From 2c6c3122b237bf158ae826904c2869938d354b1e Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Sat, 13 Aug 2022 19:56:14 +0200 Subject: [PATCH 01/14] libbluray: fix broken BDJ patch (cherry picked from commit 938ea3de88533910e50355b82ab185d8e7d47ecb) --- .../libbluray/BDJ-JARFILE-path.patch | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch index 8d9c5d0fbba7..104ebc9252b4 100644 --- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch +++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch @@ -1,27 +1,24 @@ diff --git a/configure.ac b/configure.ac -index 5fd3c8de..7ae343e0 100644 +index 5007bbd..335f3f5 100644 --- a/configure.ac +++ b/configure.ac -@@ -228,6 +228,10 @@ if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then - AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.]) - fi +@@ -253,6 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [ + ]) -+if test "x$use_bdjava_jar" = "xyes"; then -+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" -+fi -+ - AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."]) - AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""]) - AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ]) + AS_IF([test "x$use_bdjava_jar" = "xyes"], [ ++ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" + + dnl check for ant + AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c -index 511ad533..e273b9e0 100644 +index 1cb1bfe..94a175c 100644 --- a/src/libbluray/bdj/bdj.c +++ b/src/libbluray/bdj/bdj.c -@@ -478,6 +478,7 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage) - // pre-defined search paths for libbluray.jar - static const char * const jar_paths[] = { - #ifndef _WIN32 +@@ -533,6 +533,7 @@ static char *_find_libbluray_jar0() + # ifdef __FreeBSD__ + "/usr/local/share/java/" BDJ_JARFILE, + # else + JARDIR "/" BDJ_JARFILE, "/usr/share/java/" BDJ_JARFILE, "/usr/share/libbluray/lib/" BDJ_JARFILE, - #endif + # endif From 39efddea3821d11997a7bc5ebfde2041957129c8 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Sat, 13 Aug 2022 20:01:09 +0200 Subject: [PATCH 02/14] libbluray: fix build failure on 1.3.1 with java Backported from an upstream patch (cherry picked from commit 785ca266b69a4aa343fe67c9255d178203557023) --- .../libbluray/BDJ-JARFILE-path.patch | 13 ++++++---- .../libraries/libbluray/default.nix | 8 +++--- ...after-Oracle-Java-CPU-for-April-2022.patch | 25 +++++++++++++++++++ 3 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch index 104ebc9252b4..d3dec2936c50 100644 --- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch +++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch @@ -1,24 +1,27 @@ diff --git a/configure.ac b/configure.ac -index 5007bbd..335f3f5 100644 +index 5007bbd..f46de1a 100644 --- a/configure.ac +++ b/configure.ac -@@ -253,6 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [ +@@ -253,7 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [ ]) AS_IF([test "x$use_bdjava_jar" = "xyes"], [ +- + CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" - dnl check for ant AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) + AS_IF([test "x$HAVE_ANT" = "xno"], [ diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c -index 1cb1bfe..94a175c 100644 +index 1cb1bfe..f3711c2 100644 --- a/src/libbluray/bdj/bdj.c +++ b/src/libbluray/bdj/bdj.c -@@ -533,6 +533,7 @@ static char *_find_libbluray_jar0() +@@ -533,6 +533,9 @@ static char *_find_libbluray_jar0() # ifdef __FreeBSD__ "/usr/local/share/java/" BDJ_JARFILE, # else ++# ifdef JARDIR + JARDIR "/" BDJ_JARFILE, ++# endif "/usr/share/java/" BDJ_JARFILE, "/usr/share/libbluray/lib/" BDJ_JARFILE, # endif diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index 8d8e64502d42..5b262c66e18e 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-wksPQcW3N7u2XFRP5jSVY3p3HBClGd/IAudp8RK0O3U="; }; - patches = optional withJava ./BDJ-JARFILE-path.patch; + patches = [ + ./BDJ-JARFILE-path.patch + ./libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch + ]; nativeBuildInputs = [ pkg-config autoreconfHook ] - ++ optionals withJava [ ant ] - ; + ++ optionals withJava [ ant ]; buildInputs = [ fontconfig ] ++ optional withJava jdk diff --git a/pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch b/pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch new file mode 100644 index 000000000000..158468e7839d --- /dev/null +++ b/pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch @@ -0,0 +1,25 @@ +From 8f26777b1ce124ff761f80ef52d6be10bcea323e Mon Sep 17 00:00:00 2001 +From: Fridrich Strba +Date: Mon, 25 Apr 2022 14:28:58 +0300 +Subject: [PATCH] Fix build failure after Oracle Java CPU for April 2022 + +--- a/src/libbluray/bdj/java/java/io/BDFileSystem.java ++++ b/src/libbluray/bdj/java/java/io/BDFileSystem.java +@@ -227,6 +227,17 @@ public abstract class BDFileSystem extends FileSystem { + return fs.isAbsolute(f); + } + ++ public boolean isInvalid(File f) { ++ try { ++ Method m = fs.getClass().getDeclaredMethod("isInvalid", new Class[] { File.class }); ++ Object[] args = new Object[] {(Object)f}; ++ Boolean result = (Boolean)m.invoke(fs, args); ++ return result.booleanValue(); ++ } finally { ++ return false; ++ } ++ } ++ + public String resolve(File f) { + if (!booted) + return fs.resolve(f); From 694761d594f05e4ac8e5a5e4a430a26f25fff3f0 Mon Sep 17 00:00:00 2001 From: ash Date: Tue, 6 Sep 2022 08:45:13 +0100 Subject: [PATCH 03/14] less: 600 -> 608 Back on a recommended/non-beta version. http://greenwoodsoftware.com/less/news.608.html (cherry picked from commit b61fb50ddee8727d87b0c4f9ba4ed0b74961bd33) --- pkgs/tools/misc/less/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index cdea90ef5bb2..df8d9eef22ac 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "less"; - version = "600"; + version = "608"; src = fetchurl { url = "https://www.greenwoodsoftware.com/less/less-${version}.tar.gz"; - sha256 = "sha256-ZjPWqis8xxevssIFd4x8QsRiD2Ox1oLz0SyYrwvnTSA="; + sha256 = "02f2d9d6hyf03va28ip620gjc6rf4aikmdyk47h7frqj18pbx6m6"; }; configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc. From 8f84bf6ff6949a0aee3fe2257729943d25590216 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 1 Oct 2022 21:46:46 -0600 Subject: [PATCH 04/14] mesa: Install radv override configs into $out Without this, the per-game radv overrides aren't applied. --- pkgs/development/libraries/mesa/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 8954eae19b46..703b09b4d6ee 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -86,6 +86,8 @@ self = stdenv.mkDerivation { 'DATADIR "/drirc.d"' '"${placeholder "out"}/share/drirc.d"' substituteInPlace src/util/meson.build --replace \ "get_option('datadir')" "'${placeholder "out"}/share'" + substituteInPlace src/amd/vulkan/meson.build --replace \ + "get_option('datadir')" "'${placeholder "out"}/share'" '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' substituteInPlace meson.build --replace \ "find_program('nm')" \ From 47f5668ee78d71ff4095d0d17434ed5f74c1131e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Oct 2022 19:33:30 +0200 Subject: [PATCH 05/14] dbus: 1.14.0 -> 1.14.4 https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.14.4/NEWS Fixes: CVE-2022-42010, CVE-2022-42011, CVE-2022-42012 (cherry picked from commit bdb347b42cf507871d5b0c0a3bd632ba0cec8018) --- pkgs/development/libraries/dbus/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index e78529492497..d9f35ec1b2c4 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchurl , pkg-config , expat @@ -20,21 +19,14 @@ stdenv.mkDerivation rec { pname = "dbus"; - version = "1.14.0"; + version = "1.14.4"; src = fetchurl { url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; - sha256 = "sha256-zNfM43WW4KGVWP1mSNEnKrQ/AR2AyGNa6o/QutWK69Q="; + sha256 = "sha256-fA+bjl7A/yR5OD5iwAhKOimvme3xUU6fZZuBsw1ONT4="; }; - patches = [ - # Fix dbus-daemon crashing when running tests due to long XDG_DATA_DIRS. - # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/302 - (fetchpatch { - url = "https://gitlab.freedesktop.org/dbus/dbus/-/commit/b551b3e9737958216a1a9d359150a4110a9d0549.patch"; - sha256 = "kOVjlklZzKvBZXmmrE1UiO4XWRoBLViGwdn6/eDH+DY="; - }) - ] ++ (lib.optional stdenv.isSunOS ./implement-getgrouplist.patch); + patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; postPatch = '' substituteInPlace bus/Makefile.am \ From 145e0eeac7f75b570883b4211095bdfe88a4b014 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 5 Oct 2022 07:19:03 +1000 Subject: [PATCH 06/14] go_1_18: 1.18.6 -> 1.18.7 (cherry picked from commit b0d7504e82ab300d0bcef59f9afd02d1699d7bd6) --- pkgs/development/compilers/go/1.18.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.18.nix b/pkgs/development/compilers/go/1.18.nix index 36b7791a2bc9..6ff2f0dcf811 100644 --- a/pkgs/development/compilers/go/1.18.nix +++ b/pkgs/development/compilers/go/1.18.nix @@ -60,11 +60,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.18.6"; + version = "1.18.7"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - sha256 = "sha256-p/HVBCQ1XavOZtERKxyuQ5tu5eTxXtum8QTApLFz6JU="; + sha256 = "sha256-lGfjO4Gfcb67IfsO4d1nlP0iRK6UkHqYQoZxL5g5qUQ="; }; strictDeps = true; From d0f7899b232cfa9bb79033006fe6b170042740cc Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Sun, 9 Oct 2022 11:25:05 +0200 Subject: [PATCH 07/14] wavpack: 5.4.0 -> 5.5.0 CVE-2021-44269 (cherry picked from commit 27738d46f7691786b29edeb82c022d91d82311a4) --- pkgs/development/libraries/wavpack/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index e3527ac32a46..67d8bccf51f0 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -1,19 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, libiconv }: +{ lib, stdenv, fetchFromGitHub, gettext, autoreconfHook, libiconv }: stdenv.mkDerivation rec { pname = "wavpack"; - version = "5.4.0"; + version = "5.5.0"; enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optional stdenv.isDarwin libiconv; + # autogen.sh:9 + preAutoreconf = "cp ${gettext}/share/gettext/config.rpath ."; + src = fetchFromGitHub { owner = "dbry"; repo = "WavPack"; rev = version; - sha256 = "1b6szk2vmnqnv5w7h8yc1iazjlidlraq1lwjbmc3fi0snbn6qj44"; + hash = "sha256-4QDtLywu0PT+YsMV26M74bL2P7p4s1tk8ZBQtQcubaU="; }; meta = with lib; { From 4a7bf1fce12d470a48a502bdefa1456a0b8079d2 Mon Sep 17 00:00:00 2001 From: Yorick van Pelt Date: Mon, 10 Oct 2022 09:17:41 +0200 Subject: [PATCH 08/14] avahi: add patch for CVE-2021-3468 (cherry picked from commit 039e1a05f5db32f5e9ff9dfe13501d631b7001bf) --- pkgs/development/libraries/avahi/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 1732b5df04e2..511ea4d1e4be 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -33,10 +33,16 @@ stdenv.mkDerivation rec { patches = [ ./no-mkdir-localstatedir.patch + # CVE-2021-36217 / CVE-2021-3502 (fetchpatch { url = "https://github.com/lathiat/avahi/commit/9d31939e55280a733d930b15ac9e4dda4497680c.patch"; sha256 = "sha256-BXWmrLWUvDxKPoIPRFBpMS3T4gijRw0J+rndp6iDybU="; }) + # CVE-2021-3468 + (fetchpatch { + url = "https://github.com/lathiat/avahi/commit/447affe29991ee99c6b9732fc5f2c1048a611d3b.patch"; + sha256 = "sha256-qWaCU1ZkCg2PmijNto7t8E3pYRN/36/9FrG8okd6Gu8="; + }) ]; buildInputs = [ libdaemon dbus glib expat libiconv libevent ] From bd08df0fc8ad86d47ec7c8106c19ff2f1a9f93f5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 16 Aug 2022 21:01:41 +1000 Subject: [PATCH 09/14] tzdata: 2022b -> 2022c https://mm.icann.org/pipermail/tz-announce/2022-August/000072.html (cherry picked from commit 913ea47f6ba806e964251061ed58989a12b78577) --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 7cb13e0535ee..1a6cba44ef87 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2022b"; + version = "2022c"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - hash = "sha256-9ZDq8Eo5UkVCbCvk+uccFDrqXOvBEIi3oKVwRGHfOX0="; + hash = "sha256-aXT040i/IyMnS1bf+edQAkfjFZ6qS0hd+gzWbnXBS/4="; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - hash = "sha256-urINlD5ZoyGENfSNhopOVS8Y1tfz3RKGYMVmDIC4oF8="; + hash = "sha256-Pnzh82IMwEgZB8fgdNaZEHkyhb/+DKMx7xptGuPqkMw="; }) ]; From 7a44afc41249311185db941b8ddb2a3c405bb836 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 24 Sep 2022 09:30:10 +0200 Subject: [PATCH 10/14] tzdata: 2022c -> 2022d https://mm.icann.org/pipermail/tz-announce/2022-September/000073.html (cherry picked from commit ee73d3a942f5c63e88ad0b9bc89c50521eb28e82) --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 1a6cba44ef87..41004243a557 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2022c"; + version = "2022d"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - hash = "sha256-aXT040i/IyMnS1bf+edQAkfjFZ6qS0hd+gzWbnXBS/4="; + hash = "sha256-bs2+4n+kPc+knz1P2Lsd/vVMkNoavNgsmrzy3E8yHeA="; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - hash = "sha256-Pnzh82IMwEgZB8fgdNaZEHkyhb/+DKMx7xptGuPqkMw="; + hash = "sha256-1kS6D5OImTdOqMtVTjX7SvoPe9e3FsYXd80AUAuHWeA="; }) ]; From b8960073f3e8c8c5543664026ffd1cc2a44bb9c4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 11 Oct 2022 22:55:09 +0200 Subject: [PATCH 11/14] tzdata: 2022d -> 2022e https://mm.icann.org/pipermail/tz-announce/2022-October/000074.html (cherry picked from commit 8a2b098a1b94ed55efd4e627919da7aa89d0af49) --- pkgs/data/misc/tzdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 41004243a557..68183343cc2e 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2022d"; + version = "2022e"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - hash = "sha256-bs2+4n+kPc+knz1P2Lsd/vVMkNoavNgsmrzy3E8yHeA="; + hash = "sha256-jeTCaG3OPRqukDBxnmgUkxwhai1eiR7D0zLm9lFq7M0="; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - hash = "sha256-1kS6D5OImTdOqMtVTjX7SvoPe9e3FsYXd80AUAuHWeA="; + hash = "sha256-1AKAJTmA6JFo5r5CdahSv5UhUk1HaE3jE1uaXKOHcQs="; }) ]; From 3037c4b1dddb485fab70dd73e50afdc7c5d93052 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 24 Aug 2022 23:18:02 +0200 Subject: [PATCH 12/14] libopenmpt: 0.6.4 -> 0.6.5 (cherry picked from commit 4db470acb63e4990c0c5b693561671d4375e62bd) --- pkgs/development/libraries/audio/libopenmpt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index bd383ffe39c4..270e4632aef1 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.6.4"; + version = "0.6.5"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "4J+4RcMpJwCnrBPDsx1mns072+vL/hMo66I3bOvkAWI="; + sha256 = "8iq+l3za5AX2hbdRUOf7FVsseJa0cA/VSr5ohA9m6cA="; }; enableParallelBuilding = true; From 40a7b25bf6dc752cdf369064bddc68ef41eae826 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Sep 2022 09:34:12 +0000 Subject: [PATCH 13/14] libopenmpt: 0.6.5 -> 0.6.6 (cherry picked from commit ff3dd66849b724cf51c67d58410422067e63641b) --- pkgs/development/libraries/audio/libopenmpt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libopenmpt/default.nix b/pkgs/development/libraries/audio/libopenmpt/default.nix index 270e4632aef1..8e5793b0bcd1 100644 --- a/pkgs/development/libraries/audio/libopenmpt/default.nix +++ b/pkgs/development/libraries/audio/libopenmpt/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libopenmpt"; - version = "0.6.5"; + version = "0.6.6"; outputs = [ "out" "dev" "bin" ]; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "8iq+l3za5AX2hbdRUOf7FVsseJa0cA/VSr5ohA9m6cA="; + sha256 = "bdueJqQwYglEiReW/vsbuzi9kUj2z8VYgQwNPyaYdsc="; }; enableParallelBuilding = true; From 1a94c97706f239e3b5ec258a9a1e2552a000929a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 13 Oct 2022 20:01:53 +0200 Subject: [PATCH 14/14] libksba: 1.6.0 -> 1.6.2 Close #192215 Noteworthy changes in version 1.6.2 (2022-10-07) [C22/A14/R2] ------------------------------------------------ * Fix integer overflow in the CRL parser. [rK4b7d9cd4a0] Release-info: https://dev.gnupg.org/T6230 Noteworthy changes in version 1.6.1 (2022-09-16) [C22/A14/R1] ------------------------------------------------ * Allow an OCSP server not to return the sent nonce. [rK24992a4a7a] Release-info: https://dev.gnupg.org/T6210 (cherry picked from commit 8ec485f5142d9502e080e0318dba84e0a46f3f62) --- pkgs/development/libraries/libksba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index e6fb5162b7a6..5bfb0d029cdf 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libksba"; - version = "1.6.0"; + version = "1.6.2"; src = fetchurl { url = "mirror://gnupg/libksba/libksba-${version}.tar.bz2"; - sha256 = "sha256-2taD5vLZFdiAqkvtXOqaEVaQuJNbeKG74BZpGJMHpIs="; + sha256 = "fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971"; }; outputs = [ "out" "dev" "info" ];