diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-06-11 12:59:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-11 12:59:17 +0100 |
| commit | fe208a1cc86c8e8137ebeb18b46022236587b784 (patch) | |
| tree | ea0209f4f8a1693a8584a4a34ab2d85a50690eb5 /pkgs/os-specific | |
| parent | 425bc07d435face36888b2f4d244e93370081156 (diff) | |
| parent | 6bdebf252c48cd60694c8f8c786d6d54ee5e1712 (diff) | |
| download | nixlib-fe208a1cc86c8e8137ebeb18b46022236587b784.tar nixlib-fe208a1cc86c8e8137ebeb18b46022236587b784.tar.gz nixlib-fe208a1cc86c8e8137ebeb18b46022236587b784.tar.bz2 nixlib-fe208a1cc86c8e8137ebeb18b46022236587b784.tar.lz nixlib-fe208a1cc86c8e8137ebeb18b46022236587b784.tar.xz nixlib-fe208a1cc86c8e8137ebeb18b46022236587b784.tar.zst nixlib-fe208a1cc86c8e8137ebeb18b46022236587b784.zip | |
Merge pull request #26509 from MP2E/musl_update
musl: 1.1.15 -> 1.1.16
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/musl/default.nix | 12 |
1 files 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; |