diff options
| author | TredwellGit <tredwell@tutanota.com> | 2021-03-23 15:45:23 +0000 |
|---|---|---|
| committer | TredwellGit <tredwell@tutanota.com> | 2021-03-23 15:45:23 +0000 |
| commit | 5e2311d2fb2e375a304a9d6d38b6fa445f158a75 (patch) | |
| tree | 75afa25f6b025cff95c31d4ea61e6e859ed8729f /pkgs/os-specific | |
| parent | c622182b3894e1133c89ba351171611802968944 (diff) | |
musl: 1.2.1 -> 1.2.2
https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v1.2.2#n2242
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/musl/default.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 3310692b31dc..ae175a363241 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { pname = "musl"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; - sha256 = "0jz8fzwgvfyjgxjbpw35ixdglp2apqjvp8m386f6yr4zacc6xbv8"; + url = "https://musl.libc.org/releases/${pname}-${version}.tar.gz"; + sha256 = "1p8r6bac64y98ln0wzmnixysckq3crca69ys7p16sy9d04i975lv"; }; enableParallelBuilding = true; @@ -67,12 +67,6 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) - # wcsnrtombs destination buffer overflow, remove >= 1.2.2 - (fetchurl { - name = "CVE-2020-28928.patch"; - url = "https://www.openwall.com/lists/oss-security/2020/11/20/4/1"; - sha256 = "077n2p165504nz9di6n8y5421591r3lsbcxgih8z26l6mvkhcs2h"; - }) ]; CFLAGS = [ "-fstack-protector-strong" ] ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64"; @@ -149,7 +143,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An efficient, small, quality libc implementation"; - homepage = "http://www.musl-libc.org"; + homepage = "https://musl.libc.org/"; + changelog = "https://git.musl-libc.org/cgit/musl/tree/WHATSNEW?h=v${version}"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice dtzWill ]; |