gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

musl: 1.2.3 -> 1.2.5

Browse Source 
This release fixes the implementation of strverscmp(), so the libtasn1
patch that negates the test can now be removed.
This commit is contained in:
Alyssa Ross
2024-09-20 18:46:25 +02:00
parent 268e483412
commit 697ece4455
4 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/abseil-cpp/202103.nix
+2
View File
@@ -59,5 +59,7 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.andersk ];
# Requires LFS64 APIs. 202401 and later are fine.
broken = stdenv.hostPlatform.isMusl;
};
}
pkgs/development/libraries/abseil-cpp/202301.nix
+2
View File
@@ -44,5 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.andersk ];
# Requires LFS64 APIs. 202401 and later are fine.
broken = stdenv.hostPlatform.isMusl;
};
})
pkgs/development/libraries/libtasn1/default.nix
-9
View File
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchurl
, fetchpatch
, perl
, texinfo
@@ -20,14 +19,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-FhPwrBz0hNbsDOO4wG1WJjzHJC8cI7MNgtI940WmP3o=";
};
# Patch borrowed from alpine to work around a specific test failure with musl libc
# Upstream is patching this test in their own CI because that CI is using alpine and thus musl
# https://github.com/gnutls/libtasn1/commit/06e7433c4e587e2ba6df521264138585a63d07c7#diff-037ea159eb0a7cb0ac23b851e66bee30fb838ee8d0d99fa331a1ba65283d37f7R293
patches = lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
url = "https://git.alpinelinux.org/aports/plain/main/libtasn1/failed-test.patch?id=aaed9995acc1511d54d5d93e1ea3776caf4aa488";
sha256 = "sha256-GTfwqEelEsGtLEcBwGRfBZZz1vKXRfWXtMx/409YqX8=";
});
outputs = [ "out" "dev" "devdoc" ];
outputBin = "dev";
pkgs/os-specific/linux/musl/default.nix
+7 -12
View File
@@ -44,11 +44,11 @@ let
in
stdenv.mkDerivation rec {
pname = "musl";
version = "1.2.3";
version = "1.2.5";
src = fetchurl {
url = "https://musl.libc.org/releases/${pname}-${version}.tar.gz";
sha256 = "sha256-fVsLYGJSHkYn4JnkydyCSNMqMChelZt+7Kp4DPjP1KQ=";
sha256 = "qaEYu+hNh2TaDqDSizqz+uhHf8fkCF2QECuFlvx8deQ=";
};
enableParallelBuilding = true;
@@ -71,12 +71,6 @@ stdenv.mkDerivation rec {
url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch";
sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n";
})
# fix parsing lines with optional fields in fstab etc. NOTE: Remove for the next release since it has been merged upstream
(fetchurl {
url = "https://git.musl-libc.org/cgit/musl/patch/?id=751bee0ee727e8d8b003c87cff77ac76f1dbecd6";
sha256 = "sha256-qCw132TCSaZrkISmtDb8Q8ufyt8sAJdwACkvfwuoi/0=";
})
];
CFLAGS = [ "-fstack-protector-strong" ]
++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64";
@@ -151,10 +145,11 @@ stdenv.mkDerivation rec {
license = licenses.mit;
platforms = [
"aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
"armv7l-linux" "i686-linux" "x86_64-linux" "m68k-linux"
"microblaze-linux" "microblazeel-linux" "mips-linux" "mips64-linux"
"mipsel-linux" "mips64el-linux" "powerpc64-linux" "powerpc64le-linux"
"riscv64-linux" "s390x-linux"
"armv7l-linux" "i686-linux" "loongarch64-linux" "m68k-linux"
"microblaze-linux" "microblazeel-linux" "mips-linux"
"mips64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux"
"powerpc64le-linux" "riscv32-linux" "riscv64-linux"
"s390x-linux" "x86_64-linux"
];
maintainers = with maintainers; [ thoughtpolice dtzWill ];
};