statsd: Don't use <nixpkgs>

This was preventing the Nixpkgs channel from updating, since the
program indexer barfed on:

error: anonymous function at /nix/store/wdnwbh3kmf68nhqqp0khcyxbdbp43vg5-nixos-14.12.626.b0d594c/nixos/nixpkgs/pkgs/top-level/node-packages.nix:1:1 called without required argument ‘neededNatives’, at /data/releases/nixos/unstable-small/.tmp-nixos-16.03pre72946.c50d013-787/unpack/nixos-16.03pre72946.c50d013/lib/customisation.nix:56:12

because Nixpkgs 16.03 was importing files from Nixpkgs 14.12.

Also added some half-assed checks to detect this issue in the future.

+16 -7
+1 -1
pkgs/development/python-modules/blivet/default.nix
··· 36 36 six 37 37 ]; 38 38 39 - # Tests are in <nixpkgs/nixos/tests/blivet.nix>. 39 + # Tests are in nixos/tests/blivet.nix. 40 40 doCheck = false; 41 41 42 42 meta = with stdenv.lib; {
+1 -1
pkgs/tools/networking/statsd/default.nix
··· 3 3 4 4 let 5 5 self = recurseIntoAttrs ( 6 - callPackage <nixpkgs/pkgs/top-level/node-packages.nix> { 6 + callPackage ../../../top-level/node-packages.nix { 7 7 inherit nodejs self; 8 8 generated = callPackage ./node-packages.nix { inherit self; }; 9 9 overrides = {
+14 -5
pkgs/top-level/make-tarball.nix
··· 30 30 checkPhase = '' 31 31 export NIX_DB_DIR=$TMPDIR 32 32 export NIX_STATE_DIR=$TMPDIR 33 + export NIX_PATH=nixpkgs=$TMPDIR/barf.nix 33 34 nix-store --init 34 35 36 + echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix 37 + 38 + # Make sure that Nixpkgs does not use <nixpkgs> 39 + if grep -r '<nixpkgs\/' pkgs; then 40 + echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself." 41 + exit 1 42 + fi 43 + 35 44 # Make sure that derivation paths do not depend on the Nixpkgs path. 36 45 mkdir $TMPDIR/foo 37 46 ln -s $(readlink -f .) $TMPDIR/foo/bar 38 - p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox) 47 + p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox --show-trace) 39 48 p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox) 40 49 if [ "$p1" != "$p2" ]; then 41 50 echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" ··· 51 60 52 61 # Check that all-packages.nix evaluates on a number of platforms without any warnings. 53 62 for platform in i686-linux x86_64-linux x86_64-darwin; do 54 - header "checking pkgs/top-level/all-packages.nix on $platform" 63 + header "checking Nixpkgs on $platform" 55 64 56 - NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ 65 + NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ 57 66 --show-trace --argstr system "$platform" \ 58 67 -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log 59 68 60 69 if [ -s eval-warnings.log ]; then 61 - echo "pkgs/top-level/all-packages.nix on $platform evaluated with warnings, aborting" 70 + echo "Nixpkgs on $platform evaluated with warnings, aborting" 62 71 exit 1 63 72 fi 64 73 rm eval-warnings.log 65 74 66 - NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ 75 + NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ 67 76 --show-trace --argstr system "$platform" \ 68 77 -qa --drv-path --system-filter \* --system --meta --xml > /dev/null 69 78 stopNest