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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6d4b93323e7f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 914148a665ba
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 11, 2020

  1. pythonPackages.supervisor: drop glibc-2.31 patch 

    A fix was integrated into the 4.2.1 release.
    @mweinelt
    mweinelt committed Sep 11, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4607f02 View commit details

  2. Merge pull request #97724 from mweinelt/supervisor 

    pythonPackages.supervisor: drop glibc-2.31 patch
    @Ma27
    Ma27 authored Sep 11, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    914148a View commit details
Showing with 0 additions and 20 deletions.
  1. +0 −7 pkgs/development/python-modules/supervisor/default.nix
  2. +0 −13 pkgs/development/python-modules/supervisor/glibc-2.31.patch
7 changes: 0 additions & 7 deletions pkgs/development/python-modules/supervisor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,13 +14,6 @@ buildPythonPackage rec {
sha256 = "c479c875853e9c013d1fa73e529fd2165ff1ecaecc7e82810ba57e7362ae984d";
};

patches = [
# SOMAXCONN limit of glibc-2.31 has been increased from 128 to 4096:
# * https://sourceware.org/git/?p=glibc.git;a=commit;h=96958e2700f5b4f4d1183a0606b2b9848a53ea44
# * https://github.com/Supervisor/supervisor/issues/1346
./glibc-2.31.patch
];

# wants to write to /tmp/foo which is likely already owned by another
# nixbld user on hydra
doCheck = !stdenv.isDarwin;
13 changes: 0 additions & 13 deletions pkgs/development/python-modules/supervisor/glibc-2.31.patch
View file

This file was deleted.