diff options
| author | Florian Klink <flokli@flokli.de> | 2020-03-29 20:57:50 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-03-29 20:57:50 +0200 |
| commit | 855a12eacff57f0b9a6e34e93cd78d1adfc10d6a (patch) | |
| tree | fb6f36c77371700868dbee608f5125dcc2451e69 | |
| parent | f4f8921f97eefb1b5832f36f7b757bcb91b7cb24 (diff) | |
| download | nixpkgs-855a12eacff57f0b9a6e34e93cd78d1adfc10d6a.tar nixpkgs-855a12eacff57f0b9a6e34e93cd78d1adfc10d6a.tar.gz nixpkgs-855a12eacff57f0b9a6e34e93cd78d1adfc10d6a.tar.bz2 nixpkgs-855a12eacff57f0b9a6e34e93cd78d1adfc10d6a.tar.lz nixpkgs-855a12eacff57f0b9a6e34e93cd78d1adfc10d6a.tar.xz nixpkgs-855a12eacff57f0b9a6e34e93cd78d1adfc10d6a.tar.zst nixpkgs-855a12eacff57f0b9a6e34e93cd78d1adfc10d6a.zip | |
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
| -rw-r--r-- | doc/doc-support/lib-function-locations.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/doc-support/lib-function-locations.nix b/doc/doc-support/lib-function-locations.nix index 53a96bc2659..68edd270985 100644 --- a/doc/doc-support/lib-function-locations.nix +++ b/doc/doc-support/lib-function-locations.nix @@ -1,6 +1,6 @@ { pkgs ? (import ./.. { }), nixpkgs ? { }}: let - revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.rev or "master"); + revision = pkgs.lib.trivial.revisionWithDefault (nixpkgs.revision or "master"); libDefPos = set: builtins.map diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 9bb9e99b4ce..bb0d7bc54e7 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -103,7 +103,7 @@ releaseTools.sourceTarball { header "generating packages.json" 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 echo -n '}' >> tmp packages=$out/packages.json.br diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ca1343261db..e0723523f4e 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -8,7 +8,7 @@ $ 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 # The platforms for which we build Nixpkgs. , supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] |