From 3b70bf13e4501f108a6ea5baf4659c3c6c592280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= Date: Tue, 16 Sep 2025 14:01:37 +0100 Subject: [PATCH] temp --- .../tempwork/flake.lock | 17 ++++++++++++ .../devshell/nix-non-flake/tempwork/flake.nix | 27 +++++++++++++++++++ source/recipes/devshell/nixpkg/main.adoc0 | 1 - .../devshell/nixpkg/tempwork/flake.nix | 20 -------------- 4 files changed, 44 insertions(+), 21 deletions(-) rename source/recipes/devshell/{nixpkg => nix-non-flake}/tempwork/flake.lock (73%) create mode 100644 source/recipes/devshell/nix-non-flake/tempwork/flake.nix delete mode 100644 source/recipes/devshell/nixpkg/tempwork/flake.nix diff --git a/source/recipes/devshell/nixpkg/tempwork/flake.lock b/source/recipes/devshell/nix-non-flake/tempwork/flake.lock similarity index 73% rename from source/recipes/devshell/nixpkg/tempwork/flake.lock rename to source/recipes/devshell/nix-non-flake/tempwork/flake.lock index d51c2d5..77c1bd4 100644 --- a/source/recipes/devshell/nixpkg/tempwork/flake.lock +++ b/source/recipes/devshell/nix-non-flake/tempwork/flake.lock @@ -18,6 +18,22 @@ "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": 1758024132, @@ -36,6 +52,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", + "hello-nix": "hello-nix", "nixpkgs": "nixpkgs" } }, diff --git a/source/recipes/devshell/nix-non-flake/tempwork/flake.nix b/source/recipes/devshell/nix-non-flake/tempwork/flake.nix new file mode 100644 index 0000000..b4b97a6 --- /dev/null +++ b/source/recipes/devshell/nix-non-flake/tempwork/flake.nix @@ -0,0 +1,27 @@ +{ + 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; + }; + }; + + outputs = { self, nixpkgs, flake-utils, hello-nix }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + }; + helloNix = import hello-nix { inherit pkgs; }; + in + { + devShells = rec { + default = pkgs.mkShell { + packages = [ helloNix ]; + }; + }; + } + ); +} diff --git a/source/recipes/devshell/nixpkg/main.adoc0 b/source/recipes/devshell/nixpkg/main.adoc0 index f9ab2cb..e07fe8e 100644 --- a/source/recipes/devshell/nixpkg/main.adoc0 +++ b/source/recipes/devshell/nixpkg/main.adoc0 @@ -20,7 +20,6 @@ Here's a demonstration using the shell. .... $ cowsay "Moo!" # Fails; dependency not available -$ echo "DEBUG PATH=$PATH" $# start-shell nix develop <