From dda789409e32aa58c43b737b7299f4c309b43ca9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 11 May 2023 00:49:05 +0200 Subject: [PATCH 01/20] python310Packages.sqlalchemy: 2.0.9 -> 2.0.13 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_10 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_11 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_12 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_2_0_13 --- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 691b67df1696b..a8bd111f26df6 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -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 =[ From bff6c67911ed74cf560bd2b00fb1da32bd2fed63 Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Tue, 2 May 2023 13:38:52 +0100 Subject: [PATCH 02/20] python.pipInstallHook: avoid producing wrong direct_url.json file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When installing many python packages, a `direct_url.json` file appeared in the lib directory. Example: ```sh ➤ nix build nixpkgs/29755fec55e58a315b517d431b2be261772f2b80#python3Packages.flask ➤ cat result/lib/python3.10/site-packages/Flask-2.2.3.dist-info/direct_url.json {"archive_info": {}, "url": "file:///build/Flask-2.2.3/dist/Flask-2.2.3-py3-none-any.whl"}⏎ ``` As you can see, that file contains a wrong reference to `/build`. In https://discuss.python.org/t/pep-610-usage-guidelines-for-linux-distributions/4012/4 there's an explanation on how to avoid this. Here, I'm implementing that change for nixpkgs. @moduon MT-1075 --- .../development/interpreters/python/hooks/pip-install-hook.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh index a4f08b8b14cbd..f6fae14aa8d3a 100644 --- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh @@ -10,9 +10,7 @@ pipInstallPhase() { mkdir -p "$out/@pythonSitePackages@" export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" - pushd dist || return 1 - @pythonInterpreter@ -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags - popd || return 1 + @pythonInterpreter@ -m pip install $pname --find-links dist --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags runHook postInstall echo "Finished executing pipInstallPhase" From c56299151cbbd9804f6a2e5aac3364355d9a9baf Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 May 2023 16:44:27 +0200 Subject: [PATCH 03/20] postgresql_11: 11.19 -> 11.20 https://www.postgresql.org/docs/release/11.20/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 48b94841548ec..7a3f67c51d1cd 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -290,9 +290,9 @@ 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; From b201c295c73892f7d607e78174a64a2f45d5e609 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 May 2023 16:44:43 +0200 Subject: [PATCH 04/20] postgresql_12: 12.14 -> 12.15 https://www.postgresql.org/docs/release/12.15/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 7a3f67c51d1cd..0c56fe73189a4 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -299,9 +299,9 @@ let }; 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; From 370e6c896d2cd9a596bd849a99f6a16da6971e2d Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 May 2023 16:44:58 +0200 Subject: [PATCH 05/20] postgresql_13: 13.10 -> 13.11 https://www.postgresql.org/docs/release/13.11/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 0c56fe73189a4..b10b6dee9ba64 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -308,9 +308,9 @@ let }; 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; From 08b80543669b063db79bb1202220006c2e945de4 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 May 2023 16:45:14 +0200 Subject: [PATCH 06/20] postgresql_14: 14.7 -> 14.8 https://www.postgresql.org/docs/release/14.8/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b10b6dee9ba64..89355efc68d73 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -317,9 +317,9 @@ let }; 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; From 3abafec08f228c6c592c8d7f8b449dff00bdb702 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 11 May 2023 16:45:25 +0200 Subject: [PATCH 07/20] postgresql_15: 15.2 -> 15.3 https://www.postgresql.org/docs/release/15.3/ --- pkgs/servers/sql/postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 89355efc68d73..2d91ad167c76a 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -326,9 +326,9 @@ let }; 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; From 813f263511ae4382881f48b8ae15bb1fad27e6e4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 08/20] grpc: 1.54.0 -> 1.54.2 https://github.com/grpc/grpc/releases/tag/v1.54.1 https://github.com/grpc/grpc/releases/tag/v1.54.2 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 1ff8df9e58b79..7ba6ec214cd04 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -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; }; From d4cc1658d9b3a6485af5d326b2845573700a032a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 09/20] python310Packages.grpcio-tools: 1.54.0 -> 1.54.2 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 938fd43619c46..6012a9eb135c5 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -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 = '' From 26f6badb14b4d6c7c5e36cd4a67396a0fb006353 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 10/20] bundler: 2.4.12 -> 2.4.13 Diff: https://github.com/rubygems/rubygems/compare/bundler-v2.4.12...bundler-v2.4.13 Changelog: https://github.com/rubygems/rubygems/releases/tag/bundler-v2.4.13 --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 4e807716a776e..774e29e49d068 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -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 = '' From 2093048e1de653966bcb55eef812687725234f56 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 11/20] python310Packages.grpcio-status: 1.54.0 -> 1.54.2 --- pkgs/development/python-modules/grpcio-status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix index e6c4ec584e34f..27a2fb54da8d7 100644 --- a/pkgs/development/python-modules/grpcio-status/default.nix +++ b/pkgs/development/python-modules/grpcio-status/default.nix @@ -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 = '' From a9610a4dde74873fc039e50170e40b4270ff2cec Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 13 May 2023 04:20:00 +0000 Subject: [PATCH 12/20] ruby.rubygems: 3.4.12 -> 3.4.13 Diff: https://github.com/rubygems/rubygems/compare/v3.4.12...v3.4.13 Changelog: https://github.com/rubygems/rubygems/releases/tag/v3.4.13 --- pkgs/development/interpreters/ruby/rubygems/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 4577d6d33b37b..34c49cea90216 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -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 = [ From 27ce8eb0d1a5c2c9a9d181c748d52892d98555f4 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Mon, 2 Jan 2023 01:47:17 -0500 Subject: [PATCH 13/20] python3.pkgs.wrapt: build offline documentation X-Reverse-Dependencies: python3.pkgs.aiobotocore --- pkgs/development/python-modules/wrapt/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index 590100c3006db..268f2775d5cf9 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -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" ]; From 7212cbc712093bf212d96011503ccd18578f7689 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 13 May 2023 16:06:23 +0300 Subject: [PATCH 14/20] xorg.libxcvt: 0.1.1 -> 0.1.2 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 0f9aeee3e6998..d6c98e86d4102 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -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; diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index a20aac1cc1ef8..84237b44c0de2 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -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 From e1daacf987d6064bd7dc65a30e7715990bc1c011 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 14 May 2023 04:10:20 +0200 Subject: [PATCH 15/20] pahole: patch to force single-threaded mode if reproducibility is desired pahole's processes DWARF -> BTF in a pseudo-random order if multi threading is enabled (default in the Linux kernel). This can be fixed in dependent derivation by making sure users don't ever pass "-j" or "-j N", but it seems easier and safer to just detect whether reprodubility is desired (by proxy: if SOURCE_DATE_EPOCH is set) and ignore the multi-threading flag. --- pkgs/development/tools/misc/pahole/default.nix | 2 ++ .../pahole/threading-reproducibility.patch | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/tools/misc/pahole/threading-reproducibility.patch diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 03b2a194d6397..8b8d4e8c6e2f3 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -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" ]; diff --git a/pkgs/development/tools/misc/pahole/threading-reproducibility.patch b/pkgs/development/tools/misc/pahole/threading-reproducibility.patch new file mode 100644 index 0000000000000..15893ce2d035c --- /dev/null +++ b/pkgs/development/tools/misc/pahole/threading-reproducibility.patch @@ -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 From 6cac1dec78a3adb1629ae7f5124aa4e46953ba1e Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 May 2023 19:11:00 +0300 Subject: [PATCH 16/20] alsa-ucm-conf: 1.2.8 -> 1.2.9 --- pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix index 4568ecf1e7a8b..75ec2932c8904 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-ucm-conf/default.nix @@ -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; From 73df46ee7794def95ae22affff53dfc0bd14e5db Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sun, 14 May 2023 20:39:41 +0200 Subject: [PATCH 17/20] ruby_3_0: make it use OpenSSL 3 Ruby 3.0 pretend they don't support OpenSSL3 out of the box (https://bugs.ruby-lang.org/issues/18658). Actually, they suggest to install a OpenSSL 3.x gem. This is what we are doing. Our Ruby 3.0 will probably exhibit slight incompatibilities, in exchange, we get nice security. --- .../development/interpreters/ruby/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b9032b60c1bf7..fda798ec454d2 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -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 = '' From f04278458be6f92d0a84605308b077438b968764 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 17 May 2023 12:19:52 +0200 Subject: [PATCH 18/20] Revert "python.pipInstallHook: avoid producing wrong direct_url.json file" Certain packages were failing since this was merged. https://github.com/NixOS/nixpkgs/pull/229472#issuecomment-1544410416 This reverts commit bff6c67911ed74cf560bd2b00fb1da32bd2fed63. --- .../development/interpreters/python/hooks/pip-install-hook.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh index f6fae14aa8d3a..a4f08b8b14cbd 100644 --- a/pkgs/development/interpreters/python/hooks/pip-install-hook.sh +++ b/pkgs/development/interpreters/python/hooks/pip-install-hook.sh @@ -10,7 +10,9 @@ pipInstallPhase() { mkdir -p "$out/@pythonSitePackages@" export PYTHONPATH="$out/@pythonSitePackages@:$PYTHONPATH" - @pythonInterpreter@ -m pip install $pname --find-links dist --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags + pushd dist || return 1 + @pythonInterpreter@ -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache $pipInstallFlags + popd || return 1 runHook postInstall echo "Finished executing pipInstallPhase" From 45a55711fe12d0aada3aa04746082cf1b83dfbf3 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 May 2023 13:57:32 +0300 Subject: [PATCH 19/20] libcamera: 0.0.3 -> 0.0.5 --- pkgs/development/libraries/libcamera/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcamera/default.nix b/pkgs/development/libraries/libcamera/default.nix index b2ac4fa0aafd7..a502bc0d79620 100644 --- a/pkgs/development/libraries/libcamera/default.nix +++ b/pkgs/development/libraries/libcamera/default.nix @@ -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" ]; From 8c4008db557249d7b655c6fca46dc16db6e5e5c0 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 May 2023 13:51:57 +0300 Subject: [PATCH 20/20] pipewire: 0.3.70 -> 0.3.71 Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/0.3.70...0.3.71 --- .../pipewire/0060-libjack-path.patch | 26 +++++++++++++++++++ .../libraries/pipewire/default.nix | 6 +++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/pipewire/0060-libjack-path.patch diff --git a/pkgs/development/libraries/pipewire/0060-libjack-path.patch b/pkgs/development/libraries/pipewire/0060-libjack-path.patch new file mode 100644 index 0000000000000..7fde3dbb8faac --- /dev/null +++ b/pkgs/development/libraries/pipewire/0060-libjack-path.patch @@ -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; diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 8f74140ec68ac..dbd4951f3ddb2 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -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