diff --git a/doc/manual/source/advanced-topics/diff-hook.md b/doc/manual/source/advanced-topics/diff-hook.md index 207aad3b8b2..8f8d2c90418 100644 --- a/doc/manual/source/advanced-topics/diff-hook.md +++ b/doc/manual/source/advanced-topics/diff-hook.md @@ -50,13 +50,13 @@ code of 0: ```console $ nix-build ./deterministic.nix --attr stable this derivation will be built: - /nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv -building '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'... -/nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable + /nix/store/z98fasz2jqy9gs0xbvdj939p27jwda3o-stable.drv +building '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda3o-stable.drv'... +/nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgo-stable $ nix-build ./deterministic.nix --attr stable --check -checking outputs of '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'... -/nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable +checking outputs of '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda3o-stable.drv'... +/nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgo-stable ``` If the build is not deterministic, Nix will exit with a status code of @@ -65,20 +65,20 @@ If the build is not deterministic, Nix will exit with a status code of ```console $ nix-build ./deterministic.nix --attr unstable this derivation will be built: - /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv -building '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'... -/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable + /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dho-unstable.drv +building '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dho-unstable.drv'... +/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cao-unstable $ nix-build ./deterministic.nix --attr unstable --check -checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'... -error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may -not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs +checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dho-unstable.drv'... +error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dho-unstable.drv' may +not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cao-unstable' differs ``` In the Nix daemon's log, we will now see: ``` -For derivation /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv: +For derivation /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dho-unstable.drv: 1c1 < 8108 --- @@ -90,15 +90,15 @@ build's output in a special, `.check` path: ```console $ nix-build ./deterministic.nix --attr unstable --check --keep-failed -checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'... +checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dho-unstable.drv'... note: keeping build directory '/tmp/nix-build-unstable.drv-0' -error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may -not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs -from '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check' +error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dho-unstable.drv' may +not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cao-unstable' differs +from '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cao-unstable.check' ``` In particular, notice the -`/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check` output. Nix +`/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cao-unstable.check` output. Nix has copied the build results to that directory where you can examine it. > []{#check-dirs-are-unregistered} **Note** @@ -117,7 +117,7 @@ has copied the build results to that directory where you can examine it. already. If the derivation has not been built Nix will fail with the error: - error: some outputs of '/nix/store/hzi1h60z2qf0nb85iwnpvrai3j2w7rr6-unstable.drv' + error: some outputs of '/nix/store/hzi1h60z2qf0nb85iwnpvrai3j2w7rro-unstable.drv' are not valid, so checking is not possible Run the build without `--check`, and then try with `--check` again. diff --git a/doc/manual/source/advanced-topics/eval-profiler.md b/doc/manual/source/advanced-topics/eval-profiler.md index ed3848bb2db..a8aa754ca52 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/x9wnkly3k1gkq580m90jjn32q9f05q2o-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/x9wnkly3k1gkq580m90jjn32q9f05q2o-source/pkgs/top-level/default.nix:167:5`. diff --git a/doc/manual/source/advanced-topics/post-build-hook.md b/doc/manual/source/advanced-topics/post-build-hook.md index 3c1cc9b369a..fbede5ea377 100644 --- a/doc/manual/source/advanced-topics/post-build-hook.md +++ b/doc/manual/source/advanced-topics/post-build-hook.md @@ -93,12 +93,12 @@ Build any derivation, for example: ```console $ nix-build --expr '(import {}).writeText "example" (builtins.toString builtins.currentTime)' this derivation will be built: - /nix/store/s4pnfbkalzy5qz57qs6yybna8wylkig6-example.drv -building '/nix/store/s4pnfbkalzy5qz57qs6yybna8wylkig6-example.drv'... + /nix/store/s4pnfbkalzy5qz57qs6yybna8wylkigo-example.drv +building '/nix/store/s4pnfbkalzy5qz57qs6yybna8wylkigo-example.drv'... running post-build-hook '/home/grahamc/projects/github.com/NixOS/nix/post-hook.sh'... -post-build-hook: Signing paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example -post-build-hook: Uploading paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example -/nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example +post-build-hook: Signing paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n1o-example +post-build-hook: Uploading paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n1o-example +/nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n1o-example ``` Then delete the path from the store, and try substituting it from the @@ -106,16 +106,16 @@ binary cache: ```console $ rm ./result -$ nix-store --delete /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example +$ nix-store --delete /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n1o-example ``` Now, copy the path back from the cache: ```console -$ nix-store --realise /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example -copying path '/nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpsa-example from 's3://example-nix-cache'... +$ nix-store --realise /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n1o-example +copying path '/nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpso-example from 's3://example-nix-cache'... warning: you did not specify '--add-root'; the result might be removed by the garbage collector -/nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpsa-example +/nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpso-example ``` # Conclusion diff --git a/doc/manual/source/command-ref/files/manifest.json.md b/doc/manual/source/command-ref/files/manifest.json.md index bcfe7373d06..bf50d157196 100644 --- a/doc/manual/source/command-ref/files/manifest.json.md +++ b/doc/manual/source/command-ref/files/manifest.json.md @@ -13,7 +13,7 @@ Here is an example of what the file might look like after installing `zoom-us` f "attrPath": "legacyPackages.x86_64-linux.zoom-us", "originalUrl": "flake:nixpkgs", "storePaths": [ - "/nix/store/wbhg2ga8f3h87s9h5k0slxk0m81m4cxl-zoom-us-5.3.469451.0927" + "/nix/store/wbhg2ga8f3h87s9h5k0slxk0m81m4cxo-zoom-us-5.3.469451.0927" ], "uri": "github:NixOS/nixpkgs/13d0c311e3ae923a00f734b43fd1d35b47d8943a" }, diff --git a/doc/manual/source/command-ref/files/manifest.nix.md b/doc/manual/source/command-ref/files/manifest.nix.md index d7d1b605b54..8da090c712f 100644 --- a/doc/manual/source/command-ref/files/manifest.nix.md +++ b/doc/manual/source/command-ref/files/manifest.nix.md @@ -108,15 +108,15 @@ Here is an example of how this file might look like after installing `hello` fro "i686-windows" ]; position = - "/nix/store/7niq32w715567hbph0q13m5lqna64c1s-nixos-unstable.tar.gz/nixos-unstable.tar.gz/pkgs/applications/misc/hello/default.nix:34"; + "/nix/store/7niq32w715567hbph0q13m5lqna64c1o-nixos-unstable.tar.gz/nixos-unstable.tar.gz/pkgs/applications/misc/hello/default.nix:34"; unfree = false; unsupported = false; }; name = "hello-2.12.1"; out = { - outPath = "/nix/store/260q5867crm1xjs4khgqpl6vr9kywql1-hello-2.12.1"; + outPath = "/nix/store/260q5867crm1xjs4khgqpl6vr9kywqlo-hello-2.12.1"; }; - outPath = "/nix/store/260q5867crm1xjs4khgqpl6vr9kywql1-hello-2.12.1"; + outPath = "/nix/store/260q5867crm1xjs4khgqpl6vr9kywqlo-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 e46e2418b4c..7b0e63503f4 100644 --- a/doc/manual/source/command-ref/files/profiles.md +++ b/doc/manual/source/command-ref/files/profiles.md @@ -16,9 +16,9 @@ For example: ```console $ ls -l ~alice/.local/state/nix/profiles/profile* lrwxrwxrwx 1 alice users 14 Nov 25 14:35 /home/alice/.local/state/nix/profiles/profile -> profile-7-link -lrwxrwxrwx 1 alice users 51 Oct 28 16:18 /home/alice/.local/state/nix/profiles/profile-5-link -> /nix/store/q69xad13ghpf7ir87h0b2gd28lafjj1j-profile -lrwxrwxrwx 1 alice users 51 Oct 29 13:20 /home/alice/.local/state/nix/profiles/profile-6-link -> /nix/store/6bvhpysd7vwz7k3b0pndn7ifi5xr32dg-profile -lrwxrwxrwx 1 alice users 51 Nov 25 14:35 /home/alice/.local/state/nix/profiles/profile-7-link -> /nix/store/mp0x6xnsg0b8qhswy6riqvimai4gm677-profile +lrwxrwxrwx 1 alice users 51 Oct 28 16:18 /home/alice/.local/state/nix/profiles/profile-5-link -> /nix/store/q69xad13ghpf7ir87h0b2gd28lafjj1o-profile +lrwxrwxrwx 1 alice users 51 Oct 29 13:20 /home/alice/.local/state/nix/profiles/profile-6-link -> /nix/store/6bvhpysd7vwz7k3b0pndn7ifi5xr32do-profile +lrwxrwxrwx 1 alice users 51 Nov 25 14:35 /home/alice/.local/state/nix/profiles/profile-7-link -> /nix/store/mp0x6xnsg0b8qhswy6riqvimai4gm67o-profile ``` Each of these symlinks is a root for the Nix garbage collector. @@ -37,15 +37,15 @@ 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 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 +lrwxrwxrwx 5 root root 79 Jan 1 1970 chromium -> /nix/store/ijm5k0zqisvkdwjkc77mb9qzb35xfi4o-chromium-86.0.4240.111/bin/chromium +lrwxrwxrwx 7 root root 87 Jan 1 1970 spotify -> /nix/store/w9182874m1bl56smps3m5zjj36jhp3ro-spotify-1.1.26.501.gbe11e53b-15/bin/spotify +lrwxrwxrwx 3 root root 79 Jan 1 1970 zoom-us -> /nix/store/wbhg2ga8f3h87s9h5k0slxk0m81m4cxo-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 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 +lrwxrwxrwx 4 root root 120 Jan 1 1970 chromium-browser.desktop -> /nix/store/4cf803y4vzfm3gyk3vzhzb2327v0kl8o-chromium-unwrapped-86.0.4240.111/share/applications/chromium-browser.desktop +lrwxrwxrwx 7 root root 110 Jan 1 1970 spotify.desktop -> /nix/store/w9182874m1bl56smps3m5zjj36jhp3ro-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/wbhg2ga8f3h87s9h5k0slxk0m81m4cxo-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 b7e31d93bfc..df7b539b81e 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/nrwkk6ak3rgkrxbqhsscb01jpzmslf2o-xgcc-13.2.0-libgcc' to 'ssh://alice@itchy.example.org'... +> copying path '/nix/store/gm61h1y42pqyl6178g90x8zm22n6pyyo-libunistring-1.1' to 'ssh://alice@itchy.example.org'... +> copying path '/nix/store/ddfzjdykw67s20c35i7a6624by3iz5jo-libidn2-2.3.7' to 'ssh://alice@itchy.example.org'... +> copying path '/nix/store/apab5i73dqa09wx0q27b6fbhd1r18iho-glibc-2.39-31' to 'ssh://alice@itchy.example.org'... +> copying path '/nix/store/g1n2vryg06amvcc1avb2mcq36faly0mo-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 26a32aa6b6b..1e8edc4c2b5 100644 --- a/doc/manual/source/command-ref/nix-env/install.md +++ b/doc/manual/source/command-ref/nix-env/install.md @@ -203,13 +203,13 @@ 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/fibjb1bfbpm5mrsxc4mh2d8n37sxh91o-gcc-3.4.3.drv ``` To install a specific output path: ```console -$ nix-env --install /nix/store/y3cgx0xj1p4iv9x0pnnmdhr8iyg741vk-gcc-3.4.3 +$ nix-env --install /nix/store/y3cgx0xj1p4iv9x0pnnmdhr8iyg741vo-gcc-3.4.3 ``` To install from a Nix expression specified on the command-line: @@ -231,7 +231,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/wkhdf9jinag5750mqlax6z2zbwhqb76o-hello-2.10 ... ``` diff --git a/doc/manual/source/command-ref/nix-env/set-flag.md b/doc/manual/source/command-ref/nix-env/set-flag.md index 58a0248bba9..3e0306b723c 100644 --- a/doc/manual/source/command-ref/nix-env/set-flag.md +++ b/doc/manual/source/command-ref/nix-env/set-flag.md @@ -57,7 +57,7 @@ firefox-2.0.0.9 (the current one) $ nix-env --preserve-installed --install firefox-2.0.0.11 installing `firefox-2.0.0.11' -building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzsl-user-environment' +building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzso-user-environment' collision between `/nix/store/...-firefox-2.0.0.11/bin/firefox' and `/nix/store/...-firefox-2.0.0.9/bin/firefox'. (i.e., can’t have two active at the same time) diff --git a/doc/manual/source/command-ref/nix-instantiate.md b/doc/manual/source/command-ref/nix-instantiate.md index bac9f365933..89153b95a1a 100644 --- a/doc/manual/source/command-ref/nix-instantiate.md +++ b/doc/manual/source/command-ref/nix-instantiate.md @@ -137,13 +137,13 @@ Instantiate [store derivation]s from a Nix expression, and build them using `nix ```console $ nix-instantiate test.nix (instantiate) -/nix/store/cigxbmvy6dzix98dxxh9b6shg7ar5bvs-perl-BerkeleyDB-0.26.drv +/nix/store/cigxbmvy6dzix98dxxh9b6shg7ar5bvo-perl-BerkeleyDB-0.26.drv $ nix-store --realise $(nix-instantiate test.nix) (build) ... -/nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26 (output path) +/nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgo-perl-BerkeleyDB-0.26 (output path) -$ ls -l /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26 +$ ls -l /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgo-perl-BerkeleyDB-0.26 dr-xr-xr-x 2 eelco users 4096 1970-01-01 01:00 lib ... ``` @@ -152,7 +152,7 @@ You can also give a Nix expression on the command line: ```console $ nix-instantiate --expr 'with import { }; hello' -/nix/store/j8s4zyv75a724q38cb0r87rlczaiag4y-hello-2.8.drv +/nix/store/j8s4zyv75a724q38cb0r87rlczaiag4o-hello-2.8.drv ``` This is equivalent to: diff --git a/doc/manual/source/command-ref/nix-prefetch-url.md b/doc/manual/source/command-ref/nix-prefetch-url.md index 19322ec8e04..e1be3b65289 100644 --- a/doc/manual/source/command-ref/nix-prefetch-url.md +++ b/doc/manual/source/command-ref/nix-prefetch-url.md @@ -76,11 +76,11 @@ $ 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/3x7dwzq014bblazs7kq20p9hyzz0qh8o-hello-2.10.tar.gz ``` ```console $ nix-prefetch-url --unpack --print-path https://github.com/NixOS/patchelf/archive/0.8.tar.gz 079agjlv0hrv7fxnx9ngipx14gyncbkllxrp9cccnh3a50fxcmy7 -/nix/store/19zrmhm3m40xxaw81c8cqm6aljgrnwj2-0.8.tar.gz +/nix/store/19zrmhm3m40xxaw81c8cqm6aljgrnwjo-0.8.tar.gz ``` 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 2ea90a13592..a028a8932f7 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/3x7dwzq014bblazs7kq20p9hyzz0qh8o-hello-2.10.tar.gz ``` diff --git a/doc/manual/source/command-ref/nix-store/add.md b/doc/manual/source/command-ref/nix-store/add.md index ab474072311..df5cca67e82 100644 --- a/doc/manual/source/command-ref/nix-store/add.md +++ b/doc/manual/source/command-ref/nix-store/add.md @@ -24,5 +24,5 @@ as symlinks with the same target. ```console $ nix-store --add ./foo.c -/nix/store/m7lrha58ph6rcnv109yzx1nk1cj7k7zf-foo.c +/nix/store/m7lrha58ph6rcnv109yzx1nk1cj7k7zo-foo.c ``` diff --git a/doc/manual/source/command-ref/nix-store/delete.md b/doc/manual/source/command-ref/nix-store/delete.md index 550c5ea2914..706e0cb4131 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/zq0h41l75vlb4z45kzgjjmsjxvcv1qko-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/zq0h41l75vlb4z45kzgjjmsjxvcv1qko-mesa-6.4' since it is still alive ``` diff --git a/doc/manual/source/command-ref/nix-store/gc.md b/doc/manual/source/command-ref/nix-store/gc.md index 8ec59d906c2..26359dd582e 100644 --- a/doc/manual/source/command-ref/nix-store/gc.md +++ b/doc/manual/source/command-ref/nix-store/gc.md @@ -62,7 +62,7 @@ To delete all unreachable paths, just do: ```console $ nix-store --gc -deleting `/nix/store/kq82idx6g0nyzsp2s14gfsc38npai7lf-cairo-1.0.4.tar.gz.drv' +deleting `/nix/store/kq82idx6g0nyzsp2s14gfsc38npai7lo-cairo-1.0.4.tar.gz.drv' ... 8825586 bytes freed (8.42 MiB) ``` diff --git a/doc/manual/source/command-ref/nix-store/optimise.md b/doc/manual/source/command-ref/nix-store/optimise.md index b257466b203..67fe488e3d6 100644 --- a/doc/manual/source/command-ref/nix-store/optimise.md +++ b/doc/manual/source/command-ref/nix-store/optimise.md @@ -32,7 +32,7 @@ Use `-vv` or `-vvv` to get some progress indication. ```console $ nix-store --optimise -hashing files in `/nix/store/qhqx7l2f1kmwihc9bnxs7rc159hsxnf3-gcc-4.1.1' +hashing files in `/nix/store/qhqx7l2f1kmwihc9bnxs7rc159hsxnfo-gcc-4.1.1' ... 541838819 bytes (516.74 MiB) freed by hard-linking 54143 files; there are 114486 files with equal contents out of 215894 files in total diff --git a/doc/manual/source/command-ref/nix-store/print-env.md b/doc/manual/source/command-ref/nix-store/print-env.md index bd2084ef66c..0e86b073db5 100644 --- a/doc/manual/source/command-ref/nix-store/print-env.md +++ b/doc/manual/source/command-ref/nix-store/print-env.md @@ -23,9 +23,9 @@ of the builder are placed in the variable `_args`. ```console $ nix-store --print-env $(nix-instantiate '' -A firefox) … -export src; src='/nix/store/plpj7qrwcz94z2psh6fchsi7s8yihc7k-firefox-12.0.source.tar.bz2' -export stdenv; stdenv='/nix/store/7c8asx3yfrg5dg1gzhzyq2236zfgibnn-stdenv' +export src; src='/nix/store/plpj7qrwcz94z2psh6fchsi7s8yihc7o-firefox-12.0.source.tar.bz2' +export stdenv; stdenv='/nix/store/7c8asx3yfrg5dg1gzhzyq2236zfgibno-stdenv' export system; system='x86_64-linux' -export _args; _args='-e /nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25c-default-builder.sh' +export _args; _args='-e /nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25o-default-builder.sh' ``` diff --git a/doc/manual/source/command-ref/nix-store/query.md b/doc/manual/source/command-ref/nix-store/query.md index 94eee05b8a8..3da25202441 100644 --- a/doc/manual/source/command-ref/nix-store/query.md +++ b/doc/manual/source/command-ref/nix-store/query.md @@ -182,8 +182,8 @@ current user environment: ```console $ nix-store --query --requisites $(which svn) -/nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4 -/nix/store/9lz9yc6zgmc0vlqmn2ipcpkjlmbi51vv-glibc-2.3.4 +/nix/store/5mbglq5ldqld8sj57273aljwkfvj22mo-subversion-1.1.4 +/nix/store/9lz9yc6zgmc0vlqmn2ipcpkjlmbi51vo-glibc-2.3.4 ... ``` @@ -191,9 +191,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/02iizgn86m42q905rddvg4ja975bk2io-grep-2.5.1.tar.bz2.drv +/nix/store/07a2bzxmzwz5hp58nf03pahrv2ygwgso-gcc-wrapper.sh +/nix/store/0ma7c9wsbaxahwwl04gbw3fcd806skio-glibc-2.3.4.drv ... lots of other paths ... ``` @@ -205,11 +205,11 @@ 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/7i5082kfb6yjbqdbiwdhhza0am2xvh6o-subversion-1.1.4.drv ++---/nix/store/d8afh10z72n8l1cr5w42366abiblgn5o-builder.sh ++---/nix/store/fmzxmpjx2lh849ph0l36snfj9zdibw6o-bash-3.0.drv +| +---/nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8ko-bash +| +---/nix/store/p3srsbd8dx44v2pg6nbnszab5mcwx03o-builder.sh ... ``` @@ -217,10 +217,10 @@ Show all paths that depend on the same OpenSSL library as `svn`: ```console $ nix-store --query --referrers $(nix-store --query --binding openssl $(nix-store --query --deriver $(which svn))) -/nix/store/23ny9l9wixx21632y2wi4p585qhva1q8-sylpheed-1.0.0 -/nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4 -/nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vy4-subversion-1.1.3 -/nix/store/l51240xqsgg8a7yrbqdx1rfzyv6l26fx-lynx-2.8.5 +/nix/store/23ny9l9wixx21632y2wi4p585qhva1qo-sylpheed-1.0.0 +/nix/store/5mbglq5ldqld8sj57273aljwkfvj22mo-subversion-1.1.4 +/nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vyo-subversion-1.1.3 +/nix/store/l51240xqsgg8a7yrbqdx1rfzyv6l26fo-lynx-2.8.5 ``` Show all paths that directly or indirectly depend on the Glibc (C @@ -228,8 +228,8 @@ library) used by `svn`: ```console $ nix-store --query --referrers-closure $(ldd $(which svn) | grep /libc.so | awk '{print $3}') -/nix/store/034a6h4vpz9kds5r6kzb9lhh81mscw43-libgnomeprintui-2.8.2 -/nix/store/15l3yi0d45prm7a82pcrknxdh6nzmxza-gawk-3.1.4 +/nix/store/034a6h4vpz9kds5r6kzb9lhh81mscw4o-libgnomeprintui-2.8.2 +/nix/store/15l3yi0d45prm7a82pcrknxdh6nzmxzo-gawk-3.1.4 ... ``` diff --git a/doc/manual/source/command-ref/nix-store/read-log.md b/doc/manual/source/command-ref/nix-store/read-log.md index d1ff17891b3..0ce3259ecc7 100644 --- a/doc/manual/source/command-ref/nix-store/read-log.md +++ b/doc/manual/source/command-ref/nix-store/read-log.md @@ -28,9 +28,9 @@ substitute, then the log is unavailable. ```console $ nix-store --read-log $(which ktorrent) -building /nix/store/dhc73pvzpnzxhdgpimsd9sw39di66ph1-ktorrent-2.2.1 +building /nix/store/dhc73pvzpnzxhdgpimsd9sw39di66pho-ktorrent-2.2.1 unpacking sources -unpacking source archive /nix/store/p8n1jpqs27mgkjw07pb5269717nzf5f8-ktorrent-2.2.1.tar.gz +unpacking source archive /nix/store/p8n1jpqs27mgkjw07pb5269717nzf5fo-ktorrent-2.2.1.tar.gz ktorrent-2.2.1/ ktorrent-2.2.1/NEWS ... diff --git a/doc/manual/source/command-ref/nix-store/realise.md b/doc/manual/source/command-ref/nix-store/realise.md index 240685ce5c7..c6720988df8 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/31axcgrlbfsxzmfff1gyj1bf62hvkbyo-aterm-2.3.1 ``` This is essentially what [`nix-build`](@docroot@/command-ref/nix-build.md) does. diff --git a/doc/manual/source/command-ref/nix-store/repair-path.md b/doc/manual/source/command-ref/nix-store/repair-path.md index 9c3d9f7cd29..2e776912c6e 100644 --- a/doc/manual/source/command-ref/nix-store/repair-path.md +++ b/doc/manual/source/command-ref/nix-store/repair-path.md @@ -23,12 +23,12 @@ substitutes are available, then repair is not possible. # Example ```console -$ nix-store --verify-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13 -path `/nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13' was modified! +$ nix-store --verify-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263po-glibc-2.13 +path `/nix/store/dj7a81wsm1ijwwpkks3725661h3263po-glibc-2.13' was modified! expected hash `2db57715ae90b7e31ff1f2ecb8c12ec1cc43da920efcbe3b22763f36a1861588', got `481c5aa5483ebc97c20457bb8bca24deea56550d3985cda0027f67fe54b808e4' -$ nix-store --repair-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13 +$ nix-store --repair-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263po-glibc-2.13 fetching path `/nix/store/d7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13'... … ``` diff --git a/doc/manual/source/glossary.md b/doc/manual/source/glossary.md index a54f0cbff75..f981a4f78ec 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/a040m110amc4h71lds2jmr8qrkj2jhxo-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 af2cb3521ab..09089cfa553 100644 --- a/doc/manual/source/introduction.md +++ b/doc/manual/source/introduction.md @@ -23,7 +23,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/b6gvzjyb2pg0kjfwrjmg1vfhh54ad73o-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/import-from-derivation.md b/doc/manual/source/language/import-from-derivation.md index f161c6fe391..84cb0b77cd9 100644 --- a/doc/manual/source/language/import-from-derivation.md +++ b/doc/manual/source/language/import-from-derivation.md @@ -49,7 +49,7 @@ nix-instantiate IFD.nix --eval --read-write-mode ``` ``` -building '/nix/store/348q1cal6sdgfxs8zqi9v8llrsn4kqkq-hello.drv'... +building '/nix/store/348q1cal6sdgfxs8zqi9v8llrsn4kqko-hello.drv'... "hello world" ``` diff --git a/doc/manual/source/language/string-context.md b/doc/manual/source/language/string-context.md index 65c59d865f0..5094da078eb 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/wkhdf9jinag5750mqlax6z2zbwhqb76o-hello-2.10") > ``` > evaluates to > ```nix > { - > "/nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10" = { + > "/nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76o-hello-2.10" = { > path = true; > }; > } @@ -59,13 +59,13 @@ String context elements come in different forms: > ```nix > builtins.getContext > (builtins.outputOf - > (builtins.storePath "/nix/store/fvchh9cvcr7kdla6n860hshchsba305w-hello-2.12.drv") + > (builtins.storePath "/nix/store/fvchh9cvcr7kdla6n860hshchsba305o-hello-2.12.drv") > "out") > ``` > evaluates to > ```nix > { - > "/nix/store/fvchh9cvcr7kdla6n860hshchsba305w-hello-2.12.drv" = { + > "/nix/store/fvchh9cvcr7kdla6n860hshchsba305o-hello-2.12.drv" = { > outputs = [ "out" ]; > }; > } @@ -88,12 +88,12 @@ String context elements come in different forms: > ```nix > builtins.getContext > (builtins.addDrvOutputDependencies - > (builtins.storePath "/nix/store/fvchh9cvcr7kdla6n860hshchsba305w-hello-2.12.drv")) + > (builtins.storePath "/nix/store/fvchh9cvcr7kdla6n860hshchsba305o-hello-2.12.drv")) > ``` > evaluates to > ```nix > { - > "/nix/store/fvchh9cvcr7kdla6n860hshchsba305w-hello-2.12.drv" = { + > "/nix/store/fvchh9cvcr7kdla6n860hshchsba305o-hello-2.12.drv" = { > allOutputs = true; > }; > } diff --git a/doc/manual/source/language/string-interpolation.md b/doc/manual/source/language/string-interpolation.md index 8e25d2b6311..3700d066eec 100644 --- a/doc/manual/source/language/string-interpolation.md +++ b/doc/manual/source/language/string-interpolation.md @@ -168,7 +168,7 @@ A path in an interpolated expression is first copied into the Nix store, and the > "${./foo}" > ``` > -> "/nix/store/2hhl2nz5v0khbn06ys82nrk99aa1xxdw-foo" +> "/nix/store/2hhl2nz5v0khbn06ys82nrk99aa1xxdo-foo" A derivation interpolates to the [store path] of its first [output](./derivations.md#attr-outputs). @@ -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/4xpfqf29z4m8vbhrqcz064wfmb46w5ro-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/package-management/profiles.md b/doc/manual/source/package-management/profiles.md index 1d9e672a8de..ce57d41915e 100644 --- a/doc/manual/source/package-management/profiles.md +++ b/doc/manual/source/package-management/profiles.md @@ -7,9 +7,9 @@ useful to know a bit about how Nix works. In Nix, packages are stored in unique locations in the *Nix store* (typically, `/nix/store`). For instance, a particular version of the Subversion package might be stored in a directory -`/nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vy4-subversion-1.1.3/`, while +`/nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vyo-subversion-1.1.3/`, while another version might be stored in -`/nix/store/5mq2jcn36ldlmh93yj1n8s9c95pj7c5s-subversion-1.1.2`. The long +`/nix/store/5mq2jcn36ldlmh93yj1n8s9c95pj7c5o-subversion-1.1.2`. The long strings prefixed to the directory names are cryptographic hashes (to be precise, 160-bit truncations of SHA-256 hashes encoded in a base-32 notation) of *all* inputs involved in building the package — sources, diff --git a/doc/manual/source/protocols/json/schema/derivation-v4.yaml b/doc/manual/source/protocols/json/schema/derivation-v4.yaml index 2b86f06b401..942f21cfe01 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" + > "47y241wqdhac3jm5l7nv0x4975mb197o-separate-debug-info.sh", + > "56d0w71pjj9bdr363ym3wj1zkwyqq97o-fix-pop-var-context-error.patch" > ] > ``` items: @@ -110,8 +110,8 @@ properties: > > ```json > "drvs": { - > "6lkh5yi7nlb7l6dr8fljlli5zfd9hq58-curl-7.73.0.drv": ["dev"], - > "fn3kgnfzl5dzym26j8g907gq3kbm8bfh-unzip-6.0.drv": ["out"] + > "6lkh5yi7nlb7l6dr8fljlli5zfd9hq5o-curl-7.73.0.drv": ["dev"], + > "fn3kgnfzl5dzym26j8g907gq3kbm8bfo-unzip-6.0.drv": ["out"] > } > ``` > @@ -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/r3j288vpmczbl500w6zz89gyfa4nr0bo-bash-4.4-p23/bin/bash`). args: type: array diff --git a/doc/manual/source/protocols/json/schema/store-path-v1.yaml b/doc/manual/source/protocols/json/schema/store-path-v1.yaml index 61653d60e21..aced62d0151 100644 --- a/doc/manual/source/protocols/json/schema/store-path-v1.yaml +++ b/doc/manual/source/protocols/json/schema/store-path-v1.yaml @@ -10,9 +10,9 @@ description: | Store paths in JSON are represented as strings containing just the hash and name portion, without the store directory prefix. - For example: `"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"` + For example: `"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"` - (If the store dir is `/nix/store`, then this corresponds to the path `/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv`.) + (If the store dir is `/nix/store`, then this corresponds to the path `/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv`.) ## Structure diff --git a/doc/manual/source/release-notes-determinate/rl-3.5.1.md b/doc/manual/source/release-notes-determinate/rl-3.5.1.md index b0813ca59c9..2ee665140d0 100644 --- a/doc/manual/source/release-notes-determinate/rl-3.5.1.md +++ b/doc/manual/source/release-notes-determinate/rl-3.5.1.md @@ -40,18 +40,18 @@ error: 1 dependencies of derivation '/nix/store/[...]-nested-failure-top.drv' fa Now: ``` -error: Cannot build '/nix/store/w37gflm9wz9dcnsgy3sfrmnlvm8qigaj-nested-failure-bottom.drv'. +error: Cannot build '/nix/store/w37gflm9wz9dcnsgy3sfrmnlvm8qigao-nested-failure-bottom.drv'. Reason: builder failed with exit code 1. Output paths: - /nix/store/yzybs8kp35dfipbzdlqcc6lxz62hax04-nested-failure-bottom -error: Cannot build '/nix/store/00gr5hlxfc03x2675w6nn3pwfrz2fr62-nested-failure-middle.drv'. + /nix/store/yzybs8kp35dfipbzdlqcc6lxz62hax0o-nested-failure-bottom +error: Cannot build '/nix/store/00gr5hlxfc03x2675w6nn3pwfrz2fr6o-nested-failure-middle.drv'. Reason: 1 dependency failed. Output paths: - /nix/store/h781j5h4bdchmb4c2lvy8qzh8733azhz-nested-failure-middle -error: Cannot build '/nix/store/8am0ng1gyx8sbzyr0yx6jd5ix3yy5szc-nested-failure-top.drv'. + /nix/store/h781j5h4bdchmb4c2lvy8qzh8733azho-nested-failure-middle +error: Cannot build '/nix/store/8am0ng1gyx8sbzyr0yx6jd5ix3yy5szo-nested-failure-top.drv'. Reason: 1 dependency failed. Output paths: - /nix/store/fh12637kgvp906s9yhi9w2dc7ghfwxs1-nested-failure-top + /nix/store/fh12637kgvp906s9yhi9w2dc7ghfwxso-nested-failure-top ``` **Full Changelog**: [v3.4.2...v3.5.1](https://github.com/DeterminateSystems/nix-src/compare/v3.4.2...v3.5.1) diff --git a/doc/manual/source/release-notes-determinate/rl-3.7.0.md b/doc/manual/source/release-notes-determinate/rl-3.7.0.md index 8e5fc9ca6a1..d05db015517 100644 --- a/doc/manual/source/release-notes-determinate/rl-3.7.0.md +++ b/doc/manual/source/release-notes-determinate/rl-3.7.0.md @@ -46,13 +46,13 @@ By @edolstra in [DeterminateSystems/nix-src#130](https://github.com/DeterminateS For example: ``` -error: Cannot delete path '/nix/store/6fcrjgfjip2ww3sx51rrmmghfsf60jvi-patchelf-0.14.3' +error: Cannot delete path '/nix/store/6fcrjgfjip2ww3sx51rrmmghfsf60jvo-patchelf-0.14.3' because it's referenced by the GC root '/home/eelco/Dev/nix-master/build/result'. -error: Cannot delete path '/nix/store/rn0qyn3kmky26xgpr2n10vr787g57lff-cowsay-3.8.4' +error: Cannot delete path '/nix/store/rn0qyn3kmky26xgpr2n10vr787g57lfo-cowsay-3.8.4' because it's referenced by the GC root '/proc/3600568/environ'. -error: Cannot delete path '/nix/store/klyng5rpdkwi5kbxkncy4gjwb490dlhb-foo.drv' +error: Cannot delete path '/nix/store/klyng5rpdkwi5kbxkncy4gjwb490dlho-foo.drv' because it's in use by '{nix-process:3605324}'. ``` diff --git a/doc/manual/source/release-notes-determinate/v3.14.0.md b/doc/manual/source/release-notes-determinate/v3.14.0.md index 4fd978b4970..21c3a2a9f01 100644 --- a/doc/manual/source/release-notes-determinate/v3.14.0.md +++ b/doc/manual/source/release-notes-determinate/v3.14.0.md @@ -9,19 +9,19 @@ Determinate Nix now features a `nix ps` command to summarize all of the active b ``` $ nix ps USER PID CPU DERIVATION/COMMAND -_nixbld1 30167 0.4s /nix/store/h431bcfml83czhpyzljhp9mw4yrq95vs-determinate-nix-manual-3.14.0.drv (wall=9s) -_nixbld1 30167 0.2s └───bash -e /nix/store/vj1c3wf9c11a0qs6p3ymfvrnsdgsdcbq-source-stdenv.sh /nix/store/shkw4qm9qcw5sc5n1k5jznc83ny02r39-default-builder.s +_nixbld1 30167 0.4s /nix/store/h431bcfml83czhpyzljhp9mw4yrq95vo-determinate-nix-manual-3.14.0.drv (wall=9s) +_nixbld1 30167 0.2s └───bash -e /nix/store/vj1c3wf9c11a0qs6p3ymfvrnsdgsdcbo-source-stdenv.sh /nix/store/shkw4qm9qcw5sc5n1k5jznc83ny02r3o-default-builder.s _nixbld1 30278 0.0s └───ninja -j14 -_nixbld1 30279 0.0s ├───/nix/store/v21kg4vm7yy0wflh0avkibz0shk86jn8-python3-3.12.11/bin/python3.12 /nix/store/lp001an6p80qx2fhdxgv5ysbn2iwj9pa-mes -_nixbld1 30286 0.0s │ └───/nix/store/z59zm01pjwzil2qkvv0s4ibk54risy9a-determinate-nix-3.14.0/bin/nix config show --json -_nixbld1 30280 0.0s ├───/nix/store/v21kg4vm7yy0wflh0avkibz0shk86jn8-python3-3.12.11/bin/python3.12 /nix/store/lp001an6p80qx2fhdxgv5ysbn2iwj9pa-mes -_nixbld1 30287 0.0s │ └───/nix/store/z59zm01pjwzil2qkvv0s4ibk54risy9a-determinate-nix-3.14.0/bin/nix __dump-language -_nixbld1 30281 0.0s ├───/nix/store/v21kg4vm7yy0wflh0avkibz0shk86jn8-python3-3.12.11/bin/python3.12 /nix/store/lp001an6p80qx2fhdxgv5ysbn2iwj9pa-mes -_nixbld1 30288 0.0s │ └───/nix/store/z59zm01pjwzil2qkvv0s4ibk54risy9a-determinate-nix-3.14.0/bin/nix __dump-cli -_nixbld1 30282 0.0s ├───/nix/store/v21kg4vm7yy0wflh0avkibz0shk86jn8-python3-3.12.11/bin/python3.12 /nix/store/lp001an6p80qx2fhdxgv5ysbn2iwj9pa-mes -_nixbld1 30284 0.0s │ └───/nix/store/z59zm01pjwzil2qkvv0s4ibk54risy9a-determinate-nix-3.14.0/bin/nix __dump-xp-features -_nixbld1 30283 0.0s └───/nix/store/v21kg4vm7yy0wflh0avkibz0shk86jn8-python3-3.12.11/bin/python3.12 /nix/store/lp001an6p80qx2fhdxgv5ysbn2iwj9pa-mes -_nixbld1 30285 0.0s └───/nix/store/5c8hb299k0acbypqw6j9m4znyd6b97cz-bash-5.2p37/bin/bash -euo pipefail -c if type -p build-release-notes > /de +_nixbld1 30279 0.0s ├───/nix/store/v21kg4vm7yy0wflh0avkibz0shk86jno-python3-3.12.11/bin/python3.12 /nix/store/lp001an6p80qx2fhdxgv5ysbn2iwj9po-mes +_nixbld1 30286 0.0s │ └───/nix/store/z59zm01pjwzil2qkvv0s4ibk54risy9o-determinate-nix-3.14.0/bin/nix config show --json +_nixbld1 30280 0.0s ├───/nix/store/v21kg4vm7yy0wflh0avkibz0shk86jno-python3-3.12.11/bin/python3.12 /nix/store/lp001an6p80qx2fhdxgv5ysbn2iwj9po-mes +_nixbld1 30287 0.0s │ └───/nix/store/z59zm01pjwzil2qkvv0s4ibk54risy9o-determinate-nix-3.14.0/bin/nix __dump-language +_nixbld1 30281 0.0s ├───/nix/store/v21kg4vm7yy0wflh0avkibz0shk86jno-python3-3.12.11/bin/python3.12 /nix/store/lp001an6p80qx2fhdxgv5ysbn2iwj9po-mes +_nixbld1 30288 0.0s │ └───/nix/store/z59zm01pjwzil2qkvv0s4ibk54risy9o-determinate-nix-3.14.0/bin/nix __dump-cli +_nixbld1 30282 0.0s ├───/nix/store/v21kg4vm7yy0wflh0avkibz0shk86jno-python3-3.12.11/bin/python3.12 /nix/store/lp001an6p80qx2fhdxgv5ysbn2iwj9po-mes +_nixbld1 30284 0.0s │ └───/nix/store/z59zm01pjwzil2qkvv0s4ibk54risy9o-determinate-nix-3.14.0/bin/nix __dump-xp-features +_nixbld1 30283 0.0s └───/nix/store/v21kg4vm7yy0wflh0avkibz0shk86jno-python3-3.12.11/bin/python3.12 /nix/store/lp001an6p80qx2fhdxgv5ysbn2iwj9po-mes +_nixbld1 30285 0.0s └───/nix/store/5c8hb299k0acbypqw6j9m4znyd6b97co-bash-5.2p37/bin/bash -euo pipefail -c if type -p build-release-notes > /de _nixbld1 30289 0.0s └───changelog-d ../source/release-notes/../../rl-next ``` @@ -42,11 +42,11 @@ Now, `nix build` and `nix profile` commands provide the specific output: ``` $ nix build .#oneFakeHash .#badSystem --keep-going ❌ git+file:///Users/grahamc/src/github.com/DeterminateSystems/samples#oneFakeHash -error: hash mismatch in fixed-output derivation '/nix/store/58pp1y74j4f5zxfq50xncv2wvnxf7w3y-one-fake-hash.drv': +error: hash mismatch in fixed-output derivation '/nix/store/58pp1y74j4f5zxfq50xncv2wvnxf7w3o-one-fake-hash.drv': specified: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= got: sha256-i7j83d71sibS/ssSjLJ5PMKmbhjAM+BHW0aElvkgEwY= ❌ git+file:///Users/grahamc/src/github.com/DeterminateSystems/samples#badSystem -error: Cannot build '/nix/store/5vsaxi730yl2icngkyvn8wiflik5wfmq-bad-system.drv'. +error: Cannot build '/nix/store/5vsaxi730yl2icngkyvn8wiflik5wfmo-bad-system.drv'. Reason: required system or feature not available Required system: 'bogus' with features {} Current system: 'aarch64-darwin' with features {apple-virt, benchmark, big-parallel, nixos-test} @@ -68,7 +68,7 @@ $ nix flake check ❓ checks.aarch64-darwin.badFeaturesNested (cancelled) ❓ checks.aarch64-darwin.failureNested (cancelled) ❌ checks.aarch64-darwin.badFeatures -error: Cannot build '/nix/store/sc1cyhrpsm9yjx55cl2zzyr5lypwigi6-bad-feature.drv'. +error: Cannot build '/nix/store/sc1cyhrpsm9yjx55cl2zzyr5lypwigio-bad-feature.drv'. Reason: required system or feature not available Required system: 'aarch64-darwin' with features {bogus} Current system: 'aarch64-darwin' with features {apple-virt, benchmark, big-parallel, nixos-test} diff --git a/doc/manual/source/release-notes/rl-0.12.md b/doc/manual/source/release-notes/rl-0.12.md index 3a4aba07d69..23d531292f1 100644 --- a/doc/manual/source/release-notes/rl-0.12.md +++ b/doc/manual/source/release-notes/rl-0.12.md @@ -75,12 +75,12 @@ instance, a build will show something like the following derivations will be built: - /nix/store/129sbxnk5n466zg6r1qmq1xjv9zymyy7-activate-configuration.sh.drv - /nix/store/7mzy971rdm8l566ch8hgxaf89x7lr7ik-upstart-jobs.drv + /nix/store/129sbxnk5n466zg6r1qmq1xjv9zymyyo-activate-configuration.sh.drv + /nix/store/7mzy971rdm8l566ch8hgxaf89x7lr7io-upstart-jobs.drv ... 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/4m8pvgy2dcjgppf5b4cj5l6wyshjhalo-samba-3.2.4 + /nix/store/7h1kwcj29ip8vk26rhmx6bfjraxp0g4o-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 5ba6e0e7217..8d76c136d0d 100644 --- a/doc/manual/source/release-notes/rl-0.8.md +++ b/doc/manual/source/release-notes/rl-0.8.md @@ -32,7 +32,7 @@ Nix 0.8 has the following improvements: - The cryptographic hashes used in store paths are now 160 bits long, but encoded in base-32 so that they are still only 32 characters long (e.g., - `/nix/store/csw87wag8bqlqk7ipllbwypb14xainap-atk-1.9.0`). (This is + `/nix/store/csw87wag8bqlqk7ipllbwypb14xainao-atk-1.9.0`). (This is actually a 160 bit truncation of a SHA-256 hash.) - Big cleanups and simplifications of the basic store semantics. The @@ -49,7 +49,7 @@ Nix 0.8 has the following improvements: built it (the “deriver”): $ nix-store -qR $(which firefox) - /nix/store/4b0jx7vq80l9aqcnkszxhymsf1ffa5jd-firefox-1.0.1.drv + /nix/store/4b0jx7vq80l9aqcnkszxhymsf1ffa5jo-firefox-1.0.1.drv So to see the build-time dependencies, you can do @@ -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/8lz9yc6zgmc0vlqmn2ipcpkjlmbi51vo-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 25cc5e0a5f3..bdb32c8e3ed 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/0i2jd68mp5g6h2sa5k9c85rb80sn8hio-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/0i2jd68mp5g6h2sa5k9c85rb80sn8hio-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 168708113ea..153963a7a0f 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/gzaflydcr6sb3567hap9q6srzx8ggdgo-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 e7e52631ba4..d06306ea41b 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/gzaflydcr6sb3567hap9q6srzx8ggdgo-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/gzaflydcr6sb3567hap9q6srzx8ggdgo-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 171dffb121d..16149804dbc 100644 --- a/doc/manual/source/release-notes/rl-2.19.md +++ b/doc/manual/source/release-notes/rl-2.19.md @@ -45,12 +45,12 @@ ```json5 [ { - "path": "/nix/store/8fv91097mbh5049i9rglc73dx6kjg3qk-bash-5.2-p15", + "path": "/nix/store/8fv91097mbh5049i9rglc73dx6kjg3qo-bash-5.2-p15", "valid": true, // ... }, { - "path": "/nix/store/wffw7l0alvs3iw94cbgi1gmmbmw99sqb-home-manager-path", + "path": "/nix/store/wffw7l0alvs3iw94cbgi1gmmbmw99sqo-home-manager-path", "valid": false } ] @@ -60,10 +60,10 @@ ```json5 { - "/nix/store/8fv91097mbh5049i9rglc73dx6kjg3qk-bash-5.2-p15": { + "/nix/store/8fv91097mbh5049i9rglc73dx6kjg3qo-bash-5.2-p15": { // ... }, - "/nix/store/wffw7l0alvs3iw94cbgi1gmmbmw99sqb-home-manager-path": null, + "/nix/store/wffw7l0alvs3iw94cbgi1gmmbmw99sqo-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 eb724f600aa..2738c244991 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/8rrzq23h2zq7sv5l2vhw44kls5w0f65o-source/lib/trivial.nix:26:5» "my-value" ``` diff --git a/doc/manual/source/release-notes/rl-2.21.md b/doc/manual/source/release-notes/rl-2.21.md index 75114f117aa..9d1a0f517f8 100644 --- a/doc/manual/source/release-notes/rl-2.21.md +++ b/doc/manual/source/release-notes/rl-2.21.md @@ -83,7 +83,7 @@ ``` 0: while evaluating the attribute 'python311.pythonForBuild.pkgs' - /nix/store/hg65h51xnp74ikahns9hyf3py5mlbbqq-source/overrides/default.nix:132:27 + /nix/store/hg65h51xnp74ikahns9hyf3py5mlbbqo-source/overrides/default.nix:132:27 131| 132| bootstrappingBase = pkgs.${self.python.pythonAttr}.pythonForBuild.pkgs; @@ -285,7 +285,7 @@ ``` 0: while evaluating the attribute 'python311.pythonForBuild.pkgs' - /nix/store/hg65h51xnp74ikahns9hyf3py5mlbbqq-source/overrides/default.nix:132:27 + /nix/store/hg65h51xnp74ikahns9hyf3py5mlbbqo-source/overrides/default.nix:132:27 131| 132| bootstrappingBase = pkgs.${self.python.pythonAttr}.pythonForBuild.pkgs; diff --git a/doc/manual/source/release-notes/rl-2.22.md b/doc/manual/source/release-notes/rl-2.22.md index c78d3d692af..8841f479bda 100644 --- a/doc/manual/source/release-notes/rl-2.22.md +++ b/doc/manual/source/release-notes/rl-2.22.md @@ -16,6 +16,6 @@ ```ShellSession $ nix eval nixpkgs#bash - «derivation /nix/store/m32cbgbd598f4w299g0hwyv7gbw6rqcg-bash-5.2p26.drv» + «derivation /nix/store/m32cbgbd598f4w299g0hwyv7gbw6rqco-bash-5.2p26.drv» ``` diff --git a/doc/manual/source/release-notes/rl-2.24.md b/doc/manual/source/release-notes/rl-2.24.md index f608fb54f7d..cf2267383e8 100644 --- a/doc/manual/source/release-notes/rl-2.24.md +++ b/doc/manual/source/release-notes/rl-2.24.md @@ -150,7 +150,7 @@ ``` 0: while evaluating the attribute 'python311.pythonForBuild.pkgs' - /nix/store/hg65h51xnp74ikahns9hyf3py5mlbbqq-source/overrides/default.nix:132:27 + /nix/store/hg65h51xnp74ikahns9hyf3py5mlbbqo-source/overrides/default.nix:132:27 131| 132| bootstrappingBase = pkgs.${self.python.pythonAttr}.pythonForBuild.pkgs; diff --git a/doc/manual/source/release-notes/rl-2.29.md b/doc/manual/source/release-notes/rl-2.29.md index b59d6d6f03f..f7ccaeafe89 100644 --- a/doc/manual/source/release-notes/rl-2.29.md +++ b/doc/manual/source/release-notes/rl-2.29.md @@ -100,10 +100,10 @@ This fact is counterbalanced by the fact that most of those changes are bug fixe ``` $ nix formatter build - /nix/store/cb9w44vkhk2x4adfxwgdkkf5gjmm856j-treefmt/bin/treefmt + /nix/store/cb9w44vkhk2x4adfxwgdkkf5gjmm856o-treefmt/bin/treefmt ``` - Note that unlike `nix build`, this prints the full path to the program, not just the store path (in the example above that would be `/nix/store/cb9w44vkhk2x4adfxwgdkkf5gjmm856j-treefmt`). + Note that unlike `nix build`, this prints the full path to the program, not just the store path (in the example above that would be `/nix/store/cb9w44vkhk2x4adfxwgdkkf5gjmm856o-treefmt`). - Amend OSC 8 escape stripping for xterm-style separator [#13109](https://github.com/NixOS/nix/pull/13109) diff --git a/doc/manual/source/release-notes/rl-2.4.md b/doc/manual/source/release-notes/rl-2.4.md index dbec5a29d28..d5beb915e9a 100644 --- a/doc/manual/source/release-notes/rl-2.4.md +++ b/doc/manual/source/release-notes/rl-2.4.md @@ -12,7 +12,7 @@ more than 2800 commits from 195 contributors since release 2.3. $ nix build error: undefined variable 'bzip3' - at /nix/store/449lv242z0zsgwv95a8124xi11sp419f-source/flake.nix:88:13: + at /nix/store/449lv242z0zsgwv95a8124xi11sp419o-source/flake.nix:88:13: 87| [ curl 88| bzip3 xz brotli editline diff --git a/doc/manual/source/store/derivation/index.md b/doc/manual/source/store/derivation/index.md index 3a14d06bcaf..52b9b30cb2d 100644 --- a/doc/manual/source/store/derivation/index.md +++ b/doc/manual/source/store/derivation/index.md @@ -232,13 +232,13 @@ If those other derivations *also* abide by this common case (and likewise for tr > **Example** > > ``` - > /nix/store/lxrn8v5aamkikg6agxwdqd1jz7746wz4-firefox-98.0.2.drv^out + > /nix/store/lxrn8v5aamkikg6agxwdqd1jz7746wzo-firefox-98.0.2.drv^out > ``` > > This parses like so: > > ``` - > /nix/store/lxrn8v5aamkikg6agxwdqd1jz7746wz4-firefox-98.0.2.drv^out + > /nix/store/lxrn8v5aamkikg6agxwdqd1jz7746wzo-firefox-98.0.2.drv^out > |------------------------------------------------------------| |-| > store path (usual encoding) output name > |--| @@ -301,7 +301,7 @@ The result of this is that it is possible to have a chain of `^` at > **Example** > > ``` -> /nix/store/lxrn8v5aamkikg6agxwdqd1jz7746wz4-firefox-98.0.2.drv^foo.drv^bar.drv^out +> /nix/store/lxrn8v5aamkikg6agxwdqd1jz7746wzo-firefox-98.0.2.drv^foo.drv^bar.drv^out > |----------------------------------------------------------------------------| |-| > inner deriving path (usual encoding) output name > |--------------------------------------------------------------------| |-----| diff --git a/doc/manual/source/store/store-path.md b/doc/manual/source/store/store-path.md index 4061f3653f6..bd4cdb25b36 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/a040m110amc4h71lds2jmr8qrkj2jhxo-git-2.38.1` > > A rendered store path @@ -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/b6gvzjyb2pg0kjfwrjmg1vfhh54ad73o-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 a35161ce8fa..2add1220277 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/a7gvj343m05j2s32xcnwr35v31ynlypo-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 00000000000..ab4cce0199a --- /dev/null +++ b/maintainers/invalidate-store-paths.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +set -euo pipefail + +# Nix base32 alphabet (no e, o, t, u) +HASH_CHARS='0123456789abcdfghijklmnpqrsvwxyz' + +git ls-files -z | +while IFS= read -r -d '' file; do + # Skip symlinks + if [ -L "$file" ]; then + continue + fi + + perl -pi -e ' + s{ + (['"$HASH_CHARS"']{31}) # prefix + first 31 hash chars + ['"$HASH_CHARS"'] # last hash char + - # hyphen + }{$1o-}gx + ' "$file" +done diff --git a/scripts/install-multi-user.sh b/scripts/install-multi-user.sh index 5ff760a6143..ed26d3fcac5 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/j8dbv5w6jl34caywh2ygdy88knx1mdfo-nix-2.3.6" +#readonly NIX_INSTALLED_CACERT="/nix/store/7dxhzymvy330i28ii676fl1pqwcahv2o-nss-cacert-3.49.2" EXTRACTED_NIX_PATH="$(dirname "$0")" readonly EXTRACTED_NIX_PATH diff --git a/src/libexpr-tests/json.cc b/src/libexpr-tests/json.cc index 31e7a18c5bd..089eea8a285 100644 --- a/src/libexpr-tests/json.cc +++ b/src/libexpr-tests/json.cc @@ -74,6 +74,6 @@ TEST_F(JSONValueTest, DISABLED_Path) { Value v; v.mkPath(state.rootPath(CanonPath("/test")), state.mem); - ASSERT_EQ(getJSONValue(v), "\"/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x\""); + ASSERT_EQ(getJSONValue(v), "\"/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-x\""); } } /* namespace nix */ diff --git a/src/libexpr-tests/nix_api_value.cc b/src/libexpr-tests/nix_api_value.cc index 830637f3ec5..89541b5b94c 100644 --- a/src/libexpr-tests/nix_api_value.cc +++ b/src/libexpr-tests/nix_api_value.cc @@ -112,7 +112,7 @@ TEST_F(nix_api_expr_test, nix_value_set_get_path_invalid) TEST_F(nix_api_expr_test, nix_value_set_get_path) { - const char * p = "/nix/store/40s0qmrfb45vlh6610rk29ym318dswdr-myname"; + const char * p = "/nix/store/40s0qmrfb45vlh6610rk29ym318dswdo-myname"; nix_init_path_string(ctx, state, value, p); ASSERT_STREQ(p, nix_get_path_string(ctx, value)); diff --git a/src/libexpr-tests/value/context.cc b/src/libexpr-tests/value/context.cc index fe3072b64ff..87a8f88fb1d 100644 --- a/src/libexpr-tests/value/context.cc +++ b/src/libexpr-tests/value/context.cc @@ -41,7 +41,7 @@ TEST(NixStringContextElemTest, slash_invalid) */ TEST(NixStringContextElemTest, opaque) { - std::string_view opaque = "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x"; + std::string_view opaque = "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-x"; auto elem = NixStringContextElem::parse(opaque); auto * p = std::get_if(&elem.raw); ASSERT_TRUE(p); @@ -55,7 +55,7 @@ TEST(NixStringContextElemTest, opaque) */ TEST(NixStringContextElemTest, drvDeep) { - std::string_view drvDeep = "=g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x.drv"; + std::string_view drvDeep = "=g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-x.drv"; auto elem = NixStringContextElem::parse(drvDeep); auto * p = std::get_if(&elem.raw); ASSERT_TRUE(p); @@ -69,7 +69,7 @@ TEST(NixStringContextElemTest, drvDeep) */ TEST(NixStringContextElemTest, built_opaque) { - std::string_view built = "!foo!g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x.drv"; + std::string_view built = "!foo!g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-x.drv"; auto elem = NixStringContextElem::parse(built); auto * p = std::get_if(&elem.raw); ASSERT_TRUE(p); @@ -95,7 +95,7 @@ TEST(NixStringContextElemTest, built_built) ExperimentalFeatureSettings mockXpSettings; mockXpSettings.set("experimental-features", "dynamic-derivations ca-derivations"); - std::string_view built = "!foo!bar!g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x.drv"; + std::string_view built = "!foo!bar!g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-x.drv"; auto elem = NixStringContextElem::parse(built, mockXpSettings); auto * p = std::get_if(&elem.raw); ASSERT_TRUE(p); @@ -118,7 +118,7 @@ TEST(NixStringContextElemTest, built_built) TEST(NixStringContextElemTest, built_built_xp) { ASSERT_THROW( - NixStringContextElem::parse("!foo!bar!g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x.drv"), MissingExperimentalFeature); + NixStringContextElem::parse("!foo!bar!g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-x.drv"), MissingExperimentalFeature); } #ifndef COVERAGE diff --git a/src/libexpr/primops/context.cc b/src/libexpr/primops/context.cc index d4824d9b9e5..e4df8aa55be 100644 --- a/src/libexpr/primops/context.cc +++ b/src/libexpr/primops/context.cc @@ -267,7 +267,7 @@ static RegisterPrimOp primop_getContext( evaluates to ``` - { "/nix/store/arhvjaf6zmlyn8vh8fgn55rpwnxq0n7l-a.drv" = { outputs = [ "out" ]; }; } + { "/nix/store/arhvjaf6zmlyn8vh8fgn55rpwnxq0n7o-a.drv" = { outputs = [ "out" ]; }; } ``` )", .fun = prim_getContext}); diff --git a/src/libexpr/primops/fetchClosure.cc b/src/libexpr/primops/fetchClosure.cc index c74d02b0069..65acffef208 100644 --- a/src/libexpr/primops/fetchClosure.cc +++ b/src/libexpr/primops/fetchClosure.cc @@ -228,7 +228,7 @@ static RegisterPrimOp primop_fetchClosure({ ```nix builtins.fetchClosure { fromStore = "https://cache.nixos.org"; - fromPath = /nix/store/ldbhlwhh39wha58rm61bkiiwm6j7211j-git-2.33.1; + fromPath = /nix/store/ldbhlwhh39wha58rm61bkiiwm6j7211o-git-2.33.1; } ``` @@ -243,8 +243,8 @@ static RegisterPrimOp primop_fetchClosure({ ```nix builtins.fetchClosure { fromStore = "https://cache.nixos.org"; - fromPath = /nix/store/r2jd6ygnmirm2g803mksqqjm4y39yi6i-git-2.33.1; - toPath = /nix/store/ldbhlwhh39wha58rm61bkiiwm6j7211j-git-2.33.1; + fromPath = /nix/store/r2jd6ygnmirm2g803mksqqjm4y39yi6o-git-2.33.1; + toPath = /nix/store/ldbhlwhh39wha58rm61bkiiwm6j7211o-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/r2jd6ygnmirm2g803mksqqjm4y39yi6o-git-2.33.1 + rewrote '/nix/store/r2jd6ygnmirm2g803mksqqjm4y39yi6o-git-2.33.1' to '/nix/store/ldbhlwhh39wha58rm61bkiiwm6j7211o-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/r2jd6ygnmirm2g803mksqqjm4y39yi6o-git-2.33.1; inputAddressed = true; } ``` diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc index dda81b9d328..8a0e1a02a96 100644 --- a/src/libexpr/primops/fetchTree.cc +++ b/src/libexpr/primops/fetchTree.cc @@ -323,7 +323,7 @@ static RegisterPrimOp primop_fetchTree({ > lastModified = 1686503798; > lastModifiedDate = "20230611171638"; > narHash = "sha256-rA9RqKP9OlBrgGCPvfd5HVAXDOy8k2SmPtB/ijShNXc="; - > outPath = "/nix/store/l5m6qlvfs9sdw14ja3qbzpglcjlb6j1x-source"; + > outPath = "/nix/store/l5m6qlvfs9sdw14ja3qbzpglcjlb6j1o-source"; > rev = "ae2e6b3958682513d28f7d633734571fb18285dd"; > shortRev = "ae2e6b3"; > } diff --git a/src/libstore-tests/build-result.cc b/src/libstore-tests/build-result.cc index 85e799c2a73..4b5c0ed5fb9 100644 --- a/src/libstore-tests/build-result.cc +++ b/src/libstore-tests/build-result.cc @@ -75,7 +75,7 @@ INSTANTIATE_TEST_SUITE_P( "foo", { { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, DrvOutput{ .drvHash = Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), @@ -87,7 +87,7 @@ INSTANTIATE_TEST_SUITE_P( "bar", { { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar"}, }, DrvOutput{ .drvHash = Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), diff --git a/src/libstore-tests/common-protocol.cc b/src/libstore-tests/common-protocol.cc index fa676eb7f4e..6d5e67cc575 100644 --- a/src/libstore-tests/common-protocol.cc +++ b/src/libstore-tests/common-protocol.cc @@ -80,8 +80,8 @@ CHARACTERIZATION_TEST( storePath, "store-path", (std::tuple{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar"}, })) CHARACTERIZATION_TEST( @@ -122,7 +122,7 @@ CHARACTERIZATION_TEST( (std::tuple{ Realisation{ { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, { .drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="), @@ -131,7 +131,7 @@ CHARACTERIZATION_TEST( }, Realisation{ { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, .signatures = {"asdf", "qwer"}, }, { @@ -147,7 +147,7 @@ CHARACTERIZATION_TEST( (std::tuple{ Realisation{ { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, .signatures = {"asdf", "qwer"}, .dependentRealisations = { @@ -156,7 +156,7 @@ CHARACTERIZATION_TEST( .drvHash = Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), .outputName = "quux", }, - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, }, }, @@ -197,7 +197,7 @@ CHARACTERIZATION_TEST( (std::tuple, std::optional>{ std::nullopt, std::optional{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar"}, }, })) diff --git a/src/libstore-tests/data/build-result/success.json b/src/libstore-tests/data/build-result/success.json index 4baadb54775..e0de4684475 100644 --- a/src/libstore-tests/data/build-result/success.json +++ b/src/libstore-tests/data/build-result/success.json @@ -3,13 +3,13 @@ "bar": { "dependentRealisations": {}, "id": "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!bar", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", "signatures": [] }, "foo": { "dependentRealisations": {}, "id": "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!foo", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [] } }, diff --git a/src/libstore-tests/data/common-protocol/optional-store-path.bin b/src/libstore-tests/data/common-protocol/optional-store-path.bin index 4fbca5576b6..170332c83e7 100644 Binary files a/src/libstore-tests/data/common-protocol/optional-store-path.bin and b/src/libstore-tests/data/common-protocol/optional-store-path.bin differ diff --git a/src/libstore-tests/data/common-protocol/optional-store-path.json b/src/libstore-tests/data/common-protocol/optional-store-path.json index 58519a4d2c4..28672167f55 100644 --- a/src/libstore-tests/data/common-protocol/optional-store-path.json +++ b/src/libstore-tests/data/common-protocol/optional-store-path.json @@ -1,4 +1,4 @@ [ null, - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar" ] diff --git a/src/libstore-tests/data/common-protocol/realisation-with-deps.bin b/src/libstore-tests/data/common-protocol/realisation-with-deps.bin index 54a78b64ebc..1dc2c43d004 100644 Binary files a/src/libstore-tests/data/common-protocol/realisation-with-deps.bin and b/src/libstore-tests/data/common-protocol/realisation-with-deps.bin differ diff --git a/src/libstore-tests/data/common-protocol/realisation-with-deps.json b/src/libstore-tests/data/common-protocol/realisation-with-deps.json index 77148d14ca4..413467866e3 100644 --- a/src/libstore-tests/data/common-protocol/realisation-with-deps.json +++ b/src/libstore-tests/data/common-protocol/realisation-with-deps.json @@ -1,10 +1,10 @@ [ { "dependentRealisations": { - "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!quux": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo" + "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!quux": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo" }, "id": "sha256:15e3c560894cbb27085cf65b5a2ecb18488c999497f4531b6907a7581ce6d527!baz", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [ "asdf", "qwer" diff --git a/src/libstore-tests/data/common-protocol/realisation.bin b/src/libstore-tests/data/common-protocol/realisation.bin index 3a0b2b2d8e3..9539b503f85 100644 Binary files a/src/libstore-tests/data/common-protocol/realisation.bin and b/src/libstore-tests/data/common-protocol/realisation.bin differ diff --git a/src/libstore-tests/data/common-protocol/realisation.json b/src/libstore-tests/data/common-protocol/realisation.json index f9ff09dbb63..f1c5f2bbd61 100644 --- a/src/libstore-tests/data/common-protocol/realisation.json +++ b/src/libstore-tests/data/common-protocol/realisation.json @@ -2,13 +2,13 @@ { "dependentRealisations": {}, "id": "sha256:15e3c560894cbb27085cf65b5a2ecb18488c999497f4531b6907a7581ce6d527!baz", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [] }, { "dependentRealisations": {}, "id": "sha256:15e3c560894cbb27085cf65b5a2ecb18488c999497f4531b6907a7581ce6d527!baz", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [ "asdf", "qwer" diff --git a/src/libstore-tests/data/common-protocol/store-path.bin b/src/libstore-tests/data/common-protocol/store-path.bin index 3fc05f2981d..b7e67b84933 100644 Binary files a/src/libstore-tests/data/common-protocol/store-path.bin and b/src/libstore-tests/data/common-protocol/store-path.bin differ diff --git a/src/libstore-tests/data/common-protocol/store-path.json b/src/libstore-tests/data/common-protocol/store-path.json index 16459245be8..666b85c0979 100644 --- a/src/libstore-tests/data/common-protocol/store-path.json +++ b/src/libstore-tests/data/common-protocol/store-path.json @@ -1,4 +1,4 @@ [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar" ] diff --git a/src/libstore-tests/data/derivation/bad-old-version-dyn-deps.drv b/src/libstore-tests/data/derivation/bad-old-version-dyn-deps.drv index 3cd1ded029d..5e97c9e10bf 100644 --- a/src/libstore-tests/data/derivation/bad-old-version-dyn-deps.drv +++ b/src/libstore-tests/data/derivation/bad-old-version-dyn-deps.drv @@ -1 +1 @@ -Derive([],[("/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep2.drv",(["cat","dog"],[("cat",["kitten"]),("goose",["gosling"])]))],["/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1"],"wasm-sel4","foo",["bar","baz"],[("BIG_BAD","WOLF")]) \ No newline at end of file +Derive([],[("/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep2.drv",(["cat","dog"],[("cat",["kitten"]),("goose",["gosling"])]))],["/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep1"],"wasm-sel4","foo",["bar","baz"],[("BIG_BAD","WOLF")]) \ No newline at end of file diff --git a/src/libstore-tests/data/derivation/bad-version.drv b/src/libstore-tests/data/derivation/bad-version.drv index bbf75c114de..bbda8ea90e2 100644 --- a/src/libstore-tests/data/derivation/bad-version.drv +++ b/src/libstore-tests/data/derivation/bad-version.drv @@ -1 +1 @@ -DrvWithVersion("invalid-version",[],[("/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep2.drv",["cat","dog"])],["/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1"],"wasm-sel4","foo",["bar","baz"],[("BIG_BAD","WOLF")]) \ No newline at end of file +DrvWithVersion("invalid-version",[],[("/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep2.drv",["cat","dog"])],["/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep1"],"wasm-sel4","foo",["bar","baz"],[("BIG_BAD","WOLF")]) \ No newline at end of file diff --git a/src/libstore-tests/data/derivation/ca/advanced-attributes-structured-attrs.json b/src/libstore-tests/data/derivation/ca/advanced-attributes-structured-attrs.json index 95122ad4184..717a2e56bce 100644 --- a/src/libstore-tests/data/derivation/ca/advanced-attributes-structured-attrs.json +++ b/src/libstore-tests/data/derivation/ca/advanced-attributes-structured-attrs.json @@ -11,14 +11,14 @@ }, "inputs": { "drvs": { - "j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv": { + "j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv": { "dynamicOutputs": {}, "outputs": [ "dev", "out" ] }, - "qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv": { + "qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv": { "dynamicOutputs": {}, "outputs": [ "dev", @@ -27,7 +27,7 @@ } }, "srcs": [ - "qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv" + "qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv" ] }, "name": "advanced-attributes-structured-attrs", @@ -59,7 +59,7 @@ "/164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9" ], "refs2": [ - "/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv" + "/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv" ] }, "impureEnvVars": [ diff --git a/src/libstore-tests/data/derivation/ca/advanced-attributes.json b/src/libstore-tests/data/derivation/ca/advanced-attributes.json index 6b77459bcb7..9c93c3353c2 100644 --- a/src/libstore-tests/data/derivation/ca/advanced-attributes.json +++ b/src/libstore-tests/data/derivation/ca/advanced-attributes.json @@ -15,7 +15,7 @@ "builder": "/bin/bash", "disallowedReferences": "/0nyw57wm2iicnm9rglvjmbci3ikmcp823czdqdzdcgsnnwqps71g dev", "disallowedRequisites": "/07f301yqyz8c6wf6bbbavb2q39j4n8kmcly1s09xadyhgy6x2wr8", - "exportReferencesGraph": "refs1 /164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9 refs2 /nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv", + "exportReferencesGraph": "refs1 /164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9 refs2 /nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv", "impureEnvVars": "UNICORN", "name": "advanced-attributes", "out": "/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9", @@ -27,14 +27,14 @@ }, "inputs": { "drvs": { - "j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv": { + "j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv": { "dynamicOutputs": {}, "outputs": [ "dev", "out" ] }, - "qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv": { + "qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv": { "dynamicOutputs": {}, "outputs": [ "dev", @@ -43,7 +43,7 @@ } }, "srcs": [ - "qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv" + "qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv" ] }, "name": "advanced-attributes", diff --git a/src/libstore-tests/data/derivation/ca/derivation-options/all_set.json b/src/libstore-tests/data/derivation/ca/derivation-options/all_set.json index 8086c752ca0..e881c252d5b 100644 --- a/src/libstore-tests/data/derivation/ca/derivation-options/all_set.json +++ b/src/libstore-tests/data/derivation/ca/derivation-options/all_set.json @@ -5,12 +5,12 @@ "exportReferencesGraph": { "refs1": [ { - "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv", + "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv", "output": "out" } ], "refs2": [ - "qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv" + "qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv" ] }, "impureEnvVars": [ @@ -24,7 +24,7 @@ "forAllOutputs": { "allowedReferences": [ { - "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv", + "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv", "output": "out" } ], @@ -34,7 +34,7 @@ "output": "bin" }, { - "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv", + "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv", "output": "dev" } ], @@ -44,13 +44,13 @@ "output": "dev" }, { - "drvPath": "qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv", + "drvPath": "qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv", "output": "out" } ], "disallowedRequisites": [ { - "drvPath": "qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv", + "drvPath": "qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv", "output": "dev" } ], diff --git a/src/libstore-tests/data/derivation/ca/derivation-options/structuredAttrs_all_set.json b/src/libstore-tests/data/derivation/ca/derivation-options/structuredAttrs_all_set.json index e29447b6a47..920d2b4bde2 100644 --- a/src/libstore-tests/data/derivation/ca/derivation-options/structuredAttrs_all_set.json +++ b/src/libstore-tests/data/derivation/ca/derivation-options/structuredAttrs_all_set.json @@ -5,12 +5,12 @@ "exportReferencesGraph": { "refs1": [ { - "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv", + "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv", "output": "out" } ], "refs2": [ - "qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv" + "qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv" ] }, "impureEnvVars": [ @@ -31,13 +31,13 @@ "output": "dev" }, { - "drvPath": "qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv", + "drvPath": "qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv", "output": "out" } ], "disallowedRequisites": [ { - "drvPath": "qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv", + "drvPath": "qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv", "output": "dev" } ], @@ -57,7 +57,7 @@ "out": { "allowedReferences": [ { - "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv", + "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv", "output": "out" } ], @@ -67,7 +67,7 @@ "output": "bin" }, { - "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv", + "drvPath": "j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv", "output": "dev" } ], diff --git a/src/libstore-tests/data/derivation/dyn-dep-derivation.drv b/src/libstore-tests/data/derivation/dyn-dep-derivation.drv index cfffe48ec90..7e63276fcdc 100644 --- a/src/libstore-tests/data/derivation/dyn-dep-derivation.drv +++ b/src/libstore-tests/data/derivation/dyn-dep-derivation.drv @@ -1 +1 @@ -DrvWithVersion("xp-dyn-drv",[],[("/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep2.drv",(["cat","dog"],[("cat",["kitten"]),("goose",["gosling"])]))],["/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1"],"wasm-sel4","foo",["bar","baz"],[("BIG_BAD","WOLF")]) \ No newline at end of file +DrvWithVersion("xp-dyn-drv",[],[("/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep2.drv",(["cat","dog"],[("cat",["kitten"]),("goose",["gosling"])]))],["/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep1"],"wasm-sel4","foo",["bar","baz"],[("BIG_BAD","WOLF")]) \ No newline at end of file diff --git a/src/libstore-tests/data/derivation/dyn-dep-derivation.json b/src/libstore-tests/data/derivation/dyn-dep-derivation.json index 1793c5f2d1e..e292db97187 100644 --- a/src/libstore-tests/data/derivation/dyn-dep-derivation.json +++ b/src/libstore-tests/data/derivation/dyn-dep-derivation.json @@ -9,7 +9,7 @@ }, "inputs": { "drvs": { - "c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep2.drv": { + "c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep2.drv": { "dynamicOutputs": { "cat": { "dynamicOutputs": {}, @@ -31,7 +31,7 @@ } }, "srcs": [ - "c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1" + "c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep1" ] }, "name": "dyn-dep-derivation", diff --git a/src/libstore-tests/data/derivation/firefox.drv b/src/libstore-tests/data/derivation/firefox.drv index d746d21e83c..be5d00ac730 100644 --- a/src/libstore-tests/data/derivation/firefox.drv +++ b/src/libstore-tests/data/derivation/firefox.drv @@ -1 +1 @@ -Derive([("out","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-140.0.4","","")],[("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-krb5-1.21.3.drv",["lib"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libglvnd-1.7.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-make-shell-wrapper-hook.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libva-2.22.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-policies.json.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-extract-binary-wrapper-cmd.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pipewire-1.4.6.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-alsa-lib-1.2.14.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-ffmpeg-7.1.1.drv",["lib"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-mesa-libgbm-25.1.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-vulkan-loader-1.4.313.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-speech-dispatcher-0.12.1.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pciutils-3.14.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-xdg-utils-1.2.1.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-cups-2.4.12.drv",["lib"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libnotify-0.8.6.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox.desktop.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-jq-1.8.1.drv",["dev"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libXScrnSaver-1.2.4.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-lndir-1.0.5.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-sndio-1.10.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libpulseaudio-17.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-systemd-minimal-libs-257.6.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bash-5.2p37.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-stdenv-linux.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-gtk+3-3.24.49.drv",["dev"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libjack2-1.9.22.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-adwaita-icon-theme-48.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libcanberra-0.30.drv",["out"])],["/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-default-builder.sh","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-source-stdenv.sh"],"x86_64-linux","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bash-5.2p37/bin/bash",["-e","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-source-stdenv.sh","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-default-builder.sh"],[("__json","{\"NIX_MAIN_PROGRAM\":\"firefox\",\"buildCommand\":\"if [ ! -x \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4/bin/firefox\\\" ]\\nthen\\n echo \\\"cannot find executable file \\\\`/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4/bin/firefox'\\\"\\n exit 1\\nfi\\n\\n#########################\\n# #\\n# EXTRA PREF CHANGES #\\n# #\\n#########################\\n# Link the runtime. The executable itself has to be copied,\\n# because it will resolve paths relative to its true location.\\n# Any symbolic links have to be replicated as well.\\ncd \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4\\\"\\nfind . -type d -exec mkdir -p \\\"$out\\\"/{} \\\\;\\n\\nfind . -type f \\\\( -not -name \\\"firefox\\\" \\\\) -exec ln -sT \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4\\\"/{} \\\"$out\\\"/{} \\\\;\\n\\nfind . -type f \\\\( -name \\\"firefox\\\" -o -name \\\"firefox-bin\\\" \\\\) -print0 | while read -d $'\\\\0' f; do\\n cp -P --no-preserve=mode,ownership --remove-destination \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4/$f\\\" \\\"$out/$f\\\"\\n chmod a+rwx \\\"$out/$f\\\"\\ndone\\n\\n# fix links and absolute references\\n\\nfind . -type l -print0 | while read -d $'\\\\0' l; do\\n target=\\\"$(readlink \\\"$l\\\")\\\"\\n target=${target/#\\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4\\\"/\\\"$out\\\"}\\n ln -sfT \\\"$target\\\" \\\"$out/$l\\\"\\ndone\\n\\ncd \\\"$out\\\"\\n\\n\\n# create the wrapper\\n\\nexecutablePrefix=\\\"$out/bin\\\"\\nexecutablePath=\\\"$out/bin/firefox\\\"\\noldWrapperArgs=()\\n\\nif [[ -L $executablePath ]]; then\\n # Symbolic link: wrap the link's target.\\n oldExe=\\\"$(readlink -v --canonicalize-existing \\\"$executablePath\\\")\\\"\\n rm \\\"$executablePath\\\"\\nelif wrapperCmd=$(/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-extract-binary-wrapper-cmd \\\"$executablePath\\\"); [[ $wrapperCmd ]]; then\\n # If the executable is a binary wrapper, we need to update its target to\\n # point to $out, but we can't just edit the binary in-place because of length\\n # issues. So we extract the command used to create the wrapper and add the\\n # arguments to our wrapper.\\n parseMakeCWrapperCall() {\\n shift # makeCWrapper\\n oldExe=$1; shift\\n oldWrapperArgs=(\\\"$@\\\")\\n }\\n eval \\\"parseMakeCWrapperCall ${wrapperCmd//\\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4\\\"/\\\"$out\\\"}\\\"\\n rm \\\"$executablePath\\\"\\nelse\\n if read -rn2 shebang < \\\"$executablePath\\\" && [[ $shebang == '#!' ]]; then\\n # Shell wrapper: patch in place to point to $out.\\n sed -i \\\"s@/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4@$out@g\\\" \\\"$executablePath\\\"\\n fi\\n # Suffix the executable with -old, because -wrapped might already be used by the old wrapper.\\n oldExe=\\\"$executablePrefix/.firefox\\\"-old\\n mv \\\"$executablePath\\\" \\\"$oldExe\\\"\\nfi\\nappendToVar makeWrapperArgs --prefix XDG_DATA_DIRS : \\\"$GSETTINGS_SCHEMAS_PATH\\\"\\nconcatTo makeWrapperArgs oldWrapperArgs\\n\\nmakeWrapper \\\"$oldExe\\\" \\\"$out/bin/firefox\\\" \\\"${makeWrapperArgs[@]}\\\"\\n\\n#############################\\n# #\\n# END EXTRA PREF CHANGES #\\n# #\\n#############################\\nif [ -e \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4/share/icons\\\" ]; then\\n mkdir -p \\\"$out/share\\\"\\n ln -s \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4/share/icons\\\" \\\"$out/share/icons\\\"\\nelse\\n for res in 16 32 48 64 128; do\\n mkdir -p \\\"$out/share/icons/hicolor/${res}x${res}/apps\\\"\\n icon=$( find \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-unwrapped-140.0.4/lib/\\\" -name \\\"default${res}.png\\\" )\\n if [ -e \\\"$icon\\\" ]; then ln -s \\\"$icon\\\" \\\\\\n \\\"$out/share/icons/hicolor/${res}x${res}/apps/firefox.png\\\"\\n fi\\n done\\nfi\\n\\ninstall -m 644 -D -t $out/share/applications $desktopItem/share/applications/*\\n\\nmkdir -p $out/lib/mozilla/native-messaging-hosts\\nfor ext in ; do\\n ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/*\\ndone\\n\\nmkdir -p $out/lib/mozilla/pkcs11-modules\\nfor ext in ; do\\n ln -sLt $out/lib/mozilla/pkcs11-modules $ext/lib/mozilla/pkcs11-modules/*\\ndone\\n\\n\\n#########################\\n# #\\n# EXTRA PREF CHANGES #\\n# #\\n#########################\\n# user customization\\nlibDir=\\\"$out/lib/firefox\\\"\\n\\n# creating policies.json\\nmkdir -p \\\"$libDir/distribution\\\"\\n\\nPOL_PATH=\\\"$libDir/distribution/policies.json\\\"\\nrm -f \\\"$POL_PATH\\\"\\ncat /nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-policies.json >> \\\"$POL_PATH\\\"\\n\\nextraPoliciesFiles=()\\nfor extraPoliciesFile in \\\"${extraPoliciesFiles[@]}\\\"; do\\n jq -s '.[0] * .[1]' $extraPoliciesFile \\\"$POL_PATH\\\" > .tmp.json\\n mv .tmp.json \\\"$POL_PATH\\\"\\ndone\\n\\n# preparing for autoconfig\\nprefsDir=\\\"$out/lib/firefox/defaults/pref\\\"\\nmkdir -p \\\"$prefsDir\\\"\\n\\necho 'pref(\\\"general.config.filename\\\", \\\"mozilla.cfg\\\");' > \\\"$prefsDir/autoconfig.js\\\"\\necho 'pref(\\\"general.config.obscure_value\\\", 0);' >> \\\"$prefsDir/autoconfig.js\\\"\\n\\ncat > \\\"$libDir/mozilla.cfg\\\" << EOF\\n// First line must be a comment\\n\\n// Disables addon signature checking\\n// to be able to install addons that do not have an extid\\n// Security is maintained because only user whitelisted addons\\n// with a checksum can be installed\\n\\n\\nEOF\\n\\nextraPrefsFiles=()\\nfor extraPrefsFile in \\\"${extraPrefsFiles[@]}\\\"; do\\n cat \\\"$extraPrefsFile\\\" >> \\\"$libDir/mozilla.cfg\\\"\\ndone\\n\\ncat >> \\\"$libDir/mozilla.cfg\\\" << EOF\\n\\nEOF\\n\\nmkdir -p \\\"$libDir/distribution/extensions\\\"\\n\\n#############################\\n# #\\n# END EXTRA PREF CHANGES #\\n# #\\n#############################\\n\",\"buildInputs\":[\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-gtk+3-3.24.49-dev\"],\"builder\":\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bash-5.2p37/bin/bash\",\"cmakeFlags\":[],\"configureFlags\":[],\"depsBuildBuild\":[],\"depsBuildBuildPropagated\":[],\"depsBuildTarget\":[],\"depsBuildTargetPropagated\":[],\"depsHostHost\":[],\"depsHostHostPropagated\":[],\"depsTargetTarget\":[],\"depsTargetTargetPropagated\":[],\"desktopItem\":\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox.desktop\",\"doCheck\":false,\"doInstallCheck\":false,\"env\":{\"NIX_MAIN_PROGRAM\":\"firefox\"},\"gtk_modules\":[\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libcanberra-0.30/lib/gtk-3.0/\"],\"libs\":\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-systemd-minimal-libs-257.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libva-2.22.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-mesa-libgbm-25.1.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libnotify-0.8.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libXScrnSaver-1.2.4/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-cups-2.4.12-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pciutils-3.14.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-vulkan-loader-1.4.313.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-speech-dispatcher-0.12.1/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pipewire-1.4.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-ffmpeg-7.1.1-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-krb5-1.21.3-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libglvnd-1.7.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libpulseaudio-17.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-alsa-lib-1.2.14/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-sndio-1.10.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libjack2-1.9.22/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libcanberra-0.30/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-systemd-minimal-libs-257.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libva-2.22.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-mesa-libgbm-25.1.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libnotify-0.8.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libXScrnSaver-1.2.4/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-cups-2.4.12-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pciutils-3.14.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-vulkan-loader-1.4.313.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-speech-dispatcher-0.12.1/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pipewire-1.4.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-ffmpeg-7.1.1-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-krb5-1.21.3-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libglvnd-1.7.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libpulseaudio-17.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-alsa-lib-1.2.14/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-sndio-1.10.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libjack2-1.9.22/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libcanberra-0.30/lib64\",\"makeWrapperArgs\":[\"--prefix\",\"LD_LIBRARY_PATH\",\":\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-systemd-minimal-libs-257.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libva-2.22.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-mesa-libgbm-25.1.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libnotify-0.8.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libXScrnSaver-1.2.4/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-cups-2.4.12-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pciutils-3.14.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-vulkan-loader-1.4.313.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-speech-dispatcher-0.12.1/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pipewire-1.4.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-ffmpeg-7.1.1-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-krb5-1.21.3-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libglvnd-1.7.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libpulseaudio-17.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-alsa-lib-1.2.14/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-sndio-1.10.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libjack2-1.9.22/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libcanberra-0.30/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-systemd-minimal-libs-257.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libva-2.22.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-mesa-libgbm-25.1.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libnotify-0.8.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libXScrnSaver-1.2.4/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-cups-2.4.12-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pciutils-3.14.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-vulkan-loader-1.4.313.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-speech-dispatcher-0.12.1/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-pipewire-1.4.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-ffmpeg-7.1.1-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-krb5-1.21.3-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libglvnd-1.7.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libpulseaudio-17.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-alsa-lib-1.2.14/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-sndio-1.10.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libjack2-1.9.22/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libcanberra-0.30/lib64\",\"--suffix\",\"PATH\",\":\",\"/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9/bin\",\"--set\",\"MOZ_APP_LAUNCHER\",\"firefox\",\"--set\",\"MOZ_LEGACY_PROFILES\",\"1\",\"--set\",\"MOZ_ALLOW_DOWNGRADE\",\"1\",\"--suffix\",\"GTK_PATH\",\":\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-libcanberra-0.30/lib/gtk-3.0/\",\"--suffix\",\"XDG_DATA_DIRS\",\":\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-adwaita-icon-theme-48.0/share\",\"--set-default\",\"MOZ_ENABLE_WAYLAND\",\"1\",\"--suffix\",\"PATH\",\":\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-xdg-utils-1.2.1/bin\",\"--set\",\"MOZ_SYSTEM_DIR\",\"/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9/lib/mozilla\"],\"mesonFlags\":[],\"name\":\"firefox-140.0.4\",\"nativeBuildInputs\":[\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-make-shell-wrapper-hook\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-lndir-1.0.5\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-jq-1.8.1-dev\"],\"outputChecks\":{\"out\":{\"disallowedRequisites\":[\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-gcc-wrapper-14.3.0\"]}},\"outputs\":[\"out\"],\"patches\":[],\"pname\":\"firefox\",\"preferLocalBuild\":true,\"propagatedBuildInputs\":[],\"propagatedNativeBuildInputs\":[],\"stdenv\":\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-stdenv-linux\",\"strictDeps\":false,\"system\":\"x86_64-linux\",\"version\":\"140.0.4\"}"),("out","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-firefox-140.0.4")]) \ No newline at end of file +Derive([("out","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-140.0.4","","")],[("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-krb5-1.21.3.drv",["lib"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libglvnd-1.7.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-make-shell-wrapper-hook.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libva-2.22.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-policies.json.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-extract-binary-wrapper-cmd.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-pipewire-1.4.6.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-alsa-lib-1.2.14.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-ffmpeg-7.1.1.drv",["lib"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-mesa-libgbm-25.1.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-vulkan-loader-1.4.313.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-speech-dispatcher-0.12.1.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-pciutils-3.14.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-xdg-utils-1.2.1.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-cups-2.4.12.drv",["lib"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libnotify-0.8.6.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox.desktop.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-jq-1.8.1.drv",["dev"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libXScrnSaver-1.2.4.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-lndir-1.0.5.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-sndio-1.10.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libpulseaudio-17.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-systemd-minimal-libs-257.6.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-bash-5.2p37.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-stdenv-linux.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-gtk+3-3.24.49.drv",["dev"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libjack2-1.9.22.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-adwaita-icon-theme-48.0.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libcanberra-0.30.drv",["out"])],["/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-default-builder.sh","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-source-stdenv.sh"],"x86_64-linux","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-bash-5.2p37/bin/bash",["-e","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-source-stdenv.sh","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-default-builder.sh"],[("__json","{\"NIX_MAIN_PROGRAM\":\"firefox\",\"buildCommand\":\"if [ ! -x \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4/bin/firefox\\\" ]\\nthen\\n echo \\\"cannot find executable file \\\\`/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4/bin/firefox'\\\"\\n exit 1\\nfi\\n\\n#########################\\n# #\\n# EXTRA PREF CHANGES #\\n# #\\n#########################\\n# Link the runtime. The executable itself has to be copied,\\n# because it will resolve paths relative to its true location.\\n# Any symbolic links have to be replicated as well.\\ncd \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4\\\"\\nfind . -type d -exec mkdir -p \\\"$out\\\"/{} \\\\;\\n\\nfind . -type f \\\\( -not -name \\\"firefox\\\" \\\\) -exec ln -sT \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4\\\"/{} \\\"$out\\\"/{} \\\\;\\n\\nfind . -type f \\\\( -name \\\"firefox\\\" -o -name \\\"firefox-bin\\\" \\\\) -print0 | while read -d $'\\\\0' f; do\\n cp -P --no-preserve=mode,ownership --remove-destination \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4/$f\\\" \\\"$out/$f\\\"\\n chmod a+rwx \\\"$out/$f\\\"\\ndone\\n\\n# fix links and absolute references\\n\\nfind . -type l -print0 | while read -d $'\\\\0' l; do\\n target=\\\"$(readlink \\\"$l\\\")\\\"\\n target=${target/#\\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4\\\"/\\\"$out\\\"}\\n ln -sfT \\\"$target\\\" \\\"$out/$l\\\"\\ndone\\n\\ncd \\\"$out\\\"\\n\\n\\n# create the wrapper\\n\\nexecutablePrefix=\\\"$out/bin\\\"\\nexecutablePath=\\\"$out/bin/firefox\\\"\\noldWrapperArgs=()\\n\\nif [[ -L $executablePath ]]; then\\n # Symbolic link: wrap the link's target.\\n oldExe=\\\"$(readlink -v --canonicalize-existing \\\"$executablePath\\\")\\\"\\n rm \\\"$executablePath\\\"\\nelif wrapperCmd=$(/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-extract-binary-wrapper-cmd \\\"$executablePath\\\"); [[ $wrapperCmd ]]; then\\n # If the executable is a binary wrapper, we need to update its target to\\n # point to $out, but we can't just edit the binary in-place because of length\\n # issues. So we extract the command used to create the wrapper and add the\\n # arguments to our wrapper.\\n parseMakeCWrapperCall() {\\n shift # makeCWrapper\\n oldExe=$1; shift\\n oldWrapperArgs=(\\\"$@\\\")\\n }\\n eval \\\"parseMakeCWrapperCall ${wrapperCmd//\\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4\\\"/\\\"$out\\\"}\\\"\\n rm \\\"$executablePath\\\"\\nelse\\n if read -rn2 shebang < \\\"$executablePath\\\" && [[ $shebang == '#!' ]]; then\\n # Shell wrapper: patch in place to point to $out.\\n sed -i \\\"s@/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4@$out@g\\\" \\\"$executablePath\\\"\\n fi\\n # Suffix the executable with -old, because -wrapped might already be used by the old wrapper.\\n oldExe=\\\"$executablePrefix/.firefox\\\"-old\\n mv \\\"$executablePath\\\" \\\"$oldExe\\\"\\nfi\\nappendToVar makeWrapperArgs --prefix XDG_DATA_DIRS : \\\"$GSETTINGS_SCHEMAS_PATH\\\"\\nconcatTo makeWrapperArgs oldWrapperArgs\\n\\nmakeWrapper \\\"$oldExe\\\" \\\"$out/bin/firefox\\\" \\\"${makeWrapperArgs[@]}\\\"\\n\\n#############################\\n# #\\n# END EXTRA PREF CHANGES #\\n# #\\n#############################\\nif [ -e \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4/share/icons\\\" ]; then\\n mkdir -p \\\"$out/share\\\"\\n ln -s \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4/share/icons\\\" \\\"$out/share/icons\\\"\\nelse\\n for res in 16 32 48 64 128; do\\n mkdir -p \\\"$out/share/icons/hicolor/${res}x${res}/apps\\\"\\n icon=$( find \\\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-unwrapped-140.0.4/lib/\\\" -name \\\"default${res}.png\\\" )\\n if [ -e \\\"$icon\\\" ]; then ln -s \\\"$icon\\\" \\\\\\n \\\"$out/share/icons/hicolor/${res}x${res}/apps/firefox.png\\\"\\n fi\\n done\\nfi\\n\\ninstall -m 644 -D -t $out/share/applications $desktopItem/share/applications/*\\n\\nmkdir -p $out/lib/mozilla/native-messaging-hosts\\nfor ext in ; do\\n ln -sLt $out/lib/mozilla/native-messaging-hosts $ext/lib/mozilla/native-messaging-hosts/*\\ndone\\n\\nmkdir -p $out/lib/mozilla/pkcs11-modules\\nfor ext in ; do\\n ln -sLt $out/lib/mozilla/pkcs11-modules $ext/lib/mozilla/pkcs11-modules/*\\ndone\\n\\n\\n#########################\\n# #\\n# EXTRA PREF CHANGES #\\n# #\\n#########################\\n# user customization\\nlibDir=\\\"$out/lib/firefox\\\"\\n\\n# creating policies.json\\nmkdir -p \\\"$libDir/distribution\\\"\\n\\nPOL_PATH=\\\"$libDir/distribution/policies.json\\\"\\nrm -f \\\"$POL_PATH\\\"\\ncat /nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-policies.json >> \\\"$POL_PATH\\\"\\n\\nextraPoliciesFiles=()\\nfor extraPoliciesFile in \\\"${extraPoliciesFiles[@]}\\\"; do\\n jq -s '.[0] * .[1]' $extraPoliciesFile \\\"$POL_PATH\\\" > .tmp.json\\n mv .tmp.json \\\"$POL_PATH\\\"\\ndone\\n\\n# preparing for autoconfig\\nprefsDir=\\\"$out/lib/firefox/defaults/pref\\\"\\nmkdir -p \\\"$prefsDir\\\"\\n\\necho 'pref(\\\"general.config.filename\\\", \\\"mozilla.cfg\\\");' > \\\"$prefsDir/autoconfig.js\\\"\\necho 'pref(\\\"general.config.obscure_value\\\", 0);' >> \\\"$prefsDir/autoconfig.js\\\"\\n\\ncat > \\\"$libDir/mozilla.cfg\\\" << EOF\\n// First line must be a comment\\n\\n// Disables addon signature checking\\n// to be able to install addons that do not have an extid\\n// Security is maintained because only user whitelisted addons\\n// with a checksum can be installed\\n\\n\\nEOF\\n\\nextraPrefsFiles=()\\nfor extraPrefsFile in \\\"${extraPrefsFiles[@]}\\\"; do\\n cat \\\"$extraPrefsFile\\\" >> \\\"$libDir/mozilla.cfg\\\"\\ndone\\n\\ncat >> \\\"$libDir/mozilla.cfg\\\" << EOF\\n\\nEOF\\n\\nmkdir -p \\\"$libDir/distribution/extensions\\\"\\n\\n#############################\\n# #\\n# END EXTRA PREF CHANGES #\\n# #\\n#############################\\n\",\"buildInputs\":[\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-gtk+3-3.24.49-dev\"],\"builder\":\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-bash-5.2p37/bin/bash\",\"cmakeFlags\":[],\"configureFlags\":[],\"depsBuildBuild\":[],\"depsBuildBuildPropagated\":[],\"depsBuildTarget\":[],\"depsBuildTargetPropagated\":[],\"depsHostHost\":[],\"depsHostHostPropagated\":[],\"depsTargetTarget\":[],\"depsTargetTargetPropagated\":[],\"desktopItem\":\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox.desktop\",\"doCheck\":false,\"doInstallCheck\":false,\"env\":{\"NIX_MAIN_PROGRAM\":\"firefox\"},\"gtk_modules\":[\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libcanberra-0.30/lib/gtk-3.0/\"],\"libs\":\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-systemd-minimal-libs-257.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libva-2.22.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-mesa-libgbm-25.1.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libnotify-0.8.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libXScrnSaver-1.2.4/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-cups-2.4.12-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-pciutils-3.14.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-vulkan-loader-1.4.313.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-speech-dispatcher-0.12.1/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-pipewire-1.4.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-ffmpeg-7.1.1-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-krb5-1.21.3-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libglvnd-1.7.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libpulseaudio-17.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-alsa-lib-1.2.14/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-sndio-1.10.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libjack2-1.9.22/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libcanberra-0.30/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-systemd-minimal-libs-257.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libva-2.22.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-mesa-libgbm-25.1.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libnotify-0.8.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libXScrnSaver-1.2.4/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-cups-2.4.12-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-pciutils-3.14.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-vulkan-loader-1.4.313.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-speech-dispatcher-0.12.1/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-pipewire-1.4.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-ffmpeg-7.1.1-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-krb5-1.21.3-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libglvnd-1.7.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libpulseaudio-17.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-alsa-lib-1.2.14/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-sndio-1.10.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libjack2-1.9.22/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libcanberra-0.30/lib64\",\"makeWrapperArgs\":[\"--prefix\",\"LD_LIBRARY_PATH\",\":\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-systemd-minimal-libs-257.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libva-2.22.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-mesa-libgbm-25.1.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libnotify-0.8.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libXScrnSaver-1.2.4/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-cups-2.4.12-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-pciutils-3.14.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-vulkan-loader-1.4.313.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-speech-dispatcher-0.12.1/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-pipewire-1.4.6/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-ffmpeg-7.1.1-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-krb5-1.21.3-lib/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libglvnd-1.7.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libpulseaudio-17.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-alsa-lib-1.2.14/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-sndio-1.10.0/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libjack2-1.9.22/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libcanberra-0.30/lib:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-systemd-minimal-libs-257.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libva-2.22.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-mesa-libgbm-25.1.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libnotify-0.8.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libXScrnSaver-1.2.4/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-cups-2.4.12-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-pciutils-3.14.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-vulkan-loader-1.4.313.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-speech-dispatcher-0.12.1/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-pipewire-1.4.6/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-ffmpeg-7.1.1-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-krb5-1.21.3-lib/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libglvnd-1.7.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libpulseaudio-17.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-alsa-lib-1.2.14/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-sndio-1.10.0/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libjack2-1.9.22/lib64:/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libcanberra-0.30/lib64\",\"--suffix\",\"PATH\",\":\",\"/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9/bin\",\"--set\",\"MOZ_APP_LAUNCHER\",\"firefox\",\"--set\",\"MOZ_LEGACY_PROFILES\",\"1\",\"--set\",\"MOZ_ALLOW_DOWNGRADE\",\"1\",\"--suffix\",\"GTK_PATH\",\":\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-libcanberra-0.30/lib/gtk-3.0/\",\"--suffix\",\"XDG_DATA_DIRS\",\":\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-adwaita-icon-theme-48.0/share\",\"--set-default\",\"MOZ_ENABLE_WAYLAND\",\"1\",\"--suffix\",\"PATH\",\":\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-xdg-utils-1.2.1/bin\",\"--set\",\"MOZ_SYSTEM_DIR\",\"/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9/lib/mozilla\"],\"mesonFlags\":[],\"name\":\"firefox-140.0.4\",\"nativeBuildInputs\":[\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-make-shell-wrapper-hook\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-lndir-1.0.5\",\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-jq-1.8.1-dev\"],\"outputChecks\":{\"out\":{\"disallowedRequisites\":[\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-gcc-wrapper-14.3.0\"]}},\"outputs\":[\"out\"],\"patches\":[],\"pname\":\"firefox\",\"preferLocalBuild\":true,\"propagatedBuildInputs\":[],\"propagatedNativeBuildInputs\":[],\"stdenv\":\"/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-stdenv-linux\",\"strictDeps\":false,\"system\":\"x86_64-linux\",\"version\":\"140.0.4\"}"),("out","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-firefox-140.0.4")]) \ No newline at end of file diff --git a/src/libstore-tests/data/derivation/hello.drv b/src/libstore-tests/data/derivation/hello.drv index f92a4b4850e..bc769b20f27 100644 --- a/src/libstore-tests/data/derivation/hello.drv +++ b/src/libstore-tests/data/derivation/hello.drv @@ -1 +1 @@ -Derive([("out","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-hello-2.12.2","","")],[("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-version-check-hook.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-hello-2.12.2.tar.gz.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bash-5.2p37.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-stdenv-linux.drv",["out"])],["/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-default-builder.sh","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-source-stdenv.sh"],"x86_64-linux","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bash-5.2p37/bin/bash",["-e","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-source-stdenv.sh","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-default-builder.sh"],[("NIX_MAIN_PROGRAM","hello"),("__structuredAttrs",""),("buildInputs",""),("builder","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bash-5.2p37/bin/bash"),("cmakeFlags",""),("configureFlags",""),("depsBuildBuild",""),("depsBuildBuildPropagated",""),("depsBuildTarget",""),("depsBuildTargetPropagated",""),("depsHostHost",""),("depsHostHostPropagated",""),("depsTargetTarget",""),("depsTargetTargetPropagated",""),("doCheck","1"),("doInstallCheck","1"),("mesonFlags",""),("name","hello-2.12.2"),("nativeBuildInputs","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-version-check-hook"),("out","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-hello-2.12.2"),("outputs","out"),("patches",""),("pname","hello"),("postInstallCheck","stat \"${!outputBin}/bin/hello\"\n"),("propagatedBuildInputs",""),("propagatedNativeBuildInputs",""),("src","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-hello-2.12.2.tar.gz"),("stdenv","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-stdenv-linux"),("strictDeps",""),("system","x86_64-linux"),("version","2.12.2")]) \ No newline at end of file +Derive([("out","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-hello-2.12.2","","")],[("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-version-check-hook.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-hello-2.12.2.tar.gz.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-bash-5.2p37.drv",["out"]),("/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-stdenv-linux.drv",["out"])],["/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-default-builder.sh","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-source-stdenv.sh"],"x86_64-linux","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-bash-5.2p37/bin/bash",["-e","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-source-stdenv.sh","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-default-builder.sh"],[("NIX_MAIN_PROGRAM","hello"),("__structuredAttrs",""),("buildInputs",""),("builder","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-bash-5.2p37/bin/bash"),("cmakeFlags",""),("configureFlags",""),("depsBuildBuild",""),("depsBuildBuildPropagated",""),("depsBuildTarget",""),("depsBuildTargetPropagated",""),("depsHostHost",""),("depsHostHostPropagated",""),("depsTargetTarget",""),("depsTargetTargetPropagated",""),("doCheck","1"),("doInstallCheck","1"),("mesonFlags",""),("name","hello-2.12.2"),("nativeBuildInputs","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-version-check-hook"),("out","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-hello-2.12.2"),("outputs","out"),("patches",""),("pname","hello"),("postInstallCheck","stat \"${!outputBin}/bin/hello\"\n"),("propagatedBuildInputs",""),("propagatedNativeBuildInputs",""),("src","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-hello-2.12.2.tar.gz"),("stdenv","/nix/store/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-stdenv-linux"),("strictDeps",""),("system","x86_64-linux"),("version","2.12.2")]) \ No newline at end of file diff --git a/src/libstore-tests/data/derivation/ia/advanced-attributes-defaults.json b/src/libstore-tests/data/derivation/ia/advanced-attributes-defaults.json index 898762123a3..2adb64de482 100644 --- a/src/libstore-tests/data/derivation/ia/advanced-attributes-defaults.json +++ b/src/libstore-tests/data/derivation/ia/advanced-attributes-defaults.json @@ -7,7 +7,7 @@ "env": { "builder": "/bin/bash", "name": "advanced-attributes-defaults", - "out": "/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults", + "out": "/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czjo-advanced-attributes-defaults", "system": "my-system" }, "inputs": { @@ -17,7 +17,7 @@ "name": "advanced-attributes-defaults", "outputs": { "out": { - "path": "1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults" + "path": "1qsc7svv43m4dw2prh6mvyf7cai5czjo-advanced-attributes-defaults" } }, "system": "my-system", diff --git a/src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs-defaults.json b/src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs-defaults.json index c51095986d4..5cd8d7b6316 100644 --- a/src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs-defaults.json +++ b/src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs-defaults.json @@ -5,8 +5,8 @@ ], "builder": "/bin/bash", "env": { - "dev": "/nix/store/8bazivnbipbyi569623skw5zm91z6kc2-advanced-attributes-structured-attrs-defaults-dev", - "out": "/nix/store/f8f8nvnx32bxvyxyx2ff7akbvwhwd9dw-advanced-attributes-structured-attrs-defaults" + "dev": "/nix/store/8bazivnbipbyi569623skw5zm91z6kco-advanced-attributes-structured-attrs-defaults-dev", + "out": "/nix/store/f8f8nvnx32bxvyxyx2ff7akbvwhwd9do-advanced-attributes-structured-attrs-defaults" }, "inputs": { "drvs": {}, @@ -15,10 +15,10 @@ "name": "advanced-attributes-structured-attrs-defaults", "outputs": { "dev": { - "path": "8bazivnbipbyi569623skw5zm91z6kc2-advanced-attributes-structured-attrs-defaults-dev" + "path": "8bazivnbipbyi569623skw5zm91z6kco-advanced-attributes-structured-attrs-defaults-dev" }, "out": { - "path": "f8f8nvnx32bxvyxyx2ff7akbvwhwd9dw-advanced-attributes-structured-attrs-defaults" + "path": "f8f8nvnx32bxvyxyx2ff7akbvwhwd9do-advanced-attributes-structured-attrs-defaults" } }, "structuredAttrs": { diff --git a/src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs.json b/src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs.json index bbd68e08705..94e520b5e43 100644 --- a/src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs.json +++ b/src/libstore-tests/data/derivation/ia/advanced-attributes-structured-attrs.json @@ -5,20 +5,20 @@ ], "builder": "/bin/bash", "env": { - "bin": "/nix/store/cnpasdljgkhnwaf78cf3qygcp4qbki1c-advanced-attributes-structured-attrs-bin", - "dev": "/nix/store/ijq6mwpa9jbnpnl33qldfqihrr38kprx-advanced-attributes-structured-attrs-dev", - "out": "/nix/store/h1vh648d3p088kdimy0r8ngpfx7c3nzw-advanced-attributes-structured-attrs" + "bin": "/nix/store/cnpasdljgkhnwaf78cf3qygcp4qbki1o-advanced-attributes-structured-attrs-bin", + "dev": "/nix/store/ijq6mwpa9jbnpnl33qldfqihrr38kpro-advanced-attributes-structured-attrs-dev", + "out": "/nix/store/h1vh648d3p088kdimy0r8ngpfx7c3nzo-advanced-attributes-structured-attrs" }, "inputs": { "drvs": { - "afc3vbjbzql750v2lp8gxgaxsajphzih-foo.drv": { + "afc3vbjbzql750v2lp8gxgaxsajphzio-foo.drv": { "dynamicOutputs": {}, "outputs": [ "dev", "out" ] }, - "vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv": { + "vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv": { "dynamicOutputs": {}, "outputs": [ "dev", @@ -27,19 +27,19 @@ } }, "srcs": [ - "vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv" + "vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv" ] }, "name": "advanced-attributes-structured-attrs", "outputs": { "bin": { - "path": "cnpasdljgkhnwaf78cf3qygcp4qbki1c-advanced-attributes-structured-attrs-bin" + "path": "cnpasdljgkhnwaf78cf3qygcp4qbki1o-advanced-attributes-structured-attrs-bin" }, "dev": { - "path": "ijq6mwpa9jbnpnl33qldfqihrr38kprx-advanced-attributes-structured-attrs-dev" + "path": "ijq6mwpa9jbnpnl33qldfqihrr38kpro-advanced-attributes-structured-attrs-dev" }, "out": { - "path": "h1vh648d3p088kdimy0r8ngpfx7c3nzw-advanced-attributes-structured-attrs" + "path": "h1vh648d3p088kdimy0r8ngpfx7c3nzo-advanced-attributes-structured-attrs" } }, "structuredAttrs": { @@ -53,10 +53,10 @@ "builder": "/bin/bash", "exportReferencesGraph": { "refs1": [ - "/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo" + "/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo" ], "refs2": [ - "/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv" + "/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv" ] }, "impureEnvVars": [ @@ -66,11 +66,11 @@ "outputChecks": { "bin": { "disallowedReferences": [ - "/nix/store/r5cff30838majxk5mp3ip2diffi8vpaj-bar", + "/nix/store/r5cff30838majxk5mp3ip2diffi8vpao-bar", "dev" ], "disallowedRequisites": [ - "/nix/store/9b61w26b4avv870dw0ymb6rw4r1hzpws-bar-dev" + "/nix/store/9b61w26b4avv870dw0ymb6rw4r1hzpwo-bar-dev" ] }, "dev": { @@ -79,10 +79,10 @@ }, "out": { "allowedReferences": [ - "/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo" + "/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo" ], "allowedRequisites": [ - "/nix/store/z0rjzy29v9k5qa4nqpykrbzirj7sd43v-foo-dev", + "/nix/store/z0rjzy29v9k5qa4nqpykrbzirj7sd43o-foo-dev", "bin" ] } diff --git a/src/libstore-tests/data/derivation/ia/advanced-attributes.json b/src/libstore-tests/data/derivation/ia/advanced-attributes.json index e2de9431b4b..3bbe5e264b0 100644 --- a/src/libstore-tests/data/derivation/ia/advanced-attributes.json +++ b/src/libstore-tests/data/derivation/ia/advanced-attributes.json @@ -10,29 +10,29 @@ "__noChroot": "1", "__sandboxProfile": "sandcastle", "allowSubstitutes": "", - "allowedReferences": "/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo", - "allowedRequisites": "/nix/store/z0rjzy29v9k5qa4nqpykrbzirj7sd43v-foo-dev bin", + "allowedReferences": "/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo", + "allowedRequisites": "/nix/store/z0rjzy29v9k5qa4nqpykrbzirj7sd43o-foo-dev bin", "builder": "/bin/bash", - "disallowedReferences": "/nix/store/r5cff30838majxk5mp3ip2diffi8vpaj-bar dev", - "disallowedRequisites": "/nix/store/9b61w26b4avv870dw0ymb6rw4r1hzpws-bar-dev", - "exportReferencesGraph": "refs1 /nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo refs2 /nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv", + "disallowedReferences": "/nix/store/r5cff30838majxk5mp3ip2diffi8vpao-bar dev", + "disallowedRequisites": "/nix/store/9b61w26b4avv870dw0ymb6rw4r1hzpwo-bar-dev", + "exportReferencesGraph": "refs1 /nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo refs2 /nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv", "impureEnvVars": "UNICORN", "name": "advanced-attributes", - "out": "/nix/store/ymqmybkq5j4nd1xplw6ccdpbjnfi017v-advanced-attributes", + "out": "/nix/store/ymqmybkq5j4nd1xplw6ccdpbjnfi017o-advanced-attributes", "preferLocalBuild": "1", "requiredSystemFeatures": "rainbow uid-range", "system": "my-system" }, "inputs": { "drvs": { - "afc3vbjbzql750v2lp8gxgaxsajphzih-foo.drv": { + "afc3vbjbzql750v2lp8gxgaxsajphzio-foo.drv": { "dynamicOutputs": {}, "outputs": [ "dev", "out" ] }, - "vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv": { + "vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv": { "dynamicOutputs": {}, "outputs": [ "dev", @@ -41,13 +41,13 @@ } }, "srcs": [ - "vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv" + "vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv" ] }, "name": "advanced-attributes", "outputs": { "out": { - "path": "ymqmybkq5j4nd1xplw6ccdpbjnfi017v-advanced-attributes" + "path": "ymqmybkq5j4nd1xplw6ccdpbjnfi017o-advanced-attributes" } }, "system": "my-system", diff --git a/src/libstore-tests/data/derivation/ia/derivation-options/all_set.json b/src/libstore-tests/data/derivation/ia/derivation-options/all_set.json index 2e1c848daf4..348c658ce2d 100644 --- a/src/libstore-tests/data/derivation/ia/derivation-options/all_set.json +++ b/src/libstore-tests/data/derivation/ia/derivation-options/all_set.json @@ -4,10 +4,10 @@ "allowSubstitutes": false, "exportReferencesGraph": { "refs1": [ - "p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo" + "p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo" ], "refs2": [ - "vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv" + "vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv" ] }, "impureEnvVars": [ @@ -20,24 +20,24 @@ "outputChecks": { "forAllOutputs": { "allowedReferences": [ - "p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo" + "p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo" ], "allowedRequisites": [ { "drvPath": "self", "output": "bin" }, - "z0rjzy29v9k5qa4nqpykrbzirj7sd43v-foo-dev" + "z0rjzy29v9k5qa4nqpykrbzirj7sd43o-foo-dev" ], "disallowedReferences": [ { "drvPath": "self", "output": "dev" }, - "r5cff30838majxk5mp3ip2diffi8vpaj-bar" + "r5cff30838majxk5mp3ip2diffi8vpao-bar" ], "disallowedRequisites": [ - "9b61w26b4avv870dw0ymb6rw4r1hzpws-bar-dev" + "9b61w26b4avv870dw0ymb6rw4r1hzpwo-bar-dev" ], "ignoreSelfRefs": true, "maxClosureSize": null, diff --git a/src/libstore-tests/data/derivation/ia/derivation-options/structuredAttrs_all_set.json b/src/libstore-tests/data/derivation/ia/derivation-options/structuredAttrs_all_set.json index a29699b5dd6..dcf64999442 100644 --- a/src/libstore-tests/data/derivation/ia/derivation-options/structuredAttrs_all_set.json +++ b/src/libstore-tests/data/derivation/ia/derivation-options/structuredAttrs_all_set.json @@ -4,10 +4,10 @@ "allowSubstitutes": false, "exportReferencesGraph": { "refs1": [ - "p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo" + "p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo" ], "refs2": [ - "vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv" + "vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv" ] }, "impureEnvVars": [ @@ -27,10 +27,10 @@ "drvPath": "self", "output": "dev" }, - "r5cff30838majxk5mp3ip2diffi8vpaj-bar" + "r5cff30838majxk5mp3ip2diffi8vpao-bar" ], "disallowedRequisites": [ - "9b61w26b4avv870dw0ymb6rw4r1hzpws-bar-dev" + "9b61w26b4avv870dw0ymb6rw4r1hzpwo-bar-dev" ], "ignoreSelfRefs": false, "maxClosureSize": null, @@ -47,14 +47,14 @@ }, "out": { "allowedReferences": [ - "p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo" + "p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo" ], "allowedRequisites": [ { "drvPath": "self", "output": "bin" }, - "z0rjzy29v9k5qa4nqpykrbzirj7sd43v-foo-dev" + "z0rjzy29v9k5qa4nqpykrbzirj7sd43o-foo-dev" ], "disallowedReferences": [], "disallowedRequisites": [], diff --git a/src/libstore-tests/data/derivation/invariants/bad-depends-on-drv-pre.json b/src/libstore-tests/data/derivation/invariants/bad-depends-on-drv-pre.json index 8454cf548fc..c14821c3f72 100644 --- a/src/libstore-tests/data/derivation/invariants/bad-depends-on-drv-pre.json +++ b/src/libstore-tests/data/derivation/invariants/bad-depends-on-drv-pre.json @@ -7,7 +7,7 @@ }, "inputs": { "drvs": { - "lg4c4b8r9hlczwprl6kgnzfd9mc1xmkk-dependency.drv": { + "lg4c4b8r9hlczwprl6kgnzfd9mc1xmko-dependency.drv": { "dynamicOutputs": {}, "outputs": [ "out" @@ -19,7 +19,7 @@ "name": "depends-on-drv", "outputs": { "out": { - "path": "c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-wrong-name" + "path": "c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-wrong-name" } }, "system": "x86_64-linux", diff --git a/src/libstore-tests/data/derivation/invariants/bad-env-var.json b/src/libstore-tests/data/derivation/invariants/bad-env-var.json index cb0c9492fe8..ea55059f873 100644 --- a/src/libstore-tests/data/derivation/invariants/bad-env-var.json +++ b/src/libstore-tests/data/derivation/invariants/bad-env-var.json @@ -3,7 +3,7 @@ "builder": "/bin/sh", "env": { "__doc": "Wrong env var value throws error", - "out": "/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-wrong-name" + "out": "/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-wrong-name" }, "inputs": { "drvs": {}, diff --git a/src/libstore-tests/data/derivation/invariants/bad-path.json b/src/libstore-tests/data/derivation/invariants/bad-path.json index 688f2d4e696..7ceadaa159f 100644 --- a/src/libstore-tests/data/derivation/invariants/bad-path.json +++ b/src/libstore-tests/data/derivation/invariants/bad-path.json @@ -3,7 +3,7 @@ "builder": "/bin/sh", "env": { "__doc": "Wrong InputAddressed path throws error", - "out": "/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-wrong-name" + "out": "/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-wrong-name" }, "inputs": { "drvs": {}, @@ -12,7 +12,7 @@ "name": "bad-path", "outputs": { "out": { - "path": "c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-wrong-name" + "path": "c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-wrong-name" } }, "system": "x86_64-linux", diff --git a/src/libstore-tests/data/derivation/invariants/depends-on-drv-pre.json b/src/libstore-tests/data/derivation/invariants/depends-on-drv-pre.json index d782cc756c5..79499dff900 100644 --- a/src/libstore-tests/data/derivation/invariants/depends-on-drv-pre.json +++ b/src/libstore-tests/data/derivation/invariants/depends-on-drv-pre.json @@ -7,7 +7,7 @@ }, "inputs": { "drvs": { - "lg4c4b8r9hlczwprl6kgnzfd9mc1xmkk-dependency.drv": { + "lg4c4b8r9hlczwprl6kgnzfd9mc1xmko-dependency.drv": { "dynamicOutputs": {}, "outputs": [ "out" diff --git a/src/libstore-tests/data/derivation/invariants/filled-in-deferred-empty-env-var-post.json b/src/libstore-tests/data/derivation/invariants/filled-in-deferred-empty-env-var-post.json index c5abdf69298..8a04208fee2 100644 --- a/src/libstore-tests/data/derivation/invariants/filled-in-deferred-empty-env-var-post.json +++ b/src/libstore-tests/data/derivation/invariants/filled-in-deferred-empty-env-var-post.json @@ -3,7 +3,7 @@ "builder": "/bin/sh", "env": { "__doc": "Fill in deferred output with empty env var", - "out": "/nix/store/bilpz1nq8qi9r3bzsp72n34yjgqg43ws-filled-in-deferred-empty-env-var" + "out": "/nix/store/bilpz1nq8qi9r3bzsp72n34yjgqg43wo-filled-in-deferred-empty-env-var" }, "inputs": { "drvs": {}, @@ -12,7 +12,7 @@ "name": "filled-in-deferred-empty-env-var", "outputs": { "out": { - "path": "bilpz1nq8qi9r3bzsp72n34yjgqg43ws-filled-in-deferred-empty-env-var" + "path": "bilpz1nq8qi9r3bzsp72n34yjgqg43wo-filled-in-deferred-empty-env-var" } }, "system": "x86_64-linux", diff --git a/src/libstore-tests/data/derivation/invariants/filled-in-deferred-no-env-var-post.json b/src/libstore-tests/data/derivation/invariants/filled-in-deferred-no-env-var-post.json index 709d7bca0de..486022b93b2 100644 --- a/src/libstore-tests/data/derivation/invariants/filled-in-deferred-no-env-var-post.json +++ b/src/libstore-tests/data/derivation/invariants/filled-in-deferred-no-env-var-post.json @@ -3,7 +3,7 @@ "builder": "/bin/sh", "env": { "__doc": "Fill in deferred with missing env var", - "out": "/nix/store/wpk9qrgg77fyswhailap0gicgw98izx9-filled-in-deferred-no-env-var" + "out": "/nix/store/wpk9qrgg77fyswhailap0gicgw98izxo-filled-in-deferred-no-env-var" }, "inputs": { "drvs": {}, @@ -12,7 +12,7 @@ "name": "filled-in-deferred-no-env-var", "outputs": { "out": { - "path": "wpk9qrgg77fyswhailap0gicgw98izx9-filled-in-deferred-no-env-var" + "path": "wpk9qrgg77fyswhailap0gicgw98izxo-filled-in-deferred-no-env-var" } }, "system": "x86_64-linux", diff --git a/src/libstore-tests/data/derivation/invariants/filled-in-idempotent.json b/src/libstore-tests/data/derivation/invariants/filled-in-idempotent.json index 9b99fb81216..3eae1b3c611 100644 --- a/src/libstore-tests/data/derivation/invariants/filled-in-idempotent.json +++ b/src/libstore-tests/data/derivation/invariants/filled-in-idempotent.json @@ -3,7 +3,7 @@ "builder": "/bin/sh", "env": { "__doc": "Correct path stays unchanged", - "out": "/nix/store/w4bk7hpyxzgy2gx8fsa8f952435pll3i-filled-in-already" + "out": "/nix/store/w4bk7hpyxzgy2gx8fsa8f952435pll3o-filled-in-already" }, "inputs": { "drvs": {}, @@ -12,7 +12,7 @@ "name": "filled-in-already", "outputs": { "out": { - "path": "w4bk7hpyxzgy2gx8fsa8f952435pll3i-filled-in-already" + "path": "w4bk7hpyxzgy2gx8fsa8f952435pll3o-filled-in-already" } }, "system": "x86_64-linux", diff --git a/src/libstore-tests/data/derivation/output-inputAddressed.json b/src/libstore-tests/data/derivation/output-inputAddressed.json index 04491ffdec3..c204bcdca13 100644 --- a/src/libstore-tests/data/derivation/output-inputAddressed.json +++ b/src/libstore-tests/data/derivation/output-inputAddressed.json @@ -1,3 +1,3 @@ { - "path": "c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-drv-name-output-name" + "path": "c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-drv-name-output-name" } diff --git a/src/libstore-tests/data/derivation/simple-derivation.drv b/src/libstore-tests/data/derivation/simple-derivation.drv index bda74ad25c0..9ad3134eccc 100644 --- a/src/libstore-tests/data/derivation/simple-derivation.drv +++ b/src/libstore-tests/data/derivation/simple-derivation.drv @@ -1 +1 @@ -Derive([],[("/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep2.drv",["cat","dog"])],["/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1"],"wasm-sel4","foo",["bar","baz"],[("BIG_BAD","WOLF")]) \ No newline at end of file +Derive([],[("/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep2.drv",["cat","dog"])],["/nix/store/c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep1"],"wasm-sel4","foo",["bar","baz"],[("BIG_BAD","WOLF")]) \ No newline at end of file diff --git a/src/libstore-tests/data/derivation/simple-derivation.json b/src/libstore-tests/data/derivation/simple-derivation.json index 04129a096e0..9b86821ce62 100644 --- a/src/libstore-tests/data/derivation/simple-derivation.json +++ b/src/libstore-tests/data/derivation/simple-derivation.json @@ -9,7 +9,7 @@ }, "inputs": { "drvs": { - "c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep2.drv": { + "c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep2.drv": { "dynamicOutputs": {}, "outputs": [ "cat", @@ -18,7 +18,7 @@ } }, "srcs": [ - "c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1" + "c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep1" ] }, "name": "simple-derivation", diff --git a/src/libstore-tests/data/derived-path/multi_built_built.json b/src/libstore-tests/data/derived-path/multi_built_built.json index 561d0485092..c17dc77a5f1 100644 --- a/src/libstore-tests/data/derived-path/multi_built_built.json +++ b/src/libstore-tests/data/derived-path/multi_built_built.json @@ -1,6 +1,6 @@ { "drvPath": { - "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv", + "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv", "output": "bar" }, "outputs": [ diff --git a/src/libstore-tests/data/derived-path/multi_built_built_wildcard.json b/src/libstore-tests/data/derived-path/multi_built_built_wildcard.json index da1f9d996ac..eae3a60b0a3 100644 --- a/src/libstore-tests/data/derived-path/multi_built_built_wildcard.json +++ b/src/libstore-tests/data/derived-path/multi_built_built_wildcard.json @@ -1,6 +1,6 @@ { "drvPath": { - "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv", + "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv", "output": "bar" }, "outputs": [ diff --git a/src/libstore-tests/data/derived-path/multi_opaque.json b/src/libstore-tests/data/derived-path/multi_opaque.json index 9bedb882bca..53630e525c2 100644 --- a/src/libstore-tests/data/derived-path/multi_opaque.json +++ b/src/libstore-tests/data/derived-path/multi_opaque.json @@ -1 +1 @@ -"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv" +"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv" diff --git a/src/libstore-tests/data/derived-path/mutli_built.json b/src/libstore-tests/data/derived-path/mutli_built.json index d7bcff53d49..48237b910ff 100644 --- a/src/libstore-tests/data/derived-path/mutli_built.json +++ b/src/libstore-tests/data/derived-path/mutli_built.json @@ -1,5 +1,5 @@ { - "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv", + "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv", "outputs": [ "bar", "baz" diff --git a/src/libstore-tests/data/derived-path/single_built.json b/src/libstore-tests/data/derived-path/single_built.json index 64110a364eb..2d3cb1aba7a 100644 --- a/src/libstore-tests/data/derived-path/single_built.json +++ b/src/libstore-tests/data/derived-path/single_built.json @@ -1,4 +1,4 @@ { - "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv", + "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv", "output": "bar" } diff --git a/src/libstore-tests/data/derived-path/single_built_built.json b/src/libstore-tests/data/derived-path/single_built_built.json index 66faa668cd6..311de964144 100644 --- a/src/libstore-tests/data/derived-path/single_built_built.json +++ b/src/libstore-tests/data/derived-path/single_built_built.json @@ -1,6 +1,6 @@ { "drvPath": { - "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv", + "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv", "output": "bar" }, "output": "baz" diff --git a/src/libstore-tests/data/derived-path/single_opaque.json b/src/libstore-tests/data/derived-path/single_opaque.json index 9bedb882bca..53630e525c2 100644 --- a/src/libstore-tests/data/derived-path/single_opaque.json +++ b/src/libstore-tests/data/derived-path/single_opaque.json @@ -1 +1 @@ -"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv" +"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv" diff --git a/src/libstore-tests/data/dummy-store/one-derivation.json b/src/libstore-tests/data/dummy-store/one-derivation.json index a3e3391e6e0..31c765e82fe 100644 --- a/src/libstore-tests/data/dummy-store/one-derivation.json +++ b/src/libstore-tests/data/dummy-store/one-derivation.json @@ -5,7 +5,7 @@ }, "contents": {}, "derivations": { - "rlqjbbb65ggcx9hy577hvnn929wz1aj0-foo.drv": { + "rlqjbbb65ggcx9hy577hvnn929wz1ajo-foo.drv": { "args": [], "builder": "", "env": {}, diff --git a/src/libstore-tests/data/dummy-store/one-flat-file.json b/src/libstore-tests/data/dummy-store/one-flat-file.json index 804bbf07da6..4d9ef206779 100644 --- a/src/libstore-tests/data/dummy-store/one-flat-file.json +++ b/src/libstore-tests/data/dummy-store/one-flat-file.json @@ -4,7 +4,7 @@ "store": "/nix/store" }, "contents": { - "5hizn7xyyrhxr0k2magvxl5ccvk0ci9n-my-file": { + "5hizn7xyyrhxr0k2magvxl5ccvk0ci9o-my-file": { "contents": { "contents": "asdf", "executable": false, diff --git a/src/libstore-tests/data/dummy-store/one-realisation.json b/src/libstore-tests/data/dummy-store/one-realisation.json index b5c8b8c5621..51dc4a9b938 100644 --- a/src/libstore-tests/data/dummy-store/one-realisation.json +++ b/src/libstore-tests/data/dummy-store/one-realisation.json @@ -3,7 +3,7 @@ "ungWv48Bz+pBQUDeXa4iI7ADYaOWF3qctBD/YfIAFa0=": { "out": { "dependentRealisations": {}, - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [] } } diff --git a/src/libstore-tests/data/nar-info/json-1/impure.json b/src/libstore-tests/data/nar-info/json-1/impure.json index c6fafe13daa..c758b5efbbe 100644 --- a/src/libstore-tests/data/nar-info/json-1/impure.json +++ b/src/libstore-tests/data/nar-info/json-1/impure.json @@ -1,14 +1,14 @@ { "ca": "fixed:r:sha256:1lr187v6dck1rjh2j6svpikcfz53wyl3qrlcbb405zlh13x0khhh", "compression": "xz", - "deriver": "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "deriver": "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "downloadHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "downloadSize": 4029176, "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ], "registrationTime": 23423, "signatures": [ diff --git a/src/libstore-tests/data/nar-info/json-1/pure.json b/src/libstore-tests/data/nar-info/json-1/pure.json index f0424ae571c..0aa2bdc5d91 100644 --- a/src/libstore-tests/data/nar-info/json-1/pure.json +++ b/src/libstore-tests/data/nar-info/json-1/pure.json @@ -3,8 +3,8 @@ "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ], "storeDir": "/nix/store", "version": 1 diff --git a/src/libstore-tests/data/nar-info/json-1/pure_noversion.json b/src/libstore-tests/data/nar-info/json-1/pure_noversion.json index 955baec3107..783fc36250f 100644 --- a/src/libstore-tests/data/nar-info/json-1/pure_noversion.json +++ b/src/libstore-tests/data/nar-info/json-1/pure_noversion.json @@ -3,7 +3,7 @@ "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ] } diff --git a/src/libstore-tests/data/nar-info/json-2/impure.json b/src/libstore-tests/data/nar-info/json-2/impure.json index b7b9f511827..bc27ac921b3 100644 --- a/src/libstore-tests/data/nar-info/json-2/impure.json +++ b/src/libstore-tests/data/nar-info/json-2/impure.json @@ -4,14 +4,14 @@ "method": "nar" }, "compression": "xz", - "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "downloadHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "downloadSize": 4029176, "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ], "registrationTime": 23423, "signatures": [ diff --git a/src/libstore-tests/data/nar-info/json-2/pure.json b/src/libstore-tests/data/nar-info/json-2/pure.json index 0350349a9d8..9eaa543e841 100644 --- a/src/libstore-tests/data/nar-info/json-2/pure.json +++ b/src/libstore-tests/data/nar-info/json-2/pure.json @@ -6,8 +6,8 @@ "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ], "storeDir": "/nix/store", "version": 2 diff --git a/src/libstore-tests/data/path-info/json-1/impure.json b/src/libstore-tests/data/path-info/json-1/impure.json index 04d1dedc2af..f72f7be4377 100644 --- a/src/libstore-tests/data/path-info/json-1/impure.json +++ b/src/libstore-tests/data/path-info/json-1/impure.json @@ -1,11 +1,11 @@ { "ca": "fixed:r:sha256:1lr187v6dck1rjh2j6svpikcfz53wyl3qrlcbb405zlh13x0khhh", - "deriver": "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "deriver": "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ], "registrationTime": 23423, "signatures": [ diff --git a/src/libstore-tests/data/path-info/json-1/pure.json b/src/libstore-tests/data/path-info/json-1/pure.json index f0424ae571c..0aa2bdc5d91 100644 --- a/src/libstore-tests/data/path-info/json-1/pure.json +++ b/src/libstore-tests/data/path-info/json-1/pure.json @@ -3,8 +3,8 @@ "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ], "storeDir": "/nix/store", "version": 1 diff --git a/src/libstore-tests/data/path-info/json-1/pure_noversion.json b/src/libstore-tests/data/path-info/json-1/pure_noversion.json index 955baec3107..783fc36250f 100644 --- a/src/libstore-tests/data/path-info/json-1/pure_noversion.json +++ b/src/libstore-tests/data/path-info/json-1/pure_noversion.json @@ -3,7 +3,7 @@ "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "/nix/store/n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ] } diff --git a/src/libstore-tests/data/path-info/json-2/impure.json b/src/libstore-tests/data/path-info/json-2/impure.json index bed67610b1b..2b51cfae80e 100644 --- a/src/libstore-tests/data/path-info/json-2/impure.json +++ b/src/libstore-tests/data/path-info/json-2/impure.json @@ -3,12 +3,12 @@ "hash": "sha256-EMIJ+giQ/gLIWoxmPKjno3zHZrxbGymgzGGyZvZBIdM=", "method": "nar" }, - "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ], "registrationTime": 23423, "signatures": [ diff --git a/src/libstore-tests/data/path-info/json-2/pure.json b/src/libstore-tests/data/path-info/json-2/pure.json index 0350349a9d8..9eaa543e841 100644 --- a/src/libstore-tests/data/path-info/json-2/pure.json +++ b/src/libstore-tests/data/path-info/json-2/pure.json @@ -6,8 +6,8 @@ "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ], "storeDir": "/nix/store", "version": 2 diff --git a/src/libstore-tests/data/realisation/simple.json b/src/libstore-tests/data/realisation/simple.json index 2ccb1e72119..4fe97924915 100644 --- a/src/libstore-tests/data/realisation/simple.json +++ b/src/libstore-tests/data/realisation/simple.json @@ -1,6 +1,6 @@ { "dependentRealisations": {}, "id": "sha256:ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad!foo", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv", "signatures": [] } diff --git a/src/libstore-tests/data/realisation/with-dependent-realisations.json b/src/libstore-tests/data/realisation/with-dependent-realisations.json index a58e0d7fe1c..66ed2732b0b 100644 --- a/src/libstore-tests/data/realisation/with-dependent-realisations.json +++ b/src/libstore-tests/data/realisation/with-dependent-realisations.json @@ -1,8 +1,8 @@ { "dependentRealisations": { - "sha256:ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad!foo": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv" + "sha256:ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad!foo": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv" }, "id": "sha256:ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad!foo", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv", "signatures": [] } diff --git a/src/libstore-tests/data/realisation/with-signature.json b/src/libstore-tests/data/realisation/with-signature.json index a28848cb02b..623663efdf7 100644 --- a/src/libstore-tests/data/realisation/with-signature.json +++ b/src/libstore-tests/data/realisation/with-signature.json @@ -1,7 +1,7 @@ { "dependentRealisations": {}, "id": "sha256:ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad!foo", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv", "signatures": [ "asdfasdfasdf" ] diff --git a/src/libstore-tests/data/serve-protocol/build-result-2.6.bin b/src/libstore-tests/data/serve-protocol/build-result-2.6.bin index b02c706eab8..942d13567f4 100644 Binary files a/src/libstore-tests/data/serve-protocol/build-result-2.6.bin and b/src/libstore-tests/data/serve-protocol/build-result-2.6.bin differ diff --git a/src/libstore-tests/data/serve-protocol/build-result-2.6.json b/src/libstore-tests/data/serve-protocol/build-result-2.6.json index 30a8e82e926..9ec255941a9 100644 --- a/src/libstore-tests/data/serve-protocol/build-result-2.6.json +++ b/src/libstore-tests/data/serve-protocol/build-result-2.6.json @@ -22,13 +22,13 @@ "bar": { "dependentRealisations": {}, "id": "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!bar", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", "signatures": [] }, "foo": { "dependentRealisations": {}, "id": "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!foo", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [] } }, diff --git a/src/libstore-tests/data/serve-protocol/optional-store-path.bin b/src/libstore-tests/data/serve-protocol/optional-store-path.bin index 4fbca5576b6..170332c83e7 100644 Binary files a/src/libstore-tests/data/serve-protocol/optional-store-path.bin and b/src/libstore-tests/data/serve-protocol/optional-store-path.bin differ diff --git a/src/libstore-tests/data/serve-protocol/optional-store-path.json b/src/libstore-tests/data/serve-protocol/optional-store-path.json index 58519a4d2c4..28672167f55 100644 --- a/src/libstore-tests/data/serve-protocol/optional-store-path.json +++ b/src/libstore-tests/data/serve-protocol/optional-store-path.json @@ -1,4 +1,4 @@ [ null, - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar" ] diff --git a/src/libstore-tests/data/serve-protocol/realisation-with-deps.bin b/src/libstore-tests/data/serve-protocol/realisation-with-deps.bin index 54a78b64ebc..1dc2c43d004 100644 Binary files a/src/libstore-tests/data/serve-protocol/realisation-with-deps.bin and b/src/libstore-tests/data/serve-protocol/realisation-with-deps.bin differ diff --git a/src/libstore-tests/data/serve-protocol/realisation-with-deps.json b/src/libstore-tests/data/serve-protocol/realisation-with-deps.json index 77148d14ca4..413467866e3 100644 --- a/src/libstore-tests/data/serve-protocol/realisation-with-deps.json +++ b/src/libstore-tests/data/serve-protocol/realisation-with-deps.json @@ -1,10 +1,10 @@ [ { "dependentRealisations": { - "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!quux": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo" + "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!quux": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo" }, "id": "sha256:15e3c560894cbb27085cf65b5a2ecb18488c999497f4531b6907a7581ce6d527!baz", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [ "asdf", "qwer" diff --git a/src/libstore-tests/data/serve-protocol/realisation.bin b/src/libstore-tests/data/serve-protocol/realisation.bin index 3a0b2b2d8e3..9539b503f85 100644 Binary files a/src/libstore-tests/data/serve-protocol/realisation.bin and b/src/libstore-tests/data/serve-protocol/realisation.bin differ diff --git a/src/libstore-tests/data/serve-protocol/realisation.json b/src/libstore-tests/data/serve-protocol/realisation.json index f9ff09dbb63..f1c5f2bbd61 100644 --- a/src/libstore-tests/data/serve-protocol/realisation.json +++ b/src/libstore-tests/data/serve-protocol/realisation.json @@ -2,13 +2,13 @@ { "dependentRealisations": {}, "id": "sha256:15e3c560894cbb27085cf65b5a2ecb18488c999497f4531b6907a7581ce6d527!baz", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [] }, { "dependentRealisations": {}, "id": "sha256:15e3c560894cbb27085cf65b5a2ecb18488c999497f4531b6907a7581ce6d527!baz", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [ "asdf", "qwer" diff --git a/src/libstore-tests/data/serve-protocol/store-path.bin b/src/libstore-tests/data/serve-protocol/store-path.bin index 3fc05f2981d..b7e67b84933 100644 Binary files a/src/libstore-tests/data/serve-protocol/store-path.bin and b/src/libstore-tests/data/serve-protocol/store-path.bin differ diff --git a/src/libstore-tests/data/serve-protocol/store-path.json b/src/libstore-tests/data/serve-protocol/store-path.json index 16459245be8..666b85c0979 100644 --- a/src/libstore-tests/data/serve-protocol/store-path.json +++ b/src/libstore-tests/data/serve-protocol/store-path.json @@ -1,4 +1,4 @@ [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar" ] diff --git a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.bin b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.bin index 8056ec055ed..55be55b9e1b 100644 Binary files a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.bin and b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.bin differ diff --git a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.json b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.json index 0f593f4248d..70046733f74 100644 --- a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.json +++ b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.3.json @@ -13,11 +13,11 @@ }, { "ca": null, - "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "narHash": "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=", "narSize": 34878, "references": [ - "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo.drv" + "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3o-foo.drv" ], "registrationTime": null, "signatures": [], diff --git a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.bin b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.bin index 521b5c423c6..db1608b944e 100644 Binary files a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.bin and b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.bin differ diff --git a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.json b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.json index 801f2040002..16d191ef298 100644 --- a/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.json +++ b/src/libstore-tests/data/serve-protocol/unkeyed-valid-path-info-2.4.json @@ -1,11 +1,11 @@ [ { "ca": null, - "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo.drv" + "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3o-foo.drv" ], "registrationTime": null, "signatures": [], @@ -18,12 +18,12 @@ "hash": "sha256-EMIJ+giQ/gLIWoxmPKjno3zHZrxbGymgzGGyZvZBIdM=", "method": "nar" }, - "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ], "registrationTime": null, "signatures": [ diff --git a/src/libstore-tests/data/store-path/simple.json b/src/libstore-tests/data/store-path/simple.json index 9bedb882bca..53630e525c2 100644 --- a/src/libstore-tests/data/store-path/simple.json +++ b/src/libstore-tests/data/store-path/simple.json @@ -1 +1 @@ -"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv" +"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv" diff --git a/src/libstore-tests/data/worker-protocol/build-result-1.28.bin b/src/libstore-tests/data/worker-protocol/build-result-1.28.bin index 74bcd5cf98b..8ce98194923 100644 Binary files a/src/libstore-tests/data/worker-protocol/build-result-1.28.bin and b/src/libstore-tests/data/worker-protocol/build-result-1.28.bin differ diff --git a/src/libstore-tests/data/worker-protocol/build-result-1.28.json b/src/libstore-tests/data/worker-protocol/build-result-1.28.json index d02845b7faa..6567376a2b7 100644 --- a/src/libstore-tests/data/worker-protocol/build-result-1.28.json +++ b/src/libstore-tests/data/worker-protocol/build-result-1.28.json @@ -22,13 +22,13 @@ "bar": { "dependentRealisations": {}, "id": "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!bar", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", "signatures": [] }, "foo": { "dependentRealisations": {}, "id": "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!foo", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [] } }, diff --git a/src/libstore-tests/data/worker-protocol/build-result-1.29.bin b/src/libstore-tests/data/worker-protocol/build-result-1.29.bin index b02c706eab8..942d13567f4 100644 Binary files a/src/libstore-tests/data/worker-protocol/build-result-1.29.bin and b/src/libstore-tests/data/worker-protocol/build-result-1.29.bin differ diff --git a/src/libstore-tests/data/worker-protocol/build-result-1.29.json b/src/libstore-tests/data/worker-protocol/build-result-1.29.json index 30a8e82e926..9ec255941a9 100644 --- a/src/libstore-tests/data/worker-protocol/build-result-1.29.json +++ b/src/libstore-tests/data/worker-protocol/build-result-1.29.json @@ -22,13 +22,13 @@ "bar": { "dependentRealisations": {}, "id": "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!bar", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", "signatures": [] }, "foo": { "dependentRealisations": {}, "id": "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!foo", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [] } }, diff --git a/src/libstore-tests/data/worker-protocol/build-result-1.37.bin b/src/libstore-tests/data/worker-protocol/build-result-1.37.bin index 7d6e43fff2f..6567e1f47f2 100644 Binary files a/src/libstore-tests/data/worker-protocol/build-result-1.37.bin and b/src/libstore-tests/data/worker-protocol/build-result-1.37.bin differ diff --git a/src/libstore-tests/data/worker-protocol/build-result-1.37.json b/src/libstore-tests/data/worker-protocol/build-result-1.37.json index 61cddd2ca42..7fd16c2ee81 100644 --- a/src/libstore-tests/data/worker-protocol/build-result-1.37.json +++ b/src/libstore-tests/data/worker-protocol/build-result-1.37.json @@ -22,13 +22,13 @@ "bar": { "dependentRealisations": {}, "id": "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!bar", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", "signatures": [] }, "foo": { "dependentRealisations": {}, "id": "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!foo", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [] } }, diff --git a/src/libstore-tests/data/worker-protocol/derived-path-1.29.bin b/src/libstore-tests/data/worker-protocol/derived-path-1.29.bin index 05ea7678aa0..14f4e38ccbe 100644 Binary files a/src/libstore-tests/data/worker-protocol/derived-path-1.29.bin and b/src/libstore-tests/data/worker-protocol/derived-path-1.29.bin differ diff --git a/src/libstore-tests/data/worker-protocol/derived-path-1.29.json b/src/libstore-tests/data/worker-protocol/derived-path-1.29.json index f0efe4a3532..b12218ae29f 100644 --- a/src/libstore-tests/data/worker-protocol/derived-path-1.29.json +++ b/src/libstore-tests/data/worker-protocol/derived-path-1.29.json @@ -1,13 +1,13 @@ [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", { - "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "outputs": [ "*" ] }, { - "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "outputs": [ "x", "y" diff --git a/src/libstore-tests/data/worker-protocol/derived-path-1.30.bin b/src/libstore-tests/data/worker-protocol/derived-path-1.30.bin index 0729b2690e2..f77c64c4219 100644 Binary files a/src/libstore-tests/data/worker-protocol/derived-path-1.30.bin and b/src/libstore-tests/data/worker-protocol/derived-path-1.30.bin differ diff --git a/src/libstore-tests/data/worker-protocol/derived-path-1.30.json b/src/libstore-tests/data/worker-protocol/derived-path-1.30.json index 7a67e476100..98b982c1712 100644 --- a/src/libstore-tests/data/worker-protocol/derived-path-1.30.json +++ b/src/libstore-tests/data/worker-protocol/derived-path-1.30.json @@ -1,14 +1,14 @@ [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv", { - "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "outputs": [ "*" ] }, { - "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "outputs": [ "x", "y" diff --git a/src/libstore-tests/data/worker-protocol/keyed-build-result-1.29.bin b/src/libstore-tests/data/worker-protocol/keyed-build-result-1.29.bin index c5b3c7f3669..5e8ae88880e 100644 Binary files a/src/libstore-tests/data/worker-protocol/keyed-build-result-1.29.bin and b/src/libstore-tests/data/worker-protocol/keyed-build-result-1.29.bin differ diff --git a/src/libstore-tests/data/worker-protocol/keyed-build-result-1.29.json b/src/libstore-tests/data/worker-protocol/keyed-build-result-1.29.json index c15d47aa363..4bb3c91de01 100644 --- a/src/libstore-tests/data/worker-protocol/keyed-build-result-1.29.json +++ b/src/libstore-tests/data/worker-protocol/keyed-build-result-1.29.json @@ -2,7 +2,7 @@ { "errorMsg": "no idea why", "isNonDeterministic": false, - "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-xxx", + "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-xxx", "startTime": 0, "status": "OutputRejected", "stopTime": 0, @@ -13,7 +13,7 @@ "errorMsg": "no idea why", "isNonDeterministic": true, "path": { - "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "drvPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "outputs": [ "out" ] diff --git a/src/libstore-tests/data/worker-protocol/optional-store-path.bin b/src/libstore-tests/data/worker-protocol/optional-store-path.bin index 4fbca5576b6..170332c83e7 100644 Binary files a/src/libstore-tests/data/worker-protocol/optional-store-path.bin and b/src/libstore-tests/data/worker-protocol/optional-store-path.bin differ diff --git a/src/libstore-tests/data/worker-protocol/optional-store-path.json b/src/libstore-tests/data/worker-protocol/optional-store-path.json index 58519a4d2c4..28672167f55 100644 --- a/src/libstore-tests/data/worker-protocol/optional-store-path.json +++ b/src/libstore-tests/data/worker-protocol/optional-store-path.json @@ -1,4 +1,4 @@ [ null, - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar" ] diff --git a/src/libstore-tests/data/worker-protocol/realisation-with-deps.bin b/src/libstore-tests/data/worker-protocol/realisation-with-deps.bin index 54a78b64ebc..1dc2c43d004 100644 Binary files a/src/libstore-tests/data/worker-protocol/realisation-with-deps.bin and b/src/libstore-tests/data/worker-protocol/realisation-with-deps.bin differ diff --git a/src/libstore-tests/data/worker-protocol/realisation-with-deps.json b/src/libstore-tests/data/worker-protocol/realisation-with-deps.json index 77148d14ca4..413467866e3 100644 --- a/src/libstore-tests/data/worker-protocol/realisation-with-deps.json +++ b/src/libstore-tests/data/worker-protocol/realisation-with-deps.json @@ -1,10 +1,10 @@ [ { "dependentRealisations": { - "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!quux": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo" + "sha256:6f869f9ea2823bda165e06076fd0de4366dead2c0e8d2dbbad277d4f15c373f5!quux": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo" }, "id": "sha256:15e3c560894cbb27085cf65b5a2ecb18488c999497f4531b6907a7581ce6d527!baz", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [ "asdf", "qwer" diff --git a/src/libstore-tests/data/worker-protocol/realisation.bin b/src/libstore-tests/data/worker-protocol/realisation.bin index 3a0b2b2d8e3..9539b503f85 100644 Binary files a/src/libstore-tests/data/worker-protocol/realisation.bin and b/src/libstore-tests/data/worker-protocol/realisation.bin differ diff --git a/src/libstore-tests/data/worker-protocol/realisation.json b/src/libstore-tests/data/worker-protocol/realisation.json index f9ff09dbb63..f1c5f2bbd61 100644 --- a/src/libstore-tests/data/worker-protocol/realisation.json +++ b/src/libstore-tests/data/worker-protocol/realisation.json @@ -2,13 +2,13 @@ { "dependentRealisations": {}, "id": "sha256:15e3c560894cbb27085cf65b5a2ecb18488c999497f4531b6907a7581ce6d527!baz", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [] }, { "dependentRealisations": {}, "id": "sha256:15e3c560894cbb27085cf65b5a2ecb18488c999497f4531b6907a7581ce6d527!baz", - "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", + "outPath": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", "signatures": [ "asdf", "qwer" diff --git a/src/libstore-tests/data/worker-protocol/store-path.bin b/src/libstore-tests/data/worker-protocol/store-path.bin index 3fc05f2981d..b7e67b84933 100644 Binary files a/src/libstore-tests/data/worker-protocol/store-path.bin and b/src/libstore-tests/data/worker-protocol/store-path.bin differ diff --git a/src/libstore-tests/data/worker-protocol/store-path.json b/src/libstore-tests/data/worker-protocol/store-path.json index 16459245be8..666b85c0979 100644 --- a/src/libstore-tests/data/worker-protocol/store-path.json +++ b/src/libstore-tests/data/worker-protocol/store-path.json @@ -1,4 +1,4 @@ [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo", - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar" ] diff --git a/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.bin b/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.bin index e69ccbe8386..21daebb00e0 100644 Binary files a/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.bin and b/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.bin differ diff --git a/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.json b/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.json index 9cc53c6804e..ec28e77c8e1 100644 --- a/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.json +++ b/src/libstore-tests/data/worker-protocol/unkeyed-valid-path-info-1.15.json @@ -13,11 +13,11 @@ }, { "ca": null, - "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, "references": [ - "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo.drv" + "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3o-foo.drv" ], "registrationTime": 23423, "signatures": [], diff --git a/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.bin b/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.bin index 7adc8dd4472..c309340e90d 100644 Binary files a/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.bin and b/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.bin differ diff --git a/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.json b/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.json index 427c286ddfb..8531121c2cd 100644 --- a/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.json +++ b/src/libstore-tests/data/worker-protocol/valid-path-info-1.15.json @@ -4,7 +4,7 @@ "deriver": null, "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, - "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", "references": [], "registrationTime": 23423, "signatures": [], @@ -14,13 +14,13 @@ }, { "ca": null, - "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, - "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", "references": [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3o-foo" ], "registrationTime": 23423, "signatures": [], diff --git a/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.bin b/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.bin index a72de6bd62a..892623418d0 100644 Binary files a/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.bin and b/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.bin differ diff --git a/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.json b/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.json index f980d842174..f098cf1fa46 100644 --- a/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.json +++ b/src/libstore-tests/data/worker-protocol/valid-path-info-1.16.json @@ -4,7 +4,7 @@ "deriver": null, "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, - "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", "references": [], "registrationTime": 23423, "signatures": [], @@ -14,13 +14,13 @@ }, { "ca": null, - "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "deriver": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, - "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "path": "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", "references": [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3o-foo" ], "registrationTime": 23423, "signatures": [ @@ -39,10 +39,10 @@ "deriver": null, "narHash": "sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=", "narSize": 34878, - "path": "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo", + "path": "n5wkd9frr45pa74if5gpz9j7mifg27fo-foo", "references": [ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", - "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo" + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", + "n5wkd9frr45pa74if5gpz9j7mifg27fo-foo" ], "registrationTime": 23423, "signatures": [], diff --git a/src/libstore-tests/derivation-advanced-attrs.cc b/src/libstore-tests/derivation-advanced-attrs.cc index 296ffed619b..a54b1ad3e19 100644 --- a/src/libstore-tests/derivation-advanced-attrs.cc +++ b/src/libstore-tests/derivation-advanced-attrs.cc @@ -134,29 +134,29 @@ TEST_ATERM_JSON(advancedAttributes_structuredAttrs_defaults, "advanced-attribute * sense to give them names in this file. */ static SingleDerivedPath - pathFoo = SingleDerivedPath::Opaque{StorePath{"p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo"}}, - pathFooDev = SingleDerivedPath::Opaque{StorePath{"z0rjzy29v9k5qa4nqpykrbzirj7sd43v-foo-dev"}}, - pathBar = SingleDerivedPath::Opaque{StorePath{"r5cff30838majxk5mp3ip2diffi8vpaj-bar"}}, - pathBarDev = SingleDerivedPath::Opaque{StorePath{"9b61w26b4avv870dw0ymb6rw4r1hzpws-bar-dev"}}, - pathBarDrvIA = SingleDerivedPath::Opaque{StorePath{"vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv"}}, - pathBarDrvCA = SingleDerivedPath::Opaque{StorePath{"qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv"}}, + pathFoo = SingleDerivedPath::Opaque{StorePath{"p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo"}}, + pathFooDev = SingleDerivedPath::Opaque{StorePath{"z0rjzy29v9k5qa4nqpykrbzirj7sd43o-foo-dev"}}, + pathBar = SingleDerivedPath::Opaque{StorePath{"r5cff30838majxk5mp3ip2diffi8vpao-bar"}}, + pathBarDev = SingleDerivedPath::Opaque{StorePath{"9b61w26b4avv870dw0ymb6rw4r1hzpwo-bar-dev"}}, + pathBarDrvIA = SingleDerivedPath::Opaque{StorePath{"vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv"}}, + pathBarDrvCA = SingleDerivedPath::Opaque{StorePath{"qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv"}}, placeholderFoo = SingleDerivedPath::Built{ - .drvPath = makeConstantStorePathRef(StorePath{"j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv"}), + .drvPath = makeConstantStorePathRef(StorePath{"j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv"}), .output = "out", }, placeholderFooDev = SingleDerivedPath::Built{ - .drvPath = makeConstantStorePathRef(StorePath{"j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv"}), + .drvPath = makeConstantStorePathRef(StorePath{"j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv"}), .output = "dev", }, placeholderBar = SingleDerivedPath::Built{ - .drvPath = makeConstantStorePathRef(StorePath{"qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv"}), + .drvPath = makeConstantStorePathRef(StorePath{"qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv"}), .output = "out", }, placeholderBarDev = SingleDerivedPath::Built{ - .drvPath = makeConstantStorePathRef(StorePath{"qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv"}), + .drvPath = makeConstantStorePathRef(StorePath{"qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv"}), .output = "dev", }; diff --git a/src/libstore-tests/derivation/external-formats.cc b/src/libstore-tests/derivation/external-formats.cc index 056eeaa8a96..7322ee800d9 100644 --- a/src/libstore-tests/derivation/external-formats.cc +++ b/src/libstore-tests/derivation/external-formats.cc @@ -50,7 +50,7 @@ INSTANTIATE_TEST_SUITE_P( std::pair{ "inputAddressed", DerivationOutput{DerivationOutput::InputAddressed{ - .path = StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-drv-name-output-name"}, + .path = StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-drv-name-output-name"}, }}, }, std::pair{ @@ -182,13 +182,13 @@ Derivation makeSimpleDrv() Derivation drv; drv.name = "simple-derivation"; drv.inputSrcs = { - StorePath("c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1"), + StorePath("c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep1"), }; drv.inputDrvs = { .map = { { - StorePath("c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep2.drv"), + StorePath("c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep2.drv"), { .value = { @@ -228,13 +228,13 @@ Derivation makeDynDepDerivation() Derivation drv; drv.name = "dyn-dep-derivation"; drv.inputSrcs = { - StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep1"}, + StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep1"}, }; drv.inputDrvs = { .map = { { - StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-dep2.drv"}, + StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-dep2.drv"}, DerivedPathMap::ChildNode{ .value = { diff --git a/src/libstore-tests/derivation/invariants.cc b/src/libstore-tests/derivation/invariants.cc index cacdca0cdc0..9a8542823c2 100644 --- a/src/libstore-tests/derivation/invariants.cc +++ b/src/libstore-tests/derivation/invariants.cc @@ -127,7 +127,7 @@ TEST_F(FillInOutputPathsTest, fillsDeferredOutputs_empty_string_var) TEST_F(FillInOutputPathsTest, preservesInputAddressedOutputs) { - auto expectedPath = StorePath{"w4bk7hpyxzgy2gx8fsa8f952435pll3i-filled-in-already"}; + auto expectedPath = StorePath{"w4bk7hpyxzgy2gx8fsa8f952435pll3o-filled-in-already"}; Derivation drv; drv.name = "filled-in-already"; @@ -154,7 +154,7 @@ TEST_F(FillInOutputPathsTest, preservesInputAddressedOutputs) TEST_F(FillInOutputPathsTest, throwsOnIncorrectInputAddressedPath) { - auto wrongPath = StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-wrong-name"}; + auto wrongPath = StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-wrong-name"}; Derivation drv; drv.name = "bad-path"; @@ -177,7 +177,7 @@ TEST_F(FillInOutputPathsTest, throwsOnIncorrectInputAddressedPath) #if 0 TEST_F(FillInOutputPathsTest, throwsOnIncorrectEnvVar) { - auto wrongPath = StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-wrong-name"}; + auto wrongPath = StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-wrong-name"}; Derivation drv; drv.name = "bad-env-var"; @@ -239,7 +239,7 @@ TEST_F(FillInOutputPathsTest, throwsOnPatWhenShouldBeDeffered) // Create a CA floating dependency derivation auto depDrvPath = makeCAFloatingDependency("dependency"); - auto wrongPath = StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hr9-wrong-name"}; + auto wrongPath = StorePath{"c015dhfh5l0lp6wxyvdn7bmwhbbr6hro-wrong-name"}; // Create a derivation that depends on the dependency Derivation drv; diff --git a/src/libstore-tests/derived-path.cc b/src/libstore-tests/derived-path.cc index 70e789c0c4f..0a922bc2552 100644 --- a/src/libstore-tests/derived-path.cc +++ b/src/libstore-tests/derived-path.cc @@ -27,7 +27,7 @@ class DerivedPathTest : public virtual CharacterizationTest, public LibStoreTest */ TEST_F(DerivedPathTest, opaque) { - std::string_view opaque = "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x"; + std::string_view opaque = "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-x"; auto elem = DerivedPath::parse(*store, opaque); auto * p = std::get_if(&elem); ASSERT_TRUE(p); @@ -41,7 +41,7 @@ TEST_F(DerivedPathTest, opaque) */ TEST_F(DerivedPathTest, built_opaque) { - std::string_view built = "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x.drv^bar,foo"; + std::string_view built = "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-x.drv^bar,foo"; auto elem = DerivedPath::parse(*store, built); auto * p = std::get_if(&elem); ASSERT_TRUE(p); @@ -67,7 +67,7 @@ TEST_F(DerivedPathTest, built_built) ExperimentalFeatureSettings mockXpSettings; mockXpSettings.set("experimental-features", "dynamic-derivations ca-derivations"); - std::string_view built = "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x.drv^foo^bar,baz"; + std::string_view built = "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-x.drv^foo^bar,baz"; auto elem = DerivedPath::parse(*store, built, mockXpSettings); auto * p = std::get_if(&elem); ASSERT_TRUE(p); @@ -90,7 +90,7 @@ TEST_F(DerivedPathTest, built_built) TEST_F(DerivedPathTest, built_built_xp) { ASSERT_THROW( - DerivedPath::parse(*store, "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-x.drv^foo^bar,baz"), + DerivedPath::parse(*store, "/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-x.drv^foo^bar,baz"), MissingExperimentalFeature); } @@ -98,7 +98,7 @@ TEST_F(DerivedPathTest, built_built_xp) /* TODO: Disabled due to the following error: - path '00000000000000000000000000000000-0^0' is not a valid store path: + path '0000000000000000000000000000000o-0^0' is not a valid store path: name '0^0' contains illegal character '^' */ RC_GTEST_FIXTURE_PROP(DerivedPathTest, DISABLED_prop_legacy_round_rip, (const DerivedPath & o)) @@ -171,14 +171,14 @@ struct DerivedPathJsonTest : DerivedPathTest, } TEST_JSON( - SingleDerivedPath, single_opaque, SingleDerivedPath::Opaque{StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}}); + SingleDerivedPath, single_opaque, SingleDerivedPath::Opaque{StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}}); TEST_JSON( SingleDerivedPath, single_built, (SingleDerivedPath::Built{ .drvPath = make_ref(SingleDerivedPath::Opaque{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}}), + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}}), .output = "bar", })); @@ -188,20 +188,20 @@ TEST_JSON_XP_DYN( (SingleDerivedPath::Built{ .drvPath = make_ref(SingleDerivedPath::Built{ .drvPath = make_ref(SingleDerivedPath::Opaque{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}}), + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}}), .output = "bar", }), .output = "baz", })); -TEST_JSON(DerivedPath, multi_opaque, DerivedPath::Opaque{StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}}); +TEST_JSON(DerivedPath, multi_opaque, DerivedPath::Opaque{StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}}); TEST_JSON( DerivedPath, mutli_built, (DerivedPath::Built{ .drvPath = make_ref(SingleDerivedPath::Opaque{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}}), + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}}), .outputs = OutputsSpec::Names{"bar", "baz"}, })); @@ -211,7 +211,7 @@ TEST_JSON_XP_DYN( (DerivedPath::Built{ .drvPath = make_ref(SingleDerivedPath::Built{ .drvPath = make_ref(SingleDerivedPath::Opaque{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}}), + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}}), .output = "bar", }), .outputs = OutputsSpec::Names{"baz", "quux"}, @@ -223,7 +223,7 @@ TEST_JSON_XP_DYN( (DerivedPath::Built{ .drvPath = make_ref(SingleDerivedPath::Built{ .drvPath = make_ref(SingleDerivedPath::Opaque{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}}), + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}}), .output = "bar", }), .outputs = OutputsSpec::All{}, diff --git a/src/libstore-tests/downstream-placeholder.cc b/src/libstore-tests/downstream-placeholder.cc index 4659a0f811b..75f9102666a 100644 --- a/src/libstore-tests/downstream-placeholder.cc +++ b/src/libstore-tests/downstream-placeholder.cc @@ -15,7 +15,7 @@ TEST(DownstreamPlaceholder, unknownCaOutput) ASSERT_EQ( DownstreamPlaceholder::unknownCaOutput( - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}, "out", mockXpSettings) + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}, "out", mockXpSettings) .render(), "/0c6rn30q4frawknapgwq386zq358m8r6msvywcvc89n6m5p2dgbz"); } @@ -31,7 +31,7 @@ TEST(DownstreamPlaceholder, unknownDerivation) ASSERT_EQ( DownstreamPlaceholder::unknownDerivation( DownstreamPlaceholder::unknownCaOutput( - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv.drv"}, "out", mockXpSettings), + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv.drv"}, "out", mockXpSettings), "out", mockXpSettings) .render(), diff --git a/src/libstore-tests/dummy-store.cc b/src/libstore-tests/dummy-store.cc index 4a12dcf78c0..c9e458155a7 100644 --- a/src/libstore-tests/dummy-store.cc +++ b/src/libstore-tests/dummy-store.cc @@ -45,7 +45,7 @@ TEST(DummyStore, realisation_read) EXPECT_EQ(store->queryRealisation({drvHash, outputName}), nullptr); UnkeyedRealisation value{ - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}, }; store->buildTrace.insert({drvHash, {{outputName, value}}}); @@ -139,7 +139,7 @@ INSTANTIATE_TEST_SUITE_P(DummyStoreJSON, DummyStoreJsonTest, [] { { "out", UnkeyedRealisation{ - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, }, }); diff --git a/src/libstore-tests/nar-info.cc b/src/libstore-tests/nar-info.cc index 493ca2a8c37..421d9b8f1df 100644 --- a/src/libstore-tests/nar-info.cc +++ b/src/libstore-tests/nar-info.cc @@ -45,7 +45,7 @@ static NarInfo makeNarInfo(const Store & store, bool includeImpureInfo) .others = { StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", }, }, .self = true, @@ -55,7 +55,7 @@ static NarInfo makeNarInfo(const Store & store, bool includeImpureInfo) info.narSize = 34878; if (includeImpureInfo) { info.deriver = StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }; info.registrationTime = 23423; info.ultimate = true; diff --git a/src/libstore-tests/nix_api_store.cc b/src/libstore-tests/nix_api_store.cc index ea600f90570..d256264de95 100644 --- a/src/libstore-tests/nix_api_store.cc +++ b/src/libstore-tests/nix_api_store.cc @@ -14,7 +14,7 @@ namespace nixC { -std::string PATH_SUFFIX = "/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-name"; +std::string PATH_SUFFIX = "/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-name"; TEST_F(nix_api_util_context, nix_libstore_init) { diff --git a/src/libstore-tests/path-info.cc b/src/libstore-tests/path-info.cc index 6c0fd183beb..9fcac1396af 100644 --- a/src/libstore-tests/path-info.cc +++ b/src/libstore-tests/path-info.cc @@ -52,7 +52,7 @@ static ValidPathInfo makeFullKeyed(const Store & store, bool includeImpureInfo) .others = { StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", }, }, .self = true, @@ -62,7 +62,7 @@ static ValidPathInfo makeFullKeyed(const Store & store, bool includeImpureInfo) info.narSize = 34878; if (includeImpureInfo) { info.deriver = StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }; info.registrationTime = 23423; info.ultimate = true; @@ -145,8 +145,8 @@ TEST_F(PathInfoTestV2, PathInfo_full_shortRefs) // it.references = unkeyed.references; auto refs = it.shortRefs(); ASSERT_EQ(refs.size(), 2u); - ASSERT_EQ(*refs.begin(), "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"); - ASSERT_EQ(*++refs.begin(), "n5wkd9frr45pa74if5gpz9j7mifg27fh-foo"); + ASSERT_EQ(*refs.begin(), "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar"); + ASSERT_EQ(*++refs.begin(), "n5wkd9frr45pa74if5gpz9j7mifg27fo-foo"); } } // namespace nix diff --git a/src/libstore-tests/path.cc b/src/libstore-tests/path.cc index eb860a34dab..3cc2bca57b1 100644 --- a/src/libstore-tests/path.cc +++ b/src/libstore-tests/path.cc @@ -131,7 +131,7 @@ RC_GTEST_FIXTURE_PROP(StorePathTest, prop_check_regex_eq_parse, ()) auto name = *nameFuzzer; - std::string path = store->storeDir + "/575s52sh487i0ylmbs9pvi606ljdszr0-" + name; + std::string path = store->storeDir + "/575s52sh487i0ylmbs9pvi606ljdszro-" + name; bool parsed = false; try { store->parseStorePath(path); @@ -172,7 +172,7 @@ INSTANTIATE_TEST_SUITE_P( ::testing::Values( std::pair{ "simple", - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}, })); } // namespace nix diff --git a/src/libstore-tests/realisation.cc b/src/libstore-tests/realisation.cc index d16049bc5b0..a049c4e35b3 100644 --- a/src/libstore-tests/realisation.cc +++ b/src/libstore-tests/realisation.cc @@ -50,7 +50,7 @@ INSTANTIATE_TEST_SUITE_P( ([] { Realisation simple{ { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}, }, { .drvHash = Hash::parseExplicitFormatUnprefixed( @@ -85,7 +85,7 @@ INSTANTIATE_TEST_SUITE_P( HashFormat::Base16), .outputName = "foo", }, - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}, }}; return r; }(), diff --git a/src/libstore-tests/references.cc b/src/libstore-tests/references.cc index f2c6fb51e5c..e9ded641d2a 100644 --- a/src/libstore-tests/references.cc +++ b/src/libstore-tests/references.cc @@ -86,9 +86,9 @@ TEST(references, scanForReferencesDeep) using File = MemorySourceAccessor::File; // Create store paths to search for - StorePath path1{"dc04vv14dak1c1r48qa0m23vr9jy8sm0-foo"}; - StorePath path2{"zc842j0rz61mjsp3h3wp5ly71ak6qgdn-bar"}; - StorePath path3{"a5cn2i4b83gnsm60d38l3kgb8qfplm11-baz"}; + StorePath path1{"dc04vv14dak1c1r48qa0m23vr9jy8smo-foo"}; + StorePath path2{"zc842j0rz61mjsp3h3wp5ly71ak6qgdo-bar"}; + StorePath path3{"a5cn2i4b83gnsm60d38l3kgb8qfplm1o-baz"}; StorePathSet refs{path1, path2, path3}; diff --git a/src/libstore-tests/serve-protocol.cc b/src/libstore-tests/serve-protocol.cc index 258dbf04990..09c3e6293a0 100644 --- a/src/libstore-tests/serve-protocol.cc +++ b/src/libstore-tests/serve-protocol.cc @@ -49,8 +49,8 @@ VERSIONED_CHARACTERIZATION_TEST( "store-path", defaultVersion, (std::tuple{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar"}, })) VERSIONED_CHARACTERIZATION_TEST( @@ -99,7 +99,7 @@ VERSIONED_CHARACTERIZATION_TEST( (std::tuple{ Realisation{ { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, { .drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="), @@ -108,7 +108,7 @@ VERSIONED_CHARACTERIZATION_TEST( }, Realisation{ { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, .signatures = {"asdf", "qwer"}, }, { @@ -126,7 +126,7 @@ VERSIONED_CHARACTERIZATION_TEST( (std::tuple{ Realisation{ { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, .signatures = {"asdf", "qwer"}, .dependentRealisations = { @@ -135,7 +135,7 @@ VERSIONED_CHARACTERIZATION_TEST( .drvHash = Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), .outputName = "quux", }, - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, }, }, @@ -219,7 +219,7 @@ VERSIONED_CHARACTERIZATION_TEST( "foo", { { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, DrvOutput{ .drvHash = @@ -232,7 +232,7 @@ VERSIONED_CHARACTERIZATION_TEST( "bar", { { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar"}, }, DrvOutput{ .drvHash = @@ -272,11 +272,11 @@ VERSIONED_CHARACTERIZATION_TEST( ({ UnkeyedValidPathInfo info{std::string{defaultStoreDir}, Hash::dummy}; info.deriver = StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }; info.references = { StorePath{ - "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo.drv", + "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3o-foo.drv", }, }; info.narSize = 34878; @@ -296,11 +296,11 @@ VERSIONED_CHARACTERIZATION_TEST( Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="), }; info.deriver = StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }; info.references = { StorePath{ - "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo.drv", + "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3o-foo.drv", }, }; info.narSize = 34878; @@ -318,7 +318,7 @@ VERSIONED_CHARACTERIZATION_TEST( .others = { StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", }, }, .self = true, @@ -326,7 +326,7 @@ VERSIONED_CHARACTERIZATION_TEST( }, Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc=")); info.deriver = StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }; info.narSize = 34878; info.sigs = @@ -422,7 +422,7 @@ VERSIONED_CHARACTERIZATION_TEST( (std::tuple, std::optional>{ std::nullopt, std::optional{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar"}, }, })) diff --git a/src/libstore-tests/worker-protocol.cc b/src/libstore-tests/worker-protocol.cc index 7416d732301..f0b550932da 100644 --- a/src/libstore-tests/worker-protocol.cc +++ b/src/libstore-tests/worker-protocol.cc @@ -49,8 +49,8 @@ VERSIONED_CHARACTERIZATION_TEST( "store-path", defaultVersion, (std::tuple{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar"}, })) VERSIONED_CHARACTERIZATION_TEST( @@ -82,19 +82,19 @@ VERSIONED_CHARACTERIZATION_TEST( 1 << 8 | 29, (std::tuple{ DerivedPath::Opaque{ - .path = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .path = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, DerivedPath::Built{ .drvPath = makeConstantStorePathRef( StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }), .outputs = OutputsSpec::All{}, }, DerivedPath::Built{ .drvPath = makeConstantStorePathRef( StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }), .outputs = OutputsSpec::Names{"x", "y"}, }, @@ -107,22 +107,22 @@ VERSIONED_CHARACTERIZATION_TEST( 1 << 8 | 30, (std::tuple{ DerivedPath::Opaque{ - .path = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .path = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, DerivedPath::Opaque{ - .path = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo.drv"}, + .path = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo.drv"}, }, DerivedPath::Built{ .drvPath = makeConstantStorePathRef( StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }), .outputs = OutputsSpec::All{}, }, DerivedPath::Built{ .drvPath = makeConstantStorePathRef( StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }), .outputs = OutputsSpec::Names{"x", "y"}, }, @@ -152,7 +152,7 @@ VERSIONED_CHARACTERIZATION_TEST( (std::tuple{ Realisation{ { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, { .drvHash = Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="), @@ -161,7 +161,7 @@ VERSIONED_CHARACTERIZATION_TEST( }, Realisation{ { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, .signatures = {"asdf", "qwer"}, }, { @@ -179,7 +179,7 @@ VERSIONED_CHARACTERIZATION_TEST( (std::tuple{ Realisation{ { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, .signatures = {"asdf", "qwer"}, .dependentRealisations = { @@ -188,7 +188,7 @@ VERSIONED_CHARACTERIZATION_TEST( .drvHash = Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), .outputName = "quux", }, - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, }, }, @@ -237,7 +237,7 @@ VERSIONED_CHARACTERIZATION_TEST( "foo", { { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, DrvOutput{ .drvHash = Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), @@ -249,7 +249,7 @@ VERSIONED_CHARACTERIZATION_TEST( "bar", { { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar"}, }, DrvOutput{ .drvHash = Hash::parseSRI("sha256-b4afnqKCO9oWXgYHb9DeQ2berSwOjS27rSd9TxXDc/U="), @@ -290,7 +290,7 @@ VERSIONED_CHARACTERIZATION_TEST( "foo", { { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, DrvOutput{ .drvHash = @@ -303,7 +303,7 @@ VERSIONED_CHARACTERIZATION_TEST( "bar", { { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar"}, }, DrvOutput{ .drvHash = @@ -349,7 +349,7 @@ VERSIONED_CHARACTERIZATION_TEST( "foo", { { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo"}, }, DrvOutput{ .drvHash = @@ -362,7 +362,7 @@ VERSIONED_CHARACTERIZATION_TEST( "bar", { { - .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"}, + .outPath = StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar"}, }, DrvOutput{ .drvHash = @@ -393,7 +393,7 @@ VERSIONED_CHARACTERIZATION_TEST(WorkerProtoTest, keyedBuildResult_1_29, "keyed-b }}}, /* .path = */ DerivedPath::Opaque{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-xxx"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-xxx"}, }, }, KeyedBuildResult{ @@ -411,7 +411,7 @@ VERSIONED_CHARACTERIZATION_TEST(WorkerProtoTest, keyedBuildResult_1_29, "keyed-b DerivedPath::Built{ .drvPath = makeConstantStorePathRef( StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }), .outputs = OutputsSpec::Names{"out"}, }, @@ -441,11 +441,11 @@ VERSIONED_CHARACTERIZATION_TEST( Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="), }; info.deriver = StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }; info.references = { StorePath{ - "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo.drv", + "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3o-foo.drv", }, }; info.registrationTime = 23423; @@ -463,7 +463,7 @@ VERSIONED_CHARACTERIZATION_TEST( ({ ValidPathInfo info{ StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", }, UnkeyedValidPathInfo{ std::string{defaultStoreDir}, @@ -477,7 +477,7 @@ VERSIONED_CHARACTERIZATION_TEST( ({ ValidPathInfo info{ StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", }, UnkeyedValidPathInfo{ std::string{defaultStoreDir}, @@ -485,16 +485,16 @@ VERSIONED_CHARACTERIZATION_TEST( }, }; info.deriver = StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }; info.references = { // other reference StorePath{ - "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo", + "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3o-foo", }, // self reference StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", }, }; info.registrationTime = 23423; @@ -512,7 +512,7 @@ VERSIONED_CHARACTERIZATION_TEST( ({ ValidPathInfo info{ StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", }, UnkeyedValidPathInfo{ std::string{defaultStoreDir}, @@ -527,7 +527,7 @@ VERSIONED_CHARACTERIZATION_TEST( ({ ValidPathInfo info{ StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", }, UnkeyedValidPathInfo{ std::string{defaultStoreDir}, @@ -535,16 +535,16 @@ VERSIONED_CHARACTERIZATION_TEST( }, }; info.deriver = StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar.drv", }; info.references = { // other reference StorePath{ - "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo", + "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3o-foo", }, // self reference StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", }, }; info.registrationTime = 23423; @@ -568,7 +568,7 @@ VERSIONED_CHARACTERIZATION_TEST( .others = { StorePath{ - "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar", + "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar", }, }, .self = true, @@ -639,7 +639,7 @@ VERSIONED_CHARACTERIZATION_TEST( (std::tuple, std::optional>{ std::nullopt, std::optional{ - StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-foo-bar"}, + StorePath{"g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-foo-bar"}, }, })) diff --git a/src/libstore/include/nix/store/globals.hh b/src/libstore/include/nix/store/globals.hh index d28198a16ad..dc7b7d5a7c7 100644 --- a/src/libstore/include/nix/store/globals.hh +++ b/src/libstore/include/nix/store/globals.hh @@ -1114,18 +1114,18 @@ public: The derivation for the built paths. Example: - `/nix/store/5nihn1a7pa8b25l9zafqaqibznlvvp3f-bash-4.4-p23.drv` + `/nix/store/5nihn1a7pa8b25l9zafqaqibznlvvp3o-bash-4.4-p23.drv` - `OUT_PATHS` Output paths of the built derivation, separated by a space 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/zf5lbh336mnzf1nlswdn11g4n2m8zh3o-bash-4.4-p23-dev + /nix/store/rjxwxwv1fpn9wa2x5ssk5phzwlcv4mno-bash-4.4-p23-doc + /nix/store/6bqvbzjkcp9695dq0dpl5y43nvy37pqo-bash-4.4-p23-info + /nix/store/r7fng3kk3vlpdlh2idnrbn37vh4imljo-bash-4.4-p23-man + /nix/store/xfghy8ixrhz3kyy6p724iv3cxji088do-bash-4.4-p23`. )"}; Setting downloadSpeed{ diff --git a/src/libstore/include/nix/store/path-references.hh b/src/libstore/include/nix/store/path-references.hh index 6aa506da4a3..bb25da8ece6 100644 --- a/src/libstore/include/nix/store/path-references.hh +++ b/src/libstore/include/nix/store/path-references.hh @@ -47,7 +47,7 @@ struct FileRefScanResult * * Note: This function only searches for the hash part of store paths (e.g., * "dc04vv14dak1c1r48qa0m23vr9jy8sm0"), not the name part. A store path like - * "/nix/store/dc04vv14dak1c1r48qa0m23vr9jy8sm0-foo" will be detected if the + * "/nix/store/dc04vv14dak1c1r48qa0m23vr9jy8smo-foo" will be detected if the * hash appears anywhere in the scanned content, regardless of the "-foo" suffix. * * @param accessor Source accessor to read the tree diff --git a/src/libstore/path.cc b/src/libstore/path.cc index fa430ce94d7..11b4f7fc94f 100644 --- a/src/libstore/path.cc +++ b/src/libstore/path.cc @@ -70,7 +70,7 @@ void StorePath::requireDerivation() const throw FormatError("store path '%s' is not a valid derivation path", to_string()); } -StorePath StorePath::dummy("ffffffffffffffffffffffffffffffff-x"); +StorePath StorePath::dummy("fffffffffffffffffffffffffffffffo-x"); StorePath StorePath::random(std::string_view name) { diff --git a/src/libutil/experimental-features.cc b/src/libutil/experimental-features.cc index 757578cff1c..9e13bb14a89 100644 --- a/src/libutil/experimental-features.cc +++ b/src/libutil/experimental-features.cc @@ -126,14 +126,14 @@ constexpr std::array xpFeatureDetails arbitrary substitutions. For example, running ``` - nix-store -r /nix/store/kmwd1hq55akdb9sc7l3finr175dajlby-hello-2.10 + nix-store -r /nix/store/kmwd1hq55akdb9sc7l3finr175dajlbo-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/kmwd1hq55akdb9sc7l3finr175dajlbo-hello-2.10` were already in the build inputs or built by a previous recursive Nix call. )", diff --git a/src/nix/add.md b/src/nix/add.md index d38cd21d87f..1418983027c 100644 --- a/src/nix/add.md +++ b/src/nix/add.md @@ -20,9 +20,9 @@ Add a directory to the store: # echo foo > dir/bar # nix store add ./dir -/nix/store/6pmjx56pm94n66n4qw1nff0y1crm8nqg-dir +/nix/store/6pmjx56pm94n66n4qw1nff0y1crm8nqo-dir -# cat /nix/store/6pmjx56pm94n66n4qw1nff0y1crm8nqg-dir/bar +# cat /nix/store/6pmjx56pm94n66n4qw1nff0y1crm8nqo-dir/bar foo ``` diff --git a/src/nix/build.md b/src/nix/build.md index 5dfdd44a71f..b86de500872 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/v5sv61sszx301i0x6xysaqzla09nksno-hello-2.10 + lrwxrwxrwx 1 … result-1 -> /nix/store/rkfrm0z6x6jmi7d3gsmma4j53h15mg3o-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/v5sv61sszx301i0x6xysaqzla09nksno-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/dkm3gwl0xrx0wrw6zi5x3px3lpgjhlwo-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/gvad6v0cmq1qccmc4wphsazqbj0xzjso-openssl-3.0.13-bin + /nix/store/a07jqdrc8afnk8r6f3lnhh4gvab7chko-openssl-3.0.13-debug + /nix/store/yg75achq89wgqn2fi3gglgsd77kjpi0o-openssl-3.0.13-dev + /nix/store/bvdcihi8c88fw31cg6gzzmpnwglpn1jo-openssl-3.0.13-doc + /nix/store/gjqcvq47cmxazxga0cirspm3jywkmvfo-openssl-3.0.13-man + /nix/store/7nmrrad8skxr47f9hfl3xc0pfqmwq51o-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/rkfrm0z6x6jmi7d3gsmma4j53h15mg3o-cowsay-3.03+dfsg2 ``` # Description diff --git a/src/nix/copy.md b/src/nix/copy.md index 813050fcbab..0de6771d4c9 100644 --- a/src/nix/copy.md +++ b/src/nix/copy.md @@ -32,7 +32,7 @@ R""( * Copy a closure from another machine via SSH: ```console - # nix copy --from ssh://server /nix/store/a6cnl93nk1wxnq84brbbwr6hxw9gp2w9-blender-2.79-rc2 + # nix copy --from ssh://server /nix/store/a6cnl93nk1wxnq84brbbwr6hxw9gp2wo-blender-2.79-rc2 ``` * Copy Hello to a binary cache in an Amazon S3 bucket: @@ -61,7 +61,7 @@ R""( ```console # nix copy --from ssh://server \ --profile /nix/var/nix/profiles/system \ - /nix/store/r14v3km89zm3prwsa521fab5kgzvfbw4-nixos-system-foobar-24.05.20240925.759537f + /nix/store/r14v3km89zm3prwsa521fab5kgzvfbwo-nixos-system-foobar-24.05.20240925.759537f ``` # Description diff --git a/src/nix/derivation-show.md b/src/nix/derivation-show.md index 6948b5ba72e..442efae8f11 100644 --- a/src/nix/derivation-show.md +++ b/src/nix/derivation-show.md @@ -8,7 +8,7 @@ R""( ```console # nix derivation show nixpkgs#hello { - "/nix/store/s6rn4jz1sin56rf4qj5b5v8jxjm32hlk-hello-2.10.drv": { + "/nix/store/s6rn4jz1sin56rf4qj5b5v8jxjm32hlo-hello-2.10.drv": { … } } diff --git a/src/nix/edit.md b/src/nix/edit.md index 89bd09abf80..dc9d6dbc3c0 100644 --- a/src/nix/edit.md +++ b/src/nix/edit.md @@ -12,7 +12,7 @@ R""( ```console # nix eval --raw nixpkgs#hello.meta.position - /nix/store/fvafw0gvwayzdan642wrv84pzm5bgpmy-source/pkgs/applications/misc/hello/default.nix:15 + /nix/store/fvafw0gvwayzdan642wrv84pzm5bgpmo-source/pkgs/applications/misc/hello/default.nix:15 ``` # Description diff --git a/src/nix/flake-metadata.md b/src/nix/flake-metadata.md index adfd3dc96bb..07bcbfa9e29 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/769s05vjydmc2lcf6b02az28wsa9ixho-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/hang3792qwdmm2n0d9nsrs5n6bsws6ko-source", "resolved": { "owner": "edolstra", "repo": "dwarffs", diff --git a/src/nix/flake-prefetch.md b/src/nix/flake-prefetch.md index 4666aadc4df..66405e7edda 100644 --- a/src/nix/flake-prefetch.md +++ b/src/nix/flake-prefetch.md @@ -7,7 +7,7 @@ R""( ```console # nix flake prefetch https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.5.tar.xz --out-link ./result Downloaded 'https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.5.tar.xz?narHash=sha256-3XYHZANT6AFBV0BqegkAZHbba6oeDkIUCDwbATLMhAY=' - to '/nix/store/sl5vvk8mb4ma1sjyy03kwpvkz50hd22d-source' (hash + to '/nix/store/sl5vvk8mb4ma1sjyy03kwpvkz50hd22o-source' (hash 'sha256-3XYHZANT6AFBV0BqegkAZHbba6oeDkIUCDwbATLMhAY='). # cat ./result/README @@ -20,7 +20,7 @@ R""( ```console # nix flake prefetch dwarffs --json {"hash":"sha256-VHg3MYVgQ12LeRSU2PSoDeKlSPD8PYYEFxxwkVVDRd0=" - ,"storePath":"/nix/store/hang3792qwdmm2n0d9nsrs5n6bsws6kv-source"} + ,"storePath":"/nix/store/hang3792qwdmm2n0d9nsrs5n6bsws6ko-source"} ``` # Description diff --git a/src/nix/formatter-build.md b/src/nix/formatter-build.md index fbb6adb1cec..9dd76a8f36e 100644 --- a/src/nix/formatter-build.md +++ b/src/nix/formatter-build.md @@ -18,6 +18,6 @@ It always prints the command to standard output. ```console # nix formatter build - /nix/store/cb9w44vkhk2x4adfxwgdkkf5gjmm856j-treefmt/bin/treefmt + /nix/store/cb9w44vkhk2x4adfxwgdkkf5gjmm856o-treefmt/bin/treefmt ``` )"" diff --git a/src/nix/log.md b/src/nix/log.md index 01e9801df72..ddf6382b358 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/lmngj4wcm9rkv3w4dfhzhcyij3195hio-thunderbird-52.2.1 ``` * Get a build log from a specific binary cache: @@ -32,7 +32,7 @@ Nix looks for build logs in two places: * In the binary caches listed in the `substituters` setting. Logs should be named `/log/`, where `store-path` is a derivation, - e.g. `https://cache.nixos.org/log/dvmig8jgrdapvbyxb1rprckdmdqx08kv-hello-2.10.drv`. + e.g. `https://cache.nixos.org/log/dvmig8jgrdapvbyxb1rprckdmdqx08ko-hello-2.10.drv`. For non-derivation store paths, Nix will first try to determine the deriver by fetching the `.narinfo` file for this store path. diff --git a/src/nix/make-content-addressed.md b/src/nix/make-content-addressed.md index e6a51c83ada..04b0f8cf3cd 100644 --- a/src/nix/make-content-addressed.md +++ b/src/nix/make-content-addressed.md @@ -7,14 +7,14 @@ 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/v5sv61sszx301i0x6xysaqzla09nksno-hello-2.10' to '/nix/store/5skmmcb9svys5lj3kbsrjg7vf2irid6o-hello-2.10' ``` Since the resulting paths are content-addressed, they are always trusted and don't need signatures to copied to another store: ```console - # nix copy --to /tmp/nix --trusted-public-keys '' /nix/store/5skmmcb9svys5lj3kbsrjg7vf2irid63-hello-2.10 + # nix copy --to /tmp/nix --trusted-public-keys '' /nix/store/5skmmcb9svys5lj3kbsrjg7vf2irid6o-hello-2.10 ``` By contrast, the original closure is input-addressed, so it does @@ -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/zy9wbxwcygrwnh8n2w9qbbcr6zk87m2o-libunistring-0.9.10' because it lacks a signature by a trusted key ``` * Create a content-addressed representation of the current NixOS @@ -51,7 +51,7 @@ be verified without any additional information such as signatures. This means that a command like ```console -# nix build /nix/store/5skmmcb9svys5lj3kbsrjg7vf2irid63-hello-2.10 \ +# nix build /nix/store/5skmmcb9svys5lj3kbsrjg7vf2irid6o-hello-2.10 \ --substituters https://my-cache.example.org ``` diff --git a/src/nix/nario-list.md b/src/nix/nario-list.md index ea833586074..2a3b5fe4d59 100644 --- a/src/nix/nario-list.md +++ b/src/nix/nario-list.md @@ -6,8 +6,8 @@ R""( ```console # nix nario list < dump.nario - /nix/store/4y1jj6cwvslmfh1bzkhbvhx77az6yf00-xgcc-14.2.1.20250322-libgcc: 201856 bytes - /nix/store/d8hnbm5hvbg2vza50garppb63y724i94-libunistring-1.3: 2070240 bytes + /nix/store/4y1jj6cwvslmfh1bzkhbvhx77az6yf0o-xgcc-14.2.1.20250322-libgcc: 201856 bytes + /nix/store/d8hnbm5hvbg2vza50garppb63y724i9o-libunistring-1.3: 2070240 bytes … ``` diff --git a/src/nix/nix.md b/src/nix/nix.md index 83a1fd0776f..5a1bce15d65 100644 --- a/src/nix/nix.md +++ b/src/nix/nix.md @@ -128,21 +128,21 @@ 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/v5sv61sszx301i0x6xysaqzla09nksno-hello-2.10` These are paths inside the Nix store, or symlinks that resolve to a path in the Nix store. A [store derivation] is also addressed by store path. -Example: `/nix/store/p7gp6lxdg32h4ka1q398wd9r2zkbbz2v-hello-2.10.drv` +Example: `/nix/store/p7gp6lxdg32h4ka1q398wd9r2zkbbz2o-hello-2.10.drv` If you want to refer to an output path of that store derivation, add the output name preceded by a caret (`^`). -Example: `/nix/store/p7gp6lxdg32h4ka1q398wd9r2zkbbz2v-hello-2.10.drv^out` +Example: `/nix/store/p7gp6lxdg32h4ka1q398wd9r2zkbbz2o-hello-2.10.drv^out` All outputs can be referred to at once with the special syntax `^*`. -Example: `/nix/store/p7gp6lxdg32h4ka1q398wd9r2zkbbz2v-hello-2.10.drv^*` +Example: `/nix/store/p7gp6lxdg32h4ka1q398wd9r2zkbbz2o-hello-2.10.drv^*` ### Nix file @@ -184,7 +184,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/gzaflydcr6sb3567hap9q6srzx8ggdgo-glibc-2.33-78.drv^dev,static' … ``` @@ -207,17 +207,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/g02b1lpbddhymmcjb923kf0l7s9nww5o-glibc-2.33-123 33208200 + /nix/store/851dp95qqiisjifi639r0zzg5l465nyo-glibc-2.33-123-bin 36142896 + /nix/store/kdgs3q6r7xdff1p7a9hnjr43xw2404zo-glibc-2.33-123-debug 155787312 + /nix/store/n4xa8h6pbmqmwnq0mmsz08l38abb06zo-glibc-2.33-123-static 42488328 + /nix/store/q6580lr01jpcsqs4r5arlh4ki2c1m9ro-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/gzaflydcr6sb3567hap9q6srzx8ggdgo-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 788e13ab6d4..6ebe31f553e 100644 --- a/src/nix/path-from-hash-part.md +++ b/src/nix/path-from-hash-part.md @@ -6,7 +6,7 @@ R""( ```console # nix store path-from-hash-part --store https://cache.nixos.org/ 0i2jd68mp5g6h2sa5k9c85rb80sn8hi9 - /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10 + /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hio-hello-2.10 ``` # Description diff --git a/src/nix/path-info.md b/src/nix/path-info.md index 2e39225b865..8b1478a481a 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/v5sv61sszx301i0x6xysaqzla09nksno-hello-2.10 ``` * Show the closure sizes of every path in the current NixOS system @@ -14,11 +14,11 @@ 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/hl5xwp9kdrd1zkm0idm3kkby9q66z40o-empty 96 + /nix/store/27324qvqhnxj3rncazmxc4mwy79kz8ho-nameservers 112 … - /nix/store/539jkw9a8dyry7clcv60gk6na816j7y8-etc 5783255504 - /nix/store/zqamz3cz4dbzfihki2mk7a63mbkxz9xq-nixos-system-machine-20.09.20201112.3090c65 5887562256 + /nix/store/539jkw9a8dyry7clcv60gk6na816j7yo-etc 5783255504 + /nix/store/zqamz3cz4dbzfihki2mk7a63mbkxz9xo-nixos-system-machine-20.09.20201112.3090c65 5887562256 ``` * Show a package's closure size and all its dependencies with human @@ -26,16 +26,16 @@ 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/01rrgsg5zk3cds0xgdsq40zpk6g51dzo-ncurses-6.2-dev 386.7 KiB 69.1 MiB + /nix/store/0q783wnvixpqz6dxjp16nw296avgczao-libpfm-4.11.0 5.9 MiB 37.4 MiB … ``` * Check the existence of a path in a binary cache: ```console - # nix path-info --recursive /nix/store/blzxgyvrk32ki6xga10phr4sby2xf25q-geeqie-1.5.1 --store https://cache.nixos.org/ - path '/nix/store/blzxgyvrk32ki6xga10phr4sby2xf25q-geeqie-1.5.1' is not valid + # nix path-info --recursive /nix/store/blzxgyvrk32ki6xga10phr4sby2xf25o-geeqie-1.5.1 --store https://cache.nixos.org/ + path '/nix/store/blzxgyvrk32ki6xga10phr4sby2xf25o-geeqie-1.5.1' is not valid ``` @@ -62,7 +62,7 @@ R""( [ …, { - .key = "/nix/store/zqamz3cz4dbzfihki2mk7a63mbkxz9xq-nixos-system-machine-20.09.20201112.3090c65", + .key = "/nix/store/zqamz3cz4dbzfihki2mk7a63mbkxz9xo-nixos-system-machine-20.09.20201112.3090c65", .value = 5887562256, } ] @@ -74,7 +74,7 @@ R""( ```console # nix path-info --derivation nixpkgs#hello - /nix/store/s6rn4jz1sin56rf4qj5b5v8jxjm32hlk-hello-2.10.drv + /nix/store/s6rn4jz1sin56rf4qj5b5v8jxjm32hlo-hello-2.10.drv ``` # Description diff --git a/src/nix/print-dev-env.md b/src/nix/print-dev-env.md index a8ce9d36ae7..935f70c4f05 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/3x7dwzq014bblazs7kq20p9hyzz0qh8o-hello-2.10.tar.gz" }, "postUnpackHooks": { "type": "array", diff --git a/src/nix/profile-list.md b/src/nix/profile-list.md index 9811b9ec920..7d2b61a4216 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/indzcw5wvlhx6vwk7k4iq29q15chvr3o-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/i798sxl3j40wpdi1rgf391id1b5klw7o-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 e7e5e0dfb94..93309c366b5 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/rr3y0c6zyk7kjjl8y19s4lsrhn4aiq1o-hello-2.10 ``` # Description diff --git a/src/nix/ps.md b/src/nix/ps.md index 07decb61622..2cb40d77a61 100644 --- a/src/nix/ps.md +++ b/src/nix/ps.md @@ -7,15 +7,15 @@ R"( ```console # nix ps USER PID CPU DERIVATION/COMMAND - nixbld11 3534394 110.2s /nix/store/lzvdxlbr6xjd9w8py4nd2y2nnqb9gz7p-nix-util-tests-3.13.2.drv (wall=8s) - nixbld11 3534394 0.8s └───bash -e /nix/store/vj1c3wf9c11a0qs6p3ymfvrnsdgsdcbq-source-stdenv.sh /nix/store/shkw4qm9qcw5sc5n1k5jznc83ny02 + nixbld11 3534394 110.2s /nix/store/lzvdxlbr6xjd9w8py4nd2y2nnqb9gz7o-nix-util-tests-3.13.2.drv (wall=8s) + nixbld11 3534394 0.8s └───bash -e /nix/store/vj1c3wf9c11a0qs6p3ymfvrnsdgsdcbo-source-stdenv.sh /nix/store/shkw4qm9qcw5sc5n1k5jznc83ny02 nixbld11 3534751 36.3s └───ninja -j24 - nixbld11 3535637 0.0s ├───/nix/store/8adzgnxs3s0pbj22qhk9zjxi1fqmz3xv-gcc-14.3.0/bin/g++ -fPIC -fstack-clash-protection -O2 -U_ - nixbld11 3535639 0.1s │ └───/nix/store/8adzgnxs3s0pbj22qhk9zjxi1fqmz3xv-gcc-14.3.0/libexec/gcc/x86_64-unknown-linux-gnu/14.3. - nixbld11 3535658 0.0s └───/nix/store/8adzgnxs3s0pbj22qhk9zjxi1fqmz3xv-gcc-14.3.0/bin/g++ -fPIC -fstack-clash-protection -O2 -U_ - nixbld1 3534377 1.8s /nix/store/nh2dx9cqcy9lw4d4rvd0dbsflwdsbzdy-patchelf-0.18.0.drv (wall=5s) - nixbld1 3534377 1.8s └───bash -e /nix/store/v6x3cs394jgqfbi0a42pam708flxaphh-default-builder.sh - nixbld1 3535074 0.0s └───/nix/store/0irlcqx2n3qm6b1pc9rsd2i8qpvcccaj-bash-5.2p37/bin/bash ./configure --disable-dependency-trackin + nixbld11 3535637 0.0s ├───/nix/store/8adzgnxs3s0pbj22qhk9zjxi1fqmz3xo-gcc-14.3.0/bin/g++ -fPIC -fstack-clash-protection -O2 -U_ + nixbld11 3535639 0.1s │ └───/nix/store/8adzgnxs3s0pbj22qhk9zjxi1fqmz3xo-gcc-14.3.0/libexec/gcc/x86_64-unknown-linux-gnu/14.3. + nixbld11 3535658 0.0s └───/nix/store/8adzgnxs3s0pbj22qhk9zjxi1fqmz3xo-gcc-14.3.0/bin/g++ -fPIC -fstack-clash-protection -O2 -U_ + nixbld1 3534377 1.8s /nix/store/nh2dx9cqcy9lw4d4rvd0dbsflwdsbzdo-patchelf-0.18.0.drv (wall=5s) + nixbld1 3534377 1.8s └───bash -e /nix/store/v6x3cs394jgqfbi0a42pam708flxapho-default-builder.sh + nixbld1 3535074 0.0s └───/nix/store/0irlcqx2n3qm6b1pc9rsd2i8qpvcccao-bash-5.2p37/bin/bash ./configure --disable-dependency-trackin ``` # Description diff --git a/src/nix/realisation/info.md b/src/nix/realisation/info.md index 8aa986516f7..fe14e8391ec 100644 --- a/src/nix/realisation/info.md +++ b/src/nix/realisation/info.md @@ -9,7 +9,7 @@ Show some information about the realisation of the `hello` package: ```console $ nix realisation info nixpkgs#hello --json -[{"id":"sha256:3d382378a00588e064ee30be96dd0fa7e7df7cf3fbcace85a0e7b7dada1eef25!out","outPath":"fd3m7xawvrqcg98kgz5hc2vk3x9q0lh7-hello"}] +[{"id":"sha256:3d382378a00588e064ee30be96dd0fa7e7df7cf3fbcace85a0e7b7dada1eef25!out","outPath":"fd3m7xawvrqcg98kgz5hc2vk3x9q0lho-hello"}] ``` )MdBoundary" diff --git a/src/nix/registry-list.md b/src/nix/registry-list.md index 30b6e29d8aa..aef6a720d05 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/fxl9mrm5xvzam0lxi9ygdmksskx4qq8o-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/repl.md b/src/nix/repl.md index e608dabf6f9..58359aadca6 100644 --- a/src/nix/repl.md +++ b/src/nix/repl.md @@ -54,13 +54,13 @@ R""( "emacs-27.1" nix-repl> emacs.drvPath - "/nix/store/lp0sjrhgg03y2n0l10n70rg0k7hhyz0l-emacs-27.1.drv" + "/nix/store/lp0sjrhgg03y2n0l10n70rg0k7hhyz0o-emacs-27.1.drv" nix-repl> drv = runCommand "hello" { buildInputs = [ hello ]; } "hello; hello > $out" nix-repl> :b drv this derivation produced the following outputs: - out -> /nix/store/0njwbgwmkwls0w5dv9mpc1pq5fj39q0l-hello + out -> /nix/store/0njwbgwmkwls0w5dv9mpc1pq5fj39q0o-hello nix-repl> builtins.readFile drv "Hello, world!\n" diff --git a/src/nix/store-cat.md b/src/nix/store-cat.md index da2073473fd..348e817f813 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/0i2jd68mp5g6h2sa5k9c85rb80sn8hio-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 61daa75c178..51cf944de3c 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/ilgm50plpmcgjhcp33z6n4qbnpqfhxyo-glibc-2.33-59.drv ``` # Description diff --git a/src/nix/store-copy-sigs.md b/src/nix/store-copy-sigs.md index 67875622156..4b8ea144821 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/y1x7ng5bmc9s8lqrf98brcpk1a7lbclo-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/y1x7ng5bmc9s8lqrf98brcpk1a7lbclo-hello-2.12.1 imported 2 signatures ``` diff --git a/src/nix/store-delete.md b/src/nix/store-delete.md index 431bc5f5e3f..aae1977aefd 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/yb5q57zxv6hgqql42d5r8b5k5mcq6kao-hello-2.10 ``` # Description diff --git a/src/nix/store-dump-path.md b/src/nix/store-dump-path.md index 21467ff329e..6d296057ecd 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/7crrmih8c52r8fbnqb933dxrsp44md9o-glibc-2.25 > glibc.nar ``` # Description diff --git a/src/nix/store-ls.md b/src/nix/store-ls.md index 14c4627c97a..c4e623816ba 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/0i2jd68mp5g6h2sa5k9c85rb80sn8hio-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/0i2jd68mp5g6h2sa5k9c85rb80sn8hio-hello-2.10/bin/hello -r-xr-xr-x 38184 hello ``` diff --git a/src/nix/store-prefetch-file.md b/src/nix/store-prefetch-file.md index f9fdcbc57d0..0dbf81d37f9 100644 --- a/src/nix/store-prefetch-file.md +++ b/src/nix/store-prefetch-file.md @@ -7,7 +7,7 @@ R""( ```console # nix store prefetch-file https://releases.nixos.org/nix/nix-2.3.10/nix-2.3.10.tar.xz Downloaded 'https://releases.nixos.org/nix/nix-2.3.10/nix-2.3.10.tar.xz' to - '/nix/store/vbdbi42hgnc4h7pyqzp6h2yf77kw93aw-source' (hash + '/nix/store/vbdbi42hgnc4h7pyqzp6h2yf77kw93ao-source' (hash 'sha256-qKheVd5D0BervxMDbt+1hnTKE2aRWC8XCAwc0SeHt6s='). ``` diff --git a/src/nix/store-repair.md b/src/nix/store-repair.md index 180c577acae..96a22a13eed 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/yb5q57zxv6hgqql42d5r8b5k5mcq6kao-hello-2.10 + path '/nix/store/yb5q57zxv6hgqql42d5r8b5k5mcq6kao-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/yb5q57zxv6hgqql42d5r8b5k5mcq6kao-hello-2.10 ``` # Description diff --git a/src/nix/verify.md b/src/nix/verify.md index ae0b0acd68a..0d8672d1010 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/v5sv61sszx301i0x6xysaqzla09nksno-hello-2.10 ``` # Description diff --git a/src/nix/why-depends.md b/src/nix/why-depends.md index dc13619e13a..e6242c087d3 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/v5sv61sszx301i0x6xysaqzla09nksno-hello-2.10 + └───bin/hello: …...................../nix/store/9l06v7fc38c1x3r2iydl15ksgz0ysb8o-glibc-2.32/lib/ld-linux-x86-64.… + → /nix/store/9l06v7fc38c1x3r2iydl15ksgz0ysb8o-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/qfc8729nzpdln1h0hvi1ziclsl3m84so-thunderbird-78.5.1 + ├───lib/thunderbird/libxul.so: …6wrw-libxcb-1.14/lib:/nix/store/adzfjjh8w25vdr0xdx9x16ah4f5rqrwo-libX11-1.7.0/lib:/nix/store/ssf… + │ → /nix/store/adzfjjh8w25vdr0xdx9x16ah4f5rqrwo-libX11-1.7.0 + ├───lib/thunderbird/libxul.so: …pxyc-libXt-1.2.0/lib:/nix/store/1qj29ipxl2fyi2b13l39hdircq17gnko-libXdamage-1.1.5/lib:/nix/store… + │ → /nix/store/1qj29ipxl2fyi2b13l39hdircq17gnko-libXdamage-1.1.5 + │ ├───lib/libXdamage.so.1.1.0: …-libXfixes-5.0.3/lib:/nix/store/adzfjjh8w25vdr0xdx9x16ah4f5rqrwo-libX11-1.7.0/lib:/nix/store/9l0… + │ │ → /nix/store/adzfjjh8w25vdr0xdx9x16ah4f5rqrwo-libX11-1.7.0 … ``` @@ -31,22 +31,22 @@ 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/9df65igwjmf2wbw0gbrrgair6piqjgmo-glibc-2.31 + └───lib/ld-2.31.so: …che Do not use /nix/store/9df65igwjmf2wbw0gbrrgair6piqjgmo-glibc-2.31/etc/ld.so.cache. --… + → /nix/store/9df65igwjmf2wbw0gbrrgair6piqjgmo-glibc-2.31 ``` * Show why Geeqie has a build-time dependency on `systemd`: ```console # nix why-depends --derivation nixpkgs#geeqie nixpkgs#systemd - /nix/store/drrpq2fqlrbj98bmazrnww7hm1in3wgj-geeqie-1.4.drv - └───/: …atch.drv",["out"]),("/nix/store/qzh8dyq3lfbk3i1acbp7x9wh3il2imiv-gtk+3-3.24.21.drv",["dev"]),("/… - → /nix/store/qzh8dyq3lfbk3i1acbp7x9wh3il2imiv-gtk+3-3.24.21.drv - └───/: …16.0.drv",["dev"]),("/nix/store/8kp79fyslf3z4m3dpvlh6w46iaadz5c2-cups-2.3.3.drv",["dev"]),("/nix… - → /nix/store/8kp79fyslf3z4m3dpvlh6w46iaadz5c2-cups-2.3.3.drv - └───/: ….3.1.drv",["out"]),("/nix/store/yd3ihapyi5wbz1kjacq9dbkaq5v5hqjg-systemd-246.4.drv",["dev"]),("/… - → /nix/store/yd3ihapyi5wbz1kjacq9dbkaq5v5hqjg-systemd-246.4.drv + /nix/store/drrpq2fqlrbj98bmazrnww7hm1in3wgo-geeqie-1.4.drv + └───/: …atch.drv",["out"]),("/nix/store/qzh8dyq3lfbk3i1acbp7x9wh3il2imio-gtk+3-3.24.21.drv",["dev"]),("/… + → /nix/store/qzh8dyq3lfbk3i1acbp7x9wh3il2imio-gtk+3-3.24.21.drv + └───/: …16.0.drv",["dev"]),("/nix/store/8kp79fyslf3z4m3dpvlh6w46iaadz5co-cups-2.3.3.drv",["dev"]),("/nix… + → /nix/store/8kp79fyslf3z4m3dpvlh6w46iaadz5co-cups-2.3.3.drv + └───/: ….3.1.drv",["out"]),("/nix/store/yd3ihapyi5wbz1kjacq9dbkaq5v5hqjo-systemd-246.4.drv",["dev"]),("/… + → /nix/store/yd3ihapyi5wbz1kjacq9dbkaq5v5hqjo-systemd-246.4.drv ``` # Description @@ -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/9df65igwjmf2wbw0gbrrgair6piqjgmo-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/src/perl/t/init.t b/src/perl/t/init.t index 80197e01376..bb9be25397c 100644 --- a/src/perl/t/init.t +++ b/src/perl/t/init.t @@ -6,7 +6,7 @@ use Nix::Store; my $s = new Nix::Store("dummy://"); -my $res = $s->isValidPath("/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar"); +my $res = $s->isValidPath("/nix/store/g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3o-bar"); ok(!$res, "should not have path"); diff --git a/tests/functional/derivation/ca/advanced-attributes-structured-attrs.drv b/tests/functional/derivation/ca/advanced-attributes-structured-attrs.drv index eeaba88e68b..ab226a76f48 100644 --- a/tests/functional/derivation/ca/advanced-attributes-structured-attrs.drv +++ b/tests/functional/derivation/ca/advanced-attributes-structured-attrs.drv @@ -1 +1 @@ -Derive([("bin","","r:sha256",""),("dev","","r:sha256",""),("out","","r:sha256","")],[("/nix/store/j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv",["dev","out"]),("/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv",["dev","out"])],["/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv"],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"__darwinAllowLocalNetworking\":true,\"__impureHostDeps\":[\"/usr/bin/ditto\"],\"__noChroot\":true,\"__sandboxProfile\":\"sandcastle\",\"allowSubstitutes\":false,\"builder\":\"/bin/bash\",\"exportReferencesGraph\":{\"refs1\":[\"/164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9\"],\"refs2\":[\"/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv\"]},\"impureEnvVars\":[\"UNICORN\"],\"name\":\"advanced-attributes-structured-attrs\",\"outputChecks\":{\"bin\":{\"disallowedReferences\":[\"/0nyw57wm2iicnm9rglvjmbci3ikmcp823czdqdzdcgsnnwqps71g\",\"dev\"],\"disallowedRequisites\":[\"/07f301yqyz8c6wf6bbbavb2q39j4n8kmcly1s09xadyhgy6x2wr8\"]},\"dev\":{\"maxClosureSize\":5909,\"maxSize\":789},\"out\":{\"allowedReferences\":[\"/164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9\"],\"allowedRequisites\":[\"/0nr45p69vn6izw9446wsh9bng9nndhvn19kpsm4n96a5mycw0s4z\",\"bin\"]}},\"outputHashAlgo\":\"sha256\",\"outputHashMode\":\"recursive\",\"outputs\":[\"out\",\"bin\",\"dev\"],\"preferLocalBuild\":true,\"requiredSystemFeatures\":[\"rainbow\",\"uid-range\"],\"system\":\"my-system\"}"),("bin","/04f3da1kmbr67m3gzxikmsl4vjz5zf777sv6m14ahv22r65aac9m"),("dev","/02qcpld1y6xhs5gz9bchpxaw0xdhmsp5dv88lh25r2ss44kh8dxz"),("out","/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9")]) \ No newline at end of file +Derive([("bin","","r:sha256",""),("dev","","r:sha256",""),("out","","r:sha256","")],[("/nix/store/j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv",["dev","out"]),("/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv",["dev","out"])],["/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv"],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"__darwinAllowLocalNetworking\":true,\"__impureHostDeps\":[\"/usr/bin/ditto\"],\"__noChroot\":true,\"__sandboxProfile\":\"sandcastle\",\"allowSubstitutes\":false,\"builder\":\"/bin/bash\",\"exportReferencesGraph\":{\"refs1\":[\"/164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9\"],\"refs2\":[\"/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv\"]},\"impureEnvVars\":[\"UNICORN\"],\"name\":\"advanced-attributes-structured-attrs\",\"outputChecks\":{\"bin\":{\"disallowedReferences\":[\"/0nyw57wm2iicnm9rglvjmbci3ikmcp823czdqdzdcgsnnwqps71g\",\"dev\"],\"disallowedRequisites\":[\"/07f301yqyz8c6wf6bbbavb2q39j4n8kmcly1s09xadyhgy6x2wr8\"]},\"dev\":{\"maxClosureSize\":5909,\"maxSize\":789},\"out\":{\"allowedReferences\":[\"/164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9\"],\"allowedRequisites\":[\"/0nr45p69vn6izw9446wsh9bng9nndhvn19kpsm4n96a5mycw0s4z\",\"bin\"]}},\"outputHashAlgo\":\"sha256\",\"outputHashMode\":\"recursive\",\"outputs\":[\"out\",\"bin\",\"dev\"],\"preferLocalBuild\":true,\"requiredSystemFeatures\":[\"rainbow\",\"uid-range\"],\"system\":\"my-system\"}"),("bin","/04f3da1kmbr67m3gzxikmsl4vjz5zf777sv6m14ahv22r65aac9m"),("dev","/02qcpld1y6xhs5gz9bchpxaw0xdhmsp5dv88lh25r2ss44kh8dxz"),("out","/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9")]) \ No newline at end of file diff --git a/tests/functional/derivation/ca/advanced-attributes.drv b/tests/functional/derivation/ca/advanced-attributes.drv index ee5968cdced..a4d34f0d594 100644 --- a/tests/functional/derivation/ca/advanced-attributes.drv +++ b/tests/functional/derivation/ca/advanced-attributes.drv @@ -1 +1 @@ -Derive([("out","","r:sha256","")],[("/nix/store/j56sf12rxpcv5swr14vsjn5cwm6bj03h-foo.drv",["dev","out"]),("/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv",["dev","out"])],["/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv"],"my-system","/bin/bash",["-c","echo hello > $out"],[("__darwinAllowLocalNetworking","1"),("__impureHostDeps","/usr/bin/ditto"),("__noChroot","1"),("__sandboxProfile","sandcastle"),("allowSubstitutes",""),("allowedReferences","/164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9"),("allowedRequisites","/0nr45p69vn6izw9446wsh9bng9nndhvn19kpsm4n96a5mycw0s4z bin"),("builder","/bin/bash"),("disallowedReferences","/0nyw57wm2iicnm9rglvjmbci3ikmcp823czdqdzdcgsnnwqps71g dev"),("disallowedRequisites","/07f301yqyz8c6wf6bbbavb2q39j4n8kmcly1s09xadyhgy6x2wr8"),("exportReferencesGraph","refs1 /164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9 refs2 /nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni58-bar.drv"),("impureEnvVars","UNICORN"),("name","advanced-attributes"),("out","/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9"),("outputHashAlgo","sha256"),("outputHashMode","recursive"),("preferLocalBuild","1"),("requiredSystemFeatures","rainbow uid-range"),("system","my-system")]) \ No newline at end of file +Derive([("out","","r:sha256","")],[("/nix/store/j56sf12rxpcv5swr14vsjn5cwm6bj03o-foo.drv",["dev","out"]),("/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv",["dev","out"])],["/nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv"],"my-system","/bin/bash",["-c","echo hello > $out"],[("__darwinAllowLocalNetworking","1"),("__impureHostDeps","/usr/bin/ditto"),("__noChroot","1"),("__sandboxProfile","sandcastle"),("allowSubstitutes",""),("allowedReferences","/164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9"),("allowedRequisites","/0nr45p69vn6izw9446wsh9bng9nndhvn19kpsm4n96a5mycw0s4z bin"),("builder","/bin/bash"),("disallowedReferences","/0nyw57wm2iicnm9rglvjmbci3ikmcp823czdqdzdcgsnnwqps71g dev"),("disallowedRequisites","/07f301yqyz8c6wf6bbbavb2q39j4n8kmcly1s09xadyhgy6x2wr8"),("exportReferencesGraph","refs1 /164j69y6zir9z0339n8pjigg3rckinlr77bxsavzizdaaljb7nh9 refs2 /nix/store/qnml92yh97a6fbrs2m5qg5cqlc8vni5o-bar.drv"),("impureEnvVars","UNICORN"),("name","advanced-attributes"),("out","/1rz4g4znpzjwh1xymhjpm42vipw92pr73vdgl6xs1hycac8kf2n9"),("outputHashAlgo","sha256"),("outputHashMode","recursive"),("preferLocalBuild","1"),("requiredSystemFeatures","rainbow uid-range"),("system","my-system")]) \ No newline at end of file diff --git a/tests/functional/derivation/ia/advanced-attributes-defaults.drv b/tests/functional/derivation/ia/advanced-attributes-defaults.drv index 391c6ab807c..f0fdae10fea 100644 --- a/tests/functional/derivation/ia/advanced-attributes-defaults.drv +++ b/tests/functional/derivation/ia/advanced-attributes-defaults.drv @@ -1 +1 @@ -Derive([("out","/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults","","")],[],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("builder","/bin/bash"),("name","advanced-attributes-defaults"),("out","/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czji-advanced-attributes-defaults"),("system","my-system")]) \ No newline at end of file +Derive([("out","/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czjo-advanced-attributes-defaults","","")],[],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("builder","/bin/bash"),("name","advanced-attributes-defaults"),("out","/nix/store/1qsc7svv43m4dw2prh6mvyf7cai5czjo-advanced-attributes-defaults"),("system","my-system")]) \ No newline at end of file diff --git a/tests/functional/derivation/ia/advanced-attributes-structured-attrs-defaults.drv b/tests/functional/derivation/ia/advanced-attributes-structured-attrs-defaults.drv index 9dd4020571c..352fc484d55 100644 --- a/tests/functional/derivation/ia/advanced-attributes-structured-attrs-defaults.drv +++ b/tests/functional/derivation/ia/advanced-attributes-structured-attrs-defaults.drv @@ -1 +1 @@ -Derive([("dev","/nix/store/8bazivnbipbyi569623skw5zm91z6kc2-advanced-attributes-structured-attrs-defaults-dev","",""),("out","/nix/store/f8f8nvnx32bxvyxyx2ff7akbvwhwd9dw-advanced-attributes-structured-attrs-defaults","","")],[],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"builder\":\"/bin/bash\",\"name\":\"advanced-attributes-structured-attrs-defaults\",\"outputs\":[\"out\",\"dev\"],\"system\":\"my-system\"}"),("dev","/nix/store/8bazivnbipbyi569623skw5zm91z6kc2-advanced-attributes-structured-attrs-defaults-dev"),("out","/nix/store/f8f8nvnx32bxvyxyx2ff7akbvwhwd9dw-advanced-attributes-structured-attrs-defaults")]) \ No newline at end of file +Derive([("dev","/nix/store/8bazivnbipbyi569623skw5zm91z6kco-advanced-attributes-structured-attrs-defaults-dev","",""),("out","/nix/store/f8f8nvnx32bxvyxyx2ff7akbvwhwd9do-advanced-attributes-structured-attrs-defaults","","")],[],[],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"builder\":\"/bin/bash\",\"name\":\"advanced-attributes-structured-attrs-defaults\",\"outputs\":[\"out\",\"dev\"],\"system\":\"my-system\"}"),("dev","/nix/store/8bazivnbipbyi569623skw5zm91z6kco-advanced-attributes-structured-attrs-defaults-dev"),("out","/nix/store/f8f8nvnx32bxvyxyx2ff7akbvwhwd9do-advanced-attributes-structured-attrs-defaults")]) \ No newline at end of file diff --git a/tests/functional/derivation/ia/advanced-attributes-structured-attrs.drv b/tests/functional/derivation/ia/advanced-attributes-structured-attrs.drv index 0aa82e636f8..b62fdf5831d 100644 --- a/tests/functional/derivation/ia/advanced-attributes-structured-attrs.drv +++ b/tests/functional/derivation/ia/advanced-attributes-structured-attrs.drv @@ -1 +1 @@ -Derive([("bin","/nix/store/cnpasdljgkhnwaf78cf3qygcp4qbki1c-advanced-attributes-structured-attrs-bin","",""),("dev","/nix/store/ijq6mwpa9jbnpnl33qldfqihrr38kprx-advanced-attributes-structured-attrs-dev","",""),("out","/nix/store/h1vh648d3p088kdimy0r8ngpfx7c3nzw-advanced-attributes-structured-attrs","","")],[("/nix/store/afc3vbjbzql750v2lp8gxgaxsajphzih-foo.drv",["dev","out"]),("/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv",["dev","out"])],["/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv"],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"__darwinAllowLocalNetworking\":true,\"__impureHostDeps\":[\"/usr/bin/ditto\"],\"__noChroot\":true,\"__sandboxProfile\":\"sandcastle\",\"allowSubstitutes\":false,\"builder\":\"/bin/bash\",\"exportReferencesGraph\":{\"refs1\":[\"/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo\"],\"refs2\":[\"/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv\"]},\"impureEnvVars\":[\"UNICORN\"],\"name\":\"advanced-attributes-structured-attrs\",\"outputChecks\":{\"bin\":{\"disallowedReferences\":[\"/nix/store/r5cff30838majxk5mp3ip2diffi8vpaj-bar\",\"dev\"],\"disallowedRequisites\":[\"/nix/store/9b61w26b4avv870dw0ymb6rw4r1hzpws-bar-dev\"]},\"dev\":{\"maxClosureSize\":5909,\"maxSize\":789},\"out\":{\"allowedReferences\":[\"/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo\"],\"allowedRequisites\":[\"/nix/store/z0rjzy29v9k5qa4nqpykrbzirj7sd43v-foo-dev\",\"bin\"]}},\"outputs\":[\"out\",\"bin\",\"dev\"],\"preferLocalBuild\":true,\"requiredSystemFeatures\":[\"rainbow\",\"uid-range\"],\"system\":\"my-system\"}"),("bin","/nix/store/cnpasdljgkhnwaf78cf3qygcp4qbki1c-advanced-attributes-structured-attrs-bin"),("dev","/nix/store/ijq6mwpa9jbnpnl33qldfqihrr38kprx-advanced-attributes-structured-attrs-dev"),("out","/nix/store/h1vh648d3p088kdimy0r8ngpfx7c3nzw-advanced-attributes-structured-attrs")]) \ No newline at end of file +Derive([("bin","/nix/store/cnpasdljgkhnwaf78cf3qygcp4qbki1o-advanced-attributes-structured-attrs-bin","",""),("dev","/nix/store/ijq6mwpa9jbnpnl33qldfqihrr38kpro-advanced-attributes-structured-attrs-dev","",""),("out","/nix/store/h1vh648d3p088kdimy0r8ngpfx7c3nzo-advanced-attributes-structured-attrs","","")],[("/nix/store/afc3vbjbzql750v2lp8gxgaxsajphzio-foo.drv",["dev","out"]),("/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv",["dev","out"])],["/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv"],"my-system","/bin/bash",["-c","echo hello > $out"],[("__json","{\"__darwinAllowLocalNetworking\":true,\"__impureHostDeps\":[\"/usr/bin/ditto\"],\"__noChroot\":true,\"__sandboxProfile\":\"sandcastle\",\"allowSubstitutes\":false,\"builder\":\"/bin/bash\",\"exportReferencesGraph\":{\"refs1\":[\"/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo\"],\"refs2\":[\"/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv\"]},\"impureEnvVars\":[\"UNICORN\"],\"name\":\"advanced-attributes-structured-attrs\",\"outputChecks\":{\"bin\":{\"disallowedReferences\":[\"/nix/store/r5cff30838majxk5mp3ip2diffi8vpao-bar\",\"dev\"],\"disallowedRequisites\":[\"/nix/store/9b61w26b4avv870dw0ymb6rw4r1hzpwo-bar-dev\"]},\"dev\":{\"maxClosureSize\":5909,\"maxSize\":789},\"out\":{\"allowedReferences\":[\"/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo\"],\"allowedRequisites\":[\"/nix/store/z0rjzy29v9k5qa4nqpykrbzirj7sd43o-foo-dev\",\"bin\"]}},\"outputs\":[\"out\",\"bin\",\"dev\"],\"preferLocalBuild\":true,\"requiredSystemFeatures\":[\"rainbow\",\"uid-range\"],\"system\":\"my-system\"}"),("bin","/nix/store/cnpasdljgkhnwaf78cf3qygcp4qbki1o-advanced-attributes-structured-attrs-bin"),("dev","/nix/store/ijq6mwpa9jbnpnl33qldfqihrr38kpro-advanced-attributes-structured-attrs-dev"),("out","/nix/store/h1vh648d3p088kdimy0r8ngpfx7c3nzo-advanced-attributes-structured-attrs")]) \ No newline at end of file diff --git a/tests/functional/derivation/ia/advanced-attributes.drv b/tests/functional/derivation/ia/advanced-attributes.drv index 4bc7320f573..6006aa870ea 100644 --- a/tests/functional/derivation/ia/advanced-attributes.drv +++ b/tests/functional/derivation/ia/advanced-attributes.drv @@ -1 +1 @@ -Derive([("out","/nix/store/ymqmybkq5j4nd1xplw6ccdpbjnfi017v-advanced-attributes","","")],[("/nix/store/afc3vbjbzql750v2lp8gxgaxsajphzih-foo.drv",["dev","out"]),("/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv",["dev","out"])],["/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv"],"my-system","/bin/bash",["-c","echo hello > $out"],[("__darwinAllowLocalNetworking","1"),("__impureHostDeps","/usr/bin/ditto"),("__noChroot","1"),("__sandboxProfile","sandcastle"),("allowSubstitutes",""),("allowedReferences","/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo"),("allowedRequisites","/nix/store/z0rjzy29v9k5qa4nqpykrbzirj7sd43v-foo-dev bin"),("builder","/bin/bash"),("disallowedReferences","/nix/store/r5cff30838majxk5mp3ip2diffi8vpaj-bar dev"),("disallowedRequisites","/nix/store/9b61w26b4avv870dw0ymb6rw4r1hzpws-bar-dev"),("exportReferencesGraph","refs1 /nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzn-foo refs2 /nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv14-bar.drv"),("impureEnvVars","UNICORN"),("name","advanced-attributes"),("out","/nix/store/ymqmybkq5j4nd1xplw6ccdpbjnfi017v-advanced-attributes"),("preferLocalBuild","1"),("requiredSystemFeatures","rainbow uid-range"),("system","my-system")]) \ No newline at end of file +Derive([("out","/nix/store/ymqmybkq5j4nd1xplw6ccdpbjnfi017o-advanced-attributes","","")],[("/nix/store/afc3vbjbzql750v2lp8gxgaxsajphzio-foo.drv",["dev","out"]),("/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv",["dev","out"])],["/nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv"],"my-system","/bin/bash",["-c","echo hello > $out"],[("__darwinAllowLocalNetworking","1"),("__impureHostDeps","/usr/bin/ditto"),("__noChroot","1"),("__sandboxProfile","sandcastle"),("allowSubstitutes",""),("allowedReferences","/nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo"),("allowedRequisites","/nix/store/z0rjzy29v9k5qa4nqpykrbzirj7sd43o-foo-dev bin"),("builder","/bin/bash"),("disallowedReferences","/nix/store/r5cff30838majxk5mp3ip2diffi8vpao-bar dev"),("disallowedRequisites","/nix/store/9b61w26b4avv870dw0ymb6rw4r1hzpwo-bar-dev"),("exportReferencesGraph","refs1 /nix/store/p0hax2lzvjpfc2gwkk62xdglz0fcqfzo-foo refs2 /nix/store/vj2i49jm2868j2fmqvxm70vlzmzvgv1o-bar.drv"),("impureEnvVars","UNICORN"),("name","advanced-attributes"),("out","/nix/store/ymqmybkq5j4nd1xplw6ccdpbjnfi017o-advanced-attributes"),("preferLocalBuild","1"),("requiredSystemFeatures","rainbow uid-range"),("system","my-system")]) \ No newline at end of file diff --git a/tests/functional/fetchClosure.sh b/tests/functional/fetchClosure.sh index 85a83d19225..bf1da1805fb 100755 --- a/tests/functional/fetchClosure.sh +++ b/tests/functional/fetchClosure.sh @@ -124,7 +124,7 @@ rm -rf "$narCache" clearStore # shellcheck disable=SC2001 -badPath=$(echo "$caPath" | sed -e 's!/store/................................-!/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx-!') +badPath=$(echo "$caPath" | sed -e 's!/store/................................-!/store/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxo-!') [ ! -e "$badPath" ] diff --git a/tests/functional/lang.sh b/tests/functional/lang.sh index e64663d3064..4255dcf851c 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 '8qlfcic10lw5304gqm8q45nr7g7jl62o-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-fail-addDrvOutputDependencies-multi-elem-context.err.exp b/tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp index 56fbffa1942..d626b0c84b2 100644 --- a/tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp +++ b/tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp @@ -6,4 +6,4 @@ error: | ^ 26| - error: context of string '/nix/store/pg9yqs4yd85yhdm3f4i5dyaqp5jahrsz-fail.drv/nix/store/2dxd5frb715z451vbf7s8birlf3argbk-fail-2.drv' must have exactly one element, but has 2 + error: context of string '/nix/store/pg9yqs4yd85yhdm3f4i5dyaqp5jahrso-fail.drv/nix/store/2dxd5frb715z451vbf7s8birlf3argbo-fail-2.drv' must have exactly one element, but has 2 diff --git a/tests/functional/lang/eval-okay-derivation-legacy.exp b/tests/functional/lang/eval-okay-derivation-legacy.exp index 4f374a1aac8..6fc664a1b29 100644 --- a/tests/functional/lang/eval-okay-derivation-legacy.exp +++ b/tests/functional/lang/eval-okay-derivation-legacy.exp @@ -1 +1 @@ -"/nix/store/mzgwvrjjir216ra58mwwizi8wj6y9ddr-eval-okay-derivation-legacy" +"/nix/store/mzgwvrjjir216ra58mwwizi8wj6y9ddo-eval-okay-derivation-legacy" diff --git a/tests/functional/lang/eval-okay-path.exp b/tests/functional/lang/eval-okay-path.exp index 635e2243a2a..8e71be88f92 100644 --- a/tests/functional/lang/eval-okay-path.exp +++ b/tests/functional/lang/eval-okay-path.exp @@ -1 +1 @@ -[ "/nix/store/ya937r4ydw0l6kayq8jkyqaips9c75jm-output" "/nix/store/m7y372g6jb0g4hh1dzmj847rd356fhnz-output" ] +[ "/nix/store/ya937r4ydw0l6kayq8jkyqaips9c75jo-output" "/nix/store/m7y372g6jb0g4hh1dzmj847rd356fhno-output" ] diff --git a/tests/functional/lang/eval-okay-regex-match2.nix b/tests/functional/lang/eval-okay-regex-match2.nix index 31a94423d86..1f662eb8a99 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/8w718rm43x7z73xhw9d6vh8s4snrq67o-python3-3.12.10/bin/python3.12'' ] [ ''(.*/)?\.\.(/.*)?'' @@ -199,19 +199,19 @@ builtins.map ] [ ''.*-polly.*'' - ''/nix/store/0yxfdnfxbzczjxhgdpac81jnas194wfj-gnu-install-dirs.patch'' + ''/nix/store/0yxfdnfxbzczjxhgdpac81jnas194wfo-gnu-install-dirs.patch'' ] [ ''.*-polly.*'' - ''/nix/store/jh2pda7psaasq85b2rrigmkjdbl8d0a1-llvm-lit-cfg-add-libs-to-dylib-path.patch'' + ''/nix/store/jh2pda7psaasq85b2rrigmkjdbl8d0ao-llvm-lit-cfg-add-libs-to-dylib-path.patch'' ] [ ''.*-polly.*'' - ''/nix/store/x868j4ih7wqiivf6wr9m4g424jav0hpq-gnu-install-dirs-polly.patch'' + ''/nix/store/x868j4ih7wqiivf6wr9m4g424jav0hpo-gnu-install-dirs-polly.patch'' ] [ ''.*-polly.*'' - ''/nix/store/gr73nf6sca9nyzl88x58y3qxrav04yhd-polly-lit-cfg-add-libs-to-dylib-path.patch'' + ''/nix/store/gr73nf6sca9nyzl88x58y3qxrav04yho-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/8w718rm43x7z73xhw9d6vh8s4snrq67o-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/xp9hkw8nsw9p81d69yvcg1yr6f7vh71o-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/xp9hkw8nsw9p81d69yvcg1yr6f7vh71o-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 23639bc5465..ff210671b33 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}/8qlfcic10lw5304gqm8q45nr7g7jl62o-cachix-1.7.3-bin"; outputName = "out"; - outPath = "${builtins.storeDir}/8qlfcic10lw5304gqm8q45nr7g7jl62b-cachix-1.7.3-bin"; + outPath = "${builtins.storeDir}/8qlfcic10lw5304gqm8q45nr7g7jl62o-cachix-1.7.3-bin"; out = package; }; in diff --git a/tests/functional/nar-access.sh b/tests/functional/nar-access.sh index cd419b4eefc..8eed92951bd 100755 --- a/tests/functional/nar-access.sh +++ b/tests/functional/nar-access.sh @@ -32,7 +32,7 @@ diff -u baz.cat-nar "$storePath/foo/baz" TODO_NixOS # Check that 'nix store cat' fails on invalid store paths. -invalidPath="$(dirname "$storePath")/99999999999999999999999999999999-foo" +invalidPath="$(dirname "$storePath")/9999999999999999999999999999999o-foo" cp -r "$storePath" "$invalidPath" expect 1 nix store cat "$invalidPath/foo/baz" diff --git a/tests/functional/referrers.sh b/tests/functional/referrers.sh index ae6b39ae115..9249efe8fbd 100755 --- a/tests/functional/referrers.sh +++ b/tests/functional/referrers.sh @@ -10,7 +10,7 @@ clearStore max=500 -reference=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bla +reference=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-bla touch "$reference" (echo "$reference" && echo && echo 0) | nix-store --register-validity @@ -19,9 +19,9 @@ echo "making registration..." set +x # shellcheck disable=SC2004 for ((n = 0; n < $max; n++)); do - storePath=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-$n + storePath=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-$n echo -n > "$storePath" - ref2=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-$((n+1)) + ref2=$NIX_STORE_DIR/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaao-$((n+1)) if test $((n+1)) = $max; then ref2=$reference fi diff --git a/tests/functional/simple.sh b/tests/functional/simple.sh index e54ad860ca9..33363eed92d 100755 --- a/tests/functional/simple.sh +++ b/tests/functional/simple.sh @@ -25,13 +25,13 @@ nix-store --delete "$outPath" --ignore-liveness [[ ! -e $outPath/hello ]] outPath="$(NIX_REMOTE='local?store=/foo&real='"$TEST_ROOT"'/real-store' nix-instantiate --readonly-mode hash-check.nix)" -if test "$outPath" != "/foo/lfy1s6ca46rm5r6w4gg9hc0axiakjcnm-dependencies.drv"; then +if test "$outPath" != "/foo/lfy1s6ca46rm5r6w4gg9hc0axiakjcno-dependencies.drv"; then echo "hashDerivationModulo appears broken, got $outPath" exit 1 fi outPath="$(NIX_REMOTE='local?store=/foo&real='"$TEST_ROOT"'/real-store' nix-instantiate --readonly-mode big-derivation-attr.nix)" -if test "$outPath" != "/foo/xxiwa5zlaajv6xdjynf9yym9g319d6mn-big-derivation-attr.drv"; then +if test "$outPath" != "/foo/xxiwa5zlaajv6xdjynf9yym9g319d6mo-big-derivation-attr.drv"; then echo "big-derivation-attr.nix hash appears broken, got $outPath. Memory corruption in large drv attr?" exit 1 fi diff --git a/tests/nixos/authorization.nix b/tests/nixos/authorization.nix index 944e5925925..678052fb863 100644 --- a/tests/nixos/authorization.nix +++ b/tests/nixos/authorization.nix @@ -17,7 +17,7 @@ testScript = let - pathFour = "/nix/store/20xfy868aiic0r0flgzq4n5dq1yvmxkn-four"; + pathFour = "/nix/store/20xfy868aiic0r0flgzq4n5dq1yvmxko-four"; in '' machine.wait_for_unit("multi-user.target")