summary refs log tree commit diff
path: root/pkgs/top-level/make-tarball.nix
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-03-29 20:14:15 +0200
committerEelco Dolstra <edolstra@gmail.com>2020-03-29 20:16:07 +0200
commit5e8545e72341887bb371407a71a723bc0e9c7844 (patch)
tree7b779c9f612912d291a0136c868a546ffa2e4dc4 /pkgs/top-level/make-tarball.nix
parent0dd5ccc742eab4332b98065af328275a21bf8ea5 (diff)
downloadnixpkgs-5e8545e72341887bb371407a71a723bc0e9c7844.tar
nixpkgs-5e8545e72341887bb371407a71a723bc0e9c7844.tar.gz
nixpkgs-5e8545e72341887bb371407a71a723bc0e9c7844.tar.bz2
nixpkgs-5e8545e72341887bb371407a71a723bc0e9c7844.tar.lz
nixpkgs-5e8545e72341887bb371407a71a723bc0e9c7844.tar.xz
nixpkgs-5e8545e72341887bb371407a71a723bc0e9c7844.tar.zst
nixpkgs-5e8545e72341887bb371407a71a723bc0e9c7844.zip
make-tarball.nix: Restore the 'commit' field in packages.json
Also change incorrect 'revision' to 'rev' in the default value for
'nixpkgs' in release.nix.

Fixes https://github.com/NixOS/nixos-homepage/issues/372.
Diffstat (limited to 'pkgs/top-level/make-tarball.nix')
-rw-r--r--pkgs/top-level/make-tarball.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index bb0d7bc54e7..9bb9e99b4ce 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,"packages":' > tmp
+    echo -n '{"version":2,"commit":"${nixpkgs.rev}","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