From 9fe39bc9deebbad8e9a0309b41862ee82fd7aaaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= Date: Sat, 6 Sep 2025 16:42:24 +0100 Subject: [PATCH] temp --- .../devshell/flake/tempwork/flake.lock | 128 ------------------ .../devshell/non-flake/tempwork/flake.lock | 77 +++++++++++ .../{flake => non-flake}/tempwork/flake.nix | 12 +- 3 files changed, 86 insertions(+), 131 deletions(-) delete mode 100644 source/recipes/devshell/flake/tempwork/flake.lock create mode 100644 source/recipes/devshell/non-flake/tempwork/flake.lock rename source/recipes/devshell/{flake => non-flake}/tempwork/flake.nix (56%) diff --git a/source/recipes/devshell/flake/tempwork/flake.lock b/source/recipes/devshell/flake/tempwork/flake.lock deleted file mode 100644 index 6ae7d59..0000000 --- a/source/recipes/devshell/flake/tempwork/flake.lock +++ /dev/null @@ -1,128 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "hello-flake": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1684524031, - "narHash": "sha256-0DYX7S7u5S2no2e6jiIv7cRfbpM5JBJq7+/1CUKEGxA=", - "ref": "refs/heads/main", - "rev": "099bfadc43f79a8929809bd097d12ef5de73ef62", - "revCount": 24, - "type": "git", - "url": "https://codeberg.org/mhwombat/hello-flake" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/mhwombat/hello-flake" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1681665000, - "narHash": "sha256-hDGTR59wC3qrQZFxVi2U3vTY+r02+Okbq080hO1C4Nk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3a6205d9f79fe526be03d8c465403b118ca4cf37", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1757172738, - "narHash": "sha256-wt4izkhUOlFBMt6Zc4TRG8U769Iq79l5rAU1W5aevVg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3ef96d876cd8cb511b809a942dc5e1072636b85b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "hello-flake": "hello-flake", - "nixpkgs": "nixpkgs_2" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/source/recipes/devshell/non-flake/tempwork/flake.lock b/source/recipes/devshell/non-flake/tempwork/flake.lock new file mode 100644 index 0000000..e07c629 --- /dev/null +++ b/source/recipes/devshell/non-flake/tempwork/flake.lock @@ -0,0 +1,77 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "hello-nix": { + "flake": false, + "locked": { + "lastModified": 1676213208, + "narHash": "sha256-Zds5C+f5sA3w+j85EsAQjte0zeHqubMVPGYn5lGwATo=", + "ref": "refs/heads/main", + "rev": "aa2c87f8b89578b069b09fdb2be30a0c9d8a77d8", + "revCount": 4, + "type": "git", + "url": "https://codeberg.org/mhwombat/hello-nix" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/mhwombat/hello-nix" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1757172738, + "narHash": "sha256-wt4izkhUOlFBMt6Zc4TRG8U769Iq79l5rAU1W5aevVg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3ef96d876cd8cb511b809a942dc5e1072636b85b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "hello-nix": "hello-nix", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/source/recipes/devshell/flake/tempwork/flake.nix b/source/recipes/devshell/non-flake/tempwork/flake.nix similarity index 56% rename from source/recipes/devshell/flake/tempwork/flake.nix rename to source/recipes/devshell/non-flake/tempwork/flake.nix index 0db427b..560bc6e 100644 --- a/source/recipes/devshell/flake/tempwork/flake.nix +++ b/source/recipes/devshell/non-flake/tempwork/flake.nix @@ -2,10 +2,13 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; - hello-flake.url = "git+https://codeberg.org/mhwombat/hello-flake"; + hello-nix = { + url = "git+https://codeberg.org/mhwombat/hello-nix"; + flake = false; + }; }; - outputs = { self, nixpkgs, flake-utils, hello-flake }: + outputs = { self, nixpkgs, flake-utils, hello-nix }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; @@ -13,7 +16,10 @@ { devShells = rec { default = pkgs.mkShell { - buildInputs = [ hello-flake.packages.${system}.hello ]; + shellHook = + '' + PATH=${hello-nix}:$PATH + ''; }; }; }