pyrox.dev / nixpkgs
lol
fork atom

Revert "make-tarball.nix: Restore the 'commit' field in packages.json"

This reverts commit 5e8545e72341887bb371407a71a723bc0e9c7844.

It breaks eval:

attribute 'rev' missing, at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/eval-0-gleber.ewr1.nix.ci/pkgs/top-level/make-tarball.nix:106:39

Florian Klink 855a12ea f4f8921f

+3 -3
unified split
+1 -1
doc/doc-support/lib-function-locations.nix
··· 1 { pkgs ? (import ./.. { }), nixpkgs ? { }}: 2 let 3 - revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.rev or "master"); 4 5 libDefPos = set: 6 builtins.map
··· 1 { pkgs ? (import ./.. { }), nixpkgs ? { }}: 2 let 3 + revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master"); 4 5 libDefPos = set: 6 builtins.map
+1 -1
pkgs/top-level/make-tarball.nix
··· 103 104 header "generating packages.json" 105 mkdir -p $out/nix-support 106 - echo -n '{"version":2,"commit":"${nixpkgs.rev}","packages":' > tmp 107 nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp 108 echo -n '}' >> tmp 109 packages=$out/packages.json.br
··· 103 104 header "generating packages.json" 105 mkdir -p $out/nix-support 106 + echo -n '{"version":2,"packages":' > tmp 107 nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp 108 echo -n '}' >> tmp 109 packages=$out/packages.json.br
+1 -1
pkgs/top-level/release.nix
··· 8 9 $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux 10 */ 11 - { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; rev = "0000000000000000000000000000000000000000"; } 12 , officialRelease ? false 13 # The platforms for which we build Nixpkgs. 14 , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]
··· 8 9 $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux 10 */ 11 + { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; } 12 , officialRelease ? false 13 # The platforms for which we build Nixpkgs. 14 , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]