Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[staging] autoconf: 2.70 -> 2.71 #111431

Merged
merged 4 commits into from
May 14, 2021
Merged

[staging] autoconf: 2.70 -> 2.71 #111431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10efa49
autoconf271: init at 2.71
andir Jan 30, 2021
b9cc20e
autoconf: use autoconf 2.71 by default
andir Jan 30, 2021
16d7d40
pythonPackages.psutil: disable tests due to test failures
andir Jan 31, 2021
82bccc2
Merge branch 'nixpkgs-unstable' into PR #111431
vcunat Apr 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions pkgs/development/python-modules/psutil/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,25 @@ buildPythonPackage rec {
sha256 = "1immnj532bnnrh1qmk5q3lsw3san8qfk9kxy1cpmy0knmfcwp70c";
};

# arch doesn't report frequency is the same way
# tests segfaults on darwin https://github.com/giampaolo/psutil/issues/1715
doCheck = !stdenv.isDarwin && stdenv.isx86_64;
# We have many test failures on various parts of the package:
# - segfaults on darwin:
# 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 ]
++ 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 = [
"$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 = [
"user"
"disk_io_counters"
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/tools/misc/autoconf/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
# files.

stdenv.mkDerivation rec {
name = "autoconf-2.70";
name = "autoconf-2.71";

src = fetchurl {
url = "mirror://gnu/autoconf/${name}.tar.xz";
sha256 = "1ipckz0wr2mvhj9n3ys54fmf2aksin6bhqvzl304bn6rc1w257ps";
sha256 = "197sl23irn6s9pd54rxj5vcp5y8dv65jb9yfqgr2g56cxg7q6k7i";
};

nativeBuildInputs = [ m4 perl ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12356,14 +12356,14 @@ in

autobuild = callPackage ../development/tools/misc/autobuild { };

autoconf = autoconf270;
autoconf = autoconf271;

autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { };

autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { };
autoconf264 = callPackage ../development/tools/misc/autoconf/2.64.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{ };

Expand Down