JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 5e8545e723.

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
This commit is contained in:
Florian Klink 2020-03-29 20:57:50 +02:00
parent f4f8921f97
commit 855a12eacf
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/doc-support/lib-function-locations.nix
View File

@ -1,6 +1,6 @@
{ pkgs ? (import ./.. { }), nixpkgs ? { }}: { pkgs ? (import ./.. { }), nixpkgs ? { }}:
let let
revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.rev or "master"); revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master");
libDefPos = set: libDefPos = set:
builtins.map builtins.map

2
pkgs/top-level/make-tarball.nix
View File

@ -103,7 +103,7 @@ releaseTools.sourceTarball {
header "generating packages.json" header "generating packages.json"
mkdir -p $out/nix-support mkdir -p $out/nix-support
echo -n '{"version":2,"commit":"${nixpkgs.rev}","packages":' > tmp echo -n '{"version":2,"packages":' > tmp
nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp
echo -n '}' >> tmp echo -n '}' >> tmp
packages=$out/packages.json.br packages=$out/packages.json.br

2
pkgs/top-level/release.nix
View File

@ -8,7 +8,7 @@
$ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux $ nix-build pkgs/top-level/release.nix -A coreutils.x86_64-linux
*/ */
{ nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; rev = "0000000000000000000000000000000000000000"; } { nixpkgs ? { outPath = (import ../../lib).cleanSource ../..; revCount = 1234; shortRev = "abcdef"; revision = "0000000000000000000000000000000000000000"; }
, officialRelease ? false , officialRelease ? false
# The platforms for which we build Nixpkgs. # The platforms for which we build Nixpkgs.
, supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]