diff --git a/doc/nix-installation.md b/doc/nix-installation.md index 534903b..cf898a1 100644 --- a/doc/nix-installation.md +++ b/doc/nix-installation.md @@ -89,8 +89,6 @@ For each substituter we use, we need to also configure Nix to trust their public When editing the `/etc/nix/nix.conf` as root, suffix the new substituter(s), space-separated to any values already populating the `substituters` parameter. -Note, the order of the substituters indicates the order in which caches are searched. Leave the substituter first to maximize cache hits. - Next, similarly suffix the key(s) to the `trusted-public-keys` parameter. Your file will likely look like the following: diff --git a/doc/nix-installation.org b/doc/nix-installation.org index 4bc4c3b..41b809a 100644 --- a/doc/nix-installation.org +++ b/doc/nix-installation.org @@ -133,10 +133,6 @@ keys: When editing the =/etc/nix/nix.conf= as root, suffix the new substituter(s), space-separated to any values already populating the =substituters= parameter. -Note, the order of the substituters indicates the order in which caches are -searched. Leave the https://cache.nixos.org substituter first to maximize cache -hits. - Next, similarly suffix the key(s) to the =trusted-public-keys= parameter. Your file will likely look like the following: diff --git a/doc/nix-usage-flakes.md b/doc/nix-usage-flakes.md index 60c859a..f26af26 100644 --- a/doc/nix-usage-flakes.md +++ b/doc/nix-usage-flakes.md @@ -185,8 +185,6 @@ nix search . * packages.x86_64-linux.org2gfm Script to export Org-mode files to GitHub Flavored Markdown (GFM) - - * legacyPackages.x86_64-linux.ci If a flake has a lot of packages, you can pass regexes to prune down the search. Returned values will match all the regexes provided. diff --git a/doc/nix-usage-flakes.org b/doc/nix-usage-flakes.org index b904a86..287475e 100644 --- a/doc/nix-usage-flakes.org +++ b/doc/nix-usage-flakes.org @@ -304,8 +304,6 @@ nix search . | ansifilter : : * packages.x86_64-linux.org2gfm : Script to export Org-mode files to GitHub Flavored Markdown (GFM) -: -: * legacyPackages.x86_64-linux.ci If a flake has a lot of packages, you can pass regexes to prune down the search. Returned values will match all the regexes provided. diff --git a/doc/nix-usage-noflakes.md b/doc/nix-usage-noflakes.md index 9dd2f86..0df810e 100644 --- a/doc/nix-usage-noflakes.md +++ b/doc/nix-usage-noflakes.md @@ -80,13 +80,13 @@ We can use an `--extra-experimental-features nix-command` switch to use an exper nix --extra-experimental-features nix-command search --file . '' ``` - * legacyPackages.aarch64-darwin.ci - - * legacyPackages.x86_64-darwin.ci + * packages.aarch64-darwin.nix-scaffold + Script to scaffold a Nix project - * legacyPackages.x86_64-linux.ci + * packages.aarch64-darwin.org2gfm + Script to export Org-mode files to GitHub Flavored Markdown (GFM) - * packages.aarch64-darwin.nix-scaffold + * packages.x86_64-darwin.nix-scaffold Script to scaffold a Nix project … @@ -119,14 +119,14 @@ nix --extra-experimental-features \ ``` { - "legacyPackages.aarch64-darwin.ci": { - "description": "", - "pname": "nix-project-ci", + "packages.aarch64-darwin.nix-scaffold": { + "description": "Script to scaffold a Nix project", + "pname": "nix-scaffold", "version": "" }, - "legacyPackages.x86_64-darwin.ci": { - "description": "", - "pname": "nix-project-ci", + "packages.aarch64-darwin.org2gfm": { + "description": "Script to export Org-mode files to GitHub Flavored Markdown (GFM)", + "pname": "org2gfm", … Additional data includes the package's name (from the “pname” field), a version string, and a textual description of the package. @@ -305,6 +305,7 @@ nix-env --install --file . --attr packages.x86_64-linux.org2gfm 2>&1 ``` installing 'org2gfm' + building '/nix/store/hs9xz17vlb2m4qn6kxfmccgjq4jyrvqg-user-environment.drv'... We can see this installation by querying what's been installed: diff --git a/doc/nix-usage-noflakes.org b/doc/nix-usage-noflakes.org index c3c146d..bfe9a21 100644 --- a/doc/nix-usage-noflakes.org +++ b/doc/nix-usage-noflakes.org @@ -171,13 +171,13 @@ nix --experimental-features nix-command search --file . '' | ansifilter #+RESULTS: nix-search-local #+begin_example -,* legacyPackages.aarch64-darwin.ci - -,* legacyPackages.x86_64-darwin.ci +,* packages.aarch64-darwin.nix-scaffold + Script to scaffold a Nix project -,* legacyPackages.x86_64-linux.ci +,* packages.aarch64-darwin.org2gfm + Script to export Org-mode files to GitHub Flavored Markdown (GFM) -,* packages.aarch64-darwin.nix-scaffold +,* packages.x86_64-darwin.nix-scaffold Script to scaffold a Nix project … @@ -235,14 +235,14 @@ nix --experimental-features \ #+RESULTS: nix-search-json #+begin_example { - "legacyPackages.aarch64-darwin.ci": { - "description": "", - "pname": "nix-project-ci", + "packages.aarch64-darwin.nix-scaffold": { + "description": "Script to scaffold a Nix project", + "pname": "nix-scaffold", "version": "" }, - "legacyPackages.x86_64-darwin.ci": { - "description": "", - "pname": "nix-project-ci", + "packages.aarch64-darwin.org2gfm": { + "description": "Script to export Org-mode files to GitHub Flavored Markdown (GFM)", + "pname": "org2gfm", … #+end_example @@ -557,6 +557,7 @@ nix-env --profile /tmp/nix-profile \ #+RESULTS: nix-env-install : installing 'org2gfm' +: building '/nix/store/hs9xz17vlb2m4qn6kxfmccgjq4jyrvqg-user-environment.drv'... We can see this installation by querying what's been installed: diff --git a/flake.lock b/flake.lock index 3f94112..e4cea56 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1720993261, - "narHash": "sha256-n7UcEUsgl4aYeSuE2Ukp6alNPoDQEk69GhSctX6wPDg=", + "lastModified": 1721059602, + "narHash": "sha256-LCTss2iem0kTTSihKamsYTc1ZUL85S8TXqwhelOevqI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f00069ce100284d5729ae6fdd999a7045e24d9", + "rev": "ccb1f96597312925b921f21461f713691c6050f0", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "nixpkgs-stable-linux": { "locked": { - "lastModified": 1720823163, - "narHash": "sha256-FZ5dnrvKkln9ESdoTR8R7GKW9rNpXNZrxGsOXsbsTpE=", + "lastModified": 1720954236, + "narHash": "sha256-1mEKHp4m9brvfQ0rjCca8P1WHpymK3TOr3v34ydv9bs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f12ee5f64c6a09995e71c9626d88c4efa983b488", + "rev": "53e81e790209e41f0c1efa9ff26ff2fd7ab35e27", "type": "github" }, "original": { @@ -96,11 +96,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1720955038, - "narHash": "sha256-GaliJqfFwyYxReFywxAa8orCO+EnDq2NK2F+5aSc8vo=", + "lastModified": 1721016451, + "narHash": "sha256-Cypl9ORr5UjtBsbjXMTJRepTe362yNVrPrntUvHiTaw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa247c0c90ecf4ae7a032c54fdc21b91ca274062", + "rev": "a14c5d651cee9ed70f9cd9e83f323f1e531002db", "type": "github" }, "original": {