nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging-22.05' into staging-next-22.05

Browse Source
This commit is contained in:
Vladimír Čunát
2022-10-21 12:44:04 +02:00
parent de52ad0d76 8c0c9c61aa
commit 8a8ae17664
12 changed files with 75 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/data/misc/tzdata/default.nix
View File

@@ -2,16 +2,16 @@
stdenv.mkDerivation rec {
pname = "tzdata";
version = "2022b";
version = "2022e";
srcs = [
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz";
hash = "sha256-9ZDq8Eo5UkVCbCvk+uccFDrqXOvBEIi3oKVwRGHfOX0=";
hash = "sha256-jeTCaG3OPRqukDBxnmgUkxwhai1eiR7D0zLm9lFq7M0=";
})
(fetchurl {
url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz";
hash = "sha256-urINlD5ZoyGENfSNhopOVS8Y1tfz3RKGYMVmDIC4oF8=";
hash = "sha256-1AKAJTmA6JFo5r5CdahSv5UhUk1HaE3jE1uaXKOHcQs=";
})
];

4
pkgs/development/compilers/go/1.18.nix
View File

@@ -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;

4
pkgs/development/libraries/audio/libopenmpt/default.nix
View File

@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "libopenmpt";
version = "0.6.4";
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 = "4J+4RcMpJwCnrBPDsx1mns072+vL/hMo66I3bOvkAWI=";
sha256 = "bdueJqQwYglEiReW/vsbuzi9kUj2z8VYgQwNPyaYdsc=";
};
enableParallelBuilding = true;

6
pkgs/development/libraries/avahi/default.nix
View File

@@ -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 ]

14
pkgs/development/libraries/dbus/default.nix
View File

@@ -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 \

34
pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
View File

@@ -1,27 +1,27 @@
diff --git a/configure.ac b/configure.ac
index 5fd3c8de..7ae343e0 100644
index 5007bbd..f46de1a 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,7 +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)
AS_IF([test "x$HAVE_ANT" = "xno"], [
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
index 511ad533..e273b9e0 100644
index 1cb1bfe..f3711c2 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,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
# endif

8
pkgs/development/libraries/libbluray/default.nix
View File

@@ -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

25
pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch Normal file
View File

@@ -0,0 +1,25 @@
From 8f26777b1ce124ff761f80ef52d6be10bcea323e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
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);

4
pkgs/development/libraries/libksba/default.nix
View File

@@ -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" ];

2
pkgs/development/libraries/mesa/default.nix
View File

@@ -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')" \

9
pkgs/development/libraries/wavpack/default.nix
View File

@@ -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; {

4
pkgs/tools/misc/less/default.nix
View File

@@ -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.