Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: cebc8e82c795
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 0023f45705b8
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 31, 2021

  1. autoconf271: init at 2.71

    This is a newer version of autoconf that fixes a bunch of issues that occured
    since the last autoconf release and they also fixed one issue with clang that I
    ran into while trying out Nix on aarch64-darwin [1].
    
    [1] http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=de36ccf6637974f4faba3747813d38ee46e77d69
    andir committed Jan 31, 2021
    Copy the full SHA
    10efa49 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    b9cc20e View commit details
    Browse the repository at this point in the history
  3. pythonPackages.psutil: disable tests due to test failures

    Tests are very flaky and depend on the exact execution environment. It
    is weird that it has gone well so far but started causing issues across
    many of my builders.
    
    Also started rewording some of the comments in the expression so
    hopefully the next person looking at this has an easier time to
    understand it.
    
    On systems where swap is available and fully used tests fail like this:
    
    >    def test_swap_memory(self):
    >         mem = psutil.swap_memory()
    >         self.assertEqual(
    >             mem._fields, ('total', 'used', 'free', 'percent', 'sin', 'sout'))
    >
    >         assert mem.total >= 0, mem
    >         assert mem.used >= 0, mem
    >         if mem.total > 0:
    >             # likely a system with no swap partition
    > >           assert mem.free > 0, mem
    > E           AssertionError: sswap(total=1048567808, used=1048567808, free=0, percent=100.0, sin=50741248, sout=1316823040)
    > E           assert 0 > 0
    > E            +  where 0 = sswap(total=1048567808, used=1048567808, free=0, percent=100.0, sin=50741248, sout=1316823040).free
    
    Upstream bug report: giampaolo/psutil#1911
    
    Systems where /proc/mounts doesn't expose any mount points to build the
    tests fail like this:
    
    >     def test_disk_partitions(self):
    >             self.assertIsInstance(nt.device, str)
    >         def check_ntuple(nt):
    >             self.assertIsInstance(nt.mountpoint, str)
    >             self.assertIsInstance(nt.fstype, str)
    >             self.assertIsInstance(nt.opts, str)
    >             self.assertIsInstance(nt.maxfile, (int, type(None)))
    >             self.assertIsInstance(nt.maxpath, (int, type(None)))
    >                 self.assertGreater(nt.maxfile, 0)
    >             if nt.maxfile is not None and not GITHUB_ACTIONS:
    >             if nt.maxpath is not None:
    >                 self.assertGreater(nt.maxpath, 0)
    >
    >         # all = False
    >         ls = psutil.disk_partitions(all=False)
    > >       self.assertTrue(ls, msg=ls)
    > E       AssertionError: [] is not true : []
    
    Upstream bug report: giampaolo/psutil#1912
    andir committed Jan 31, 2021
    Copy the full SHA
    16d7d40 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2021

  1. Merge branch 'nixpkgs-unstable' into PR #111431

    I'm not really sure about the conflicts in:
    	pkgs/development/python-modules/psutil/default.nix
    
    Hydra nixpkgs: ?compare=1666054
    vcunat committed Apr 28, 2021
    Copy the full SHA
    82bccc2 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2021

  1. Copy the full SHA
    0023f45 View commit details
    Browse the repository at this point in the history