diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-12-07 15:57:06 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-12-07 16:00:09 +0100 |
| commit | 5c5223d46b5d159e6c297feeb0ee277536e9e158 (patch) | |
| tree | e6b11d4344084ad7ea7f84c75f01bb2f507fffc9 /pkgs/top-level/make-tarball.nix | |
| parent | 9a8633bb5982a3e772a7b3dc9db1ff005fb65074 (diff) | |
| download | nixpkgs-5c5223d46b5d159e6c297feeb0ee277536e9e158.tar nixpkgs-5c5223d46b5d159e6c297feeb0ee277536e9e158.tar.gz nixpkgs-5c5223d46b5d159e6c297feeb0ee277536e9e158.tar.bz2 nixpkgs-5c5223d46b5d159e6c297feeb0ee277536e9e158.tar.lz nixpkgs-5c5223d46b5d159e6c297feeb0ee277536e9e158.tar.xz nixpkgs-5c5223d46b5d159e6c297feeb0ee277536e9e158.tar.zst nixpkgs-5c5223d46b5d159e6c297feeb0ee277536e9e158.zip | |
make-tarball.nix: Fix <nixpkgs> check
This was broken by 6bcf1944494973029071411bb378d4262ce2a678, which caused the result of the check to be ignored (since xargs will return a non-zero exit status if *any* grep doesn't find a match).
Diffstat (limited to 'pkgs/top-level/make-tarball.nix')
| -rw-r--r-- | pkgs/top-level/make-tarball.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 16940761e6d..ccd7b89fc12 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -43,8 +43,10 @@ releaseTools.sourceTarball rec { echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix # Make sure that Nixpkgs does not use <nixpkgs> - if (find pkgs -type f -name '*.nix' -print | xargs grep '<nixpkgs\/'); then + badFiles=$(find pkgs -type f -name '*.nix' -print | xargs grep -l '^[^#]*<nixpkgs\/' || true) + if [[ -n $badFiles ]]; then echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself." + echo "The offending files: $badFiles" exit 1 fi |