From 1263a712fff1be63be349b2dfe728b08dbf516dc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 14 Oct 2019 15:24:54 -0500 Subject: [PATCH 1/2] musl: 1.1.2x -> 1.1.24 https://www.openwall.com/lists/musl/2019/10/13/5 Apparently 1.1.23 never made it to nixpkgs proper (?!), see: https://git.musl-libc.org/cgit/musl/commit/?id=b07d45eb01e900f0176894fdedab62285f5cb8be (sorry I apparently dropped the ball here) --- pkgs/os-specific/linux/musl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 91e1ae36f709..842b68c86538 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "musl"; - version = "1.1.22"; + version = "1.1.24"; src = fetchurl { url = "https://www.musl-libc.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1qr9xqdzziy5bsyyqlh6k8yz056ll55d5yvc0gbhz61ginj422cb"; + sha256 = "18r2a00k82hz0mqdvgm7crzc7305l36109c0j9yjmkxj2alcjw0k"; }; enableParallelBuilding = true; From 1e746cae1e053b5d9a40caa20c2155da05d3d4a9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 14 Oct 2019 18:51:51 -0500 Subject: [PATCH 2/2] musl: touchup meta, add myself (@dtzWill) to maintainers list --- pkgs/os-specific/linux/musl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 842b68c86538..93e9ba614f88 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -110,11 +110,11 @@ stdenv.mkDerivation rec { passthru.linuxHeaders = linuxHeaders; - meta = { + meta = with lib; { description = "An efficient, small, quality libc implementation"; homepage = "http://www.musl-libc.org"; - license = lib.licenses.mit; - platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.thoughtpolice ]; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice dtzWill ]; }; }