From 6bdebf252c48cd60694c8f8c786d6d54ee5e1712 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sat, 10 Jun 2017 15:37:40 -0700 Subject: [PATCH] musl: 1.1.15 -> 1.1.16 --- pkgs/os-specific/linux/musl/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 54d6dbcb1ca4..e37a2b9f55e6 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.15"; + version = "1.1.16"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "1ymhxkskivzph0q34zadwfglc5gyahqajm7chqqn2zraxv3lgr4p"; + sha256 = "048h0w4yjyza4h05bkc6dpwg3hq6l03na46g0q1ha8fpwnjqawck"; }; enableParallelBuilding = true; @@ -24,13 +24,7 @@ stdenv.mkDerivation rec { "--enable-static" ]; - patches = [ - # CVE-2016-8859: http://www.openwall.com/lists/oss-security/2016/10/19/1 - (fetchpatch { - url = "https://git.musl-libc.org/cgit/musl/patch/?id=c3edc06d1e1360f3570db9155d6b318ae0d0f0f7"; - sha256 = "15ih0aj27lz4sgq8r5jndc3qy5gz3ciraavrqpp0vw8h5wjcsb9v"; - }) - ]; + patches = []; dontDisableStatic = true;