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

Merge #232237: staging-next 2023-05-16

Browse Source
This commit is contained in:
Vladimír Čunát
2023-05-19 08:20:25 +02:00
parent 9c82602247 6a414c5a5b
commit c11cd4011b
17 changed files with 104 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/ruby/default.nix
+16 -3
View File
@@ -15,6 +15,13 @@ let
config = import ./config.nix { inherit fetchFromSavannah; };
rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
openssl3Gem = fetchFromGitHub {
owner = "ruby";
repo = "openssl";
rev = "v3.0.2";
hash = "sha256-KhuKRP1JkMJv7CagGRQ0KKGOd5Oh0FP0fbj0VZ4utGo=";
};
# Contains the ruby version heuristics
rubyVersion = import ./ruby-version.nix { inherit lib; };
@@ -84,8 +91,8 @@ let
++ (op fiddleSupport libffi)
++ (ops cursesSupport [ ncurses readline ])
++ (op zlibSupport zlib)
++ (op (!atLeast31 && opensslSupport) openssl_1_1)
++ (op (atLeast31 && opensslSupport) openssl)
++ (op (atLeast30 && opensslSupport) openssl)
++ (op (!atLeast30 && opensslSupport) openssl_1_1)
++ (op gdbmSupport gdbm)
++ (op yamlSupport libyaml)
# Looks like ruby fails to build on darwin without readline even if curses
@@ -113,7 +120,7 @@ let
url = "https://github.com/ruby/ruby/commit/0acc05caf7518cd0d63ab02bfa036455add02346.patch";
sha256 = "sha256-43hI9L6bXfeujgmgKFVmiWhg7OXvshPCCtQ4TxqK1zk=";
})
]
]
++ ops (!atLeast30 && rubygemsSupport) [
# We upgrade rubygems to a version that isn't compatible with the
# ruby 2.7 installer. Backport the upstream fix.
@@ -149,6 +156,12 @@ let
rm -rf $sourceRoot/{lib,test}/rubygems*
cp -r ${rubygems}/lib/rubygems* $sourceRoot/lib
cp -r ${rubygems}/test/rubygems $sourceRoot/test
'' + opString (ver.majMin == "3.0" && opensslSupport) ''
# Replace the Gem by a OpenSSL3-compatible one.
echo "Hotpatching the OpenSSL gem with a 3.x series for OpenSSL 3 support..."
cp -vr ${openssl3Gem}/ext/openssl $sourceRoot/ext/
cp -vr ${openssl3Gem}/lib/ $sourceRoot/ext/openssl/
cp -vr ${openssl3Gem}/{History.md,openssl.gemspec} $sourceRoot/ext/openssl/
'';
postPatch = ''
pkgs/development/interpreters/ruby/rubygems/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rubygems";
version = "3.4.12";
version = "3.4.13";
src = fetchurl {
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
sha256 = "sha256-WFCnwvw4DN09pwShznuwSNQtSACTPfULiSAmW1hF4Vs=";
sha256 = "sha256-s/7KCbf07zezuASA7E03t83UDY6W/fFw9bljOprXWls=";
};
patches = [
pkgs/development/libraries/grpc/default.nix
+2 -2
View File
@@ -21,7 +21,7 @@
stdenv.mkDerivation rec {
pname = "grpc";
version = "1.54.0"; # N.B: if you change this, please update:
version = "1.54.2"; # N.B: if you change this, please update:
# pythonPackages.grpcio-tools
# pythonPackages.grpcio-status
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
hash = "sha256-WVH7rYyFx2LyAnctnNbX4KevoJ5KKZujN+SmL0Y6wvw=";
hash = "sha256-OIRqH+h8Kjbw3X5slpdCfNN0f027WuvHG3q7KUuSWo8=";
fetchSubmodules = true;
};
pkgs/development/libraries/libcamera/default.nix
+2 -2
View File
@@ -21,12 +21,12 @@
stdenv.mkDerivation rec {
pname = "libcamera";
version = "0.0.3";
version = "0.0.5";
src = fetchgit {
url = "https://git.libcamera.org/libcamera/libcamera.git";
rev = "v${version}";
hash = "sha256-0/wvH07bJRKFwYnOARRJNzH8enIX3TNnWQnJdfpfvgE=";
hash = "sha256-rd1YIEosg4+H/FJBYCoxdQlV9F0evU5fckHJrSdVPOE=";
};
outputs = [ "out" "dev" "doc" ];
pkgs/development/libraries/pipewire/0060-libjack-path.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/src/modules/meson.build b/src/modules/meson.build
index 5d2dc9984..35f5773aa 100644
--- a/src/modules/meson.build
+++ b/src/modules/meson.build
@@ -169,6 +169,7 @@ if build_module_jack_tunnel
install_dir : modules_install_dir,
install_rpath: modules_install_dir,
dependencies : [mathlib, dl_lib, pipewire_dep],
+ c_args: '-DNIXPKGS_LIBJACK_PATH="@0@"'.format(jack_dep.get_variable('libdir'))
)
build_module_jackdbus_detect = dbus_dep.found()
if build_module_jackdbus_detect
diff --git a/src/modules/module-jack-tunnel/weakjack.h b/src/modules/module-jack-tunnel/weakjack.h
index 42580f798..e7aadd3cc 100644
--- a/src/modules/module-jack-tunnel/weakjack.h
+++ b/src/modules/module-jack-tunnel/weakjack.h
@@ -164,8 +164,7 @@ static inline int weakjack_load(struct weakjack *jack, const char *lib)
search_dirs = getenv("LIBJACK_PATH");
if (!search_dirs)
- search_dirs = PREFIX "/lib64/:" PREFIX "/lib/:"
- "/usr/lib64/:/usr/lib/:" LIBDIR;
+ search_dirs = NIXPKGS_LIBJACK_PATH;
while ((p = pw_split_walk(search_dirs, ":", &len, &state))) {
int pathlen;
pkgs/development/libraries/pipewire/default.nix
+4 -2
View File
@@ -73,7 +73,7 @@ let
self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.70";
version = "0.3.71";
outputs = [
"out"
@@ -91,7 +91,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-xhJzE6JcfNcLMm+TqTIPaBEnEthEqUZiTqhWz1fO5Ng=";
sha256 = "sha256-NPYWl+WeI/z70gNHX1BAKslGFX634D7XrV04vuJgGOo=";
};
patches = [
@@ -99,6 +99,8 @@ let
./0040-alsa-profiles-use-libdir.patch
# Change the path of the pipewire-pulse binary in the service definition.
./0050-pipewire-pulse-path.patch
# Load libjack from a known location
./0060-libjack-path.patch
# Move installed tests into their own output.
./0070-installed-tests-path.patch
# Add option for changing the config install directory
pkgs/development/python-modules/grpcio-status/default.nix
+2 -2
View File
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "grpcio-status";
version = "1.54.0";
version = "1.54.2";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-tQMF1SwN9haUk8yl8uObm013Oz8w1Kemtt18GMuJAHw=";
hash = "sha256-MlXL7Ft8cGyqPU3VhGBsCA5kFeFWMbsvYhXitwBVg20=";
};
postPatch = ''
pkgs/development/python-modules/grpcio-tools/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
buildPythonPackage rec {
pname = "grpcio-tools";
version = "1.54.0";
version = "1.54.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-33msv1mZcBjhMXE7cWov3bVVbhhA6fud5MpzvyBZWQ4=";
hash = "sha256-4RwsKu5T80CZLo5NalkXLLu9AZPxNR3pjE+BClBB1co=";
};
postPatch = ''
pkgs/development/python-modules/sqlalchemy/default.nix
+2 -2
View File
@@ -41,7 +41,7 @@
buildPythonPackage rec {
pname = "SQLAlchemy";
version = "2.0.9";
version = "2.0.13";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -50,7 +50,7 @@ buildPythonPackage rec {
owner = "sqlalchemy";
repo = "sqlalchemy";
rev = "refs/tags/rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
hash = "sha256-0WlRZ7Kv6owtZB+PDFKk+8dxEL4p3QQrRPq8eQd2PqM=";
hash = "sha256-tKxzKv0Ng0saybeFJNleCN5D8gOFw4z9m858OeddJH0=";
};
nativeBuildInputs =[
pkgs/development/python-modules/wrapt/default.nix
+8
View File
@@ -2,11 +2,14 @@
, buildPythonPackage
, fetchFromGitHub
, pytestCheckHook
, sphinxHook
, sphinx-rtd-theme
}:
buildPythonPackage rec {
pname = "wrapt";
version = "1.14.1";
outputs = [ "out" "doc" ];
format = "setuptools";
src = fetchFromGitHub {
@@ -20,6 +23,11 @@ buildPythonPackage rec {
pytestCheckHook
];
nativeBuildInputs = [
sphinxHook
sphinx-rtd-theme
];
pythonImportsCheck = [
"wrapt"
];
pkgs/development/ruby-modules/bundler/default.nix
+2 -2
View File
@@ -4,8 +4,8 @@ buildRubyGem rec {
inherit ruby;
name = "${gemName}-${version}";
gemName = "bundler";
version = "2.4.12";
source.sha256 = "sha256-y1VM1Pi/Rx0XeTff5vUv7mCtcLtKr3ENcnD6SiTezk0=";
version = "2.4.13";
source.sha256 = "sha256-EWU6pa5QfG29Vb9+m+iSbZmvrJtsDAjToZOK/rPnWos=";
dontPatchShebangs = true;
postFixup = ''
pkgs/development/tools/misc/pahole/default.nix
+2
View File
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
musl-obstack
];
patches = [ ./threading-reproducibility.patch ];
# Put libraries in "lib" subdirectory, not top level of $out
cmakeFlags = [ "-D__LIB=lib" "-DLIBBPF_EMBEDDED=OFF" ];
pkgs/development/tools/misc/pahole/threading-reproducibility.patch
+18
View File
@@ -0,0 +1,18 @@
diff --git a/pahole.c b/pahole.c
index 6fc4ed6..a4e306f 100644
--- a/pahole.c
+++ b/pahole.c
@@ -1687,8 +1687,11 @@ static error_t pahole__options_parser(int key, char *arg,
class_name = arg; break;
case 'j':
#if _ELFUTILS_PREREQ(0, 178)
- conf_load.nr_jobs = arg ? atoi(arg) :
- sysconf(_SC_NPROCESSORS_ONLN) * 1.1;
+ // Force single thread if reproducibility is desirable.
+ if (!getenv("SOURCE_DATE_EPOCH")) {
+ conf_load.nr_jobs = arg ? atoi(arg) :
+ sysconf(_SC_NPROCESSORS_ONLN) * 1.1;
+ }
#else
fputs("pahole: Multithreading requires elfutils >= 0.178. Continuing with a single thread...\n", stderr);
#endif
pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "alsa-ucm-conf";
version = "1.2.8";
version = "1.2.9";
src = fetchurl {
url = "mirror://alsa/lib/${pname}-${version}.tar.bz2";
hash = "sha256-/uSnN4MP0l+WnYPaRqKyMb6whu/ZZvzAfSJeeCMmCug=";
hash = "sha256-N09oM7/XfQpGdeSqK/t53v6FDlpGpdRUKkWWL0ueJyo=";
};
dontBuild = true;
pkgs/servers/sql/postgresql/default.nix
+10 -10
View File
@@ -290,45 +290,45 @@ let
mkPackages = self: {
postgresql_11 = self.callPackage generic {
version = "11.19";
version = "11.20";
psqlSchema = "11.1"; # should be 11, but changing it is invasive
hash = "sha256-ExCeK3HxE5QFwnIB2jczphrOcu4cIo2cnwMg4GruFMI=";
hash = "sha256-PXyIgvZKfphTSgRCV9/uerrXelt9oSUI2F1yK5i1rM4=";
this = self.postgresql_11;
thisAttr = "postgresql_11";
inherit self;
};
postgresql_12 = self.callPackage generic {
version = "12.14";
version = "12.15";
psqlSchema = "12";
hash = "sha256-eFYQI304LIQtNW40cTjljAb/6uJA5swLUqxevMMNBD4=";
hash = "sha256-u1IG4oZMHEV5k4uW6mCW0VXyKr8tLMKqV1cePEyxKzY=";
this = self.postgresql_12;
thisAttr = "postgresql_12";
inherit self;
};
postgresql_13 = self.callPackage generic {
version = "13.10";
version = "13.11";
psqlSchema = "13";
hash = "sha256-W7z1pW2FxE86iwWPtGhi/0nLyRg00H4pXQLm3jwhbfI=";
hash = "sha256-SZL/ZHIDVmtnDU5U3FMXSZomhWyTV20OqVG99r7lC/s=";
this = self.postgresql_13;
thisAttr = "postgresql_13";
inherit self;
};
postgresql_14 = self.callPackage generic {
version = "14.7";
version = "14.8";
psqlSchema = "14";
hash = "sha256-zvYPAJj6gQHBVG9CVORbcir1QxM3lFs3ryBwB2MNszE=";
hash = "sha256-OdOPADBzftA4Nd6+7+47N9M1RizkmV4kl7w41iHr5Fo=";
this = self.postgresql_14;
thisAttr = "postgresql_14";
inherit self;
};
postgresql_15 = self.callPackage generic {
version = "15.2";
version = "15.3";
psqlSchema = "15";
hash = "sha256-maIXH8PWtbX1a3V6ejy4XVCaOOQnOAXe8jlB7SuEaMc=";
hash = "sha256-/8fUiR8A/79cP06rf7vO2EYLjA7mPFpRZxM7nmWZ2TI=";
this = self.postgresql_15;
thisAttr = "postgresql_15";
inherit self;
pkgs/servers/x11/xorg/default.nix
+3 -3
View File
@@ -1453,11 +1453,11 @@ self: with self; {
# THIS IS A GENERATED FILE. DO NOT EDIT!
libxcvt = callPackage ({ stdenv, pkg-config, fetchurl, meson, ninja }: stdenv.mkDerivation {
pname = "libxcvt";
version = "0.1.1";
version = "0.1.2";
builder = ./builder.sh;
src = fetchurl {
url = "mirror://xorg/individual/lib/libxcvt-0.1.1.tar.xz";
sha256 = "0acc7vrj5kfb19zvyl7f29rnsvx383dvwc19k70r8prm1lccxsr7";
url = "mirror://xorg/individual/lib/libxcvt-0.1.2.tar.xz";
sha256 = "0f6vf47lay9y288n8yg9ckjgz5ypn2hnp03ipp7javkr8h2njq85";
};
hardeningDisable = [ "bindnow" "relro" ];
strictDeps = true;
pkgs/servers/x11/xorg/tarballs.list
+1 -1
View File
@@ -180,7 +180,7 @@ mirror://xorg/individual/lib/libXaw-1.0.14.tar.bz2
mirror://xorg/individual/lib/libxcb-1.14.tar.xz
mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2
mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2
mirror://xorg/individual/lib/libxcvt-0.1.1.tar.xz
mirror://xorg/individual/lib/libxcvt-0.1.2.tar.xz
mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2
mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2