diff --git a/index.html b/index.html index 0fea732..aa0a430 100644 --- a/index.html +++ b/index.html @@ -5224,11 +5224,11 @@ hello-nix 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-nix = { + url = "git+https://codeberg.org/mhwombat/hello-nix"; + flake = false; + }; + }; outputs = { self, nixpkgs, flake-utils, hello-nix }: flake-utils.lib.eachDefaultSystem (system: @@ -5236,8 +5236,8 @@ hello-nix pkgs = import nixpkgs { inherit system; }; - helloNix = import hello-nix { inherit pkgs; }; - in + helloNix = import hello-nix { inherit pkgs; }; + in { packages = rec { hello = pkgs.stdenv.mkDerivation rec { @@ -5250,19 +5250,19 @@ hello-nix buildPhase = ":"; installPhase = - '' - mkdir -p $out/bin - cp $src/hello-again $out/bin - chmod +x $out/bin/hello-again + '' + mkdir -p $out/bin + 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 - ''; + HELLO=$(type -p hello-nix) + sed "s_hello-nix_"$HELLO"_" --in-place $out/bin/hello-again + ''; - buildInputs = [ helloNix ]; - }; + buildInputs = [ helloNix ]; + }; default = hello; }; @@ -5295,14 +5295,11 @@ by specifying the full path to hello-nix.

$ hello-nix # this will fail
 bash: line 40: hello-nix: command not found
 $ nix develop
-building '/nix/store/0qzgar07id1cpygx9yyxfsvls1w2jf0c-hello-again-env.drv'...
+building '/nix/store/72z63qhsk4f8shg0yn81m76w56m42x7s-hello-again-env.drv'...
 $ hello-nix
 Hello from your nix package!
-
-

Unresolved directive in recipes/build/main.adoc - include::non-flake/main-generated.adoc[leveloffset=+1]

-
@@ -5364,7 +5361,7 @@ Hello from your flake!
diff --git a/source/recipes/build/nix-non-flake/main.adoc0 b/source/recipes/build/nix-non-flake/main.adoc0 index 7d22777..6f4548a 100644 --- a/source/recipes/build/nix-non-flake/main.adoc0 +++ b/source/recipes/build/nix-non-flake/main.adoc0 @@ -42,10 +42,7 @@ by specifying the full path to `hello-nix`. Here's a demonstration using the shell. .... -$ hello-nix # this will fail -$# ../../../../../start-shell nix develop <