diff --git a/source/recipes/build/flake/tempwork/flake.lock b/source/recipes/build/flake/tempwork/flake.lock new file mode 100644 index 0000000..b040569 --- /dev/null +++ b/source/recipes/build/flake/tempwork/flake.lock @@ -0,0 +1,128 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "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-flake": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1760114287, + "narHash": "sha256-tdyepod8s4Sr2iYTKh5CJlKCf+j2us26BCM9fCLa7/g=", + "ref": "refs/heads/main", + "rev": "60de6f2ab044e8020d2100e0fcac57c5c1e5f8ae", + "revCount": 26, + "type": "git", + "url": "https://codeberg.org/mhwombat/hello-flake" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/mhwombat/hello-flake" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1757873102, + "narHash": "sha256-kYhNxLlYyJcUouNRazBufVfBInMWMyF+44xG/xar2yE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "88cef159e47c0dc56f151593e044453a39a6e547", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1754788789, + "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "a73b9c743612e4244d865a2fdee11865283c04e6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1760435515, + "narHash": "sha256-E9D5sWHmPCmWsrCB3Jogvr/7ODiVaKynDrOpG4ba2tI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "db25466bd95abdbe3012be2900a5562fcfb95d51", + "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" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/source/recipes/build/nix-non-flake/tempwork/flake.nix b/source/recipes/build/flake/tempwork/flake.nix similarity index 70% rename from source/recipes/build/nix-non-flake/tempwork/flake.nix rename to source/recipes/build/flake/tempwork/flake.nix index 3d6f9a9..ad09046 100644 --- a/source/recipes/build/nix-non-flake/tempwork/flake.nix +++ b/source/recipes/build/flake/tempwork/flake.nix @@ -2,17 +2,13 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; - hello-nix = { - url = "git+https://codeberg.org/mhwombat/hello-nix"; - flake = false; - }; + hello-flake.url = "git+https://codeberg.org/mhwombat/hello-flake"; }; - outputs = { self, nixpkgs, flake-utils, hello-nix }: + outputs = { self, nixpkgs, flake-utils, hello-flake }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { inherit system; }; - helloNix = import hello-nix { inherit pkgs; }; in { packages = rec { @@ -31,13 +27,12 @@ cp $src/hello-again $out/bin chmod +x $out/bin/hello-again - # modify the hello-again script so it can find hello-nix - HELLO=$(type -p hello-nix) - sed "s_hello-nix_"$HELLO"_" --in-place $out/bin/hello-again + # modify the hello-again script so it can find hello-flake + HELLO=$(type -p hello-flake) + sed "s_hello-flake_"$HELLO"_" --in-place $out/bin/hello-again ''; - - buildInputs = [ helloNix ]; + buildInputs = [ hello-flake.packages.${system}.hello ]; }; default = hello; }; diff --git a/source/recipes/build/flake/tempwork/hello-again b/source/recipes/build/flake/tempwork/hello-again new file mode 100755 index 0000000..f75e067 --- /dev/null +++ b/source/recipes/build/flake/tempwork/hello-again @@ -0,0 +1,4 @@ +#!/usr/bin/env sh + +echo "I'm a flake, and I'm running a command defined in a another flake." +hello-flake diff --git a/source/recipes/build/nix-non-flake/tempwork/flake.lock b/source/recipes/build/nix-non-flake/tempwork/flake.lock deleted file mode 100644 index d2f468c..0000000 --- a/source/recipes/build/nix-non-flake/tempwork/flake.lock +++ /dev/null @@ -1,77 +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" - } - }, - "hello-nix": { - "flake": false, - "locked": { - "lastModified": 1757705465, - "narHash": "sha256-sJCQ9+8Dy+QF9ISaupp42+mGbuXtFyqbX85tWzeNPOI=", - "ref": "refs/heads/main", - "rev": "56044f61231c996e4ab795de1da89e5f79db3f4f", - "revCount": 5, - "type": "git", - "url": "https://codeberg.org/mhwombat/hello-nix" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/mhwombat/hello-nix" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1760435515, - "narHash": "sha256-E9D5sWHmPCmWsrCB3Jogvr/7ODiVaKynDrOpG4ba2tI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "db25466bd95abdbe3012be2900a5562fcfb95d51", - "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/build/nix-non-flake/tempwork/hello-again b/source/recipes/build/nix-non-flake/tempwork/hello-again deleted file mode 100755 index 5315da4..0000000 --- a/source/recipes/build/nix-non-flake/tempwork/hello-again +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env sh - -echo "I'm a flake, but I'm running a command defined in a non-flake package." -hello-nix