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

Merge #111431: autoconf: 2.70 -> 2.71 (into staging)

Browse Source
This commit is contained in:
Vladimír Čunát 2021-05-14 18:29:05 +02:00
commit 0023f45705
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/python-modules/psutil/default.nix
View File

@ -15,16 +15,25 @@ buildPythonPackage rec {
sha256 = "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c"; sha256 = "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c";
}; };
# arch doesn't report frequency is the same way # We have many test failures on various parts of the package:
# tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715 # - segfaults on darwin:
doCheck = !stdenv.isDarwin && stdenv.isx86_64; # https://github.com/giampaolo/psutil/issues/1715
# - swap (on linux) might cause test failures if it is fully used:
# https://github.com/giampaolo/psutil/issues/1911
# - some mount paths are required in the build sanbox to make the tests succeed:
# https://github.com/giampaolo/psutil/issues/1912
doCheck = false;
checkInputs = [ pytestCheckHook ] checkInputs = [ pytestCheckHook ]
++ lib.optionals isPy27 [ mock ipaddress unittest2 ]; ++ lib.optionals isPy27 [ mock ipaddress unittest2 ];
# In addition to the issues listed above there are some that occure due to
# our sandboxing which we can work around by disabling some tests:
# - cpu_times was flaky on darwin
# - the other disabled tests are likely due to sanboxing (missing specific errors)
pytestFlagsArray = [ pytestFlagsArray = [
"$out/${python.sitePackages}/psutil/tests/test_system.py" "$out/${python.sitePackages}/psutil/tests/test_system.py"
]; ];
# disable tests which don't work in sandbox
# cpu_times is flakey on darwin # Note: $out must be referenced as test import paths are relative
disabledTests = [ disabledTests = [
"user" "user"
"disk_io_counters" "disk_io_counters"

4
pkgs/development/tools/misc/autoconf/default.nix
View File

@ -6,11 +6,11 @@
# files. # files.
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "autoconf-2.70"; name = "autoconf-2.71";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/autoconf/${name}.tar.xz"; url = "mirror://gnu/autoconf/${name}.tar.xz";
sha256 = "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps"; sha256 = "197sl23irn6s9pd54rxj5vcp5y8dv65jb9yfqgr2g56cxg7q6k7i";
}; };
nativeBuildInputs = [ m4 perl ]; nativeBuildInputs = [ m4 perl ];

4
pkgs/top-level/all-packages.nix
View File

@ -12500,14 +12500,14 @@ in
autobuild = callPackage ../development/tools/misc/autobuild { }; autobuild = callPackage ../development/tools/misc/autobuild { };
autoconf = autoconf270; autoconf = autoconf271;
autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { };
autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { }; autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.nix { };
autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { }; autoconf269 = callPackage ../development/tools/misc/autoconf/2.69.nix { };
autoconf270 = callPackage ../development/tools/misc/autoconf { }; autoconf271 = callPackage ../development/tools/misc/autoconf { };
autocutsel = callPackage ../tools/X11/autocutsel{ }; autocutsel = callPackage ../tools/X11/autocutsel{ };