glibc: 2.30 -> 2.31

https://lists.gnu.org/archive/html/info-gnu/2020-02/msg00001.html
NixOS · Feb 6, 2020 · 808d802 · 808d802
1 parent b2b5e08
commit 808d802
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 21 deletions.
diff --git a/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch b/pkgs/development/libraries/glibc/2.27-CVE-2019-19126.patch
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
@@ -36,9 +36,9 @@
 } @ args:
 
 let
-  version = "2.30";
+  version = "2.31";
   patchSuffix = "";
-  sha256 = "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72";
+  sha256 = "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj";
 in
 
 assert withLinuxHeaders -> linuxHeaders != null;
@@ -97,7 +97,6 @@ stdenv.mkDerivation ({
     ]
     ++ lib.optionals stdenv.isx86_64 [
       ./fix-x64-abi.patch
-      ./2.27-CVE-2019-19126.patch
     ]
     ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch
     ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch;