Merge branch 'staging-next'

Security fixes for a few packages are included.
This commit is contained in:
Vladimír Čunát
2018-08-21 15:36:02 +02:00
196 changed files with 9556 additions and 16487 deletions
+9
View File
@@ -4,6 +4,7 @@
, fusePackages, utillinux, gettext
, meson, ninja, pkgconfig
, autoreconfHook
, python3Packages, which
}:
let
@@ -58,6 +59,14 @@ in stdenv.mkDerivation rec {
./makeconf.sh
'');
checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]);
checkPhase = ''
python3 -m pytest test/
'';
doCheck = false; # v2: no tests, v3: all tests get skipped in a sandbox
postFixup = "cd $out\n" + (if isFuse3 then ''
install -D -m444 etc/fuse.conf $common/etc/fuse.conf
install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules