mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-29 19:30:11 +00:00
staging-next-25.11 iteration 7 - 2026-05-25 (#524014)
This commit is contained in:
@@ -85,13 +85,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.2-19";
|
||||
version = "7.1.2-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4uASM+GRTe0ES6FdshUMMkVof4IlLV+CMm2l+v5qZN0=";
|
||||
hash = "sha256-zYk75q+EyWq5g/AHFU6v8a7gye0aDAEe/ZZvjqR9ZTc=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -620,7 +620,10 @@ rec {
|
||||
in
|
||||
runCommand name args ''
|
||||
mkdir -p $out
|
||||
for i in $(cat $pathsPath); do
|
||||
if [ -n "''${pathsPath:-}" ] && [ -f "$pathsPath" ]; then
|
||||
mapfile -d " " -t paths < "$pathsPath"
|
||||
fi
|
||||
for i in "''${paths[@]}"; do
|
||||
${optionalString (!failOnMissing) "if test -d $i; then "}${lndir}/bin/lndir -silent $i $out${
|
||||
optionalString (!failOnMissing) "; fi"
|
||||
}
|
||||
|
||||
@@ -55,6 +55,24 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
symlinkJoin-structured-attrs = testEqualContents {
|
||||
assertion = "symlinkJoin-structured-attrs";
|
||||
actual = symlinkJoin {
|
||||
__structuredAttrs = true;
|
||||
name = "symlinkJoin-structured-attrs";
|
||||
paths = [
|
||||
foo
|
||||
bar
|
||||
baz
|
||||
];
|
||||
};
|
||||
expected = runCommand "symlinkJoin-foo-bar-baz" { } ''
|
||||
mkdir -p $out/{var/lib/arbitrary,etc/test.d}
|
||||
ln -s {${foo},${bar}}/etc/test.d/* $out/etc/test.d
|
||||
ln -s ${baz}/var/lib/arbitrary/baz $out/var/lib/arbitrary/
|
||||
'';
|
||||
};
|
||||
|
||||
symlinkJoin-strip-paths = testEqualContents {
|
||||
assertion = "symlinkJoin-strip-paths";
|
||||
actual = symlinkJoin {
|
||||
|
||||
@@ -29,13 +29,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "audit";
|
||||
version = "4.1.2-unstable-2025-09-06"; # fixes to non-static builds right after 4.1.2 release
|
||||
version = "4.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-audit";
|
||||
repo = "audit-userspace";
|
||||
rev = "cb13fe75ee2c36d5c525ed9de22aae10dbc8caf4";
|
||||
hash = "sha256-NX0TWA+LtcZgbM9aQfokWv2rGNAAb3ksGqAH8URAkYM=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-GdJ9nzlDAdOazOHH/YWuEoELrJh+G5ZJUKwIqAKAzpo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -130,10 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
# Instead, we load audit rules in a dedicated module.
|
||||
postFixup = ''
|
||||
moveToOutput bin/augenrules $scripts
|
||||
substituteInPlace $scripts/bin/augenrules \
|
||||
--replace-fail "/sbin/auditctl -R" "$bin/bin/auditctl -R" \
|
||||
--replace-fail "auditctl -s" "$bin/bin/auditctl -s" \
|
||||
--replace-fail "/bin/ls" "ls"
|
||||
wrapProgram $scripts/bin/augenrules \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
|
||||
@@ -23,15 +23,18 @@
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "cups";
|
||||
version = "2.4.16";
|
||||
version = "2.4.19";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
|
||||
hash = "sha256-AzlYcgS0+UKN0FkuswHewL+epuqNzl2WkNVr5YWrqS0=";
|
||||
url = "https://github.com/OpenPrinting/cups/releases/download/v${finalAttrs.version}/cups-${finalAttrs.version}-source.tar.gz";
|
||||
hash = "sha256-ggmEsSpn+YcFeFquLdE0f+CsCXgoAB1Fg/9kV0rtY4k=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
strictDeps = true;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"lib"
|
||||
@@ -183,4 +186,4 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with lib.maintainers; [ matthewbauer ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -86,7 +86,7 @@ assert
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "curl";
|
||||
version = "8.19.0";
|
||||
version = "8.20.0";
|
||||
|
||||
src = fetchurl {
|
||||
urls = [
|
||||
@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
|
||||
}/curl-${finalAttrs.version}.tar.xz"
|
||||
];
|
||||
hash = "sha256-TrQUiXkNGeGQ16x+GOgoV83Wivj05mspLO1WLTM/Ed8=";
|
||||
hash = "sha256-Y/4twUi6DOromSLvg49+XJRicsLni3xZ+rS3nTziuJY=";
|
||||
};
|
||||
|
||||
# this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
# files.
|
||||
|
||||
let
|
||||
version = "2.7.5";
|
||||
version = "2.8.1";
|
||||
tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
url =
|
||||
with finalAttrs;
|
||||
"https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-EDLf70/xf3BGSCfaooNpsg9lhNEIvDbxerFnbh7dL5E=";
|
||||
hash = "sha256-ELGV7ngWCpCDiBgKj+NgPU6aEvR1X79fOBayOp11DaA=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
autoreconfHook,
|
||||
imlib2,
|
||||
xorg,
|
||||
@@ -22,6 +23,14 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2026-42046.patch";
|
||||
url = "https://github.com/cacalabs/libcaca/commit/fb77acff9ba6bb01d53940da34fb10f20b156a23.patch";
|
||||
hash = "sha256-AdpiE5Gw/CVET//7TTYZCb0glW5HY+T8xZkYs1XCBvY=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
version = "1.0.18";
|
||||
version = "1.0.19";
|
||||
pname = "libde265";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "strukturag";
|
||||
repo = "libde265";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-N6K82ElrzrMSNKfPTDsc5onrxucIJ8niwFgbaEPPd2I=";
|
||||
hash = "sha256-77OIclR2TwOigo/k5ps9S0TrDNvEjf290PqZyqBcydo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libexif";
|
||||
version = "0.6.25";
|
||||
version = "0.6.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libexif";
|
||||
repo = "libexif";
|
||||
rev = "libexif-${builtins.replaceStrings [ "." ] [ "_" ] version}-release";
|
||||
sha256 = "sha256-H8YzfNO2FCrYAwEA4bkOpRdxISK9RXaHVuK8zz70TlM=";
|
||||
sha256 = "sha256-H51RlMT3swWF8oLWu70eTnuumee5mRMSCWkMFX7mJSk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
38
pkgs/by-name/li/libssh2/CVE-2026-7598.patch
Normal file
38
pkgs/by-name/li/libssh2/CVE-2026-7598.patch
Normal file
@@ -0,0 +1,38 @@
|
||||
diff --git a/src/userauth.c b/src/userauth.c
|
||||
index f8e02651c4..43d9ab9b9d 100644
|
||||
--- a/src/userauth.c
|
||||
+++ b/src/userauth.c
|
||||
@@ -80,6 +80,12 @@ static char *userauth_list(LIBSSH2_SESSION *session, const char *username,
|
||||
memset(&session->userauth_list_packet_requirev_state, 0,
|
||||
sizeof(session->userauth_list_packet_requirev_state));
|
||||
|
||||
+ if(username_len > UINT32_MAX - 27) {
|
||||
+ _libssh2_error(session, LIBSSH2_ERROR_PROTO,
|
||||
+ "username_len out of bounds");
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
session->userauth_list_data_len = username_len + 27;
|
||||
|
||||
if(session->userauth_list_data) {
|
||||
@@ -316,6 +322,11 @@ userauth_password(LIBSSH2_SESSION *session,
|
||||
* 40 = packet_type(1) + username_len(4) + service_len(4) +
|
||||
* service(14)"ssh-connection" + method_len(4) + method(8)"password" +
|
||||
* chgpwdbool(1) + password_len(4) */
|
||||
+ if(username_len > UINT32_MAX - 40) {
|
||||
+ return _libssh2_error(session, LIBSSH2_ERROR_PROTO,
|
||||
+ "username_len out of bounds");
|
||||
+ }
|
||||
+
|
||||
session->userauth_pswd_data_len = username_len + 40;
|
||||
|
||||
session->userauth_pswd_data0 =
|
||||
@@ -456,7 +467,7 @@ userauth_password(LIBSSH2_SESSION *session,
|
||||
}
|
||||
|
||||
/* basic data_len + newpw_len(4) */
|
||||
- if(username_len + password_len + 44 <= UINT_MAX) {
|
||||
+ if(username_len <= UINT32_MAX - password_len - 44) {
|
||||
session->userauth_pswd_data_len =
|
||||
username_len + password_len + 44;
|
||||
s = session->userauth_pswd_data =
|
||||
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-2ex2y+NNuY7sNTn+LImdJrDIN8s+tGalaw8QnKv2WPc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/libssh2/libssh2/commit/256d04b60d80bf1190e96b0ad1e91b2174d744b1
|
||||
./CVE-2026-7598.patch
|
||||
];
|
||||
|
||||
# this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
|
||||
# necessary for FreeBSD code path in configure
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.39";
|
||||
version = "1.6.42";
|
||||
pname = "memcached";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://memcached.org/files/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-I+VQfpM7FUYxYdTF05IbDF80C1Qtbt1/bF4Xw08Ro2M=";
|
||||
sha256 = "sha256-UPCLh51PnTbeqdkF6eqt4Vxwjjjbfppz/CHci0U5Xec=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -1,20 +1,8 @@
|
||||
From e5cc8f7c387e3238ebb8239e2555c933a41502c0 Mon Sep 17 00:00:00 2001
|
||||
From: Graham Christensen <graham@grahamc.com>
|
||||
Date: Thu, 7 Mar 2019 08:11:32 -0500
|
||||
Subject: [PATCH] Makefile: use SOURCE_DATE_EPOCH for reproducibility
|
||||
|
||||
---
|
||||
nspr/lib/ds/Makefile.in | 4 ++--
|
||||
nspr/lib/libc/src/Makefile.in | 4 ++--
|
||||
nspr/lib/prstreams/Makefile.in | 4 ++--
|
||||
nspr/pr/src/Makefile.in | 6 +++---
|
||||
4 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/nspr/lib/ds/Makefile.in b/nspr/lib/ds/Makefile.in
|
||||
index e737791..d56b0a7 100644
|
||||
index fa8c783..eff1ac3 100644
|
||||
--- a/nspr/lib/ds/Makefile.in
|
||||
+++ b/nspr/lib/ds/Makefile.in
|
||||
@@ -101,8 +101,8 @@ ECHO = echo
|
||||
@@ -91,8 +91,8 @@ ECHO = echo
|
||||
TINC = $(OBJDIR)/_pl_bld.h
|
||||
PROD = $(notdir $(SHARED_LIBRARY))
|
||||
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
|
||||
@@ -26,10 +14,10 @@ index e737791..d56b0a7 100644
|
||||
ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
|
||||
SUF = i64
|
||||
diff --git a/nspr/lib/libc/src/Makefile.in b/nspr/lib/libc/src/Makefile.in
|
||||
index e8a6d9f..0485737 100644
|
||||
index 9ef2007..2d5db8f 100644
|
||||
--- a/nspr/lib/libc/src/Makefile.in
|
||||
+++ b/nspr/lib/libc/src/Makefile.in
|
||||
@@ -103,8 +103,8 @@ ECHO = echo
|
||||
@@ -93,8 +93,8 @@ ECHO = echo
|
||||
TINC = $(OBJDIR)/_pl_bld.h
|
||||
PROD = $(notdir $(SHARED_LIBRARY))
|
||||
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
|
||||
@@ -40,36 +28,12 @@ index e8a6d9f..0485737 100644
|
||||
|
||||
ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
|
||||
SUF = i64
|
||||
diff --git a/nspr/lib/prstreams/Makefile.in b/nspr/lib/prstreams/Makefile.in
|
||||
index aeb2944..83ae423 100644
|
||||
--- a/nspr/lib/prstreams/Makefile.in
|
||||
+++ b/nspr/lib/prstreams/Makefile.in
|
||||
@@ -105,8 +105,8 @@ ECHO = echo
|
||||
TINC = $(OBJDIR)/_pl_bld.h
|
||||
PROD = $(notdir $(SHARED_LIBRARY))
|
||||
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
|
||||
-SH_DATE = $(shell date "+%Y-%m-%d %T")
|
||||
-SH_NOW = $(shell $(NOW))
|
||||
+SH_DATE = $(shell date "+%Y-%m-%d %T" --date $(SOURCE_DATE_EPOCH))
|
||||
+SH_NOW = $(SOURCE_DATE_EPOCH)000000
|
||||
|
||||
ifeq ($(OS_ARCH), WINNT)
|
||||
SUF = i64
|
||||
diff --git a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
|
||||
index 19c5a69..989cc8c 100644
|
||||
index a9e86f5..854c0a9 100644
|
||||
--- a/nspr/pr/src/Makefile.in
|
||||
+++ b/nspr/pr/src/Makefile.in
|
||||
@@ -46,7 +46,7 @@ MKSHLIB += -M $(MAPFILE)
|
||||
endif
|
||||
#
|
||||
# In Solaris 2.6 or earlier, -lrt is called -lposix4.
|
||||
-#
|
||||
+#
|
||||
LIBRT_TEST=$(firstword $(sort 5.7 $(OS_RELEASE)))
|
||||
ifeq (5.7, $(LIBRT_TEST))
|
||||
LIBRT=-lrt
|
||||
@@ -311,8 +311,8 @@ PROD = $(notdir $(SHARED_LIBRARY))
|
||||
endif
|
||||
@@ -276,8 +276,8 @@ TINC = $(OBJDIR)/_pr_bld.h
|
||||
PROD = $(notdir $(SHARED_LIBRARY))
|
||||
|
||||
NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now
|
||||
-SH_DATE = $(shell date "+%Y-%m-%d %T")
|
||||
@@ -79,6 +43,3 @@ index 19c5a69..989cc8c 100644
|
||||
|
||||
ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT)
|
||||
SUF = i64
|
||||
--
|
||||
2.19.2
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nspr";
|
||||
version = "4.38.2";
|
||||
version = "4.39";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
|
||||
hash = "sha256-5Akvrqt3vcmzLbERPkIVlI7naOJsRmbbO1pgs18skQU=";
|
||||
hash = "sha256-u9Au6HpVZ2Bjpj5byBngIn3iZmtHMHsqATRBTN9CNo4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
|
||||
# https://bugs.openldap.org/show_bug.cgi?id=8623
|
||||
rm -f tests/scripts/test022-ppolicy
|
||||
|
||||
rm -f tests/scripts/test*-sync*
|
||||
|
||||
rm -f tests/scripts/test063-delta-multiprovider
|
||||
|
||||
# https://bugs.openldap.org/show_bug.cgi?id=10009
|
||||
|
||||
@@ -18,11 +18,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "SDL2_image";
|
||||
version = "2.8.8";
|
||||
version = "2.8.12";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-IhO1b9r/IiDQ44yOQgy+GoPIc3QZDLqMcK8hVgl84wo=";
|
||||
hash = "sha256-OT9e+1BTbsE8pPSv+2nMmWbTw/lp5sXnAfrd+fl4U4E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tzdata";
|
||||
version = "2026a";
|
||||
version = "2026b";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzdata${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-d7VBclk3u1O9kr1ITAtDvshUXi00Me4B8E748iA7orc=";
|
||||
hash = "sha256-EUVD2fGaa/61vKQ2hq6hc9OHVaPbHy7sESZHrpLG9UQ=";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://data.iana.org/time-zones/releases/tzcode${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-+AoXou3dK1QEH5yY11sKqAOLAW18XecokqFG2ZOHQOE=";
|
||||
hash = "sha256-N+nthCf101IcIvxY4pPL+wQ9cO7fEAOHCzPzY/Yco0Q=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
@@ -56,13 +56,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "unbound";
|
||||
version = "1.24.2";
|
||||
version = "1.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NLnetLabs";
|
||||
repo = "unbound";
|
||||
tag = "release-${finalAttrs.version}";
|
||||
hash = "sha256-kyTcDmNGKJuOMZ7cxIWh6o7aasRUoAB4M0tIG81BQsE=";
|
||||
hash = "sha256-1PXnxCPxoB5IrVBQIsrxiWAq+IoH7Ma9T1TTJsoTJc4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xdg-dbus-proxy";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flatpak/xdg-dbus-proxy/releases/download/${finalAttrs.version}/xdg-dbus-proxy-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-Exv1n858fufsvF2RBtZ1D09Ze/5gmWZXMkD35JUpc6E=";
|
||||
hash = "sha256-OtPSe6V04XisteTUOLo2rOJeNWT4mcNvMcVvgsetu+c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -25,11 +25,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "go";
|
||||
version = "1.25.9";
|
||||
version = "1.25.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
|
||||
hash = "sha256-DsnvjrzqCXqsN97K6fCachi0Uc2Wvn1u1RPY5Lz5Cc8=";
|
||||
hash = "sha256-IM8EqS5a+ZdI40G8iZb6KAkMmsmHZfoRXsXd9B169B0=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -59,11 +59,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnutls";
|
||||
version = "3.8.12";
|
||||
version = "3.8.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
|
||||
hash = "sha256-p7NBQhv9RZrPejdMpK87ngZgjc1715Kyv0cL6gErjlE=";
|
||||
hash = "sha256-/+2Owb8JwkJtTxSq43feR1O1PlN9aF5gTpmosWypyX4=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
{ callPackage, fetchurl }:
|
||||
|
||||
callPackage ./generic.nix {
|
||||
version = "3.6.5";
|
||||
hash = "sha256-CAMksh7i4mg5zVTYLB/SZWFVmgQBMhPnislLCD9j7+o=";
|
||||
version = "3.6.6";
|
||||
hash = "sha256-+PW41/c8M/Yz0EVWM4Gt4HTNBMUTU5MayaKVZ+upLIo=";
|
||||
|
||||
patches = [
|
||||
# Fixes the build with GCC 14 on aarch64.
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openexr";
|
||||
version = "3.3.8";
|
||||
version = "3.4.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "openexr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-bJJdfr+OybCl8L27m1uRynGaU1V8D70bSzQjkDuqMDU=";
|
||||
hash = "sha256-jXio+PvagKTR8NjcYIQ/j8LOMNc/0sQBuaixKk/0V3k=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -155,6 +155,12 @@ buildPythonPackage rec {
|
||||
# Fails with `sandbox=false` by mis-configuring the model it's using.
|
||||
# AttributeError: 'DistributedDataParallel' object has no attribute '_ignored_modules'. Did you mean: 'named_modules'?
|
||||
"test_ignored_modules_regex"
|
||||
|
||||
# Illegal instruction (x86_64) / Trace/BPT Error 5 (aarch64)
|
||||
"test_can_pickle_dataloader"
|
||||
|
||||
# ImportError: cannot import name 'PretrainedConfig' from 'transformers.modeling_utils'
|
||||
"test_nested_hook"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
# RuntimeError: torch_shm_manager: execl failed: Permission denied
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@@ -45,25 +44,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pillow";
|
||||
version = "12.1.1";
|
||||
version = "12.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-pillow";
|
||||
repo = "pillow";
|
||||
tag = version;
|
||||
hash = "sha256-NlmNabyoHiakwvomjivTA7N304ovNCMDSaBLSmcmZ7w=";
|
||||
hash = "sha256-7w6FbZLTAoUMvLtSPvafk3wSRv8TrkAAfgZ/dfu3HpA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# https://github.com/python-pillow/Pillow/security/advisories/GHSA-whj4-6x5x-4v2j
|
||||
name = "CVE-2026-40192.patch";
|
||||
url = "https://github.com/python-pillow/Pillow/commit/3cb854e8b2bab43f40e342e665f9340d861aa628.patch";
|
||||
hash = "sha256-7Hh72WoD7Iy/aB1J7w5X6ge3wx4lPWAQrOR6luO0FOg=";
|
||||
})
|
||||
];
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
pybind11
|
||||
|
||||
@@ -187,10 +187,13 @@ buildPythonPackage rec {
|
||||
"ProcessTestsBuilder_SelectReactorTests.test_processEnded"
|
||||
];
|
||||
"src/twisted/internet/test/test_tcp.py" = [
|
||||
# marked as flaky on macOS by upstream
|
||||
# https://github.com/twisted/twisted/blob/twisted-25.5.0/src/twisted/internet/test/test_tcp.py
|
||||
# flaky on macOS, suspected kernel bug in socket notifications
|
||||
# https://github.com/twisted/twisted/issues/12151
|
||||
"AbortConnectionTests_AsyncioSelectorReactorTests.test_fullWriteBufferAfterByteExchange"
|
||||
"AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbort"
|
||||
"AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbortLater"
|
||||
# Times out in Hydra on x86_64-darwin
|
||||
"AbortConnectionTests_AsyncioSelectorReactorTests.test_fullWriteBufferAfterByteExchange"
|
||||
];
|
||||
};
|
||||
in
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tzdata";
|
||||
version = "2025.2";
|
||||
version = "2026.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-tgpjj8wNr/rfgv4PV+U9Br3sLzbE32YoCuebzmvW8rk=";
|
||||
hash = "sha256-kXP959gNkBjgKmYuFo5aLQT4fEHqF0sTn772Qu2mLRA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
@@ -30,6 +30,7 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "tzdata" ];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/python/tzdata/blob/${version}/NEWS.md";
|
||||
description = "Provider of IANA time zone data";
|
||||
homepage = "https://github.com/python/tzdata";
|
||||
license = lib.licenses.asl20;
|
||||
|
||||
@@ -40,14 +40,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libpq";
|
||||
version = "18.2";
|
||||
version = "18.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "postgres";
|
||||
repo = "postgres";
|
||||
# rev, not tag, on purpose: see generic.nix.
|
||||
rev = "refs/tags/REL_18_2";
|
||||
hash = "sha256-cvBXxA7/kEwDGxFv/YoZCIh17jzUujrCtfKAmtSxKTw=";
|
||||
rev = "refs/tags/REL_18_4";
|
||||
hash = "sha256-Ac/Dqcj8vjcW3my5vsnKaMiQqTq/HPtUzckJ3SMyrfA=";
|
||||
};
|
||||
|
||||
__structuredAttrs = true;
|
||||
|
||||
@@ -93,12 +93,12 @@ in
|
||||
|
||||
openssh_gssapi = common rec {
|
||||
pname = "openssh-with-gssapi";
|
||||
version = "10.2p1";
|
||||
version = "10.3p1";
|
||||
extraDesc = " with GSSAPI support";
|
||||
|
||||
src = fetchurl {
|
||||
url = urlFor version;
|
||||
hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI=";
|
||||
hash = "sha256-VmgqNruS3PS08Bb9jsjnQFm3mo3iXBXWcNcx59GORfQ=";
|
||||
};
|
||||
|
||||
extraPatches = [
|
||||
@@ -106,8 +106,8 @@ in
|
||||
|
||||
(fetchpatch {
|
||||
name = "openssh-gssapi.patch";
|
||||
url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%2510.2p1-6/debian/patches/gssapi.patch";
|
||||
hash = "sha256-mYrJJrE6l0r/VYLWlOTGkKLzj9Dj4wOLgJyW/NLGaeo=";
|
||||
url = "https://salsa.debian.org/ssh-team/openssh/raw/debian/1%2510.3p1-1/debian/patches/gssapi.patch";
|
||||
hash = "sha256-gs5Vw4f/TDxmme1DbrtgwvWcPGGmYIWE/A4JWa551zA=";
|
||||
})
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user