From e712d753fde3f079efb32a2d18bbe6fc361b7b49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= Date: Thu, 4 Sep 2025 17:32:23 +0100 Subject: [PATCH] temp --- index.html | 64 +++++++-- .../devshell/flake/tempwork/flake.lock | 128 ++++++++++++++++++ .../{nixpkg => flake}/tempwork/flake.nix | 5 +- .../devshell/nixpkg/tempwork/flake.lock | 60 -------- 4 files changed, 185 insertions(+), 72 deletions(-) create mode 100644 source/recipes/devshell/flake/tempwork/flake.lock rename source/recipes/devshell/{nixpkg => flake}/tempwork/flake.nix (63%) delete mode 100644 source/recipes/devshell/nixpkg/tempwork/flake.lock diff --git a/index.html b/index.html index 30c1891..f546203 100644 --- a/index.html +++ b/index.html @@ -4317,7 +4317,45 @@ hello-flake
flake.nix
-
1
cat: flake.nix: No such file or directory
+
 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
{
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs { inherit system; };
+      in
+      {
+        devShells = rec {
+          default = pkgs.mkShell {
+            packages = [ pkgs.cowsay ];
+          };
+        };
+      }
+    );
+}
 

 

 
@@ -4327,8 +4365,17 @@ hello-flake
 

 

 
$ cowsay "Moo!"
-bash: line 30: cowsay: command not found
-bash: line 31: ../../../../start-shell: No such file or directory

+bash: line 17: cowsay: command not found
+$ nix develop
+$ cowsay "Moo!"
+ ______
+< Moo! >
+ ------
+        \   ^__^
+         \  (oo)\_______
+            (__)\       )\/\
+                ||----w |
+                ||     ||
 

 

 
@@ -4387,13 +4434,10 @@ bash: line 31: ../../../../start-shell: No such file or directory
 

 

 
$ hello-flake
-bash: line 24: hello-flake: command not found
+bash: line 17: hello-flake: command not found
 $ nix develop
-error: Path 'source/recipes/devshell' in the repository "/home/amy/codeberg/nix-book" is not tracked by Git.
-
-       To make it visible to Nix, run:
-
-       git -C "/home/amy/codeberg/nix-book" add "source/recipes/devshell"

+$ hello-flake
+Hello from your flake!
 

 

 

@@ -4968,7 +5012,7 @@ mkShell {
 

 
 
diff --git a/source/recipes/devshell/flake/tempwork/flake.lock b/source/recipes/devshell/flake/tempwork/flake.lock
new file mode 100644
index 0000000..8c1ea7e
--- /dev/null
+++ b/source/recipes/devshell/flake/tempwork/flake.lock
@@ -0,0 +1,128 @@
+{
+  "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": 1757000881,
+        "narHash": "sha256-Cl3ep4eX9Katb2m/DJLmbfltPSRaWnVAFtoI+VPVDLk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0987f8f26d7b889e23a7c533ae6d998b27924899",
+        "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/nixpkg/tempwork/flake.nix b/source/recipes/devshell/flake/tempwork/flake.nix
similarity index 63%
rename from source/recipes/devshell/nixpkg/tempwork/flake.nix
rename to source/recipes/devshell/flake/tempwork/flake.nix
index 83db46c..0db427b 100644
--- a/source/recipes/devshell/nixpkg/tempwork/flake.nix
+++ b/source/recipes/devshell/flake/tempwork/flake.nix
@@ -2,9 +2,10 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs";
     flake-utils.url = "github:numtide/flake-utils";
+    hello-flake.url = "git+https://codeberg.org/mhwombat/hello-flake";
   };
 
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, hello-flake }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; };
@@ -12,7 +13,7 @@
       {
         devShells = rec {
           default = pkgs.mkShell {
-            packages = [ pkgs.cowsay ];
+            buildInputs = [ hello-flake.packages.${system}.hello ];
           };
         };
       }
diff --git a/source/recipes/devshell/nixpkg/tempwork/flake.lock b/source/recipes/devshell/nixpkg/tempwork/flake.lock
deleted file mode 100644
index 8327761..0000000
--- a/source/recipes/devshell/nixpkg/tempwork/flake.lock
+++ /dev/null
@@ -1,60 +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"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1757000881,
-        "narHash": "sha256-Cl3ep4eX9Katb2m/DJLmbfltPSRaWnVAFtoI+VPVDLk=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0987f8f26d7b889e23a7c533ae6d998b27924899",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "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
-}