mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-26 02:20:36 +00:00
Compare commits
217 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
41b595239b | ||
|
|
9b4d29aa74 | ||
|
|
2ba8b0c93e | ||
|
|
303ca0fe9b | ||
|
|
673a37d284 | ||
|
|
b25725c601 | ||
|
|
885c75596d | ||
|
|
48c5003e3d | ||
|
|
2c891a6f1f | ||
|
|
44d362d5a6 | ||
|
|
1ea7aae21f | ||
|
|
aa7a3b1c68 | ||
|
|
ee674f9897 | ||
|
|
0513e11355 | ||
|
|
da3aedc384 | ||
|
|
a67fa62eb3 | ||
|
|
d8f639ff89 | ||
|
|
94f7975fb8 | ||
|
|
41edc200a6 | ||
|
|
2dc0d42192 | ||
|
|
22c017cf68 | ||
|
|
bb8534b07d | ||
|
|
a4a35f10b9 | ||
|
|
008c45a383 | ||
|
|
c94477c2d2 | ||
|
|
00d0b792cc | ||
|
|
ba2ca99e29 | ||
|
|
1be9a8d15a | ||
|
|
c5481d89f4 | ||
|
|
7a0b03740a | ||
|
|
2f81259e56 | ||
|
|
c7010daad2 | ||
|
|
11ead1be24 | ||
|
|
dbce7bdf5f | ||
|
|
5e3b18898a | ||
|
|
7f6b809aa5 | ||
|
|
838f68584a | ||
|
|
2dbf639607 | ||
|
|
f6055e87bf | ||
|
|
6862cf855e | ||
|
|
21017fadcc | ||
|
|
61e6dad91e | ||
|
|
a48b2baac5 | ||
|
|
232cf6b9db | ||
|
|
12f115452c | ||
|
|
468b788365 | ||
|
|
67baa7d684 | ||
|
|
1edc097bd2 | ||
|
|
bcdf716948 | ||
|
|
5fe66fcffe | ||
|
|
44000aec59 | ||
|
|
a0f7233e07 | ||
|
|
90da5ffd35 | ||
|
|
391874228d | ||
|
|
368f7bf357 | ||
|
|
05a86876bd | ||
|
|
9ff109fb87 | ||
|
|
aa9484a1aa | ||
|
|
0eee18cde3 | ||
|
|
90f0ae699f | ||
|
|
08675bad08 | ||
|
|
66c61c3c1e | ||
|
|
4335931ec3 | ||
|
|
a453e9151e | ||
|
|
33906cd762 | ||
|
|
10d1260d3a | ||
|
|
69f75cc1a4 | ||
|
|
7bd1ed1622 | ||
|
|
75eca02672 | ||
|
|
e7fc5f5929 | ||
|
|
100921721e | ||
|
|
ffe6ce2a14 | ||
|
|
a2c03f70a6 | ||
|
|
b240a809a8 | ||
|
|
fee9080b63 | ||
|
|
e9f5fbea62 | ||
|
|
b0b780a4ae | ||
|
|
d2cff906cc | ||
|
|
e51f60deb2 | ||
|
|
585b17062b | ||
|
|
ea1d43ed8a | ||
|
|
a4973ac2d4 | ||
|
|
1f22863ccd | ||
|
|
a74384116d | ||
|
|
b0003ba3f5 | ||
|
|
06d50224cc | ||
|
|
f412c70cf7 | ||
|
|
26cfad56d0 | ||
|
|
1c88beab89 | ||
|
|
e3850b7cb0 | ||
|
|
7973bd606a | ||
|
|
e2f1003d54 | ||
|
|
e5e485993a | ||
|
|
2f1ba1e607 | ||
|
|
c89f3fbd2d | ||
|
|
481f060889 | ||
|
|
9bcdcbe201 | ||
|
|
bdd41cf25f | ||
|
|
c1fac1327d | ||
|
|
737bea0291 | ||
|
|
1ea19ce3da | ||
|
|
85f3793b05 | ||
|
|
b43c707be2 | ||
|
|
aa4219ffaa | ||
|
|
951e50ec2b | ||
|
|
72dfbeef2f | ||
|
|
52325bf865 | ||
|
|
8741663b37 | ||
|
|
f6c466042e | ||
|
|
2709d6b4f4 | ||
|
|
ca13224dfb | ||
|
|
fb6f0040ba | ||
|
|
b2aab90a9c | ||
|
|
5029ec8c4b | ||
|
|
85698966be | ||
|
|
89d7ad761d | ||
|
|
06dfd43f5a | ||
|
|
9d32e5581e | ||
|
|
7d3875618f | ||
|
|
5f6ddcdf15 | ||
|
|
5cf2644c4f | ||
|
|
7bb08865d0 | ||
|
|
ac882579e9 | ||
|
|
1780b903fd | ||
|
|
ce8a82fb44 | ||
|
|
33ca91a44e | ||
|
|
aa3e83b5be | ||
|
|
0fb5f0c1d5 | ||
|
|
eaaeed2a57 | ||
|
|
66b5ff6922 | ||
|
|
bb64af82c3 | ||
|
|
030180ff42 | ||
|
|
93c2daee52 | ||
|
|
cf5eebf360 | ||
|
|
3d43477063 | ||
|
|
80d7920bdd | ||
|
|
be8bc646d4 | ||
|
|
d3ea2a3180 | ||
|
|
a756cf1950 | ||
|
|
c9a869ef27 | ||
|
|
631bb3f063 | ||
|
|
8fb20960f6 | ||
|
|
6ba22d1955 | ||
|
|
14c9361dac | ||
|
|
9652e1332d | ||
|
|
e6f60a365a | ||
|
|
fe496ec525 | ||
|
|
4f6ec6fc96 | ||
|
|
979d1af798 | ||
|
|
01b81663af | ||
|
|
143000035a | ||
|
|
6a00cf9029 | ||
|
|
b8849050c9 | ||
|
|
35eba27db6 | ||
|
|
781c3e5b32 | ||
|
|
67204887a8 | ||
|
|
007ea29d17 | ||
|
|
63f496d8fb | ||
|
|
56caf75a2b | ||
|
|
e79e57c3d0 | ||
|
|
f659de9be2 | ||
|
|
339568c9f9 | ||
|
|
36077ec8f8 | ||
|
|
c0216ed720 | ||
|
|
dac609047e | ||
|
|
0e0204bf39 | ||
|
|
b5231255ab | ||
|
|
3e44519ed5 | ||
|
|
4c4644e487 | ||
|
|
0b99f61e56 | ||
|
|
e72f7e0e9e | ||
|
|
6efd50f603 | ||
|
|
5ff3d47156 | ||
|
|
f2f80d3cde | ||
|
|
68a131f652 | ||
|
|
33f1076b16 | ||
|
|
50e42b2d6c | ||
|
|
107ecb2533 | ||
|
|
84d99e1916 | ||
|
|
4893b4e92d | ||
|
|
dfea27aa96 | ||
|
|
ba6c358aff | ||
|
|
a51d057203 | ||
|
|
dbd0f87198 | ||
|
|
d0cbf1997e | ||
|
|
a043bd8b36 | ||
|
|
bd7c058954 | ||
|
|
290bcbbbb4 | ||
|
|
18c75074ca | ||
|
|
26482ee87c | ||
|
|
3512188322 | ||
|
|
5dbb5ece48 | ||
|
|
50d878deee | ||
|
|
af253c905a | ||
|
|
df0809760c | ||
|
|
60451d9fcf | ||
|
|
55781a05ed | ||
|
|
6204aa2983 | ||
|
|
5964572d17 | ||
|
|
cbd66b68e2 | ||
|
|
12babd1e2a | ||
|
|
d88eb9f171 | ||
|
|
5614859b5a | ||
|
|
f186affb81 | ||
|
|
df13b3e4a4 | ||
|
|
9508ddad2b | ||
|
|
35bc596317 | ||
|
|
5526f30e5a | ||
|
|
d14289b445 | ||
|
|
d066489411 | ||
|
|
3259398327 | ||
|
|
c4df48e4e2 | ||
|
|
14700de3af | ||
|
|
32c3bbd5b6 | ||
|
|
ba1857095f | ||
|
|
b3a0b19271 | ||
|
|
0565c96604 |
@@ -31,6 +31,6 @@
|
||||
assert ("Latitude: 12.345000°" in whereAmI), f"Incorrect latitude in:\n{whereAmI}"
|
||||
assert ("Longitude: -67.890000°" in whereAmI), f"Incorrect longitude in:\n{whereAmI}"
|
||||
assert ("Altitude: 123.450000 meters" in whereAmI), f"Incorrect altitude in:\n{whereAmI}"
|
||||
assert ("Accuracy: 1000.000000 meters" in whereAmI), f"Incorrect accuracy in:\n{whereAmI}"
|
||||
assert ("Accuracy: 1000 meters" in whereAmI), f"Incorrect accuracy in:\n{whereAmI}"
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -460,19 +460,17 @@ in
|
||||
nodes.machine = common;
|
||||
|
||||
testScript =
|
||||
let
|
||||
oldVersion = "222";
|
||||
in
|
||||
# python
|
||||
''
|
||||
machine.succeed("mount -o remount,rw /boot")
|
||||
|
||||
def switch():
|
||||
# Replace version inside sd-boot with something older. See magic[] string in systemd src/boot/efi/boot.c
|
||||
# Replace version inside sd-boot with something older. See SD_MAGIC in systemd src/boot/boot.c
|
||||
# Note: the sed replacement has to be length-preserving, because section length matters.
|
||||
machine.succeed(
|
||||
"""
|
||||
r"""
|
||||
find /boot -iname '*boot*.efi' -print0 | \
|
||||
xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot ${oldVersion} ####/' '{}'
|
||||
xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot [0-9]\(.*\) ####/#### LoaderInfo: systemd-boot 0\1 ####/' '{}'
|
||||
"""
|
||||
)
|
||||
return machine.succeed("/run/current-system/bin/switch-to-configuration boot 2>&1")
|
||||
|
||||
@@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ASSIMP_BUILD_ASSIMP_TOOLS" true)
|
||||
(lib.cmakeBool "ASSIMP_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
(lib.cmakeBool "ASSIMP_WARNINGS_AS_ERRORS" false)
|
||||
];
|
||||
|
||||
# Some matrix tests fail on non-86_64-linux:
|
||||
|
||||
@@ -30,13 +30,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "audit";
|
||||
version = "4.1.4";
|
||||
version = "4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-audit";
|
||||
repo = "audit-userspace";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GdJ9nzlDAdOazOHH/YWuEoELrJh+G5ZJUKwIqAKAzpo=";
|
||||
hash = "sha256-poldhsF+ccutCxK7KE/gYpxa1x3wUQJWoCwU6pGFj6A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
homepage = "https://people.redhat.com/sgrubb/audit/";
|
||||
description = "Audit Library";
|
||||
changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/v4.1.2";
|
||||
changelog = "https://github.com/linux-audit/audit-userspace/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ grimmauld ];
|
||||
teams = [ lib.teams.security-review ];
|
||||
|
||||
@@ -20,7 +20,7 @@ let
|
||||
lib.concatStringsSep "\n\n" extraCertificateStrings
|
||||
);
|
||||
|
||||
version = "3.125";
|
||||
version = "3.126";
|
||||
meta = {
|
||||
homepage = "https://firefox-source-docs.mozilla.org/security/nss/runbooks/rootstore.html#root-store-consumers";
|
||||
description = "Bundle of X.509 certificates of public Certificate Authorities (CA)";
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
|
||||
"https://hg-edge.mozilla.org/projects/nss/raw-file/${tag}/${file}"
|
||||
"https://raw.githubusercontent.com/nss-dev/nss/refs/tags/${tag}/${file}"
|
||||
];
|
||||
hash = "sha256-5XkSgI2u97Kw+k3yzPF+R66vJsg5o4+Fx2AD66/YZr0=";
|
||||
hash = "sha256-gbfyV2MzouNg5nP5Etewt6dl2DbHMQA+NIpGysXTcZg=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dash";
|
||||
version = "0.5.13.4";
|
||||
version = "0.5.13.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-0Q39Qc2lkWVWDbOcqRXCxKdjb/8EKB2NLfd62Sx1Pis=";
|
||||
hash = "sha256-QAkBAaKkkfE+kB09SOkEFPJmNGKLm//zX/VANjwien0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "doctest";
|
||||
version = "2.5.2";
|
||||
version = "2.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doctest";
|
||||
repo = "doctest";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-4jW6xPFCFxk1l47EkSUVojhycrtluPhOc5Adf/25R7M=";
|
||||
hash = "sha256-+/IEISqN9HdaCJ0udLVUitOUziLvF/D3POecZMoXuho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ethtool";
|
||||
version = "7.0";
|
||||
version = "7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/software/network/ethtool/ethtool-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Zgv5clp4cTQ6DSMgaKdjT7z7abbC+O/0VYJ/rvsM0WI=";
|
||||
hash = "sha256-TXjCbtwCVbyS9LmVtf1mEI11/5Zu1GlPYCWm03C8JJY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fluidsynth";
|
||||
version = "2.5.5";
|
||||
version = "2.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FluidSynth";
|
||||
repo = "fluidsynth";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-WEzOYHtPIUkPZu3v4dWcCh3dOJUyG1xRxDuoSXqiGbk=";
|
||||
hash = "sha256-q4NdfemCprYEYCrKlHumeRM8TyNz8eJcFM18EsB0p0c=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/FluidSynth/fluidsynth/blob/${finalAttrs.src.tag}/doc/wiki/ChangeLog.md";
|
||||
description = "Real-time software synthesizer based on the SoundFont 2 specifications";
|
||||
homepage = "https://www.fluidsynth.org";
|
||||
license = lib.licenses.lgpl21Plus;
|
||||
|
||||
13
pkgs/by-name/ge/geoclue2/fix-sysusers_dir.patch
Normal file
13
pkgs/by-name/ge/geoclue2/fix-sysusers_dir.patch
Normal file
@@ -0,0 +1,13 @@
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 2591e6a..dc1bd8d 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -69,7 +69,7 @@ if get_option('enable-backend')
|
||||
if systemd.found()
|
||||
sysusers_dir = systemd.get_variable(pkgconfig: 'sysusersdir')
|
||||
else
|
||||
- sysusers_dir = '/usr/lib/sysusers.d'
|
||||
+ sysusers_dir = join_paths(get_option('prefix'), 'usr/lib/sysusers.d')
|
||||
endif
|
||||
configure_file(output: 'geoclue-sysusers.conf',
|
||||
input: 'geoclue-sysusers.conf.in',
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "geoclue";
|
||||
version = "2.7.2";
|
||||
version = "2.8.1";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -42,11 +42,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "geoclue";
|
||||
repo = "geoclue";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LwL1WtCdHb/NwPr3/OLISwaAwplhJwiZT9vUdX29Bbs=";
|
||||
hash = "sha256-CyZhUMAa2vMUi61sL+gGBZFxGo0lu7Cm68fTjcbblTg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./add-option-for-installation-sysconfdir.patch
|
||||
./fix-sysusers_dir.patch
|
||||
];
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
@@ -71,18 +71,22 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
checkPhase =
|
||||
let
|
||||
excludedTests =
|
||||
lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"mock-log"
|
||||
]
|
||||
++ [
|
||||
"logging" # works around segfaults for now
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) [
|
||||
# CHECK_STREQ failed: symbol == "non_inline_func" ((/build/source/build/symbolize_unittest+0x1000b840) vs. non_inline_func)
|
||||
# TestWithPCInsideNonInlineFunction doesn't use TEST(), so can't exclude via GTEST_FILTER
|
||||
"symbolize"
|
||||
];
|
||||
excludedTests = [
|
||||
"logging" # works around segfaults for now
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isGnu [
|
||||
# Test appears to make strong assumptions about compiler optimizations
|
||||
# that appear to be broken under GCC 16.
|
||||
"stacktrace"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"mock-log"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) [
|
||||
# CHECK_STREQ failed: symbol == "non_inline_func" ((/build/source/build/symbolize_unittest+0x1000b840) vs. non_inline_func)
|
||||
# TestWithPCInsideNonInlineFunction doesn't use TEST(), so can't exclude via GTEST_FILTER
|
||||
"symbolize"
|
||||
];
|
||||
excludedTestsRegex = lib.optionalString (
|
||||
excludedTests != [ ]
|
||||
) "(${lib.concatStringsSep "|" excludedTests})";
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
version ?
|
||||
# This is a workaround for update-source-version to be able to update this
|
||||
let
|
||||
_version = "0-unstable-2026-04-01";
|
||||
_version = "0-unstable-2026-05-27";
|
||||
in
|
||||
_version,
|
||||
rev ? "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a",
|
||||
hash ? "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ=",
|
||||
rev ? "3357c4f51b1a9e676378c695dd9c7e9911c35ee6",
|
||||
hash ? "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=",
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
@@ -40,13 +40,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "graphviz";
|
||||
version = "14.1.2";
|
||||
version = "15.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "graphviz";
|
||||
repo = "graphviz";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-LkyiKl0ulS9ujEdVLfyeoc4CtjITd6CAc35IUtlHSfw=";
|
||||
hash = "sha256-5v/ib8hwqHrJLs+jvDGvg0aJiKIt8ipXEd1EUzew7XU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# Fix build on i686 by not trying to build AVX2 code
|
||||
# Submitted upstream: https://github.com/HdrHistogram/HdrHistogram_c/pull/143
|
||||
${if stdenv.hostPlatform.isi686 then "patches" else null} = [
|
||||
patches = [
|
||||
./no-avx2-i386.patch
|
||||
];
|
||||
|
||||
|
||||
@@ -67,26 +67,6 @@
|
||||
assert libXtSupport -> libX11Support;
|
||||
assert libraqmSupport -> freetypeSupport;
|
||||
|
||||
let
|
||||
arch =
|
||||
if stdenv.hostPlatform.system == "i686-linux" then
|
||||
"i686"
|
||||
else if
|
||||
stdenv.hostPlatform.system == "x86_64-linux" || stdenv.hostPlatform.system == "x86_64-darwin"
|
||||
then
|
||||
"x86-64"
|
||||
else if stdenv.hostPlatform.system == "armv7l-linux" then
|
||||
"armv7l"
|
||||
else if
|
||||
stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin"
|
||||
then
|
||||
"aarch64"
|
||||
else if stdenv.hostPlatform.system == "powerpc64le-linux" then
|
||||
"ppc64le"
|
||||
else
|
||||
null;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.2-27";
|
||||
@@ -113,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"MVDelegate=${lib.getExe' coreutils "mv"}"
|
||||
"RMDelegate=${lib.getExe' coreutils "rm"}"
|
||||
"--with-frozenpaths"
|
||||
(lib.withFeatureAs (arch != null) "gcc-arch" arch)
|
||||
"--with-gcc-arch=generic"
|
||||
(lib.withFeature librsvgSupport "rsvg")
|
||||
(lib.withFeature librsvgSupport "pango")
|
||||
(lib.withFeature liblqr1Support "lqr")
|
||||
|
||||
@@ -32,13 +32,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libapparmor";
|
||||
version = "5.0.1";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "apparmor";
|
||||
repo = "apparmor";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-y5r8X7Cpwp7TSsKYXNoAeyy0MbgxLSW8gNtLsIvKP8c=";
|
||||
hash = "sha256-Kuc5Nrz4iq5MC5AOcJL9Sb54DWNKlEk3b3DW0vpgSZg=";
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/libraries/libapparmor";
|
||||
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libffi";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
with finalAttrs;
|
||||
"https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-IlXFpjjftRv2fCChKnu3DRf+senqurrAX1VzFG9YZDY=";
|
||||
hash = "sha256-1emmY43b0lE921RRjrZ+S75vpwe8wBwQ9iEvCgiNgZ0=";
|
||||
};
|
||||
|
||||
# Note: this package is used for bootstrapping fetchurl, and thus
|
||||
@@ -32,9 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./freebsd-tsan-pthread.patch
|
||||
];
|
||||
|
||||
# To workaround https://github.com/libffi/libffi/issues/993, we empty the test file:
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin "echo 'int main (void) { return 0; }' > testsuite/libffi.call/i128-1.c";
|
||||
|
||||
strictDeps = true;
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -94,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
homepage = "http://sourceware.org/libffi/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ aduh95 ];
|
||||
platforms = lib.platforms.all;
|
||||
pkgConfigModules = [ "libffi" ];
|
||||
};
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
commit bfdf7b0b7b62f4463451a7d5f8408cec75520dca
|
||||
Author: NIIBE Yutaka <gniibe@fsij.org>
|
||||
Date: Thu Jun 25 10:53:29 2026 +0900
|
||||
|
||||
tests: Skip a test when !HAVE_LONG_DOUBLE_WIDER.
|
||||
|
||||
* configure.ac (AC_TYPE_LONG_DOUBLE_WIDER): New.
|
||||
* tests/t-printf.c (check_large_float): Fix a typo.
|
||||
[!HAVE_LONG_DOUBLE_WIDER]: Skip the LDBL_MAX test.
|
||||
|
||||
--
|
||||
|
||||
GnuPG-bug-id: 8309
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e9abe0d..7871769 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -276,6 +276,7 @@ AC_C_CONST
|
||||
AC_CHECK_SIZEOF(int)
|
||||
AC_CHECK_SIZEOF(long)
|
||||
AC_CHECK_SIZEOF(long long)
|
||||
+AC_TYPE_LONG_DOUBLE_WIDER
|
||||
|
||||
GNUPG_FUNC_MKDIR_TAKES_ONE_ARG
|
||||
|
||||
diff --git a/tests/t-printf.c b/tests/t-printf.c
|
||||
index 6cbd03f..b0a3f3f 100644
|
||||
--- a/tests/t-printf.c
|
||||
+++ b/tests/t-printf.c
|
||||
@@ -449,7 +449,7 @@ check_large_float (void)
|
||||
errno, strerror (errno));
|
||||
}
|
||||
else if (verbose)
|
||||
- show ("format \"%%.100f\" with DBL_MAX: ->%s<-\n", buf2);
|
||||
+ show ("format \"%%.101f\" with DBL_MAX: ->%s<-\n", buf2);
|
||||
|
||||
if (strcmp (buf, buf2))
|
||||
fail ("format \"%%.100f\" does not match \"%%.101f\"\n" );
|
||||
@@ -469,6 +469,7 @@ check_large_float (void)
|
||||
show ("format \"%%.100Lf\" with DBL_MAX: ->%s<-\n", buf);
|
||||
gpgrt_free (buf);
|
||||
|
||||
+# ifdef HAVE_LONG_DOUBLE_WIDER
|
||||
ld = LDBL_MAX;
|
||||
buf = gpgrt_bsprintf ("%.100Lf\n", ld);
|
||||
if (buf)
|
||||
@@ -478,6 +479,10 @@ check_large_float (void)
|
||||
else if (verbose)
|
||||
show ("format \"%%.100Lf\" with LDBL_MAX failed as expected\n");
|
||||
gpgrt_free (buf);
|
||||
+# else
|
||||
+ if (verbose)
|
||||
+ show ("LDBL_MAX == DBL_MAX - skipping LDBL_MAX test\n");
|
||||
+# endif
|
||||
|
||||
#endif /*HAVE_LONG_DOUBLE*/
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
autoreconfHook,
|
||||
buildPackages,
|
||||
fetchurl,
|
||||
gettext,
|
||||
@@ -32,6 +33,12 @@ stdenv.mkDerivation (
|
||||
hash = "sha256-eoVBPyvDVPT4qoMrcYrxIuSJZeng65AS7mWcE8Y4XJM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fixes t-printf test on platforms where LDBL_MAX == DBL_MAX (armhf, ppc64)
|
||||
# Upstream's git forge doesn't seem to have a nice way to download it :/
|
||||
./libgpg-error-tests-skip-a-test-when-not-HAVE_LONG_DOUBLE_WIDER.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
|
||||
''
|
||||
@@ -39,6 +46,17 @@ stdenv.mkDerivation (
|
||||
# so add one for FreeBSD.
|
||||
+ lib.optionalString (stdenv.hostPlatform.system == "x86_64-freebsd") ''
|
||||
cp ${./lock-obj-pub.x86_64-unknown-freebsd.h} src/syscfg/lock-obj-pub.freebsd.h
|
||||
''
|
||||
# Fails on powerpc64-linux
|
||||
# https://lists.gnupg.org/pipermail/gnupg-users/2026-July/068440.html
|
||||
+ lib.optionalString (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) ''
|
||||
substituteInPlace tests/t-printf.c \
|
||||
--replace-fail \
|
||||
'# ifdef HAVE_LONG_DOUBLE_WIDER' \
|
||||
'# if 0' \
|
||||
--replace-fail \
|
||||
'show ("LDBL_MAX == DBL_MAX - skipping LDBL_MAX test\n")' \
|
||||
'show ("LDBL_MAX is weird on this platform - skipping LDBL_MAX test\n")'
|
||||
'';
|
||||
|
||||
hardeningDisable = [ "strictflexarrays3" ];
|
||||
@@ -58,7 +76,10 @@ stdenv.mkDerivation (
|
||||
# If architecture-dependent MO files aren't available, they're generated
|
||||
# during build, so we need gettext for cross-builds.
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ gettext ];
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook # HAVE_LONG_DOUBLE_WIDER patch changes configure.ac
|
||||
gettext
|
||||
];
|
||||
|
||||
postConfigure =
|
||||
# For some reason, /bin/sh on OpenIndiana leads to this at the end of the
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libmysofa";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hoene";
|
||||
repo = "libmysofa";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-jvib1hGPJEY2w/KjlD7iTtRy1s8LFG+Qhb2d6xdpUyc=";
|
||||
hash = "sha256-gP/RjKzMx8JIYcyiivBGvy3kIdwHMEKY6abssyVUKNQ=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -100,6 +100,17 @@ let
|
||||
moveToOutput "share/man/man1/nc.1.gz" "$nc"
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
|
||||
# Check whether the build target actually contains our cacert.
|
||||
# A simple binary match for the path is enough.
|
||||
grep "${cacert}/etc/ssl/certs/ca-bundle.crt" $out/lib/*libtls*
|
||||
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Free TLS/SSL implementation";
|
||||
homepage = "https://www.libressl.org";
|
||||
@@ -139,6 +150,13 @@ let
|
||||
url = "https://github.com/libressl/portable/commit/a15ea0710398eaeed3be53cf643e80a1e80c981d.patch";
|
||||
hash = "sha256-Mlf4SrGCCqALQicbGtmVGdkdfcE8DEGYkOuVyG2CozM=";
|
||||
};
|
||||
|
||||
# https://github.com/libressl/portable/issues/1295
|
||||
# https://github.com/libressl/portable/pull/1303
|
||||
tls-default-ca-patch = fetchpatch {
|
||||
url = "https://github.com/libressl/portable/commit/c85e07d0d68129fc1b1c9039b266099c8d735c3d.patch";
|
||||
hash = "sha256-oNL3v8Ef1HrayXn+/3T4UhHLJos8eVMlqebVyaxnWVo=";
|
||||
};
|
||||
in
|
||||
{
|
||||
# 4.2 was released October 2025 and will become unsupported on October 22,
|
||||
@@ -148,6 +166,7 @@ in
|
||||
hash = "sha256-bVwvWFg1iOp5H0yGRQBAcdAN+lVKW/eIoAbKHrWr1ws=";
|
||||
patches = [
|
||||
common-cmake-install-full-dirs-patch
|
||||
tls-default-ca-patch
|
||||
];
|
||||
};
|
||||
|
||||
@@ -156,5 +175,8 @@ in
|
||||
libressl_4_3 = generic {
|
||||
version = "4.3.2";
|
||||
hash = "sha256-7fAa7iTGXWnmqe/LnUS82mgv+dTzu72V55Th36kIR7U=";
|
||||
patches = [
|
||||
tls-default-ca-patch
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libsodium";
|
||||
version = "1.0.22-unstable-2026-04-16";
|
||||
version = "1.0.22-unstable-2026-07-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jedisct1";
|
||||
repo = "libsodium";
|
||||
rev = "33cc75ab1565d9dcbe808354191bd572ad6b64d0";
|
||||
hash = "sha256-8kS9FBoaFaJOjH7XZc8IG3GaQaUiYD/awQOhs7j0n1Y=";
|
||||
rev = "77a422c85a3b8b487de50c811b38d18394831ba6";
|
||||
hash = "sha256-Ahka2PnrmYvTLjZMzik5mFsxhDpMLRMKT/I5ftUb0Xc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libssh";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.libssh.org/files/${lib.versions.majorMinor finalAttrs.version}/libssh-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Gmr0JNgyfl7t705f5/W5JCJt1hesnz3oDyF9gqNqcSE=";
|
||||
hash = "sha256-05Qa8KLXjV2C7Xo2mI6RM5lDEvA1uWWabkP42zloeEw=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -37,13 +37,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libtiff";
|
||||
version = "4.7.1";
|
||||
version = "4.7.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "libtiff";
|
||||
repo = "libtiff";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-UiC6s86i7UavW86EKm74oPVlEacvoKmwW7KETjpnNaI=";
|
||||
hash = "sha256-60Lpg5WRfWMzlOoOUA+C6KLlYIZ+3BjXidOVqv4M2GA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
}:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "4.1.0";
|
||||
hash = "sha256-TA1uka13So8URttw+JJVdKIL+IonkhIQSc0IfraXpIM=";
|
||||
version = "4.2.0";
|
||||
hash = "sha256-Xz5W5zYPNlASPyc1/Sz2O1LONdxpUkg1hgzKdax/3ag=";
|
||||
|
||||
patches = [
|
||||
# Fixes the build with GCC 14 on aarch64.
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
}:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "3.6.6";
|
||||
hash = "sha256-+PW41/c8M/Yz0EVWM4Gt4HTNBMUTU5MayaKVZ+upLIo=";
|
||||
version = "3.6.7";
|
||||
hash = "sha256-t1ZPeFA3ftKaEIaXQ7RXZEsiOAYK4KSSm55SFr9g17A=";
|
||||
|
||||
patches = [
|
||||
# Fixes the build with GCC 14 on aarch64.
|
||||
|
||||
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Determine version and revision from:
|
||||
# https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
|
||||
pname = "netpbm";
|
||||
version = "11.15.1";
|
||||
version = "11.15.3";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@@ -31,8 +31,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchsvn {
|
||||
url = "https://svn.code.sf.net/p/netpbm/code/advanced";
|
||||
rev = "5227";
|
||||
sha256 = "sha256-Lr02cu7OAPv+wjKjPkA0wyZ0VvurUuCf5IJXjmCAE0I=";
|
||||
rev = "5264";
|
||||
sha256 = "sha256-5G2OitW25ZNsdBcVkKfLpFJWjTm9VcB3ca0QllOSugI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -76,6 +76,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH" false)
|
||||
# Treating compiler errors as warnings creates churn each compiler update,
|
||||
# and provides little utility to us downstream.
|
||||
(lib.cmakeBool "TBB_STRICT" false)
|
||||
(lib.cmakeBool "TBB_TEST" finalAttrs.finalPackage.doCheck)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
@@ -83,10 +86,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
env = {
|
||||
# Fix build with modern gcc
|
||||
# In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',
|
||||
NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=stringop-overflow";
|
||||
|
||||
# Fix undefined reference errors with version script under LLVM.
|
||||
NIX_LDFLAGS = lib.optionalString (
|
||||
stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
|
||||
|
||||
@@ -124,6 +124,7 @@ pythonPackages.buildPythonApplication (finalAttrs: {
|
||||
"scikit-learn"
|
||||
"tika-client"
|
||||
"tqdm"
|
||||
"zxing-cpp"
|
||||
# requested by maintainer
|
||||
"imap-tools"
|
||||
"ocrmypdf"
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "prek";
|
||||
version = "0.4.4";
|
||||
version = "0.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "j178";
|
||||
repo = "prek";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-PAEmRQ5Vro83fkegOWsdY59U7WAQxBPSEalzxZV6K4o=";
|
||||
hash = "sha256-tTr/Aob6jP1YL+n5vGkUkByew73WdP3mqLW5Lci1gNM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-EmlR6Lmt5XR0uS/y3FqY5yGNeVBSdtLtEGH9jZLcP2o=";
|
||||
cargoHash = "sha256-He55uH7t7NI5sYgowujqCMK5yjhC2F+8ZLxKG6TLjYY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "s2n-tls";
|
||||
version = "1.7.2";
|
||||
version = "1.7.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "s2n-tls";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-oqWTcUGutEn5cOggiY1yPUlVWiHYKjnwBCCrEeWYn0A=";
|
||||
hash = "sha256-ujKVtVioQP7RNyQ3hGVCNGanOpYlzTecerTdrsVtlUo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
diff --git a/lib/tests/test_regexranges_main.cpp b/lib/tests/test_regexranges_main.cpp
|
||||
index 567d79230c..e28bba47e5 100644
|
||||
--- a/lib/tests/test_regexranges_main.cpp
|
||||
+++ b/lib/tests/test_regexranges_main.cpp
|
||||
@@ -12,26 +12,26 @@
|
||||
using namespace std;
|
||||
using namespace srchilite;
|
||||
|
||||
-RegexRanges ranges;
|
||||
+RegexRanges regexRanges;
|
||||
|
||||
void check_range_regex(const string &s, bool expectedTrue = true) {
|
||||
cout << "checking " << s << endl;
|
||||
if (expectedTrue)
|
||||
- assertTrue(ranges.addRegexRange(s));
|
||||
+ assertTrue(regexRanges.addRegexRange(s));
|
||||
else
|
||||
- assertFalse(ranges.addRegexRange(s));
|
||||
+ assertFalse(regexRanges.addRegexRange(s));
|
||||
}
|
||||
|
||||
void check_match(const string &line, const string &expected = "") {
|
||||
cout << "searching inside " << line;
|
||||
const boost::regex *matched = 0;
|
||||
if (expected != "") {
|
||||
- matched = ranges.matches(line);
|
||||
+ matched = regexRanges.matches(line);
|
||||
assertTrue(matched != 0);
|
||||
assertEquals(expected, matched->str());
|
||||
cout << " found " << *matched << endl;
|
||||
} else {
|
||||
- assertTrue(ranges.matches(line) == 0);
|
||||
+ assertTrue(regexRanges.matches(line) == 0);
|
||||
cout << " not found" << endl;
|
||||
}
|
||||
}
|
||||
@@ -39,9 +39,9 @@
|
||||
void check_in_range(const string &s, bool expectedTrue = true) {
|
||||
cout << "checking " << s << "... ";
|
||||
if (expectedTrue) {
|
||||
- assertTrue(ranges.isInRange(s));
|
||||
+ assertTrue(regexRanges.isInRange(s));
|
||||
} else {
|
||||
- assertFalse(ranges.isInRange(s));
|
||||
+ assertFalse(regexRanges.isInRange(s));
|
||||
}
|
||||
cout << expectedTrue << endl;
|
||||
}
|
||||
@@ -57,7 +57,7 @@
|
||||
check_range_regex("{notclosed");
|
||||
|
||||
// reset regular expressions
|
||||
- ranges.clear();
|
||||
+ regexRanges.clear();
|
||||
|
||||
check_range_regex("/// foo");
|
||||
check_range_regex("/// bar");
|
||||
@@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://git.savannah.gnu.org/cgit/src-highlite.git/patch/?id=ab9fe5cb9b85c5afab94f2a7f4b6d7d473c14ee9";
|
||||
hash = "sha256-wmSLgLnLuFE+IC6AjxzZp/HEnaOCS1VfY2cac0T7Y+w=";
|
||||
})
|
||||
|
||||
# GCC 16 detects ambiguity in the `ranges` name in a test (conflicts with
|
||||
# `namespace std::range { }` from GCC), so we rename the variable to
|
||||
# disambiguate.
|
||||
./gcc16-disambiguate-regex-ranges-test.patch
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [
|
||||
# Adds compatibility with C++17 by removing the `register` storage class specifier.
|
||||
|
||||
@@ -36,15 +36,11 @@
|
||||
libpulseaudio,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sox";
|
||||
version = "unstable-2021-05-09";
|
||||
version = "14.4.2-unstable-2021-05-09";
|
||||
|
||||
src = fetchgit {
|
||||
# not really needed, but when this src was updated from `fetchurl ->
|
||||
# fetchgit`, we spared the mass rebuild by changing this `name` and
|
||||
# therefor merge this to `master` and not to `staging`.
|
||||
name = "source";
|
||||
url = "https://git.code.sf.net/p/sox/code";
|
||||
rev = "42b3557e13e0fe01a83465b672d89faddbe65f49";
|
||||
hash = "sha256-9cpOwio69GvzVeDq79BSmJgds9WU5kA/KUlAkHcpN5c=";
|
||||
@@ -94,4 +90,4 @@ stdenv.mkDerivation {
|
||||
license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -29,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url = "https://github.com/KhronosGroup/SPIRV-Tools/commit/2ec8457ab33d539b6f1fecc998360c0b8b05ed4f.diff";
|
||||
hash = "sha256-YHbYBwXMm4rTKpmMW6I3LUafhA4RuNUdXqUBUAXwXpE=";
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
url = "https://github.com/KhronosGroup/SPIRV-Tools/commit/0db9162641d9709c63c92a13e66fd88905180e89.diff";
|
||||
hash = "sha256-eoS35Zxb+frQTTTNCaZ4TV/QZjaK45mW1OzzIlXQ1C0=";
|
||||
})
|
||||
]
|
||||
# The cmake options are sufficient for turning on static building, but not
|
||||
# for disabling shared building, just trim the shared lib from the CMake
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "srt";
|
||||
version = "1.5.5";
|
||||
version = "1.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Haivision";
|
||||
repo = "srt";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-hOkLlmtF9dKqXZTjAeBntkkg5WsmsZN6DKhyakoIF1k=";
|
||||
sha256 = "sha256-fdgj6URuMaem+ZVy7D8Hnf2Ev1HindevdvX0xyxCL4M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -8,12 +8,16 @@
|
||||
cpio,
|
||||
elfutils,
|
||||
python3,
|
||||
bashNonInteractive,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "systemtap";
|
||||
version = "5.4";
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://sourceware.org/git/systemtap.git";
|
||||
rev = "release-${finalAttrs.version}";
|
||||
@@ -30,14 +34,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
cpio
|
||||
gettext
|
||||
python3
|
||||
python3.pkgs.setuptools
|
||||
];
|
||||
buildInputs = [
|
||||
boost
|
||||
elfutils
|
||||
gettext
|
||||
python3
|
||||
bashNonInteractive
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
bison,
|
||||
flex,
|
||||
ctestCheckHook,
|
||||
buildPackages,
|
||||
static ? stdenv.hostPlatform.isStatic,
|
||||
}:
|
||||
|
||||
@@ -26,6 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-gGAO+D0A/hEoHMm6OvRBc1Mks9y52kfd0q/Sg96pdW4=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (!finalAttrs.finalPackage.doCheck) ''
|
||||
# Compiling the tests doesn't work for cross builds.
|
||||
substituteInPlace lib/py/CMakeLists.txt \
|
||||
--replace-fail 'COMMAND ''${THRIFT_COMPILER} --gen py test/test_thrift_file/TestServer.thrift' ""
|
||||
'';
|
||||
|
||||
# Workaround to make the Python wrapper not drop this package:
|
||||
# pythonFull.buildEnv.override { extraLibs = [ thrift ]; }
|
||||
pythonPath = [ ];
|
||||
@@ -35,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
cmake
|
||||
flex
|
||||
pkg-config
|
||||
(python3.withPackages (
|
||||
(buildPackages.python3.withPackages (
|
||||
ps:
|
||||
with ps;
|
||||
[
|
||||
@@ -74,7 +81,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# FIXME: Fails to link in static mode with undefined reference to
|
||||
# `boost::unit_test::unit_test_main(bool (*)(), int, char**)'
|
||||
(lib.cmakeBool "BUILD_TESTING" (!static))
|
||||
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
|
||||
# Building tutorials requires running thrift.
|
||||
(lib.cmakeBool "BUILD_TUTORIALS" (stdenv.buildPlatform.canExecute stdenv.hostPlatform))
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
@@ -111,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Library for scalable cross-language services";
|
||||
mainProgram = "thrift";
|
||||
homepage = "https://thrift.apache.org/";
|
||||
downloadPage = "https://github.com/apache/thrift";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
maintainers = with lib.maintainers; [ bjornfor ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tzdata";
|
||||
version = "2026b";
|
||||
version = "2026c";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-EUVD2fGaa/61vKQ2hq6hc9OHVaPbHy7sESZHrpLG9UQ=";
|
||||
hash = "sha256-5KF4pEd/PQ6nfMMYKP9yqjj+/41hqhPn6Z4ULp2QK+Q=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-N+nthCf101IcIvxY4pPL+wQ9cO7fEAOHCzPzY/Yco0Q=";
|
||||
hash = "sha256-sc/8Os5MTHzQ77ovet2G7D0LedpIvPA1gmcf08j+rOg=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -63,13 +63,13 @@ assert lib.assertMsg (
|
||||
) "unbound: withDoQ requires OpenSSL with QUIC support (OpenSSL >= 3.5)";
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unbound";
|
||||
version = "1.25.1";
|
||||
version = "1.25.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NLnetLabs";
|
||||
repo = "unbound";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-1PXnxCPxoB5IrVBQIsrxiWAq+IoH7Ma9T1TTJsoTJc4=";
|
||||
hash = "sha256-zt0JpVmct7w6ay+p8CdH6SGt/rL/v//e7K3MT8KZfOY=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "valkey";
|
||||
version = "9.1.0";
|
||||
version = "9.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "valkey-io";
|
||||
repo = "valkey";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-RMZz83fycpOTPWB1dIXU0/hdh4ZGC+6JhCws8htAQ5E=";
|
||||
hash = "sha256-wGHlPQ2JPxGTaJRJ9Siz3Q3eKdlo5z1tQpSFs9xZMbI=";
|
||||
};
|
||||
|
||||
patches = lib.optional useSystemJemalloc ./use_system_jemalloc.patch;
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xsimd";
|
||||
version = "14.2.0";
|
||||
version = "14.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xtensor-stack";
|
||||
repo = "xsimd";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-BTiN4B3//wlB3nmOoluM/7bL7J7YIBp5afih9zUP1yw=";
|
||||
hash = "sha256-0m9gUDCgGh58lf9uPp1Obw4rsqWEL1RffWYB6s315p0=";
|
||||
};
|
||||
|
||||
# strictDeps raises the chance that xsimd will be able to be cross compiled
|
||||
|
||||
@@ -38,14 +38,7 @@
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xvfb";
|
||||
|
||||
# TODO: commented out for rebuild avoidance after xorg-server update. revert
|
||||
# on staging.
|
||||
# inherit (xorg-server) src version;
|
||||
version = "21.1.23";
|
||||
src = fetchurl {
|
||||
url = "mirror://xorg/individual/xserver/xorg-server-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-45gy5WF9ra8HL9+fDhnl0uHCoTYHrCgLrBq6n4/hRjQ=";
|
||||
};
|
||||
inherit (xorg-server) src version;
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "yara";
|
||||
version = "4.5.6";
|
||||
version = "4.5.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "VirusTotal";
|
||||
repo = "yara";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vzYH56BC0Stb2I4U5VzxA0xG46xZkWmbTIC6BtzeNQ8=";
|
||||
hash = "sha256-4PK/GU02mcgMSkFllqGZ7zmswQb8b6bkfEWLoCGHo3E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,25 +6,31 @@
|
||||
python3,
|
||||
stdenv,
|
||||
libzint,
|
||||
pkg-config,
|
||||
stb,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zxing-cpp";
|
||||
version = "2.3.0";
|
||||
version = "3.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zxing-cpp";
|
||||
repo = "zxing-cpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-e3nSxjg8p+1DEUbZOh4C2zfnA6iGhNJMPiIe2oJEbRo=";
|
||||
hash = "sha256-ZtjvHBnuPJkc9kU998jH7IPlX3jF/RGtLNWDzsb0v4A=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libzint
|
||||
stb
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
@@ -57,7 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
formats.
|
||||
'';
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ lukegb ];
|
||||
maintainers = with lib.maintainers; [
|
||||
lukegb
|
||||
qweered
|
||||
];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -324,6 +324,15 @@ stdenv.mkDerivation {
|
||||
# calls install-strip ...
|
||||
dontBuild = true;
|
||||
|
||||
# GHC tries to remove xattrs when installing to work around Gatekeeper
|
||||
# (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally
|
||||
# succeeds in nixpkgs because xattrs are not allowed in the store, but it
|
||||
# can fail when a file has the `com.apple.provenance` xattr, and it can’t be
|
||||
# modified (such as target of the symlink to `libiconv.dylib`).
|
||||
# The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13.
|
||||
# See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/
|
||||
makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ];
|
||||
|
||||
# Patch scripts to include runtime dependencies in $PATH.
|
||||
postInstall = ''
|
||||
for i in "$out/bin/"*; do
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"hash": "sha256-5QWicPXWUyP1VkmTDIOjIgu9NXkB27nvtgUbrL+mSxg=",
|
||||
"hash": "sha256-XxD5Tn5dMwirOoESCsza1dPvcgMF795Uh8YgaGUli1g=",
|
||||
"owner": "openjdk",
|
||||
"repo": "jdk21u",
|
||||
"rev": "refs/tags/jdk-21.0.12+2"
|
||||
"rev": "refs/tags/jdk-21.0.12+8"
|
||||
}
|
||||
|
||||
@@ -50,8 +50,8 @@ let
|
||||
in
|
||||
import ./default.nix
|
||||
{
|
||||
rustcVersion = "1.97.0";
|
||||
rustcSha256 = "sha256-HAhV2JgqD7HQMhtgVLVbcy07HRfIRoQet/0Ks3vydvg=";
|
||||
rustcVersion = "1.97.1";
|
||||
rustcSha256 = "sha256-YiwrQpxTy/3A3TpR0DVU6RzWPr7BkSwfVwlkDN/vGp0=";
|
||||
|
||||
llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
|
||||
llvmSharedForHost = llvmSharedFor pkgsBuildHost;
|
||||
@@ -65,27 +65,27 @@ import ./default.nix
|
||||
# Note: the version MUST be the same version that we are building. Upstream
|
||||
# ensures that each released compiler can compile itself:
|
||||
# https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363
|
||||
bootstrapVersion = "1.97.0";
|
||||
bootstrapVersion = "1.97.1";
|
||||
|
||||
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
|
||||
bootstrapHashes = {
|
||||
i686-unknown-linux-gnu = "d066e5dd59c15fc1c793173d53b41719162de4470b5c34041a8bc664542df375";
|
||||
x86_64-unknown-linux-gnu = "eb89b20287153391c49ebcdb7fd91b683a12438d129bfb92eadcc495545af3a7";
|
||||
x86_64-unknown-linux-musl = "675bb2d574efc64da0563a9cb70cc017560394c5938e04c92987cad383299e8d";
|
||||
arm-unknown-linux-gnueabihf = "180e487a1f7abaeda374b942d369dd7faa4364b1267629d48552d9a17a5bc4ab";
|
||||
armv7-unknown-linux-gnueabihf = "2f9dfd76694efcf391f6d4947e97be17d1f469c9e989ed194660ddd85877ca60";
|
||||
aarch64-unknown-linux-gnu = "70fb01b4894d56fad34c260ce63aee647589be57a26ab33730110d8228cbcf02";
|
||||
aarch64-unknown-linux-musl = "28efcf4ee31235eb5f7820dadba46400ab9dbbb030719e7a2ab284b02c8cbf82";
|
||||
x86_64-apple-darwin = "3dc9ad8ec35a9f0acd2c5ae2c80c36baf5c7010423bf339ca55709fc995885d4";
|
||||
aarch64-apple-darwin = "c2e6a5ef480f5715ae9874188c1fa749b6a6f90d8d911f5a3a5d768f0ac70427";
|
||||
powerpc64-unknown-linux-gnu = "62c9f9b7887505fc4dcda40784469f23909657d245e53025a7a8124b016d6631";
|
||||
powerpc64le-unknown-linux-gnu = "a8d3f487d07cebc48ce03ad66a970a5f5138a5c1e7c7cec12fb9b6e47a24bf1a";
|
||||
powerpc64le-unknown-linux-musl = "09fee3b9ede1e94ff6c3bad3918dc231be909c74bb182e0acd583c03a9f1df5f";
|
||||
riscv64gc-unknown-linux-gnu = "be239392f7112f6a81f20c9e715d5743319a8b773592e027ad800d73527d8fae";
|
||||
s390x-unknown-linux-gnu = "fee699e31d0a0034f46669c473e61a88af6734f8c5902d77329ac236fcd9b538";
|
||||
loongarch64-unknown-linux-gnu = "37ad9d55b98cc680a2d75c7184e6457b632ce82690a56be7a2044e32c91176ce";
|
||||
loongarch64-unknown-linux-musl = "bfba202bae252ac372026171d9bc98e5eb80578d576546f56e8aee2e9d64ecf0";
|
||||
x86_64-unknown-freebsd = "77101232e3769395e99c0e663d2c8beb3d4127857945cf7c812c1886ba823b8f";
|
||||
i686-unknown-linux-gnu = "914c2702deada0b9cf1d64bb3495d76e55cb3eba07d508472dde8b55a93e3759";
|
||||
x86_64-unknown-linux-gnu = "b4cdbc7cc6b0ee0a2666b1872769fdb2ad8393b28b63952f6493b4b400e4832b";
|
||||
x86_64-unknown-linux-musl = "40dbea28193cf2b488cf3e4a89274ccfb60efa50883f19917a382f84fd05bdc4";
|
||||
arm-unknown-linux-gnueabihf = "ba62fe07ad85b507907705a14adc1e8bc258de5f6177ba41d77bbff9f469a4ce";
|
||||
armv7-unknown-linux-gnueabihf = "e89c5e33aaddc6ef56857000c9117875c2997e9a1a500bd7b16277c9874b002f";
|
||||
aarch64-unknown-linux-gnu = "2f2496c70bd336a66a4c8baf2d303ba161f3552f192444c3639ba903c7c1e2c5";
|
||||
aarch64-unknown-linux-musl = "c5f45b5c6eb7f8fdb277c54c08402b7c931516740fbd4eccc26ba148f7cd5d57";
|
||||
x86_64-apple-darwin = "5f4c84d2bcce7983468642855a45fc4978fba1324cfdd1ea0b182face3ab4ffa";
|
||||
aarch64-apple-darwin = "cbd14c36f039f6f11f38148a6295d8234d18ddf20bea53031c86f119423a8b26";
|
||||
powerpc64-unknown-linux-gnu = "2b507d5eb9b5c4c041b50e93e069db56d094f02e6df103dc74c016155141bfae";
|
||||
powerpc64le-unknown-linux-gnu = "ff524eef5a59d801df09ccad5cdaf9ea1f0a07d75cbed2a7e9f013a9eb76a3c1";
|
||||
powerpc64le-unknown-linux-musl = "15630f33fbea2dd9661f8482b6c612da271549aba40401444aaa53650e646b9b";
|
||||
riscv64gc-unknown-linux-gnu = "59bec35d8febb2ab918fa41cffbaa5b07146a63bdc33f029ff756d70a3151ece";
|
||||
s390x-unknown-linux-gnu = "808268af9e880d41b8cb32b242e38c9bd3ea7aba6409b02fbffa0fbc5370c538";
|
||||
loongarch64-unknown-linux-gnu = "d5a925962854730ae7641420d8337af93988ea4ff47b503a856ec53776c87841";
|
||||
loongarch64-unknown-linux-musl = "3fb653299d228e3e0726afb179b07dd10a51a2ecc3cdfcd740011b1d8420ca97";
|
||||
x86_64-unknown-freebsd = "77866a4c449bcccb40e9d6712bf3eb899d29018ed8e841fd9d8d59370751f152";
|
||||
};
|
||||
|
||||
selectRustPackage = pkgs: pkgs.rust_1_97;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import ./common.nix {
|
||||
version = "140.11.0";
|
||||
hash = "sha512-0GrbPvTeEyTj1hhy1w3jGrCKwBPzOQNUm+0oxuvMW03ulLs2OIKCwZNdd9GlZAefOtvwjWu4AoSomcuz2GEwDA==";
|
||||
version = "140.13.0";
|
||||
hash = "sha512-k3pBA9ccXh5L8FGCFyn26nC1wY1ESTCkh2lcwj10cSoBNARySPasAjBeAb7LcFQmpVudiXOfAqAe2gHs9bwn8Q==";
|
||||
}
|
||||
|
||||
@@ -819,9 +819,10 @@ stdenv.mkDerivation (
|
||||
toStrip =
|
||||
map placeholder (lib.remove "data" finalAttrs.outputs) # We want to keep references to the data dir.
|
||||
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.stdenv.cc
|
||||
++ lib.optional withCudaLLVM buildPackages.clang.cc
|
||||
++ lib.optional withMetal xcode;
|
||||
in
|
||||
"remove-references-to ${lib.concatStringsSep " " (map (o: "-t ${o}") toStrip)} config.h";
|
||||
"remove-references-to ${lib.concatMapStringsSep " " (o: "-t ${o}") toStrip} config.h";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fontconfig";
|
||||
version = "2.18.1";
|
||||
version = "2.18.2";
|
||||
|
||||
outputs = [
|
||||
"bin"
|
||||
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# ref: https://github.com/NixOS/nixpkgs/pull/401037#discussion_r2055430206
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${finalAttrs.version}/fontconfig-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-IwDz2/pyU7OkT0/uzbyN+kXd5dws+3H86vMfOUy0EDE=";
|
||||
hash = "sha256-z45ldu8EhMFQeb2vd82cUcRk31NlgUraTT7nMx6jHrU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -69,8 +69,7 @@ let
|
||||
++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.is64bit) "ABI=64"
|
||||
# to build a .dll on windows, we need --disable-static + --enable-shared
|
||||
# see https://gmplib.org/manual/Notes-for-Particular-Systems.html
|
||||
++ optional (!withStatic && stdenv.hostPlatform.isPE) "--disable-static --enable-shared"
|
||||
++ optional (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "--disable-assembly";
|
||||
++ optional (!withStatic && stdenv.hostPlatform.isPE) "--disable-static --enable-shared";
|
||||
|
||||
doCheck = true; # not cross;
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{ callPackage, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix rec {
|
||||
version = "1.0.5";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
|
||||
hash = "sha256-tG0A9Y76b0l7l9LngsTuZjAdQS3dhV3TBoUYs6LNPqI=";
|
||||
hash = "sha256-u1z8rfxS29XrUS1uKZXgNhNRwz6XqHq6Qm06Snumz3A=";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -48,14 +48,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "aiohttp";
|
||||
version = "3.14.1";
|
||||
version = "3.14.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = "aiohttp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OJSLv/NfVrKESZqNr51FJUzLRz7wLMRdGoNjKC5EhlI=";
|
||||
hash = "sha256-n8LH34N9V2Smqc23q/49gqRbP0U1glJAYiyPEGFtEmM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -3,16 +3,16 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
cython,
|
||||
packaging,
|
||||
pkgconfig,
|
||||
setuptools,
|
||||
wheel,
|
||||
pytestCheckHook,
|
||||
python,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "faust-cchardet";
|
||||
version = "2.1.19";
|
||||
version = "2.1.20";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@@ -20,14 +20,19 @@ buildPythonPackage rec {
|
||||
repo = "cChardet";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-yY6YEhXC4S47rxnkKAta4m16IVGn7gkHSt056bYOYJ4=";
|
||||
hash = "sha256-MeRX/g38c+q2jiTtEhUpaGYf+5tkhexRGuIG0PdUGvI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail "packaging<26" packaging
|
||||
'';
|
||||
|
||||
build-system = [
|
||||
cython
|
||||
packaging
|
||||
pkgconfig
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
@@ -41,7 +46,7 @@ buildPythonPackage rec {
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/faust-streaming/cChardet/blob/${src.rev}/CHANGES.rst";
|
||||
changelog = "https://github.com/faust-streaming/cChardet/blob/${src.tag}/CHANGES.rst";
|
||||
description = "High-speed universal character encoding detector";
|
||||
mainProgram = "cchardetect";
|
||||
homepage = "https://github.com/faust-streaming/cChardet";
|
||||
|
||||
@@ -2,27 +2,30 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
python-dateutil,
|
||||
lxml,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "feedgen";
|
||||
version = "1.0.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-2b1Rw7XpVqKlKZjDcIxNLHKfL8wxEYjh5dO5cmOTVGo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
python-dateutil
|
||||
lxml
|
||||
];
|
||||
|
||||
# No tests in archive
|
||||
doCheck = false;
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
meta = {
|
||||
description = "Python module to generate ATOM feeds, RSS feeds and Podcasts";
|
||||
@@ -34,4 +37,4 @@ buildPythonPackage rec {
|
||||
];
|
||||
maintainers = with lib.maintainers; [ casey ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,24 +2,29 @@
|
||||
buildPythonPackage,
|
||||
lib,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "fields";
|
||||
version = "5.0.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-MdSqA9jUTjXfE8Qx3jUTaZfwR6kkpZfYT3vCCeG+Vyc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "fields" ];
|
||||
|
||||
doCheck = false; # Argument(s) {'path'} are declared in the hookimpl but can not be found in the hookspec
|
||||
|
||||
meta = {
|
||||
description = "Container class boilerplate killer";
|
||||
homepage = "https://github.com/ionelmc/python-fields";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = [ lib.maintainers.sheepforce ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -41,6 +41,7 @@ buildPythonPackage (finalAttrs: {
|
||||
"tests/test_virtualenv.py"
|
||||
# Very prone to timeouts on busy machines
|
||||
"tests/test_filelock.py"
|
||||
"tests/test_read_write.py"
|
||||
];
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -29,14 +29,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "httpcore2";
|
||||
version = "2.5.0";
|
||||
version = "2.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "httpx2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vIWAUjHPyafbeeUc2OvGpkiOoTj1fTniRnQiKSdkm6s=";
|
||||
hash = "sha256-3kghDQMYksF9a4sFGajzNfGPOjdX1OiMwv7rH/fbmM0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -24,14 +24,17 @@
|
||||
pygments,
|
||||
rich,
|
||||
socksio,
|
||||
wsproto,
|
||||
zstandard,
|
||||
|
||||
# tests
|
||||
chardet,
|
||||
pytestCheckHook,
|
||||
pytest-trio,
|
||||
starlette,
|
||||
trustme,
|
||||
uvicorn,
|
||||
websockets,
|
||||
|
||||
# reverse deps
|
||||
httpx2,
|
||||
@@ -39,14 +42,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "httpx2";
|
||||
version = "2.5.0";
|
||||
version = "2.9.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pydantic";
|
||||
repo = "httpx2";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-vIWAUjHPyafbeeUc2OvGpkiOoTj1fTniRnQiKSdkm6s=";
|
||||
hash = "sha256-3kghDQMYksF9a4sFGajzNfGPOjdX1OiMwv7rH/fbmM0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -75,6 +78,7 @@ buildPythonPackage (finalAttrs: {
|
||||
];
|
||||
http2 = [ h2 ];
|
||||
socks = [ socksio ];
|
||||
ws = [ wsproto ];
|
||||
zstd = lib.optionals (pythonOlder "3.14") [ zstandard ];
|
||||
};
|
||||
|
||||
@@ -89,10 +93,11 @@ buildPythonPackage (finalAttrs: {
|
||||
nativeCheckInputs = [
|
||||
chardet
|
||||
pytestCheckHook
|
||||
# pytest-httpbin
|
||||
pytest-trio
|
||||
(starlette.overridePythonAttrs { doCheck = false; })
|
||||
trustme
|
||||
uvicorn
|
||||
websockets
|
||||
]
|
||||
++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
|
||||
|
||||
|
||||
@@ -69,13 +69,13 @@ let
|
||||
in
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
pname = "matplotlib";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-aMDHvgGzDcyjY4k09/WR33NAEjXL2/DRqxxx59t/i1c=";
|
||||
hash = "sha256-aWR9tXRpQceT1uRFpM00kyP/uH2cyVjCrYSmWbSDLTA=";
|
||||
};
|
||||
|
||||
env.XDG_RUNTIME_DIR = "/tmp";
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "mistune";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lepture";
|
||||
repo = "mistune";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-AAOpQ3GMEifMVM1SaT5zVltIshAQt5SYqCtIvdjy20M=";
|
||||
hash = "sha256-7N1Kz2lN6GyDVKUhuGrEkbinV8Vpc4aahal/7KhnIXo=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "multipart";
|
||||
version = "1.3.1";
|
||||
version = "2.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "defnull";
|
||||
repo = "multipart";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kLiOK6ovW3ki1CONXVQZCJw/U3K1AoR6rrmJUstwZOw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-1/G8qUnY7i5OvxkTSebC2pae9lzzfvnozJSVVylqB7w=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
@@ -25,10 +25,10 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "multipart" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/defnull/multipart/blob/${src.tag}/CHANGELOG.rst";
|
||||
changelog = "https://github.com/defnull/multipart/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
|
||||
description = "Parser for multipart/form-data";
|
||||
homepage = "https://github.com/defnull/multipart";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
python,
|
||||
pythonAtLeast,
|
||||
buildPythonPackage,
|
||||
@@ -52,6 +53,16 @@ buildPythonPackage (finalAttrs: {
|
||||
hash = "sha256-IriSrnGAZHvJ7m97s12BydNQZDZunCVtRgj/iSgw5Vc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix for test failure on i686. Remove with next release.
|
||||
# Upstream report: https://github.com/numpy/numpy/issues/32060
|
||||
# Upstream PR: https://github.com/numpy/numpy/pull/32064
|
||||
(fetchpatch {
|
||||
url = "https://github.com/numpy/numpy/commit/0e1dce62e27f79be9d6552487787a19b7f95cfbf.patch";
|
||||
hash = "sha256-mQjf6y/mLSgx9+G70/r9U3VJg5zIrl/6ANQhpP2LGmg=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# remove needless reference to full Python path stored in built wheel
|
||||
substituteInPlace numpy/meson.build \
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
fetchurl,
|
||||
nukeReferences,
|
||||
python,
|
||||
replaceVars,
|
||||
|
||||
# build
|
||||
@@ -78,12 +80,17 @@ let
|
||||
|
||||
nativeBuildInputs = [
|
||||
libpq.pg_config
|
||||
nukeReferences
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libpq
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
nuke-refs $out/${python.sitePackages}/psycopg_c/{pq.c,_psycopg.c}
|
||||
'';
|
||||
|
||||
# tested in psycopg
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
prek,
|
||||
pyprojectVersionPatchHook,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
@@ -33,7 +32,6 @@ buildPythonPackage (finalAttrs: {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
prek
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
@@ -38,7 +38,9 @@ buildPythonPackage rec {
|
||||
"test_unicode_path"
|
||||
# fails to import itself after modifying the environment
|
||||
"test_environment"
|
||||
# timing sensitive through usage of sleep(1) and signal handling
|
||||
# timing sensitive due to strict timeouts
|
||||
"test_done_callback_no_deadlock"
|
||||
"test_timeout_overstep"
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Disable tests that fail on Darwin sandbox
|
||||
|
||||
@@ -16,16 +16,16 @@
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "yarl";
|
||||
version = "1.24.2";
|
||||
version = "1.24.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = "yarl";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-GEe2GDXmqsQgWB0UxPZVMdSco3j2JYHg9BU9M6oqynw=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-2Uqn1TwfH375CBIveEpsco4dDNrhxHwX8wIP8dKhh/M=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@@ -61,10 +61,10 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "yarl" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/aio-libs/yarl/blob/${src.tag}/CHANGES.rst";
|
||||
changelog = "https://github.com/aio-libs/yarl/blob/${finalAttrs.src.tag}/CHANGES.rst";
|
||||
description = "Yet another URL library";
|
||||
homepage = "https://github.com/aio-libs/yarl";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -6,16 +6,17 @@
|
||||
pillow,
|
||||
pybind11,
|
||||
libzxing-cpp,
|
||||
pyprojectVersionPatchHook,
|
||||
pytestCheckHook,
|
||||
libzint,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "zxing-cpp";
|
||||
inherit (libzxing-cpp) src version meta;
|
||||
inherit (libzxing-cpp) src version;
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/wrappers/python";
|
||||
sourceRoot = "${libzxing-cpp.src.name}/wrappers/python";
|
||||
|
||||
# we don't need pybind11 in the root environment
|
||||
# https://pybind11.readthedocs.io/en/stable/installing.html#include-with-pypi
|
||||
@@ -25,7 +26,7 @@ buildPythonPackage rec {
|
||||
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "cfg = 'Debug' if self.debug else 'Release'" "cfg = 'Release'" \
|
||||
--replace-fail " '-DVERSION_INFO=' + self.distribution.get_version()]" " '-DVERSION_INFO=' + self.distribution.get_version(), '-DZXING_DEPENDENCIES=LOCAL', '-DZXING_USE_BUNDLED_ZINT=OFF']"
|
||||
--replace-fail "f'-DPython_EXECUTABLE={sys.executable}'," "f'-DPython_EXECUTABLE={sys.executable}', '-DZXING_DEPENDENCIES=LOCAL', '-DZXING_USE_BUNDLED_ZINT=OFF',"
|
||||
'';
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
@@ -39,6 +40,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pyprojectVersionPatchHook
|
||||
];
|
||||
|
||||
buildInputs = [ libzint ];
|
||||
@@ -51,4 +53,16 @@ buildPythonPackage rec {
|
||||
enabledTestPaths = [ "test.py" ];
|
||||
|
||||
pythonImportsCheck = [ "zxingcpp" ];
|
||||
|
||||
meta = {
|
||||
inherit (libzxing-cpp.meta)
|
||||
homepage
|
||||
changelog
|
||||
description
|
||||
longDescription
|
||||
license
|
||||
maintainers
|
||||
platforms
|
||||
;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,11 +15,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtool";
|
||||
version = "2.5.4";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/libtool/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-2o67LOTc9GuQCY2vliz/po9LT2LqYPeY0O8Skp7eat8=";
|
||||
hash = "sha256-JK2zqprgNccPq6NEr1fXMhXriSgQRa9sfM0wd1H4sL8=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -157,13 +157,13 @@ in
|
||||
|
||||
linuxHeaders =
|
||||
let
|
||||
version = "7.0";
|
||||
version = "7.1";
|
||||
in
|
||||
makeLinuxHeaders {
|
||||
inherit version;
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v${lib.versions.major version}.x/linux-${version}.tar.xz";
|
||||
hash = "sha256-u39tgLOHx1e30Uu5MCj8uQ95PFwNNnc27oFaEAs4kfA=";
|
||||
hash = "sha256-aR9EeX++eQ3IoyFgTJJwh1Jq0nttZJkl1g+O7QolZKA=";
|
||||
};
|
||||
patches = [
|
||||
./no-relocs.patch # for building x86 kernel headers on non-ELF platforms
|
||||
|
||||
@@ -8,7 +8,6 @@ in
|
||||
ln-boot,
|
||||
mes,
|
||||
buildPlatform,
|
||||
fetchurl,
|
||||
}:
|
||||
let
|
||||
pname = "mes-libc";
|
||||
@@ -24,18 +23,16 @@ let
|
||||
sources = sourcesJson."${arch}.linux.gcc";
|
||||
inherit (sources) libtcc1_SOURCES libc_gnu1_SOURCES libc_gnu2_SOURCES;
|
||||
|
||||
ldexpl = fetchurl {
|
||||
url = "https://gitlab.com/janneke/mes/-/raw/c837abed8edb341d4e56913729fbe9803b4de47c/lib/math/ldexpl.c";
|
||||
hash = "sha256-3QoFZZIqVmlMUosEqOdYIMEHzYgQ7GJ7Hz0Bf/1iIig=";
|
||||
};
|
||||
|
||||
# Concatenate all source files into a convenient bundle
|
||||
# "gcc" variants of source files (eg. "lib/linux/x86-mes-gcc") can also be
|
||||
# compiled by tinycc
|
||||
#
|
||||
# Passing this many arguments is too much for kaem so we need to split
|
||||
# the operation in two
|
||||
firstLibc = libc_gnu1_SOURCES + " ${ldexpl}";
|
||||
#
|
||||
# We also vendor a copy of ldexpl. We do not `fetchurl` it as the mes GitLab
|
||||
# often has force pushes and links are thus unstable.
|
||||
firstLibc = libc_gnu1_SOURCES + " " + ./ldexpl.c;
|
||||
lastLibc = libc_gnu2_SOURCES;
|
||||
in
|
||||
kaem.runCommand "${pname}-${version}"
|
||||
|
||||
@@ -203,13 +203,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname;
|
||||
version = "261";
|
||||
version = "261.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "systemd";
|
||||
repo = "systemd";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-6IB1ZEQqQ0impwBhCaLZAEgMVkVFU61JDVlGotxNzGQ=";
|
||||
hash = "sha256-4iOitWGdRmGgJjEXGWtq2lEhPtGguma+qrjTShrps2g=";
|
||||
};
|
||||
|
||||
# PATCH POLICY
|
||||
|
||||
@@ -13,24 +13,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "findutils";
|
||||
version = "4.10.0";
|
||||
version = "4.11.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/findutils/findutils-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "sha256-E4fgtn/yR9Kr3pmPkN+/cMFJE5Glnd/suK5ph4nwpPU=";
|
||||
sha256 = "sha256-v9GcsGzHHzNS1WfpAoTYzawCrIl3S76t8LUzsMEUMv0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace xargs/xargs.c --replace 'char default_cmd[] = "echo";' 'char default_cmd[] = "${coreutils}/bin/echo";'
|
||||
substituteInPlace xargs/xargs.c --replace 'char default_cmd[] = "echo";' 'char default_cmd[] = "${lib.getExe' coreutils "echo"}";'
|
||||
'';
|
||||
|
||||
patches = [
|
||||
./no-install-statedir.patch
|
||||
|
||||
# Fixes test-float failure on ppc64 with C23
|
||||
# https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00021.html
|
||||
# Multiple upstream commits squashed with adjustments, see header
|
||||
./gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
|
||||
@@ -53,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
configureFlags = [
|
||||
# "sort" need not be on the PATH as a run-time dep, so we need to tell
|
||||
# configure where it is. Covers the cross and native case alike.
|
||||
"SORT=${coreutils}/bin/sort"
|
||||
"SORT=${lib.getExe' coreutils "sort"}"
|
||||
"--localstatedir=/var/cache"
|
||||
];
|
||||
|
||||
@@ -86,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
meta = {
|
||||
homepage = "https://www.gnu.org/software/findutils/";
|
||||
changelog = "https://cgit.git.savannah.gnu.org/cgit/findutils.git/tree/NEWS?h=v${finalAttrs.version}";
|
||||
description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system";
|
||||
longDescription = ''
|
||||
The GNU Find Utilities are the basic directory searching
|
||||
|
||||
@@ -1,225 +0,0 @@
|
||||
Applied the following incremental gnulib commits:
|
||||
|
||||
- 55a366a06fbd98bf13adc531579e3513cee97a32
|
||||
- 65ed9d3b24ad09fd61d326c83e7f1b05f6e9d65f
|
||||
- ce8e9de0bf34bc63dffc67ab384334c509175f64
|
||||
- 6164b4cb0887b5331a4e64449107decd37d32735
|
||||
|
||||
With adjustments specific to the structure & differences in findutils:
|
||||
|
||||
- gnulib code is split across gl/lib and gnulib-tests
|
||||
- float.in.h seems old, lacking blocks for standards C11 and up. Relevant code for LDBL_NORM_MAX was added.
|
||||
- A Makefile.in is used for the test flags instead of the fancy automake modules
|
||||
in the upstream gnulib project, so we add -lm to the float test there.
|
||||
Surrounding texts in this file are slightly different in every project.
|
||||
---
|
||||
diff '--color=auto' -ruN a/gl/lib/float.c b/gl/lib/float.c
|
||||
--- a/gl/lib/float.c 2024-01-01 21:35:38.000000000 +0100
|
||||
+++ b/gl/lib/float.c 2026-01-02 16:11:07.508755119 +0100
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
|
||||
const union gl_long_double_union gl_LDBL_MAX =
|
||||
- { { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL } };
|
||||
+ { { DBL_MAX, DBL_MAX / 0x1p53 } };
|
||||
#elif defined __i386__
|
||||
const union gl_long_double_union gl_LDBL_MAX =
|
||||
{ { 0xFFFFFFFF, 0xFFFFFFFF, 32766 } };
|
||||
diff '--color=auto' -ruN a/gl/lib/float.in.h b/gl/lib/float.in.h
|
||||
--- a/gl/lib/float.in.h 2024-01-01 21:35:38.000000000 +0100
|
||||
+++ b/gl/lib/float.in.h 2026-01-02 16:13:56.571684867 +0100
|
||||
@@ -111,44 +111,38 @@
|
||||
# define LDBL_MAX_10_EXP 4932
|
||||
#endif
|
||||
|
||||
-/* On AIX 7.1 with gcc 4.2, the values of LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX are
|
||||
- wrong.
|
||||
- On Linux/PowerPC with gcc 4.4, the value of LDBL_MAX is wrong. */
|
||||
-#if (defined _ARCH_PPC || defined _POWER) && defined _AIX && (LDBL_MANT_DIG == 106) && defined __GNUC__
|
||||
+/* On PowerPC with gcc 15 when using __ibm128 long double, the value of
|
||||
+ LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX, and LDBL_NORM_MAX are wrong. */
|
||||
+#if ((defined _ARCH_PPC || defined _POWER) && LDBL_MANT_DIG == 106 \
|
||||
+ && defined __GNUC__)
|
||||
# undef LDBL_MIN_EXP
|
||||
# define LDBL_MIN_EXP DBL_MIN_EXP
|
||||
# undef LDBL_MIN_10_EXP
|
||||
# define LDBL_MIN_10_EXP DBL_MIN_10_EXP
|
||||
# undef LDBL_MIN
|
||||
# define LDBL_MIN 2.22507385850720138309023271733240406422e-308L /* DBL_MIN = 2^-1022 */
|
||||
-#endif
|
||||
-#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
|
||||
# undef LDBL_MAX
|
||||
-/* LDBL_MAX is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xFFFFFFFF }.
|
||||
- It is not easy to define:
|
||||
- #define LDBL_MAX 1.79769313486231580793728971405302307166e308L
|
||||
- is too small, whereas
|
||||
- #define LDBL_MAX 1.79769313486231580793728971405302307167e308L
|
||||
- is too large. Apparently a bug in GCC decimal-to-binary conversion.
|
||||
- Also, I can't get values larger than
|
||||
- #define LDBL63 ((long double) (1ULL << 63))
|
||||
- #define LDBL882 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
|
||||
- #define LDBL945 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
|
||||
- #define LDBL1008 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
|
||||
- #define LDBL_MAX (LDBL1008 * 65535.0L + LDBL945 * (long double) 9223372036821221375ULL + LDBL882 * (long double) 4611686018427387904ULL)
|
||||
- which is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xF8000000 }.
|
||||
- So, define it like this through a reference to an external variable
|
||||
+/* LDBL_MAX is 2**1024 - 2**918, represented as: { 0x7FEFFFFF, 0xFFFFFFFF,
|
||||
+ 0x7C9FFFFF, 0xFFFFFFFF }.
|
||||
+
|
||||
+ Do not write it as a constant expression, as GCC would likely treat
|
||||
+ that as infinity due to the vagaries of this platform's funky arithmetic.
|
||||
+ Instead, define it through a reference to an external variable.
|
||||
+ Like the following, but using a union to avoid type mismatches:
|
||||
|
||||
- const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL };
|
||||
+ const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / 0x1p53 };
|
||||
extern const long double LDBL_MAX;
|
||||
|
||||
- or through a pointer cast
|
||||
+ The following alternative would not work as well when GCC is optimizing:
|
||||
+
|
||||
+ #define LDBL_MAX (*(long double const *) (double[])
|
||||
+ { DBL_MAX, DBL_MAX / 0x1p53 })
|
||||
|
||||
- #define LDBL_MAX \
|
||||
- (*(const long double *) (double[]) { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL })
|
||||
+ The following alternative would require GCC 6 or later:
|
||||
|
||||
- Unfortunately, this is not a constant expression, and the latter expression
|
||||
- does not work well when GCC is optimizing.. */
|
||||
+ #define LDBL_MAX __builtin_pack_longdouble (DBL_MAX, DBL_MAX / 0x1p53)
|
||||
+
|
||||
+ Unfortunately none of the alternatives are constant expressions. */
|
||||
# if !GNULIB_defined_long_double_union
|
||||
union gl_long_double_union
|
||||
{
|
||||
@@ -159,6 +153,8 @@
|
||||
# endif
|
||||
extern const union gl_long_double_union gl_LDBL_MAX;
|
||||
# define LDBL_MAX (gl_LDBL_MAX.ld)
|
||||
+# undef LDBL_NORM_MAX
|
||||
+# define LDBL_NORM_MAX LDBL_MAX
|
||||
#endif
|
||||
|
||||
/* On IRIX 6.5, with cc, the value of LDBL_MANT_DIG is wrong.
|
||||
@@ -179,6 +175,35 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+/* On PowerPC platforms, 'long double' has a double-double representation.
|
||||
+ Up to ISO C 17, this was outside the scope of ISO C because it can represent
|
||||
+ numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits>, such as
|
||||
+ 1.0L + 4.94065645841246544176568792868221e-324L = 1 + 2^-1074; see
|
||||
+ ISO C 17 § 5.2.4.2.2.(3).
|
||||
+ In ISO C 23, wording has been included that makes this 'long double'
|
||||
+ representation compliant; see ISO C 23 § 5.2.5.3.3.(8)-(9). In this setting,
|
||||
+ numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits> are
|
||||
+ called "unnormalized". And since LDBL_EPSILON must be normalized (per
|
||||
+ ISO C 23 § 5.2.5.3.3.(33)), it must be 2^-105. */
|
||||
+#if defined __powerpc__ && LDBL_MANT_DIG == 106
|
||||
+# undef LDBL_EPSILON
|
||||
+# define LDBL_EPSILON 2.46519032881566189191165176650870696773e-32L /* 2^-105 */
|
||||
+#endif
|
||||
+
|
||||
+/* ============================ ISO C23 support ============================ */
|
||||
+
|
||||
+/* 'long double' properties */
|
||||
+
|
||||
+#ifndef LDBL_NORM_MAX
|
||||
+# ifdef __LDBL_NORM_MAX__
|
||||
+# define LDBL_NORM_MAX __LDBL_NORM_MAX__
|
||||
+# else
|
||||
+# define LDBL_NORM_MAX LDBL_MAX
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
+/* ================================= Other ================================= */
|
||||
+
|
||||
#if @REPLACE_ITOLD@
|
||||
/* Pull in a function that fixes the 'int' to 'long double' conversion
|
||||
of glibc 2.7. */
|
||||
diff '--color=auto' -ruN a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in
|
||||
--- a/gnulib-tests/Makefile.in 2024-06-01 18:18:09.000000000 +0200
|
||||
+++ b/gnulib-tests/Makefile.in 2026-01-02 15:56:12.645625323 +0100
|
||||
@@ -1172,7 +1172,7 @@
|
||||
../gl/lib/libgnulib.a libtests.a $(am__DEPENDENCIES_1)
|
||||
test_float_SOURCES = test-float.c
|
||||
test_float_OBJECTS = test-float.$(OBJEXT)
|
||||
-test_float_LDADD = $(LDADD)
|
||||
+test_float_LDADD = $(LDADD) -lm
|
||||
test_float_DEPENDENCIES = libtests.a ../gl/lib/libgnulib.a libtests.a \
|
||||
../gl/lib/libgnulib.a libtests.a $(am__DEPENDENCIES_1)
|
||||
test_fnmatch_SOURCES = test-fnmatch.c
|
||||
diff '--color=auto' -ruN a/gnulib-tests/test-float.c b/gnulib-tests/test-float.c
|
||||
--- a/gnulib-tests/test-float.c 2024-05-27 21:48:37.000000000 +0200
|
||||
+++ b/gnulib-tests/test-float.c 2026-01-02 16:15:21.261123584 +0100
|
||||
@@ -59,6 +59,8 @@
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
+#include <math.h>
|
||||
+
|
||||
#include "fpucw.h"
|
||||
#include "macros.h"
|
||||
|
||||
@@ -295,6 +297,44 @@
|
||||
|
||||
/* -------------------- Check macros for 'long double' -------------------- */
|
||||
|
||||
+static int
|
||||
+test_isfinitel (long double volatile x)
|
||||
+{
|
||||
+ if (x != x)
|
||||
+ return 0;
|
||||
+ long double volatile zero = x * 0;
|
||||
+ return zero == 0;
|
||||
+}
|
||||
+
|
||||
+/* Return X after normalization. This makes a difference on platforms
|
||||
+ where long double can represent unnormalized values. For example,
|
||||
+ suppose x = 1 + 2**-106 on PowerPC with IBM long double where
|
||||
+ FLT_RADIX = 2, LDBL_MANT_DIG = 106, and LDBL_EPSILON = 2**-105.
|
||||
+ Then 1 < x < 1 + LDBL_EPSILON, and normalize_long_double (x) returns 1. */
|
||||
+static long double
|
||||
+normalize_long_double (long double volatile x)
|
||||
+{
|
||||
+ if (FLT_RADIX == 2 && test_isfinitel (x))
|
||||
+ {
|
||||
+ int xexp;
|
||||
+ long double volatile
|
||||
+ frac = frexpl (x, &xexp),
|
||||
+ significand = frac * pow2l (LDBL_MANT_DIG),
|
||||
+ normalized_significand = truncl (significand),
|
||||
+ normalized_x = normalized_significand * pow2l (xexp - LDBL_MANT_DIG);
|
||||
+
|
||||
+ /* The test_isfinitel defends against PowerPC with IBM long double,
|
||||
+ which fritzes out near LDBL_MAX. */
|
||||
+ if (test_isfinitel (normalized_x))
|
||||
+ x = normalized_x;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ /* Hope that X is already normalized. */
|
||||
+ }
|
||||
+ return x;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
test_long_double (void)
|
||||
{
|
||||
@@ -354,11 +394,14 @@
|
||||
for (n = 0; n <= 2 * LDBL_MANT_DIG; n++)
|
||||
{
|
||||
volatile long double half_n = pow2l (- n); /* 2^-n */
|
||||
- volatile long double x = me - half_n;
|
||||
+ volatile long double x = normalize_long_double (me - half_n);
|
||||
if (x < me)
|
||||
ASSERT (x <= 1.0L);
|
||||
}
|
||||
}
|
||||
+
|
||||
+ /* Check the value of LDBL_NORM_MAX. */
|
||||
+ ASSERT (LDBL_NORM_MAX == normalize_long_double (LDBL_MAX));
|
||||
}
|
||||
|
||||
int
|
||||
Reference in New Issue
Block a user