mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 09:53:10 +00:00
nixVersions.nix_{2_3,2_10,2_11,2_12}: add monitorfdhup patch
This commit is contained in:
parent
ee29a773d1
commit
c035bfc528
@ -39,6 +39,13 @@ let
|
||||
aws-sdk-cpp = aws-sdk-cpp-nix;
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nix/pull/7585
|
||||
patch-monitorfdhup = fetchpatch2 {
|
||||
name = "nix-7585-monitor-fd-hup.patch";
|
||||
url = "https://github.com/NixOS/nix/commit/1df3d62c769dc68c279e89f68fdd3723ed3bcb5a.patch";
|
||||
sha256 = "sha256-f+F0fUO+bqyPXjt+IXJtISVr589hdc3y+Cdrxznb+Nk=";
|
||||
};
|
||||
|
||||
# https://github.com/NixOS/nix/pull/7473
|
||||
patch-sqlite-exception = fetchpatch2 {
|
||||
name = "nix-7473-sqlite-exception-add-message.patch";
|
||||
@ -53,6 +60,9 @@ in lib.makeExtensible (self: {
|
||||
url = "https://nixos.org/releases/nix/nix-${version}/nix-${version}.tar.xz";
|
||||
sha256 = "sha256-fuaBtp8FtSVJLSAsO+3Nne4ZYLuBj2JpD2xEk7fCqrw=";
|
||||
};
|
||||
patches = [
|
||||
patch-monitorfdhup
|
||||
];
|
||||
}).override { boehmgc = boehmgc-nix_2_3; };
|
||||
|
||||
nix_2_4 = throw "nixVersions.nix_2_4 has been removed";
|
||||
@ -78,6 +88,7 @@ in lib.makeExtensible (self: {
|
||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
})
|
||||
patch-monitorfdhup
|
||||
patch-sqlite-exception
|
||||
];
|
||||
};
|
||||
@ -93,6 +104,7 @@ in lib.makeExtensible (self: {
|
||||
url = "https://github.com/NixOS/nix/commit/3ade5f5d6026b825a80bdcc221058c4f14e10a27.patch";
|
||||
sha256 = "sha256-s1ybRFCjQaSGj7LKu0Z5g7UiHqdJGeD+iPoQL0vaiS0=";
|
||||
})
|
||||
patch-monitorfdhup
|
||||
patch-sqlite-exception
|
||||
];
|
||||
};
|
||||
@ -102,6 +114,7 @@ in lib.makeExtensible (self: {
|
||||
sha256 = "sha256-sQ9C101CL/eVN5JgH91ozHFWU4+bXr8/Fi/8NQk6xRI=";
|
||||
patches = [
|
||||
./patches/flaky-tests.patch
|
||||
patch-monitorfdhup
|
||||
patch-sqlite-exception
|
||||
];
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user