diff --git a/doc/manual/source/advanced-topics/eval-profiler.md b/doc/manual/source/advanced-topics/eval-profiler.md index ed3848bb2..2bc7ebb05 100644 --- a/doc/manual/source/advanced-topics/eval-profiler.md +++ b/doc/manual/source/advanced-topics/eval-profiler.md @@ -27,7 +27,7 @@ site](https://en.wikipedia.org/wiki/Call_site) position and the name of the function being called (when available). For example: ``` -/nix/store/x9wnkly3k1gkq580m90jjn32q9f05q2v-source/pkgs/top-level/default.nix:167:5:primop import +/nix/store/2q71fdvr4h33g9832hiriwnf20fn630l-source/pkgs/top-level/default.nix:167:5:primop import ``` -Here `import` primop is called at `/nix/store/x9wnkly3k1gkq580m90jjn32q9f05q2v-source/pkgs/top-level/default.nix:167:5`. +Here `import` primop is called at `/nix/store/2q71fdvr4h33g9832hiriwnf20fn630l-source/pkgs/top-level/default.nix:167:5`. diff --git a/doc/manual/source/command-ref/files/manifest.nix.md b/doc/manual/source/command-ref/files/manifest.nix.md index d7d1b605b..78bfdc346 100644 --- a/doc/manual/source/command-ref/files/manifest.nix.md +++ b/doc/manual/source/command-ref/files/manifest.nix.md @@ -114,9 +114,9 @@ Here is an example of how this file might look like after installing `hello` fro }; name = "hello-2.12.1"; out = { - outPath = "/nix/store/260q5867crm1xjs4khgqpl6vr9kywql1-hello-2.12.1"; + outPath = "/nix/store/src1vzij2z0slnakrsbpqpk20389z0k6-hello-2.12.1"; }; - outPath = "/nix/store/260q5867crm1xjs4khgqpl6vr9kywql1-hello-2.12.1"; + outPath = "/nix/store/src1vzij2z0slnakrsbpqpk20389z0k6-hello-2.12.1"; outputs = [ "out" ]; system = "x86_64-linux"; type = "derivation"; diff --git a/doc/manual/source/command-ref/files/profiles.md b/doc/manual/source/command-ref/files/profiles.md index b5c737880..4f022acce 100644 --- a/doc/manual/source/command-ref/files/profiles.md +++ b/doc/manual/source/command-ref/files/profiles.md @@ -37,13 +37,13 @@ dr-xr-xr-x 4 root root 4096 Jan 1 1970 share /home/eelco/.local/state/nix/profiles/profile-7-link/bin: total 20 -lrwxrwxrwx 5 root root 79 Jan 1 1970 chromium -> /nix/store/ijm5k0zqisvkdwjkc77mb9qzb35xfi4m-chromium-86.0.4240.111/bin/chromium +lrwxrwxrwx 5 root root 79 Jan 1 1970 chromium -> /nix/store/cyxny9d1zjb9l9103fr6j6kavp3bqjxf-chromium-86.0.4240.111/bin/chromium lrwxrwxrwx 7 root root 87 Jan 1 1970 spotify -> /nix/store/w9182874m1bl56smps3m5zjj36jhp3rn-spotify-1.1.26.501.gbe11e53b-15/bin/spotify lrwxrwxrwx 3 root root 79 Jan 1 1970 zoom-us -> /nix/store/wbhg2ga8f3h87s9h5k0slxk0m81m4cxl-zoom-us-5.3.469451.0927/bin/zoom-us /home/eelco/.local/state/nix/profiles/profile-7-link/share/applications: total 12 -lrwxrwxrwx 4 root root 120 Jan 1 1970 chromium-browser.desktop -> /nix/store/4cf803y4vzfm3gyk3vzhzb2327v0kl8a-chromium-unwrapped-86.0.4240.111/share/applications/chromium-browser.desktop +lrwxrwxrwx 4 root root 120 Jan 1 1970 chromium-browser.desktop -> /nix/store/sqzyx2l85i6j2a77pnyvglh3bvzwmjjp-chromium-unwrapped-86.0.4240.111/share/applications/chromium-browser.desktop lrwxrwxrwx 7 root root 110 Jan 1 1970 spotify.desktop -> /nix/store/w9182874m1bl56smps3m5zjj36jhp3rn-spotify-1.1.26.501.gbe11e53b-15/share/applications/spotify.desktop lrwxrwxrwx 3 root root 107 Jan 1 1970 us.zoom.Zoom.desktop -> /nix/store/wbhg2ga8f3h87s9h5k0slxk0m81m4cxl-zoom-us-5.3.469451.0927/share/applications/us.zoom.Zoom.desktop diff --git a/doc/manual/source/command-ref/nix-copy-closure.md b/doc/manual/source/command-ref/nix-copy-closure.md index b7e31d93b..b34d57a50 100644 --- a/doc/manual/source/command-ref/nix-copy-closure.md +++ b/doc/manual/source/command-ref/nix-copy-closure.md @@ -72,11 +72,11 @@ When using public key authentication, you can avoid typing the passphrase with ` > $ storePath="$(nix-build '' -I nixpkgs=channel:nixpkgs-unstable -A hello --no-out-link)" > $ nix-copy-closure --to alice@itchy.example.org "$storePath" > copying 5 paths... -> copying path '/nix/store/nrwkk6ak3rgkrxbqhsscb01jpzmslf2r-xgcc-13.2.0-libgcc' to 'ssh://alice@itchy.example.org'... -> copying path '/nix/store/gm61h1y42pqyl6178g90x8zm22n6pyy5-libunistring-1.1' to 'ssh://alice@itchy.example.org'... -> copying path '/nix/store/ddfzjdykw67s20c35i7a6624by3iz5jv-libidn2-2.3.7' to 'ssh://alice@itchy.example.org'... -> copying path '/nix/store/apab5i73dqa09wx0q27b6fbhd1r18ihl-glibc-2.39-31' to 'ssh://alice@itchy.example.org'... -> copying path '/nix/store/g1n2vryg06amvcc1avb2mcq36faly0mh-hello-2.12.1' to 'ssh://alice@itchy.example.org'... +> copying path '/nix/store/h6q8sqsqfbd3252f9gixqn3z282wds7m-xgcc-13.2.0-libgcc' to 'ssh://alice@itchy.example.org'... +> copying path '/nix/store/imnwvn96lw355giswsk36hx105j4wnpj-libunistring-1.1' to 'ssh://alice@itchy.example.org'... +> copying path '/nix/store/85301indj7scg34spnfczkz72jgv8wa9-libidn2-2.3.7' to 'ssh://alice@itchy.example.org'... +> copying path '/nix/store/ypwfsaljwhzw9iffiysxmxnhjj8v7np0-glibc-2.39-31' to 'ssh://alice@itchy.example.org'... +> copying path '/nix/store/0dklv59zppdsqdvgf0qdvjgzcs5wbwxa-hello-2.12.1' to 'ssh://alice@itchy.example.org'... > ``` > **Example** diff --git a/doc/manual/source/command-ref/nix-env/install.md b/doc/manual/source/command-ref/nix-env/install.md index 527fd8f90..06aeb3925 100644 --- a/doc/manual/source/command-ref/nix-env/install.md +++ b/doc/manual/source/command-ref/nix-env/install.md @@ -204,7 +204,7 @@ To install a specific [store derivation] (typically created by `nix-instantiate`): ```console -$ nix-env --install /nix/store/fibjb1bfbpm5mrsxc4mh2d8n37sxh91i-gcc-3.4.3.drv +$ nix-env --install /nix/store/8la6y31fmm6i4wfmby6avly1wf718xnj-gcc-3.4.3.drv ``` To install a specific output path: @@ -232,7 +232,7 @@ $ nix-env --file '' --install --attr hello --dry-run (dry run; not doing anything) installing ‘hello-2.10’ this path will be fetched (0.04 MiB download, 0.19 MiB unpacked): - /nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10 + /nix/store/ikwkxz4wwlp2g1428n7dy729cg1d9hin-hello-2.10 ... ``` diff --git a/doc/manual/source/command-ref/nix-prefetch-url.md b/doc/manual/source/command-ref/nix-prefetch-url.md index 19322ec8e..8451778ad 100644 --- a/doc/manual/source/command-ref/nix-prefetch-url.md +++ b/doc/manual/source/command-ref/nix-prefetch-url.md @@ -76,7 +76,7 @@ $ nix-prefetch-url ftp://ftp.gnu.org/pub/gnu/hello/hello-2.10.tar.gz ```console $ nix-prefetch-url --print-path mirror://gnu/hello/hello-2.10.tar.gz 0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i -/nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz +/nix/store/8alrpdaasjd1x6g1fczchmzbpqm936a3-hello-2.10.tar.gz ``` ```console diff --git a/doc/manual/source/command-ref/nix-store/add-fixed.md b/doc/manual/source/command-ref/nix-store/add-fixed.md index 2ea90a135..511fe2050 100644 --- a/doc/manual/source/command-ref/nix-store/add-fixed.md +++ b/doc/manual/source/command-ref/nix-store/add-fixed.md @@ -34,6 +34,6 @@ This operation has the following options: ```console $ nix-store --add-fixed sha256 ./hello-2.10.tar.gz -/nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz +/nix/store/8alrpdaasjd1x6g1fczchmzbpqm936a3-hello-2.10.tar.gz ``` diff --git a/doc/manual/source/command-ref/nix-store/delete.md b/doc/manual/source/command-ref/nix-store/delete.md index 550c5ea29..fcb2212d8 100644 --- a/doc/manual/source/command-ref/nix-store/delete.md +++ b/doc/manual/source/command-ref/nix-store/delete.md @@ -27,7 +27,7 @@ paths in the store that refer to it (i.e., depend on it). # Example ```console -$ nix-store --delete /nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4 +$ nix-store --delete /nix/store/gjak3al7lj61x4gj6rln4f5pc5v0f67n-mesa-6.4 0 bytes freed (0.00 MiB) -error: cannot delete path `/nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4' since it is still alive +error: cannot delete path `/nix/store/gjak3al7lj61x4gj6rln4f5pc5v0f67n-mesa-6.4' since it is still alive ``` diff --git a/doc/manual/source/command-ref/nix-store/query.md b/doc/manual/source/command-ref/nix-store/query.md index b5ba63ada..aeb696535 100644 --- a/doc/manual/source/command-ref/nix-store/query.md +++ b/doc/manual/source/command-ref/nix-store/query.md @@ -184,9 +184,9 @@ Print the build-time dependencies of `svn`: ```console $ nix-store --query --requisites $(nix-store --query --deriver $(which svn)) -/nix/store/02iizgn86m42q905rddvg4ja975bk2i4-grep-2.5.1.tar.bz2.drv -/nix/store/07a2bzxmzwz5hp58nf03pahrv2ygwgs3-gcc-wrapper.sh -/nix/store/0ma7c9wsbaxahwwl04gbw3fcd806ski4-glibc-2.3.4.drv +/nix/store/y6qa66l9h0pw161crnlk6y16rdrcljx4-grep-2.5.1.tar.bz2.drv +/nix/store/z716h753s97jhnzvfank2srqbljswpgm-gcc-wrapper.sh +/nix/store/f39x0q73rjdyvzm93y9wrkfr6x39lb7f-glibc-2.3.4.drv ... lots of other paths ... ``` @@ -199,10 +199,10 @@ Show the build-time dependencies as a tree: ```console $ nix-store --query --tree $(nix-store --query --deriver $(which svn)) /nix/store/7i5082kfb6yjbqdbiwdhhza0am2xvh6c-subversion-1.1.4.drv -+---/nix/store/d8afh10z72n8l1cr5w42366abiblgn54-builder.sh -+---/nix/store/fmzxmpjx2lh849ph0l36snfj9zdibw67-bash-3.0.drv -| +---/nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash -| +---/nix/store/p3srsbd8dx44v2pg6nbnszab5mcwx03v-builder.sh ++---/nix/store/vxnmkc8l8d2ijjha4xwhkfgx9vvc3q4c-builder.sh ++---/nix/store/rn9776dy82n5qrgz7xbcl1iw4vfkcrkk-bash-3.0.drv +| +---/nix/store/x9j20hz6bln1crzn55qifk0bbsm8v5ac-bash +| +---/nix/store/ajnn1mcm45wjvn0rlc22gvx2cwhjnazx-builder.sh ... ``` diff --git a/doc/manual/source/command-ref/nix-store/realise.md b/doc/manual/source/command-ref/nix-store/realise.md index 240685ce5..f5d203894 100644 --- a/doc/manual/source/command-ref/nix-store/realise.md +++ b/doc/manual/source/command-ref/nix-store/realise.md @@ -76,7 +76,7 @@ This operation is typically used to build [store derivation]s produced by ```console $ nix-store --realise $(nix-instantiate ./test.nix) -/nix/store/31axcgrlbfsxzmfff1gyj1bf62hvkby2-aterm-2.3.1 +/nix/store/6gwmy5jcnwdlz6aqqhksz863f1l8xc2w-aterm-2.3.1 ``` This is essentially what [`nix-build`](@docroot@/command-ref/nix-build.md) does. diff --git a/doc/manual/source/glossary.md b/doc/manual/source/glossary.md index 502e6d4de..af5b45314 100644 --- a/doc/manual/source/glossary.md +++ b/doc/manual/source/glossary.md @@ -136,7 +136,7 @@ > **Example** > - > `/nix/store/a040m110amc4h71lds2jmr8qrkj2jhxd-git-2.38.1` + > `/nix/store/jf6gn2dzna4nmsfbdxsd7kwhsk6gnnlr-git-2.38.1` See [Store Path](@docroot@/store/store-path.md) for details. diff --git a/doc/manual/source/introduction.md b/doc/manual/source/introduction.md index e70411c11..85de7982c 100644 --- a/doc/manual/source/introduction.md +++ b/doc/manual/source/introduction.md @@ -8,7 +8,7 @@ stores packages in the _Nix store_, usually the directory `/nix/store`, where each package has its own unique subdirectory such as - /nix/store/b6gvzjyb2pg0kjfwrjmg1vfhh54ad73z-firefox-33.1/ + /nix/store/q06x3jll2yfzckz2bzqak089p43ixkkq-firefox-33.1/ where `b6gvzjyb2pg0…` is a unique identifier for the package that captures all its dependencies (it’s a cryptographic hash of the diff --git a/doc/manual/source/language/string-context.md b/doc/manual/source/language/string-context.md index 65c59d865..0968cc88b 100644 --- a/doc/manual/source/language/string-context.md +++ b/doc/manual/source/language/string-context.md @@ -34,12 +34,12 @@ String context elements come in different forms: > [`builtins.storePath`] creates a string with a single constant string context element: > > ```nix - > builtins.getContext (builtins.storePath "/nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10") + > builtins.getContext (builtins.storePath "/nix/store/ikwkxz4wwlp2g1428n7dy729cg1d9hin-hello-2.10") > ``` > evaluates to > ```nix > { - > "/nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10" = { + > "/nix/store/ikwkxz4wwlp2g1428n7dy729cg1d9hin-hello-2.10" = { > path = true; > }; > } diff --git a/doc/manual/source/language/string-interpolation.md b/doc/manual/source/language/string-interpolation.md index 8e25d2b63..3f6bf9b9f 100644 --- a/doc/manual/source/language/string-interpolation.md +++ b/doc/manual/source/language/string-interpolation.md @@ -181,7 +181,7 @@ A derivation interpolates to the [store path] of its first [output](./derivation > "${pkgs.hello}" > ``` > -> "/nix/store/4xpfqf29z4m8vbhrqcz064wfmb46w5r7-hello-2.12.1" +> "/nix/store/qnlr7906z0mrl2syrkdbpicffq02nw07-hello-2.12.1" An attribute set interpolates to the return value of the function in the `__toString` applied to the attribute set itself. diff --git a/doc/manual/source/protocols/json/schema/derivation-v4.yaml b/doc/manual/source/protocols/json/schema/derivation-v4.yaml index 2528f7502..c41eef31b 100644 --- a/doc/manual/source/protocols/json/schema/derivation-v4.yaml +++ b/doc/manual/source/protocols/json/schema/derivation-v4.yaml @@ -94,8 +94,8 @@ properties: > > ```json > "srcs": [ - > "47y241wqdhac3jm5l7nv0x4975mb1975-separate-debug-info.sh", - > "56d0w71pjj9bdr363ym3wj1zkwyqq97j-fix-pop-var-context-error.patch" + > "b8nwz167km1yciqpwzjj24f8jcy8pq1h-separate-debug-info.sh", + > "ihzmilr413r8fb3ah30yjnhlb18c1laz-fix-pop-var-context-error.patch" > ] > ``` items: @@ -140,7 +140,7 @@ properties: description: | Absolute path of the program used to perform the build. Typically this is the `bash` shell - (e.g. `/nix/store/r3j288vpmczbl500w6zz89gyfa4nr0b1-bash-4.4-p23/bin/bash`). + (e.g. `/nix/store/p4xlj4imjbnm4v0x5jf4qysvyjjlgq1d-bash-4.4-p23/bin/bash`). args: type: array diff --git a/doc/manual/source/release-notes/rl-0.12.md b/doc/manual/source/release-notes/rl-0.12.md index 3a4aba07d..3541b6487 100644 --- a/doc/manual/source/release-notes/rl-0.12.md +++ b/doc/manual/source/release-notes/rl-0.12.md @@ -80,7 +80,7 @@ ... the following paths will be downloaded/copied (30.02 MiB): /nix/store/4m8pvgy2dcjgppf5b4cj5l6wyshjhalj-samba-3.2.4 - /nix/store/7h1kwcj29ip8vk26rhmx6bfjraxp0g4l-libunwind-0.98.6 + /nix/store/spc1m987vlibchdx369qwa391s738s7l-libunwind-0.98.6 ... - Language features: diff --git a/doc/manual/source/release-notes/rl-0.8.md b/doc/manual/source/release-notes/rl-0.8.md index 5ba6e0e72..2bc6352c3 100644 --- a/doc/manual/source/release-notes/rl-0.8.md +++ b/doc/manual/source/release-notes/rl-0.8.md @@ -63,7 +63,7 @@ Nix 0.8 has the following improvements: can query all paths that directly or indirectly use a certain Glibc: $ nix-store -q --referrers-closure \ - /nix/store/8lz9yc6zgmc0vlqmn2ipcpkjlmbi51vv-glibc-2.3.4 + /nix/store/1a6mdrjz4wn7b9sfmcw5ggbk1mi281mh-glibc-2.3.4 - The concept of fixed-output derivations has been formalised. Previously, functions such as `fetchurl` in Nixpkgs used a hack diff --git a/doc/manual/source/release-notes/rl-2.0.md b/doc/manual/source/release-notes/rl-2.0.md index 25cc5e0a5..181940f61 100644 --- a/doc/manual/source/release-notes/rl-2.0.md +++ b/doc/manual/source/release-notes/rl-2.0.md @@ -66,7 +66,7 @@ This release has the following new features: nix copy --to ssh://machine nixpkgs.hello - nix copy --to ssh://machine /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10 + nix copy --to ssh://machine /nix/store/qbhyj3blxpw2i6pb7c6grc9185nbnpvy-hello-2.10 nix copy --to ssh://machine '(with import {}; hello)' @@ -187,7 +187,7 @@ This release has the following new features: former is primarily useful in conjunction with remote stores, e.g. - nix ls-store --store https://cache.nixos.org/ -lR /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10 + nix ls-store --store https://cache.nixos.org/ -lR /nix/store/qbhyj3blxpw2i6pb7c6grc9185nbnpvy-hello-2.10 lists the contents of path in a binary cache. diff --git a/doc/manual/source/release-notes/rl-2.13.md b/doc/manual/source/release-notes/rl-2.13.md index 168708113..6976f9150 100644 --- a/doc/manual/source/release-notes/rl-2.13.md +++ b/doc/manual/source/release-notes/rl-2.13.md @@ -25,7 +25,7 @@ * Allow explicitly selecting outputs in a store derivation installable, just like we can do with other sorts of installables. For example, ```shell-session - # nix build /nix/store/gzaflydcr6sb3567hap9q6srzx8ggdgg-glibc-2.33-78.drv^dev + # nix build /nix/store/fpq78s2h8ffh66v2iy0q1838mhff06y8-glibc-2.33-78.drv^dev ``` now works just as ```shell-session diff --git a/doc/manual/source/release-notes/rl-2.15.md b/doc/manual/source/release-notes/rl-2.15.md index e7e52631b..1d30c70a4 100644 --- a/doc/manual/source/release-notes/rl-2.15.md +++ b/doc/manual/source/release-notes/rl-2.15.md @@ -18,13 +18,13 @@ For example, ```shell-session - $ nix path-info /nix/store/gzaflydcr6sb3567hap9q6srzx8ggdgg-glibc-2.33-78.drv + $ nix path-info /nix/store/fpq78s2h8ffh66v2iy0q1838mhff06y8-glibc-2.33-78.drv ``` now gives info about the derivation itself, while ```shell-session - $ nix path-info /nix/store/gzaflydcr6sb3567hap9q6srzx8ggdgg-glibc-2.33-78.drv^* + $ nix path-info /nix/store/fpq78s2h8ffh66v2iy0q1838mhff06y8-glibc-2.33-78.drv^* ``` provides information about each of its outputs. diff --git a/doc/manual/source/release-notes/rl-2.19.md b/doc/manual/source/release-notes/rl-2.19.md index 04f8c9c28..813279c9f 100644 --- a/doc/manual/source/release-notes/rl-2.19.md +++ b/doc/manual/source/release-notes/rl-2.19.md @@ -45,7 +45,7 @@ ```json5 [ { - "path": "/nix/store/8fv91097mbh5049i9rglc73dx6kjg3qk-bash-5.2-p15", + "path": "/nix/store/fvqsvk65d38p8qqir371ii0hyqxvjcw6-bash-5.2-p15", "valid": true, // ... }, @@ -60,7 +60,7 @@ ```json5 { - "/nix/store/8fv91097mbh5049i9rglc73dx6kjg3qk-bash-5.2-p15": { + "/nix/store/fvqsvk65d38p8qqir371ii0hyqxvjcw6-bash-5.2-p15": { // ... }, "/nix/store/wffw7l0alvs3iw94cbgi1gmmbmw99sqb-home-manager-path": null, diff --git a/doc/manual/source/release-notes/rl-2.20.md b/doc/manual/source/release-notes/rl-2.20.md index eb724f600..d54646379 100644 --- a/doc/manual/source/release-notes/rl-2.20.md +++ b/doc/manual/source/release-notes/rl-2.20.md @@ -182,7 +182,7 @@ «partially applied primop map» nix-repl> builtins.trace lib.id "my-value" - trace: «lambda id @ /nix/store/8rrzq23h2zq7sv5l2vhw44kls5w0f654-source/lib/trivial.nix:26:5» + trace: «lambda id @ /nix/store/kgr5lnaiiv08wb7k324yv1i1npjmrvjc-source/lib/trivial.nix:26:5» "my-value" ``` diff --git a/doc/manual/source/store/store-path.md b/doc/manual/source/store/store-path.md index 4061f3653..08b024e4a 100644 --- a/doc/manual/source/store/store-path.md +++ b/doc/manual/source/store/store-path.md @@ -2,7 +2,7 @@ > **Example** > -> `/nix/store/a040m110amc4h71lds2jmr8qrkj2jhxd-git-2.38.1` +> `/nix/store/jf6gn2dzna4nmsfbdxsd7kwhsk6gnnlr-git-2.38.1` > > A rendered store path @@ -22,7 +22,7 @@ Store paths are pairs of > **Example** > -> - Digest: `b6gvzjyb2pg0kjfwrjmg1vfhh54ad73z` +> - Digest: `q06x3jll2yfzckz2bzqak089p43ixkkq` > - Name: `firefox-33.1` To make store objects accessible to operating system processes, stores have to expose store objects through the file system. @@ -38,7 +38,7 @@ A store path is rendered to a file system path as the concatenation of > **Example** > > ``` -> /nix/store/b6gvzjyb2pg0kjfwrjmg1vfhh54ad73z-firefox-33.1 +> /nix/store/q06x3jll2yfzckz2bzqak089p43ixkkq-firefox-33.1 > |--------| |------------------------------| |----------| > store directory digest name > ``` diff --git a/doc/manual/source/store/types/index.md.in b/doc/manual/source/store/types/index.md.in index a35161ce8..b211ac98f 100644 --- a/doc/manual/source/store/types/index.md.in +++ b/doc/manual/source/store/types/index.md.in @@ -8,7 +8,7 @@ Stores are specified using a URL-like syntax. For example, the command ```console # nix path-info --store https://cache.nixos.org/ --json \ - /nix/store/a7gvj343m05j2s32xcnwr35v31ynlypr-coreutils-9.1 + /nix/store/1542dip9i7k4f24y6hqgd04hmvid9hr5-coreutils-9.1 ``` fetches information about a store path in the HTTP binary cache diff --git a/maintainers/invalidate-store-paths.sh b/maintainers/invalidate-store-paths.sh new file mode 100755 index 000000000..a075e2621 --- /dev/null +++ b/maintainers/invalidate-store-paths.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +set -euo pipefail +set -x + +git ls-files -z \ + | xargs -0 grep -o '[0123456789abcdfghijklmnpqrsvwxyz]\{32\}' 2> /dev/null \ + | rev \ + | cut -d: -f1 \ + | rev \ + | sort \ + | uniq \ + | while read -r oldhash; do + if ! curl --fail -I "https://cache.nixos.org/$oldhash.narinfo" > /dev/null 2>&1; then + continue + fi + + newhash=$( + nix eval --expr "builtins.toFile \"006c6ssvddri1sg34wnw65mzd05pcp3qliylxlhv49binldajba5\" \"$oldhash\"" \ + | cut -d- -f1 \ + | cut -d/ -f4 + ) + + msg=$(printf "bad: %s -> %s" "$oldhash" "$newhash") + echo "$msg" + git ls-files -z \ + | xargs -0 grep -a -l "$oldhash" 2> /dev/null \ + | while read -r file; do + [ -L "$file" ] && continue + perl -pi -e "s/$oldhash/$newhash/g" "$file" || true + done || true + git commit -am "$msg" + done diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh index 5ff760a61..683beca10 100644 --- a/scripts/install-multi-user.sh +++ b/scripts/install-multi-user.sh @@ -53,8 +53,8 @@ readonly PROFILE_NIX_FILE_FISH="$NIX_ROOT/var/nix/profiles/default/etc/profile.d readonly NIX_INSTALLED_NIX="@nix@" readonly NIX_INSTALLED_CACERT="@cacert@" -#readonly NIX_INSTALLED_NIX="/nix/store/j8dbv5w6jl34caywh2ygdy88knx1mdf7-nix-2.3.6" -#readonly NIX_INSTALLED_CACERT="/nix/store/7dxhzymvy330i28ii676fl1pqwcahv2f-nss-cacert-3.49.2" +#readonly NIX_INSTALLED_NIX="/nix/store/byi37zv50wnfrpp4d81z3spswd5zva37-nix-2.3.6" +#readonly NIX_INSTALLED_CACERT="/nix/store/7pi45g541xa8ahwgpbpy7ggsl0xj1jj6-nss-cacert-3.49.2" EXTRACTED_NIX_PATH="$(dirname "$0")" readonly EXTRACTED_NIX_PATH diff --git a/src/libexpr/primops/fetchClosure.cc b/src/libexpr/primops/fetchClosure.cc index 6e1389814..bfcf9798e 100644 --- a/src/libexpr/primops/fetchClosure.cc +++ b/src/libexpr/primops/fetchClosure.cc @@ -243,7 +243,7 @@ static RegisterPrimOp primop_fetchClosure({ ```nix builtins.fetchClosure { fromStore = "https://cache.nixos.org"; - fromPath = /nix/store/r2jd6ygnmirm2g803mksqqjm4y39yi6i-git-2.33.1; + fromPath = /nix/store/nph9br6y2dmciy6q3dj3fwk2brdlr4gh-git-2.33.1; toPath = /nix/store/ldbhlwhh39wha58rm61bkiiwm6j7211j-git-2.33.1; } ``` @@ -258,8 +258,8 @@ static RegisterPrimOp primop_fetchClosure({ use [`nix store make-content-addressed`](@docroot@/command-ref/new-cli/nix3-store-make-content-addressed.md): ```console - # nix store make-content-addressed --from https://cache.nixos.org /nix/store/r2jd6ygnmirm2g803mksqqjm4y39yi6i-git-2.33.1 - rewrote '/nix/store/r2jd6ygnmirm2g803mksqqjm4y39yi6i-git-2.33.1' to '/nix/store/ldbhlwhh39wha58rm61bkiiwm6j7211j-git-2.33.1' + # nix store make-content-addressed --from https://cache.nixos.org /nix/store/nph9br6y2dmciy6q3dj3fwk2brdlr4gh-git-2.33.1 + rewrote '/nix/store/nph9br6y2dmciy6q3dj3fwk2brdlr4gh-git-2.33.1' to '/nix/store/ldbhlwhh39wha58rm61bkiiwm6j7211j-git-2.33.1' ``` Alternatively, set `toPath = ""` and find the correct `toPath` in the error message. @@ -271,7 +271,7 @@ static RegisterPrimOp primop_fetchClosure({ ```nix builtins.fetchClosure { fromStore = "https://cache.nixos.org"; - fromPath = /nix/store/r2jd6ygnmirm2g803mksqqjm4y39yi6i-git-2.33.1; + fromPath = /nix/store/nph9br6y2dmciy6q3dj3fwk2brdlr4gh-git-2.33.1; inputAddressed = true; } ``` diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc index ef6ae92a4..d4361264e 100644 --- a/src/libstore/http-binary-cache-store.cc +++ b/src/libstore/http-binary-cache-store.cc @@ -182,7 +182,7 @@ FileTransferRequest HttpBinaryCacheStore::makeRequest(std::string_view path) /* path is not a path, but a full relative or absolute URL, e.g. we've seen in the wild NARINFO files have a URL field which is - `nar/15f99rdaf26k39knmzry4xd0d97wp6yfpnfk1z9avakis7ipb9yg.nar?hash=zphkqn2wg8mnvbkixnl2aadkbn0rcnfj` + `nar/15f99rdaf26k39knmzry4xd0d97wp6yfpnfk1z9avakis7ipb9yg.nar?hash=wvx0nans273vb7b0cjlplsmr2z905hwd` (note the query param) and that gets passed here. */ auto result = parseURLRelative(path, cacheUriWithTrailingSlash); diff --git a/src/libstore/include/nix/store/globals.hh b/src/libstore/include/nix/store/globals.hh index 89e92d30e..6d61442fe 100644 --- a/src/libstore/include/nix/store/globals.hh +++ b/src/libstore/include/nix/store/globals.hh @@ -1125,11 +1125,11 @@ public: character. Example: - `/nix/store/zf5lbh336mnzf1nlswdn11g4n2m8zh3g-bash-4.4-p23-dev - /nix/store/rjxwxwv1fpn9wa2x5ssk5phzwlcv4mna-bash-4.4-p23-doc - /nix/store/6bqvbzjkcp9695dq0dpl5y43nvy37pq1-bash-4.4-p23-info - /nix/store/r7fng3kk3vlpdlh2idnrbn37vh4imlj2-bash-4.4-p23-man - /nix/store/xfghy8ixrhz3kyy6p724iv3cxji088dx-bash-4.4-p23`. + `/nix/store/l88brggg9hpy96ijds34dlq4n8fan63g-bash-4.4-p23-dev + /nix/store/vch71bhyi5akr5zs40k8h2wqxx69j80l-bash-4.4-p23-doc + /nix/store/c5cxjywi66iwn9dcx5yvwjkvl559ay6p-bash-4.4-p23-info + /nix/store/scz72lskj03ihkcn42ias5mlp4i4gr1k-bash-4.4-p23-man + /nix/store/a724znygmd1cac856j3gfsyvih3lw07j-bash-4.4-p23`. )"}; Setting downloadSpeed{ diff --git a/src/libutil/experimental-features.cc b/src/libutil/experimental-features.cc index 69ba62b56..908e53fe9 100644 --- a/src/libutil/experimental-features.cc +++ b/src/libutil/experimental-features.cc @@ -143,14 +143,14 @@ constexpr std::array xpFeatureDetails arbitrary substitutions. For example, running ``` - nix-store -r /nix/store/kmwd1hq55akdb9sc7l3finr175dajlby-hello-2.10 + nix-store -r /nix/store/lrs9qfm60jcgsk83qhyypj3m4jqsgdid-hello-2.10 ``` in the above `runCommand` script would be disallowed, as this could lead to derivations with hidden dependencies or breaking reproducibility by relying on the current state of the Nix store. An exception would be if - `/nix/store/kmwd1hq55akdb9sc7l3finr175dajlby-hello-2.10` were + `/nix/store/lrs9qfm60jcgsk83qhyypj3m4jqsgdid-hello-2.10` were already in the build inputs or built by a previous recursive Nix call. )", diff --git a/src/nix/build.md b/src/nix/build.md index 5dfdd44a7..b5964e13d 100644 --- a/src/nix/build.md +++ b/src/nix/build.md @@ -21,15 +21,15 @@ R""( ```console # nix build nixpkgs#hello nixpkgs#cowsay # ls -l result* - lrwxrwxrwx 1 … result -> /nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10 - lrwxrwxrwx 1 … result-1 -> /nix/store/rkfrm0z6x6jmi7d3gsmma4j53h15mg33-cowsay-3.03+dfsg2 + lrwxrwxrwx 1 … result -> /nix/store/10l19qifk7hjjq47px8m2prqk1gv4isy-hello-2.10 + lrwxrwxrwx 1 … result-1 -> /nix/store/frzgk3v1ycnarpfc2rkynravng27a86d-cowsay-3.03+dfsg2 ``` * Build GNU Hello and print the resulting store path. ```console # nix build nixpkgs#hello --print-out-paths - /nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10 + /nix/store/10l19qifk7hjjq47px8m2prqk1gv4isy-hello-2.10 ``` * Build a specific output: @@ -37,19 +37,19 @@ R""( ```console # nix build nixpkgs#glibc.dev # ls -ld ./result-dev - lrwxrwxrwx 1 … ./result-dev -> /nix/store/dkm3gwl0xrx0wrw6zi5x3px3lpgjhlw4-glibc-2.32-dev + lrwxrwxrwx 1 … ./result-dev -> /nix/store/hb4lb9n3gv855llky72hrs4pglpxq70m-glibc-2.32-dev ``` * Build all outputs: ```console # nix build "nixpkgs#openssl^*" --print-out-paths - /nix/store/gvad6v0cmq1qccmc4wphsazqbj0xzjsl-openssl-3.0.13-bin - /nix/store/a07jqdrc8afnk8r6f3lnhh4gvab7chk4-openssl-3.0.13-debug - /nix/store/yg75achq89wgqn2fi3gglgsd77kjpi03-openssl-3.0.13-dev - /nix/store/bvdcihi8c88fw31cg6gzzmpnwglpn1jv-openssl-3.0.13-doc - /nix/store/gjqcvq47cmxazxga0cirspm3jywkmvfv-openssl-3.0.13-man - /nix/store/7nmrrad8skxr47f9hfl3xc0pfqmwq51b-openssl-3.0.13 + /nix/store/ah1slww3lfsj02w563wjf1xcz5fayj36-openssl-3.0.13-bin + /nix/store/vswlynn75s0bpba3vl6bi3wyzjym95yi-openssl-3.0.13-debug + /nix/store/z71nwwni9dcxdmd3v3a7j24v70c7v7z3-openssl-3.0.13-dev + /nix/store/iabzsa5c73p4f10zfmf5r2qsrn0hl4lk-openssl-3.0.13-doc + /nix/store/zqmfrpxvcll69a2lyawnpvp15zh421v2-openssl-3.0.13-man + /nix/store/l3nlzki957anyy7yb25qvwk6cqrnvb67-openssl-3.0.13 ``` * Build attribute `build.x86_64-linux` from (non-flake) Nix expression @@ -89,7 +89,7 @@ R""( already exist: ```console - # nix build /nix/store/rkfrm0z6x6jmi7d3gsmma4j53h15mg33-cowsay-3.03+dfsg2 + # nix build /nix/store/frzgk3v1ycnarpfc2rkynravng27a86d-cowsay-3.03+dfsg2 ``` # Description diff --git a/src/nix/flake-metadata.md b/src/nix/flake-metadata.md index adfd3dc96..b99770049 100644 --- a/src/nix/flake-metadata.md +++ b/src/nix/flake-metadata.md @@ -9,7 +9,7 @@ R""( Resolved URL: github:edolstra/dwarffs Locked URL: github:edolstra/dwarffs/f691e2c991e75edb22836f1dbe632c40324215c5 Description: A filesystem that fetches DWARF debug info from the Internet on demand - Path: /nix/store/769s05vjydmc2lcf6b02az28wsa9ixh1-source + Path: /nix/store/vdyf2s1pygcl4y3dn3bm9wy7mnl8hxcv-source Revision: f691e2c991e75edb22836f1dbe632c40324215c5 Last modified: 2021-01-21 15:41:26 Inputs: @@ -40,7 +40,7 @@ R""( "type": "indirect" }, "originalUrl": "flake:dwarffs", - "path": "/nix/store/hang3792qwdmm2n0d9nsrs5n6bsws6kv-source", + "path": "/nix/store/l06r23gw4psl1f547il2hbnwnxaplbaz-source", "resolved": { "owner": "edolstra", "repo": "dwarffs", diff --git a/src/nix/flake-prefetch.md b/src/nix/flake-prefetch.md index 4666aadc4..a634c5022 100644 --- a/src/nix/flake-prefetch.md +++ b/src/nix/flake-prefetch.md @@ -20,7 +20,7 @@ R""( ```console # nix flake prefetch dwarffs --json {"hash":"sha256-VHg3MYVgQ12LeRSU2PSoDeKlSPD8PYYEFxxwkVVDRd0=" - ,"storePath":"/nix/store/hang3792qwdmm2n0d9nsrs5n6bsws6kv-source"} + ,"storePath":"/nix/store/l06r23gw4psl1f547il2hbnwnxaplbaz-source"} ``` # Description diff --git a/src/nix/log.md b/src/nix/log.md index 01e9801df..9d526bb42 100644 --- a/src/nix/log.md +++ b/src/nix/log.md @@ -11,7 +11,7 @@ R""( * Get the build log of a specific store path: ```console - # nix log /nix/store/lmngj4wcm9rkv3w4dfhzhcyij3195hiq-thunderbird-52.2.1 + # nix log /nix/store/vaph2hfdmnipqr90v6g5mcdn8h5p5iss-thunderbird-52.2.1 ``` * Get a build log from a specific binary cache: diff --git a/src/nix/make-content-addressed.md b/src/nix/make-content-addressed.md index e6a51c83a..4acbba6f4 100644 --- a/src/nix/make-content-addressed.md +++ b/src/nix/make-content-addressed.md @@ -7,7 +7,7 @@ R""( ```console # nix store make-content-addressed nixpkgs#hello … - rewrote '/nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10' to '/nix/store/5skmmcb9svys5lj3kbsrjg7vf2irid63-hello-2.10' + rewrote '/nix/store/10l19qifk7hjjq47px8m2prqk1gv4isy-hello-2.10' to '/nix/store/5skmmcb9svys5lj3kbsrjg7vf2irid63-hello-2.10' ``` Since the resulting paths are content-addressed, they are always @@ -22,7 +22,7 @@ R""( ```console # nix copy --to /tmp/nix --trusted-public-keys '' nixpkgs#hello - cannot add path '/nix/store/zy9wbxwcygrwnh8n2w9qbbcr6zk87m26-libunistring-0.9.10' because it lacks a signature by a trusted key + cannot add path '/nix/store/gs7mh6q22l1ivxazxja2mjlsdwhw8zg9-libunistring-0.9.10' because it lacks a signature by a trusted key ``` * Create a content-addressed representation of the current NixOS diff --git a/src/nix/nix.md b/src/nix/nix.md index 10a2aaee8..fed781aa7 100644 --- a/src/nix/nix.md +++ b/src/nix/nix.md @@ -140,7 +140,7 @@ If *attrpath* begins with `.` then no prefixes or defaults are attempted. This a ### Store path -Example: `/nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10` +Example: `/nix/store/10l19qifk7hjjq47px8m2prqk1gv4isy-hello-2.10` These are paths inside the Nix store, or symlinks that resolve to a path in the Nix store. @@ -196,7 +196,7 @@ operate are determined as follows: and likewise, using a store path to a "drv" file to specify the derivation: ```console - # nix build '/nix/store/gzaflydcr6sb3567hap9q6srzx8ggdgg-glibc-2.33-78.drv^dev,static' + # nix build '/nix/store/fpq78s2h8ffh66v2iy0q1838mhff06y8-glibc-2.33-78.drv^dev,static' … ``` @@ -219,17 +219,17 @@ operate are determined as follows: ```console # nix path-info --closure-size --eval-store auto --store https://cache.nixos.org 'nixpkgs#glibc^*' - /nix/store/g02b1lpbddhymmcjb923kf0l7s9nww58-glibc-2.33-123 33208200 - /nix/store/851dp95qqiisjifi639r0zzg5l465ny4-glibc-2.33-123-bin 36142896 - /nix/store/kdgs3q6r7xdff1p7a9hnjr43xw2404z7-glibc-2.33-123-debug 155787312 - /nix/store/n4xa8h6pbmqmwnq0mmsz08l38abb06zc-glibc-2.33-123-static 42488328 - /nix/store/q6580lr01jpcsqs4r5arlh4ki2c1m9rv-glibc-2.33-123-dev 44200560 + /nix/store/i2fn2mjgihz960bwa7ldab5ra5fhxznh-glibc-2.33-123 33208200 + /nix/store/n2wnn3i47w6dbylh64hdjzgd5rrprdn8-glibc-2.33-123-bin 36142896 + /nix/store/v7dyz518sbkzl8x2a1sgk1lwsfd3d6gm-glibc-2.33-123-debug 155787312 + /nix/store/z4hv6ybyinqw9a3dwyl5k66a91aggylj-glibc-2.33-123-static 42488328 + /nix/store/lrjirf0j1rjnvif6amyp9pfcqr2km385-glibc-2.33-123-dev 44200560 ``` and likewise, using a store path to a "drv" file to specify the derivation: ```console - # nix path-info --closure-size '/nix/store/gzaflydcr6sb3567hap9q6srzx8ggdgg-glibc-2.33-78.drv^*' + # nix path-info --closure-size '/nix/store/fpq78s2h8ffh66v2iy0q1838mhff06y8-glibc-2.33-78.drv^*' … ``` * If you didn't specify the desired outputs, but the derivation has an diff --git a/src/nix/path-from-hash-part.md b/src/nix/path-from-hash-part.md index 788e13ab6..b646aa57d 100644 --- a/src/nix/path-from-hash-part.md +++ b/src/nix/path-from-hash-part.md @@ -5,8 +5,8 @@ R""( * Return the full store path with the given hash part: ```console - # nix store path-from-hash-part --store https://cache.nixos.org/ 0i2jd68mp5g6h2sa5k9c85rb80sn8hi9 - /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10 + # nix store path-from-hash-part --store https://cache.nixos.org/ qbhyj3blxpw2i6pb7c6grc9185nbnpvy + /nix/store/qbhyj3blxpw2i6pb7c6grc9185nbnpvy-hello-2.10 ``` # Description @@ -15,6 +15,6 @@ Given the hash part of a store path (that is, the 32 characters following `/nix/store/`), return the full store path. This is primarily useful in the implementation of binary caches, where a request for a `.narinfo` file only supplies the hash part -(e.g. `https://cache.nixos.org/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9.narinfo`). +(e.g. `https://cache.nixos.org/qbhyj3blxpw2i6pb7c6grc9185nbnpvy.narinfo`). )"" diff --git a/src/nix/path-info.md b/src/nix/path-info.md index 2e39225b8..bd4a9311c 100644 --- a/src/nix/path-info.md +++ b/src/nix/path-info.md @@ -6,7 +6,7 @@ R""( ```console # nix path-info nixpkgs#hello - /nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10 + /nix/store/10l19qifk7hjjq47px8m2prqk1gv4isy-hello-2.10 ``` * Show the closure sizes of every path in the current NixOS system @@ -14,8 +14,8 @@ R""( ```console # nix path-info --recursive --closure-size /run/current-system | sort -nk2 - /nix/store/hl5xwp9kdrd1zkm0idm3kkby9q66z404-empty 96 - /nix/store/27324qvqhnxj3rncazmxc4mwy79kz8ha-nameservers 112 + /nix/store/zlnmjjbpv5pwwv911qp0grqi25y80wbs-empty 96 + /nix/store/v40fjpq45135avrmnfm8klbvdhf0dcp7-nameservers 112 … /nix/store/539jkw9a8dyry7clcv60gk6na816j7y8-etc 5783255504 /nix/store/zqamz3cz4dbzfihki2mk7a63mbkxz9xq-nixos-system-machine-20.09.20201112.3090c65 5887562256 @@ -26,8 +26,8 @@ R""( ```console # nix path-info --recursive --size --closure-size --human-readable nixpkgs#rustc - /nix/store/01rrgsg5zk3cds0xgdsq40zpk6g51dz9-ncurses-6.2-dev 386.7 KiB 69.1 MiB - /nix/store/0q783wnvixpqz6dxjp16nw296avgczam-libpfm-4.11.0 5.9 MiB 37.4 MiB + /nix/store/klarszqikbvf6n70581w0381zb7rlzri-ncurses-6.2-dev 386.7 KiB 69.1 MiB + /nix/store/30rva1kafnr6fyf8y5xxlpnwixvdpv4w-libpfm-4.11.0 5.9 MiB 37.4 MiB … ``` diff --git a/src/nix/print-dev-env.md b/src/nix/print-dev-env.md index a8ce9d36a..fd84b8afe 100644 --- a/src/nix/print-dev-env.md +++ b/src/nix/print-dev-env.md @@ -25,7 +25,7 @@ R""( "variables": { "src": { "type": "exported", - "value": "/nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz" + "value": "/nix/store/8alrpdaasjd1x6g1fczchmzbpqm936a3-hello-2.10.tar.gz" }, "postUnpackHooks": { "type": "array", diff --git a/src/nix/profile-list.md b/src/nix/profile-list.md index 9811b9ec9..89ac228a3 100644 --- a/src/nix/profile-list.md +++ b/src/nix/profile-list.md @@ -10,13 +10,13 @@ R""( Flake attribute: legacyPackages.x86_64-linux.gdb Original flake URL: flake:nixpkgs Locked flake URL: github:NixOS/nixpkgs/7b38b03d76ab71bdc8dc325e3f6338d984cc35ca - Store paths: /nix/store/indzcw5wvlhx6vwk7k4iq29q15chvr3d-gdb-11.1 + Store paths: /nix/store/i6i08pl20rh0lm46g38wk3bfnvhdl43d-gdb-11.1 Name: blender-bin Flake attribute: packages.x86_64-linux.default Original flake URL: flake:blender-bin Locked flake URL: github:edolstra/nix-warez/91f2ffee657bf834e4475865ae336e2379282d34?dir=blender - Store paths: /nix/store/i798sxl3j40wpdi1rgf391id1b5klw7g-blender-bin-3.1.2 + Store paths: /nix/store/rlgr8vjhcv6v2rv7ljgl0pr6g74r0cg9-blender-bin-3.1.2 ``` Note that you can unambiguously rebuild a package from a profile diff --git a/src/nix/profile-remove.md b/src/nix/profile-remove.md index e7e5e0dfb..2d32447d4 100644 --- a/src/nix/profile-remove.md +++ b/src/nix/profile-remove.md @@ -24,7 +24,7 @@ R""( * Remove a package by store path: ```console - # nix profile remove /nix/store/rr3y0c6zyk7kjjl8y19s4lsrhn4aiq1z-hello-2.10 + # nix profile remove /nix/store/xwjlac5ay8hw3djdm5llhjz79isgngbl-hello-2.10 ``` # Description diff --git a/src/nix/registry-list.md b/src/nix/registry-list.md index 30b6e29d8..a3eb65c89 100644 --- a/src/nix/registry-list.md +++ b/src/nix/registry-list.md @@ -7,7 +7,7 @@ R""( ```console # nix registry list user flake:dwarffs github:edolstra/dwarffs/d181d714fd36eb06f4992a1997cd5601e26db8f5 - system flake:nixpkgs path:/nix/store/fxl9mrm5xvzam0lxi9ygdmksskx4qq8s-source?lastModified=1605220118&narHash=sha256-Und10ixH1WuW0XHYMxxuHRohKYb45R%2fT8CwZuLd2D2Q=&rev=3090c65041104931adda7625d37fa874b2b5c124 + system flake:nixpkgs path:/nix/store/jschy88crdk7jqqbk1p2b4l1c9gljl9b-source?lastModified=1605220118&narHash=sha256-Und10ixH1WuW0XHYMxxuHRohKYb45R%2fT8CwZuLd2D2Q=&rev=3090c65041104931adda7625d37fa874b2b5c124 global flake:blender-bin github:edolstra/nix-warez?dir=blender global flake:dwarffs github:edolstra/dwarffs … diff --git a/src/nix/store-cat.md b/src/nix/store-cat.md index da2073473..6638be2d5 100644 --- a/src/nix/store-cat.md +++ b/src/nix/store-cat.md @@ -6,7 +6,7 @@ R""( ```console # nix store cat --store https://cache.nixos.org/ \ - /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10/bin/hello | hexdump -C | head -n1 + /nix/store/qbhyj3blxpw2i6pb7c6grc9185nbnpvy-hello-2.10/bin/hello | hexdump -C | head -n1 00000000 7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00 |.ELF............| ``` diff --git a/src/nix/store-copy-log.md b/src/nix/store-copy-log.md index 61daa75c1..9d10174bb 100644 --- a/src/nix/store-copy-log.md +++ b/src/nix/store-copy-log.md @@ -23,7 +23,7 @@ R""( [store derivation]: @docroot@/glossary.md#gloss-store-derivation ```console - # nix store copy-log --to ssh-ng://machine /nix/store/ilgm50plpmcgjhcp33z6n4qbnpqfhxym-glibc-2.33-59.drv + # nix store copy-log --to ssh-ng://machine /nix/store/yaxvykk956vdrwrx9cxyw44mpqr1ml7i-glibc-2.33-59.drv ``` # Description diff --git a/src/nix/store-copy-sigs.md b/src/nix/store-copy-sigs.md index 678756221..25c60966e 100644 --- a/src/nix/store-copy-sigs.md +++ b/src/nix/store-copy-sigs.md @@ -6,7 +6,7 @@ R""( ```console # nix store copy-sigs --substituter https://cache.nixos.org \ - --recursive /nix/store/y1x7ng5bmc9s8lqrf98brcpk1a7lbcl5-hello-2.12.1 + --recursive /nix/store/q833p12cmm9qknyp1walqih941msnb9z-hello-2.12.1 ``` * To copy signatures from one binary cache to another: @@ -15,7 +15,7 @@ R""( # nix store copy-sigs --substituter https://cache.nixos.org \ --store file:///tmp/binary-cache \ --recursive -v \ - /nix/store/y1x7ng5bmc9s8lqrf98brcpk1a7lbcl5-hello-2.12.1 + /nix/store/q833p12cmm9qknyp1walqih941msnb9z-hello-2.12.1 imported 2 signatures ``` diff --git a/src/nix/store-delete.md b/src/nix/store-delete.md index 431bc5f5e..026dccd0f 100644 --- a/src/nix/store-delete.md +++ b/src/nix/store-delete.md @@ -5,7 +5,7 @@ R""( * Delete a specific store path: ```console - # nix store delete /nix/store/yb5q57zxv6hgqql42d5r8b5k5mcq6kay-hello-2.10 + # nix store delete /nix/store/fdhrijyv3670djsgprx596nn89iwlj2s-hello-2.10 ``` # Description diff --git a/src/nix/store-dump-path.md b/src/nix/store-dump-path.md index 21467ff32..4e5c6aedd 100644 --- a/src/nix/store-dump-path.md +++ b/src/nix/store-dump-path.md @@ -12,7 +12,7 @@ R""( ```console # nix store dump-path --store https://cache.nixos.org/ \ - /nix/store/7crrmih8c52r8fbnqb933dxrsp44md93-glibc-2.25 > glibc.nar + /nix/store/vyrnv99qi410q82qp7nw7lcl37zmzaxd-glibc-2.25 > glibc.nar ``` # Description diff --git a/src/nix/store-ls.md b/src/nix/store-ls.md index 14c4627c9..62f6cd070 100644 --- a/src/nix/store-ls.md +++ b/src/nix/store-ls.md @@ -5,7 +5,7 @@ R""( * To list the contents of a store path in a binary cache: ```console - # nix store ls --store https://cache.nixos.org/ --long --recursive /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10 + # nix store ls --store https://cache.nixos.org/ --long --recursive /nix/store/qbhyj3blxpw2i6pb7c6grc9185nbnpvy-hello-2.10 dr-xr-xr-x 0 ./bin -r-xr-xr-x 38184 ./bin/hello dr-xr-xr-x 0 ./share @@ -15,7 +15,7 @@ R""( * To show information about a specific file in a binary cache: ```console - # nix store ls --store https://cache.nixos.org/ --long /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10/bin/hello + # nix store ls --store https://cache.nixos.org/ --long /nix/store/qbhyj3blxpw2i6pb7c6grc9185nbnpvy-hello-2.10/bin/hello -r-xr-xr-x 38184 hello ``` diff --git a/src/nix/store-repair.md b/src/nix/store-repair.md index 180c577ac..a03952714 100644 --- a/src/nix/store-repair.md +++ b/src/nix/store-repair.md @@ -5,13 +5,13 @@ R""( * Repair a store path, after determining that it is corrupt: ```console - # nix store verify /nix/store/yb5q57zxv6hgqql42d5r8b5k5mcq6kay-hello-2.10 - path '/nix/store/yb5q57zxv6hgqql42d5r8b5k5mcq6kay-hello-2.10' was + # nix store verify /nix/store/fdhrijyv3670djsgprx596nn89iwlj2s-hello-2.10 + path '/nix/store/fdhrijyv3670djsgprx596nn89iwlj2s-hello-2.10' was modified! expected hash 'sha256:1hd5vnh6xjk388gdk841vflicy8qv7qzj2hb7xlyh8lpb43j921l', got 'sha256:1a25lf78x5wi6pfkrxalf0n13kdaca0bqmjqnp7wfjza2qz5ssgl' - # nix store repair /nix/store/yb5q57zxv6hgqql42d5r8b5k5mcq6kay-hello-2.10 + # nix store repair /nix/store/fdhrijyv3670djsgprx596nn89iwlj2s-hello-2.10 ``` # Description diff --git a/src/nix/verify.md b/src/nix/verify.md index ae0b0acd6..0c18449e2 100644 --- a/src/nix/verify.md +++ b/src/nix/verify.md @@ -19,7 +19,7 @@ R""( ```console # nix store verify --store https://cache.nixos.org/ \ - /nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10 + /nix/store/10l19qifk7hjjq47px8m2prqk1gv4isy-hello-2.10 ``` # Description diff --git a/src/nix/why-depends.md b/src/nix/why-depends.md index dc13619e1..ac8adeb7e 100644 --- a/src/nix/why-depends.md +++ b/src/nix/why-depends.md @@ -7,9 +7,9 @@ R""( ```console # nix why-depends nixpkgs#hello nixpkgs#glibc - /nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10 - └───bin/hello: …...................../nix/store/9l06v7fc38c1x3r2iydl15ksgz0ysb82-glibc-2.32/lib/ld-linux-x86-64.… - → /nix/store/9l06v7fc38c1x3r2iydl15ksgz0ysb82-glibc-2.32 + /nix/store/10l19qifk7hjjq47px8m2prqk1gv4isy-hello-2.10 + └───bin/hello: …...................../nix/store/kmmr0ggkywxvnad4z1chqb6lsxi6pqgc-glibc-2.32/lib/ld-linux-x86-64.… + → /nix/store/kmmr0ggkywxvnad4z1chqb6lsxi6pqgc-glibc-2.32 ``` * Show all files and paths in the dependency graph leading from @@ -17,13 +17,13 @@ R""( ```console # nix why-depends --all nixpkgs#thunderbird nixpkgs#xorg.libX11 - /nix/store/qfc8729nzpdln1h0hvi1ziclsl3m84sr-thunderbird-78.5.1 - ├───lib/thunderbird/libxul.so: …6wrw-libxcb-1.14/lib:/nix/store/adzfjjh8w25vdr0xdx9x16ah4f5rqrw5-libX11-1.7.0/lib:/nix/store/ssf… - │ → /nix/store/adzfjjh8w25vdr0xdx9x16ah4f5rqrw5-libX11-1.7.0 - ├───lib/thunderbird/libxul.so: …pxyc-libXt-1.2.0/lib:/nix/store/1qj29ipxl2fyi2b13l39hdircq17gnk0-libXdamage-1.1.5/lib:/nix/store… - │ → /nix/store/1qj29ipxl2fyi2b13l39hdircq17gnk0-libXdamage-1.1.5 - │ ├───lib/libXdamage.so.1.1.0: …-libXfixes-5.0.3/lib:/nix/store/adzfjjh8w25vdr0xdx9x16ah4f5rqrw5-libX11-1.7.0/lib:/nix/store/9l0… - │ │ → /nix/store/adzfjjh8w25vdr0xdx9x16ah4f5rqrw5-libX11-1.7.0 + /nix/store/0my2p7psgdzqc5pq6dyl4ld9w6g0np58-thunderbird-78.5.1 + ├───lib/thunderbird/libxul.so: …6wrw-libxcb-1.14/lib:/nix/store/jmwiq1bb3n47a0css8b1q7lhgf7416k5-libX11-1.7.0/lib:/nix/store/ssf… + │ → /nix/store/jmwiq1bb3n47a0css8b1q7lhgf7416k5-libX11-1.7.0 + ├───lib/thunderbird/libxul.so: …pxyc-libXt-1.2.0/lib:/nix/store/l1sv43bafhkf2iikmdw9y62aybjdhcmm-libXdamage-1.1.5/lib:/nix/store… + │ → /nix/store/l1sv43bafhkf2iikmdw9y62aybjdhcmm-libXdamage-1.1.5 + │ ├───lib/libXdamage.so.1.1.0: …-libXfixes-5.0.3/lib:/nix/store/jmwiq1bb3n47a0css8b1q7lhgf7416k5-libX11-1.7.0/lib:/nix/store/9l0… + │ │ → /nix/store/jmwiq1bb3n47a0css8b1q7lhgf7416k5-libX11-1.7.0 … ``` @@ -31,9 +31,9 @@ R""( ```console # nix why-depends nixpkgs#glibc nixpkgs#glibc - /nix/store/9df65igwjmf2wbw0gbrrgair6piqjgmi-glibc-2.31 - └───lib/ld-2.31.so: …che Do not use /nix/store/9df65igwjmf2wbw0gbrrgair6piqjgmi-glibc-2.31/etc/ld.so.cache. --… - → /nix/store/9df65igwjmf2wbw0gbrrgair6piqjgmi-glibc-2.31 + /nix/store/q9mknq836i0kblq8g1hm9f3cv9qda0r9-glibc-2.31 + └───lib/ld-2.31.so: …che Do not use /nix/store/q9mknq836i0kblq8g1hm9f3cv9qda0r9-glibc-2.31/etc/ld.so.cache. --… + → /nix/store/q9mknq836i0kblq8g1hm9f3cv9qda0r9-glibc-2.31 ``` * Show why Geeqie has a build-time dependency on `systemd`: @@ -54,7 +54,7 @@ R""( Nix automatically determines potential runtime dependencies between store paths by scanning for the *hash parts* of store paths. For instance, if there exists a store path -`/nix/store/9df65igwjmf2wbw0gbrrgair6piqjgmi-glibc-2.31`, and a file +`/nix/store/q9mknq836i0kblq8g1hm9f3cv9qda0r9-glibc-2.31`, and a file inside another store path contains the string `9df65igw…`, then the latter store path *refers* to the former, and thus might need it at runtime. Nix always maintains the existence of the transitive closure diff --git a/tests/functional/lang.sh b/tests/functional/lang.sh index e64663d30..63264ec22 100755 --- a/tests/functional/lang.sh +++ b/tests/functional/lang.sh @@ -27,7 +27,7 @@ nix-instantiate --show-trace --eval -E 'builtins.addErrorContext "Hello" 123' 2> expectStderr 1 nix-instantiate --show-trace --eval -E 'builtins.addErrorContext "Hello" (throw "Foo")' | grepQuiet Hello expectStderr 1 nix-instantiate --show-trace --eval -E 'builtins.addErrorContext "Hello %" (throw "Foo")' | grepQuiet 'Hello %' # Relies on parsing the expression derivation as a derivation, can't use --eval -expectStderr 1 nix-instantiate --show-trace lang/non-eval-fail-bad-drvPath.nix | grepQuiet "store path '8qlfcic10lw5304gqm8q45nr7g7jl62b-cachix-1.7.3-bin' is not a valid derivation path" +expectStderr 1 nix-instantiate --show-trace lang/non-eval-fail-bad-drvPath.nix | grepQuiet "store path '2chwzswhhmpxbgc981i2vcz7xj4d1in9-cachix-1.7.3-bin' is not a valid derivation path" nix-instantiate --eval -E 'let x = builtins.trace { x = x; } true; in x' \ diff --git a/tests/functional/lang/eval-okay-regex-match2.nix b/tests/functional/lang/eval-okay-regex-match2.nix index 31a94423d..2345b2655 100644 --- a/tests/functional/lang/eval-okay-regex-match2.nix +++ b/tests/functional/lang/eval-okay-regex-match2.nix @@ -155,7 +155,7 @@ builtins.map ] [ ''.*pypy.*'' - ''/nix/store/8w718rm43x7z73xhw9d6vh8s4snrq67h-python3-3.12.10/bin/python3.12'' + ''/nix/store/iqlzcyc1z7nv804n9wc5k5i0l180wnbs-python3-3.12.10/bin/python3.12'' ] [ ''(.*/)?\.\.(/.*)?'' @@ -199,19 +199,19 @@ builtins.map ] [ ''.*-polly.*'' - ''/nix/store/0yxfdnfxbzczjxhgdpac81jnas194wfj-gnu-install-dirs.patch'' + ''/nix/store/21yv6cysn8axxjyh7dbsnnmbp9nprg9i-gnu-install-dirs.patch'' ] [ ''.*-polly.*'' - ''/nix/store/jh2pda7psaasq85b2rrigmkjdbl8d0a1-llvm-lit-cfg-add-libs-to-dylib-path.patch'' + ''/nix/store/96dqnv9v20fi7glzsah6qx5zypbkrwsh-llvm-lit-cfg-add-libs-to-dylib-path.patch'' ] [ ''.*-polly.*'' - ''/nix/store/x868j4ih7wqiivf6wr9m4g424jav0hpq-gnu-install-dirs-polly.patch'' + ''/nix/store/hjlgp59nhxjj2y8ghf7mmqgbirqarccy-gnu-install-dirs-polly.patch'' ] [ ''.*-polly.*'' - ''/nix/store/gr73nf6sca9nyzl88x58y3qxrav04yhd-polly-lit-cfg-add-libs-to-dylib-path.patch'' + ''/nix/store/ybagzhw2933fvgi95qgbyw6i4avahyzr-polly-lit-cfg-add-libs-to-dylib-path.patch'' ] [ ''(.*/)?\.\.(/.*)?'' @@ -367,7 +367,7 @@ builtins.map ] [ ''.*pypy.*'' - ''/nix/store/8w718rm43x7z73xhw9d6vh8s4snrq67h-python3-3.12.10/bin/python3.12'' + ''/nix/store/iqlzcyc1z7nv804n9wc5k5i0l180wnbs-python3-3.12.10/bin/python3.12'' ] [ ''(.*)\.git'' @@ -453,11 +453,11 @@ builtins.map ] [ ''.*llvm-tblgen.*'' - ''-DLLVM_TABLEGEN:STRING=/nix/store/xp9hkw8nsw9p81d69yvcg1yr6f7vh71c-llvm-tblgen-18.1.8/bin/llvm-tblgen'' + ''-DLLVM_TABLEGEN:STRING=/nix/store/sclapmhdj6i9h02y7s5a630kfy55v9h1-llvm-tblgen-18.1.8/bin/llvm-tblgen'' ] [ ''.*llvm-tblgen.*'' - ''-DLLVM_TABLEGEN_EXE:STRING=/nix/store/xp9hkw8nsw9p81d69yvcg1yr6f7vh71c-llvm-tblgen-18.1.8/bin/llvm-tblgen'' + ''-DLLVM_TABLEGEN_EXE:STRING=/nix/store/sclapmhdj6i9h02y7s5a630kfy55v9h1-llvm-tblgen-18.1.8/bin/llvm-tblgen'' ] [ ''(.+)-b(.+)'' diff --git a/tests/functional/lang/non-eval-fail-bad-drvPath.nix b/tests/functional/lang/non-eval-fail-bad-drvPath.nix index 23639bc54..327a2cb2c 100644 --- a/tests/functional/lang/non-eval-fail-bad-drvPath.nix +++ b/tests/functional/lang/non-eval-fail-bad-drvPath.nix @@ -5,9 +5,9 @@ let system = builtins.currentSystem; outputs = [ "out" ]; # Illegal, because does not end in `.drv` - drvPath = "${builtins.storeDir}/8qlfcic10lw5304gqm8q45nr7g7jl62b-cachix-1.7.3-bin"; + drvPath = "${builtins.storeDir}/2chwzswhhmpxbgc981i2vcz7xj4d1in9-cachix-1.7.3-bin"; outputName = "out"; - outPath = "${builtins.storeDir}/8qlfcic10lw5304gqm8q45nr7g7jl62b-cachix-1.7.3-bin"; + outPath = "${builtins.storeDir}/2chwzswhhmpxbgc981i2vcz7xj4d1in9-cachix-1.7.3-bin"; out = package; }; in