From 47cb5ed04395c21cff120dff227a963ea0e8309e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 19 Apr 2024 18:37:20 -0400 Subject: [PATCH 1/9] libcxxrt: Add multiple outputs Good to keep headers out of closure, even if there is just one. --- pkgs/development/libraries/libcxxrt/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix index c18e699eaf86..84416d2cd585 100644 --- a/pkgs/development/libraries/libcxxrt/default.nix +++ b/pkgs/development/libraries/libcxxrt/default.nix @@ -13,9 +13,11 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; + outputs = [ "out" "dev" ]; + installPhase = '' - mkdir -p $out/include $out/lib - cp ../src/cxxabi.h $out/include + mkdir -p $dev/include $out/lib + cp ../src/cxxabi.h $dev/include cp lib/libcxxrt${stdenv.hostPlatform.extensions.library} $out/lib ''; From 45c1d2a3ae2d96709c1109bb2359e70d1a3f5c3d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 27 Apr 2024 22:02:26 +0100 Subject: [PATCH 2/9] imagemagick: 7.1.1-30 -> 7.1.1-32 Changes: - https://github.com/ImageMagick/ImageMagick/releases/tag/7.1.1-31 - https://github.com/ImageMagick/ImageMagick/releases/tag/7.1.1-32 --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index a42ab93900cb..c15af9d94fb2 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -50,13 +50,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-30"; + version = "7.1.1-32"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-btXl1J/WjV+5BZibgUzylVmBrhR3KBK/ZSbP0B2fM5c="; + hash = "sha256-9pDxnUNMmrwnP4rrR41OSZOJZjQnlVvedpLvMZJJnJo="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 0891baa02c67c890750ab057177a1f7100597546 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 15:18:52 +0800 Subject: [PATCH 3/9] python3Packages.cramjam: nixfmt-rfc-style and modernization --- .../python-modules/cramjam/default.nix | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index 7a799429907e..3139849c4111 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, rustPlatform -, stdenv -, libiconv -, hypothesis -, numpy -, pytest-xdist -, pytestCheckHook +{ + lib, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + stdenv, + libiconv, + hypothesis, + numpy, + pytest-xdist, + pytestCheckHook, }: buildPythonPackage rec { @@ -43,17 +44,11 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ - "cramjam-python/tests" - ]; + pytestFlagsArray = [ "cramjam-python/tests" ]; - disabledTestPaths = [ - "cramjam-python/benchmarks/test_bench.py" - ]; + disabledTestPaths = [ "cramjam-python/benchmarks/test_bench.py" ]; - pythonImportsCheck = [ - "cramjam" - ]; + pythonImportsCheck = [ "cramjam" ]; meta = with lib; { description = "Thin Python bindings to de/compression algorithms in Rust"; From e29d56c597082214349a64b3ddb2b037b7995b9a Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 15:19:49 +0800 Subject: [PATCH 4/9] python3Packages.cramjam: 2.8.2 -> 2.8.3 --- pkgs/development/python-modules/cramjam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cramjam/default.nix b/pkgs/development/python-modules/cramjam/default.nix index 3139849c4111..da4fec24f36b 100644 --- a/pkgs/development/python-modules/cramjam/default.nix +++ b/pkgs/development/python-modules/cramjam/default.nix @@ -13,19 +13,19 @@ buildPythonPackage rec { pname = "cramjam"; - version = "2.8.2"; + version = "2.8.3"; pyproject = true; src = fetchFromGitHub { owner = "milesgranger"; repo = "pyrus-cramjam"; rev = "refs/tags/v${version}"; - hash = "sha256-BO35s7qOW4+l968I9qn9L1m2BtgRFNYUNlA7W1sctT8="; + hash = "sha256-1KD5/oZjfdXav1ZByQoyyiDSzbmY4VJsSJg/FtUFdDE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-YWXf+ZDJLq6VxI5sa9G63fCPz2377BVSTmPM0mQSu8M="; + hash = "sha256-Bp7EtyuLdLUfU3yvouNVE42klfqYt9QOwt+iGe521yI="; }; buildAndTestSubdir = "cramjam-python"; From b625fa97d11af40e1f78fa4e282986dd3c4c2ee7 Mon Sep 17 00:00:00 2001 From: Guillaume Matheron Date: Tue, 14 May 2024 11:20:20 +0200 Subject: [PATCH 5/9] maintainers: add guillaumematheron --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 789da06a6adc..9d4a9812549f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7777,6 +7777,12 @@ githubId = 10654650; name = "Guillaume Koenig"; }; + guillaumematheron = { + email = "guillaume_nix@matheron.eu"; + github = "guillaumematheron"; + githubId = 1949438; + name = "Guillaume Matheron"; + }; guitargeek = { email = "jonas.rembser@cern.ch"; github = "guitargeek"; From da485837092cd59bcdc58715194a413e07fe6b3f Mon Sep 17 00:00:00 2001 From: Guillaume Matheron Date: Tue, 14 May 2024 11:20:50 +0200 Subject: [PATCH 6/9] jailer: init at 16.1.4 Jailer is a tool for database subsetting and relational data browsing --- pkgs/by-name/ja/jailer/package.nix | 83 ++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 pkgs/by-name/ja/jailer/package.nix diff --git a/pkgs/by-name/ja/jailer/package.nix b/pkgs/by-name/ja/jailer/package.nix new file mode 100644 index 000000000000..867d813b1f41 --- /dev/null +++ b/pkgs/by-name/ja/jailer/package.nix @@ -0,0 +1,83 @@ +{ + lib, + ant, + copyDesktopItems, + fetchFromGitHub, + jdk, + jre, + makeDesktopItem, + makeWrapper, + stdenv, + stripJavaArchivesHook, + wrapGAppsHook4, +}: +stdenv.mkDerivation (finalAttrs: { + name = "jailer"; + version = "16.1.4"; + + src = fetchFromGitHub { + owner = "Wisser"; + repo = "Jailer"; + rev = "dcde48b2e0c7b68cc1b6f73c80fde06fdf31fdc6"; + sha256 = "sha256-cPOWW2z44vCc/Fw1zYZUsYafgKr82e0g+K0Db5A9F5M="; + }; + + + buildPhase = '' + runHook preBuild + rm jailer.jar + ant + runHook postBuild + ''; + + nativeBuildInputs = [ ant jdk stripJavaArchivesHook makeWrapper wrapGAppsHook4 copyDesktopItems ]; + + installPhase = '' + runHook preInstall + + install -Dm644 jailer.jar $out/share/java/jailer.jar + install -Dm644 jailer-engine-${finalAttrs.version}.jar $out/share/java/ + mkdir -p $out/share/java/lib + for f in lib/*.jar; do + install -Dm644 $f $out/share/java/lib + done + + mkdir -p $out/bin + mkdir -p $out/share + mkdir -p $out/share/pixmaps + cp driverlist.csv $out/share + cp admin/jailer.png $out/share/pixmaps + + # On first run, create a local configuration folder and copy driverlist.csv there. + cat << EOF > $out/bin/jailer + #!/usr/bin/env bash + CFG="''${XDG_CONFIG_HOME:-\$HOME/.config}/jailer" + mkdir -p \$CFG + cp -n $out/share/driverlist.csv \$CFG + cd \$CFG + _JAVA_AWT_WM_NONREPARENTING=1 ${jre}/bin/java -jar $out/share/java/jailer.jar + EOF + chmod +x $out/bin/jailer + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "Jailer"; + desktopName = "Jailer"; + exec = "jailer"; + icon = "jailer"; + categories = [ "Development" ]; + }) + ]; + + meta = { + description = "A tool for database subsetting and relational data browsing"; + license = lib.licenses.asl20; + homepage = "https://github.com/Wisser/Jailer"; + changelog = "https://github.com/Wisser/Jailer/releases/tag/${finalAttrs.version}"; + maintainers = with lib.maintainers; [ guillaumematheron ]; + mainProgram = "jailer"; + }; +}) From 2292d443699fa2169bfd28ef0bb8bb8bfdf49602 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 19:25:04 +0000 Subject: [PATCH 7/9] ast-grep: 0.21.4 -> 0.22.3 --- pkgs/by-name/as/ast-grep/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 35d2ebdf835d..4e001f3445a6 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ast-grep"; - version = "0.21.4"; + version = "0.22.3"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; rev = version; - hash = "sha256-qoQUc+qMKptCxgW6Yfc2umhSsn27vv1SvcvjCFeuIrA="; + hash = "sha256-Q2xVB9GZBtXx67rKpeTpy1llXCBpgn9vdZmYkQVHtp8="; }; - cargoHash = "sha256-acgGz8FToQDlSuxge0hvApk4SOxQ74mMvx0A2+zv65o="; + cargoHash = "sha256-0N98WvNLlflNCu7I2nHDSgFHDmbMVqwu4YkqA9GNSwM="; nativeBuildInputs = [ installShellFiles ]; From 9401e087e2a485560dd67f60db0457bf5e7dce67 Mon Sep 17 00:00:00 2001 From: lucasew Date: Tue, 14 May 2024 22:49:41 -0300 Subject: [PATCH 8/9] linux: fix issue in config generation on lqx kernel Signed-off-by: lucasew --- pkgs/os-specific/linux/kernel/common-config.nix | 2 +- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 62922d442697..84090cba867e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -876,7 +876,7 @@ let ZRAM_MULTI_COMP = whenAtLeast "6.2" yes; ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes; ZSWAP = option yes; - ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" yes; + ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (mkOptionDefault yes); ZPOOL = yes; ZSMALLOC = option yes; }; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 1f36e36c2335..d2e32e4b09a7 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -84,8 +84,8 @@ let SCHED_PDS = yes; # Swap storage is compressed with LZ4 using zswap - ZSWAP_COMPRESSOR_DEFAULT_LZ4 = yes; - ZSWAP_COMPRESSOR_DEFAULT = freeform "lz4"; + ZSWAP_COMPRESSOR_DEFAULT_LZ4 = lib.mkOptionDefault yes; + ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkDefault no; # Fix error: unused option: XXX. CFS_BANDWIDTH = lib.mkForce (option no); From cb4678361a0cf41a886153ae23075bf6ba902071 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 14 May 2024 22:03:13 +0200 Subject: [PATCH 9/9] gnutls: fix an upstream regression in RSA certificates The update to 3.8.5 involved adding a feature to conditionally disable RSAES-PKCS1-v1.5 [1]. It was intended to be turned on by default [2], but failed [3]. Therefore it is disabled, which in turn throws a new error: "Fatal error: The encryption algorithm is not supported". (error 113). This can have severe implications, as for example Lets Encrypt signed RSA certificates aren't trusted anymore. This commit fetches the upstream patch, which hasn't been included in 3.8.5 [1]: https://gitlab.com/gnutls/gnutls/-/merge_requests/1828 [2]: https://gitlab.com/gnutls/gnutls/-/merge_requests/1828/diffs#cd5a2ba3b145c1bd292e027ef84c618b6b7fb895_267_274 [3]: https://gitlab.com/gnutls/gnutls/-/issues/1540 Signed-off-by: Florian Brandes --- pkgs/development/libraries/gnutls/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 13bdb921ef71..b527c0d3c333 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -85,6 +85,16 @@ stdenv.mkDerivation rec { revert = true; hash = "sha256-r/+Gmwqy0Yc1LHL/PdPLXlErUBC5JxquLzCBAN3LuRM="; }) + # Makes the system-wide configuration for RSAES-PKCS1-v1_5 actually apply + # and makes it enabled by default when the config file is missing + # Without this an error 113 is thrown when using some RSA certificates + # see https://gitlab.com/gnutls/gnutls/-/issues/1540 + # "This is pretty sever[e], since it breaks on letsencrypt-issued RSA keys." (comment from above issue) + (fetchpatch2 { + name = "fix-rsaes-pkcs1-v1_5-system-wide-configuration.patch"; + url = "https://gitlab.com/gnutls/gnutls/-/commit/2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d.diff"; + hash = "sha256-2aWcLff9jzJnY+XSqCIaK/zdwSLwkNlfDeMlWyRShN8="; + }) ]; # Skip some tests: