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

statsd: Don't use <nixpkgs>

Browse Source 
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.
This commit is contained in:
Eelco Dolstra 2015-12-02 15:58:30 +01:00
parent f7c25bf9c2
commit cae5bfb991
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/blivet/default.nix
View File

@ -36,7 +36,7 @@ in buildPythonPackage rec {
six six
]; ];
# Tests are in <nixpkgs/nixos/tests/blivet.nix>. # Tests are in nixos/tests/blivet.nix.
doCheck = false; doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/tools/networking/statsd/default.nix
View File

@ -3,7 +3,7 @@
let let
self = recurseIntoAttrs ( self = recurseIntoAttrs (
callPackage <nixpkgs/pkgs/top-level/node-packages.nix> { callPackage ../../../top-level/node-packages.nix {
inherit nodejs self; inherit nodejs self;
generated = callPackage ./node-packages.nix { inherit self; }; generated = callPackage ./node-packages.nix { inherit self; };
overrides = { overrides = {

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

@ -30,12 +30,21 @@ releaseTools.sourceTarball rec {
checkPhase = '' checkPhase = ''
export NIX_DB_DIR=$TMPDIR export NIX_DB_DIR=$TMPDIR
export NIX_STATE_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR
export NIX_PATH=nixpkgs=$TMPDIR/barf.nix
nix-store --init nix-store --init
echo 'abort "Illegal use of <nixpkgs> in Nixpkgs."' > $TMPDIR/barf.nix
# Make sure that Nixpkgs does not use <nixpkgs>
if grep -r '<nixpkgs\/' pkgs; then
echo "Nixpkgs is not allowed to use <nixpkgs> to refer to itself."
exit 1
fi
# Make sure that derivation paths do not depend on the Nixpkgs path. # Make sure that derivation paths do not depend on the Nixpkgs path.
mkdir $TMPDIR/foo mkdir $TMPDIR/foo
ln -s $(readlink -f .) $TMPDIR/foo/bar ln -s $(readlink -f .) $TMPDIR/foo/bar
p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox) p1=$(nix-instantiate pkgs/top-level/all-packages.nix --dry-run -A firefox --show-trace)
p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox) p2=$(nix-instantiate $TMPDIR/foo/bar/pkgs/top-level/all-packages.nix --dry-run -A firefox)
if [ "$p1" != "$p2" ]; then if [ "$p1" != "$p2" ]; then
echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!" echo "Nixpkgs evaluation depends on Nixpkgs path ($p1 vs $p2)!"
@ -51,19 +60,19 @@ releaseTools.sourceTarball rec {
# Check that all-packages.nix evaluates on a number of platforms without any warnings. # Check that all-packages.nix evaluates on a number of platforms without any warnings.
for platform in i686-linux x86_64-linux x86_64-darwin; do for platform in i686-linux x86_64-linux x86_64-darwin; do
header "checking pkgs/top-level/all-packages.nix on $platform" header "checking Nixpkgs on $platform"
NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \
--show-trace --argstr system "$platform" \ --show-trace --argstr system "$platform" \
-qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log
if [ -s eval-warnings.log ]; then if [ -s eval-warnings.log ]; then
echo "pkgs/top-level/all-packages.nix on $platform evaluated with warnings, aborting" echo "Nixpkgs on $platform evaluated with warnings, aborting"
exit 1 exit 1
fi fi
rm eval-warnings.log rm eval-warnings.log
NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \
--show-trace --argstr system "$platform" \ --show-trace --argstr system "$platform" \
-qa --drv-path --system-filter \* --system --meta --xml > /dev/null -qa --drv-path --system-filter \* --system --meta --xml > /dev/null
stopNest stopNest