From b80cfecb963ded9bb7e6b750ee9a8494fb70d46c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amy=20de=20Buitl=C3=A9ir?= Date: Sun, 14 Sep 2025 20:53:01 +0100 Subject: [PATCH] temp --- index.html | 4 +- source/recipes/devshell/flake/main.adoc0 | 4 +- .../devshell/flake/tempwork/flake.lock | 128 ++++++++++++++++++ .../{nixpkg => flake}/tempwork/flake.nix | 5 +- .../devshell/nixpkg/tempwork/flake.lock | 60 -------- 5 files changed, 135 insertions(+), 66 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 1b946b4..957abb7 100644 --- a/index.html +++ b/index.html @@ -4657,7 +4657,7 @@ sanitized: <strong>some text</strong> 
$ cowsay "Moo!"     # Won't work; dependency not available
 bash: line 17: cowsay: command not found
 $ nix develop
-$ cowsay "Moo!"
+$ cowsay "Moo!"     # Works in development environment
  ______
 < Moo! >
  ------
@@ -5598,7 +5598,7 @@ Hello from your flake!
diff --git a/source/recipes/devshell/flake/main.adoc0 b/source/recipes/devshell/flake/main.adoc0 index 75d94ea..7fb3829 100644 --- a/source/recipes/devshell/flake/main.adoc0 +++ b/source/recipes/devshell/flake/main.adoc0 @@ -19,10 +19,10 @@ However, you can use any of the flake reference styles defined in <<#flakeref>>. $# cat flake.nix .... -Let's take a closer look at the `buildInputs` from line 16. +Let's take a closer look at the `buildInputs` expression from line 16. .... -$# grep buildInputs flake.nix | sed 's/ //g' +$# grep buildInputs flake.nix | sed 's/ //g; s/.*\[//; s/\].*//' .... Why is the first part `hello-flake` and the last part `hello`? diff --git a/source/recipes/devshell/flake/tempwork/flake.lock b/source/recipes/devshell/flake/tempwork/flake.lock new file mode 100644 index 0000000..cf46e12 --- /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": 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-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1757875192, + "narHash": "sha256-JBkm6NAOYjR3Sc3BxJ2ijrTqW8Ga0NlN9GPUJ/NUsGM=", + "ref": "refs/heads/main", + "rev": "2d9363f255c44a41be2e5291dd624e078e7f4139", + "revCount": 25, + "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_2": { + "locked": { + "lastModified": 1757876592, + "narHash": "sha256-P8XdKg87fR5PpCjIgMH+05PDwhdmlNrigsvChdHfyaw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5ad881b15fb2b63c2f127533ca59f840fcc24c3f", + "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 200c880..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": 1757876592, - "narHash": "sha256-P8XdKg87fR5PpCjIgMH+05PDwhdmlNrigsvChdHfyaw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5ad881b15fb2b63c2f127533ca59f840fcc24c3f", - "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 -}