From a5cd82587fc2c3dc30fc1361380dc2cf4157dccb Mon Sep 17 00:00:00 2001 From: Ivy Fan-Chiang Date: Tue, 4 Feb 2025 19:20:11 -0500 Subject: [PATCH 001/449] detect-it-easy: add missing yara rules into package --- pkgs/by-name/de/detect-it-easy/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix index df1eeece456a..ba20cccd88d9 100644 --- a/pkgs/by-name/de/detect-it-easy/package.nix +++ b/pkgs/by-name/de/detect-it-easy/package.nix @@ -51,9 +51,8 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/icons ''; - # clean up wrongly created dirs in `install.sh` and broken .desktop file postInstall = '' - grep -v "Version=#VERSION#" $src/LINUX/die.desktop > $out/share/applications/die.desktop + cp -r $src/XYara/yara_rules $out/lib/die/ ''; meta = { From 4a0453277bbafa001855cb925b31652445238d68 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Mon, 10 Feb 2025 21:44:02 +0100 Subject: [PATCH 002/449] doc/php: use buildComposerProject2 --- doc/languages-frameworks/php.section.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 1bcb4ee727a5..bc37034fafe5 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -182,7 +182,7 @@ code, while others choose not to. In Nix, there are multiple approaches to building a Composer-based project. -One such method is the `php.buildComposerProject` helper function, which serves +One such method is the `php.buildComposerProject2` helper function, which serves as a wrapper around `mkDerivation`. Using this function, you can build a PHP project that includes both a @@ -217,19 +217,19 @@ To customize the PHP version, you can specify the `php` attribute. Similarly, if you wish to modify the Composer version, use the `composer` attribute. It is important to note that both attributes should be of the `derivation` type. -Here's an example of working code example using `php.buildComposerProject`: +Here's an example of working code example using `php.buildComposerProject2`: ```nix { php, fetchFromGitHub }: -php.buildComposerProject (finalAttrs: { +php.buildComposerProject2 (finalAttrs: { pname = "php-app"; version = "1.0.0"; src = fetchFromGitHub { owner = "git-owner"; repo = "git-repo"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8="; }; From 352d98d37e6e941d0f2f84109663eab59a8dc0a3 Mon Sep 17 00:00:00 2001 From: LionsTech Date: Wed, 26 Feb 2025 23:22:59 +0100 Subject: [PATCH 003/449] texmacs: Apply patch to fix compile error with clang 19.5 --- pkgs/applications/editors/texmacs/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index 329c0f5a8893..b5b9026f0140 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -20,6 +20,7 @@ qtbase, qtsvg, qtmacextras, + fetchpatch, ghostscriptX ? null, extraFonts ? false, chineseFonts ? false, @@ -79,6 +80,14 @@ stdenv.mkDerivation { qtmacextras ]; + patches = [ + (fetchpatch { + name = "fix-compile-clang-19.5.patch"; + url = "https://github.com/texmacs/texmacs/commit/e72783b023f22eaa0456d2e4cc76ae509d963672.patch"; + hash = "sha256-oJCiXWTY89BdxwbgtFvfThid0WM83+TAUThSihfr0oA="; + }) + ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeFeature "TEXMACS_GUI" "Qt") (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "./TeXmacs.app/Contents/Resources") From d3e7821e8f5963cda82926a4cf87a34df7e6d39c Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Tue, 11 Mar 2025 21:27:42 +0800 Subject: [PATCH 004/449] qwertone: init at 0.5.0 --- pkgs/by-name/qw/qwertone/package.nix | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/qw/qwertone/package.nix diff --git a/pkgs/by-name/qw/qwertone/package.nix b/pkgs/by-name/qw/qwertone/package.nix new file mode 100644 index 000000000000..9ecd2f0dc3d9 --- /dev/null +++ b/pkgs/by-name/qw/qwertone/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + wrapGAppsHook3, + pkg-config, + alsa-lib, + atk, + gtk3, +}: + +rustPlatform.buildRustPackage rec { + pname = "qwertone"; + version = "0.5.0"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "azymohliad"; + repo = "qwertone"; + tag = "v${version}"; + hash = "sha256-GD7iFDAaS6D7DGPvK+Cof4rVbUwPX9aCI1jfc0XTxn8="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-5hrjmX+eUPrj48Ii1YHPZFPMvynowSwSArcNnUOw4hc="; + + nativeBuildInputs = [ + wrapGAppsHook3 + pkg-config + ]; + + buildInputs = [ + alsa-lib + atk + gtk3 + ]; + + meta = { + description = "Simple music synthesizer app based on usual qwerty-keyboard for input"; + mainProgram = "qwertone"; + homepage = "https://gitlab.com/azymohliad/qwertone"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ linsui ]; + }; +} From db4da0362f2f8983e9380e7fbf5eb1b90fafee44 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 27 Mar 2025 10:49:00 +0000 Subject: [PATCH 005/449] fheroes2: 1.1.6 -> 1.1.7 Changes: https://github.com/ihhub/fheroes2/releases/tag/1.1.7 --- pkgs/by-name/fh/fheroes2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix index dbe215a34360..628566cecad1 100644 --- a/pkgs/by-name/fh/fheroes2/package.nix +++ b/pkgs/by-name/fh/fheroes2/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-CowCP+gZuGSXWbALYBkmyn+RlDgOGho/Px34GutrBX0="; + hash = "sha256-PXh8yPalXQ91roSzvWXLnHVgjz7unyWytR1x3bvh2OU="; }; nativeBuildInputs = [ imagemagick ]; From 7b7f0508e83f07fd48d07796585cc7d16489f961 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Thu, 27 Mar 2025 08:53:49 +0100 Subject: [PATCH 006/449] pangolin: Use libtiff.out as buildInput, finalAttrs and cmakeBool --- pkgs/development/libraries/pangolin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index c53c31e32c1e..bb9116110454 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -17,14 +17,14 @@ Cocoa, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pangolin"; version = "0.9.1"; src = fetchFromGitHub { owner = "stevenlovegrove"; repo = "Pangolin"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-B5YuNcJZHjR3dlVs66rySi68j29O3iMtlQvCjTUZBeY="; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ffmpeg libjpeg libpng - libtiff + libtiff.out eigen ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { # The tests use cmake's findPackage to find the installed version of # pangolin, which isn't what we want (or available). doCheck = false; - cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_TESTS" false) ]; meta = { description = "Lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input"; @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = lib.platforms.all; }; -} +}) From 3b4d405061e9e1eec53b27944cc6ce9bafe80bc0 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Sat, 29 Mar 2025 18:43:06 +0100 Subject: [PATCH 007/449] mariadb: fix musl build --- pkgs/servers/sql/mariadb/default.nix | 6 +++ .../mariadb/patch/include-cstdint-full.patch | 48 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/servers/sql/mariadb/patch/include-cstdint-full.patch diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 232b10706468..3a8dc0594415 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -120,10 +120,16 @@ let prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt ''; + env = lib.optionalAttrs (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isGnu) { + # MariaDB uses non-POSIX fopen64, which musl only conditionally defines. + NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE"; + }; patches = [ ./patch/cmake-includedir.patch + # patch for musl compatibility + ./patch/include-cstdint-full.patch ] # Fixes a build issue as documented on # https://jira.mariadb.org/browse/MDEV-26769?focusedCommentId=206073&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-206073 diff --git a/pkgs/servers/sql/mariadb/patch/include-cstdint-full.patch b/pkgs/servers/sql/mariadb/patch/include-cstdint-full.patch new file mode 100644 index 000000000000..b2697df992af --- /dev/null +++ b/pkgs/servers/sql/mariadb/patch/include-cstdint-full.patch @@ -0,0 +1,48 @@ +diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h +index f356395..3215221 100644 +--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h ++++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include + #include + #include + +diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h +index a761be6..064d059 100644 +--- a/storage/rocksdb/rocksdb/util/string_util.h ++++ b/storage/rocksdb/rocksdb/util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include + #include + #include + #include +diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +index c7f93b4..3c2ab80 100644 +--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h ++++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +@@ -8,6 +8,7 @@ + #pragma once + #ifndef ROCKSDB_LITE + ++#include + #include + #include + #include "rocksdb/status.h" +diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h +index 963c1d8..8d70309 100644 +--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h ++++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h +@@ -6,6 +6,7 @@ + #pragma once + + #include "rocksdb/rocksdb_namespace.h" ++#include + + struct CompactionIterationStats { + // Compaction statistics From 80c81eaba50ad8575d943dc806b0f2c4575122e5 Mon Sep 17 00:00:00 2001 From: Benedikt Ritter Date: Tue, 1 Apr 2025 09:43:02 +0200 Subject: [PATCH 008/449] gammastep: 2.0.9 -> 2.0.11 --- pkgs/applications/misc/redshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 31e866d0e7c5..63957b2bd4ea 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -180,13 +180,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.9"; + version = "2.0.11"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; + hash = "sha256-c8JpQLHHLYuzSC9bdymzRTF6dNqOLwYqgwUOpKcgAEU="; }; meta = redshift.meta // { From 805d682ff865dc1b8eea6b2bfbc14ddc3d04c97c Mon Sep 17 00:00:00 2001 From: Nobody_alias_N <165517462+Nobody-alias-N@users.noreply.github.com> Date: Wed, 2 Apr 2025 14:36:16 +0300 Subject: [PATCH 009/449] slade: 3.2.6 -> 3.2.7 --- pkgs/games/doom-ports/slade/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/doom-ports/slade/default.nix b/pkgs/games/doom-ports/slade/default.nix index 6db8e8dd2a91..99418f2499ea 100644 --- a/pkgs/games/doom-ports/slade/default.nix +++ b/pkgs/games/doom-ports/slade/default.nix @@ -8,7 +8,7 @@ zip, wxGTK, gtk3, - sfml, + sfml_2, fluidsynth, curl, freeimage, @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "slade"; - version = "3.2.6"; + version = "3.2.7"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; rev = version; - hash = "sha256-pcWmv1fnH18X/S8ljfHxaL1PjApo5jyM8W+WYn+/7zI="; + hash = "sha256-+i506uzO2q/9k7en6CKs4ui9gjszrMOYwW+V9W5Lvns="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK gtk3 - sfml + sfml_2 fluidsynth curl freeimage @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { ) ''; - meta = with lib; { + meta = { description = "Doom editor"; homepage = "http://slade.mancubus.net/"; - license = licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754 - platforms = platforms.linux; - maintainers = with maintainers; [ abbradar ]; + license = lib.licenses.gpl2Only; # https://github.com/sirjuddington/SLADE/issues/1754 + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ abbradar ]; }; } From c7c19affe4118ba7243418f2ae6ee303e4432f45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Apr 2025 02:05:54 +0000 Subject: [PATCH 010/449] libpg_query: 17-6.0.0 -> 17-6.1.0 --- pkgs/by-name/li/libpg_query/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libpg_query/package.nix b/pkgs/by-name/li/libpg_query/package.nix index fd39d60da250..c25f12819f2a 100644 --- a/pkgs/by-name/li/libpg_query/package.nix +++ b/pkgs/by-name/li/libpg_query/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation rec { pname = "libpg_query"; - version = "17-6.0.0"; + version = "17-6.1.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; tag = version; - hash = "sha256-hwF3kowuMmc1eXMdvhoCpBxT6++wp29MRYhy4S5Jhfg="; + hash = "sha256-UXba2WYyIO7RcFcNZeLL+Q9CwlloMZ5oFfHfL7+j4dU="; }; nativeBuildInputs = [ which ]; From 981347707cbaedaa0e31a3a87927cb728cf3e6a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Apr 2025 12:34:28 +0000 Subject: [PATCH 011/449] wt: 4.11.3 -> 4.11.4 --- pkgs/development/libraries/wt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 57e7b8fb80a4..58fa61e9dd20 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -80,7 +80,7 @@ let in { wt4 = generic { - version = "4.11.3"; - sha256 = "sha256-YEzuif+8DACSVu2U4uaLncvE1WaVonJVnCf2rAc/sUc="; + version = "4.11.4"; + sha256 = "sha256-ynmOUONHo8VTq8nmD+/SpDPR7bHILw8mArvY2DZJ5Hk="; }; } From 4d08719e992fe16c698286a38b2300aa31f7ab09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Apr 2025 00:54:39 +0000 Subject: [PATCH 012/449] libsolv: 0.7.31 -> 0.7.32 --- pkgs/by-name/li/libsolv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix index d332ebfc0358..c3dfd2d3bf2e 100644 --- a/pkgs/by-name/li/libsolv/package.nix +++ b/pkgs/by-name/li/libsolv/package.nix @@ -18,14 +18,14 @@ }: stdenv.mkDerivation rec { - version = "0.7.31"; + version = "0.7.32"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - hash = "sha256-3HOW3bip+0LKegwO773upeKKLiLv7JWUGEJcFiH0lcw="; + hash = "sha256-2cvba2S/3CR+3sMLVEnmTxWYTQSAYZoUIoQHr+GZnyY="; }; cmakeFlags = From fc85ed9d2516cd3013f19b8f23053d896354a9f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Apr 2025 06:41:49 +0000 Subject: [PATCH 013/449] cilium-cli: 0.18.2 -> 0.18.3 --- pkgs/by-name/ci/cilium-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index 09560bf7b55f..c2630a055d44 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "cilium"; repo = "cilium-cli"; tag = "v${version}"; - hash = "sha256-/R91MFE7JYutq8mOKpzLNPlt42R86dOZGJs4EOkLfKU="; + hash = "sha256-9+nNZEXjSoNB/Ftn/CtoBcR/uaD71C1jzDEaEG3Wpb4="; }; nativeBuildInputs = [ installShellFiles ]; From d000a1a5101cb40c8e1fb349fe9a6ca933025fcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Apr 2025 09:49:42 +0000 Subject: [PATCH 014/449] sd-local: 1.0.57 -> 1.0.58 --- pkgs/by-name/sd/sd-local/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sd/sd-local/package.nix b/pkgs/by-name/sd/sd-local/package.nix index 374efe41885a..7c3adcdc7a4f 100644 --- a/pkgs/by-name/sd/sd-local/package.nix +++ b/pkgs/by-name/sd/sd-local/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.57"; + version = "1.0.58"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CBEdE15lAMMawTsfc45ptHsC2AbqFP6v4/nnktytwvc="; + sha256 = "sha256-7nL+9tJt4EnGGIhsGASXdBp0u7PXbbt50ADdK2Ciel0="; }; - vendorHash = "sha256-rAFfyMlnhDrb+f04S9+hNygXPaoG9mheQMxaJtXxBVw="; + vendorHash = "sha256-CcVb2ugvKzl/HTtub4iq81u7hps7Q5a1e1e+T5t13hY="; subPackages = [ "." ]; From 6ce0214b71e3ee33a095da15492d058412eb4b76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Apr 2025 13:12:53 +0000 Subject: [PATCH 015/449] libsfdo: 0.1.3 -> 0.1.4 --- pkgs/by-name/li/libsfdo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsfdo/package.nix b/pkgs/by-name/li/libsfdo/package.nix index 2095b8a4efce..650bf2778629 100644 --- a/pkgs/by-name/li/libsfdo/package.nix +++ b/pkgs/by-name/li/libsfdo/package.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libsfdo"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "vyivel"; repo = "libsfdo"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-9jCfCIB07mmJ6aWQHvXaxYhEMNikUw/W1xrpmh6FKbo="; + hash = "sha256-xT1pKKElwKSd43XTKuBY+9rogquV1IAAYgWV5lEpAHk="; }; strictDeps = true; From d371cf4e683308d7f99b58b22cda2a3ad8407c03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Apr 2025 13:53:20 +0000 Subject: [PATCH 016/449] okteta: 0.26.20 -> 0.26.21 --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 9a3f9e0bab1e..e371605d341f 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -19,11 +19,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.20"; + version = "0.26.21"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-lKGjIeNxdBqmlsXvZTe8BnRirt+VrxwX/9CCQVVUuow="; + sha256 = "sha256-tuYvcfcxdX1nzTR603rEYIgXLEjnZH3mDRJUD/BVRJs="; }; nativeBuildInputs = [ From 47224a34dec8540e1f389e8bb9e7b1aed58a5e54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Apr 2025 15:09:55 +0000 Subject: [PATCH 017/449] zile: 2.6.3 -> 2.6.4 --- pkgs/by-name/zi/zile/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix index 3df263375833..c90fdfba6c5a 100644 --- a/pkgs/by-name/zi/zile/package.nix +++ b/pkgs/by-name/zi/zile/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "zile"; - version = "2.6.3"; + version = "2.6.4"; src = fetchurl { url = "mirror://gnu/zile/${pname}-${version}.tar.gz"; - hash = "sha256-ZnILBiwVCiqW+igx9Vz5XfohycLWwEh/qSpaHkB0AG8="; + hash = "sha256-1dRLhctJBkPQcH4aIYbzoymYwvbquqlIFHm2XK7uV8A="; }; buildInputs = [ From 5d0f8e24c845e14f487b98c866c131a5083f1c17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Apr 2025 15:44:39 +0000 Subject: [PATCH 018/449] clementine: 1.4.1-37-g3369f3085 -> 1.4.1-38-g1fc7fe0e1 --- pkgs/applications/audio/clementine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index a236c6867994..c1f74200b426 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clementine"; - version = "1.4.1-37-g3369f3085"; + version = "1.4.1-38-g1fc7fe0e1"; src = fetchFromGitHub { owner = "clementine-player"; repo = "Clementine"; tag = finalAttrs.version; - hash = "sha256-zwt4PkCXVYJn8IsZL0JEJLX1LiAvDrNdhh0s2oDxGgY="; + hash = "sha256-KV3au25iZ2W9tufNbaI0+UCeLjoJR5Um1U3Gmlk0O2s="; }; nativeBuildInputs = [ From 11ebec927ba52ee933e1766f0aa7a6fcdc2bf688 Mon Sep 17 00:00:00 2001 From: provokateurin Date: Fri, 4 Apr 2025 13:36:50 +0200 Subject: [PATCH 019/449] octodns-ddns: init at 0.2.1 --- .../octodns/providers/ddns/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/tools/networking/octodns/providers/ddns/default.nix diff --git a/pkgs/tools/networking/octodns/providers/ddns/default.nix b/pkgs/tools/networking/octodns/providers/ddns/default.nix new file mode 100644 index 000000000000..d03bf30653b8 --- /dev/null +++ b/pkgs/tools/networking/octodns/providers/ddns/default.nix @@ -0,0 +1,53 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + octodns, + pytestCheckHook, + setuptools, + requests, +}: +buildPythonPackage rec { + pname = "octodns-ddns"; + version = "0.2.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-ddns"; + tag = "v${version}"; + hash = "sha256-n4dTkJT5UmmEqtN5x2zkJe7NQtjXz3gPwwFnOmMIfIs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + octodns + requests + ]; + + postPatch = '' + substituteInPlace tests/test_octodns_source_ddns.py \ + --replace-fail "assertEquals" "assertEqual" + ''; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ + "octodns_ddns" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Simple Dynamic DNS source for octoDNS"; + homepage = "https://github.com/octodns/octodns-ddns"; + changelog = "https://github.com/octodns/octodns-ddns/blob/${src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.provokateurin ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11a44028da68..887368fa1b7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -435,6 +435,7 @@ with pkgs; hetzner = python3Packages.callPackage ../tools/networking/octodns/providers/hetzner { }; powerdns = python3Packages.callPackage ../tools/networking/octodns/providers/powerdns { }; cloudflare = python3Packages.callPackage ../tools/networking/octodns/providers/cloudflare { }; + ddns = python3Packages.callPackage ../tools/networking/octodns/providers/ddns { }; }; oletools = with python3.pkgs; toPythonApplication oletools; From 5bf1a06583f272a1924b0c92724f32f43de96758 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 4 Apr 2025 19:26:27 +0000 Subject: [PATCH 020/449] mongodb-compass: 1.45.4 -> 1.46.0 --- pkgs/by-name/mo/mongodb-compass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index ac3cdc8fe8ff..890ac0aca6b9 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -34,7 +34,7 @@ }: let - version = "1.45.4"; + version = "1.46.0"; rpath = lib.makeLibraryPath [ alsa-lib @@ -84,7 +84,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - hash = "sha256-q+nEMJ6GtWNPKqYdab6DXWGTgRmmLWvG3qcR9tRi9YY="; + hash = "sha256-cwhYiV5G8GRBT7MST20MPUxEMQM1mzxlLUfzGO6jv10="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From 2ef5f112f98d4c93b80c36019fb88cc1cc91c8e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Apr 2025 01:36:56 +0000 Subject: [PATCH 021/449] skaffold: 2.14.2 -> 2.15.0 --- pkgs/by-name/sk/skaffold/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sk/skaffold/package.nix b/pkgs/by-name/sk/skaffold/package.nix index b8e77c385d51..e26a7182db93 100644 --- a/pkgs/by-name/sk/skaffold/package.nix +++ b/pkgs/by-name/sk/skaffold/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "skaffold"; - version = "2.14.2"; + version = "2.15.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-iw9SYoepa2QjKnSaqFkIxuU5dcsLcR7S13kPh5S2Jyw="; + hash = "sha256-hZBIWiH7zxdfK8+QiaeJwz1aq9Xa0Ojy2R4LKk3ALIY="; }; vendorHash = null; From eb325dd24c2b90eb6507b60278f17bfc9b8d44ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Apr 2025 12:33:16 +0000 Subject: [PATCH 022/449] datamash: 1.8 -> 1.9 --- pkgs/by-name/da/datamash/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/da/datamash/package.nix b/pkgs/by-name/da/datamash/package.nix index abd51be89721..6a0acde45e2f 100644 --- a/pkgs/by-name/da/datamash/package.nix +++ b/pkgs/by-name/da/datamash/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "datamash"; - version = "1.8"; + version = "1.9"; src = fetchurl { url = "mirror://gnu/datamash/datamash-${version}.tar.gz"; - sha256 = "sha256-etl+jH72Ft0DqlvWeuJMSIJy2z59H1d0FhwYt18p9v0="; + sha256 = "sha256-84Lr2gNlDdZ5Fh91j5wKbMkpMhNDjUp3qO2jJarLh9I="; }; meta = with lib; { From 4d5243832db967cb6441b3bca7da5045267abe51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Apr 2025 12:34:21 +0000 Subject: [PATCH 023/449] kernelshark: 2.3.2 -> 2.4.0 --- pkgs/os-specific/linux/trace-cmd/kernelshark.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 74a179d8b2d3..5ab8049a50cf 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "kernelshark"; - version = "2.3.2"; + version = "2.4.0"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/snapshot/kernelshark-v${finalAttrs.version}.tar.gz"; - hash = "sha256-+Vi1Tj42bAxJKgGqVXbCYywqQAdz5y+Zv2hQH8iaJkM="; + hash = "sha256-OT6ClyZRE+pxWwm+sfzvN3CnoCIyxcAiVsi1fdzaT4M="; }; outputs = [ "out" ]; From 3a01cfcb34f92c265a8d9b0bdc5da482a476d3a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Apr 2025 12:34:40 +0000 Subject: [PATCH 024/449] drumkv1: 1.3.0 -> 1.3.1 --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 9f2f4e2437b3..f9e224be71fa 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "drumkv1"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/drumkv1/drumkv1-${version}.tar.gz"; - hash = "sha256-WcWhq1Li9dfj0piyW6F0mdfzcK+nvk5Rtl8pQZTYyt8="; + hash = "sha256-CzboTrMRxPr5O6caKrxW9X9uSi5Su5LRSQpwJBMGkGI="; }; buildInputs = [ From 10d9241cb0dd5e67f0ada6f66f6f7080424c319b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Apr 2025 12:46:29 +0000 Subject: [PATCH 025/449] samplv1: 1.3.0 -> 1.3.1 --- pkgs/applications/audio/samplv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index cbac2c3ee1d3..d47c5c25a189 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "samplv1"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "mirror://sourceforge/samplv1/samplv1-${version}.tar.gz"; - hash = "sha256-ZmRsiFDqJsG28FiFR/RbeXkeeLn2HBfImKQM5PaRF78="; + hash = "sha256-DcMtNGiMJ9YfTKZLns+3mBKHbkG3Ven3IJAU/qSDyh0="; }; nativeBuildInputs = [ From f0c6cb981c4cb1afae190838d19e3e83aa817428 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Apr 2025 18:26:29 +0000 Subject: [PATCH 026/449] anydesk: 6.4.2 -> 6.4.3 --- pkgs/by-name/an/anydesk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix index 6a7f5dd81eae..20db9f9cfd1d 100644 --- a/pkgs/by-name/an/anydesk/package.nix +++ b/pkgs/by-name/an/anydesk/package.nix @@ -34,14 +34,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "anydesk"; - version = "6.4.2"; + version = "6.4.3"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/anydesk-${finalAttrs.version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/anydesk-${finalAttrs.version}-amd64.tar.gz" ]; - hash = "sha256-KJTyIMuKNLymD/DsitN+Rgro7lgkY13fmkFNxsEUkWU="; + hash = "sha256-P90BPUayKG+uYszIQkbYcBg1vObQvueq67HU+su+GSI="; }; buildInputs = From 7ede4e96aa64465a87f0b349c1d739bc58a84096 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Apr 2025 18:40:04 +0000 Subject: [PATCH 027/449] ols: 0-unstable-2025-03-12 -> 0-unstable-2025-04-05 --- pkgs/by-name/ol/ols/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index 50c28b88728b..84ce0297ff80 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2025-03-12"; + version = "0-unstable-2025-04-05"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "1e44e3d78ad8a74ef09c7f54a6f6d3f7df517f8e"; - hash = "sha256-rmKEsRrGvwlPeOKq/NX/775fAw50rdeWqEUqJiNax5k="; + rev = "011b0bdec303783b6ce2a197957effef480ca50d"; + hash = "sha256-uyAxeUI0tKeAauSpOhuPMaqav5ksaawayiFWidInFUI="; }; postPatch = '' From 725bc9085e92cd7922b7f79637e5574955dda74d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 5 Apr 2025 19:23:57 +0000 Subject: [PATCH 028/449] minizip-ng: 4.0.8 -> 4.0.9 --- pkgs/by-name/mi/minizip-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index e585035af33f..21643bc581b2 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.0.8"; + version = "4.0.9"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "minizip-ng"; rev = finalAttrs.version; - hash = "sha256-NFl2R+o1SBXNAt2TOMMsbIh+IHJu78p56caT4h2TDeU="; + hash = "sha256-iAiw+ihVfcSNl6UdBad7FjT5Zwa+brndg60v7ceCzC8="; }; nativeBuildInputs = [ From 9e044e724d7bc7a686077124619b39ebf843b077 Mon Sep 17 00:00:00 2001 From: Haylin Moore Date: Sat, 5 Apr 2025 17:09:34 -0400 Subject: [PATCH 029/449] goarista: init at 0-unstable-2025-03-24 --- pkgs/by-name/go/goarista/package.nix | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/go/goarista/package.nix diff --git a/pkgs/by-name/go/goarista/package.nix b/pkgs/by-name/go/goarista/package.nix new file mode 100644 index 000000000000..87f68addd919 --- /dev/null +++ b/pkgs/by-name/go/goarista/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule { + pname = "goarista"; + version = "0-unstable-2025-03-24"; + + src = fetchFromGitHub { + owner = "aristanetworks"; + repo = "goarista"; + rev = "2af7f36a2220911d96d9d5cf8dee641a7c01eb07"; + hash = "sha256-M/gZVn4ioaxRwbqlee3yeRfWIjaG6mFq2Z+XL5mGjoA="; + }; + + vendorHash = "sha256-5vdVHTQOXsYc8EdEGEAXk2ZX/6o88gHxBzfwETcwXvA="; + + checkFlags = + let + skippedTests = [ + "TestDeepSizeof" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDialTCPTimeoutWithTOS" ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + meta = { + description = "Collection of open-source tools for network management and monitoring mostly based around gNMI"; + homepage = "https://github.com/aristanetworks/goarista"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.haylin ]; + mainProgram = "gnmi"; + }; +} From 27e17c30073fb64f72f0dab17cf13d439da82e16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Apr 2025 00:39:47 +0000 Subject: [PATCH 030/449] lombok: 1.18.36 -> 1.18.38 --- pkgs/by-name/lo/lombok/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/lombok/package.nix b/pkgs/by-name/lo/lombok/package.nix index dea367c79860..3f92609bd9eb 100644 --- a/pkgs/by-name/lo/lombok/package.nix +++ b/pkgs/by-name/lo/lombok/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "lombok"; - version = "1.18.36"; + version = "1.18.38"; src = fetchurl { url = "https://projectlombok.org/downloads/lombok-${version}.jar"; - sha256 = "sha256-c7awW2otNltwC6sI0w+U3p0zZJC8Cszlthgf70jL8Y4="; + sha256 = "sha256-Hh5CfDb/Y8RP0w7yktnnc+oxVEYKtiZdP+1+b1vFD7k="; }; nativeBuildInputs = [ makeWrapper ]; From 5b77ad31e54402746d1d2899267a5e15aaed900a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Apr 2025 04:36:25 +0000 Subject: [PATCH 031/449] openimagedenoise: 2.3.2 -> 2.3.3 --- pkgs/by-name/op/openimagedenoise/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openimagedenoise/package.nix b/pkgs/by-name/op/openimagedenoise/package.nix index b15816eefc19..7bdfe8e24f14 100644 --- a/pkgs/by-name/op/openimagedenoise/package.nix +++ b/pkgs/by-name/op/openimagedenoise/package.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "openimagedenoise"; - version = "2.3.2"; + version = "2.3.3"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/RenderKit/oidn/releases/download/v${finalAttrs.version}/oidn-${finalAttrs.version}.src.tar.gz"; - sha256 = "sha256-yTa6U/1idfidbfNTQ7mXcroe7M4eM7Frxi45A/7e2A8="; + sha256 = "sha256-JzAd47fYGLT6DeOep8Wag29VY9HOTpqf0OSv1v0kGQU="; }; patches = lib.optional cudaSupport ./cuda.patch; From baf2d3e27f4f12b997d53579f17f6d8b885dd892 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Sun, 6 Apr 2025 20:04:21 +0900 Subject: [PATCH 032/449] nixos/maddy: add package option --- nixos/modules/services/mail/maddy.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix index 41d25eaf7885..b086f319c136 100644 --- a/nixos/modules/services/mail/maddy.nix +++ b/nixos/modules/services/mail/maddy.nix @@ -143,6 +143,8 @@ in enable = lib.mkEnableOption "Maddy, a free an open source mail server"; + package = lib.mkPackageOption pkgs "maddy" { }; + user = lib.mkOption { default = "maddy"; type = with lib.types; uniq str; @@ -386,7 +388,7 @@ in systemd = { - packages = [ pkgs.maddy ]; + packages = [ cfg.package ]; services = { maddy = { serviceConfig = { @@ -402,16 +404,16 @@ in script = '' ${lib.optionalString (cfg.ensureAccounts != [ ]) '' ${lib.concatMapStrings (account: '' - if ! ${pkgs.maddy}/bin/maddyctl imap-acct list | grep "${account}"; then - ${pkgs.maddy}/bin/maddyctl imap-acct create ${account} + if ! ${cfg.package}/bin/maddyctl imap-acct list | grep "${account}"; then + ${cfg.package}/bin/maddyctl imap-acct create ${account} fi '') cfg.ensureAccounts} ''} ${lib.optionalString (cfg.ensureCredentials != { }) '' ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (name: cfg: '' - if ! ${pkgs.maddy}/bin/maddyctl creds list | grep "${name}"; then - ${pkgs.maddy}/bin/maddyctl creds create --password $(cat ${lib.escapeShellArg cfg.passwordFile}) ${name} + lib.mapAttrsToList (name: credentials: '' + if ! ${cfg.package}/bin/maddyctl creds list | grep "${name}"; then + ${cfg.package}/bin/maddyctl creds create --password $(cat ${lib.escapeShellArg credentials.passwordFile}) ${name} fi '') cfg.ensureCredentials )} @@ -486,7 +488,7 @@ in }; environment.systemPackages = [ - pkgs.maddy + cfg.package ]; }; } From 1d5b9ec60259232cb31849df570e06d3e15a711e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Apr 2025 12:08:18 +0000 Subject: [PATCH 033/449] cyme: 2.1.2 -> 2.1.3 --- pkgs/by-name/cy/cyme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index e231f25a9f01..748be9e0bfae 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "cyme"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${version}"; - hash = "sha256-KAHCeM1rAPGi98PrcVJtzkhTWGWFwf37VuSQTjqXSEg="; + hash = "sha256-7V/MExL1OJ+mBPlLcYiK6HTjvbHbIbrf13Rak+Za3d4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LwBTDBrsigt8H6PFuuGndiMlj5d8v68dyHipVYOGKVk="; + cargoHash = "sha256-4QxxwCBiPYd83rKEcoRJhHhQArzq9oQ287UBVrjbElg="; nativeBuildInputs = [ From 4567e55d048b0afc778a4ee7757fac16106f924f Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sun, 6 Apr 2025 09:32:40 -0700 Subject: [PATCH 034/449] lixPackageSets.nix-eval-jobs: add `nix` passthru attribute nix-eval-jobs is intimately tied to a specific Nix/Lix release and the Nix specific version includes a passthru attribute so downstream users can easily refer to it. Propagating the same pattern for the Lix version allows it to more readily be used as a drop in replacement. --- .../tools/package-management/lix/common-nix-eval-jobs.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix index d3be7a626d97..8206dc355127 100644 --- a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix +++ b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix @@ -40,6 +40,14 @@ stdenv.mkDerivation { # point 'nix edit' and ofborg at the file that defines the attribute, # not this common file. pos = builtins.unsafeGetAttrPos "version" args; + + # Since this package is intimately tied to a specific Nix release, we + # propagate the Nix used for building it to make it easier for users + # downstream to reference it. + passthru = { + nix = lix; + }; + meta = { description = "Hydra's builtin `hydra-eval-jobs` as a standalone tool"; mainProgram = "nix-eval-jobs"; From ec37d701e602c16caaaa014020448b2224f8bfb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Apr 2025 23:04:54 +0000 Subject: [PATCH 035/449] moonraker: 0.9.3-unstable-2025-03-26 -> 0.9.3-unstable-2025-04-03 --- pkgs/by-name/mo/moonraker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix index 750640084665..91d874092568 100644 --- a/pkgs/by-name/mo/moonraker/package.nix +++ b/pkgs/by-name/mo/moonraker/package.nix @@ -35,13 +35,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "moonraker"; - version = "0.9.3-unstable-2025-03-26"; + version = "0.9.3-unstable-2025-04-03"; src = fetchFromGitHub { owner = "Arksine"; repo = "moonraker"; - rev = "b90c96524cd4aa5579ebc9899fd7812c1e756d86"; - sha256 = "sha256-oXdZdSoxfDNGR2n1L41zAG1aRzxeLTHtTmIUe2nWu/I="; + rev = "7cdcca3cb4b7caf27d511d1c4e32fa3297391709"; + sha256 = "sha256-fjmbmv+0y/NsgvrscaA2gv9Tv8esWiMpbA35LuzFfFg="; }; nativeBuildInputs = [ makeWrapper ]; From 610208c59ca411f6354e02411d5ad7b5155e2538 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Apr 2025 23:34:39 +0000 Subject: [PATCH 036/449] texturepacker: 7.6.1 -> 7.6.2 --- pkgs/by-name/te/texturepacker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/texturepacker/package.nix b/pkgs/by-name/te/texturepacker/package.nix index e178b5b5e866..d588dc53ddad 100644 --- a/pkgs/by-name/te/texturepacker/package.nix +++ b/pkgs/by-name/te/texturepacker/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "texturepacker"; - version = "7.6.1"; + version = "7.6.2"; src = fetchurl { url = "https://www.codeandweb.com/download/texturepacker/${finalAttrs.version}/TexturePacker-${finalAttrs.version}.deb"; - hash = "sha256-e824tHi9vTxhGbIxg5BPWgb3nBt5ZA2XgtkM7g3Y5Rw="; + hash = "sha256-CJtUWxjleojjK+LljDbdhSH2FNQfVGMkif/XDRW1Y/k="; }; nativeBuildInputs = [ From 477902ed94e344446f8049e3272d5da56644e8fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Apr 2025 00:43:28 +0000 Subject: [PATCH 037/449] openscap: 1.4.1 -> 1.4.2 --- pkgs/by-name/op/openscap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openscap/package.nix b/pkgs/by-name/op/openscap/package.nix index 92df65d4a402..34776269a5ca 100644 --- a/pkgs/by-name/op/openscap/package.nix +++ b/pkgs/by-name/op/openscap/package.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "openscap"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "OpenSCAP"; repo = "openscap"; rev = version; - hash = "sha256-omPGm3VSLmwEIzInIORLfJf7wreRyxbDOXTRl05mAz0="; + hash = "sha256-AOldgYS8qMOLB/Nm2/O0obdDOrefSrubTETb50f3Gv8="; }; strictDeps = true; From ce1d697158636642c982f244cc827c0ee8033740 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Apr 2025 12:41:43 +0000 Subject: [PATCH 038/449] valijson: 1.0.4 -> 1.0.5 --- pkgs/by-name/va/valijson/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/valijson/package.nix b/pkgs/by-name/va/valijson/package.nix index a558e5c410f6..56080eb000f2 100644 --- a/pkgs/by-name/va/valijson/package.nix +++ b/pkgs/by-name/va/valijson/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "valijson"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "tristanpenman"; repo = "valijson"; rev = "v${version}"; - hash = "sha256-nIXcS8PMKoo8D616uUZ+GdIbkGb3VGSlCvg7QqZtz20="; + hash = "sha256-f/pYJTvtSXtAmVbKWQfcz/jGSdj7Yt2HNvlCFHx871Q="; }; nativeBuildInputs = [ From 916d31a390cb5874d95a215f4fb67c0a83924028 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Apr 2025 13:41:03 +0000 Subject: [PATCH 039/449] ibus-engines.m17n: 1.4.35 -> 1.4.36 --- pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 1f8f443adc22..892cc9ea6202 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.35"; + version = "1.4.36"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-+pNECooSLFqTRkijJiU4a3NpTnDNL9qzhkMp6gSq4XY="; + sha256 = "sha256-K7grmYROFRwdmYWiWNRv8TnEUpOie1W8Glx9BP6Orzc="; }; nativeBuildInputs = [ From fe66309160e0c99cdcbfab63a0a18f57a4568079 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Apr 2025 15:04:07 +0000 Subject: [PATCH 040/449] aaaaxy: 1.6.64 -> 1.6.176 --- pkgs/by-name/aa/aaaaxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index 6ac9ace5603f..c77a65855dda 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -22,17 +22,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.6.64"; + version = "1.6.176"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-0geit1ZDsNOPhpdmOeT1xSnQ3oitMiMY14zoGG8hsGU="; + hash = "sha256-LukI+FgM2gtKp2/3ySJ0FT6lTlBYTh400GFC5NK7S8I="; fetchSubmodules = true; }; - vendorHash = "sha256-1osdAkUMmkBoLpKhoESUh2URMi3OYhLfRs+N9fDnnKQ="; + vendorHash = "sha256-bw2Zk4vHzVaXdKwYJF+DkfJefxJlZKlFlh5LGcgkZBY="; buildInputs = [ alsa-lib From 69876877ee6836de0eb3e50e61a6b97cd01acc2a Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Mon, 7 Apr 2025 18:53:54 +0200 Subject: [PATCH 041/449] havn: use finalAttrs pattern --- pkgs/by-name/ha/havn/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 704a7415e350..17d5da0a683c 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -4,14 +4,14 @@ rustPlatform, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "havn"; version = "0.2.1"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SXsCJzKfm77/IH3H7L5STylusmlN9DN4xd12Vt6L3TM="; }; @@ -29,10 +29,10 @@ rustPlatform.buildRustPackage rec { meta = { homepage = "https://github.com/mrjackwills/havn"; description = "Fast configurable port scanner with reasonable defaults"; - changelog = "https://github.com/mrjackwills/havn/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/mrjackwills/havn/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; mainProgram = "havn"; platforms = lib.platforms.linux; }; -} +}) From 322c5fdc578d7b9ef136cfa8e69b49806b1be509 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Apr 2025 18:38:41 +0000 Subject: [PATCH 042/449] uclibc-ng: 1.0.51 -> 1.0.52 --- pkgs/by-name/uc/uclibc-ng/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix index 1a72587e147d..e733701f5e62 100644 --- a/pkgs/by-name/uc/uclibc-ng/package.nix +++ b/pkgs/by-name/uc/uclibc-ng/package.nix @@ -64,11 +64,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "uclibc-ng"; - version = "1.0.51"; + version = "1.0.52"; src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz"; - hash = "sha256-NITIx6BQPAj35fp0c8mHQUBQcm8x6Fk9AtmE9RLRoMs="; + hash = "sha256-iB2kc3hPlcyCkLsHgMCvyBDKKNV14z1a/V5xU7KaoTY="; }; # 'ftw' needed to build acl, a coreutils dependency From bb4be9a474c87dd9366eca69fa8e2f0aa16fcc83 Mon Sep 17 00:00:00 2001 From: Heitor Augusto Date: Thu, 27 Feb 2025 16:27:32 -0300 Subject: [PATCH 043/449] lib.strings: init splitStringBy --- lib/default.nix | 1 + lib/strings.nix | 91 ++++++++++++++++++++++++++++++++++++++++++++ lib/tests/misc.nix | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+) diff --git a/lib/default.nix b/lib/default.nix index 19316addb8cb..c433ca6a3e09 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -347,6 +347,7 @@ let toSentenceCase addContextFrom splitString + splitStringBy removePrefix removeSuffix versionOlder diff --git a/lib/strings.nix b/lib/strings.nix index d281120cad7f..70f3a6cc8a25 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -1588,6 +1588,97 @@ rec { in map (addContextFrom s) splits; + /** + Splits a string into substrings based on a predicate that examines adjacent characters. + + This function provides a flexible way to split strings by checking pairs of characters + against a custom predicate function. Unlike simpler splitting functions, this allows + for context-aware splitting based on character transitions and patterns. + + # Inputs + + `predicate` + : Function that takes two arguments (previous character and current character) + and returns true when the string should be split at the current position. + For the first character, previous will be "" (empty string). + + `keepSplit` + : Boolean that determines whether the splitting character should be kept as + part of the result. If true, the character will be included at the beginning + of the next substring; if false, it will be discarded. + + `str` + : The input string to split. + + # Return + + A list of substrings from the original string, split according to the predicate. + + # Type + + ``` + splitStringBy :: (string -> string -> bool) -> bool -> string -> [string] + ``` + + # Examples + :::{.example} + ## `lib.strings.splitStringBy` usage example + + Split on periods and hyphens, discarding the separators: + ```nix + splitStringBy (prev: curr: builtins.elem curr [ "." "-" ]) false "foo.bar-baz" + => [ "foo" "bar" "baz" ] + ``` + + Split on transitions from lowercase to uppercase, keeping the uppercase characters: + ```nix + splitStringBy (prev: curr: builtins.match "[a-z]" prev != null && builtins.match "[A-Z]" curr != null) true "fooBarBaz" + => [ "foo" "Bar" "Baz" ] + ``` + + Handle leading separators correctly: + ```nix + splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ".foo.bar.baz" + => [ "" "foo" "bar" "baz" ] + ``` + + Handle trailing separators correctly: + ```nix + splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo.bar.baz." + => [ "foo" "bar" "baz" "" ] + ``` + ::: + */ + splitStringBy = + predicate: keepSplit: str: + let + len = stringLength str; + + # Helper function that processes the string character by character + go = + pos: currentPart: result: + # Base case: reached end of string + if pos == len then + result ++ [ currentPart ] + else + let + currChar = substring pos 1 str; + prevChar = if pos > 0 then substring (pos - 1) 1 str else ""; + isSplit = predicate prevChar currChar; + in + if isSplit then + # Split here - add current part to results and start a new one + let + newResult = result ++ [ currentPart ]; + newCurrentPart = if keepSplit then currChar else ""; + in + go (pos + 1) newCurrentPart newResult + else + # Keep building current part + go (pos + 1) (currentPart + currChar) result; + in + if len == 0 then [ (addContextFrom str "") ] else map (addContextFrom str) (go 0 "" [ ]); + /** Return a string without the specified prefix, if the prefix matches. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index f5f1fb5e7c2d..f9f2b0264b9e 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -631,6 +631,101 @@ runTests { ]; }; + testSplitStringBySimpleDelimiter = { + expr = strings.splitStringBy ( + prev: curr: + builtins.elem curr [ + "." + "-" + ] + ) false "foo.bar-baz"; + expected = [ + "foo" + "bar" + "baz" + ]; + }; + + testSplitStringByLeadingDelimiter = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ".foo.bar.baz"; + expected = [ + "" + "foo" + "bar" + "baz" + ]; + }; + + testSplitStringByTrailingDelimiter = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo.bar.baz."; + expected = [ + "foo" + "bar" + "baz" + "" + ]; + }; + + testSplitStringByMultipleConsecutiveDelimiters = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false "foo...bar"; + expected = [ + "foo" + "" + "" + "bar" + ]; + }; + + testSplitStringByKeepingSplitChar = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) true "foo.bar.baz"; + expected = [ + "foo" + ".bar" + ".baz" + ]; + }; + + testSplitStringByCaseTransition = { + expr = strings.splitStringBy ( + prev: curr: builtins.match "[a-z]" prev != null && builtins.match "[A-Z]" curr != null + ) true "fooBarBaz"; + expected = [ + "foo" + "Bar" + "Baz" + ]; + }; + + testSplitStringByEmptyString = { + expr = strings.splitStringBy (prev: curr: builtins.elem curr [ "." ]) false ""; + expected = [ "" ]; + }; + + testSplitStringByComplexPredicate = { + expr = strings.splitStringBy ( + prev: curr: + prev != "" + && curr != "" + && builtins.match "[0-9]" prev != null + && builtins.match "[a-z]" curr != null + ) true "123abc456def"; + expected = [ + "123" + "abc456" + "def" + ]; + }; + + testSplitStringByUpperCaseStart = { + expr = strings.splitStringBy (prev: curr: builtins.match "[A-Z]" curr != null) true "FooBarBaz"; + expected = [ + "" + "Foo" + "Bar" + "Baz" + ]; + }; + testEscapeShellArg = { expr = strings.escapeShellArg "esc'ape\nme"; expected = "'esc'\\''ape\nme'"; From 4ed08cd55609ca9908fed4a5008b4180f4ee21be Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Mon, 7 Apr 2025 18:39:05 +0200 Subject: [PATCH 044/449] loadwatch: 1.1-1 -> 1.1-4 - fixes build by lifting https://github.com/NixOS/nixpkgs/pull/396704 upstream --- pkgs/by-name/lo/loadwatch/package.nix | 30 +++++++++++++-------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/lo/loadwatch/package.nix b/pkgs/by-name/lo/loadwatch/package.nix index 95990bc5190d..d3db7c30cd5b 100644 --- a/pkgs/by-name/lo/loadwatch/package.nix +++ b/pkgs/by-name/lo/loadwatch/package.nix @@ -1,28 +1,26 @@ { lib, stdenv, - fetchgit, + fetchFromSourcehut, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "loadwatch"; - version = "1.1-1-g6d2544c"; + version = "1.1-4-g868bd29"; - src = fetchgit { - url = "git://woffs.de/git/fd/loadwatch.git"; - sha256 = "1bhw5ywvhyb6snidsnllfpdi1migy73wg2gchhsfbcpm8aaz9c9b"; - rev = "6d2544c0caaa8a64bbafc3f851e06b8056c30e6e"; + src = fetchFromSourcehut { + owner = "~woffs"; + repo = "loadwatch"; + hash = "sha256-/4kfGdpYJWQyb7mRaVUpyQQC5VP96bDsBDfM3XhcJXw="; + rev = finalAttrs.version; }; - installPhase = '' - mkdir -p $out/bin - install loadwatch lw-ctl $out/bin - ''; + makeFlags = [ "bindir=$(out)/bin" ]; - meta = with lib; { + meta = { description = "Run a program using only idle cycles"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ woffs ]; - platforms = platforms.all; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ woffs ]; + platforms = lib.platforms.all; }; -} +}) From 04c631f4515c10d3280a7d6ed004668dfbb5b4fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 01:34:03 +0000 Subject: [PATCH 045/449] mathmod: 12.0 -> 12.1 --- pkgs/by-name/ma/mathmod/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mathmod/package.nix b/pkgs/by-name/ma/mathmod/package.nix index 09f295b0c0dd..2eec8e24f29d 100644 --- a/pkgs/by-name/ma/mathmod/package.nix +++ b/pkgs/by-name/ma/mathmod/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mathmod"; - version = "12.0"; + version = "12.1"; src = fetchFromGitHub { owner = "parisolab"; repo = "mathmod"; tag = finalAttrs.version; - hash = "sha256-h1iI7bheJVfE2+0m6Yk7QNCkl9Vye97tqb/WkQExVcQ="; + hash = "sha256-gDIYDXI9X24JAM1HP10EhJXkHZV2X8QngD5KPCUqdyI="; }; patches = [ ./fix-paths.patch ]; From dab0193b96c7e826d510c82de1a114eff68fd11a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 06:36:27 +0000 Subject: [PATCH 046/449] museum: 1.0.0 -> 1.0.2 --- pkgs/by-name/mu/museum/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index 94da1e2cf330..bcaf8fed4ddb 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -9,14 +9,14 @@ buildGoModule rec { pname = "museum"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; sparseCheckout = [ "server" ]; rev = "photos-v${version}"; - hash = "sha256-niEySdGebd9SRRha2dYLsAary3to/9tgV5KePg2LdyE="; + hash = "sha256-d66dCTs68sIL6iCV4vDvErER3LAz/SdkqOj0aJBro8k="; }; vendorHash = "sha256-px4pMqeH73Fe06va4+n6hklIUDMbPmAQNKKRIhwv6ec="; From 75c76dd7caba5e7fa6fe8227ef65ba257f3fd853 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 07:26:53 +0000 Subject: [PATCH 047/449] libdwarf-lite: 0.11.1 -> 0.12.0 --- pkgs/by-name/li/libdwarf-lite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdwarf-lite/package.nix b/pkgs/by-name/li/libdwarf-lite/package.nix index 3d5df9741cac..7091ac3f9730 100644 --- a/pkgs/by-name/li/libdwarf-lite/package.nix +++ b/pkgs/by-name/li/libdwarf-lite/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libdwarf-lite"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "jeremy-rifkin"; repo = "libdwarf-lite"; rev = "v${finalAttrs.version}"; - hash = "sha256-qHikjAG5xuuHquqqKGuiDHXVZSlg/MbNp9JNSAKM/Hs="; + hash = "sha256-/E0aUVEhEy1v4wm2/t5wLck93Xb/RrKMIwqFYpi6BLA="; }; outputs = [ From e68ccc1272206cbf762f83450c6f0083644554c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 8 Apr 2025 06:53:58 +0000 Subject: [PATCH 048/449] cockatrice: 2025-03-27-Release-2.10.1 -> 2025-04-03-Release-2.10.2 --- pkgs/games/cockatrice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index 5f12863d9f67..be79a61b87a2 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "cockatrice"; - version = "2025-03-27-Release-2.10.1"; + version = "2025-04-03-Release-2.10.2"; src = fetchFromGitHub { owner = "Cockatrice"; repo = "Cockatrice"; rev = version; - sha256 = "sha256-vM12ufqoItlDeYXHhyN3Jkqm+chGgm9gB4xtIdDbI94="; + sha256 = "sha256-zXAK830SdGT3xN3ST8h9LLy/oWr4MH6TZf57gLfI0e8="; }; buildInputs = [ From 563c329bedb084e49f6bc11da2bde02982169cff Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 8 Apr 2025 21:06:03 +0200 Subject: [PATCH 049/449] calibre: unbreak on aarch64-linux After `onnxruntime` was updated to v1.21.0 the `piper-tts` started failing inside the nixbld due to the missing `/sys` directory. This is likely related to . --- pkgs/by-name/ca/calibre/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 97927b9289ea..a862150743a5 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -219,6 +219,7 @@ stdenv.mkDerivation (finalAttrs: { $ETN 'test_qt' # we don't include svg or webp support $ETN 'test_import_of_all_python_modules' # explores actual file paths, gets confused $ETN 'test_websocket_basic' # flakey + ${lib.optionalString stdenv.hostPlatform.isAarch64 "$ETN 'test_piper'"} # https://github.com/microsoft/onnxruntime/issues/10038 ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"} ) From 3ecaffe3b70a85bea1d3b2d0afa3bb60be2da01e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 12:51:16 +0000 Subject: [PATCH 050/449] gyroflow: 1.6.0 -> 1.6.1 --- pkgs/by-name/gy/gyroflow/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gy/gyroflow/package.nix b/pkgs/by-name/gy/gyroflow/package.nix index fb237ac6fbbb..20aefb13e919 100644 --- a/pkgs/by-name/gy/gyroflow/package.nix +++ b/pkgs/by-name/gy/gyroflow/package.nix @@ -25,18 +25,18 @@ let in rustPlatform.buildRustPackage rec { pname = "gyroflow"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "gyroflow"; repo = "gyroflow"; tag = "v${version}"; - hash = "sha256-Ib9GnHN23eTbd3nEwvZf3+CBSkUHycN77o3ura0Ze/0="; + hash = "sha256-RYTT62u39g4n9++xMlhJala6U0uIn+btGOxp9khEAnU="; }; useFetchCargoVendor = true; - cargoHash = "sha256-bqBFAobXwPC4V0OYHbwmkk7shfiFt3YMGAf7F5ybLAQ="; + cargoHash = "sha256-30XSltaw1jzXPpobh0WJ+aIRbdf24nYgnbt7yzuS2gs="; nativeBuildInputs = [ clang From 13b0236723c4e40663e3450876defa90b75eddac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 13:47:26 +0000 Subject: [PATCH 051/449] franz: 5.10.0 -> 5.11.0 --- .../networking/instant-messengers/franz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index e5ba8abc06bd..be7e1f3faf14 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -7,10 +7,10 @@ mkFranzDerivation rec { pname = "franz"; name = "Franz"; - version = "5.10.0"; + version = "5.11.0"; src = fetchurl { url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb"; - sha256 = "sha256-zQhZlxr7kyMWx6txDnV+ECBTzVEwnUaBsLWKJy3XYFg="; + sha256 = "sha256-4+HeH9lY5/2fswSwzMPM1Idllj01zU7nmlLOMYfcSsU="; }; meta = with lib; { description = "Free messaging app that combines chat & messaging services into one application"; From cf05b12351bf5d9c5c2ce2533e2ef856cc3a0484 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 17:40:29 +0000 Subject: [PATCH 052/449] v2ray: 5.29.3 -> 5.30.0 --- pkgs/by-name/v2/v2ray/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix index ba2b1bdd1538..bc8ccd1f2e19 100644 --- a/pkgs/by-name/v2/v2ray/package.nix +++ b/pkgs/by-name/v2/v2ray/package.nix @@ -16,18 +16,18 @@ buildGoModule rec { pname = "v2ray-core"; - version = "5.29.3"; + version = "5.30.0"; src = fetchFromGitHub { owner = "v2fly"; repo = "v2ray-core"; rev = "v${version}"; - hash = "sha256-HCXfyWpwjryFcmk/7uUByqeJzdhJgb1zv1LDREc0k10="; + hash = "sha256-QYnTRMAEzgdzsD0QB29yu0+6prRTD+gH+Zka+cTGlr0="; }; # `nix-update` doesn't support `vendorHash` yet. # https://github.com/Mic92/nix-update/pull/95 - vendorHash = "sha256-D8xOFgnlMSUFeUgRsVWyRbCtKnCLgRJ4e+FlHbaOZKA="; + vendorHash = "sha256-LRMW2MPnffSJD2Oo5U4PvDF9/Ls7mUAJctx7Iavtvd0="; ldflags = [ "-s" From 3f347ef116f9879ffb8414404155231b86d97fac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 18:14:05 +0000 Subject: [PATCH 053/449] console-setup: 1.235 -> 1.236 --- pkgs/by-name/co/console-setup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/console-setup/package.nix b/pkgs/by-name/co/console-setup/package.nix index e5c1e3b231cc..93ac6b899a7c 100644 --- a/pkgs/by-name/co/console-setup/package.nix +++ b/pkgs/by-name/co/console-setup/package.nix @@ -12,14 +12,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "console-setup"; - version = "1.235"; + version = "1.236"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; tag = finalAttrs.version; - hash = "sha256-EGUPj5MesEhC+W6E+8Cute3HtpurwZk0TlcLBReepvI="; + hash = "sha256-b7ck48wRPga/ugCVbPCKRSRrpawIJCsEV1kbNeXDIHk="; }; buildInputs = [ From 49970e5c144279c9d164ed1f0e50e80bd6049bf4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 18:40:55 +0000 Subject: [PATCH 054/449] vitess: 21.0.3 -> 21.0.4 --- pkgs/by-name/vi/vitess/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/vitess/package.nix b/pkgs/by-name/vi/vitess/package.nix index b7366739f6f7..2ac1779863af 100644 --- a/pkgs/by-name/vi/vitess/package.nix +++ b/pkgs/by-name/vi/vitess/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "vitess"; - version = "21.0.3"; + version = "21.0.4"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-ZSxshQF84DjMQsurYhcMObPzzfT63oj8c5Pt9f9N+5Q="; + hash = "sha256-QapbbLZ/wDCKYQW98l780PT4ZEXAbhW0o4Zk2MlG6DQ="; }; - vendorHash = "sha256-S8hYoP8SU4bKkYLTAcF5Al74gSw+b1oxnuaV1dZSyXA="; + vendorHash = "sha256-Bc9rhfGSjqhDQBOPS4noW8qJ4P5xLtVcokRhDbqP3a0="; buildInputs = [ sqlite ]; From 7fce4af214be2b47c7c301ff73a6df50af690394 Mon Sep 17 00:00:00 2001 From: Nurali Aslanbekov Date: Thu, 10 Apr 2025 00:33:19 +0500 Subject: [PATCH 055/449] regname: init at 0.1.0 --- pkgs/by-name/re/regname/package.nix | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/re/regname/package.nix diff --git a/pkgs/by-name/re/regname/package.nix b/pkgs/by-name/re/regname/package.nix new file mode 100644 index 000000000000..77c74957a9a9 --- /dev/null +++ b/pkgs/by-name/re/regname/package.nix @@ -0,0 +1,30 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "regname"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "linkdd"; + repo = "regname"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zKsWEjFMTFibzfZ2dEc+RN74Ih1jr9vJhOUU0gY1rYE="; + }; + + cargoHash = "sha256-6iRDUOXPDzlD11JEL4at+z3aWkhn/dECtl7y2/vGMwo="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Mass renamer TUI written in Rust"; + homepage = "https://github.com/linkdd/regname"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.ilarvne ]; + mainProgram = "regname"; + }; +}) From a3d7610925fc77be4ec5c000b0bf6ebea5e52aea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 9 Apr 2025 23:45:12 +0000 Subject: [PATCH 056/449] suricata: 7.0.9 -> 7.0.10 --- pkgs/by-name/su/suricata/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/su/suricata/package.nix b/pkgs/by-name/su/suricata/package.nix index e03df3fd06f8..81f4a40e76f8 100644 --- a/pkgs/by-name/su/suricata/package.nix +++ b/pkgs/by-name/su/suricata/package.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { pname = "suricata"; - version = "7.0.9"; + version = "7.0.10"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - hash = "sha256-5XspNDx7ahhXyZG9crCzRKuimOThGVM7F56BfampnT0="; + hash = "sha256-GX+SXqcBvctKFaygJLBlRrACZ0zZWLWJWPKaW7IU11k="; }; nativeBuildInputs = From e20dee2e36be01dfbfd02fdbd51b7b08a2dbe357 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 00:56:07 +0000 Subject: [PATCH 057/449] npm-check-updates: 17.1.16 -> 17.1.18 --- pkgs/by-name/np/npm-check-updates/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/np/npm-check-updates/package.nix b/pkgs/by-name/np/npm-check-updates/package.nix index 76deb6572676..28221761874c 100644 --- a/pkgs/by-name/np/npm-check-updates/package.nix +++ b/pkgs/by-name/np/npm-check-updates/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "npm-check-updates"; - version = "17.1.16"; + version = "17.1.18"; src = fetchFromGitHub { owner = "raineorshine"; repo = "npm-check-updates"; rev = "refs/tags/v${version}"; - hash = "sha256-yNo1W+Twzs3jG9bZzgjDLTxvZYCXY/FhoGtjlh6ZMZo="; + hash = "sha256-0aSVYWksOpUL2i0T5Y0CeLU0Nv4tH+0nGSY57LZRNkg="; }; - npmDepsHash = "sha256-8jxuKxL7PEGYqK6kwSPnfmoQH4RLmL8sGi989RDBBSI="; + npmDepsHash = "sha256-/kDeGiUb/zQ7LQU6Lg0YhvdFRccbezJmsEx+A5WEw8w="; postPatch = '' sed -i '/"prepare"/d' package.json From 4bc3f4392375ef1e59bcc9783f64991a92107ea1 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 25 Mar 2025 11:10:08 +0100 Subject: [PATCH 058/449] nixos/dependency-track: fix nginx config for frontend Apparend I fell for some browser cache when implementing this in the first place. This patch is based on the upstream nginx config. https://github.com/DependencyTrack/frontend/blob/5f318aca10f85f1f5d7a91d7627883bd506cc48e/docker/etc/nginx/templates/default.conf.template --- .../services/web-apps/dependency-track.nix | 22 +++++++++++-- nixos/tests/dependency-track.nix | 33 +++++++++++-------- 2 files changed, 39 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/web-apps/dependency-track.nix b/nixos/modules/services/web-apps/dependency-track.nix index 129770926222..32f25e81f242 100644 --- a/nixos/modules/services/web-apps/dependency-track.nix +++ b/nixos/modules/services/web-apps/dependency-track.nix @@ -509,9 +509,27 @@ in upstreams.dependency-track.servers."localhost:${toString cfg.port}" = { }; virtualHosts.${cfg.nginx.domain} = { locations = { - "/".alias = "${cfg.package.frontend}/dist/"; + "/" = { + alias = "${cfg.package.frontend}/dist/"; + index = "index.html"; + tryFiles = "$uri $uri/ /index.html"; + extraConfig = '' + location ~ (index\.html)$ { + add_header Cache-Control "max-age=0, no-cache, no-store, must-revalidate"; + add_header Pragma "no-cache"; + add_header Expires 0; + } + ''; + }; "/api".proxyPass = "http://dependency-track"; - "= /static/config.json".alias = frontendConfigFile; + "= /static/config.json" = { + alias = frontendConfigFile; + extraConfig = '' + add_header Cache-Control "max-age=0, no-cache, no-store, must-revalidate"; + add_header Pragma "no-cache"; + add_header Expires 0; + ''; + }; }; }; }; diff --git a/nixos/tests/dependency-track.nix b/nixos/tests/dependency-track.nix index 088ec8df82e3..baa55e779058 100644 --- a/nixos/tests/dependency-track.nix +++ b/nixos/tests/dependency-track.nix @@ -45,22 +45,27 @@ import ./make-test-python.nix ( }; }; - testScript = '' - import json + testScript = + # python + '' + import json - start_all() + start_all() - server.wait_for_unit("dependency-track.service") - server.wait_until_succeeds( - "journalctl -o cat -u dependency-track.service | grep 'Dependency-Track is ready'" - ) - server.wait_for_open_port(${toString dependencyTrackPort}) - - with subtest("version api returns correct version"): - version = json.loads( - server.succeed("curl http://localhost/api/version") + server.wait_for_unit("dependency-track.service") + server.wait_until_succeeds( + "journalctl -o cat -u dependency-track.service | grep 'Dependency-Track is ready'" ) - assert version["version"] == "${pkgs.dependency-track.version}" - ''; + server.wait_for_open_port(${toString dependencyTrackPort}) + + with subtest("version api returns correct version"): + version = json.loads( + server.succeed("curl http://localhost/api/version") + ) + assert version["version"] == "${pkgs.dependency-track.version}" + + with subtest("nginx serves frontend"): + server.succeed("curl http://localhost/ | grep \"Dependency-Track\"") + ''; } ) From d2cdff2e773fb48b58ca8758c0742beafbcd2ec0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 10 Apr 2025 18:53:48 +0000 Subject: [PATCH 059/449] vassal: 3.7.15 -> 3.7.16 --- pkgs/by-name/va/vassal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix index fc362fb3f874..aa409fef0f06 100644 --- a/pkgs/by-name/va/vassal/package.nix +++ b/pkgs/by-name/va/vassal/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "VASSAL"; - version = "3.7.15"; + version = "3.7.16"; src = fetchzip { url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2"; - sha256 = "sha256-eFFzUssElsLkCLgbojF6VQ8hzn15NYljBH/I7k98LMk="; + sha256 = "sha256-Qg5GqfKXAdCK2LqhkFxAHA5TkTOunvHDwZsNKAEVexc="; }; buildInputs = [ From 98ba69fa5fad49835c6b57e89a0f4608f1e84dba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 00:32:20 +0000 Subject: [PATCH 060/449] fuzzel: 1.11.1 -> 1.12.0 --- pkgs/by-name/fu/fuzzel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fu/fuzzel/package.nix b/pkgs/by-name/fu/fuzzel/package.nix index beb5d346dbcb..bfe63be3ef39 100644 --- a/pkgs/by-name/fu/fuzzel/package.nix +++ b/pkgs/by-name/fu/fuzzel/package.nix @@ -27,14 +27,14 @@ assert (svgSupport && svgBackend == "nanosvg") -> enableCairo; stdenv.mkDerivation (finalAttrs: { pname = "fuzzel"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fuzzel"; rev = finalAttrs.version; - hash = "sha256-FM5HvPfLVmuKpS3/0m2QM/lSRcWsVpnwtJ++L3Uo5Dc="; + hash = "sha256-42a8VF4EUTbyEKcfVSIbTXmPC55+cLq7FX+lRDZKXEM="; }; depsBuildBuild = [ From 24d6c8dd6effdab120b5bda228e3c0347dd0cea3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 00:52:39 +0000 Subject: [PATCH 061/449] eccodes: 2.40.0 -> 2.41.0 --- pkgs/development/libraries/eccodes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index b1b1599e6aad..73e55f8f2979 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.40.0"; + version = "2.41.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - hash = "sha256-9Y1dc5D86Gxism12ubw8TX2abPLl+BRdHVmAiRleUf8="; + hash = "sha256-oUZ4QuEe1/YqL1zBmC4E7sYjmPSWLmugOs52RvMs8nA="; }; postPatch = '' From 59c0f8cc28b2ddb4ce4484504e5895d3577b45be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Apr 2025 01:50:32 +0000 Subject: [PATCH 062/449] rapidyaml: 0.8.0 -> 0.9.0 --- pkgs/by-name/ra/rapidyaml/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix index c7ae5e3f024b..07bc3eee474e 100644 --- a/pkgs/by-name/ra/rapidyaml/package.nix +++ b/pkgs/by-name/ra/rapidyaml/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "rapidyaml"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "biojppm"; repo = "rapidyaml"; fetchSubmodules = true; rev = "v${version}"; - hash = "sha256-5Z1UV8JSgaO4X8+fTEgxD7bzD1igOgiLQMn10c3rCLs="; + hash = "sha256-+ENfflVjeesX14m0G71HdeSIECopZV4J2JL9+c+nbXE="; }; nativeBuildInputs = [ From 8f87b512afd60bfddf9ab72b9918b4036f92e932 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Fri, 11 Apr 2025 12:00:12 +0000 Subject: [PATCH 063/449] nixos/emacs: make systemd report clean exit status when stopping see https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45181 for details --- nixos/modules/services/editors/emacs.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 50bca3596032..65211763e5a2 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -73,7 +73,8 @@ in serviceConfig = { Type = "notify"; ExecStart = "${pkgs.runtimeShell} -c 'source ${config.system.build.setEnvironment}; exec ${cfg.package}/bin/emacs --fg-daemon'"; - ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)"; + # Emacs exits with exit code 15 (SIGTERM), when stopped by systemd. + SuccessExitStatus = 15; Restart = "always"; }; From 47933fc7f3cb243907e367b74753a69993601bce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 00:26:57 +0000 Subject: [PATCH 064/449] mendeley: 2.132.0 -> 2.132.1 --- pkgs/applications/office/mendeley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index be65d30b7376..6e88ab8b0020 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -8,13 +8,13 @@ let pname = "mendeley"; - version = "2.132.0"; + version = "2.132.1"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-d4B+rVwWHKLVgY/aK3E6i6CyQKD4TsxZ/XyKbbCrQE0="; + hash = "sha256-FzniIT3foLbXGQ6Rnmea9MmBs0mXAFDgwv0iu9eX3lM="; }; appimageContents = appimageTools.extractType2 { From 6e27178dcee00ce4ba27f16d76302a371818cab1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 00:37:01 +0000 Subject: [PATCH 065/449] notmuch-bower: 1.1 -> 1.1.1 --- pkgs/by-name/no/notmuch-bower/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/notmuch-bower/package.nix b/pkgs/by-name/no/notmuch-bower/package.nix index 1bb1c050171d..09262d8bfce0 100644 --- a/pkgs/by-name/no/notmuch-bower/package.nix +++ b/pkgs/by-name/no/notmuch-bower/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "notmuch-bower"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "sha256-CqA9JU/ujqIn/NvtbPtSWxKDYCv4oDdLCgbf2jj9Av4="; + sha256 = "sha256-THIMCIk6ugPpogfQ5DTHIgFD7no5IIVYfz2mqBvKBlY="; }; nativeBuildInputs = [ From fbfa10995d8c5fe046583c7965ba4252ee5378e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 00:41:43 +0000 Subject: [PATCH 066/449] debianutils: 5.21 -> 5.22 --- pkgs/by-name/de/debianutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index c6b2c75d88f5..af377878b5f2 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.21"; + version = "5.22"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-wAVXZWSulhA1QlKi52eOlN86b05DAxeSTc4qd6UsJBM="; + hash = "sha256-TcPWQIgCSJWvJiePqEdRK2kju9xDpl6c9+VOagDsOhs="; }; nativeBuildInputs = [ From 1f477bc8607e8c65136112a247ad067686b45ef9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 00:51:21 +0000 Subject: [PATCH 067/449] xsnow: 3.8.4 -> 3.8.5 --- pkgs/by-name/xs/xsnow/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/xs/xsnow/package.nix b/pkgs/by-name/xs/xsnow/package.nix index bddb05b73a52..067bf1a0a100 100644 --- a/pkgs/by-name/xs/xsnow/package.nix +++ b/pkgs/by-name/xs/xsnow/package.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation rec { pname = "xsnow"; - version = "3.8.4"; + version = "3.8.5"; src = fetchurl { url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz"; - sha256 = "sha256-ixfX/EGdwMOYu6nzcRUp7gjii0+T14CcqHCHIWmR2f8="; + sha256 = "sha256-NkoD/oMxdJwnx9QCBM8dwFOTPg7YzOZLnNiEOQt36cU="; }; nativeBuildInputs = [ From 923ad47ec6efbab38f59ea5a077da9ba1c1efa25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Apr 2025 01:03:47 +0000 Subject: [PATCH 068/449] gnunet: 0.24.0 -> 0.24.1 --- pkgs/applications/networking/p2p/gnunet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 7174db91e6e9..9127c0af06c8 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnunet"; - version = "0.24.0"; + version = "0.24.1"; src = fetchurl { url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz"; - hash = "sha256-BoUvn0gz5ssGvu3fhyerlMQ4U69yOnY4etdxYS4WPFc="; + hash = "sha256-xPj50l06APgHCVg7h6qDEtAUVAkLc6QTtD7H7HwHujk="; }; enableParallelBuilding = true; From 1b387a2e47df77446384701c88112a697dc924d2 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Sat, 12 Apr 2025 09:27:11 +0200 Subject: [PATCH 069/449] netbox_4_2: 4.2.6 -> 4.2.7 Release notes: https://github.com/netbox-community/netbox/releases/tag/v4.2.7 Changelog: https://github.com/netbox-community/netbox/compare/v4.2.6...v4.2.7 --- pkgs/by-name/ne/netbox_4_2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netbox_4_2/package.nix b/pkgs/by-name/ne/netbox_4_2/package.nix index 34f75c1f6bbc..6783642a59bd 100644 --- a/pkgs/by-name/ne/netbox_4_2/package.nix +++ b/pkgs/by-name/ne/netbox_4_2/package.nix @@ -14,7 +14,7 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "4.2.6"; + version = "4.2.7"; format = "other"; @@ -22,7 +22,7 @@ py.pkgs.buildPythonApplication rec { owner = "netbox-community"; repo = "netbox"; tag = "v${version}"; - hash = "sha256-SOGVMaqAYc+DeyeF5ZQ4TQr9RIhWH23Lwth3h0Y3Dtg="; + hash = "sha256-SZES80hdoP+k6o5ablMnwaFrsVGE8Baew44eX2ZCk/Y="; }; patches = [ From c4692bcda1d9d550b14cfd6e4b76af759c6a4f72 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Sat, 12 Apr 2025 10:58:10 +0200 Subject: [PATCH 070/449] netbox_4_1: 4.1.7 -> 4.1.11 Release notes: - https://github.com/netbox-community/netbox/releases/tag/v4.1.8 - https://github.com/netbox-community/netbox/releases/tag/v4.1.9 - https://github.com/netbox-community/netbox/releases/tag/v4.1.10 - https://github.com/netbox-community/netbox/releases/tag/v4.1.11 Full changelog: https://github.com/netbox-community/netbox/compare/v4.1.7...v4.1.11 --- pkgs/by-name/ne/netbox_4_1/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netbox_4_1/package.nix b/pkgs/by-name/ne/netbox_4_1/package.nix index 384e6ddb99f5..ab399f5128b7 100644 --- a/pkgs/by-name/ne/netbox_4_1/package.nix +++ b/pkgs/by-name/ne/netbox_4_1/package.nix @@ -15,7 +15,7 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "4.1.7"; + version = "4.1.11"; format = "other"; @@ -23,7 +23,7 @@ py.pkgs.buildPythonApplication rec { owner = "netbox-community"; repo = "netbox"; tag = "v${version}"; - hash = "sha256-0AyIXSiNsAHELM8Ry/bcm7sd7K+ApeoEguiEm8ecAU0="; + hash = "sha256-Nd8HWXn7v0llmg934KGtS5+Tj2RvBhJDuXEvB2Pg3nQ="; }; patches = [ From b825db835b111886197a8ac3ac3bfdc70934efba Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Thu, 10 Apr 2025 23:59:41 +0300 Subject: [PATCH 071/449] teleport_17: 17.4.2 -> 17.4.3; teleport_16: 16.5.0 -> 16.5.1 Changelog: https://github.com/gravitational/teleport/releases/tag/v17.4.3 Diff: https://github.com/gravitational/teleport/compare/v17.4.2...v17.4.3 Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.1 Diff: https://github.com/gravitational/teleport/compare/v16.5.0...v16.5.1 --- pkgs/servers/teleport/16/default.nix | 10 +++++----- pkgs/servers/teleport/17/default.nix | 6 +++--- .../teleport/disable-wasm-opt-for-ironrdp.patch | 15 +++++++++++++++ pkgs/servers/teleport/generic.nix | 14 +++++++------- 4 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix index e11c6eaf0d8d..15439eda05cd 100644 --- a/pkgs/servers/teleport/16/default.nix +++ b/pkgs/servers/teleport/16/default.nix @@ -2,10 +2,10 @@ args: import ../generic.nix ( args // { - version = "16.5.0"; - hash = "sha256-d634UB/YGDdAeBEJcRsRE5gqd31oQX3P4HJ+PoMQUmk="; - vendorHash = "sha256-0/ZYG8mYv3B0YJ89NJVG7M29/hU2zBtSXmoD32VEqpk="; - pnpmHash = "sha256-dqCfwMzSnEPQXz1bsroqSihkvw2Kcvyz+A4fpa52LVk="; - cargoHash = "sha256-NASNBk4QVoqe2cz4l94aXo6pUtF8Qxwb61XRI/ErjTs="; + version = "16.5.1"; + hash = "sha256-qDXJuKQ1IJ0+v4m5glEKNZVUBuLhG95MOzo0u3Ma2Qw="; + vendorHash = "sha256-pHAiJ080lyWtb7xbwSeD9g8JlyXZyqtZC2IpsUJ7YaY="; + pnpmHash = "sha256-XHiox+UYhGYgo+inrnOVy0qvPXm7xoCaGfAC4FQmaMM="; + cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; } ) diff --git a/pkgs/servers/teleport/17/default.nix b/pkgs/servers/teleport/17/default.nix index 4907b21d80a1..703bd067c819 100644 --- a/pkgs/servers/teleport/17/default.nix +++ b/pkgs/servers/teleport/17/default.nix @@ -2,10 +2,10 @@ import ../generic.nix ( args // { - version = "17.4.2"; - hash = "sha256-hiitFUN7bJR68sh/HrWsQMUm1lM2J3yjSoIT7mv/ldo="; + version = "17.4.3"; + hash = "sha256-MdtvtM5Nd+e7eSmHf4OwdjuQ2rUjwsAusvO7kATnru0="; vendorHash = "sha256-03qkUH7UfAF0FwbG5enKf9Ke1teN89vmzk8yRfGvmPg="; - pnpmHash = "sha256-Hh4R+mkJJp9CR4NHw+VFzLPxb7e9T1BQkey0in2t934="; + pnpmHash = "sha256-zx1OKAeFo5zWvGHDdOOvtmYB+tX9sW5sIrXY2AXjPN0="; cargoHash = "sha256-0PT9y56V/WHo3M5TcpVWBuHcQMZ0w2L4rEuXuTvVNFU="; } ) diff --git a/pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch b/pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch new file mode 100644 index 000000000000..05ecdb6f78cb --- /dev/null +++ b/pkgs/servers/teleport/disable-wasm-opt-for-ironrdp.patch @@ -0,0 +1,15 @@ +# Based on https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1 +diff --git a/web/packages/shared/libs/ironrdp/Cargo.toml b/web/packages/shared/libs/ironrdp/Cargo.toml +index 4252ba95372bdab9a1e2f74e164e303bedd5eee8..4c203290984223564f50ee775a137e86f3c2ddf0 100644 +--- a/web/packages/shared/libs/ironrdp/Cargo.toml ++++ b/web/packages/shared/libs/ironrdp/Cargo.toml +@@ -7,6 +7,9 @@ publish.workspace = true + + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + ++[package.metadata.wasm-pack.profile.release] ++wasm-opt = false ++ + [lib] + crate-type = ["cdylib"] + diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index 0663d08b2424..cc99bbb45fd1 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -97,11 +97,7 @@ let ]; patches = [ - (fetchpatch { - name = "disable-wasm-opt-for-ironrdp.patch"; - url = "https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1"; - hash = "sha256-Y5SVIUQsfi5qI28x5ccoRkBjpdpeYn0mQk8sLO644xo="; - }) + ./disable-wasm-opt-for-ironrdp.patch ]; configurePhase = '' @@ -115,11 +111,15 @@ let buildPhase = '' PATH=$PATH:$PWD/node_modules/.bin - pushd web/packages/teleport + pushd web/packages + pushd shared # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20 - RUST_MIN_STACK=16777216 wasm-pack build ./src/ironrdp --target web --mode no-install + RUST_MIN_STACK=16777216 wasm-pack build ./libs/ironrdp --target web --mode no-install + popd + pushd teleport vite build popd + popd ''; installPhase = '' From 8fdb2043f2590248e0eff58ec47472693f6bdb97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 02:40:34 +0000 Subject: [PATCH 072/449] snis-unwrapped: 1.0.6 -> 1.0.8 --- pkgs/by-name/sn/snis-unwrapped/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sn/snis-unwrapped/package.nix b/pkgs/by-name/sn/snis-unwrapped/package.nix index 51ac65f3f8d2..abf3e1fe61e2 100644 --- a/pkgs/by-name/sn/snis-unwrapped/package.nix +++ b/pkgs/by-name/sn/snis-unwrapped/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snis"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "smcameron"; repo = "space-nerds-in-space"; tag = "v${finalAttrs.version}"; - hash = "sha256-QfRH/YWu2BS5Dn47DmaPqoXe0SVFaBxaBIuE6Pq2XwY="; + hash = "sha256-WxxJW0o4PtOhmloeRLqxJahJwWlGpcdpQjrjrah+Ixk="; }; enableParallelBuilding = true; From cc037cd335bfb1d0653bb736ce16e8eebe3fe59c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Apr 2025 03:03:44 +0000 Subject: [PATCH 073/449] libphonenumber: 9.0.1 -> 9.0.3 --- pkgs/development/libraries/libphonenumber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libphonenumber/default.nix b/pkgs/development/libraries/libphonenumber/default.nix index 546765969cc2..a552d6718a88 100644 --- a/pkgs/development/libraries/libphonenumber/default.nix +++ b/pkgs/development/libraries/libphonenumber/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libphonenumber"; - version = "9.0.1"; + version = "9.0.3"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; rev = "v${finalAttrs.version}"; - hash = "sha256-FEe04DNJKNB74P0s03DMgNtqtrLDN7uScIIltctKYic="; + hash = "sha256-5sstZ9wxZrZPMCN4/KAXWFDXdFSsF2FL7aSsLn3wJ1I="; }; patches = [ From 9fee9e737163b093afd46661d125e559863f6286 Mon Sep 17 00:00:00 2001 From: azahi Date: Sun, 13 Apr 2025 00:38:41 +0300 Subject: [PATCH 074/449] lib.takeEnd: init --- lib/default.nix | 1 + lib/lists.nix | 34 +++++++++++++++++++++++++ lib/tests/misc.nix | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) diff --git a/lib/default.nix b/lib/default.nix index 19316addb8cb..eeed3d8e3f42 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -279,6 +279,7 @@ let naturalSort compareLists take + takeEnd drop dropEnd sublist diff --git a/lib/lists.nix b/lib/lists.nix index e119606dd5e7..ec0fe22d2afa 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -1462,6 +1462,40 @@ rec { */ take = count: sublist 0 count; + /** + Return the last (at most) N elements of a list. + + # Inputs + + `count` + + : Maximum number of elements to pick + + `list` + + : Input list + + # Type + + ``` + takeEnd :: int -> [a] -> [a] + ``` + + # Examples + :::{.example} + ## `lib.lists.takeEnd` usage example + + ```nix + takeEnd 2 [ "a" "b" "c" "d" ] + => [ "c" "d" ] + takeEnd 2 [ ] + => [ ] + ``` + + ::: + */ + takeEnd = n: xs: drop (max 0 (length xs - n)) xs; + /** Remove the first (at most) N elements of a list. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index d17231061d69..5b86e92c5750 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -1262,6 +1262,69 @@ runTests { ) ]; + testTakeEnd = + let + inherit (lib) takeEnd; + in + testAllTrue [ + ( + takeEnd 0 [ + 1 + 2 + 3 + ] == [ ] + ) + ( + takeEnd 1 [ + 1 + 2 + 3 + ] == [ 3 ] + ) + ( + takeEnd 2 [ + 1 + 2 + 3 + ] == [ + 2 + 3 + ] + ) + ( + takeEnd 3 [ + 1 + 2 + 3 + ] == [ + 1 + 2 + 3 + ] + ) + ( + takeEnd 4 [ + 1 + 2 + 3 + ] == [ + 1 + 2 + 3 + ] + ) + (takeEnd 0 [ ] == [ ]) + (takeEnd 1 [ ] == [ ]) + ( + takeEnd (-1) [ + 1 + 2 + 3 + ] == [ ] + ) + (takeEnd (-1) [ ] == [ ]) + ]; + testDrop = let inherit (lib) drop; From 6d180141824384a7f0867f3081c08e146f63d1ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Apr 2025 09:33:16 +0000 Subject: [PATCH 075/449] flyway: 11.4.1 -> 11.7.0 --- pkgs/by-name/fl/flyway/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix index 6890c9a7fc04..e570f2745161 100644 --- a/pkgs/by-name/fl/flyway/package.nix +++ b/pkgs/by-name/fl/flyway/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "flyway"; - version = "11.4.1"; + version = "11.7.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-tOPUBHB8nLdXnJfgd9zn+ph/KTWr7eXu7fRQ8RlpncA="; + sha256 = "sha256-Ajm4V+AAaC3NXvdTkxJ9uhk0QayZzoPYyU5RRrWxz/g="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From ca65b5535001d388ee134d6926e3ea1f408d2ace Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 14 Apr 2025 10:00:35 +0200 Subject: [PATCH 076/449] manual: explain per-variant customizations for build-image --- ...ng-images-via-nixos-rebuild-build-image.chapter.md | 11 +++++++++++ nixos/doc/manual/redirects.json | 3 +++ 2 files changed, 14 insertions(+) diff --git a/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md b/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md index 378b1163a6e3..20c9d93b1377 100644 --- a/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md +++ b/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md @@ -14,3 +14,14 @@ nixos-image-amazon-25.05pre-git-x86_64-linux.vhd nix-support To get a list of all variants available, run `nixos-rebuild build-image` without arguments. +## Customize specific image variants {#sec-image-nixos-rebuild-build-image-customize} + +The `image.modules` option can be used to set specific options per image variant, in a similar fashion as [specialisations](options.html#opt-specialisation) for generic nixos configurations. + +E.g. images for the cloud provider Linode use `grub2` as a bootloader by default. If you are using `systemd-boot` on other platforms and want to disable it for Linode onlz, you could use the following options: + +``` nix + image.modules.linode = { + boot.loader.systemd-boot.enable = lib.mkForce false; + }; +``` diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 313610aa0b07..21e335be6870 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -200,6 +200,9 @@ "sec-image-nixos-rebuild-build-image": [ "index.html#sec-image-nixos-rebuild-build-image" ], + "sec-image-nixos-rebuild-build-image-customize": [ + "index.html#sec-image-nixos-rebuild-build-image-customize" + ], "sec-image-repart": [ "index.html#sec-image-repart" ], From 92bb2a1f2e7221f3fa27c2004726b92e13359243 Mon Sep 17 00:00:00 2001 From: Riccardo Casatta Date: Mon, 14 Apr 2025 12:17:25 +0200 Subject: [PATCH 077/449] clightning: 24.11.1 -> 25.02.1 --- pkgs/by-name/cl/clightning/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix index 2484b659a4a8..0cd9776b4cf2 100644 --- a/pkgs/by-name/cl/clightning/package.nix +++ b/pkgs/by-name/cl/clightning/package.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "24.11.1"; + version = "25.02.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - hash = "sha256-FdrD+FA0t90oJnXjUA8oalU7DDjUv70fAteNxbhscgk="; + hash = "sha256-0eRLc/bR4sjnNIKzhkX9yVCAoypf1TVhpa884mmVC54="; }; # when building on darwin we need cctools to provide the correct libtool @@ -95,11 +95,6 @@ stdenv.mkDerivation rec { stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 ) "-Wno-error=gnu-folding-constant"; - # The `clnrest` plugin requires a Python environment to run - postInstall = '' - rm -r $out/libexec/c-lightning/plugins/clnrest - ''; - meta = with lib; { description = "Bitcoin Lightning Network implementation in C"; longDescription = '' From abed08740321dea36a17f0112da485d32ccb302a Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 14 Apr 2025 11:34:33 +0200 Subject: [PATCH 078/449] manual: smaller fixes for nixos-rebuild build-image docs * correct option type for `image.modules` * fix grammar * show actual output of the command to --- ...ages-via-nixos-rebuild-build-image.chapter.md | 16 ++++++++++------ nixos/doc/manual/redirects.json | 3 +++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md b/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md index 20c9d93b1377..075a8fca3bbb 100644 --- a/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md +++ b/nixos/doc/manual/installation/building-images-via-nixos-rebuild-build-image.chapter.md @@ -2,23 +2,27 @@ Nixpkgs contains a variety of modules to build custom images for different virtualization platforms and cloud providers, such as e.g. `amazon-image.nix` and `proxmox-lxc.nix`. -While those can be imported individually, `system.build.images` provides an attribute set mapping variant names to image derivations. Available variants are defined - end extendable - in `image.modules`, an attribute set mapping variant names to a list of NixOS modules. +While those can be imported directly, `system.build.images` provides an attribute set mapping variant names to image derivations. Available variants are defined - end extendable - in `image.modules`, an attribute set mapping variant names to NixOS modules. -All of those images can be built via both, their `system.build.image` attribute, and the CLI `nixos-rebuild build-image`. To build i.e. an Amazon image from your existing NixOS configuration: +All of those images can be built via both, their `system.build.image` attribute and the `nixos-rebuild build-image` command. + +For example, to build an Amazon image from your existing NixOS configuration, run: ```ShellSession $ nixos-rebuild build-image --image-variant amazon -$ ls result -nixos-image-amazon-25.05pre-git-x86_64-linux.vhd nix-support +[...] +Done. The disk image can be found in /nix/store/[hash]-nixos-image-amazon-25.05pre-git-x86_64-linux/nixos-image-amazon-25.05pre-git-x86_64-linux.vpc ``` To get a list of all variants available, run `nixos-rebuild build-image` without arguments. +::: {.example #ex-nixos-rebuild-build-image-customize} + ## Customize specific image variants {#sec-image-nixos-rebuild-build-image-customize} -The `image.modules` option can be used to set specific options per image variant, in a similar fashion as [specialisations](options.html#opt-specialisation) for generic nixos configurations. +The `image.modules` option can be used to set specific options per image variant, in a similar fashion as [specialisations](options.html#opt-specialisation) for generic NixOS configurations. -E.g. images for the cloud provider Linode use `grub2` as a bootloader by default. If you are using `systemd-boot` on other platforms and want to disable it for Linode onlz, you could use the following options: +E.g. images for the cloud provider Linode use `grub2` as a bootloader by default. If you are using `systemd-boot` on other platforms and want to disable it for Linode only, you could use the following options: ``` nix image.modules.linode = { diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 21e335be6870..f1b0b6ba6f94 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -146,6 +146,9 @@ "ex-config": [ "index.html#ex-config" ], + "ex-nixos-rebuild-build-image-customize": [ + "index.html#ex-nixos-rebuild-build-image-customize" + ], "sec-installation-additional-notes": [ "index.html#sec-installation-additional-notes" ], From 58913b195545731e58e361e2e08d6932d5d969af Mon Sep 17 00:00:00 2001 From: phaer Date: Mon, 14 Apr 2025 13:29:48 +0200 Subject: [PATCH 079/449] nixos-rebuild: don't quote imageName for build-image it's just a string, not actual json. This lead to extra quoting when printing the image name, i.e.: Done. The disk image can be found in /nix/store/rynka0dxk4n6c29mggijf8cmbqzf47zh-nixos-image-amazon-25.0 5pre-git-x86_64-linux/"nixos-image-amazon-25.05pre-git-x86_64-linux.vpc" --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 6c61b3c7a503..bd314e86a39d 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -865,16 +865,18 @@ if [ -z "$rollback" ]; then set = if builtins.isFunction value then value {} else value; in set.${attr:+$attr.}config.system.build.images.$imageVariant.v.passthru.filePath" \ "${extraBuildFlags[@]}" + | jq -r . )" elif [[ -z $flake ]]; then imageName="$( runCmd nix-instantiate --eval --strict --json --expr \ "with import {}; config.system.build.images.$imageVariant.passthru.filePath" \ "${extraBuildFlags[@]}" + | jq -r . )" else imageName="$( - runCmd nix "${flakeFlags[@]}" eval --json \ + runCmd nix "${flakeFlags[@]}" eval --raw \ "$flake#$flakeAttr.config.system.build.images.$imageVariant.passthru.filePath" \ "${evalArgs[@]}" "${extraBuildFlags[@]}" )" From e5571da75df39f31de9fde333a26041c44bae64f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 21 Mar 2025 22:11:55 +0100 Subject: [PATCH 080/449] wordpressPackages: recurseIntoAttrs --- .../web-apps/wordpress/packages/default.nix | 22 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/packages/default.nix b/pkgs/servers/web-apps/wordpress/packages/default.nix index d874bf3b4db2..a0b64dd245d7 100644 --- a/pkgs/servers/web-apps/wordpress/packages/default.nix +++ b/pkgs/servers/web-apps/wordpress/packages/default.nix @@ -184,16 +184,18 @@ let } // lib.mapAttrs ( type: pkgs: - lib.makeExtensible ( - _: - lib.mapAttrs ( - pname: data: - self.mkOfficialWordpressDerivation { - type = lib.removeSuffix "s" type; - inherit pname data; - license = sourceJson.${type}.${pname}; - } - ) pkgs + lib.recurseIntoAttrs ( + lib.makeExtensible ( + _: + lib.mapAttrs ( + pname: data: + self.mkOfficialWordpressDerivation { + type = lib.removeSuffix "s" type; + inherit pname data; + license = sourceJson.${type}.${pname}; + } + ) pkgs + ) ) ) generatedJson; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1fb79a10b39..882d597ebad9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19261,7 +19261,7 @@ with pkgs; wordpress_6_7 ; - wordpressPackages = ( + wordpressPackages = recurseIntoAttrs ( callPackage ../servers/web-apps/wordpress/packages { plugins = lib.importJSON ../servers/web-apps/wordpress/packages/plugins.json; themes = lib.importJSON ../servers/web-apps/wordpress/packages/themes.json; From 4e96dd49be9ff6da47f1575b8ff076f80b66dabb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Apr 2025 20:29:42 +0000 Subject: [PATCH 081/449] flameshot: 12.1.0-unstable-2025-03-10 -> 12.1.0-unstable-2025-04-07 --- pkgs/by-name/fl/flameshot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index 882685e3ced5..1bd78a3dee6e 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -25,13 +25,13 @@ in stdenv'.mkDerivation { pname = "flameshot"; # wlr screenshotting is currently only available on unstable version (>12.1.0) - version = "12.1.0-unstable-2025-03-10"; + version = "12.1.0-unstable-2025-04-07"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; - rev = "1997aed8a332eeb3b468559bf454c5d78b4d2cbb"; - hash = "sha256-liiL0/H70XfsG2zM7N+GuIdvd6RE29QXYQLExiYCuvc="; + rev = "63a4ab669bba83bdde878963df80a3c4e9331e21"; + hash = "sha256-+DwWiO41pck3FedtAeTWmshBwQyYNlACCK4M5qhxsas="; }; patches = [ From 5b78daffd805bd38474dfa16ff96b6013e59dcb6 Mon Sep 17 00:00:00 2001 From: Kiyotoko Date: Mon, 14 Apr 2025 23:45:25 +0200 Subject: [PATCH 082/449] maintainers: add kiyotoko --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e6b577276734..c0b6c4bf40c1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12797,6 +12797,12 @@ githubId = 1915; name = "Asherah Connor"; }; + kiyotoko = { + email = "karl.zschiebsch@gmail.com"; + github = "Kiyotoko"; + githubId = 49951907; + name = "Karl Zschiebsch"; + }; kjeremy = { email = "kjeremy@gmail.com"; name = "Jeremy Kolb"; From d6133526472eb11a863eb6e679b104086ef291bf Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Mon, 14 Apr 2025 20:00:00 -0400 Subject: [PATCH 083/449] theft: fix the static build --- pkgs/by-name/th/theft/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/th/theft/package.nix b/pkgs/by-name/th/theft/package.nix index 97c56847006a..37ffd27e8391 100644 --- a/pkgs/by-name/th/theft/package.nix +++ b/pkgs/by-name/th/theft/package.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { sha256 = "1n2mkawfl2bpd4pwy3mdzxwlqjjvb5bdrr2x2gldlyqdwbk7qjhd"; }; + postPatch = '' + substituteInPlace Makefile \ + --replace "ar -rcs" "${stdenv.cc.targetPrefix}ar -rcs" + ''; + preConfigure = "patchShebangs ./scripts/mk_bits_lut"; doCheck = true; From 389e6f13a41707c9a6b4dad695df415f797b0eb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Apr 2025 04:49:49 +0000 Subject: [PATCH 084/449] cherry-studio: 1.1.10 -> 1.2.4 --- pkgs/by-name/ch/cherry-studio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 4cbdfcbe5528..88e0dc4e598c 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -14,13 +14,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.1.10"; + version = "1.2.4"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-rTIUBlQemYOAT0NRS80FcZfEc1Q9jUmlMU5YW99z0QE="; + hash = "sha256-vBE3yKNuL8yAuZrR5DrT+n1idmPor3ygPD1qMGGGgps="; }; yarnOfflineCache = stdenvNoCC.mkDerivation { @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; outputHashMode = "recursive"; - outputHash = "sha256-GVIa8/rNdYTcPYqaRZp8VGKeh0IiNttXzJEVvCpCAQo="; + outputHash = "sha256-A0YuGvNCsrYzp/oZ4Ob1Sp9HFc+psa9Yv5fb/8rQqZY="; }; nativeBuildInputs = [ From 66231b510861c8753d0c98e6037572ce49955270 Mon Sep 17 00:00:00 2001 From: aspauldingcode Date: Sat, 8 Mar 2025 15:33:50 -0700 Subject: [PATCH 085/449] macos-instantview: init macos-instantview: update sourceProvenance description, versioning compliance self -> finalAttrs --- pkgs/by-name/ma/macos-instantview/package.nix | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/ma/macos-instantview/package.nix diff --git a/pkgs/by-name/ma/macos-instantview/package.nix b/pkgs/by-name/ma/macos-instantview/package.nix new file mode 100644 index 000000000000..94a8178cb23c --- /dev/null +++ b/pkgs/by-name/ma/macos-instantview/package.nix @@ -0,0 +1,44 @@ +{ + stdenvNoCC, + fetchurl, + lib, + _7zz, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "instantview"; + version = "3.22R0002"; + + src = fetchurl { + url = "https://www.siliconmotion.com/downloads/macOS_InstantView_V${finalAttrs.version}.dmg"; + hash = "sha256-PdgX9zCrVYtNbuOCYKVo9cegCG/VY7QXetivVsUltbg="; + }; + + nativeBuildInputs = [ _7zz ]; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p "$out/Applications" + + # Extract the DMG using 7zip + 7zz x "$src" -oextracted -y + + # Move the extracted contents to $out + cp -r extracted/* "$out/Applications/" + + runHook postInstall + ''; + + meta = { + platforms = lib.platforms.darwin; + description = "USB Docking Station plugin-and-display support with SM76x driver"; + homepage = "https://www.siliconmotion.com/events/instantview/"; + license = lib.licenses.unfree; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ aspauldingcode ]; + }; +}) From f21a197432e2945edfc12eb3a8a543b95f7b5963 Mon Sep 17 00:00:00 2001 From: Joe DeVivo Date: Tue, 15 Apr 2025 13:22:06 -0700 Subject: [PATCH 086/449] mas: 1.9.0 -> 2.1.0 --- pkgs/by-name/ma/mas/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index db4fa214b380..8a4b63648e42 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "mas"; - version = "1.9.0"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/mas-cli/mas/releases/download/v${version}/mas-${version}.pkg"; - hash = "sha256-MiSrCHLby3diTAzDPCYX1ZwdmzcHwOx/UJuWrlRJe54="; + hash = "sha256-pT8W/ZdNP7Fv5nyTX9vKbTa2jIk3THN1HVCmuEIibfc="; }; nativeBuildInputs = [ From f92e7941fb7af96918c532e2b64d2443bf0fe05c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 15 Apr 2025 23:14:55 +0000 Subject: [PATCH 087/449] firefox-devedition-bin-unwrapped: 137.0b10 -> 138.0b7 --- .../firefox-bin/developer-edition_sources.nix | 1238 ++++++++--------- 1 file changed, 619 insertions(+), 619 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix index 99f3b34eac18..2ecb7c676861 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix @@ -1,1859 +1,1859 @@ { - version = "137.0b10"; + version = "138.0b7"; sources = [ { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ach/firefox-138.0b7.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "52c3949eca045c95ad334740088139ca3dc3f22ab277cd42b9b7aa002e97a029"; + sha256 = "b8f0a3203007d7036c2bc25a9a0abf322df7f5f553e14daa009b8bf18cff7e6f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/af/firefox-138.0b7.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9e49034499c0ec77e06596fb76878ad066dd3ce2825c7c591b4757efd6b00778"; + sha256 = "0604f932461c69e65b84aa5a41dc61125208321377bae944ede90df7bb44b408"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/an/firefox-138.0b7.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "23593aa50346f535cb00ff11a801bd172bf819f6fab0f11f963c5b3f8c29c71f"; + sha256 = "c1c0a70dc45f474f2b8d6a82be038b52029f5e98303967c9f256c0dd345d34d3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ar/firefox-138.0b7.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "df1ad81eebca06458c61fabca2abd3f6b3760c07607a004f3e4ef6466947be79"; + sha256 = "0fd8d6bfc87848ff51759c1196731696aa397461fd857d97d19ce9211a7ee9d1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ast/firefox-138.0b7.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "0aa09eff372d5ac4071ad705600ff72993b2e697267f3d2fbd1c09261b90c53b"; + sha256 = "8b7af75a81b08669870c5beb4aa24e125c5b77024c9677ac9a085dc57792e200"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/az/firefox-138.0b7.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "0814953878e05bc6cff14bded5588e587378dbc7a77c238c6b9d27915f119e86"; + sha256 = "a027574eb4e9a836e6d2deed44cd7d80b01fd82eb92221e91f3620b9d7be14b7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/be/firefox-138.0b7.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "4f8efad5a43b01f4e843bfb0434f38143cc747deceb88e3c4c6d9e010d3e29bd"; + sha256 = "257900abeedbbed562f50f0ea2eb3609934dc071d359c2474d98670c94c7e5b3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/bg/firefox-138.0b7.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9adc3ffdd8e13a83953587fc91d5084c99b250ad3235674aae9e473c74afeb09"; + sha256 = "0032917af4fae9a29e84e7e94f3e0ac2cc909bf0e35c75b26e2fc03976c208d5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/bn/firefox-138.0b7.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a154ab4afef7f96f368c1a57a60ed6e7dd3eadd173d1b949df13269d2686765b"; + sha256 = "39eb0cce5cd4cb594fc2cd58f796745f147fe7424835925749cdd63b0d070005"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/br/firefox-138.0b7.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "303410e14fd0f90b83c8cc2f0c01bd1ff14593b9edcfff80bbb2131bf4ada56c"; + sha256 = "197145651d2047a9ca3f9e02794a4b4f08ed6d6a1fa3a666f43cd6d4b963f988"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/bs/firefox-138.0b7.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "ae56507b657255e00785e2a81900aef0227c4bf2697e1f65be06d85e52b3ba00"; + sha256 = "700ea9fccebe36df2c3674da40868f6ea6a17cdf8af6082f980844f7455f9192"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ca-valencia/firefox-138.0b7.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "5de065a4123eee581d4cc5e67927bf205d09a7e9af4d4de978d9005328695c59"; + sha256 = "6ccb683a068eef5595ae89e349eb87cace1d77098b9585aff8011b5cb2567013"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ca/firefox-138.0b7.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6152484711ff0116f45c46002233266d097834044adbcbfe576fa9f553836194"; + sha256 = "9a97cfe8f416f74fbfbf41e186eb6930e68939b1c39bb07fd36dc25065d3330b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/cak/firefox-138.0b7.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "2ac9e664ad52c7035231533a03d04e66e12a3e1ce39891d4e7369e8285556b2c"; + sha256 = "7dc0692bbbaab56bf1d0272a5fca92a33a9835666ad3b0fbb4d624aa7c6af940"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/cs/firefox-138.0b7.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "ad6389f4243d06d2fab3565082c5d167ff3c50f0662ac0e3a5bf4a26325ff6e6"; + sha256 = "844260d8402289ce12b814b44d612fe792c312948ed832285f1c53438c588b49"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/cy/firefox-138.0b7.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5dd6b52f212d7b67e8003b7ab5fd351febe2d8fd51864435eada72a1523f95d7"; + sha256 = "b5c6b81cfb4c7eb872fa4245f93f20ba390869d9e3c2a93aae3c98792f5ef9ab"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/da/firefox-138.0b7.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "35bc5a722500ccc4065f8dfae1d78a9cd4575a5a908560e0a0367e54ee945ca3"; + sha256 = "b725561bff20a05447235674db7316d4471b5f3d0da83d6434593aa789fffd6e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/de/firefox-138.0b7.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6a9ca1d0698bc57341a822f344d017464154cf8f9fbeeda01a54c7de2d12ccf9"; + sha256 = "a1c2d91de9a9a7fe2b02baabfdceaeb6a6521707ea336a51de287e60eee83482"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/dsb/firefox-138.0b7.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "1b436ac622a235387386caeef4b603d7ca47c93dca04d58a59c40b17eed0ecc1"; + sha256 = "19af7e85d5b99a45b20cf0c54157e9aaf67d49474f2a293357d9abc81a1f697f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/el/firefox-138.0b7.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1e91d7f6235221da12bd44bdd50008c79edfff42c60ef2f3cf5dc84a4d29abdc"; + sha256 = "05565556eaa0349eb12d3bf36ebf02efb818c5f59ef8b51c69ff8d6e479d376b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/en-CA/firefox-138.0b7.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "39e59bebfca59b7aa3c6e3ae506870d0ddda67130d0d49340e0029694ae126a7"; + sha256 = "38a3aedc45831772f28013969ee6bd3bf9403aacefdc0ddc24d47f78cbcef359"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/en-GB/firefox-138.0b7.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "cb83282b8569ed1496737fd1a2f065661050e172b9406f159dd53d527c036663"; + sha256 = "f6013c3cd54a2b6c0fe26f6f7fc62d1212b3cb98b8943c6ae41901e6dd8c5277"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/en-US/firefox-138.0b7.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "8ed06e738c2d2106a030c9ea233d1745d1d1190191d5acabfb619343d6600620"; + sha256 = "57470e280749e590c94fe8edd899aa36549227138f240ae187cce1d17dc7fd93"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/eo/firefox-138.0b7.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "cca605f86c6c9973c440fc894b9b43153c38a35d45788815a825b29606602778"; + sha256 = "068e5a83a995cd119ebc963349c0b287d63bc72102d003b8eaa8c03a684f98e2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/es-AR/firefox-138.0b7.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "7e609c61e1d8945ecce48dad3e57e8ead8bbfaa1790571e62f906a86792d30f3"; + sha256 = "da7f1776f4a5064309d82f57c8e8d685356536f153cbdc532e360bd0c6bd0328"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/es-CL/firefox-138.0b7.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "81844f1afe6f79dfd1cb770d2e4488f384fd715912f21b026b696b39d1212040"; + sha256 = "db0301eba71ecd4569c2e31b87b154631c7de47e3a2e3ed9fce718a96fbdbdaf"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/es-ES/firefox-138.0b7.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "a462ed0483bcbbdf137d95e8933bfd41e8f3cb8ca18581b2f85b00b7e33c6db5"; + sha256 = "6e4ab27052bb9b5b6b8fdbbfa1be4725887e5541129f266c6ad43d5afc47b2f5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/es-MX/firefox-138.0b7.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "12cca8014133f1e0e04c6c4d3ee5f5fd3198a8e822044f359ac3764f8ee0595c"; + sha256 = "e760ff14081a2c678c29e2d70798cd1f8bee089efc431de572c614ca5527c470"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/et/firefox-138.0b7.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2938b58027137c182041f07af65f4dafaf118e14cc55545f573b6dc434b109fd"; + sha256 = "4d02bbad7aecea49862e1e6d2639864c30465174ce12cf6fd866428b6e079b2d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/eu/firefox-138.0b7.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "86de96d98ae2016f853b2fa3f170de2dd48861d5af6b90d045806d897a070e13"; + sha256 = "fcad41c91d6591fb171288c7fe5a90032541bf28ab3c78c31e1115ab4681b196"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/fa/firefox-138.0b7.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "b64cbe106e3345b94fd8c43d2032f9605af5677b77fccdb62a57f42f62455c59"; + sha256 = "260761945332fa70a083250ebacb245d09aced1bd2403b70c7f9f510072cab9e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ff/firefox-138.0b7.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "bb8aebacba6f713f177307358b0123dd6faf918cd2bef69b935f44913d14412e"; + sha256 = "9a2df1a24c245cf0e3c4763544fc18d89cc2b96480e7445e90c7965eb8b153aa"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/fi/firefox-138.0b7.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "f625d663c40c7b7c6d451aad7bea93b0f69ac8b32acb2fd19dba67a87e66c991"; + sha256 = "fbaf053ec4efa4707b31aaa57caac871a3695a8319cb2759c7a04bc993a81d44"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/fr/firefox-138.0b7.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "d5bbfc9f508fe02b02007bcdaacd10cb714269caac0a53caf73db22c5f50689b"; + sha256 = "5d07827c26eaec4681e2f16bf08f923db0b13f87e51b117c8d37224edc71115c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/fur/firefox-138.0b7.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "dfb9867876db1711900dd13c3db6328d54c4ccfa2925b49b858f9020b14c0f05"; + sha256 = "f2a272183125b244217857d8b921c85ddaf743481cbb7b958750925f3a3f7fff"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/fy-NL/firefox-138.0b7.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c379693f25e0d4f936c93a6a18768213babe061898ee525d4487eed41b7c7642"; + sha256 = "13028ef9250513d71c046ed534f3a1597e95b489c227d73113ec8372b94939df"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ga-IE/firefox-138.0b7.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4ee4f94538d8edcf4a44776e552ef3697a9b36f8a9796958a520776d0d65644a"; + sha256 = "c0d1cb1a99b45b3e0adec5eec99dc2ab31514f0797923413605b0996228aebb8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/gd/firefox-138.0b7.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "284428018bc77741976c90f266bb89fc06e5ba3878dce262cdd05737408961e2"; + sha256 = "3a31ad8eeb4b023c74431e7c19c493d53e7d09b29bf88575f03d099073fbb03b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/gl/firefox-138.0b7.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a60105b446c2cc6b21ce379e3e1da6f63de41fbce36c961a5be20bd9cfc75147"; + sha256 = "15df3ad2a2fb492e78498d8f1fb631ffc94259e7b0fac422520d9e0d280615dd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/gn/firefox-138.0b7.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "5a1cb2d50405eab2fbd2e0d853aa9017b1eecc1725195156b264ff107f703475"; + sha256 = "fd620930191c94fdbcd97981e052f872acb373f3eb3186fe7e5e0f8fd7c8a958"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/gu-IN/firefox-138.0b7.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "48bb35638b57298dc242d5f7a38d0224a760f99ae0e46300e3c58b437407be2c"; + sha256 = "10e168a9ac241dd850ba15269ee09c64b033555b94f3b7dd7d9403d27b77ab28"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/he/firefox-138.0b7.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "08ec1bc9d4515de6bf470f44b6819aef54c81485f49022f68d6762eff3d859ee"; + sha256 = "ffd7f61c2a53937d27ce1bac266ba56c705c04b69677c25ecf742a9a800755b1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/hi-IN/firefox-138.0b7.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "a78199c3a6f1aecb53b5d62802738b753f1c20d51c49a0d3e8e157fe748aba9b"; + sha256 = "a224d8b8eed9eb89040fab120a652a47ca2f020c11052bd117840cc10282d90a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/hr/firefox-138.0b7.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "34cb684b8324bba852b5a85a3a8f2e74f60fd9330aa10349d76129140b7dfd86"; + sha256 = "48acfc537728cca5674d39256d0d177b96d9526965b09feab9281746ccbff70f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/hsb/firefox-138.0b7.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "cb7a136d2381aa243410d46608eaa87c98c1c046f19445481d1febd15115bfe0"; + sha256 = "bb822e872a358e79af79102615ea67e0bf6a33f74e60ba268ce308a25c17a9cf"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/hu/firefox-138.0b7.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "1ebe76eef892b45bcf479741fb57283ee0cfafd6517b3b8bcb0a86f98ad5c266"; + sha256 = "2b258e97f16416d4698687833f24f1e4ad152dbb92cd8ecdc9988bd0df80396c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/hy-AM/firefox-138.0b7.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6f25d3d27e27191314e89cef90c067a50fd327fa302590437b6c74838c44f624"; + sha256 = "98a26b99a75da4eaa3ef743132a82cd3f8e7cb4c17cb71590bd95935739fc507"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ia/firefox-138.0b7.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "7e63be6910e8e772a97fa44f736d798d65e6bcecef85ff56ad5c321ef27999ea"; + sha256 = "61f5414ff99201141a2765af6b56bb11f24649b1d61d2cd71dd7a3500bffb04c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/id/firefox-138.0b7.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "fb2c0edd120b9286fd13c7af9cdbece71b5c8621e78628008148997e73d91335"; + sha256 = "01c1d8c2b058f4d88500112e459ea0584c778a066987f646b82a98fbbe4f2b48"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/is/firefox-138.0b7.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "cb26b7ceadaf3d2c52a2f7ab25ea751a0171176ccb8408a6f759c687f10515ad"; + sha256 = "d64ba836c48f1077418529eff98f468ad0b2c5cb4d3cbdf9515f5774420af009"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/it/firefox-138.0b7.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "9b7711b39f2ebce0c8e6258f0351f5f15e2c51094802a64c92b283a902981960"; + sha256 = "501adb9ae0fb7fdcae66e3f5251fe4633939562842d74fa15ea6f4b070e130e0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ja/firefox-138.0b7.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "faeccf9840237b7f8f51934d4f215d7344e3828f9ec2fbb3fab17a912bb4b975"; + sha256 = "ecc34ccad9d9573d05a880b06caec23aea903ba4852caf106f139d6bb3c0d056"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ka/firefox-138.0b7.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1d1967850d1700b30605f4f0b139f05898ab97eeb1e7a2b33e0f79824664675d"; + sha256 = "c498d59fc3b72121e22222edc04820d444919271702c56876332fc3c941ecc1b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/kab/firefox-138.0b7.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "7d76acdd5f1db3f88da642ce093b05203fe5fbf4098d637e646a2c44f54e8c44"; + sha256 = "9eaedbcd9bfbffaee5eb161889e417cf949a741059224d4b787bce289e3d95d5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/kk/firefox-138.0b7.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9c0a9ff355ec8996670b7002338a02e265a18734e1f57dd60ef85c8ca13cae89"; + sha256 = "26f58223403bfe74885eb8eee19d151afb93086ade8ed965208c4eec138c2ee6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/km/firefox-138.0b7.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "d845979574a5a63d45d101e7bbe5c69c77fd247bd75e11f1a5e88cb802401d87"; + sha256 = "8e483db40e69de2f3a7872175fcbaca8c4021f915a3c3839bccd0a078cb63af5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/kn/firefox-138.0b7.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "4107fb8bb8dc9a2eca1b00dfaa8e152f55528338136bf47bdfb6405415700387"; + sha256 = "e131f5d5b11e3c847770396334621f5d39993ecf128fbfa09ac5ca67522ddc24"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ko/firefox-138.0b7.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "ee2d1b8802d7b871b231d7876d64bf7dcee35d72189c4400d992a9f489ec57b1"; + sha256 = "0498f79cc4c14a652e6845532a83d40bf73bd04403876ca219def6789ea2cdd5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/lij/firefox-138.0b7.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b6dbe9a642f842e3b45f55be7fc596f1359ece83a30b5844cb3343a5b2544316"; + sha256 = "41e2945c6d0aa1476857e027b45d73636d8f4c7e60ac84b494d4e77617915c6f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/lt/firefox-138.0b7.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "238910fd4bbe5ed78efb99419154931fd8a8626061942d482dc648b281b1060b"; + sha256 = "41c9b9cb012354ff46f009657fad708c0e12d1edacda84ff48f09837f66c94a3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/lv/firefox-138.0b7.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4e395dc08a5cc5d2e75bd1c60da14dc64708e5fa2ab545e3cd33b414d727a99c"; + sha256 = "abe1742dfcce28afdefd592a3037c03acbc68dd3d75afd78a4e30b4652778aaa"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/mk/firefox-138.0b7.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "65539afb8178be490a161fba459dedbd511ba79427836df531d2bc4779875e12"; + sha256 = "780e661baac7105026d05b19bfcb9385a237b8092952942d604000bd4e3b8398"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/mr/firefox-138.0b7.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "f43ab2ca48be65b5f41aae1bb1f8f323a613a487598146bbf1365b7ecb94b48b"; + sha256 = "33ffae9d774fd146bdf0da2285e20b0ab9af2bfa83b8aa6411fcc5222353e731"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ms/firefox-138.0b7.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "283e9200a6bfe440e3fa5daeb67107f6907b950a30a17d94d49861cc8f5eec7f"; + sha256 = "b819914d35c90cfe2ff0664f5e1c905119e49c1bd8890b23ee077f8ff8eb611a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/my/firefox-138.0b7.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "6ad988b0ba091f329d50cc8a9afceedbfa8ba37bc26a320b87470f69b6014e36"; + sha256 = "10b04f08b5f19ac78fb6d1b6d0b329ba47bf7aeea94725b797579cee253700f0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/nb-NO/firefox-138.0b7.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "2deda34e8c945c8eacf79e5396cd66b8bf5dc68160c60f2a85ba27ee630f5880"; + sha256 = "2408c807b51be3260e673ad116dfb65fec06c25989eb4987a2c922f4040809f4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ne-NP/firefox-138.0b7.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "ac788f59ad095153bba7a7a12902f2990aad942466cc9ef4134ed9dd82b69068"; + sha256 = "eeb343c941014c227b7ef8cefad77f0487ab84ce0c2a9474c936c95497987b22"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/nl/firefox-138.0b7.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "b48c11934f715a7b74dc0756ce30e0f9b5ab0e0d6522533e1c7676fa3e184b37"; + sha256 = "e4c9c0bedb78d82aef48ad94dc74045e7836f2987c9e3af7f31edde2099c1e68"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/nn-NO/firefox-138.0b7.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "185c0665b579eefb7c29f70d479d9fec8d1011f1e6e00fd8c506237b3849bdb1"; + sha256 = "c42178b2a4ec7d29cb4d8176b1f9d51f0bc3cc2f79c53363beda0f7d445168e8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/oc/firefox-138.0b7.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "ba49d5e4aad03b7bcaae9f3c5bfaf6a235d9ea361b77d79fc4672a1f89e090ab"; + sha256 = "bf863b71429ca4d7f0ae9e08e4d5ab13935804cca55eb16e474585c1b010015c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/pa-IN/firefox-138.0b7.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2c71076e95ab6f3bfffbee5cc7a8966dd749f1563ae1685c426b8b566cce3692"; + sha256 = "a878a84560176e1d7b04bddc35512092f882ba4b5baa9f84266254f3374792b3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/pl/firefox-138.0b7.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "ab5d3be12d4370090dbb62b66ac9953c95fa60f5411db80f1adb6bee1558415a"; + sha256 = "f19db9c0ed5ddc71ae95789dba9b8987197596935406dadabedf665f6d69bc81"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/pt-BR/firefox-138.0b7.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "80eb1c423c323c9d139acd49e46073baf28bd4f49b88fd2849bd7521388f3fb3"; + sha256 = "3237cd6eacca77cb5c7eab1dcab7efc7a7482abde3c5488981abc1280813bbcb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/pt-PT/firefox-138.0b7.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "4a006401f7db4032c8a6f560f050ddc6896f3669f4c09dc9006da0f696e77f71"; + sha256 = "22c6697f5d518b28103ef1c6a91643fde9b1ad02f64ef504774770fc46abbb89"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/rm/firefox-138.0b7.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "fbf4667db9f7d1fed11914a391cdedebb3a5f29885de8ecade4d137c11338bfd"; + sha256 = "bc86976739b6389378210d7164a9ee8c82fbbaff9ef47516d4b7130d55ddee33"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ro/firefox-138.0b7.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "abaf4c3e563ab8904cd857d8d24d84986a31b8729c211f9a13a070ce9c72ec9c"; + sha256 = "9c1b3a322b5449ad5a270a13a0d085871c01c3682e4d8507618802e48f849e2b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ru/firefox-138.0b7.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "570c27b473b733e8570f31e0279b41d8ab1c56f79ebde977681e5c808dd091f5"; + sha256 = "e4d2710bec845312401fa1cb9da37503bc87b8ed8e8011668c49aeceeb33eeb5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/sat/firefox-138.0b7.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "88b88fdfaf1244ea2e9089323b8f1abc801c9f3a4ffb313cc0f3212908ce4238"; + sha256 = "20957e5b79eed23b10013c55d55f2ad5f958522578db754f3a510b21ec3246f5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/sc/firefox-138.0b7.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "192a96825b82b50d99e5335f482d6cdea18930cb4f4313bfda26fb6523ab5bb6"; + sha256 = "ba40613d7c70e524e32db1cd8e571143786739680fe88f6829a84055653bf824"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/sco/firefox-138.0b7.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "1355de193197a750e67794aab79c97180bfdd86207e7f729c578f9be25bf5886"; + sha256 = "05f82f9aaadd1115d90dec5b1f64cb83695025c4befb0101c33f43001e59da23"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/si/firefox-138.0b7.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "45b810acd44ad2395e4dbc1eee3f351ffbcc37f5161b0a808236bc886d65c05d"; + sha256 = "d3b8e1df14433e532196c2ec251cbc00ce9b4d229f8a7c19c7686b43a8b372ba"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/sk/firefox-138.0b7.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1e8b0cc78dc64ba9ccc6330165eb9ecc4d74556214e9212b1b6e6fe15ee19282"; + sha256 = "03869ac8eedc49c3ee11371cb2be0bf95dd34940b48867efc8c0504400a0f04d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/skr/firefox-138.0b7.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "c3b29c21ae9ca49fac32338775a0b3abe232ed8530043112c5cbfa7c49617f92"; + sha256 = "5006a70cb5e11d30886bfb4489ef3dc22d3e489bcc433da2c9d7c733f0bca824"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/sl/firefox-138.0b7.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "cf9c33c74a0b2e4e3ef2335c16ba131b1d319879e81e563c2f20a8918d8a829f"; + sha256 = "032831da608bab41018ff2f0db92061b6a7a0b6e062683b9c9670d34a3a24a9b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/son/firefox-138.0b7.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "480a81bfc263fd64f5b21f15f528b17d6c4c08a4e13dc0de01638ceec5bade8a"; + sha256 = "fbf6b279191a34ad5aeee8df6079f85354abe15d878d3ed6e8c7cf22dbc197cb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/sq/firefox-138.0b7.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "e8994f9c47f1c216ae2e50d47a3227fd920e334f9c53e96ce3730cdbf49682b3"; + sha256 = "fa24da7f059c775db85288d82b45619811091fe05e208758aaa3e7d186a07fb7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/sr/firefox-138.0b7.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b34b09cc89b7acc6760b59444deae3118e8a264464c43ed7ae0f661ddde2df80"; + sha256 = "40b39b98da5c9fe11e1d99101677653a6f3b769dbcb44fa316757ecc424d2db6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/sv-SE/firefox-138.0b7.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "4ffbd35d8f2a20a840510d43c68ec31cc5c4e5ac8d1f9638788de7bc475bc3c5"; + sha256 = "828670dde963bd02c1089b3ca4129e94ca2a38b95ad855011a5682f7b5bed195"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/szl/firefox-138.0b7.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "b8bec90756e184c933210f62c4e2781b483770b595b59bc584cbd3019515d010"; + sha256 = "85c72a4d5185f096e6e64e957b694bc0ba61ff211551d331c00b2985211f522d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ta/firefox-138.0b7.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "90c0fd4575a2420722898fcdb75be47117c4cba4e4134c7dc6160604492d2ab3"; + sha256 = "17448a508678c32ce76c4b3d960a11172fea7ae66452cf6a41cf881772f42788"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/te/firefox-138.0b7.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "e0e969f4aeb0e3fbede33448f54dbab6152c4cc055f074b1ae72741d471bd289"; + sha256 = "54584d4a85725e0ed8ba10a8773e41abcbf3dec22b1433c3246128d16a648dd6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/tg/firefox-138.0b7.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "2972258f7c79b91417b685f36725e4124717586742c2e0cb88b125240c8bf932"; + sha256 = "4c1ffb2f582b67ef98011143c10479b518a28396f191fbe98532be1b97e27b79"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/th/firefox-138.0b7.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1668cfca3ce4337d9123eb03fb4cbf066e60acd3e528af2ba82929b25e13b9fc"; + sha256 = "f600c76f1b55d2c8373d8371603cd2ad67269fb7e7581e7f96e086be27b9ec6d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/tl/firefox-138.0b7.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "dd915ce10336b633a2e6fee839042e1bbdfca3be1b2cd33f5d6a60a3b1544313"; + sha256 = "9aa162e3bed3673c24a0b241ab4c51fd04388fddedac3cb8e1164a3d9fe73428"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/tr/firefox-138.0b7.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "1b92a4497ad5b6c6138a8e524f97e94414be7722f38c1f16f4a0df00421943d5"; + sha256 = "c698ed9243c3c7bd7e015c014c04fa25a82f5787be5aac8569c02cee01b0d6c1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/trs/firefox-138.0b7.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "9f371166943947b7df5e7cc6bc5dcde17ff0eb1e668ef642238390849e516cb7"; + sha256 = "f63d4a03e7a1ddb8c3d3af5cdbf0228f00303d48a9c7aadaf0d842e543248fb8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/uk/firefox-138.0b7.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b1d791ade62dee626c53a6537e06ae71c3796b82f85cf41693b557f5d87e65dd"; + sha256 = "3669f03052c392d5b77f0d418ac9917889fa31b586d425c00f22a065f3927f05"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/ur/firefox-138.0b7.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7e2f82b259559f1673b65def0469803d1ef84a44bfde11d9d8262c7719ed5a89"; + sha256 = "5eb49e9fb6bb4340f76fd551478b02f3bfc6fd31fad1da697d985d28b15238d4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/uz/firefox-138.0b7.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "fc811f5e0d4cff736c746d0991d4b644e1efb3a2b9e300dccafacc177b9b8016"; + sha256 = "390bf6b6d3f94830e07aa5782ddcb54ab4c093321337dfa5e14a7d8f5d6f1e86"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/vi/firefox-138.0b7.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "2401b130fea83b803c6a7e3b1c9a186dbd4b2f20565c83d79510082f3fb4496e"; + sha256 = "165bdaf635e0a28aa5d613db298ba8deaeee612013d0196f9afab33c1158729e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/xh/firefox-138.0b7.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d343dd739ecd7cbb4e1c4c14a273c2598e13ccf7a4a2fe857f374ac068c66b9d"; + sha256 = "4a5e1a7695f7bf292cdd3837403c618592d18b8f688bc71c8dcdc4b13c974745"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/zh-CN/firefox-138.0b7.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "968a01cfc9b33b5535d711c47940940ae430bd88a7a8fe78ad90226f7c6bd688"; + sha256 = "b04cd8cfdfcef2b1a4b7499a5a3ef45b7a601103d38e90e8c8ac2c527c13ee2c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-x86_64/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-x86_64/zh-TW/firefox-138.0b7.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "18f8f55bc06909aa40d591791275c2909b986353a50dcbb115ce58bbad7819f3"; + sha256 = "c0339447201ce71a3cd645060165681c741c8aaa4b5d24df650cc0e5fdab2020"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ach/firefox-138.0b7.tar.xz"; locale = "ach"; arch = "linux-i686"; - sha256 = "241bfd3fb736c57fccd6ca3d1b8fce2f9b7adca4ca7cd5d2ab6d0fa1306b464c"; + sha256 = "82c2c87253d5f6db635ee130e2bc5daffc5b2ae003d40e0c7672f75479e9eb1d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/af/firefox-138.0b7.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "626270c7d3806078307ec4c5892aeb0e02a4171ef60b36821d915e46c7368f4d"; + sha256 = "d3806917edd78b7a74affc4abaebd3449ca20e9aba0dda7efc38c10ca70047cf"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/an/firefox-138.0b7.tar.xz"; locale = "an"; arch = "linux-i686"; - sha256 = "2022481eb37f24132f1ee04fb5314ebfec71cfc8fcaf58c9d1684495901966eb"; + sha256 = "780eb3fc8f55dbfff3bc38c19d873ba893539c16ce3255ccf5b4c35408d2be38"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ar/firefox-138.0b7.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "74153a6b1b0b27887b55e052af28a27ae61c6f5751ed81b262d24cab975a68de"; + sha256 = "1b8417808203e81ae6c54250525a327ea41068d46097c6aa305942fda3299318"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ast/firefox-138.0b7.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "424dc8b4dff35ef51800b4f4b52566a79bc405e666966b5a8f1ff558c23e64a3"; + sha256 = "fc4f83e7849b1a1a468a1b045703f09dff1a608af7efe9f5c03ada2a942c8208"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/az/firefox-138.0b7.tar.xz"; locale = "az"; arch = "linux-i686"; - sha256 = "e645b219739c18101e990cff962d8f33321ca8ae98755d79b148bf5b638eab7e"; + sha256 = "c46f3b824781113ec3d96f9cae36fc7395dea83c13906a7cd6c32130ec31a59d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/be/firefox-138.0b7.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "ae3821c9736e80c4599edd517c21a36d08dba130603aadcb190d47377ef6de95"; + sha256 = "07e6326aa99755b9e85ad60391d2005d5c48344d13aa684ebc98adf157d0ecec"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/bg/firefox-138.0b7.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "80436511e1756c5b18683a2f15d381d0dc69dff0a4664a24ec369531d5ecde7f"; + sha256 = "7267bc0f6c7a45221d668e1929fb9ecffea24c5e0f762f4ca996ea372f31a720"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/bn/firefox-138.0b7.tar.xz"; locale = "bn"; arch = "linux-i686"; - sha256 = "cdeefb356baf2d597630fbfd3e0fc72863e465f913ee70a42000e65829263c25"; + sha256 = "338c90eef66ca73445caa3f0c935fdf6ed39fe2e0664bde58bb2ab20b43d2490"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/br/firefox-138.0b7.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "3d29cf00c4a48596291d41a672a4d7778283f79b192994e7e19d548f8e2a3887"; + sha256 = "46f1e1644e4e205f408db4005116f0a33afc1a02fb9543b13e47963873eca0fc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/bs/firefox-138.0b7.tar.xz"; locale = "bs"; arch = "linux-i686"; - sha256 = "13c88efd322ef7000f3410b71b8ca8525e494e31f35cbcb4134f115d5791446a"; + sha256 = "13b6eb7e199be3b14df5b714e5ae7b52f5644d27414ca55900d92e337ebc399b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ca-valencia/firefox-138.0b7.tar.xz"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "0cf4e799c720b746cbb3b2ce66d1f31e510ace4af6e8d24b9657c4a2d7954120"; + sha256 = "ecee14386be5f86791ca991352d1f5847bf1ff98fe33faa3d73536b3368afab9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ca/firefox-138.0b7.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "ca3e36dbe4356a726aa798578125a8419cec2b498ecf7576ef03a68244633f17"; + sha256 = "d8420e5a41594234f62f9726bf0d8a83e4e20cf0cd4368ca016bfc8d75e21746"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/cak/firefox-138.0b7.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "3abd810dd4e776abcb0e27c68555fe3a3c3634232e583e332425a8981451391d"; + sha256 = "9d0cb20852c0339a6f874b0b03bbe04b378e93153d437d641b91e706e279c22b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/cs/firefox-138.0b7.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "b67229b109da0303fa6776d5054c8f09d5e074ace747025dcda51f624d55c950"; + sha256 = "23c7f46d1174921fae7b1f04673c0ad6a91278c1d113a3e10d5085ed6f88516d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/cy/firefox-138.0b7.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "ac10c1d50e9e65d0447bced09ce2f1c7c5cdc1486ea20c21cd5d50fbf60a26e3"; + sha256 = "d9afdb01dc24eae7e0acac20519c2f491b456afb8f652689bf1df3e5c789a8b7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/da/firefox-138.0b7.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "359c8d5d901e5b7f1dbf940b54d1c222386933f9269047b9be1c415bb5bcefb2"; + sha256 = "2c4056dfcebe8d2f3572bfe2383b1ec7d1ce8f50ae6be7f0be466c630d88c23b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/de/firefox-138.0b7.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "f499a68e6970a0a8349560a14b433fdc028b8f89a8aed961d174f3ae920d2304"; + sha256 = "07a2a24aaa9f2069db525455f974adb767bb21c19e62b0e9e6694f65443aad98"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/dsb/firefox-138.0b7.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "978dcd560c3053067dc88439a021da3db525233e303812960f13722d8b565486"; + sha256 = "fd3048a427678edb53d41b9c6965c27963a362ab274ba7475ab76e25372033f8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/el/firefox-138.0b7.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "fe13eb1a82217f31ae25989bd101102af4c17f5047d1470001e1983737ddd82e"; + sha256 = "fd6d60ef5b03faea68bbd3133d0b5a9385eeca39ef0b9fa1822fe1eaef059839"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/en-CA/firefox-138.0b7.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "bbfb5d88f47b04eb531f5ecf503a49f9d53cfdeb3744d5aa5594ffdfdc868a9c"; + sha256 = "47ae9cfb743fe82c797285caa71084d40f44a8ec27e31589121c7242474ab3b8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/en-GB/firefox-138.0b7.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7d17556817693319010bdd9bf625ac28a6a1f76901447cb8c9e5980bbcbfc93a"; + sha256 = "809842ad556b86bf5d13f09781930be24ad1d9a95b91156d14bee6f8eb9f1bf3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/en-US/firefox-138.0b7.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "8cf1837253bbbbeef57cc14a858b808b0f465280634ed1f09f6b9a0013e69540"; + sha256 = "0e09dd3df011e310b3f37c4b8cc4707730e8008e553fda1b7d192126ef03ae54"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/eo/firefox-138.0b7.tar.xz"; locale = "eo"; arch = "linux-i686"; - sha256 = "95cd145e05c6a2b1ff257440f6ef3d959d40a98b63508b817ae1ceef72ca68ef"; + sha256 = "e4a563c3c190e5f16b6dc68bf20ee185bb3ef2010ac8b0f9c36c61d33e19463c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/es-AR/firefox-138.0b7.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b678693e411d4216e9864b996444ed9771d981d98bbe9089bf0f54efe9c6a44e"; + sha256 = "29a3ffd8158843ef31bc72a597c885c906f13ea7716623928f4056298bd7fdb9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/es-CL/firefox-138.0b7.tar.xz"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "9832977f32038d256a2294548a397d2e08d9cbfc8eaa2faaca3b1124ce580930"; + sha256 = "cea3d6654d6a94c3d8b9d81c4da8febe0b339018943c61204e567c1487ecde2b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/es-ES/firefox-138.0b7.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a985f1574e382ed0c2181da38c8d72a4bd5406af86b7ae5f5133206576479664"; + sha256 = "2a55073ed04b1091dd3badb1b9dc16e53a120e6683a0ac749cbccc807933a3c3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/es-MX/firefox-138.0b7.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "ec4fb0ea84fb90367c3f3d7ec5503b05ceba3d6f760238fb1633114d32bad8a5"; + sha256 = "1bc4e310ea2a93dc5e789ea25030fe4575f24d3350c0e09b541fc22be91c03c4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/et/firefox-138.0b7.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "708fece51b9b7d82a3839d5cfd14f37ae42d91a2f5d5d760787a723f3e277c30"; + sha256 = "6a5680e7c67197b3cbd31c42a5c82ca88ee677abe91c23cf17e016fb056c62e3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/eu/firefox-138.0b7.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "d2b9b689f2506f1aa16d695f82fa44ad7e94242415b0218a9d2025020c53c2db"; + sha256 = "41ca8a720ca25f9c95bf3e0aafcd955ebf84b562347b7f78c8026484efd6c50e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/fa/firefox-138.0b7.tar.xz"; locale = "fa"; arch = "linux-i686"; - sha256 = "7ba25ddbd1cd32e2969f71c4642f02be307f5cab4c868f063477606f6bb974a7"; + sha256 = "9db17ec5c9f5d8cf59bd3e5d0eace6e6aa82b23d8b6b28f92d6b43beb3061da4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ff/firefox-138.0b7.tar.xz"; locale = "ff"; arch = "linux-i686"; - sha256 = "60c5a8f405177af13ccde738d51ea9c652a61ff30d644422e459d6a6016fa107"; + sha256 = "55539014cd36b1477fac3338e778a6f9d5f277f898305a9e3ecafa1581001a7a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/fi/firefox-138.0b7.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "eca85eff1de00cf062185e371ef5dc67cc18b284c4406ce75a5b6deb15420de3"; + sha256 = "59858f9bb2ec844299b9066e6eea42fa425f09ecbaa9b6e1fe1c0f55b7fb0da9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/fr/firefox-138.0b7.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "2c2bf1c002dc301a44b0ff5142b174d57b29e0c85f45510e6f9767a48bc77854"; + sha256 = "53bfbf13ab4461d48e773ebbc5f4d79fd21b2bc99a72fdb1fe02ad2fd7dc0a25"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/fur/firefox-138.0b7.tar.xz"; locale = "fur"; arch = "linux-i686"; - sha256 = "94045f9a29784ea0b212cfd5582c0c6298889c90f368c249a72685563c172970"; + sha256 = "cb5fcb431b8f06120eeced643131e02cbd3aa357e83e6ba26494e12755a8abee"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/fy-NL/firefox-138.0b7.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6a4bdcdbd00a1be4c02215ec6fa1ff8a6a19c47c95ff1e1f9a77776099f34817"; + sha256 = "262ad80ad3758940b9f79ea6ada05716c48c319b81689c4faad6b8a7403dd18a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ga-IE/firefox-138.0b7.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "3eaa3486fe84f7307ade5735f4bf7cebee2495c736f152e9a18e26fc4ed8ec6c"; + sha256 = "691e3bfff38e33b965bd091c88466f20c0527b5d5e4aa7bc2b6e8cc78a1399a3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/gd/firefox-138.0b7.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "77ca1a66ff56ab9e9591508da843058985c929bdf03e7e6737740bb203b8d56b"; + sha256 = "fd6df225e4ba88409aec798102c164cd249aaefbb903efceb3e6dc1b64343801"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/gl/firefox-138.0b7.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "357b4a0d8dfac5aec19fbaf8988bb10dff0662131fd3e7b4b700c6d01ebb5c66"; + sha256 = "ea2424dcbeab7d166eb8261435d92a7f7b3d320cf22347f4b939fa670bd79508"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/gn/firefox-138.0b7.tar.xz"; locale = "gn"; arch = "linux-i686"; - sha256 = "46d3446fe26763725b9f3f1c3d4fd2f9dd9e0f203405caeeba1584c807c11080"; + sha256 = "3578232b57561ec137dee65665e663e55f96351013836f30563bbded400e79c5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/gu-IN/firefox-138.0b7.tar.xz"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "b42afe9344f65c79da178cedf01f2a7de1b5855e55c70d27bbae552207048dd2"; + sha256 = "62f32417b4df18a653526aa8530c271c08327d942edfe1b2ddc50dcbf5b9db27"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/he/firefox-138.0b7.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "827c9e607e32da29f9aea0519dc02809eeae780446f28ec6ea56aa550b65c7b4"; + sha256 = "39f8c4062db93d1eaf31aee77ce41bb0e7bcfe6f0c5e5f1efaff4007f8a23e20"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/hi-IN/firefox-138.0b7.tar.xz"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "b32e38180719bc9d1b02e598f528b6988f7b7ef12db32b2fcbb6252713f22d7e"; + sha256 = "e535265a168998b2e874c2fb1ee7e8e3cb33512a2bf12691b4caf3d2f1b2ffc9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/hr/firefox-138.0b7.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "024c108905d2ce577e4a64c5f0674e6a116bd53f44e20ca22ea72e6f0a24696b"; + sha256 = "5e541b931fb7f926508094e1e0d96257c3ac2738bdb07d3f88f0f64a5c59bb18"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/hsb/firefox-138.0b7.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "1a61886b7eab21e900a78cab5191062d8ba752a761b664a3910d734f276b6c14"; + sha256 = "3ed0302d06f8fda57f21a8212915d5964c57bef76c0ed5d2efc5e039c4241c38"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/hu/firefox-138.0b7.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "560581c45fc075b80d50eab22926d257243ad11d2f965b08dc70050af6dd36a1"; + sha256 = "2785f316c78c7838ebe3799f2f6f826ac2fd8835a983ace01caf79ac95c1e2d9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/hy-AM/firefox-138.0b7.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "08616b06ac2f8b96e4f912a8404099e5204810cb54b9e766f868676e2ab59959"; + sha256 = "75245e9b01024eae59cf7292ec32f5bfad570fc3f9e7f224b497f5e44fa8ad2c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ia/firefox-138.0b7.tar.xz"; locale = "ia"; arch = "linux-i686"; - sha256 = "479426d19d2692e914ecff18bb13274d8bebd0ed7b45800e5a5f687f7fde601c"; + sha256 = "0a874f16702500c5895e248f7230c245a9115c09e4535132f826807b00f84757"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/id/firefox-138.0b7.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "c817854f19a10bb40c7bbf1bddaad5d2d630b678876b0764bda7d646c6a0636f"; + sha256 = "21114d8ba4f1ec3ab71b8f6b59ba24a8ad7ee8449be4de6acad6ea45d75b8d6d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/is/firefox-138.0b7.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "601248919378c1502a439df67d210f4a1bcb993aeff55b0603648c8bdecb74a9"; + sha256 = "7fc45cd282d08c719de85b2fefffe82fd51c89c281665b9bd6b9c592c5e0ac6b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/it/firefox-138.0b7.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "9ff2abd850ac415160302e9f2d4fca4251d276637f336070cc81b6eed96770cd"; + sha256 = "6b3728f3fbc3241c791d801ed35d353c047faaa0ac9a34a8095d556a4c6ee252"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ja/firefox-138.0b7.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "9ee6ccaad803abff3c364746a5f251b91a6a8e4495ed3e109ccf9ac430b8748b"; + sha256 = "108ac8e11ef9a975d41abec22d281cedf7f9594a7c8c7acc2cd8e9ecfcbb091c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ka/firefox-138.0b7.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "054f669a3f67bdae169a5b85902c2a7e5343a01d2d413a9c0733627673a16c2d"; + sha256 = "45f61884989b1f53db1579a945d9519586f03a8a6342b21e31488a3c1507e796"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/kab/firefox-138.0b7.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "ca4a798458fa494ca7af2b74fbf49d33fb1cd64c029367698c526bb2fc5fc96c"; + sha256 = "d50b916265b19eee3af39b178d96df34b0250269fc303d327138cdf4caf1d34a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/kk/firefox-138.0b7.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "7d231f884f66892bc24e96b9ad89a1c6e967dc8e10b1c71e1cddf1091c97d7b7"; + sha256 = "7e8b09591a24da144cfc18ce960e27bb545f10e4375d0c5f87340fb8532a3608"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/km/firefox-138.0b7.tar.xz"; locale = "km"; arch = "linux-i686"; - sha256 = "e51c8b4b7bc3a541049be98328deb6473d680c375ca908670f247499e84d1b87"; + sha256 = "1e538b6232eb0f8cf380b171ebb0a457d0f954ca57b09bad1beda3e00379b260"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/kn/firefox-138.0b7.tar.xz"; locale = "kn"; arch = "linux-i686"; - sha256 = "cdf3ae9d34b92be4a10953e11bc3d6b3a8a9c18b19598fda1472051a83ce4383"; + sha256 = "0882550f1bd56e4a893e8138ca3b947e4be6d3274de4e1f271bef1fa4c82701f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ko/firefox-138.0b7.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "c9003ee5bd269b3c5b3cfdfa4281d566a40e60fba32e85477f08e9ffe857e6b3"; + sha256 = "24262bc4823202d74b5a34dccc233c186bec39563779bb62298f3496fe692efe"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/lij/firefox-138.0b7.tar.xz"; locale = "lij"; arch = "linux-i686"; - sha256 = "32cb0e94588c08272d06836c52aa7240c0c5e1df6fc02ab1742ccf3b680a1561"; + sha256 = "9ff490b89818589d5e5e78b6aadee160a5d1c6087ca0f2a438b640420522f8c7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/lt/firefox-138.0b7.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "bb3e37d8a24a664b1df26cac5a3431840ed5d1d2c6ddc3e04a8bcc2221413701"; + sha256 = "c5d5a9593fd4461ac91ebfe968c6ac530f5754337c7fe87664b1525aac5be424"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/lv/firefox-138.0b7.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "e216fde84a125a443e5d90291af64dfa1e2997edf0a578bed18b3610b69408ac"; + sha256 = "64b17e92e2c32668cc3f70c87cde8faf2f2abee7dd24b24740486f179dae47ee"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/mk/firefox-138.0b7.tar.xz"; locale = "mk"; arch = "linux-i686"; - sha256 = "c30c9257092237f4e16d1215ba52ba0505040567ca2cf858f724fd881730d2e4"; + sha256 = "3b5bf67082b1e66d9c97b83a030e2ef5dc752f36a0ba689bd58c94841a93e22f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/mr/firefox-138.0b7.tar.xz"; locale = "mr"; arch = "linux-i686"; - sha256 = "9087eeb81d0adf624085fd0a7d5b47c1f5465cfe38c9ff735ea646c6da872c59"; + sha256 = "e32f654d1c2e19f9c63afdcb46896ada19b668c81d4fd5e6828402a784543799"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ms/firefox-138.0b7.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "2e1c6789f701187bd9aa05f4f6e015cc61a233c873dc57f0b9fab40f22a53c49"; + sha256 = "5738e6431e146cb3cbce5e5541c9b18976fe856a4b9ea708bd219b5eb0a9a59c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/my/firefox-138.0b7.tar.xz"; locale = "my"; arch = "linux-i686"; - sha256 = "0bb3121b16fbcaea34f85e04611eb9f0fcff7bcf9b395be60ec59638243a5fe2"; + sha256 = "d55d7cbdfb5f74bbc538262f0030f40a84e8f2ebb5b2e30250825657ad4fbb76"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/nb-NO/firefox-138.0b7.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e615eda12e42f9f766a8fc93730c7e92472d53fe9232709a0a922008610e476e"; + sha256 = "e866589650793411758c0c9bf0a565b72b536bc5387abe5b580a2ec12673a779"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ne-NP/firefox-138.0b7.tar.xz"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "58d8da2efdfefe4d94f82b999ada785d5710401698884bdd2229ff14815ab54a"; + sha256 = "bed7926025047db7c44fe4151b7cceb7c103d03bf8af397652be8bd924a5d5a8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/nl/firefox-138.0b7.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "629d72462592af1e08c2b249017d3d369969f0099a8531777e423fcd52b3d356"; + sha256 = "ee8f89a559726ca9997a1224bd5df2c0c9f7f643bd3c29f53581b5946b34cc27"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/nn-NO/firefox-138.0b7.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "6ec906ca83cca0ea031bd150ab26f862f3274e9b9806e7e98dcf7b245cc1e363"; + sha256 = "cc98a51a3df16cfac3e1462a1989cef897b8153b0d8e34eb55cd65bfde8cf27a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/oc/firefox-138.0b7.tar.xz"; locale = "oc"; arch = "linux-i686"; - sha256 = "1deda9a423955bc98e41a213a7f2f969c639dab8124fa5a79dee22557a5d8013"; + sha256 = "7e839e8595acaaf7682de705962a2b36b15137a4a04b3930e371ff04e43a86b1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/pa-IN/firefox-138.0b7.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ba196dc7a74a6991b941dc1c845febccc8bc93ab634fcd668b613baef5dd4397"; + sha256 = "b70f3e9bb5da8564854a160d0e627f4993cf771890cfa7b439e4de2d227aaee3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/pl/firefox-138.0b7.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "3c7fcdbfaffe9c5b4b48e42615df337dfe966564685672c3e8c51f412a8490c6"; + sha256 = "8d181ec90398db918eca6a1c01adde2a522f36670b74669bf373580888cb196d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/pt-BR/firefox-138.0b7.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f56cafb39c0cef5e1a43b7579ba53cb530ca2a0d3ba83452e13fd76b22ff7686"; + sha256 = "567e6126e872aa715f9b6c4ca7fd1f2f54a43fe18722fb1c2496107b0c29b674"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/pt-PT/firefox-138.0b7.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "cd1851ca0c8d0d6b13402985b2916123eebf5d499eb9587aebe0a1c8d1e6cee5"; + sha256 = "18e4edf85933b25548405b80b5c401ee54bb18ac9158e8e1a25c6f5ada11af50"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/rm/firefox-138.0b7.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "26350c6707b1157cd6c53ec9294c4c0d5caad4c95f940e5ee03bbca08353ec83"; + sha256 = "abbff59761b6661e6a65390bfa14a82e63ab5b4a17b84cf2690b7b405f33fc35"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ro/firefox-138.0b7.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "c087ab2e61a41d157cc2423894f0080f080cfeb74ceb92ac47afa6abd4780d77"; + sha256 = "181ee97fac8454ee52766669744dcf5817f951fb9eeb705fef42db87c3ff3383"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ru/firefox-138.0b7.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "8cbc728b269a14b1c735daebf44d27438721635ffae1b857f3725ee053909009"; + sha256 = "f7e48615a4a2ebd72c7e65ad76ef3601dae838ffd1a3c9ab70d5f2a8c864b188"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/sat/firefox-138.0b7.tar.xz"; locale = "sat"; arch = "linux-i686"; - sha256 = "cf49aba3c05d630c7d0fcd872e85a7e28cf22373124d2cb114dd1f1c1cc46b87"; + sha256 = "3f5afab0a5c741a7f8d711001eff302f1554a7635d66c0fb870fcbbfb7a18031"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/sc/firefox-138.0b7.tar.xz"; locale = "sc"; arch = "linux-i686"; - sha256 = "e8bac5ed8064bb6e8ba29f20cdecd4c40c827cb49cff71ade57550f9058520fe"; + sha256 = "be537d34fed5c39f66dac88030a4569cd733d8c69477b1c94e2a4ff430956eaf"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/sco/firefox-138.0b7.tar.xz"; locale = "sco"; arch = "linux-i686"; - sha256 = "ca868225a4cbb677fbdc97b5cab583784393a4f411997d4b0ba41df6889a9bdd"; + sha256 = "91cf5eea447ad484c68bc806ff386731f5271aba5bfc3a41d0ae1312675ba601"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/si/firefox-138.0b7.tar.xz"; locale = "si"; arch = "linux-i686"; - sha256 = "f6525c27f7c561c46b474e88e2bec0f099a49f2a36fa252a6331a2531c2fed3b"; + sha256 = "2a89de5d16792780d54a8f2778a40aebe7b0b7cbd9ee70a8177ceb14b633f171"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/sk/firefox-138.0b7.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "6ef895d29deaf359f6800b07e1fff3bab2a8d98ffe13148051a74723bbd540bc"; + sha256 = "f319e5ca33436f352f2e338fd222a5a6a586eba60dc5800caf68d70a3e3160a0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/skr/firefox-138.0b7.tar.xz"; locale = "skr"; arch = "linux-i686"; - sha256 = "75303e5900e977788c6741056e696081a6b230e90e3fc069111109d999ab0a3e"; + sha256 = "d61ab175fc31703d24832a266f3cf99e15e1aff426dd632a7ab2654f50f131c6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/sl/firefox-138.0b7.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "a3463d5cb2a93a0c07bedab3f90e5cc9388a8ae743899373f23cb3f3d8acce18"; + sha256 = "b3a4ebcc906472edb50681011e9bc1c6d6089d258e055a72aadc53819bb30f8a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/son/firefox-138.0b7.tar.xz"; locale = "son"; arch = "linux-i686"; - sha256 = "56a0157e7719d92b4809c9c0032ede72c5467f256fab9a8b9836eec1fd1d954a"; + sha256 = "5be0c12e0e83bbea7b053b4df51ba7320ff0e214822ce14e5d14c9e44971c9f6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/sq/firefox-138.0b7.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "7340943d13b1528cbbc9ad679e4b1a83fca9077771819f023148360a1a306a7e"; + sha256 = "e5a6db327af4d67af18065f1a5d18e2be7bf9ddadcb503e8575e101250bcdb66"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/sr/firefox-138.0b7.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "21a866c1d1d5ca34a9757426f2b30e0f2c6f192611f75528053ac8b7a782962c"; + sha256 = "07994f4bd7508703b7a5139d5d8477f393456db89cdadb0a51c968f9f464c4cd"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/sv-SE/firefox-138.0b7.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "f7649b0fe3e21e648cb7a3d919c3afe0d12a2014910c0d18f283a8f4fc20d699"; + sha256 = "82ff6854db693f27657f7debbdbf97f43fc3f60f52da7c8bd3c87534697ff4e7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/szl/firefox-138.0b7.tar.xz"; locale = "szl"; arch = "linux-i686"; - sha256 = "090ae85a47343f047b944caaff56936eec5475c2e80aec85b0a254b3e699d3e9"; + sha256 = "9eb87a599a91d17956c3e9c7a7b06a8e7ab9654eea65f71a3d7fa5090a89f117"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ta/firefox-138.0b7.tar.xz"; locale = "ta"; arch = "linux-i686"; - sha256 = "98a40f6d72087cf13b62683548fb652573a306a861209ea6c7128a068ac39e10"; + sha256 = "c4dbba37fa0a342e8c6088f479f42b3bc8c3d53f236334616bbd14a8dabd8df1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/te/firefox-138.0b7.tar.xz"; locale = "te"; arch = "linux-i686"; - sha256 = "dac190685a4f1e898923d293fb8ce00bda7fec4a585d313ae763745975edfe96"; + sha256 = "909784c8df2dcccd9e00fcc87bb3d6cdcaa95da4654ad978a11a66a645de6d3c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/tg/firefox-138.0b7.tar.xz"; locale = "tg"; arch = "linux-i686"; - sha256 = "15a4e5df389619e4cb4dcc7e677128ef507964a1fab09abcbba5b58d22034845"; + sha256 = "19ea5484c1f9f99af606a500ac6eeecb12dc4f055a1d01646f1071907a36af46"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/th/firefox-138.0b7.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "5bab501cd8bf43d425b4b001eecf97d093555ea64f7b4abaffa2d2d9b749e808"; + sha256 = "673f47e625f03623772ad524381ea0e1a8a602410373b99b4cb71924ad765add"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/tl/firefox-138.0b7.tar.xz"; locale = "tl"; arch = "linux-i686"; - sha256 = "55cce8888edab61cd71eb96c2cbd750b8612155ea552f7269a22b8d317a5c9b2"; + sha256 = "53eb82c341b3c6f47b0c1771399544de8fdef59013a359062ca58016d38378b5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/tr/firefox-138.0b7.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "179d90be324596a3b7eba6f0e3ae786a487d2bec0a8103cb8a9c58bcf0ff1dff"; + sha256 = "58cf45699c6755973d52bfd383059c9e0136307930aa8ada6898b48269ffe4ee"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/trs/firefox-138.0b7.tar.xz"; locale = "trs"; arch = "linux-i686"; - sha256 = "637250195f8b71b705c0468c9098ff3865099b662457aad201af10b6d38f2003"; + sha256 = "ab33fc658e6d8ffda3a78979a46bdc10b5417aa6895670fb1e9878ae9d87fc6a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/uk/firefox-138.0b7.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "2650614e2f867ef58da5295071ade1ccccab829433c6139766cdfacc600559a2"; + sha256 = "e2cdc873128c95e7e30fcdb93f13ce8a64d5531508d0d2db8acf1aae604bb697"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/ur/firefox-138.0b7.tar.xz"; locale = "ur"; arch = "linux-i686"; - sha256 = "b9612a871b0b092854b7dcc1421cb0a00c2bf4f053354796ad78697da6b1eef3"; + sha256 = "45f67ee0b8275e62b95b8a83f4dac483a0373c374264e8bccc1d24cf72d9be3a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/uz/firefox-138.0b7.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "3b102ac2ab5989ec486e7bbd50b2b9693ef62a11e08adb243c126dd917cd7c3f"; + sha256 = "c2dc005b058a65a5d5bcfa2b0b3368e82696b66428a2aa444503afb303b7a73a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/vi/firefox-138.0b7.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "fd8197d70795cc98a4afa2a4c2c87a111ad055c634040cb6c51c0403c6eb57ab"; + sha256 = "2b6cb8f3ff3ac076e160bc3c8e477a5281cf78c78242e0a7f7c99c1837c626cc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/xh/firefox-138.0b7.tar.xz"; locale = "xh"; arch = "linux-i686"; - sha256 = "6777cfa8c94aeb02e4a22646538b4cd040d8d6dfe81cc03a6c011c9464c4d4d0"; + sha256 = "4e17e93d6267555f72cb7fbc01c569cdedff5b03327499651062a8b9c3c2e75d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/zh-CN/firefox-138.0b7.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7a8f8ad9dd677bbd021856a60b98aabe85364d4b40668f3d0c0b141389e5c4cb"; + sha256 = "ed47d919d59e8f6eb6e2b646ba47f7c09dde321b85ffc81589f12fa6d92e9d76"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-i686/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-i686/zh-TW/firefox-138.0b7.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ce9501fa8a8864e91dc03c2fd1678d9d21e9d25aa037547aa8ff766f3f93469b"; + sha256 = "16b96c4f8a09e54a9efbef8a230f1dc254982d5eb7ac41c68ab89c34285c02e1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ach/firefox-138.0b7.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "b14827b02d8033f9b0947d646153d9b0501bc69706615d27c5f2bb3a370658ad"; + sha256 = "3b196277503005df9f969bb1543ff861b6cd42731cbe11bd80eecc7e43c1ade7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/af/firefox-138.0b7.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "116773d412c066678e715a1a670465a5eda4afd02eca6ac606ca3a82c7014151"; + sha256 = "4c4c1720d79ad857c343f139cb5858b9b762cd57f37ce11cddc551884bc9c046"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/an/firefox-138.0b7.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "57fd77977b3d0858421b5489b0776780e61a1c931fd6871eb6e029bbb564a6c7"; + sha256 = "1591a882a0e01e85d5d6558cd4cc32d2fe83f4d2774fed899b20162801abae9a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ar/firefox-138.0b7.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "26ba9bd54569b1d8aed27ecdf7bf3303ae2914b7402e39358dcd32259563c5e5"; + sha256 = "f401ae073f054e7961898e2002281457a67434283293a2777b8ee55d8e3746a5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ast/firefox-138.0b7.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "4769814dbc43be2d5e1f3ed869629988e3033916496283156d46e26753312d21"; + sha256 = "c3dd45c3065affbf8c9659d17217e797c305589a5dd45cbc4429dfa7b6278af9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/az/firefox-138.0b7.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "a740ca8fd7bff0663943f85022b3011713b8238b2cc0516567d0aa0874adb342"; + sha256 = "7e6f798ba0bd0498eda602f138c83865046eace972f4dd7f3a2dfc2dcbd68f44"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/be/firefox-138.0b7.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "8a1c6787c7966300551b84b01926488f26ac393dd7c4a502eaa418749fb7749c"; + sha256 = "b9b7e36c7db06ed69e63206d398fc5383308b4c2fd39924ee79c5162e6441831"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/bg/firefox-138.0b7.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "7ac0b72a4be4c2c90cef42ae4f6c304cd53d49de19a2665275ee9fb37bfd3b9d"; + sha256 = "6a2a894f19ac8299838458aa6f29a15ed5018b018e5de3f79b490e18ed54bf4e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/bn/firefox-138.0b7.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "6fae4e0cb0975d4c11f5d3baa57a4fd99e137e1c74ccb875b081397a83fe1b5b"; + sha256 = "e2551e717cd11894f59d3f0c31f4b29b1e06d559173e8230404baf984f803d7d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/br/firefox-138.0b7.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "313fd02a196551870f020762ff76921a6589a5f4091d7ff363010bf5718b206a"; + sha256 = "906b66ff21ae7ce07aac26048b94eab58ce97aa625d5934631c82e4116c41188"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/bs/firefox-138.0b7.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "f23778ae091b5ecbc2dfd1d9a734c9e8675251257343da0cb224fb942803ff31"; + sha256 = "f9195437102901f1064ad147ebbb13b62ad67dffe7ff2f2cfcb1eccd289489da"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ca-valencia/firefox-138.0b7.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "b6e5ef1fc584b3ee82341948f25663a9c8a16990461244529f6da76b0fc2d683"; + sha256 = "383b476b71cb2388c89ab67876fcaeb1366706babef769d819e10b87deddc397"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ca/firefox-138.0b7.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "71e53ffc8921b375ccb66d085cf52df3d48f372d823e7d322beb6532ff087ed0"; + sha256 = "efc0ecefd65385241e3002a94707f798da83062d955262c8e8177c466d8fb6fc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/cak/firefox-138.0b7.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "54caa651cb3d7320af7a4bdbe9c6f9cb2385cbe652d23a04414b0e884ceab930"; + sha256 = "736255656ee54d35d6ec58579c95d638c87746064f4dc3e4fc9ecf70ec830095"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/cs/firefox-138.0b7.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "39b7d94a01a1a8e306c7874257b36f9d60dcb75ac0b2d2f11cc60ae62a9fcca9"; + sha256 = "42405a06e3546bdeaec8dfaf0a5a946580f5ca2b61b9c2618ee744beb5dd2bcc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/cy/firefox-138.0b7.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "c8feb0f86ddc0b7c9e1339749c4f11104f3fa08a47641cca55f511ad9be7620e"; + sha256 = "fc30088851a876897b0b8c5518e3e43fdad61eec91defec5214644b3fabbc90d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/da/firefox-138.0b7.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "268bcc11e17fbceee75bc124b823abca626c2202be449cfc9e69633a8db5fa60"; + sha256 = "d26d5e1aca46c34ff6c37436db222671212b921d7f21f403bdae1ab378dca4f0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/de/firefox-138.0b7.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "cd12af18f53d550f15e53d05053930e487048c2dcfc5c950bc1d8de96dc7d4a7"; + sha256 = "e2494b123723b573fbace51a39aef7c4bbfc9f3d371d60bd8b21534053dc26c6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/dsb/firefox-138.0b7.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "84471a1e3c44dc3089b891b0bc254a3c50bf5b7996ccf564af2b0754f4b68ed8"; + sha256 = "f3cefb7ab04a7ad3787e326a1f7a25127e285468ea9c29abe91b90bfa2deb192"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/el/firefox-138.0b7.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "53216fe70b114e96939fc3dd313d5adff92b04f13a2bb15866a6745a95f05acb"; + sha256 = "18e759e3dd6a7d64549428ee58cdc5abf99e199dff7e8108bae0d4ec1145323d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/en-CA/firefox-138.0b7.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "e4daeccc139e265ac87a884c207bf9b94febe626cebe22850cb0e705206a5e88"; + sha256 = "f59123050424c550e09a40115d61dd3356a6e2c38d975618f96f7f2a1b28eadc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/en-GB/firefox-138.0b7.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "b017589a1d99a575d9bd09be2410a7d2c3be1e347af2e569bd46cfb15c02a36b"; + sha256 = "5c999fca7a054beb4566d9c7a6322274dec7a77ceb276abbe18784fcd41e54b3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/en-US/firefox-138.0b7.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "ba85b43e51e320929dc53f40d7526e8bd95a606faca373dccb5c2db710564906"; + sha256 = "4dfa71b44101481e2b3c24133753af4fc89ef67f8d78cca03f687e5561e104d5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/eo/firefox-138.0b7.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "d16d4daf9d036737646acd3b958ea5855ff0029c65160f93ba6d34eb41c05f7e"; + sha256 = "add402adf44e69a7c70dd5628635a20dae85825d29c6513bde49c0a3713abad8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/es-AR/firefox-138.0b7.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "d2c7d9f5fa294897960c8ed08c162094e85b95f4413efdb263aaf9313d520a9b"; + sha256 = "3d061865ae2248b82d48a547bf7a790cc7a3738c8b504f9777c5733ef24f8572"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/es-CL/firefox-138.0b7.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "f4df84cb23193c2161cd3dd0c1de38a051529edd87052ebfd2dfa0cac50b30ec"; + sha256 = "83cf44d063db1cbb0500c7db456377eb2511d7b87decc7efe1e0864ef924cc71"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/es-ES/firefox-138.0b7.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "d734abd1a1105fbc10c5bf9baa03a8756501a277701977bb7c3ef677c03bcb71"; + sha256 = "06997992d5a1de81e5feb78c4259b8aa54ab79f3eda23ec24b620cc1836dab70"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/es-MX/firefox-138.0b7.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "2ed8ff03d40e0c3ee6792a4a9724fc27f1f49eb9d6f444ddf851ad7bba1ee6a6"; + sha256 = "21911f988a6a69eb9cfb1ed67199eb48e35922a1641c290e996a2bd31a534fa5"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/et/firefox-138.0b7.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "b9a4fe035ed1225dee0ebf4aa1ab04c16056b622e4ef839d84b3463f3b40a5f7"; + sha256 = "986ca26d910b6eb23944c6cea9933b16cf8dbb849f5d5c9394a806293b4d628a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/eu/firefox-138.0b7.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "7d7224828e0a051cae205043fb9d335ad0646f83c3676c96c57632592fce53bd"; + sha256 = "c92a2d15ed2643501b20a01ef41c23331214e4f8f973acede13a070c99491e1f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/fa/firefox-138.0b7.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "47002006a12d86ec80ed31e3e0b9b95d3a3f7fc04344d14afb988833e632df24"; + sha256 = "dbe2930eefa9ec5de73803d8df25332b50a9ccc463445318e344091d7a37e745"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ff/firefox-138.0b7.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "02cfd21c1e9f8996746e6c5ad5d2d331d7f17a86805ddc70e9edcebc43599687"; + sha256 = "b40d33fa1cb6c635f9f32ab353006d1cbecdfeb7cfa9fa409c9e2e5a1e641e3a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/fi/firefox-138.0b7.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "b9d0e43833fbc7d3e743b132bf7a01037665dc21429a634d27bc48783bce695e"; + sha256 = "14f31a1c0bc7dcdbddcd0bf8f77fc76e0b07d88063b0aecd192e71350e1ea071"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/fr/firefox-138.0b7.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "2b631987fa063485d7dba06d90cfc054e278cd4be9b0d38a8452691f817de518"; + sha256 = "90a857a5ff729f082d9efe2836758a5a9c3657bd903b83f4ff0f31c351452d9d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/fur/firefox-138.0b7.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "a09f81844bdde33736c9a94ff21245b92766aeefb95df3d0fbb4c8ad622e65d5"; + sha256 = "46b92c4ac920d55ee56f91962d4ce3950cee6db210c1966b6c2e770c1c4ee254"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/fy-NL/firefox-138.0b7.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "f0cc57889e572a51b1c92b955a5a16e254a97d64a763ef09bc6677845a99e2e0"; + sha256 = "05120cf0443af71dc59429bf17ad3cc6dba34e6327833030b7358cd2e4223b99"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ga-IE/firefox-138.0b7.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "62ed774d6fd81fd79ddf6d8810646bb14c88b9231b3a029ca5cba9286e562733"; + sha256 = "1831a5f2d1459c59641547d365b3e5580e9507fb212f6ebbe75b3d81559ca958"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/gd/firefox-138.0b7.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "ab020c5d89a00fb8e25313b0ae10c15c8a9471e88f8fdbcaa701c02b4be97d72"; + sha256 = "970724b0375e8d311bf96c657fab37943e185efb7047e6ace7d8edf96f5949e0"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/gl/firefox-138.0b7.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "b51f3e0450e4725b73dc13243dee90a68d980948add5ec8ba9cb2fba07dbe617"; + sha256 = "9dcb3ff8bd2081947b84c642b0cb950c8166bbbc341ccb437e64b3ae5ed0d03b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/gn/firefox-138.0b7.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "7bdaa29b0efcc4d4d8a4f67a93fce6718d21cca6268500e67f35b4a258e84686"; + sha256 = "059a2578855b0b54d26e133a936e9aa0fa6d08178397c0a371700aa486e673f2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/gu-IN/firefox-138.0b7.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "dfc02495938df3205cf053b5fa80e481bba1799043714c218bf218fe3f6b4bf5"; + sha256 = "8fcb88286518948765b1940152621c29e8a3a68888b1bad20ad3782201d0c073"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/he/firefox-138.0b7.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "2e012e78366da7d4136d94b4162089eaf93b62972f418105475e9ed500da6bb3"; + sha256 = "40e1193a32f7867ad96e70211f1fffe4be966730ec9e5a2de6f62510bc46ec18"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/hi-IN/firefox-138.0b7.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "78622250015e7fe7e185e7f0f9fb7ac23222fd6a89a99c17063d2598f4a489fe"; + sha256 = "b4b22f94dac456fbd8a660abffe79c7e7394efc699f0fa9efe64d0ade69a47ef"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/hr/firefox-138.0b7.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "97664b504a19b2108a42a7efd79466a9221fe1765ebc996abba229ba7d3a9228"; + sha256 = "5066e48164d76550702532513057746e43b09903a1253a5b21f8a87277f888b7"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/hsb/firefox-138.0b7.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "5038938ab909b2c4cf174eb4a196c42ce1bb02dbe99c7c2862845c5e014ab935"; + sha256 = "3f785406522834dedc9382b084c7ce32d12c9fdf37a62a4dc0ce1272f6900e93"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/hu/firefox-138.0b7.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "20d311f0e5aedaa10797cdd6bf55df067e3dd28716af12ab767f2dea9569ddd0"; + sha256 = "299d24c1b80a0ad9f78700d7b3d3f9cb76663acb065bd28565cd2f702695c2b2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/hy-AM/firefox-138.0b7.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "ed0a1216b7b028db0894edf37fd6ab1d1b714127ecbb35b1876be6be209b712c"; + sha256 = "85a5fe260697ce9d43757942a0066f9dba374b8728761fd5ad1137e0c01b6425"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ia/firefox-138.0b7.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "a2a44707da571df52264f6cc488c2e3848c162f765732e848e222ad3d2c484ab"; + sha256 = "83d85c15764744e8b077c6a06b01b79f5145cdc8425a2325b5270d3ee750b812"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/id/firefox-138.0b7.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "a062b0c638c4346aad47290fe391ca1a73989cf306ba5767b05ea00ce4bdd407"; + sha256 = "4d86d01fcea88982521d63852799b2a2de37e86acfe1340d49bd7dc53ca08dfc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/is/firefox-138.0b7.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "a4fda3f61bd2936dbc93a3a5fc80adbb63ef12f58dd7b40338c8d3a7755c48e2"; + sha256 = "2efc236a034389823e36c7b17232949cb0d02aa85d666e54ab1eac17094d5635"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/it/firefox-138.0b7.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "28c665e6924ab2d621ce7b18bfe657baadacb9b9ab70b388f5fcb066fd670e00"; + sha256 = "a6b71e4fb874c35e00ee58e11dc797612248e2f90fbc3ca93ac92a972d03e668"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ja/firefox-138.0b7.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "1b34aa6d3239d3956225cbc2aab4ac6cbcdb1e1a6dc567c7df0bb104d0b58500"; + sha256 = "05e4cd8d61f3db19c2fdc565291de72cfd562a8b681f5eaa26a9cc800ff09660"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ka/firefox-138.0b7.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "b121c05539387cffaf332f69c59545ee177a7e6f322d8f4eb091e37328225e60"; + sha256 = "162e1069bfc3f67a77117bdd24068f013a661c03c1358740f9cace954b4de6a8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/kab/firefox-138.0b7.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "1436340a158db39dc55cf1fde411581750fb14547db7dfc53f6d415677bea280"; + sha256 = "532502d6b0ad9b1bd07cae59bf180f6f048591cee3ebc933b28b890d7fc3bdd3"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/kk/firefox-138.0b7.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "e2b20cd5c6cd4325f79148b6804cd4486794466a444eedc5473f5db1540e6b46"; + sha256 = "cbdd8ea2f73dc6713b46b2dc0c0308ecad5d0b89d5198d4de2a0431419d4fff6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/km/firefox-138.0b7.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "59182a3016621019f3559d6ec301face8469c6555f914805bc8b9ef0430246f9"; + sha256 = "877882f3ad72e7b84882221db20a820a50bb535fd72e670899f25de44f4ff7c8"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/kn/firefox-138.0b7.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "8bfdc4d580120b2ab22a7e5ef59564ea9d56b5998a13f4c2125a997edc1fcbca"; + sha256 = "32213f3ed05dcf7724d35d3a61deda6cff9bf73878ca489cb22b32e992916279"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ko/firefox-138.0b7.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "4385b028d0e1fe5c0cb1c8cef7c926b64c4ac195e81b8eee8bcf19214489e303"; + sha256 = "55e5a8581d2c33508fed7c0429c66f5ff4c9dca439a8528c08cd84c6765cec6e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/lij/firefox-138.0b7.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "d062919de7bccb04a5c9c02a32749ba6ea6a01c3be3a284bb2c7d735b4211636"; + sha256 = "bad6c22ad94060bed5dca45502b0471be6537cc39a728709eda238618ea49464"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/lt/firefox-138.0b7.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "1070a54c1c490d6dd81a0195392fd49d8330e3b6b1d2d5d4642989bf17250904"; + sha256 = "093b2db2967d5c0c8e6c1b99d0ce0413bdc9cf7d6791cf3cd67a30a149db62cc"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/lv/firefox-138.0b7.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "a0ba18b4d9e1df89550f3c480f95c0836e7c213c434730b8b8f31836dff641cf"; + sha256 = "b27a9ac8b9742388fc532cca20cd9277a54c0648e7c2d8ceed2609ac6d984aa2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/mk/firefox-138.0b7.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "5d7e6eb75a610cf7c8d70f35f849f72d1f67bc3e352e9d19ea61efc4b529c95a"; + sha256 = "fc9a5de9be288315f26fec91d48be673cc8c622da85e1408e2e2a6eb382c55ca"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/mr/firefox-138.0b7.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "0982f46ce8d49806b7b08f943defe1bdb6ce97dcdea13a1344757dd38f7d2f28"; + sha256 = "577d6953dd6d6ca5515cb085d66f46f9f8360b99a52bbfed302d098745dee03d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ms/firefox-138.0b7.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "308e8b51c62f129f2d0ef36961317e60e9392c91c8cb07dec4790baa22a55fe7"; + sha256 = "e019304641d77b7ce4f13a392014575764b297eb05f17b520aa81c03f4439e5a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/my/firefox-138.0b7.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "8721ff8b897bd4106f576ca14c33ade7a111d4f0738b370ed135d88dfecdc77d"; + sha256 = "23280f7ba14f2b845646ed0baccf2fc77d03dd4822775d9f184003b7f06be094"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/nb-NO/firefox-138.0b7.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "e22398c03075edc7b0e72a7db7545987f5b8131bfec1e7d5aec40eca4baef5e2"; + sha256 = "acb68b82ee7d04d9992bfb0e688d2d3245ce04ca90825fd7bf2f1e218ffda227"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ne-NP/firefox-138.0b7.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "da03ba3b827f2f5a16496b58476256e1b537562afae40e532d9908c08cff53c6"; + sha256 = "ae8d2d6d50ea13dfc5436fe32b839594f5b2e6184beccc325d452eb6152a9d15"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/nl/firefox-138.0b7.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "a9ca74aa38f493aa447f1d1cd98f02a09af8164a1dadf4871ff6c13d272a32cb"; + sha256 = "8dc3ac4511ee746803c8242085dccc64db983e84553154c50dac8a8bd79010ed"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/nn-NO/firefox-138.0b7.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "5037a6967c6e0a4ce65ea0d55d42d374a67e30b474d5c4cabbbbbbd8e71f763c"; + sha256 = "20a4e45dd710ecf86abb69adf1833a7e99d3ff91f43170300fae0b3747df56b4"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/oc/firefox-138.0b7.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "45829a8abef7af5cc69a98425514d5283ac7ff0d5a43135116d8f611e0c6d894"; + sha256 = "2775cdd62550deb832c8d5f4c0bfa2fdd26da6fe64d5602ec1b22709c4d3abc9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/pa-IN/firefox-138.0b7.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "6d947501e07f9ccb0ef2d7d2e0fd03a25aac80d689f097576857bfd54ffc86dc"; + sha256 = "ad81fb9bdc397a9b43f8024092117cd57c70f5e83c9d658b6cbb4b61e34efe0b"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/pl/firefox-138.0b7.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "d64964272790495418ae3769c1a06ea6aac6890128788aea3384f9f24ba3432f"; + sha256 = "02d9cbbaed272187a403adf80670e59bc752b090235d752e49202fd2ca80be67"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/pt-BR/firefox-138.0b7.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "fad049de235b576677d314c41499306475ecfbf32c068eda19260c7bbb7b1888"; + sha256 = "8b02a569ead2a0ebe711e43504c328a2389016a81bb407b3e19d5da8cbfe1d6d"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/pt-PT/firefox-138.0b7.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "8d8438273bd586706b40e69b629e5025ff36d8e4af8deba6a0690c2352d7cb67"; + sha256 = "9dca92b6b691f5ddcdee0980678932cf308152787f00e0080a6efd6faa7f87e6"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/rm/firefox-138.0b7.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "90f79aaa4583f08c51616b8f18da8d7e0f591646d2aa9bf4334ff7c9d36b9e9c"; + sha256 = "26c27b3f6d4cc1107202802da71ffa89e597333285d236712a5e2a979d9d77d9"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ro/firefox-138.0b7.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "ec5747d75c65f1635a534f45714d56628d29969c511112434d04bbd5675b8ea2"; + sha256 = "cae8fb5ac0a106ae2d3d297a46006641d3e6276df80606ecde9cee48583d1df2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ru/firefox-138.0b7.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "107bd63559ed5ceb1a317f3594a3aee58cb8a3531c29f76168d20ee7413eecec"; + sha256 = "980cc3556767d66b5e9d5575b0d500645868e6196ee5c666fa2486a3173f3e20"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/sat/firefox-138.0b7.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "d2f761796294275f5d0b9cd42514b2c0f0a086f7948263a1145c730d95225e4f"; + sha256 = "fd101a85ace561a7917c400fe9a93332416c253f5b055439ecf2ee3357214ca2"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/sc/firefox-138.0b7.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "341bd37605c0c9182a13cd329f6449a460af43c34b8de8e6a8df88f9cc34c41d"; + sha256 = "220984510ef0586360b034884fb1399a35da86cea1468bfa9d1133733af5380c"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/sco/firefox-138.0b7.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "eda7138831b8ad021e80cfd249e06e3996edfb83a85eea4afd9c2764b2ca9e91"; + sha256 = "5c98e111ca6cae248ab4a5cecf94e85f0be4df39dd02ad23fbe1c98015681a9e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/si/firefox-138.0b7.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "e7b7a3fdbdcf12c8f7e2d99990ddf00bdd58e89a0ec83887cf37aacd8775e630"; + sha256 = "75c848fe0c4373b46267ad06207f9d2605268d8f1a0f5d802ed7da3275595bfb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/sk/firefox-138.0b7.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "fe026c923c57c7a16c1aaaa57befdf40fb97cf4e7885281e9fbc56c7f4d1a7e7"; + sha256 = "ce4a35a22c3f99fd4baa4e2c3109211f8e0543b8a39b136ae5ed2b6e21f7ac91"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/skr/firefox-138.0b7.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "3c5226eabb59eaa03404cfe9d7aab17c1d31136ca58df86546432fe21e345699"; + sha256 = "568945d795198946504ea118d85f195b802e7fd08a9ba9fcecc57cb401f35517"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/sl/firefox-138.0b7.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "331c9d1aa95304e729c7b245912e5306d503a807e4616f190cb189e283b78d68"; + sha256 = "7ebfbbeecdf1bc04fbf5b31ce0f91109e3412378ead61414a6306697bdd03110"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/son/firefox-138.0b7.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "d30873e50619b8572ebf4c4b8adb35c83b9c1458a7fe31f539daec50a9cde994"; + sha256 = "a094289528d2f1b31e174cbe3551c5744747a955d3341c1b0fac38672fd21e2f"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/sq/firefox-138.0b7.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "272a828677668effda1b4eeba469de91fa3e76382b43012c5cac16a3cab9f20b"; + sha256 = "88a50d4a29fc8ce3b30e60c0ff3bfd3e504e611056833bf84a4aea8048157220"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/sr/firefox-138.0b7.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "5e5066a68f1a71da4cdaf0efa8b02fc68a9c91ac4172543442aa116c232d4e15"; + sha256 = "4b1407e1fd2bf6d91e239ffb4fe1dd809148f1332dc9bda76e1d379020d53320"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/sv-SE/firefox-138.0b7.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "23d47b8d7782ed01c531ad3bc928aa45e9c6a94bd8bd3d0ede21e35658a3c44a"; + sha256 = "23b4e53da67d41f863679210d741e7eec588a5874506b8e06193e2f46ebbafc1"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/szl/firefox-138.0b7.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "c62a0fc9802c5d619e0d84e424af994775da65efa0e47c1860acba756f98ad36"; + sha256 = "f3c1ad7a5bb6ac5b7ce711995728bb32f6c1b8226e79f9e14aa037e2709c37ac"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ta/firefox-138.0b7.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "aacfdd55a392c3ca576c0ef4b019d4fba3bcc5ffd2f1146ee5b271f3657d3cd8"; + sha256 = "9de6e29250da5f1fbc982c30dedf05710e5c1f01be5e5c137c53604294e14f1a"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/te/firefox-138.0b7.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "5e8029dcfc510aabfde5b1d923c5fcdc752cf44c600d099c35d12e1d761b4102"; + sha256 = "999795333abea2bfd2d4b12b3a7a04659f9e297d9b038ec90ab056d5bea6b325"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/tg/firefox-138.0b7.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "0e451b0fdef31cb180a3f0b6d1b7b44dcf282d07b7e8f93330ef6d2e5f2cb032"; + sha256 = "96ddc227ecf61c666a2a46800582992cdc4dcf4730d5495cf95b6952bf2fc032"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/th/firefox-138.0b7.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "470e07988caf6b7a6719dc97c7a1ad8efa99a05593a5cbe215b5dbb47bddd8c1"; + sha256 = "6b6dab8bd8a146cda141b544c66b5bedbcd03c00ecc0668a80a689a4a4b3a42e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/tl/firefox-138.0b7.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "0ad4ddd1eb47201e9db424759ce8145f84f314d23cb578fdc79056f55ad73880"; + sha256 = "87e18e3fb92be33fa6abdcf55604b050e6e1f616499a375a11e8d26381bd3313"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/tr/firefox-138.0b7.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "189590bd759e39eca2e6e0070c9ffc011f0d08f9588d0db28baf9245ab212cee"; + sha256 = "c67fe64d226a4677b1d1850f7eac39933145874172780e48b02c37357fd3131e"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/trs/firefox-138.0b7.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "5da9c02d3243101c8f13707cec43d9dcb95901269cb8721fbfcc2d3fd7b35d7d"; + sha256 = "914e05cd142834c79213901acbc88bbf04f0f7d4e3383be880e05c8e3e6cf001"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/uk/firefox-138.0b7.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "2cca8fe62ae8b45bc0765eba43ebe3f9741ce37dad821019e4fac68c478f82ce"; + sha256 = "7aa6e8d978e08ffe357be73c375c187c92a3e3ea36ca6f605190fec97854f035"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/ur/firefox-138.0b7.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "6964092fba73da2685acb284c3fae2f5d17e85837ce99325d408cb30db2c2112"; + sha256 = "7bb715ebd55b803b01472049f1ac3877983f834b35197e5a3e013955d5b444aa"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/uz/firefox-138.0b7.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "2508e30246bbd0d1c0a3d601e0d3f378dc0b3a6406daad5be8cfac02ac8c5fbc"; + sha256 = "ccfb7abc2394b4930596c8292c4c9360cb3262e285609c68545ff49aaa1363eb"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/vi/firefox-138.0b7.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "51c345b731ed0bd644e9de153ec36270e4c0a77486008a2ba4b062faf852f412"; + sha256 = "cad04e1b861f11e3dba7e3ef011c202436be3d17f5721d8ca59efc9150e0e444"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/xh/firefox-138.0b7.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "e9560d6625b56671686fbc6e7a8b4fd4d9a539ae362fde18b1444adc135bb723"; + sha256 = "86e748b9f8cb09e56ceb4474efe989edd0cc798ca1244243a30b316eb67c2e96"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/zh-CN/firefox-138.0b7.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "765a12ed5e48902087564ddd4b401b90a1c372d315788a9385611809c3721d50"; + sha256 = "f2040156cc69a5e848a9b5e5dd6b6b13ceca9dc7add672794dfd80149d845a64"; } { - url = "https://archive.mozilla.org/pub/devedition/releases/137.0b10/linux-aarch64/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/devedition/releases/138.0b7/linux-aarch64/zh-TW/firefox-138.0b7.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "4a44f1bc531add38c5d46ffd6ed6081ce491baa95c13e300967124c98a8af3bc"; + sha256 = "7df10de9a1115b96040a123793f2119f63a12da18dde27acd6ffe6e2caf8aa0b"; } ]; } From d0269626cf41a31f05755021a01b4c101b13c5be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Apr 2025 03:18:00 +0000 Subject: [PATCH 088/449] icingaweb2: 2.12.3 -> 2.12.4 --- pkgs/servers/icingaweb2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/icingaweb2/default.nix b/pkgs/servers/icingaweb2/default.nix index a8ebcc9e2e56..c13c808ec7f7 100644 --- a/pkgs/servers/icingaweb2/default.nix +++ b/pkgs/servers/icingaweb2/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "icingaweb2"; - version = "2.12.3"; + version = "2.12.4"; src = fetchFromGitHub { owner = "Icinga"; repo = "icingaweb2"; rev = "v${version}"; - hash = "sha256-PWP5fECKjdXhdX1E5hYaGv/fqb1KIKfclcPiCY/MMZM="; + hash = "sha256-Ds1SxNQ3WAhY79SWl1ZIQUl2Pb8bZlHISRaSEe+Phos="; }; nativeBuildInputs = [ makeWrapper ]; From ca0e9bbb7bc2869b107cec3d6a6121bcd9effa90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Apr 2025 05:21:22 +0000 Subject: [PATCH 089/449] dolt: 1.50.9 -> 1.51.4 --- pkgs/by-name/do/dolt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index d97f45c3a14b..549fa6947a97 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.50.9"; + version = "1.51.4"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-d4n4Cz4FvSMznTqHs5cD18Y1xE6p8umGr7PqtI5k6Zg="; + sha256 = "sha256-UlFWGvrm2X54YZDywSiJne/i/6krQ61sJXEyt5cgVAM="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-+UD1J1FSIfYtRY+0shCw/j5LPbc2V6Ydmc0bf8yj2EI="; + vendorHash = "sha256-n4fS9QbtMIO1QtLoESzAjNrnzNH81xUBHYM9OomGia0="; proxyVendor = true; doCheck = false; From cebb491099014391e83f0da124edea02c182bced Mon Sep 17 00:00:00 2001 From: emaryn Date: Wed, 16 Apr 2025 15:34:10 +0800 Subject: [PATCH 090/449] python313Packages.bump-my-version: 1.0.2 -> 1.1.2 Diff: https://github.com/callowayproject/bump-my-version/compare/refs/tags/1.0.2...refs/tags/1.1.2 Changelog: https://github.com/callowayproject/bump-my-version/tag/1.1.2 --- pkgs/development/python-modules/bump-my-version/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bump-my-version/default.nix b/pkgs/development/python-modules/bump-my-version/default.nix index afed2a855c33..6512250417fb 100644 --- a/pkgs/development/python-modules/bump-my-version/default.nix +++ b/pkgs/development/python-modules/bump-my-version/default.nix @@ -19,6 +19,7 @@ wcmatch, # test + mercurial, gitMinimal, freezegun, pre-commit, @@ -31,14 +32,14 @@ buildPythonPackage rec { pname = "bump-my-version"; - version = "1.0.2"; + version = "1.1.2"; pyproject = true; src = fetchFromGitHub { owner = "callowayproject"; repo = "bump-my-version"; tag = version; - hash = "sha256-V5eFh2ne7ivtTH46QAxG0YPE0JN/W7Dt2fbf085hBVM="; + hash = "sha256-O7Ihw2AKJyOmBLReNI6TP5K3HgOFDuK1/9lN3d3/SrQ="; }; build-system = [ @@ -66,6 +67,7 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + mercurial gitMinimal freezegun pre-commit From a4403f96e9e5a95da1dc371538ecb7c8c545ef07 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 16 Apr 2025 10:12:11 +0200 Subject: [PATCH 091/449] python313Packages.mcpadapt: 0.1.0 -> 0.1.3 Diff: https://github.com/grll/mcpadapt/compare/refs/tags/v0.1.0...refs/tags/v0.1.3 Changelog: https://github.com/grll/mcpadapt/releases/tag/v0.1.3 --- pkgs/development/python-modules/mcpadapt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcpadapt/default.nix b/pkgs/development/python-modules/mcpadapt/default.nix index 81cd5385ed8d..29704b659d44 100644 --- a/pkgs/development/python-modules/mcpadapt/default.nix +++ b/pkgs/development/python-modules/mcpadapt/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "mcpadapt"; - version = "0.1.0"; + version = "0.1.3"; pyproject = true; src = fetchFromGitHub { owner = "grll"; repo = "mcpadapt"; tag = "v${version}"; - hash = "sha256-hSmE53LfpLAZosVWHqy3795UPqqLdknMVfWrIxAxWBM="; + hash = "sha256-9TMVg70kj25bSNvgVxeFNsY6YnBg+9KswOfcv4Y2SqA="; }; build-system = [ hatchling ]; From 59d5d93205848460d40114e8b8dbb52a64bee8e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Apr 2025 15:37:06 +0000 Subject: [PATCH 092/449] pferd: 3.7.0 -> 3.8.0 --- pkgs/by-name/pf/pferd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pf/pferd/package.nix b/pkgs/by-name/pf/pferd/package.nix index 1f563eaaced4..5fb3dc21d4e6 100644 --- a/pkgs/by-name/pf/pferd/package.nix +++ b/pkgs/by-name/pf/pferd/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication rec { pname = "pferd"; - version = "3.7.0"; + version = "3.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "Garmelon"; repo = "PFERD"; tag = "v${version}"; - sha256 = "sha256-4+LlnGv/i9zDf+HeW86PJ6XsPMEkJ0JzhLr14MJ4WKM="; + sha256 = "sha256-pbMT6KqqITDBPGgLGq4gmCmasby4lhuZzq02ixnDeSI="; }; nativeBuildInputs = with python3Packages; [ From fc8ba167be1bd21b62813cca17649fad7f3de5e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Apr 2025 15:42:53 +0000 Subject: [PATCH 093/449] codeium: 1.42.4 -> 1.46.0 --- pkgs/by-name/co/codeium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 57256ff1f633..7950e8d5a2bf 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -23,10 +23,10 @@ let hash = { - x86_64-linux = "sha256-iFJRdECSmFZt63yVkozaZeIT0MP8vfW3G5SvuE8/wZw="; - aarch64-linux = "sha256-JJxjYFgaj2f6RQRszWfxG26SjTokhoGDZjqbg7HGoV0="; - x86_64-darwin = "sha256-27bhqNIw3Aceq8u0UthR5Ju20SQiGVMCfUZiHbzC6wk="; - aarch64-darwin = "sha256-wajMCeRaOzXSJgb5z8i+ed+2w0xWTm0I2Wb3hTq1LqY="; + x86_64-linux = "sha256-wZl6wlR+K53rGeQ75ZVzmzKpiBnp6/UCTNx/iOHscug="; + aarch64-linux = "sha256-2wslvQlvhbaxZ9lwGh4UTBo0yHjSLcOZ8mxMQETY7kY="; + x86_64-darwin = "sha256-+34thUKUWV4P29Ak547fT5AKkaw/tgV9AMe+UT6GmD4="; + aarch64-darwin = "sha256-GkAh18MlZP4D+fpxZtAgXEPYSb3iiRycN/0sQm2oJnE="; } .${system} or throwSystem; @@ -35,7 +35,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.42.4"; + version = "1.46.0"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; From c3208bd74cf16e31dc025a8461d883ccf4608c77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Apr 2025 17:35:25 +0000 Subject: [PATCH 094/449] testkube: 2.1.125 -> 2.1.141 --- pkgs/by-name/te/testkube/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index f428dbba2df9..f8f0dd960bf1 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "testkube"; - version = "2.1.125"; + version = "2.1.141"; src = fetchFromGitHub { owner = "kubeshop"; repo = "testkube"; rev = "v${version}"; - hash = "sha256-Coi/aPEZb1VoMCOtzl2AcURomo4uS76AZDS449B4EcU="; + hash = "sha256-oiy0PrGwFuY3C8esP7wbwwnHdXmR+xM6oGJIzGYFBU4="; }; - vendorHash = "sha256-Z8or7JvTBZQmka71I2IpGldgnyTeh4O0aIlB/wssYoM="; + vendorHash = "sha256-lS6RLag9HZSu08Bv0p6qgp2wnsnJpJEUn6P4eeAUXWo="; ldflags = [ "-X main.version=${version}" From e8ca01f61632af8321301c07fd5c92d13d6ba7ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Apr 2025 19:23:58 +0000 Subject: [PATCH 095/449] supabase-cli: 2.20.5 -> 2.22.1 --- pkgs/by-name/su/supabase-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix index 8e358adbd446..52ece4fd9b3c 100644 --- a/pkgs/by-name/su/supabase-cli/package.nix +++ b/pkgs/by-name/su/supabase-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "2.20.5"; + version = "2.22.1"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-350b+79Jmrk8wsVQdE3gRAP3JZbgAtL1Cw46sOCyaok="; + hash = "sha256-ixmEMO/+t53v9FbEkMigQ7eV4Q4awceJYwwswOBgJkw="; }; - vendorHash = "sha256-7AilsV/TBvY/n1gR5SSc6+d68n0rhclo5hqDTC/VrkY="; + vendorHash = "sha256-0zaxdwBAbOAa3cnvm2qzXJ03he2a87Hz9LgbK1a+TEM="; ldflags = [ "-s" From 3832d6b366fed0910f5541e97e324caecbd11c03 Mon Sep 17 00:00:00 2001 From: Erno Hopearuoho Date: Wed, 16 Apr 2025 23:06:52 +0300 Subject: [PATCH 096/449] goxlr-utility: 1.1.4 -> 1.2.2 --- pkgs/by-name/go/goxlr-utility/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/goxlr-utility/package.nix b/pkgs/by-name/go/goxlr-utility/package.nix index d38d7c6be0a1..2d1cf6eef7ef 100644 --- a/pkgs/by-name/go/goxlr-utility/package.nix +++ b/pkgs/by-name/go/goxlr-utility/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "goxlr-utility"; - version = "1.1.4"; + version = "1.2.2"; src = fetchFromGitHub { owner = "GoXLR-on-Linux"; repo = "goxlr-utility"; rev = "v${version}"; - hash = "sha256-aThIu+3eNHCKS6lsio7cLZeIMg0509qkE0YQ6M6vPAI="; + hash = "sha256-Z/VqQKmfzqd1htMlXU8sDkOSw2xczb3tG53LVC0MZhM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-EhqniqdgD95yUwiaqlA0vtRZfq4cR7wxsGPmjpvzgdI="; + cargoHash = "sha256-tSlFMMZWsyZBXBeEW64s0eBt/qrAREfOpfxAgcTK4XQ="; buildInputs = [ libpulseaudio From 4062e10764233e229ca45eeda994e91b78a448af Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 17 Apr 2025 00:40:41 +0200 Subject: [PATCH 097/449] python312Packages.kubernetes-asyncio: 31.1.0 -> 32.3.0 Diff: https://github.com/tomplus/kubernetes_asyncio/compare/refs/tags/31.1.0...refs/tags/32.3.0 Changelog: https://github.com/tomplus/kubernetes_asyncio/blob/refs/tags/32.3.0/CHANGELOG.md --- .../development/python-modules/kubernetes-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kubernetes-asyncio/default.nix b/pkgs/development/python-modules/kubernetes-asyncio/default.nix index 308d7dd8bb7b..456ce3e9b6cd 100644 --- a/pkgs/development/python-modules/kubernetes-asyncio/default.nix +++ b/pkgs/development/python-modules/kubernetes-asyncio/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "kubernetes-asyncio"; - version = "31.1.0"; + version = "32.3.0"; pyproject = true; src = fetchFromGitHub { owner = "tomplus"; repo = "kubernetes_asyncio"; tag = version; - hash = "sha256-YKBqhUeLqLiQ6bK235zTm4salnSLUxl4DUiFLQSjWqw="; + hash = "sha256-EqFecu389zS/DqwoMz9ptaLv+jwJhABTEdMv8nwCSTQ="; }; postPatch = '' From 9a7d5fc23141637ab89d381e764c4f96b7dfb157 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 17 Apr 2025 00:47:27 +0200 Subject: [PATCH 098/449] python312Packages.textual-serve: 1.1.1 -> 1.1.2 --- pkgs/development/python-modules/textual-serve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textual-serve/default.nix b/pkgs/development/python-modules/textual-serve/default.nix index 8a50b830ed0b..947bb63bdb26 100644 --- a/pkgs/development/python-modules/textual-serve/default.nix +++ b/pkgs/development/python-modules/textual-serve/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "textual-serve"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; # No tags on GitHub src = fetchPypi { pname = "textual_serve"; inherit version; - hash = "sha256-ccZiRyxGLl42je/GYO5ujq47/aiMpAwFDFVHRobrDFQ="; + hash = "sha256-DMr5ud+cCNSy16CIfK0yciQ7qH9oGSw2T0vtW2g+S9Q="; }; build-system = [ From ade0715c9dc8eb91f1dbab89dd2cc9be9487d52d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Apr 2025 04:32:03 +0000 Subject: [PATCH 099/449] firefox-beta-bin-unwrapped: 137.0b10 -> 138.0b8 --- .../browsers/firefox-bin/beta_sources.nix | 1238 ++++++++--------- 1 file changed, 619 insertions(+), 619 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 7e7217eabe42..9451eb669b5e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,1859 +1,1859 @@ { - version = "137.0b10"; + version = "138.0b8"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ach/firefox-138.0b8.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "d0f0da12027c6e9b798fc8420785809ed5f7208984e585d791846d32ffd1c085"; + sha256 = "80989a964e38730d2fe4319235806764520b5a0650192799ae13bfe441940279"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/af/firefox-138.0b8.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "6e4620ecb89169e9b1e60dd23969c7649d62d4cac614e7c6a83308402cb67f7a"; + sha256 = "421a4d6cc45c4d64c95ad7783362350cb64aadf66a44895550247d1ec7f3ece0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/an/firefox-138.0b8.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "fe2d385e510ee289d174c00349a6429b0b985fd0fabec111a50a58c59471b769"; + sha256 = "797657def82cfd6ee70084af60d5f09ad1f66d6325b9e08ffb88ecdccd62ec02"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ar/firefox-138.0b8.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f87eb7054f34a2c09409c68bfc27f69dda1d6ae01c16347edf3f44e86c9d9862"; + sha256 = "919ad1d11421fcae4b05f2a0eec8724d8bce40865e4efaf71bb362451acd748c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ast/firefox-138.0b8.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "356e3dab406a768b54ec641bfc32b30c503b9608e4b446218243cadc61863b3f"; + sha256 = "147c7bb0b40dbf5653447861f16b8515fe39ae7f1c13533cfbb08526be9c1dfd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/az/firefox-138.0b8.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "fdf66de1bb5799d725377e9a2039deee49867f5d799a878db75812fe72c5cbe6"; + sha256 = "37dd7aeb3c2f88a451f5e623bc2575bd71d529dcc31f5a4c072e0ae25010ca2d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/be/firefox-138.0b8.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "4570956b5a82505ee705c4ee0615c98755a2e7e827e741a633387a452ff723f1"; + sha256 = "099eab295d39cb2044774a097040eb5d4ae9595f26ae76421a48f741e37a4b97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/bg/firefox-138.0b8.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "14e37e5a57af4ea698fb554e410c366821af7c26e007123fb66373e63641135f"; + sha256 = "22be921854a33169b7d8ae8f72187f4928c8d02d52a0db626f8d25ea79f6ba0a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/bn/firefox-138.0b8.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "63b78127c286e955a9221a38390c31d9413f92c5c4894952282359cddc91c438"; + sha256 = "8c33ec8119293d8351159e8ca1741f6a4a06a858373dc41b02a340017fe5af21"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/br/firefox-138.0b8.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "2e63841530a8c265e81a1e34e43f279c34f4f13928a5592931172956db7ba6f5"; + sha256 = "6816dc30f54105995cc29f28ab75abfb7b9b14ecbe963f0fa493e3f845c86dc2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/bs/firefox-138.0b8.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "40c0bd4064c84d0197f2dfee5c77a4a5a0f6bd0eb5505c325091b23ee282174a"; + sha256 = "259dd175006d8eb98b62bf3d4126f790e57d7b05c15fc3eeba3badf3eebacf24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ca-valencia/firefox-138.0b8.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "beba161453814dc95f53074b19218abecfda9bf2d1b4571e8cd1af4376be9b9e"; + sha256 = "92f7e70f2f9a552dd558ff3c3f4d6633624b373d0d74dff1c5fb40e90418a48d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ca/firefox-138.0b8.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "148cfe273854edd64a0841f5a4eed8c08c4e06abaf0198d0617c1b840743fd1c"; + sha256 = "f61026c82d71b9925a3573bdd6c1e9e6f7de8868d07944544c9854a8929c8d01"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/cak/firefox-138.0b8.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "a3250d57ab8d434a71fa48054870df3934dede3ca87ab6227654daa2c478febb"; + sha256 = "d90f8af5129110899a818224eac03e34690ffc21df1ec1258c7d3f919ed976c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/cs/firefox-138.0b8.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a72f95cf2dd349a01769ba8b1f7c73c6553e9de9d406470e40563d302cb2f38e"; + sha256 = "866c297ac37839400ef3eb13ddc616d35b376b64c19be83faf093d8b4104d5e0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/cy/firefox-138.0b8.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "a7fc2e0893d921ce6c6bb5d9fb47183b8ea14772cb31b9333bffd48ca7a79eb6"; + sha256 = "631eef205844faa2b305cfb0b5294cb8c480e9338c6c069b48ac7ba482388d60"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/da/firefox-138.0b8.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "18cf5d0c1da42d49ce885e993a64b1fa39fb124f76627b3d389093efff9e429d"; + sha256 = "2cffffd9edafdd60f7c2c2a38d2cf9da14d91b6c1315e82273f58a2487914e06"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/de/firefox-138.0b8.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "78ce80c62a025c6850bb362e026406043a246d99b33096e5449f67f09c19ed60"; + sha256 = "1a8a7c232c4611108a47afcb98d433e9fbd4dcbeae84cc7263931b619c54b85a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/dsb/firefox-138.0b8.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b2a0c9b51715afae4e5f6014561abaf1022c9e5e1911e9e147760458542be365"; + sha256 = "1ed273febd64e31eb2ea76513b968cad099a2aa8c3e93005fff60ff6835254a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/el/firefox-138.0b8.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "9bf8a3fa1d05c46c377d7fecb9d1ae4857fa5ab19160f81c0921f5d3721d3baf"; + sha256 = "53e5a38a785b5ec57c7d5cc72cf0cc63971d618804e908e36734b4cd848dd780"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/en-CA/firefox-138.0b8.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "7c74368a8aeeac88ad4587428d6dd86de51fa1c4ecab76953e41aad9bb0ccabb"; + sha256 = "58bd81c3b7df16bd8674749b9fcdce124a580203013df4904d5e6c22328939ca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/en-GB/firefox-138.0b8.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6b8f0732d30af5eda5fed8eda112d08fc5500a1c3e02117a22db967546107036"; + sha256 = "79f98e187a8506cb41e54538b932e835615dfe244f1e9b33d6c8b695e109627d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/en-US/firefox-138.0b8.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "319af71913886726333110cc2f365b39cdaa120d90938869985f8967e8f4f4af"; + sha256 = "1201eebc10e1a6d8e02ab9daae3bea5795ae9e6f9cd289f7244557fbd10c2fc6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/eo/firefox-138.0b8.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "fcb0face5526bba1bad5fdf6fc7eba2bb96b7f5ab64df78674ed4c081c8f94a0"; + sha256 = "65107fb2691ce2f54805d544968ebc50a19fa627264ced0ff22392b13ce547ad"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/es-AR/firefox-138.0b8.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "90b7fdcc676399b320e9a068d34e00959042286e3ebb40b709c9cde9b8dfbc72"; + sha256 = "8eeeb37caa5ac429b5814b0a242f3515e09a9064f38f31d64a7f19b5654fe0e7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/es-CL/firefox-138.0b8.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "eb43c4d52d87873fc58a26d935ef95d9915cb8c14851fc2ea62b5110a2ae5819"; + sha256 = "625d302661d8ebd31d23c64b84a305d458312244c817dfdf5cd571afab6510d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/es-ES/firefox-138.0b8.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "1daa83de45da55f9f2ca238ed3f0a1ec23df7ec74105ecfdddc4cfabc12980e7"; + sha256 = "4daff44ef46d32046c729f029f9b0ea9d86ea501bd17ac45ba9c0c0e4c718453"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/es-MX/firefox-138.0b8.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "83ab68086711114b20f9849efaebd081e19e4e7c33a5dd73d1502cd1228b20f5"; + sha256 = "38f282b0386287a7a2b6729b07d2c22b4961d948983bf650de88b8d794a00ad9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/et/firefox-138.0b8.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "ec34b966424b586f5e384c81d10aab9b29fd684f3560ca449abdc3254add8cc6"; + sha256 = "74bed5f9d6316740b4bccbee3089e83500280df3d0656cf5a9699c7ebb383a8c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/eu/firefox-138.0b8.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "70e64c904b0a65ac0be8ae2bac04ed1af85c4fb1169a0898941e1b956713329d"; + sha256 = "04113f82f4ff1e9620b3ebf80aeb67671580d5e7a67ae0eac74ff7317e9c74d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/fa/firefox-138.0b8.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "8750c4aff9537b89e76938817dd4f98b3b31c21634f954752b0bf49724672454"; + sha256 = "cebcf7d923f02a5d30a4b73f11dd3cac73d64473ae9f525c82e4a15fb8a23470"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ff/firefox-138.0b8.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "ef428591168086a6b6d2344394aa5fcd4551b119a85f7258d1f35bb8f28232ea"; + sha256 = "8853de176648d95a2407dc77627d433d5f2278c82e7c5f98a461b5a95a8f897f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/fi/firefox-138.0b8.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "fc43b3cb736b040790e92b2b4e23bc59360a58d533b167118590cbe102db521a"; + sha256 = "9cd51d0cbd5a4d2f32e7553cab24ea28a44834e5e9e94259980e17b4e32d75d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/fr/firefox-138.0b8.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "2361aa0991e71f2242e1d6fce3c97beee9dac61d0c02b0f9265cc9da199d502a"; + sha256 = "e29729ae855e9995e5c2c5548b5af0580851bdc264b93c3e1ced4a29ba5c4813"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/fur/firefox-138.0b8.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "f32bd5c0c3ae17cd7893139ec20c608ba0e058744e155284a9dc6baf433b3604"; + sha256 = "008a4410171cd5dc57d71d3970d461a9de88ddf684047240935ed34c436129d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/fy-NL/firefox-138.0b8.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "bf3354e2e772e827df7bd344bd7e56f958b04cab43f03de229eb724700102870"; + sha256 = "574252eba950aa2adbaa69e43710d4300efdf609beb574c1348e0fc7320e72e1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ga-IE/firefox-138.0b8.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "468751b8fad4eac1b1ac308319912672f8f9fbf4571f8134e734b0d09303b640"; + sha256 = "ad425b945f93f64a5eeff7fc7299cdb8858341f79704d7d5123121ca3cac907f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/gd/firefox-138.0b8.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ce7e20daa5f1f5b6818f55569a1f68fd5582e971b0e88b2b6bb929838dde7eef"; + sha256 = "dc4c549e67bca41686cab05a70778d251bec7f04393c2ffdd1839fd2dc5aee6a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/gl/firefox-138.0b8.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a472ef1726220f89dca3507e22b8c779f49944c38eae90ee67996b4647956403"; + sha256 = "0b257b3fad952202deb5efb8c9c16827cc736bc30294dbb75c8e7b5e3da9d0fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/gn/firefox-138.0b8.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ad10b1dae8bf121e9a29a5aa52bd2f1dc59b5ec7519e119bccc7f8fe21065568"; + sha256 = "c3bcd3278666a66c14ae86eeca705a89e43bd40121408c52a877188676768ec1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/gu-IN/firefox-138.0b8.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "f18813f2ca4e9febeaeb26eb87705f8d7c3ba0092e07035dc381e72a31537c5e"; + sha256 = "57f77ad57a0195fffad63fc84204d4d47df35b4c1c207b5ac747743ddc2f68b3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/he/firefox-138.0b8.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "85ae9fec9c97e72bf164b7c0d39b7d6c56243e720e500ced87aae51a92fbbb8a"; + sha256 = "5ba38e979772b2c37dd95cb8b9e4ab4cb0c07a8e18288b7adaec4b89c2ed738d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/hi-IN/firefox-138.0b8.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "370a23bc3d57b2c2af5835bac73cbc3ddfae78bd63b1a3e2a4e68267a3853c50"; + sha256 = "7322e060be05bbcffab7392b9d937ac17a8d60c3af0bdb43b45a0dcfc182fb94"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/hr/firefox-138.0b8.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9fc278c697d363b8210b828bcd7688babbdfacc250c15c69c5101dcee9219434"; + sha256 = "f4a16125374c9aa466d5213c565e694a4668fa92e875814ac5fb44994685b9d4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/hsb/firefox-138.0b8.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "5094b85a8c87181a9aaa18ccfdf2410a910a3b01912c3f29b5735cac009ed475"; + sha256 = "ce961cca196da998192b8f24344e34b476a19d5142db800d0fee153efcb77ce6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/hu/firefox-138.0b8.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ca43990b646a281aa3a081f2a0ad29084fa8063d060eb3205c759bce64c65cfd"; + sha256 = "69ca37e072084ec23eeee0a7ab0243c3b7749f9e6b37ea48f16fb17c626b76b5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/hy-AM/firefox-138.0b8.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "443e28421a588229742e0c0cb354e2dc4a4d4a6a34b02849137902c34d4aa7ad"; + sha256 = "3da107e96a56ba4a5ab175571088793610f8b8efe61c4e180173b100d4b305d8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ia/firefox-138.0b8.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "909554909e4ca042879e46421abbe22c7a1a697bad5b7429c73f24fa83d55352"; + sha256 = "32c3042feb9808d33897b2a1b21a6e96d61b0b2b563064d72b2ac4579c401835"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/id/firefox-138.0b8.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "68252135e463181f7769cba5529dcdbddd42f694a3bcb4f77d8813cd54a4cda9"; + sha256 = "42d9c7eb1328f76f846102fde392123843efc6dce95163b23695485698b28f24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/is/firefox-138.0b8.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "531ccc2cfcc1d405064b6dfd793443be992f3b1d12635da826805cef2627bd15"; + sha256 = "17e477d1f96d273bd4c8b51dd6112e9d623c79793acf8c350c3c8d589e23fd57"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/it/firefox-138.0b8.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "7e43713ef319fb08680fc1ccda216be9d6c0c2fb413630574d321cb28c3d4a3a"; + sha256 = "97bf236f9dfef9cc366408d65fce9ce7a0d34a80b2b9661211767bdc064c1b1d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ja/firefox-138.0b8.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "07b7a5613e9a36ed773aa400de1fac7b44e180d89b85de9c56583a7a7f3bba28"; + sha256 = "17f0e2326114fe84e29d43862c97d86851eb298fe9b8f63ed256564c5eed0cbb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ka/firefox-138.0b8.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "0f6e5f1c126816863c34654e2226a672be34dd31cd0c8567435d7c3d7563a56e"; + sha256 = "49cd63a3d178bee3a16d4621e3636065a6ff2c0e156161cd3c8ae9f946c89982"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/kab/firefox-138.0b8.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5dd613b222a00d6bc4294e4ac190adcbd8d1af7ea20092716d26ad0002a24673"; + sha256 = "586d36bbf978f3b8a67c969fa6cfb795a1f55e412d20afb881f69b6b4e8a8c43"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/kk/firefox-138.0b8.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3e94f8b72384e119500a6ddc1d750bc28507bee04bc1604de9a5618b274d3552"; + sha256 = "67d2d58a7e70cf536b88d4c0f8dde991716a9daafdda837eb3cfd4f2493dd201"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/km/firefox-138.0b8.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "3639933713c2291c5771fd21068a4d2fa0770fd6c7764f3e11e58c11c16ccc8c"; + sha256 = "4d1a054d9ff827415fc330d6d142d51bdabdde327d80d9f0fde43da660a44261"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/kn/firefox-138.0b8.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9260368ea1474d6611c9f5dbdeb9a7b398a1d465b8a42aed90989b929fb879ca"; + sha256 = "89bf39d54a0265e83d1b6b0ae5585b50ecf5e77a07285eb75ea7c5df96e4935e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ko/firefox-138.0b8.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "abafa1b3f6de01f1a05af169c6c6b599cef374f9827aa73fbb0ee0bed2f8bd7c"; + sha256 = "b53a59317398e513afcfc577fe7680cc0923f0c1b17858d0afc0d35840830808"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/lij/firefox-138.0b8.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "98a004987887a49fe244bf3ebb1b6bce5ed97d45a093e81126eb9ed66279f411"; + sha256 = "e2e0eeafebc9f8a287bee6a8774a0fd31519d573b7c0a61ca9d69db525434656"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/lt/firefox-138.0b8.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "201855ba80fe1c88eed7eb43ac46ccc29d8db82a563381f9743c1ea798d044b7"; + sha256 = "5ac4031cbf7a29ddb99495dc839bcc5a726943f6737e35a899527e93c05b53be"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/lv/firefox-138.0b8.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "a36ce7dfa47918d5b963fcaf1d5e9b44aa75c4fc86e46467c64f030d84ef72e1"; + sha256 = "dd786a35101a5d8145fe45f81f0bb63e26853c4b1683a870a2f6708cc46826c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/mk/firefox-138.0b8.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "ba434cb6eb5e9c64eab8fc19ed6b63b37babee8a545823b703cd750a6d24ee75"; + sha256 = "7fbceffe26dca9560a41812f9080661a9d95f9447c2d942124280b607c68a90d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/mr/firefox-138.0b8.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "576e06215f4c8522924e48f7fdb7078d79cc2cb1b71e8d7bb015c760faf024c1"; + sha256 = "9c01a5c0e09bbc4a2f6e9140daed81459f415e5e95f92111509e71fa00170ab1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ms/firefox-138.0b8.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3e3e54688b7e8a9b464d9c23e7925b47a6b6f171f816f805bb520e05e3e2f79f"; + sha256 = "d38f1953eeba0321b20f089ad10a37644ecc39ec422c3b1ea580432bdc42ba58"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/my/firefox-138.0b8.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "79138b0eaa972d1c7df403028f53c4b4d6d222f11cf5ecf9468565f1518c6390"; + sha256 = "09d0b529b37c94886fa1665cad9c420d7306865d4df0ef1313129b0c6c41bc32"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/nb-NO/firefox-138.0b8.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "d33ca66814433c8971b6d37d2812ef3a0e9e9b569afd94031f98762d9f98086e"; + sha256 = "0287b916add04fa8f23178384fe5ff832392cbdbe84116d19600fe4b3571ff8f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ne-NP/firefox-138.0b8.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "f6aac9719ec68474b4abb58b9aacdb6122007c95df5b421752e38f124e41f1ca"; + sha256 = "05dd8ebe1986c76a86c62b870ed6964dfa0b813edc440042138a6908ea174408"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/nl/firefox-138.0b8.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "5b8d31d21d06cc4b19ff9bb05d07d53d180820dd1cd86a95ee5c1e7403a1981a"; + sha256 = "5b4dfb153877e573a9b0b4a81ea07253cb4e2c583b0788ae39527dfcb68ddab8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/nn-NO/firefox-138.0b8.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "757cef127d50b804479e136ebc58ea5c000254a32f2c09f92f2d43e4a47bd999"; + sha256 = "a50b32883392a405daa6e7bafc3161fd2d5fbadc183500126b41eb54b4961470"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/oc/firefox-138.0b8.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "965405d799f1440ac0a33bb12efcf0b9511dd80849b7ca0f2cc89ad0c77e932f"; + sha256 = "083e6bdcceba2079ceaee7113c6f5a526affe2283820d2e6ad9abeedabe664c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/pa-IN/firefox-138.0b8.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9aeafc8fae330a3e09ceaaf122dfee8f581f054e5c0e91e10bc308b435a3ada8"; + sha256 = "acdb216ba73dcd18bc05d1e848e241a251dd9dfcf51d7fc07107f8f9275273a3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/pl/firefox-138.0b8.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "5dc8d09f27776f0f96c0302a81fc2027843a915fee40b09855d80f2692a108f5"; + sha256 = "051a4cc7a27a6f0657930a3bac4feb801034066ac5c1f597eb864d62b8398507"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/pt-BR/firefox-138.0b8.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "fd95ca5be74c5ee2a9ee117e6f08def52b9003d80ca552b5535a6f3272f8a51b"; + sha256 = "81ad860db9d5195d20697e9c952069cfa823b16335b526ba5594de341cf94b97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/pt-PT/firefox-138.0b8.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1892b62ab2721d8716220c5e88af9c90fec5beb420374c3e603707ff44bc47d1"; + sha256 = "767c02235a8c5f053ea686ab52bd4ae5e89185958aaca42474ea6f8aff361c5f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/rm/firefox-138.0b8.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "51d581629f587de3a2055d8c6799359ecfb7fe5fd13c11b77935f8041c2a295e"; + sha256 = "266505f3dfd3587721d8c9aa70015c319f92bb6292d6a3a2af9903193add23f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ro/firefox-138.0b8.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ea978843d609281f73d545e85bd0ba9c57adc91e4645b1f0e8b022dd92f9998b"; + sha256 = "1e973a8e4d22ecb6c99d0017080ef376d1c755c4aed1db4c17f3d5ba937ef32b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ru/firefox-138.0b8.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e4ab2d28171a701d63d62cd65d0cad78ff4506b7a497485b06f808037ca7ea21"; + sha256 = "54ee7d43166ea9728d16d42f9afa9f1ef2ee9f77f7dc39396724563f5045f57f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/sat/firefox-138.0b8.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "b160fab29f0fdde16c5ebf99769a7dc4bf00c4ac09f3f7d726a47cd9d69cc936"; + sha256 = "6c6dc76fe09ac48a86697547a11226412591183cc25c955a49be86095ce099ac"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/sc/firefox-138.0b8.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "d8213839c9e3b35db2f743d4a2789ee1ec91759f344879bccc9187c4a5acef5d"; + sha256 = "ad776ef072469ec87f37f10e0a6f3b0ed94dd0a0c33bc630675009a86a933a3c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/sco/firefox-138.0b8.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3916653026146b6f13a98bd3559dfdf38ea2645f93b24b85cc663dee67f1c0d6"; + sha256 = "0e5fc72f533778248e9b2364ee00452840828e9a6f22a77a63d3f853037f5b49"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/si/firefox-138.0b8.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "d1fc184b57cf24b6041731d5f9ab2fa73ae0549a27cb695d8558491e44901210"; + sha256 = "bf243cae6fe9b3da2f3efa3acd3e4390e15fcfff26795770e658aa62fa841a14"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/sk/firefox-138.0b8.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "243da2b019aca664e445a6cf486ee78a399b89da1ca1e67d560c82a9e2e1c13d"; + sha256 = "25809b89943527a092655f77259302b848cded4135ea84ae43a85cf52618a0d2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/skr/firefox-138.0b8.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "2156ab1d3c5185511c909f8072152649583a45c3f6e43b08ba91b7402b41d1a2"; + sha256 = "1866ef50dc4b0122078825ed2f540b537a807300795eeb92b363d00fd288e76b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/sl/firefox-138.0b8.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "6f5a698c5498603250e91c877c4e1bf021ead850ffb25d707a9fdef45f4bf560"; + sha256 = "d99bc7d841864846359fb7953e2bc8768dd70d10f5f2e96e2620b0d3dbed9be7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/son/firefox-138.0b8.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "ba839673b1adb6630233c1daf1ddcc3e905528f60076ceb390b9bf977b86c6da"; + sha256 = "b6e3a9a889c54656c986b8062cc959641c746fb5b72d99fc3a6f706448612124"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/sq/firefox-138.0b8.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "36f06ea635d64e5fc0497e020def2304651a6fd385fe67844d2878c94ffca122"; + sha256 = "722e657909aa48eb3d4795e609e6fad435aecaaaf0fd43c29125aa8355d6b342"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/sr/firefox-138.0b8.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "9bb4a103678e526e0797ce4ce6c68e27637917436c431e33f48a06b4a7d5b73a"; + sha256 = "54006212032d6aeb187ec1ae5682e08e17161bb1c246b9631b08261d915cdb3c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/sv-SE/firefox-138.0b8.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "99b873da9b8bf0a729f3eadee176b3bf5ebbc095ca59f119b8f7775cc96434f2"; + sha256 = "85eef0439aff665442f12900c55eb6c86b11f5e31c92120b252da90e9ac09853"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/szl/firefox-138.0b8.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "b1eb754a9421ef53d1873480938e0d26c9bc4431bc24f21f020e1d0a6ba5038b"; + sha256 = "28695dc87161eb34244659579d67cc908a4bafe4b88e6c6a8d01a74826e57cb4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ta/firefox-138.0b8.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "df7acdf49fb510f12fce7ec99f00119a29e0254dd270ae1c1b52da899d7e23b4"; + sha256 = "ec03c79225cdae737171d402885725e6ea2a46d7b2a88169f2a81f93f09f27d5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/te/firefox-138.0b8.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "4d9309859577e18c3b707283ab68112fec2ab61e66ae57ec68dd389be6235519"; + sha256 = "bcff0f09f256a8ca561a98be6d38a2d8e4b8f3077fdca1ddcc8b8ef1225b3a36"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/tg/firefox-138.0b8.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "36044388faa92f1d2d06c18aa0fd32cd5311d8a11f5bb0f16cddda5128b0888a"; + sha256 = "b14b42e6792b234146921471a420c2a8533ef8281d85fc21d482838aeab73b27"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/th/firefox-138.0b8.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "1818a5657f524194b08644ff1fa2444a4d18e224774ce1a0a4d84e2dda8cfa8a"; + sha256 = "ee6a01b836c079eda1ca4c98949491860153dfe0a4a28183df163ab2b2737bb6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/tl/firefox-138.0b8.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7f821360c515bb180d5f4de778bc76e96fc32b1ddf3dd7533f79c39c866d6e61"; + sha256 = "f83e81dea8da021371db0968a94577a1c6c3d4a3f74edc7b46fdedc47a473366"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/tr/firefox-138.0b8.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "788fad9f6ff62df7257095d0ff7f0026e651f5cfa03ca3d72976978be686465f"; + sha256 = "03ed4ab6015aefc21dbe35190734260643caf7f36467c56f8cf720d8ffa72968"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/trs/firefox-138.0b8.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "51e5ffbaf0c77708323fad6c82658ebe84f16eb26401b8b252538f49841e2503"; + sha256 = "b8b2290dc1fd69480cc14b25639a347d493948dfc25e7816d1963907a4f33d9e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/uk/firefox-138.0b8.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "b3ea841a43f4d226580dfc9613a457fa7c945b2a638e58906ecfe5da8661f042"; + sha256 = "8016a28eb52336b369bdff7146af4e83442b7263191b36367ee0bdf2f3c33c2d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/ur/firefox-138.0b8.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "ee2303f9d69089f292bdc28ac67adaad40a27654e21854c93c6e493f157ea210"; + sha256 = "a107906c9e22713bf338b67c51b8c50a0dbed92549211097b0358e343a79b6f3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/uz/firefox-138.0b8.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2a2b1bddb030346c7b229153784cfc64d0b9619002cba1ad13d5530cbaecf8c7"; + sha256 = "15f2726658d3cbd9444716ab6aa0b393d29df37e9db96fc72fec5545865d05ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/vi/firefox-138.0b8.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "fb0a54a9c393d1e62ffed1e7864444274ae9e22a3f2f027b225f3f4cdc9952e9"; + sha256 = "67c961a25713221353c6fc422ca267cdb73bef6fba198e4ebf7cdc44eee9e015"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/xh/firefox-138.0b8.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "74298cd379e0d2bfcd9cd3beeb10c1bad040cba292a09669db0861b88f3f1ef2"; + sha256 = "1ebf8bc0a3a94fecfbe50a5eeed4942998f83e047983da1ba9317c7e3c5a726e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/zh-CN/firefox-138.0b8.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "adb07f9499ab8e1b09a6e546653192dc86b7af3878d8f6c9e1a4b94a72c891bc"; + sha256 = "6458482532f7f0483aa0fb32fffa0082f775855d3bfafa75e989a615d5066766"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-x86_64/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-x86_64/zh-TW/firefox-138.0b8.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "81274c3d1fe8d0cd833821947225637b544cd64973b4456088f18b6d1dfb7cfa"; + sha256 = "3d104c31729925ef76c7436343a776f3b33678d95c5b15e182939adf2a782ad3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ach/firefox-138.0b8.tar.xz"; locale = "ach"; arch = "linux-i686"; - sha256 = "9df21b1ff9945ff4a8b8152e4bf4a3519e98174a29c2af5ce23e8f67b3abb7bb"; + sha256 = "7479dc6122632f2cc38394263af9e5c83204e091530f3a1f6fde3895a144bb9e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/af/firefox-138.0b8.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "01ba75d77f73b589e44e8bf5367700d6241d32e0ed562da4489af9f8e1ee2a65"; + sha256 = "9079967eea0a8c06d70ab710699056aa44389cd0db80abc7246d166d29161405"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/an/firefox-138.0b8.tar.xz"; locale = "an"; arch = "linux-i686"; - sha256 = "f75442c5fad7155bf3e339b612a1b3b024d0ceaf1f7c81e9217998a055a85bc9"; + sha256 = "5b4aa10813bebba6f2a3f854539771d90b88111d7a33464dc5bc44e6e3d2a271"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ar/firefox-138.0b8.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "aa4a2889b3baa03ceaa18cd53f3601540abe2261277d0650489bc6ac3ab5a060"; + sha256 = "27b331312e6e312658290c15b4f643d74a79ece02be99369adbb0f3595f80f1b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ast/firefox-138.0b8.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "56c39b1c083063f74819655ff1929e1e3c9c2dc4bb9a1bed43859f2780ef0d72"; + sha256 = "d763f646a358ce3486301eec5dd049d47d236600d91032a9fab8c116e194b8fa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/az/firefox-138.0b8.tar.xz"; locale = "az"; arch = "linux-i686"; - sha256 = "877596d4171746dd7cdffe3c073c4634b610c396d99cbe5aaee6794a923bf96e"; + sha256 = "559e7881155e0e1e328622685f51a9dc355bc11b228ef50a84e6a4dd68570674"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/be/firefox-138.0b8.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "66b4cb0e25fb263614775548c85479fe17d1b98b875d320cf366e8854921b2ca"; + sha256 = "bca0a29c7662740d053975cd5659849e09d1b29e694c51ebe3db6889bbdbc4c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/bg/firefox-138.0b8.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "0a885b0ebef3041360694ab89737dcc9c98b9d749888db1d778a88bb671b587b"; + sha256 = "f707c2aba8387f2c53b9a9f54b22b5ba263a348546625616957709b3ebfcd9d5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/bn/firefox-138.0b8.tar.xz"; locale = "bn"; arch = "linux-i686"; - sha256 = "af0559b15d9ff6125207d39c4e4c7be1d9127eec85c4844b2ebba56d3b9580bb"; + sha256 = "f4f12f428781608cf480e2b35b24f4570f93ec3e04a5d2a9708c77df2b061c92"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/br/firefox-138.0b8.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "fd8ed6377e263f69b258a994c0b6a3c58da9664031be265a0eceb48a1afb73d5"; + sha256 = "8ba3248074e7870d650e0a4435c0cf8a6a74c8a34516c04ac3cdbd0417c0fc3d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/bs/firefox-138.0b8.tar.xz"; locale = "bs"; arch = "linux-i686"; - sha256 = "02ee80372fd1b2994e6b8fca3ad7749f14270bd19f30e0130b1c0bf72a90cb0f"; + sha256 = "f1693020c29737622a97143ca82cd2dc93b0f41c25b75ebe5432a0b522f54367"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ca-valencia/firefox-138.0b8.tar.xz"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "4e0882dc24784f0fa990d9eca6fa7e41497de82bba12b0685c412b25e6c6563a"; + sha256 = "5acbbf7244b59673eb3a308d1e3b9ffd2735ee532780ddb97dfbf23ed3022e2b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ca/firefox-138.0b8.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "d36a4d9fe0a8a45d75228b10133427a8e7de10470764624849b0c753e4baa48c"; + sha256 = "bb711a740bba862cdbedf18c23b54cf0873879bed2f97e2b0eeaad03f5890a2a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/cak/firefox-138.0b8.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "c0e952accd97cf53d0ac8dcc309fe3645d265c681e20fcf7ddb18d8b0bf29e56"; + sha256 = "876521aaad356d8637c411d5e522840c7f49dbce0af601b96bfb4a24c8b4379f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/cs/firefox-138.0b8.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "1fa69b2eb220a6abe2e014357160817f805b223ede4cebc69a786a6c253c3354"; + sha256 = "eb442833658fb203ebfe1444a67528c17fc06c59737ccf4f034b0d256d79932b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/cy/firefox-138.0b8.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "6f3d484a3a1e883e0866e5847a94c107a355c6f38350413f9c8e054c82987418"; + sha256 = "73f40e17cc4084b86c242b4d8124fded5c084c2ab936021bdadaf7be7e92e9a3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/da/firefox-138.0b8.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "3618ba5f56c810e1a087ffc9cba9f39a9e9682a530b9f65420441c86d6d5fda3"; + sha256 = "15c92c6d2d7b6f391ecbd4a9f949b3df56a942c1d4615bd0d3ba9ea5534fd660"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/de/firefox-138.0b8.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "7929672a9f2631c78a0a1309a7d8c06ae2e0cd16a4133d64a998a57bdd2402f3"; + sha256 = "3a8c4c10841424ea86ffea7c351421f738328a393b950f6e2262bccd447de0f4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/dsb/firefox-138.0b8.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c3bab0d523d7657c6be39a21d048a83d070cd4c5ae33d01e5f0cca8733a6c30b"; + sha256 = "c5b9d2b803ad0b886314d3ddaad23d9629887d82354e26c07d82ec868753b9b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/el/firefox-138.0b8.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "5433ff937adae7f0c6559c37d6934114b170f71e84c3c2c2e9a3338370139fe5"; + sha256 = "99fde56a01a16ab1e09d009aa0e36697b5cbf9fb5b8b0b970dc88f4e281bf46a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/en-CA/firefox-138.0b8.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c45ad41936fc1e9bfa9d59cf737d0e029e08328ac026673b27daf90a0fc8a39a"; + sha256 = "004f8db95896a2366343f7d00fbb30c0689a2910b53abe786a280d5f7f6781f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/en-GB/firefox-138.0b8.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "52ea4415837b9c3791d04a5563b9acc7caa6012a295c6880f461303abb65a542"; + sha256 = "9a2c3371a2cad437e135412043863ecc769f941a9fcf741a5e88f57bf91971e7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/en-US/firefox-138.0b8.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "e428129f2d3cf9cbbf2701317fd222b2ee8c94b76aaf6a54f3a86de540aa3af2"; + sha256 = "d16fae37e6042ea23c5d7ffd3f5817730b5489bc1acff60de17bd4e64e6349ed"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/eo/firefox-138.0b8.tar.xz"; locale = "eo"; arch = "linux-i686"; - sha256 = "bc2dee43a7f7d4ccb04dcc233ff1359eb3f45dc272d01e92039fb3bcd0534fc2"; + sha256 = "9dac38d1121ccdb5ce2124cf5ea10f12a417dca50385715ff4ee0d530b4eba95"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/es-AR/firefox-138.0b8.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "99c747b138a8481829711c63afe7f5e5eb1b45442203c4eff8e09afb2673d00e"; + sha256 = "85c96f509d0fafa7f2a2e744e483e7ffea4fb559cd7f918639023be358b41c6b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/es-CL/firefox-138.0b8.tar.xz"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "eb81bd1bad7debf0a332afbed4eecfdd5765fca6fa05ed9e75ab8c8dd05b5de7"; + sha256 = "27f083d3d7cac7c5b153e01f3890f493b48a7931a1d3158139c9f0670a89bf84"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/es-ES/firefox-138.0b8.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "446d7d956bb878a28869a57256d2a08c090c6893276f4ea09cf2116515aaeb48"; + sha256 = "f4af98251961ae0f93f8b444bf8558dd26a02e467236fda34cf15bf54e2dbf36"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/es-MX/firefox-138.0b8.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "e2f4db1178e11a43e1d62f21eed61c5e25d4bd75edf91f63401ba384d29080f7"; + sha256 = "3fcf3e01b81c53541429e089173740144027c2441f0e6a269919f8f6f4cff38d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/et/firefox-138.0b8.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "3d47570c5de25da080f2e9e7ca20641d06878b421147f4ccdbadeccde9bff61e"; + sha256 = "8c7d0a6c67917234ba3b8054a6ff30ebf42b746f74fc4b92434e958c4a4f66db"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/eu/firefox-138.0b8.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "f8631ded866eaea8ef7812ecba52958242c95b8e39e69d892f38f1c1a0ea03db"; + sha256 = "c2b5bdb5b6ed4cd17c0a16cb8a909a406038398c128b4409b7b2cf500cee510a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/fa/firefox-138.0b8.tar.xz"; locale = "fa"; arch = "linux-i686"; - sha256 = "d55346559f9cc01070bae44b1f53513f2897cbb3deef0fd5a51d692fbda6b4be"; + sha256 = "1affa59a71f9d47ed01b7c2a4f704346b10029c84fa04a8fbab5377819587b94"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ff/firefox-138.0b8.tar.xz"; locale = "ff"; arch = "linux-i686"; - sha256 = "05588e3f4b121ff1f042abe8ed9c0a011f0db6cd035d049b9c765ecf107b5bcd"; + sha256 = "8609c462b25c386474fafe63614addafa66589857388ab94834b54c814db5ec8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/fi/firefox-138.0b8.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "3cdb70af6f7720e263c4eb9353ea1dffdbe881203227666a589e215318698e1f"; + sha256 = "cbd0467316432d860e8ac154b4725c4301dff8e6a4943dd3d4294d54bb1839de"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/fr/firefox-138.0b8.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "4c92f507c46acc5bb90849bcedf0a763068fce151cfe3e7b3c886e1a2de45c03"; + sha256 = "3042106b307cf18c646b6a36a527e1981e731e8fd8e8c7f4f78008c5bd864416"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/fur/firefox-138.0b8.tar.xz"; locale = "fur"; arch = "linux-i686"; - sha256 = "9acba01f31b0f61cecfd99432f2e7b9fe7bdce0a8a3b2a1bb3416b5b1b7b81f6"; + sha256 = "f0a6afaea91f2e9c5c12393f960ad2a4041062262377bc5877d13f7c1ed93711"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/fy-NL/firefox-138.0b8.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "3a3955cc52c5f6b9c14b82cc18ac3668cf5c6afa01c27a037fcad4db82275cb8"; + sha256 = "661041ec4465bc3040dacd2dadaad9f9253568deb18e988712300e86cd158bd1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ga-IE/firefox-138.0b8.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "375281860f95bd4c80d9668c1e277540cb7f81d0ebe01fbfc5b207760d706c20"; + sha256 = "eaeabd3bff721aa8281f4a5cda884ab6823544d528ad5e3ea036433053a77793"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/gd/firefox-138.0b8.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "e07c785c5c9873062d9b761c212dac14bdfe88737a8df93a3fe928190b6c28d2"; + sha256 = "78de6bb428a013479925616db118e9d8e8062ecde75c1bef1de4cff24d08b39a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/gl/firefox-138.0b8.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "ced8304e694cb5a33c1fc4004debddb6a5ab001717e0fa7e70d0635680c1df12"; + sha256 = "0b931e1b7367b9e529766b33e7f9b33539638f0c8ebcdebe9803aa3102e4b51d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/gn/firefox-138.0b8.tar.xz"; locale = "gn"; arch = "linux-i686"; - sha256 = "cfa35eb30a9d4dd075dba1dc83dc1941689c40988839e761919b417b9b1e4555"; + sha256 = "c2703d7bf7827e6ceb5d5380321b0ff07705c3b0e5c7c5eef9b814e58c212111"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/gu-IN/firefox-138.0b8.tar.xz"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f5efc09dc204f7872f6cda19db0f66733dc536b823f6bbb223beafb5900005d9"; + sha256 = "d500719429666e63b2343e83c8c0b2ed87994dbe313f48961baaa45414739c5b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/he/firefox-138.0b8.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "b4bf8b6bb71f713850da46ca1df1f4aaf7278174c48cbc4f4ebaeca65d9863c0"; + sha256 = "225fe65494f8a2ea36f618c2b2bc8f22cd055e2c2142d243a9c74f067ba39a33"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/hi-IN/firefox-138.0b8.tar.xz"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "0f1c4f1f75517c393198cfb944ace2159e3d3f12fb9170eb532ef5edbe241d95"; + sha256 = "8cda527dacaafbf33921e4630754ddbacd587d9f03aa7f4c4b27f8f9826b4b44"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/hr/firefox-138.0b8.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "4bfbe567206a9c37dcd1dfedd430c6c5cbee015ae11723f654108b1ad1dd07e9"; + sha256 = "7b21066ee72f55b50d8e32d30d74b297fd3a04514b02ece928871a21b7845749"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/hsb/firefox-138.0b8.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "92cf0ae541ccc4b7609dd70bfbb37f7dc066a926e8c9f14e94d85dd2b2847638"; + sha256 = "33ea54c36ce97402c3f38eb70f7c3036a29383d2a786b91c0923faae890ecc13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/hu/firefox-138.0b8.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "05bae7f6e502256d1b7a9da81a207bdf01d529a6bd2ca85fa557062452aee498"; + sha256 = "7eacde8665ca348ea0108c9434193aac632d7543002c2a84fd643cab8cb1da72"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/hy-AM/firefox-138.0b8.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4fbe110d0c790e317c3d052b46550ea1cfbf3d04e836cbd48b6b43c11bdd2ec2"; + sha256 = "2b979961fc4cf15ab839fc011d1007f57256244e0369e672bacf370fc7a586fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ia/firefox-138.0b8.tar.xz"; locale = "ia"; arch = "linux-i686"; - sha256 = "dcfe829ba81b743e6835b2b8712650f45a9e6ef51e1b5b89fbcc6a8458a6d775"; + sha256 = "a6ebd0c8299a56e09e0251a78957693b44a7dd636540981f80e502d0ef7f6dc5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/id/firefox-138.0b8.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "d434c3c92da14dd3a75f61e1793f0e81cbaf4271bdb0a2a31db5aa2aadcecdcb"; + sha256 = "8e6e96dff1046f38febcd342ad383e72310c71cbf816da8f536d93c656d26319"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/is/firefox-138.0b8.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "f08a607f20e20f41d0644a80e0e916a37085d37627dd0e04828a4fd22988e8e2"; + sha256 = "8bc09e75e17ce60c4d250aa673c41a92d9308743b425b3fe81ab5feffcfa331c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/it/firefox-138.0b8.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "65d258db99319900e8ffb23614d70f3f54423399cd822682359bf0f3c7e5abe2"; + sha256 = "b979aafd747007759f9658db5cf49545b7fc6c4dd7a8516bc682b54013d96fb0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ja/firefox-138.0b8.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "4ad16c31e3be0c8e9e449c93fc201f2fc093abababdfab2d863115881533d2bd"; + sha256 = "6b7b43ab0e602b19cd966fdaadc6733536b0e61f7e23b8633c230ee941446740"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ka/firefox-138.0b8.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "2361559e34ddd3bdb002f898bb3b5923c4958114992fa6334b057f22f33a5b5a"; + sha256 = "620a990d91302c743acd9e2ed0d15af2ef7c9c95cbfcbd13abe31f37db667b20"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/kab/firefox-138.0b8.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "aafcd78122be357a6fa4c7fbe027f45fed98f0bf3d4eacf06fa8aa24d593c2dd"; + sha256 = "c549e9d8be66da2c60621deaf3c03c365b578ad026a8fbb18163f44a2edde8ff"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/kk/firefox-138.0b8.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "e44b1992c70e356c0c5118f2eb31f63ddd98c98ebbd8c5c872118584eb71c400"; + sha256 = "319992af03c691622fd4e028dee9f68ff681b201c829c8fac94b6ac1b2444880"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/km/firefox-138.0b8.tar.xz"; locale = "km"; arch = "linux-i686"; - sha256 = "0905dc9e42430fb8299ce8a0eae722b5ec7d24b8db5260612c082415f0979f14"; + sha256 = "f62bfee8800237128d7ae727564bda9060eb41d7d27f2b7eb1140c52b62e86f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/kn/firefox-138.0b8.tar.xz"; locale = "kn"; arch = "linux-i686"; - sha256 = "a592fff8c6a6076bc6e4e3631f923c3ac04af775142546e42d580ae5fdc9cead"; + sha256 = "818823253da880800026ae6e08739e615ee9aad15246e2579b4e96ee7e40f3ca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ko/firefox-138.0b8.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "bb7bc9712d8f672f30dfafbff4901ebd2c23c68b66bb3800b5a5a9d145ff9202"; + sha256 = "0fb41dc322ddd629311d6bcb8d6eb78a7127cf70cf6389f928c7cd7007b574bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/lij/firefox-138.0b8.tar.xz"; locale = "lij"; arch = "linux-i686"; - sha256 = "505d9ec5d3c110593da450ac6b8ae57740f2474fb92e26bfd7e372d168997973"; + sha256 = "a87b35d5068ecabf1541d552e09518e6871751c35bde78e50bf67b2bbb0f9124"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/lt/firefox-138.0b8.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "eca8790d0866a8d694f74db9ceb7f2f913cf1a6ecadd3df77eed217de686b8fc"; + sha256 = "89190fdf49f74bd65f09850432bb60ae457887480365d3edac3dc1eca76a30df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/lv/firefox-138.0b8.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "4d81e0900bb7d552a61ccfcab80c68495bbf883047f8d0e928f6ff2c582ad360"; + sha256 = "3d51fecaf98018f8d6fdad6402e635b42b16da88150867fc9c74f2cf900378ee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/mk/firefox-138.0b8.tar.xz"; locale = "mk"; arch = "linux-i686"; - sha256 = "851b8db8097c0f872208ba92ac628b66ab85572f16412351b36faef18f733037"; + sha256 = "fcd0107b68139c9585693efdbe52e4a67669a721bb0bb719b7375331fd081c11"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/mr/firefox-138.0b8.tar.xz"; locale = "mr"; arch = "linux-i686"; - sha256 = "8fdb01d7a9299d4f46b8d4fc2622eea7d343fffb8d02139b696a5125a0f525d3"; + sha256 = "a6fa9a09d4de8a458913f9fcc5103bf098c0d49ff51e2d233e146411320c61a0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ms/firefox-138.0b8.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "eb9104fea4231c5096c23b4769ceee5cbfda2d06c43e6248476e5559f415c019"; + sha256 = "b3f3a2133d92ce08e8b77e6051f7c2109e8f210e11ade78e1dfdaec5c107c091"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/my/firefox-138.0b8.tar.xz"; locale = "my"; arch = "linux-i686"; - sha256 = "0363c1bba70dd20e047784ee7aee50b97512fa01a498de8611fdcbc424b489ef"; + sha256 = "998882322ea526f81ae367025eddd7bb38c5f0da8d88ebfefbf78ae47c06b77e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/nb-NO/firefox-138.0b8.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1d7421306ccfb6afb43649895bc71eccb9a2ae8da95c941ed5a0538add4c08b7"; + sha256 = "8a7b1e32d6895b7120f6de59614136c3fa6788d419afacd3aa3031b147a44b29"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ne-NP/firefox-138.0b8.tar.xz"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "a3005348908f842726eebebfd8ed21763cb893e5416021e963b80733df1c2ad1"; + sha256 = "2d764038f27072b9048b5ceea925160a577f655be63db9fbb10dcc313a0ecf19"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/nl/firefox-138.0b8.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "8a1b2dc5c61ac95e38de823186e886531482ba75e837e9df6c8bb0b0c3ccf208"; + sha256 = "9f36b90b2e781872218598472b4351713976210f94544b284db420a902d90d5c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/nn-NO/firefox-138.0b8.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "351341647bde6c40e0ba8112e98ca80be4f7af8b74da08892f82b43284a4c9e9"; + sha256 = "d717f8e3d80f21fdca92a39b0c85bb8d4d9279d42a471c8130f841e0a1a6092c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/oc/firefox-138.0b8.tar.xz"; locale = "oc"; arch = "linux-i686"; - sha256 = "d8fb3dd34388204543e4e4bb8aed424df10b77e2cd2b51f7549f091d3c7ec6c2"; + sha256 = "8b861eb3f4bf31caa19648d5d56b8fc4f3f6982e5bb66849b56e13240d2eef4f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/pa-IN/firefox-138.0b8.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "839dea66654c3efba3d733bbfba365214189eeb4a61dbbf020daa115eaa7a304"; + sha256 = "883bcbd17478958b7051a4831ae4c4cae6eb317fa0ad57d7dc3e5ee5a07744f0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/pl/firefox-138.0b8.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "20edbddca204268e30efeb2ee20995cbba5f26fdd706ab260ab4e7ae2f1b9ef5"; + sha256 = "94179577c1acfb8ce027e2abf828cb29025d7419bf110eb33f998ca69f8e44a3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/pt-BR/firefox-138.0b8.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4cf9ab194610b2405e34de6e456993b70fe31f9b04962a9a344250ecf16500aa"; + sha256 = "3b18635c5ccab1a3fb31fddd5ec73a5bcafd217d91b392b4bfdb152c8e60888c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/pt-PT/firefox-138.0b8.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "482fd023b60ce06b25e292c7764dd7069951dd2d88b542b80a24b1b1422a8fff"; + sha256 = "e6c0d92e26f3c793654269f0ac041492f1a61efade8c21a8f1f5d9f5c7a462f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/rm/firefox-138.0b8.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "2cb8a7ad00eab956ecbb001019877476d7aca116e79a0e43b05365ecba41dafb"; + sha256 = "896fa4341255ad6edd05747b1d9b7862746649f5a17d1771e52e4d3ecfcb0f8d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ro/firefox-138.0b8.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "6db1a0fbb04082c803858ce2cd222ea49965bdc81d35f1ab77bccd69aaffb9cc"; + sha256 = "1453aa68ab6f1473ea6f2bd74b3d1bbf7867a3f874f5ac4a006f711c7f2606e0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ru/firefox-138.0b8.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "7bdb6d708b8f3515549c4047c56e61cd0ed58b784b5ccef7c32ec1e204d46f97"; + sha256 = "f66e1fe7ad4be8c611a4086e2c274315761040f8a703501b88569dfc4a47cd35"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/sat/firefox-138.0b8.tar.xz"; locale = "sat"; arch = "linux-i686"; - sha256 = "1ce9947cdbd094a5e1efe8e6fdda5d4685a9457e222569151a3423661b264dc9"; + sha256 = "9348c28b1407b57a2498eeaa8928e9b2df482414a4ce842e0fd5d32a15ef960b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/sc/firefox-138.0b8.tar.xz"; locale = "sc"; arch = "linux-i686"; - sha256 = "6988b13049e6c34ee09868c2b004e7559c39e7931ec246a50643a051c8ec4083"; + sha256 = "5f1e203b0bc54bef4d26b799c9f0b36135a10e52a11432442a993c422009777d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/sco/firefox-138.0b8.tar.xz"; locale = "sco"; arch = "linux-i686"; - sha256 = "f61ee2344d1dc96a6b8fa13b3676376d3f43b9c1fd65dec344ff3781e448f1a4"; + sha256 = "9d5aa39bea903a6c64798b57208a37a429a48188fc90f85e07d439a8b4d4c982"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/si/firefox-138.0b8.tar.xz"; locale = "si"; arch = "linux-i686"; - sha256 = "8a418e6fecb901bf0fe27ff3717159ae0e9300ed27ee2dfc83ccb54ed9c94980"; + sha256 = "c976b9445a68b630c6b8092c3f9cf1809759d3541d9db3edd791a2c8a2c58431"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/sk/firefox-138.0b8.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "5c1fc8793fde16c8bab897210a620b401d2fe2f416c766dad5617bfdc166c097"; + sha256 = "528cfc6405d82e49ce1d3f50b982778e0666e6f2a6db2581cb85d0c32fcfb958"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/skr/firefox-138.0b8.tar.xz"; locale = "skr"; arch = "linux-i686"; - sha256 = "789acdd8375d1f96a6ea86d0866dc164640d80400bd7d27320b103b7e3f7a210"; + sha256 = "5888fba7e084bd38d72fb4d3b9ec8515c78f60a07e7297a02c86611f9d854645"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/sl/firefox-138.0b8.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "2429564d5158a8ca350b64041a25d8678a51b4a7947cdefb5f1a006df3a2b1cd"; + sha256 = "05713c10164b52bd8d8e0713fba0c983b3b1eb8c7aa36192e967b808ca99f3ae"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/son/firefox-138.0b8.tar.xz"; locale = "son"; arch = "linux-i686"; - sha256 = "b54c750963d11100b56055bf3be5b4397a80c3b487189cc7ba30fdfcbec4af0b"; + sha256 = "0ba74b43e2a4c41730fba7ee8b67c3b545fc580d3f891d5498c2d2ee5d2305a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/sq/firefox-138.0b8.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "aa829b9d1490c97656b785e17e6a612114fc3e5f850808f277176eda12a547fb"; + sha256 = "d14cba8c3d12875ae5899e48a94eeaf2405f1877df587508b59bf3268fa92b0e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/sr/firefox-138.0b8.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "5217c2f43e2cd8a363660ccd992705d96b9f2b7ecb7c5d3d400f70d385d85567"; + sha256 = "7990c1a1fdd683dc42746eb062fb8c7dae0f1de5d15a6d78c1d798eb1be71f89"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/sv-SE/firefox-138.0b8.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "74b995cd3793292f1cc2f8e30ee72f059aef55295fc5811e12baa6714ebb8e95"; + sha256 = "132a876e9bb9acd950646bd8b39a098f46c5c6ebafd07cb86da8b85407758d29"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/szl/firefox-138.0b8.tar.xz"; locale = "szl"; arch = "linux-i686"; - sha256 = "86acd2e307a17b0668e756ef12515ab4d37b3ae4fa9c308d15a58e236ed1597b"; + sha256 = "fbf778fe846332616090640a2545ffbc4c536e7769137758d22b0aa33e3534d1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ta/firefox-138.0b8.tar.xz"; locale = "ta"; arch = "linux-i686"; - sha256 = "1b1dddbd4dfa2ba4e43b0d97357876925e3a3b4fc103890c36692e4c669551f1"; + sha256 = "49ed6296edbce85d364427a730bfb74e536dbbc92b1887a6d23878d1dffb4d65"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/te/firefox-138.0b8.tar.xz"; locale = "te"; arch = "linux-i686"; - sha256 = "9ff90bbf310a961b3ee5ce81d87815af20a97d317835ae685b02bd11d76e4430"; + sha256 = "df9eabaec213bdb9df7c3fb487048f5d0e03ef9e1b36edd5a508c3699409a33f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/tg/firefox-138.0b8.tar.xz"; locale = "tg"; arch = "linux-i686"; - sha256 = "6f5ad0a96358acbdab8eb6499adbbddfefb19da4d4add4cfdeb374eaf7b474f7"; + sha256 = "976fb89f5111994de51ffc51d6a18e5c96aea5bc6a80c57690fb843a453eca18"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/th/firefox-138.0b8.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "29264ff4976979c5e89ed20ee4d1bf3d1f4fc174e86f1d4713fa470cc5d57e90"; + sha256 = "509845c33718e4d66c50507a919a7eeffa65aa62795edc37bf03374056025cec"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/tl/firefox-138.0b8.tar.xz"; locale = "tl"; arch = "linux-i686"; - sha256 = "5a9edf38ba5b382c63d42c58a578af4b89840ab2996119c8cee7842a230e7161"; + sha256 = "ce97e79ee1f295bfb92a26126efa3366681655806014e38b0218621745159dfc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/tr/firefox-138.0b8.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "b1592111fc5767078edaabf192e8fa46508479d070714181be7469284df881ed"; + sha256 = "4d044aebd3893b607626ffb53b57ff962b3bc12770f5be7da42f12f5c03eebb6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/trs/firefox-138.0b8.tar.xz"; locale = "trs"; arch = "linux-i686"; - sha256 = "2f535a90613b2243300da5bc35185c793796eb3d5eabbe565818c25ecc910d2f"; + sha256 = "f7c6cdb6b7d29a66b9f5477bd8ad6e2f90d2c9c51c0ba454305fc47bdd0222fb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/uk/firefox-138.0b8.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "6362f8c826d78cc5954816e5bafe40f87b168a61430330e5669163e415c63840"; + sha256 = "544abc2450e681b0ca8ec833a13bd02ddf94bb8dab370126b190eb3d46b35548"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/ur/firefox-138.0b8.tar.xz"; locale = "ur"; arch = "linux-i686"; - sha256 = "b267f2749c8f8395b11ad589ed0605a0c5afd1277286006bbafcf9c34b9e2b7f"; + sha256 = "0dd23e0b02a3d25131ccada64e1ca735ec97702b8c5bd8904f04cfd93701004b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/uz/firefox-138.0b8.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "14c173874b105b357e2c2db597da5b39974c733df54f8d3be07b341179ce8eee"; + sha256 = "44f51fe9a06fef663ae75d5e045ad7ffabd0b111ec3a312b1d427c272719ade4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/vi/firefox-138.0b8.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "ca75da7252cf7b070515cb45474df7c2acf247731757163362ebf90bfc2432f1"; + sha256 = "0e1514cd3dceffc592703a44afcc456d0ebb01528c3215ede19c97c86cf50937"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/xh/firefox-138.0b8.tar.xz"; locale = "xh"; arch = "linux-i686"; - sha256 = "dde72415aa29498cf08a7015b1e9122239705978da0028587ecfc9a125488366"; + sha256 = "b4ac60687f69fc7d697bf6cbd3d34cf17c0135aef0044148da9bc930926a4d21"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/zh-CN/firefox-138.0b8.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "7eaa490631845abe7e20c88f4238de0dfa278ad7d36523898f57d469e2b8da88"; + sha256 = "feca67d43e8cac981830b46c826c7739ed79051c51008622d5900b8184e64486"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-i686/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-i686/zh-TW/firefox-138.0b8.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "22667488a77ccf885072a125735c103e7a00473d9bdad07b1cb5d318c3a94f89"; + sha256 = "787b75e92cd96ae3808ad38dcd7300360d017ac234f3fb3fff7f11874ae3f7d6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ach/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ach/firefox-138.0b8.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "ce548a0c42c7e1975e5379b7bc7134832757409ce03710ee8a22a6df2d38673e"; + sha256 = "4dba4de14bf320c5e71a133b183b60b7d04d83a76d86cf77ac507c45bea9fb8e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/af/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/af/firefox-138.0b8.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "06da5be60293d3badf10a6b5742bc3cad97023b4a306a0594810f83589268e24"; + sha256 = "f429dd76944239dfe5d55242e1a194aad714ec352e8b0f2b10bf5dfc322c92d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/an/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/an/firefox-138.0b8.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "c7804abcbc07eb52164ceb2f1db308b12a9df64507e93b29e4786d86ec63c78e"; + sha256 = "6a74e60087a3c6d75d805c320c6b2920ed14a5d0354b3e6cd7573fe2954cbdab"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ar/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ar/firefox-138.0b8.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "0167980e4292272f83029af4cdb1da224b796e3063be21b24483723318541e3e"; + sha256 = "59cf79704987223a349c033c00f323b4f85897f3879fac905c8b217e9f41ebdd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ast/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ast/firefox-138.0b8.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "0f101d8d68702cfb4ce78633b23839b77947193a45b8519367eea3a6b5f4a62c"; + sha256 = "e172f60107ffb37fa364f2401a63818216083e907b25dd4b8142248b999b6589"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/az/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/az/firefox-138.0b8.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "f3e4494e319e051584754307168b0e6b425d7089f645634d3fc09ae5284155b0"; + sha256 = "70c01c89cbeab938b3d09fbd609d20393853e7b7cf9370f7d8111567477dde57"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/be/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/be/firefox-138.0b8.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "130aae11edb98a9e33b081f8441015cc63279c346db8d958c643e9f3bd871271"; + sha256 = "a1b5371d5c0f533fffe78b193e38945bc1ecefc13e6d41dc75ea6fe7a0012b8b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/bg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/bg/firefox-138.0b8.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "85f71b158f1bc589a78a9d3f4abbcaedd55a1ff4718efde4565a5d749faac35e"; + sha256 = "f546a566fc02cd611b54da162e01eca1591c05950faa283619ff462f311e46c7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/bn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/bn/firefox-138.0b8.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "0e0d0ed99d2dc1333010b37ab71f74d9b8f5c909c7dfe9836a4c7944165993af"; + sha256 = "83493f8396f07c94297e4d3f140b64286d5dc0aa9fabebf011640f7a31a5174e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/br/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/br/firefox-138.0b8.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "d1e4a8f7cd8fff5fc85759a87794adae6c316df07008f8aa3fa2987598cc2730"; + sha256 = "e8f9348a03dbbb95dc54669295263412c6770ba8092668776205325c4d66c498"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/bs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/bs/firefox-138.0b8.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "8a169af638602d6da03194a40a3ab96c251b3216ba365858e3f2d71a595a1a54"; + sha256 = "1e8f291cc4869139abf7fe4cc0aa34bde2cd6ddd65b1de88122c190eb1fd9f41"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ca-valencia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ca-valencia/firefox-138.0b8.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "6f29784363b9291b19f92972a48e0de87b679b0f9e0942d92b5ebee675846885"; + sha256 = "d70218ffd6bb42aead9e52656bec4f78ff5d71e43a6a4ad74f5687e171af530c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ca/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ca/firefox-138.0b8.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "7b0d0657930eac7e2fe75e91ed4ca0eba4dde283a5aa8ee17287c779b12eb347"; + sha256 = "92549a05b092a511ee061144204195f44a12db4e69a91962a678dd98b456e59a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/cak/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/cak/firefox-138.0b8.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "008110582b519f4b753f2f3fcb7af37fa30225c89687233ebe132b581393231b"; + sha256 = "2b45886b54ef0e35605d76871c93df2773077bd63a19edb940fcf46e7769cdfb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/cs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/cs/firefox-138.0b8.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "19ea0006094e57d9ff62a93d46708ccd78cc7ebdd9208fdebcce4ecd27ba471c"; + sha256 = "13bc0c007f6cb8fdc1dd2110dcf4a688315bd72e3b5abafad0cc1143695459c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/cy/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/cy/firefox-138.0b8.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "3f5ec52e6d4fae2b875324320d07160d493eec5172c5ba0b2b8451d761a58aac"; + sha256 = "c3a60745e0a01dcc024fb5f1a669b2ca64a44f0d3ccfd2ba55a8c54656115417"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/da/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/da/firefox-138.0b8.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "1d1d769ce702a698a6d95e5847ed05b3e299e3e4258edc6344d87990279f62c7"; + sha256 = "455d9e99a3c6b40b1b043b9cfbcbbb1a1c591ea48f5d516255241eb393e2b574"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/de/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/de/firefox-138.0b8.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "fc629f70100300da9d040bbe4da67cfa1a734240457245546ba7f50647c66a16"; + sha256 = "7955b14e88187ba18ca1cc548406932639d8aef074c2b95016d92d4f1d16b695"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/dsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/dsb/firefox-138.0b8.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "80299a2420fed5bf4bbf4fb8a32f6ac8e4bb0d73c2f78d59f770af02695d6fcf"; + sha256 = "45ff9f1fd0ca8a5a2292dcde5e3a13e9aa0021f97cf9321f281003a3ed360fbe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/el/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/el/firefox-138.0b8.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "cbdbac410aa4734ce40e6afc65001bfdf8662ff923ae31e7b634cdf97875d859"; + sha256 = "8c72c30ceb3a44b79b3a7c48234744c47cd726592131c71b8abc27b1c769254d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/en-CA/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/en-CA/firefox-138.0b8.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "a071d131cadfda0a918a0287f1ae7ae3c670fbf54a02679bda7737b420fadc10"; + sha256 = "3c030eeb676ec244a66bc049abc2f7c41c4b9af648a8bea243682fdb4af400aa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/en-GB/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/en-GB/firefox-138.0b8.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "28ecc1608fc7b832c1a0a1f72092bdc09fb2e09c6edabe3d55c14dc456662b75"; + sha256 = "2e729717b9cc8029784cd2e00767552ee68b08796c20a4ccf0197076b7e2c281"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/en-US/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/en-US/firefox-138.0b8.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "4c028acfa9d519f795fe4033a9fe52ce1a2288be33e9d854cf256c4660c7946f"; + sha256 = "c9246a995979a13b142deddff467e899954c327ec8a945cc0b22a7e20663c001"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/eo/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/eo/firefox-138.0b8.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "73ef5438bffdbe75076d6830f0521f4cfba73eaf4eb7d8a0a92a5a9c532953e8"; + sha256 = "6faf6b3db45088f3c7c826a6a0c866c5b16fa5a7ecd6080ab448eefe056a67f2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/es-AR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/es-AR/firefox-138.0b8.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "a2ea925be3b5331a320787a2d01cb5371794131c96c20592b04f324c5d66c8b7"; + sha256 = "d354bd8afe79bc10eee44e71ca1f0d71a0295e393fab7dfc80b58d82fe8dc0e0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/es-CL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/es-CL/firefox-138.0b8.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "ec472157a4b483f5bcd72a9819ec9f8755e8d14b2f697719e43f95eca19af71d"; + sha256 = "36a553b846c8e2fd5880574a88a0113132634e0e049de5c712d20e6897c1c176"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/es-ES/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/es-ES/firefox-138.0b8.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "1f0fe1aa55012dee2c482309cec2dd894a3f7221e3013ec56c67ea2266b5fd2f"; + sha256 = "3a09f6aab43b37c65585c4352e8df347d0505c84bf8d7a5c510b0e540873c23d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/es-MX/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/es-MX/firefox-138.0b8.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "24ae6e6dcbd7f5e48547aca74bcd7b46993a23c9672ae7d32f28489367dd13e5"; + sha256 = "218d3547916fb90d9fbf3f43eb2e17473807429bd7f82cd98469f3f49c33b119"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/et/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/et/firefox-138.0b8.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "93700b3435fd867e257c831654eedc35700e175e6b4e766d853fd8b51becda75"; + sha256 = "6522bf6eab8e7dc2856ed36f5e8a34a5a2c7938e35df288261d9bb21fb08188e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/eu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/eu/firefox-138.0b8.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "637a0e3bd45a6e4d73d5394f7f6be9b3b6dfb14e797c8f019ee640d1fe1ea3a1"; + sha256 = "8030d323e062a1173eda9e9ca2d29ed7a77155f202eb990b71aae790bb62fabc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/fa/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/fa/firefox-138.0b8.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "5be4866571ec92021bf0cd764dd4d2112bf0cfff650e69da6cd2cdc1f6b9f9d4"; + sha256 = "7ef0bb05281b92a6b74e856fda0941c3390e5dccc3cf9a5a2d927a640ef9d1cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ff/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ff/firefox-138.0b8.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "439df3eb29b13d443466cd585f6c3bb0014391462003860486959233d228a246"; + sha256 = "002f289c4ca6b7ff049e9e527a914d8725015f5072fafff463f9b573097a5008"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/fi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/fi/firefox-138.0b8.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "c58331db4fe82801630365d5621e1ad8f82a3552a2763c68a965b0ce83180947"; + sha256 = "96c014b4d4c3de54d2f78b9d74d1ff138410261cd09600e0fce4892c415f8de7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/fr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/fr/firefox-138.0b8.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "dff4cbf811f7fcaad0259f1b0c297085fcd521f1c76efae62152470966eacf83"; + sha256 = "e0e597b512754cc7426a75655d4fda26eed5c219afd195bf50f81849f07a3ce6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/fur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/fur/firefox-138.0b8.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "3c356377b02f6f790a84dbbfa8b55d37c84dccc6296f6f8e25f089608fdca44d"; + sha256 = "ec7bd02d2f83959143ac47889a7bef5bcfd7082b7858c276aea7513f9503d32e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/fy-NL/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/fy-NL/firefox-138.0b8.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "6421023ee22edcf15f1dcdf6e747edf14852f6dcb30d9750b330fb23d43c213c"; + sha256 = "9c0315fb65755fd68e646a3735ba7e7ace5a43b8664c3cb0131a35300e7672fc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ga-IE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ga-IE/firefox-138.0b8.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "aa506c7b34eaa2195a2653b18bc931772ccea48c30cdb7a99d9d9edee872918c"; + sha256 = "484828425dad1a8ee77b35ec531a2144df77b5bcb0f9620aad11a994409d41c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/gd/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/gd/firefox-138.0b8.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "0d6421613741d48342ed67ae9a29c09a4836d38afbef33158cf579469e7cbb8c"; + sha256 = "b831c4d80580ba2aecf7e724816ea26075c952c7de28c8cb78496d75af533cdf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/gl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/gl/firefox-138.0b8.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "f94460f9d1a26d424659363bf7da21b7c12a7e8daa648321ccaf5e812a35d01d"; + sha256 = "cbdd00d04fb1a9728123becc83f0279a96bfe283a27dc044898dc87a7ccb5440"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/gn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/gn/firefox-138.0b8.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "93eddd6cd208ca63193dec9b51544c210949278495a90c043f3ff4d9cca8acc3"; + sha256 = "389dcb60e0e20e2ea19b751cf9cba2160175e7c297b838ccb3a11e0bc78d259a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/gu-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/gu-IN/firefox-138.0b8.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "5034e3be1d6d382bae34b6d64f2fdadfe92885d4d78db3f8b56ee262e5d6211d"; + sha256 = "de31fafb532f86565ec03c939250fc32537f672ed09cb3eea21272fae962eefc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/he/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/he/firefox-138.0b8.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "e80722332526c57f312309aab776b9decf362adcbcb421444559c704a7eae879"; + sha256 = "cce0cc8fa93f6318688ef2a664159199e4c6e1a2d3aa984ec46bfbc2536fc0ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/hi-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/hi-IN/firefox-138.0b8.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "7782ba6f9d86029b0ec370e95ccd2e7818a0de2b00a01fdc11fc3c8f337d1cc7"; + sha256 = "3dc345ff030c1ba64e95f06b6ba3e6c9a2aa175ad7464fb7bcea28d4225f175a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/hr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/hr/firefox-138.0b8.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "62f77d473c2aa0f246d256f23a4885efae9582a8fd1b5ed5160f0c085eae0c97"; + sha256 = "bed89b538d187722de5e18a3d6e2aef568c3a5bf1be7c2f9b418c263dac0f11d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/hsb/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/hsb/firefox-138.0b8.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "8cb41909dd42842b5a0415cfb304e2a2b34e8be60db35e7bf9fec93f8b796a44"; + sha256 = "143ca5f040c5274775b40c3a7f6a9756ab04160423eaf7338f75b0f03629dadf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/hu/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/hu/firefox-138.0b8.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "23a5cce6bf6860851978cfd199e6a843b4ce8c6b810636d7044a58d03d8ae0d2"; + sha256 = "aa979034b6fdd14f3e948eddc0f4bca691a213279f4351dadefef6d2e7bcf7b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/hy-AM/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/hy-AM/firefox-138.0b8.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "671ed7bc013c4be4507fafea2d7bb11105e760a9d0bf262b1fca943cbfc2c31c"; + sha256 = "6345b24a6ee4d5a63340c7673dac3afc729ce001e37e9019d6ca74e8606bf298"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ia/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ia/firefox-138.0b8.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "0c126080ba8c9e1721b98ac8df93a5f3a0d019724cd85c33e3905a42042c5648"; + sha256 = "d9875bf61c807750f626237c55dbb6b9c0544fda8ad4d6f60e0c8b98293bca1b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/id/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/id/firefox-138.0b8.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "854f96bc809b0687c65d27b6f9241f0f8f628ef436097c7aba587e5fe6441d5e"; + sha256 = "b8fbad9f4bd52096ebcef09da94271a2b22914b034b0aa3dde30763061003f2a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/is/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/is/firefox-138.0b8.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "089f36c0ae651bbe196078e2d98593c4c612c2b81336f6018ebe54b201cb70b7"; + sha256 = "5905f09f368c0b8165eecd8fd896c082d4b6ad7a288e2de96223b00fae4f380a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/it/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/it/firefox-138.0b8.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "42f78e343de68b8bc33419a8fe983a2a31d83ebebc2447ddf9db02743b4103ee"; + sha256 = "4d0051391fc367fa2f9de69ad761fa8832aa5b4aedaf4dbbc09b4668cb7c6ee7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ja/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ja/firefox-138.0b8.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "2d2c097f0ff0f15d864ec09e7ec74de30935973283ae2decc2929051fd6b4489"; + sha256 = "c56d46da0be7190bc1112420080a1ab34e161576b53165cc189e03d2c5174e63"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ka/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ka/firefox-138.0b8.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "6e0b139ad102bfd028dbd752a5488c53e2176d0b5aa59715dfd813bde861a8f3"; + sha256 = "83149973b83d8405d1cfd3d02ee382ec79e606bf852398abf0960d7f13b100a9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/kab/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/kab/firefox-138.0b8.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "31a497c03ab41039abc657e7b24b980219e25590958d0219f418a6c8a267b0b7"; + sha256 = "4086a97e0341648b4784b8e3cec4029f4fed00ebaab536b655230123349ec24d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/kk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/kk/firefox-138.0b8.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "b8b85696af18ea3a53b8b0bb454b96713d194bbb555c081689ab3e2080c5e47f"; + sha256 = "9232a3cb15b541e6b0375f1eb2ec7ad60c32e4a6aff255d373e3895ecfa01ed0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/km/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/km/firefox-138.0b8.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "ba9b7db2c6263a2ee3456366d145aa835b20e42828c9665359cbda626608d6d6"; + sha256 = "777e0d9beab3480e0556a10caca424cdc8d51a2e19751e8bbcd47ba536a4a0a4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/kn/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/kn/firefox-138.0b8.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "d65d064f102a20f596ca72a87c365d12a446a50e0b5c7bcf90c98d927812335c"; + sha256 = "c15468a0a703020e1fc518b0752fdc522e047b7138b485a8b72133e4622a7d12"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ko/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ko/firefox-138.0b8.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "0150bdbf754a3a5055a6684bfd370982aa80866cc5ef3673acbcacc49004c1ca"; + sha256 = "1c49f3125f5b71e5ba2b7e5bb4331f4f1d561b0a12d8a21488bfe9a6c11d0f72"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/lij/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/lij/firefox-138.0b8.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "7574d4aa6421d61bd76c83ee337a08733531b6e3ed291bf73718562fbea7f913"; + sha256 = "919caa0bd18b0d7baaa393c0682aa250d980a045dcf4303df5d4076cd212ff07"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/lt/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/lt/firefox-138.0b8.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "259d5841f39910ecbbbcae05647e9b9e45525949e40f56d451677877998bbcdd"; + sha256 = "7cca85b0f5cb687c4a58cb3ed8440850cad102ce8b9410978f51e42e3f3ce732"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/lv/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/lv/firefox-138.0b8.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "7af8df80da1118c9da7611bab1889fa17f25b7a05d5cc65aa1fb676551c56fe6"; + sha256 = "3404a967cee8b521da2aa2e44de6e1fff492266f11d4e16b6130889530c4bae6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/mk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/mk/firefox-138.0b8.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "7fb1dc800a568d59100cdbde3f387279b6d81d19945318d56832776219314f4e"; + sha256 = "3764c46ad2eaeeb18692cb23399ccb958fc855a1776096252e1362c8d6b7746d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/mr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/mr/firefox-138.0b8.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "078935be95f22dc8b15cb9e25ada5d96f31d3776333c46c5ce736267169efa04"; + sha256 = "b953a8be0c927e09e8a32b607a2e405be0d343e2856f31d4727edd3cc21c72f3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ms/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ms/firefox-138.0b8.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "3628c6d7f073b1e7dcd224e708da5c14485066e7ba0503ba546cdcb447a5ea98"; + sha256 = "2c2654b5b7288f1b03c340a58b6cff5bb2fd28188e3a60dc36732ffc9a5d3548"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/my/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/my/firefox-138.0b8.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "3cf629fa5e4a98377c039d35a150cb66daa9ff556b3a3a8eb6975eb1a73259a7"; + sha256 = "93a8cea90b538beff516fe946a9b6bf96fc1e8edbcf30c90bf3b311bb662340a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/nb-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/nb-NO/firefox-138.0b8.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "8f2af84577fc72b2b25d2ccbcb9bb3b6a7369385253b9f54428b17667e5570da"; + sha256 = "da4e75f2f00f535908141a3ae633f4391f6d181a7b8072cd3ff1ee36a0783a68"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ne-NP/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ne-NP/firefox-138.0b8.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "684bff075da0925c758b9030a4926adf821da91d800f5d7b084becd800275bf1"; + sha256 = "c1b57522b6628e23d74d889958fe43ed88e236d612fcd2d1b124307f9ce2a1d9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/nl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/nl/firefox-138.0b8.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "9f0489801ca3b4c5e819f440d25e4eed4ea94c650d87d45ec0070954b6d60dfc"; + sha256 = "f08d7801a35502d87ba79536d0852046db3ad086559c0f355633b24e915bc18a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/nn-NO/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/nn-NO/firefox-138.0b8.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "3d969df152796d67dc4128f8b5d4caffc27cc163d8a922643d39263228fb8201"; + sha256 = "3caf0db9687ae89a5a4e226eefd9739179a7889ec81c2ca26186f2eedba8bcdc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/oc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/oc/firefox-138.0b8.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "4170cacefa6b4d6d7569d3fa6133b488a75b53cefc3229b87a556a5da2e11734"; + sha256 = "46799eb3d065f4a16100afaab696827b156474d9d83b4e95ef0678c7981f52e1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/pa-IN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/pa-IN/firefox-138.0b8.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "3e0987701d64d0c6054171b3587d8bc0e1ccbbd4ca2f7907c62a4146428509fa"; + sha256 = "889931181631832037cbcbbb2c883a22a154ee4161309d9bb3f87721eb97e191"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/pl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/pl/firefox-138.0b8.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "e3dd25e8120bfd69aab6a3b67f05aa24453edba986f85393d5e6c6e281bb8819"; + sha256 = "9ee7fa9407d5ba68483f1383e453cfaa6598e26b8e8800d9fd5b1246579d8e13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/pt-BR/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/pt-BR/firefox-138.0b8.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "560ef4c0776897f5ccec34b3d8b481bfe6f6d5096cd4d3d984a444c417688e7f"; + sha256 = "26948401239bed611427dd907bf8c16ec8aa7fabe901817eca4b404a56dc0a13"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/pt-PT/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/pt-PT/firefox-138.0b8.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "3dfc196e3079bdaac5377e467fdbf195bd93e045553990c3cdc0631feb1c8bfe"; + sha256 = "9b61c3bc750c01a97e063533bc383cbc37b8a756685fa51fbdf0d37aca0c4a3e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/rm/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/rm/firefox-138.0b8.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "a4d89476a65d7be5502aac1d85a50110198b23362de3df69d34c66bbe8c51d52"; + sha256 = "1090ee036cf5ccc6e54c8d027c3dfc4b48d0b551b5d1e5445af9df8df3773b6a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ro/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ro/firefox-138.0b8.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "1723c06b5ad3fa1fe06b6b3d7a2ff18a4a94cec217fc46501e571b69ed4bace3"; + sha256 = "4c5ec76aa87d68d23136f8b6493cf49de7e1f4626ef6591bf7f56ba2a05e9848"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ru/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ru/firefox-138.0b8.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "dcc26bb5ad02edf2e3afa0c73b5381be48dcbdc12ffc24d9f6df6d2afb639df8"; + sha256 = "0d689b56d5ac9feab771f71af7b5fdac84c493fa53d6df84107a97982b4816b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sat/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/sat/firefox-138.0b8.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "fd686c94a6a9506bbfa6e7a362c39728ecacb59e762467725d78af5dd16a6d03"; + sha256 = "9f7b24a649199891e9df80f418a7ac446dfa5c788654e865f5a345495912787b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sc/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/sc/firefox-138.0b8.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "488066e0a984fa21637b0aab44c7e78481625acf309da28919a4dd1042ab193d"; + sha256 = "c6ad52380b870f26799bb06b98864aab86f25b33c41666c5f2d759d51eba6ef1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sco/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/sco/firefox-138.0b8.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "541a7eef9f6b9cad7498f2166e0b9a99e5eda68956649825fafb8283dd78762f"; + sha256 = "2936d6257caa14ac7143fb2e2b94a461bb843503580906f8135210cbca57dfbb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/si/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/si/firefox-138.0b8.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "7fbdcaf6588d7aecae6339e85dc50e6884c88462df6dd5789fd36bcb91f264bc"; + sha256 = "81822c077d0970599d5eb3e5c189c8d9c2c8f7e6c81e21d2150a3448450a9859"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/sk/firefox-138.0b8.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "8a322025bb0f6b59a1afda171463e200a1021666c9c5a8a013c538d2d8e253bf"; + sha256 = "0c6478b5031dcd15a2e33a5c90be75f284eb5f6e6986681d5d47f2a6c0c77331"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/skr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/skr/firefox-138.0b8.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "1d2d7aba9d3e02d36d578e67a71ada78f85ae10d1b76107b33eb58906c48687c"; + sha256 = "6215e72dd7d3632b7fbc6931a9a0419063ba1530ab0ab1d75b86da3a7f84af97"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/sl/firefox-138.0b8.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "a18a3a73b20bed6a85af824851e27e64ff437eb4fb30b0c2232827f2ea3f5b7d"; + sha256 = "a516ff966fccccd21a7372bd657dde36140197ca2ac0f9fc2ff5a138abd74189"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/son/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/son/firefox-138.0b8.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "ce5092715fb13917401b79edc9b6cecfb08b07daf4400d70f7918bf0b5c3b614"; + sha256 = "fbec94c4d3d4418c06d8d6efe93d42afdbc9b7de0c2cd438db14b32e65243618"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sq/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/sq/firefox-138.0b8.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "24d2717b7a4c35a4722723c198223829b08490e24c463cd0dc373beec76116f9"; + sha256 = "cdc237a4a886e5b529b8f71d23e29d8a275bd2c804e2299db2d2a5da75a34a7e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/sr/firefox-138.0b8.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "c482b732493da48cb9547e1c8a3159f417560d5c9ea7e1353b70d5534deff6df"; + sha256 = "d69d4bd632eb6fc9b116449c4da3324bede43e403184b45aca638a1d1df4bafa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/sv-SE/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/sv-SE/firefox-138.0b8.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "02e92e4f7a6cae0b8e7d7af5ddc822740aa11c38f395e164ef1278441f947eee"; + sha256 = "3c113a2404605870064f1f8b792025fc23a84dac4414c422a264a316ba88af63"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/szl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/szl/firefox-138.0b8.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "22f68b8e3d2cfef8f8bbc0b62b4f35b2bf731d4ab783597f71453e7b998a1fa0"; + sha256 = "d035ef26694caac8f64cd71c2633e3309d5d8d9ad1a88884edaf9b79dfacbf6c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ta/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ta/firefox-138.0b8.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "523c17cc6a6fa98fabcda73f9849ed96aac853af1a22180af19eeaf788810ba4"; + sha256 = "5c9d1e685c27dbec4beed6c134f925c18ecfc55e1f338eaf0961f45a8aaca82a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/te/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/te/firefox-138.0b8.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "80a19adfdf06cbee81fcb7a4d8118a1f7c8928f972ce9aa98e7854b12b2d8728"; + sha256 = "766c287ab620c1656c6a9f9f015d164b0d3d5a9aae15e528c0441a890cd4a661"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/tg/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/tg/firefox-138.0b8.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "3e2a18dfefd0f14bf92983d195e36d689ade2c5f4e1ab0379a9ebf1d0c526cc8"; + sha256 = "50ef2e5781a433b7805c977889a34a202f3a17d1bd931a923b76c9f9bfef5d05"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/th/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/th/firefox-138.0b8.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "5e301b1865ecd3b08d8862c55b14b6e65af20bb1587214f82dd27f466ae7202c"; + sha256 = "a26724d9359df4ebca36a0b7ac7e48dfc882e53e0624b939302a899511371061"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/tl/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/tl/firefox-138.0b8.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "1c05bb2c82fb0e1795d5c9af307c66ea3d8942e922feacf322829c6ccba630a7"; + sha256 = "cec6563c1836c69ef503f2307cf8a2671db43fea2968eb80fbe63141c6d0c48a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/tr/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/tr/firefox-138.0b8.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "4ee13bfa40a70177d87a5a071c984bcccf004a9496013fa7fdbfa9da5ec6b3b9"; + sha256 = "3ade583446f7858772af48080fcadad55254d97851389e3fff02dffcd74e988c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/trs/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/trs/firefox-138.0b8.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "cca347c702ee2cd6c4e11352b1eea381faa41bd692a9aeda8fbb87d5c570d3c4"; + sha256 = "853baacdb7ea6470764de05f64fffe6eaef7563c25b4ece73fba1e1cd52eaa59"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/uk/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/uk/firefox-138.0b8.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "54246050515f6891d54cdee6f5705b255c9bb73e60de6097d3c96092facd5865"; + sha256 = "b083cae062edc44eead68adb030b5c885fd004b4c9aab63d451151c8f0a95ea7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/ur/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/ur/firefox-138.0b8.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "f06793e672b05ae4b66a0bf2be25faad0ca1ed9bb8e8f654b1e6c07fd4a47c23"; + sha256 = "7fcd0c36294c345eaa39b889364f919fcb35a07749009548cfb041ec6d0faf50"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/uz/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/uz/firefox-138.0b8.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "0c166ef499c1cc6472f041e02583be6e24dbd81ce18bc30b76766bce419f54ac"; + sha256 = "8cdca4b49f7b61e6dce0303af91ab171ba19bc68ef26c31709cb549faf802ed0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/vi/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/vi/firefox-138.0b8.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "3f685557dc53df3df6fdce6d0c20b1cd23de9c80a5d3b78ae0a1c3c3c72d9b61"; + sha256 = "f333e144c031925e1fb2016a9c1bac1bfca794feb8f68d32798b95c7470bbf22"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/xh/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/xh/firefox-138.0b8.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "70fef2d3a7992942f12c086959162070d3687390c701910cd6cba83e6610c349"; + sha256 = "3d04450587c1a914c9494d48f8330b131346675a5050304b59e4639a0d7d5699"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/zh-CN/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/zh-CN/firefox-138.0b8.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "18f6d9ddde4256839fe9fca9d07754b16dc98075844e502a8068a0fa814b59b3"; + sha256 = "61ac04cad80424a04cffe63009d1f491fe83bf9aaa37fd9f53b32b6bf44045f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/137.0b10/linux-aarch64/zh-TW/firefox-137.0b10.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/138.0b8/linux-aarch64/zh-TW/firefox-138.0b8.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "99dc1b10d0de3ac04d2547de7e92f5db72cfd429692212325842ed5349815a17"; + sha256 = "c887b4b68d10263a65423ccf7f7367733d9d19cc4de9ff52c6b2402ca2fc3ba5"; } ]; } From 8efc339c6d1c4f46a29505082742e4438dab780b Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 17 Apr 2025 10:30:18 +0200 Subject: [PATCH 100/449] grisbi: 2.0.5 -> 3.0.4, refactor --- pkgs/applications/office/grisbi/default.nix | 24 +++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 152d7004bf60..e28b7614b7f1 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,39 +1,45 @@ { - fetchurl, + fetchFromGitHub, lib, stdenv, gtk, pkg-config, libgsf, libofx, + autoreconfHook, intltool, wrapGAppsHook3, - libsoup_2_4, adwaita-icon-theme, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "grisbi"; - version = "2.0.5"; + version = "3.0.4"; - src = fetchurl { - url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha256 = "sha256-vTrbq/xLTfwF7/YtKzZFiiSw8A0HzzWin2ry8gPHej8="; + src = fetchFromGitHub { + owner = "grisbi"; + repo = "grisbi"; + tag = "upstream_version_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + hash = "sha256-3E57M/XE4xyo3ppVceDA4OFDnVicosCY8ikE2gDJoUQ="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool + autoreconfHook ]; + buildInputs = [ gtk libgsf libofx - libsoup_2_4 adwaita-icon-theme ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Personnal accounting application"; mainProgram = "grisbi"; @@ -50,4 +56,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ layus ]; platforms = platforms.linux; }; -} +}) From 007cdb4fc94822ece06d569258511ad8fa8e692d Mon Sep 17 00:00:00 2001 From: Jayadeep KM Date: Thu, 17 Apr 2025 13:26:02 +0200 Subject: [PATCH 101/449] coder: fix update.sh script according to new structure Signed-off-by: Jayadeep KM --- pkgs/by-name/co/coder/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/coder/update.sh b/pkgs/by-name/co/coder/update.sh index 60e9a97af221..6c12ef73b191 100755 --- a/pkgs/by-name/co/coder/update.sh +++ b/pkgs/by-name/co/coder/update.sh @@ -23,7 +23,7 @@ update_version_and_hashes() { # Update version number, using '#' as delimiter sed -i "/${channel} = {/,/};/{ s#^\(\s*\)version = .*#\1version = \"$version\";# - }" ./default.nix + }" ./package.nix # Update hashes for each architecture for ARCH in "${!ARCHS[@]}"; do @@ -37,7 +37,7 @@ update_version_and_hashes() { # Update the Nix file with the new hash, using '#' as delimiter and preserving indentation sed -i "/${channel} = {/,/};/{ s#^\(\s*\)${ARCH} = .*#\1${ARCH} = \"${SRI_HASH}\";# - }" ./default.nix + }" ./package.nix done } From 032242e204b784070679d3aab263142de3e2fd70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Apr 2025 14:11:32 +0000 Subject: [PATCH 102/449] sqlc: 1.28.0 -> 1.29.0 --- pkgs/by-name/sq/sqlc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sq/sqlc/package.nix b/pkgs/by-name/sq/sqlc/package.nix index 59b99f19cb28..01e8851627c3 100644 --- a/pkgs/by-name/sq/sqlc/package.nix +++ b/pkgs/by-name/sq/sqlc/package.nix @@ -9,17 +9,17 @@ buildGoModule (finalAttrs: { pname = "sqlc"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "sqlc-dev"; repo = "sqlc"; tag = "v${finalAttrs.version}"; - hash = "sha256-kACZusfwEIO78OooNGMXCXQO5iPYddmsHCsbJ3wkRQs="; + hash = "sha256-BaEvmvbo6OQ1T9lgIuNJMyvnvVZd/20mFEMQdFtxdZc="; }; proxyVendor = true; - vendorHash = "sha256-5KVCG92aWVx2J78whEwhEhqsRNlw4xSdIPbSqYM+1QI="; + vendorHash = "sha256-LpF94Jv7kukSa803WCmnO+y6kvHLPz0ZGEdbjwVFV40="; subPackages = [ "cmd/sqlc" ]; From a5ac0ed6c38abedd3cfd8fe70481bbb19ade0a93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Apr 2025 15:12:14 +0000 Subject: [PATCH 103/449] ares-cli: 3.2.0 -> 3.2.1 --- pkgs/by-name/ar/ares-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/ares-cli/package.nix b/pkgs/by-name/ar/ares-cli/package.nix index 180507184c6f..88e67f7e22fc 100644 --- a/pkgs/by-name/ar/ares-cli/package.nix +++ b/pkgs/by-name/ar/ares-cli/package.nix @@ -6,12 +6,12 @@ }: buildNpmPackage rec { pname = "ares-cli"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "webos-tools"; repo = "cli"; rev = "v${version}"; - hash = "sha256-tSnmIDDDEhhQBrjZ5bujmCaYpetTjpdCGUjKomue+Bc="; + hash = "sha256-L8suZDtXVchVyvp7KCv0UaceJqqGBdfopd5tZzwj3MY="; }; postPatch = '' @@ -19,7 +19,7 @@ buildNpmPackage rec { ''; dontNpmBuild = true; - npmDepsHash = "sha256-eTuAi+32pK8rGQ5UDWesDFvlkjWj/ERevD+aYXYYr0Q="; + npmDepsHash = "sha256-ATIxe/sulfOpz5KiWauDAPZrlfUOFyiTa+5ECFbVd+0="; passthru.updateScript = nix-update-script { }; From 4ed78954826dbf6957bb58b7055b965883271d8a Mon Sep 17 00:00:00 2001 From: commiterate <111539270+commiterate@users.noreply.github.com> Date: Mon, 7 Apr 2025 21:42:36 -0400 Subject: [PATCH 104/449] fleeting-plugin-aws: Switch from rec to finalAttrs. Run tests. --- .../fl/fleeting-plugin-aws/package.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix index 455488c62c7c..9ae805bcdbc0 100644 --- a/pkgs/by-name/fl/fleeting-plugin-aws/package.nix +++ b/pkgs/by-name/fl/fleeting-plugin-aws/package.nix @@ -6,44 +6,37 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "fleeting-plugin-aws"; version = "1.0.1"; src = fetchFromGitLab { owner = "gitlab-org/fleeting/plugins"; repo = "aws"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-3m7t2uGO7Rlfckb8mdYVutW0/ng0OiUAH5XTBoB//ZU="; }; vendorHash = "sha256-hfuszGVWfMreGz22+dkx0/cxznjq2XZf7pAn4TWOQ5M="; - subPackages = [ "cmd/fleeting-plugin-aws" ]; - - # See https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L20-22. + # Needed for "fleeting-plugin-aws -version" to not show "dev". # - # Needed for "fleeting-plugin-aws version" to not show "dev". + # https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L20-22 ldflags = let - # See https://gitlab.com/gitlab-org/fleeting/plugins/aws/-/blob/v1.0.0/Makefile?ref_type=tags#L14. - # - # Couldn't find a way to substitute "go list ." into "ldflags". ldflagsPackageVariablePrefix = "gitlab.com/gitlab-org/fleeting/plugins/aws"; in [ "-X ${ldflagsPackageVariablePrefix}.NAME=fleeting-plugin-aws" - "-X ${ldflagsPackageVariablePrefix}.VERSION=v${version}" - "-X ${ldflagsPackageVariablePrefix}.REVISION=${src.rev}" + "-X ${ldflagsPackageVariablePrefix}.VERSION=${finalAttrs.version}" + "-X ${ldflagsPackageVariablePrefix}.REFERENCE=v${finalAttrs.version}" ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - versionCheckProgram = "${builtins.placeholder "out"}/bin/fleeting-plugin-aws"; - - versionCheckProgramArg = "version"; + versionCheckProgramArg = "-version"; passthru = { updateScript = nix-update-script { }; @@ -56,4 +49,4 @@ buildGoModule rec { mainProgram = "fleeting-plugin-aws"; maintainers = with lib.maintainers; [ commiterate ]; }; -} +}) From ec76c85c1130402a6b3199fd3afb0036463f1d68 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Thu, 17 Apr 2025 21:30:00 +0200 Subject: [PATCH 105/449] ente-cli: use finalAttrs pattern --- pkgs/by-name/en/ente-cli/package.nix | 40 +++++++++++++--------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/en/ente-cli/package.nix b/pkgs/by-name/en/ente-cli/package.nix index 0f89c077239b..05d8ea33570c 100644 --- a/pkgs/by-name/en/ente-cli/package.nix +++ b/pkgs/by-name/en/ente-cli/package.nix @@ -1,26 +1,21 @@ { lib, buildGoModule, - ente-cli, fetchFromGitHub, installShellFiles, nix-update-script, stdenv, testers, }: -let - version = "0.2.3"; - canExecute = stdenv.buildPlatform.canExecute stdenv.hostPlatform; -in -buildGoModule { +buildGoModule (finalAttrs: { pname = "ente-cli"; - inherit version; + version = "0.2.3"; src = fetchFromGitHub { owner = "ente-io"; repo = "ente"; - tag = "cli-v${version}"; + tag = "cli-v${finalAttrs.version}"; hash = "sha256-qKMFoNtD5gH0Y+asD0LR5d3mxGpr2qVWXIUzJTSezeI="; sparseCheckout = [ "cli" ]; }; @@ -34,7 +29,7 @@ buildGoModule { ldflags = [ "-s" "-w" - "-X main.AppVersion=cli-v${version}" + "-X main.AppVersion=cli-v${finalAttrs.version}" ]; nativeBuildInputs = [ installShellFiles ]; @@ -50,27 +45,30 @@ buildGoModule { # also guarding with `isLinux` because ENTE_CLI_SECRETS_PATH doesn't help on darwin: # > error setting password in keyring: exit status 195 # - + lib.optionalString (stdenv.buildPlatform.isLinux && canExecute) '' - export ENTE_CLI_CONFIG_PATH=$TMP - export ENTE_CLI_SECRETS_PATH=$TMP/secrets + + + lib.optionalString + (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.canExecute stdenv.hostPlatform) + '' + export ENTE_CLI_CONFIG_PATH=$TMP + export ENTE_CLI_SECRETS_PATH=$TMP/secrets - installShellCompletion --cmd ente \ - --bash <($out/bin/ente completion bash) \ - --fish <($out/bin/ente completion fish) \ - --zsh <($out/bin/ente completion zsh) - ''; + installShellCompletion --cmd ente \ + --bash <($out/bin/ente completion bash) \ + --fish <($out/bin/ente completion fish) \ + --zsh <($out/bin/ente completion zsh) + ''; passthru = { # only works on linux, see comment above about ENTE_CLI_SECRETS_PATH on darwin tests.version = lib.optionalAttrs stdenv.hostPlatform.isLinux ( testers.testVersion { - package = ente-cli; + package = finalAttrs.finalPackage; command = '' env ENTE_CLI_CONFIG_PATH=$TMP \ ENTE_CLI_SECRETS_PATH=$TMP/secrets \ ente version ''; - version = "Version cli-v${ente-cli.version}"; + version = "Version cli-v${finalAttrs.version}"; } ); updateScript = nix-update-script { @@ -87,11 +85,11 @@ buildGoModule { The Ente CLI is a Command Line Utility for exporting data from Ente. It also does a few more things, for example, you can use it to decrypting the export from Ente Auth. ''; homepage = "https://github.com/ente-io/ente/tree/main/cli#readme"; - changelog = "https://github.com/ente-io/ente/releases/tag/cli-v${version}"; + changelog = "https://github.com/ente-io/ente/releases/tag/cli-v${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.zi3m5f ]; mainProgram = "ente"; }; -} +}) From 72e19cc3f34c9d43e28121c8c22b17f266953e6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Apr 2025 09:29:34 +0000 Subject: [PATCH 106/449] vivaldi: 7.3.3635.7 -> 7.3.3635.11 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index faeea580df19..ecefca97eb3a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -71,7 +71,7 @@ let in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "7.3.3635.7"; + version = "7.3.3635.11"; suffix = { @@ -84,8 +84,8 @@ stdenv.mkDerivation rec { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-E/tvarNTUm0VZMxFM/FcZKM3U/psTyq4bJl2r6orpeY="; - x86_64-linux = "sha256-8Jy7L5BSWZVIFizW11pOfXhgeT9rP1Z2T0aDmC79fbQ="; + aarch64-linux = "sha256-w1/wWP3lZUQ5tBvv6XOCkoR1OCoByURBEvaaemsY19U="; + x86_64-linux = "sha256-kJNFPXiZekjofGtKFbGc85c8yQymhntkCBuhylwQBpE="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 9f92718cf502290a0a29e4b849716b9fc594d1f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 18 Apr 2025 12:40:15 +0000 Subject: [PATCH 107/449] git-machete: 3.34.0 -> 3.34.1 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 3ec812bc8219..73cb83527862 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -11,13 +11,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.34.0"; + version = "3.34.1"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-2Or4L3wrvqW7bvrJcgvK7rGqjqiob6k8CZc/XauguLo="; + hash = "sha256-CllaviW7pqLD9XD4oSHyW2nG4lObkPWFseXZbtkNUQI="; }; nativeBuildInputs = [ installShellFiles ]; From 3a2b22a9912335c15130405ad7c4987be89e32e6 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 17 Apr 2025 18:31:57 -0400 Subject: [PATCH 108/449] vengi-tools: fix build on darwin Also, move *.app bundles under /Applications/ directory. Signed-off-by: Ihar Hrachyshka --- .../graphics/vengi-tools/default.nix | 49 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index 4457c9b88c79..a9f318fb8740 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -27,9 +27,6 @@ SDL2, SDL2_mixer, wayland-protocols, - Carbon, - CoreServices, - OpenCL, callPackage, nixosTests, @@ -46,6 +43,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8rGnW+VtqNJYqUqQDp0yOVIQd7w+cq7PIpqqIQPhkbE="; }; + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Disable code signing on macOS + substituteInPlace cmake/macros.cmake --replace-fail "codesign" "true" + substituteInPlace cmake/system/apple.cmake --replace-fail "if(APPLE)" "if(false)" + + # calls otool -L on /usr/lib/libSystem.B.dylib and fails because it doesn't exist + substituteInPlace cmake/applebundle.cmake --replace-fail 'fixup_bundle("''${TARGET_BUNDLE_DIR}" "" "")' "" + ''; + nativeBuildInputs = [ cmake pkg-config @@ -73,15 +79,8 @@ stdenv.mkDerivation (finalAttrs: { SDL2_mixer ] ++ lib.optional stdenv.hostPlatform.isLinux wayland-protocols - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Carbon - CoreServices - OpenCL - ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) opencl-headers; - cmakeFlags = lib.optional stdenv.hostPlatform.isDarwin "-DCORESERVICES_LIB=${CoreServices}"; - # error: "The plain signature for target_link_libraries has already been used" doCheck = false; @@ -89,17 +88,24 @@ stdenv.mkDerivation (finalAttrs: { gtest ]; - # Set the data directory for each executable. We cannot set it at build time - # with the PKGDATADIR cmake variable because each executable needs a specific - # one. - # This is not needed on darwin, since on that platform data files are saved - # in *.app/Contents/Resources/ too, and are picked up automatically. - postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' - for prog in $out/bin/*; do - wrapProgram "$prog" \ - --set CORE_PATH $out/share/$(basename "$prog")/ - done - ''; + postInstall = + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/Applications + mv $out/*.app $out/Applications/ + '' + else + # Set the data directory for each executable. We cannot set it at build time + # with the PKGDATADIR cmake variable because each executable needs a specific + # one. + # This is not needed on darwin, since on that platform data files are saved + # in *.app/Contents/Resources/ too, and are picked up automatically. + '' + for prog in $out/bin/*; do + wrapProgram "$prog" \ + --set CORE_PATH $out/share/$(basename "$prog")/ + done + ''; passthru.tests = { voxconvert-roundtrip = callPackage ./test-voxconvert-roundtrip.nix { }; @@ -124,6 +130,5 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff9041c61f98..b604db81edb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16453,9 +16453,7 @@ with pkgs; vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - vengi-tools = darwin.apple_sdk_11_0.callPackage ../applications/graphics/vengi-tools { - inherit (darwin.apple_sdk_11_0.frameworks) Carbon CoreServices OpenCL; - }; + vengi-tools = callPackage ../applications/graphics/vengi-tools { }; veusz = libsForQt5.callPackage ../applications/graphics/veusz { }; From cff40eaf67b2a24b92296894608bcff305c675fc Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 18 Apr 2025 21:21:31 +0200 Subject: [PATCH 109/449] satisfactorymodmanager: add desktop file --- .../sa/satisfactorymodmanager/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/sa/satisfactorymodmanager/package.nix b/pkgs/by-name/sa/satisfactorymodmanager/package.nix index f95af2d910b2..db3b6e1414a5 100644 --- a/pkgs/by-name/sa/satisfactorymodmanager/package.nix +++ b/pkgs/by-name/sa/satisfactorymodmanager/package.nix @@ -8,6 +8,8 @@ wails, wrapGAppsHook3, glib-networking, + makeDesktopItem, + copyDesktopItems, }: buildGoModule rec { @@ -40,6 +42,7 @@ buildGoModule rec { pnpm_8.configHook wails wrapGAppsHook3 + copyDesktopItems ]; buildInputs = [ @@ -78,9 +81,25 @@ buildGoModule rec { installPhase = '' runHook preInstall install -Dm755 build/bin/SatisfactoryModManager -t "$out/bin" + + for i in 16 32 64 128 256 512; do + install -D ./icons/"$i"x"$i".png "$out"/share/icons/hicolor/"$i"x"$i"/apps/SatisfactoryModManager.png + done runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "SatisfactoryModManager"; + desktopName = "Satisfactory Mod Manager"; + exec = "SatisfactoryModManager %u"; + mimeTypes = [ "x-scheme-handler/smmanager" ]; + icon = "SatisfactoryModManager"; + terminal = false; + categories = [ "Game" ]; + }) + ]; + meta = { broken = stdenv.hostPlatform.isDarwin; description = "Mod manager and modloader for Satisfactory"; From 236a54dd848012bbff6d364799fa216fb5c8c07c Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 18 Apr 2025 16:57:16 -0400 Subject: [PATCH 110/449] vengi-tools: add /bin/vengi-voxconvert on darwin It's a CLI tool and so should be available outside of an .app bundle. This also fixes passthru.tests on darwin. Signed-off-by: Ihar Hrachyshka --- pkgs/applications/graphics/vengi-tools/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index a9f318fb8740..9b6c078fa53d 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -93,6 +93,9 @@ stdenv.mkDerivation (finalAttrs: { '' mkdir -p $out/Applications mv $out/*.app $out/Applications/ + + mkdir -p $out/bin + ln -s $out/Applications/vengi-voxconvert.app/Contents/MacOS/vengi-voxconvert $out/bin/vengi-voxconvert '' else # Set the data directory for each executable. We cannot set it at build time From 17047c6f78cb38751c6dc714e738fc3c7dba1b03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Apr 2025 02:23:39 +0000 Subject: [PATCH 111/449] librenms: 25.3.0 -> 25.4.0 --- pkgs/by-name/li/librenms/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix index 4fc0dd740df2..7b7b298e67fb 100644 --- a/pkgs/by-name/li/librenms/package.nix +++ b/pkgs/by-name/li/librenms/package.nix @@ -27,16 +27,16 @@ let in phpPackage.buildComposerProject2 rec { pname = "librenms"; - version = "25.3.0"; + version = "25.4.0"; src = fetchFromGitHub { owner = "librenms"; repo = pname; tag = version; - sha256 = "sha256-iCcBP/BDHdTxlzgDGZzBdT0tFL26oCvMI+q2UuEg5jw="; + sha256 = "sha256-t+RupwKnUtQd3A0VzWhCXNzc+TnVnDMaMJ6Jcgp+Sfg="; }; - vendorHash = "sha256-0YBXORA647IfR0Fes2q4lbJsgrkpcvRj1aIHJ/Te/zU="; + vendorHash = "sha256-t/3wBSXJJHqbGR1iKF4zC2Ia99gXNlanabR/iPPlHqw="; php = phpPackage; From fb8800286879ed7d2b7e0276c289e6fb5c4dc215 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 12 Apr 2025 20:23:34 +0800 Subject: [PATCH 112/449] luau: add prince213 to maintainers --- pkgs/by-name/lu/luau/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index 62c7ca64567d..2599620a53ca 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/luau-lang/luau/releases/tag/${version}"; license = licenses.mit; platforms = platforms.all; - maintainers = [ ]; + maintainers = with maintainers; [ prince213 ]; mainProgram = "luau"; }; } From f46ca77b4ec40f16f63c182eaa22bcd75e8389e1 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sat, 12 Apr 2025 20:23:34 +0800 Subject: [PATCH 113/449] luau: 0.667 -> 0.670 --- pkgs/by-name/lu/luau/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index 2599620a53ca..0543c2efcbfa 100644 --- a/pkgs/by-name/lu/luau/package.nix +++ b/pkgs/by-name/lu/luau/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "luau"; - version = "0.667"; + version = "0.670"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; rev = version; - hash = "sha256-AEPUdqQ+uIWxSTOwwbZ8tWSz3VKKHa1D08o6oeEREkg="; + hash = "sha256-3iRQJ3v8MyW9LZiaEAkRFubFBdPxg7EEzXYqzbKspFY="; }; nativeBuildInputs = [ cmake ]; From dcfa66ef8b944c71271a7908adcb697beb3c7753 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Apr 2025 05:11:13 +0000 Subject: [PATCH 114/449] lefthook: 1.11.5 -> 1.11.10 --- pkgs/by-name/le/lefthook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index cfdd201fcd93..192f137af57d 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -7,7 +7,7 @@ let pname = "lefthook"; - version = "1.11.5"; + version = "1.11.10"; in buildGoModule { inherit pname version; @@ -16,10 +16,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-JBDEVgMUVZceXSppq26xJcsKRlHmIBK5UN5uehmG/VU="; + hash = "sha256-WhveZtkwG2HbshT1xbA7wnhfxP6vmQ0h+rCxqgbwO5g="; }; - vendorHash = "sha256-0d+lr6wo4FbyVvpG15MdXesGfgnkSozANyGhjWZFRvI="; + vendorHash = "sha256-aINRFg3TByOEjFgoPr33bDL6TFnlW/b9DqDTEJWNnGI="; nativeBuildInputs = [ installShellFiles ]; From 29504b8b861b223a764b0a416a4e2d529e9c5e26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Apr 2025 12:31:28 +0000 Subject: [PATCH 115/449] tutanota-desktop: 275.250326.0 -> 277.250414.1 --- pkgs/by-name/tu/tutanota-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix index e567f055c544..370e2240c221 100644 --- a/pkgs/by-name/tu/tutanota-desktop/package.nix +++ b/pkgs/by-name/tu/tutanota-desktop/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "tutanota-desktop"; - version = "275.250326.0"; + version = "277.250414.1"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; - hash = "sha256-6Sc0KqdEJ7v9TBG+t3xcDpK96/4DivweM/F1k257cYA="; + hash = "sha256-Ke9c9kugI+Cym24Nf4juW1oFiCCTNURZy7C1+TFF0rc="; }; extraPkgs = pkgs: [ pkgs.libsecret ]; From c73d83c472ba374d9e7a2964aedf927dbdab7429 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 18 Feb 2025 14:00:52 +0100 Subject: [PATCH 116/449] mesen: 2.0.0-unstable-2024-12-25 -> 2.0.0-unstable-2025-04-01 --- pkgs/by-name/me/mesen/deps.json | 105 +++++++++--------- ...dont-use-alternative-restore-sources.patch | 16 --- .../me/mesen/dont-use-nightly-avalonia.patch | 33 ++++++ .../by-name/me/mesen/dont-zip-libraries.patch | 23 ++-- pkgs/by-name/me/mesen/package.nix | 14 +-- 5 files changed, 106 insertions(+), 85 deletions(-) delete mode 100644 pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch create mode 100644 pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch diff --git a/pkgs/by-name/me/mesen/deps.json b/pkgs/by-name/me/mesen/deps.json index 8b2284636873..ed1b21d2485e 100644 --- a/pkgs/by-name/me/mesen/deps.json +++ b/pkgs/by-name/me/mesen/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Avalonia", - "version": "11.2.0", - "hash": "sha256-kG3tnsLdodlvIjYd5feBZ0quGd2FsvV8FIy7uD5UZ5Q=" + "version": "11.2.4", + "hash": "sha256-CcdWUxqd43A4KeY1K4T5M6R1M0zuwdwyd5Qh/BAlNT4=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -16,18 +16,18 @@ }, { "pname": "Avalonia.BuildServices", - "version": "0.0.29", - "hash": "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY=" + "version": "0.0.31", + "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.0", - "hash": "sha256-x6IdcSo3e2Pq/En9/N80HpPblEXSAv51VRlBrF8wlVM=" + "version": "11.2.3", + "hash": "sha256-z3ZHxVSOoOjqq+5G71jnGN1Y0i3YpAkox7cj3lNr6kg=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.0", - "hash": "sha256-pd/cD82onMZ0iMLl9TOCl35PEvAPbyX2lUj49lrBpOA=" + "version": "11.2.3", + "hash": "sha256-jIJvuYN0iym/WeOC0C7z5xj5kCZSXGoeLQ/q5qQfewM=" }, { "pname": "Avalonia.Controls.ProportionalStackPanel", @@ -46,18 +46,18 @@ }, { "pname": "Avalonia.Desktop", - "version": "11.2.0", - "hash": "sha256-+5ISi6WXe8AIjClVo3UqZHgzZpFbMgFk13YvHHhx9MM=" + "version": "11.2.4", + "hash": "sha256-WKTOx7RNSb0fOMg5Za4j+u9DwKXDqVzHwQCEXSm7TFo=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.2.0", - "hash": "sha256-k60HGDKnsXiDOnxSH+Hx2ihyqmxSSeWIBJx2XD1ELW0=" + "version": "11.2.3", + "hash": "sha256-DIGkaBff+C3BLwedw5xteR5lfzb6ecxiLt12eJVgLQc=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.0", - "hash": "sha256-u4CQvG6EdsyaHSWa+Y704sDiWZlqbArB0g4gcoCFwQo=" + "version": "11.2.4", + "hash": "sha256-lw8YFXR/pn0awFvFW+OhjZ2LbHonL6zwqLIz+pQp+Sk=" }, { "pname": "Avalonia.MarkupExtension", @@ -66,43 +66,48 @@ }, { "pname": "Avalonia.Native", - "version": "11.2.0", - "hash": "sha256-fMikurP2RAnOahZkORxuGOKGn5iQ0saZCEYsvoFiFQI=" + "version": "11.2.4", + "hash": "sha256-MvxivGjYerXcr70JpWe9CCXO6MU9QQgCkmZfjZCFdJM=" }, { "pname": "Avalonia.ReactiveUI", - "version": "11.2.0", - "hash": "sha256-6GXX1ZA6gS9CpkQnGepx1PFNoKiwcHQyLSK5qOGmjYo=" + "version": "11.2.3", + "hash": "sha256-NqRetBiFg5gNCS8C0J1JJJsZ4sz+w+GoEegGFddBGDg=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.0", - "hash": "sha256-QwYY3bpShJ1ayHUx+mjnwaEhCPDzTk+YeasCifAtGzM=" + "version": "11.2.3", + "hash": "sha256-dSeu7rnTD9rIvlyro2iFS52oi0vvfeaGV3kDm90BkKw=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.2.4", + "hash": "sha256-mKQVqtzxnZu6p64ZxIHXKSIw3AxAFjhmrxCc5/1VXfc=" }, { "pname": "Avalonia.Skia", - "version": "11.2.0", - "hash": "sha256-rNR+l+vLtlzTU+F51FpOi4Ujy7nR5+lbTc3NQte8s/o=" + "version": "11.2.4", + "hash": "sha256-82UQGuCl5hN5kdA3Uz7hptpNnG1EPlSB6k/a6XPSuXI=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "11.2.0", - "hash": "sha256-Ate6KC61pwXmTAk5h1uh7rjwAViuiO/qgAVMl3F1BA8=" + "version": "11.2.4", + "hash": "sha256-CPun/JWFCVoGxgMA510/gMP2ZB9aZJ9Bk8yuNjwo738=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.2.0", - "hash": "sha256-l88ZX50Nao8wjtRnyZxNFFgRpJ/yxxNki6NY48dyTUg=" + "version": "11.2.3", + "hash": "sha256-UF15yTDzHmqd33siH3TJxmxaonA51dzga+hmCUahn1k=" }, { "pname": "Avalonia.Win32", - "version": "11.2.0", - "hash": "sha256-A9PB6Bt61jLdQlMOkchWy/3BwROgxS9BP8FObs/KFiU=" + "version": "11.2.4", + "hash": "sha256-LJSKiLbdof8qouQhN7pY1RkMOb09IiAu/nrJFR2OybY=" }, { "pname": "Avalonia.X11", - "version": "11.2.0", - "hash": "sha256-EP9cCqriEh8d+Wwyv27QGK/CY6w2LcCjtcIv79PZqkM=" + "version": "11.2.4", + "hash": "sha256-qty8D2/HlZz/7MiEhuagjlKlooDoW3fow5yJY5oX4Uk=" }, { "pname": "CommunityToolkit.Mvvm", @@ -156,28 +161,28 @@ }, { "pname": "HarfBuzzSharp", - "version": "7.3.0.2", - "hash": "sha256-ibgoqzT1NV7Qo5e7X2W6Vt7989TKrkd2M2pu+lhSDg8=" + "version": "7.3.0.3", + "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "7.3.0.2", - "hash": "sha256-SSfyuyBaduGobJW+reqyioWHhFWsQ+FXa2Gn7TiWxrU=" + "version": "7.3.0.3", + "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.2", - "hash": "sha256-dmEqR9MmpCwK8AuscfC7xUlnKIY7+Nvi06V0u5Jff08=" + "version": "7.3.0.3", + "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "7.3.0.3-preview.2.2", - "hash": "sha256-1NlcTnXrWUYZ2r2/N3SPxNIjNcyIpiiv3g7h8XxpNkM=" + "version": "7.3.0.3", + "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.2", - "hash": "sha256-x4iM3NHs9VyweG57xA74yd4uLuXly147ooe0mvNQ8zo=" + "version": "7.3.0.3", + "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" }, { "pname": "MicroCom.Runtime", @@ -201,28 +206,28 @@ }, { "pname": "SkiaSharp", - "version": "2.88.8", - "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A=" + "version": "2.88.9", + "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.8", - "hash": "sha256-fOmNbbjuTazIasOvPkd2NPmuQHVCWPnow7AxllRGl7Y=" + "version": "2.88.9", + "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.8", - "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI=" + "version": "2.88.9", + "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.8", - "hash": "sha256-GWWsE98f869LiOlqZuXMc9+yuuIhey2LeftGNk3/z3w=" + "version": "2.88.9", + "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.8", - "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM=" + "version": "2.88.9", + "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" }, { "pname": "Splat", diff --git a/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch b/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch deleted file mode 100644 index 1c194a4a3084..000000000000 --- a/pkgs/by-name/me/mesen/dont-use-alternative-restore-sources.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/UI/UI.csproj b/UI/UI.csproj -index 2a0eb78..74751bc 100644 ---- a/UI/UI.csproj -+++ b/UI/UI.csproj -@@ -90,11 +90,6 @@ - - - -- -- -- https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json -- -- - - - diff --git a/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch b/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch new file mode 100644 index 000000000000..b21e6b7d0306 --- /dev/null +++ b/pkgs/by-name/me/mesen/dont-use-nightly-avalonia.patch @@ -0,0 +1,33 @@ +diff --git a/UI/UI.csproj b/UI/UI.csproj +index 7721884..3011ae8 100644 +--- a/UI/UI.csproj ++++ b/UI/UI.csproj +@@ -90,11 +90,6 @@ + + + +- +- +- https://nuget-feed-nightly.avaloniaui.net/v3/index.json;https://api.nuget.org/v3/index.json +- +- + + + +@@ -105,13 +100,13 @@ + + + +- ++ + +- ++ + + + +- ++ + + + diff --git a/pkgs/by-name/me/mesen/dont-zip-libraries.patch b/pkgs/by-name/me/mesen/dont-zip-libraries.patch index 6aeed6c3e757..9e78203b5af6 100644 --- a/pkgs/by-name/me/mesen/dont-zip-libraries.patch +++ b/pkgs/by-name/me/mesen/dont-zip-libraries.patch @@ -1,17 +1,17 @@ diff --git a/UI/Config/ConfigManager.cs b/UI/Config/ConfigManager.cs -index 56c1ff1..ed5fe8a 100644 +index c3249cf..96c6ae0 100644 --- a/UI/Config/ConfigManager.cs +++ b/UI/Config/ConfigManager.cs @@ -51,7 +51,6 @@ namespace Mesen.Config } else { homeFolder = DefaultDocumentsFolder; } -- Program.ExtractNativeDependencies(homeFolder); +- DependencyHelper.ExtractNativeDependencies(homeFolder); _homeFolder = homeFolder; Config.Save(); } diff --git a/UI/Program.cs b/UI/Program.cs -index dfc4ba3..632cef2 100644 +index dc923ab..ae7a1cc 100644 --- a/UI/Program.cs +++ b/UI/Program.cs @@ -54,8 +54,6 @@ namespace Mesen @@ -19,7 +19,7 @@ index dfc4ba3..632cef2 100644 if(!File.Exists(ConfigManager.GetConfigFile())) { - //Could not find configuration file, show wizard -- ExtractNativeDependencies(ConfigManager.HomeFolder); +- DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder); App.ShowConfigWindow = true; BuildAvaloniaApp().StartWithClassicDesktopLifetime(args, ShutdownMode.OnMainWindowClose); if(File.Exists(ConfigManager.GetConfigFile())) { @@ -28,12 +28,12 @@ index dfc4ba3..632cef2 100644 Task.Run(() => ConfigManager.LoadConfig()); - //Extract core dll & other native dependencies -- ExtractNativeDependencies(ConfigManager.HomeFolder); +- DependencyHelper.ExtractNativeDependencies(ConfigManager.HomeFolder); - if(CommandLineHelper.IsTestRunner(args)) { return TestRunner.Run(args); } -@@ -147,7 +142,7 @@ namespace Mesen +@@ -105,7 +100,7 @@ namespace Mesen libraryName = libraryName + ".dylib"; } } @@ -43,10 +43,10 @@ index dfc4ba3..632cef2 100644 return IntPtr.Zero; } diff --git a/UI/UI.csproj b/UI/UI.csproj -index 053d495..2a0eb78 100644 +index 67fe57d..65762d3 100644 --- a/UI/UI.csproj +++ b/UI/UI.csproj -@@ -634,7 +634,6 @@ +@@ -637,7 +637,6 @@ @@ -54,7 +54,7 @@ index 053d495..2a0eb78 100644 -@@ -644,16 +643,5 @@ +@@ -647,16 +646,4 @@ @@ -62,13 +62,12 @@ index 053d495..2a0eb78 100644 - - - -- +- - - - - - - - +- - diff --git a/pkgs/by-name/me/mesen/package.nix b/pkgs/by-name/me/mesen/package.nix index 43957a1c7004..34b5b1108727 100644 --- a/pkgs/by-name/me/mesen/package.nix +++ b/pkgs/by-name/me/mesen/package.nix @@ -6,24 +6,24 @@ fetchFromGitHub, wrapGAppsHook3, gtk3, + libX11, SDL2, }: buildDotnetModule rec { pname = "mesen"; - version = "2.0.0-unstable-2024-12-25"; + version = "2.0.0-unstable-2025-04-01"; src = fetchFromGitHub { owner = "SourMesen"; repo = "Mesen2"; - rev = "6820db37933002089a04d356d8469481e915a359"; - hash = "sha256-TzGMZr351XvVj/wARWJxRisRb5JlkyzdjCVYbwydBVE="; + rev = "0dfdbbdd9b5bc4c5d501ea691116019266651aff"; + hash = "sha256-+Jzw1tfdiX2EmQIoPuMtLmJrv9nx/XqfyLEBW+AXj1I="; }; patches = [ - # the nightly avalonia repository url is still queried, which errors out - # even if we don't actually need any nightly versions - ./dont-use-alternative-restore-sources.patch + # patch out the usage of nightly avalonia builds, since we can't use alternative restore sources + ./dont-use-nightly-avalonia.patch # upstream has a weird library loading mechanism, which we override with a more sane alternative ./dont-zip-libraries.patch ]; @@ -60,7 +60,7 @@ buildDotnetModule rec { nativeBuildInputs = [ SDL2 ]; - buildInputs = [ SDL2 ]; + buildInputs = [ SDL2 ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ libX11 ]; makeFlags = [ "core" ]; From f86ce3b328972c41e911ba194a7eaa47ef10b970 Mon Sep 17 00:00:00 2001 From: George Shammas Date: Fri, 18 Apr 2025 18:28:42 -0400 Subject: [PATCH 117/449] phpExtensions.wikidiff2: init at 1.14.1 --- .../php-packages/wikidiff2/default.nix | 29 +++++++++++++++++++ pkgs/top-level/php-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/php-packages/wikidiff2/default.nix diff --git a/pkgs/development/php-packages/wikidiff2/default.nix b/pkgs/development/php-packages/wikidiff2/default.nix new file mode 100644 index 000000000000..cfef9cecbd17 --- /dev/null +++ b/pkgs/development/php-packages/wikidiff2/default.nix @@ -0,0 +1,29 @@ +{ + lib, + buildPecl, + fetchFromGitHub, + pkg-config, + libthai, +}: + +buildPecl rec { + pname = "wikidiff2"; + version = "1.14.1"; + + src = fetchFromGitHub { + owner = "wikimedia"; + repo = "mediawiki-php-wikidiff2"; + tag = version; + hash = "sha256-UTOfLXv2QWdjThxfrPQDLB8Mqo4js6LzOKXePivdp9k="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libthai ]; + + meta = { + description = "PHP extension which formats changes between two input texts, producing HTML or JSON."; + license = lib.licenses.gpl2; + homepage = "https://www.mediawiki.org/wiki/Wikidiff2"; + maintainers = with lib.maintainers; [ georgyo ]; + }; +} diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ea7031d03df8..e126070a5854 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -403,6 +403,8 @@ lib.makeScope pkgs.newScope ( vld = callPackage ../development/php-packages/vld { }; + wikidiff2 = callPackage ../development/php-packages/wikidiff2 { }; + xdebug = callPackage ../development/php-packages/xdebug { }; yaml = callPackage ../development/php-packages/yaml { }; From 95cf864ca78bdd21d733e51ce392f2dc51207674 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 19 Apr 2025 21:02:08 +0200 Subject: [PATCH 118/449] readest: 0.9.35 -> 0.9.36 Changelog: https://github.com/readest/readest/releases/tag/v0.9.36 Diff: https://github.com/readest/readest/compare/v0.9.35...v0.9.36 --- pkgs/by-name/re/readest/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix index b0a85304ab84..0ef4a4eca7a0 100644 --- a/pkgs/by-name/re/readest/package.nix +++ b/pkgs/by-name/re/readest/package.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "readest"; - version = "0.9.35"; + version = "0.9.36"; src = fetchFromGitHub { owner = "readest"; repo = "readest"; tag = "v${finalAttrs.version}"; - hash = "sha256-w6aMfJwQDEG5WmFdZhtxeTi9w8X3tBqBmpo0nItLYrE="; + hash = "sha256-r/mpqeHKo6oQqNCnFByxHZf7RSWD5esZbweAEuda9ME="; fetchSubmodules = true; }; From 9ac2b84e77fff2ed8f099e87b8ee52f4090d7077 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Mar 2025 23:02:56 +0000 Subject: [PATCH 119/449] python312Packages.rich-click: 1.8.6 -> 1.8.8 --- pkgs/development/python-modules/rich-click/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rich-click/default.nix b/pkgs/development/python-modules/rich-click/default.nix index c271a27557d1..343a2d6c51cd 100644 --- a/pkgs/development/python-modules/rich-click/default.nix +++ b/pkgs/development/python-modules/rich-click/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "rich-click"; - version = "1.8.6"; + version = "1.8.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ewels"; repo = "rich-click"; tag = "v${version}"; - hash = "sha256-3spiDhSpVobhJMKfU7ZvQf9srD4goKowIl6LiBziiLA="; + hash = "sha256-938YQMpq7v2iGNVoaVU1H2nuTmteZwKDfZI3anfrpcw="; }; build-system = [ setuptools ]; @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to format click help output nicely with rich"; homepage = "https://github.com/ewels/rich-click"; - changelog = "https://github.com/ewels/rich-click/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/ewels/rich-click/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "rich-click"; From 8ced044325aa0c2cc237cd0d45d80adfa813479a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Apr 2025 21:44:50 +0200 Subject: [PATCH 120/449] robotframework-tidy: fix build --- pkgs/by-name/ro/robotframework-tidy/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ro/robotframework-tidy/package.nix b/pkgs/by-name/ro/robotframework-tidy/package.nix index c129758de6af..19c1d4b75f20 100644 --- a/pkgs/by-name/ro/robotframework-tidy/package.nix +++ b/pkgs/by-name/ro/robotframework-tidy/package.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ setuptools ]; - pythonRelaxDeps = [ "rich-click" ]; + pythonRelaxDeps = [ "rich_click" ]; dependencies = with python3.pkgs; [ robotframework From 64b287d3a57b2a3ef31d71d0b63c7d2b12b27724 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Apr 2025 20:11:25 +0000 Subject: [PATCH 121/449] hypre: 2.32.0 -> 2.33.0 --- pkgs/by-name/hy/hypre/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hypre/package.nix b/pkgs/by-name/hy/hypre/package.nix index 227cba66fac9..4f29921b1a19 100644 --- a/pkgs/by-name/hy/hypre/package.nix +++ b/pkgs/by-name/hy/hypre/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { name = "hypre"; - version = "2.32.0"; + version = "2.33.0"; src = fetchFromGitHub { owner = "hypre-space"; repo = "hypre"; tag = "v${finalAttrs.version}"; - hash = "sha256-h16+nZ6+GfddfBJDF6sphuZ9Sff++PxW2R58XgJsnsI="; + hash = "sha256-OrpClN9xd+8DdELVnI4xBg3Ih/BaoBiO0w/QrFjUclw="; }; sourceRoot = "${finalAttrs.src.name}/src"; From bc333b3174c91990062b97d3c3097d53f6b064b4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 19 Apr 2025 22:23:09 +0200 Subject: [PATCH 122/449] hypre: fix pname --- pkgs/by-name/hy/hypre/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/hy/hypre/package.nix b/pkgs/by-name/hy/hypre/package.nix index 4f29921b1a19..8e8985df6b5c 100644 --- a/pkgs/by-name/hy/hypre/package.nix +++ b/pkgs/by-name/hy/hypre/package.nix @@ -6,7 +6,7 @@ }: stdenv.mkDerivation (finalAttrs: { - name = "hypre"; + pname = "hypre"; version = "2.33.0"; src = fetchFromGitHub { From 5d21053e35b8fc4784738e36b2bd0b251f5ad456 Mon Sep 17 00:00:00 2001 From: jonboh Date: Sat, 5 Apr 2025 11:02:21 +0200 Subject: [PATCH 123/449] cargo-sonar: init at 1.3.0 --- pkgs/by-name/ca/cargo-sonar/package.nix | 34 +++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/ca/cargo-sonar/package.nix diff --git a/pkgs/by-name/ca/cargo-sonar/package.nix b/pkgs/by-name/ca/cargo-sonar/package.nix new file mode 100644 index 000000000000..7cf2c74ec0bd --- /dev/null +++ b/pkgs/by-name/ca/cargo-sonar/package.nix @@ -0,0 +1,34 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cargo-sonar"; + version = "1.3.0"; + + src = fetchFromGitLab { + owner = "woshilapin"; + repo = "cargo-sonar"; + tag = finalAttrs.version; + hash = "sha256-f319hi6mrnlHTvsn7kN2wFHyamXtplLZ8A6TN0+H3jY="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-KLw6kAR2pF5RFhRDfsL093K+jk3oiSHLZ2CQvrBuhWY="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Utility to produce some Sonar-compatible format from different Rust tools like cargo-clippy cargo-audit or cargo-outdated"; + mainProgram = "cargo-sonar"; + homepage = "https://gitlab.com/woshilapin/cargo-sonar"; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers.jonboh ]; + }; +}) From 8c62d8688478ed25cb067abffa96635c085c710e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 11 Mar 2025 22:45:48 +0100 Subject: [PATCH 124/449] eigen_3_4_0: init at 3.4.0 --- .../science/biology/mrtrix/default.nix | 39 ++------------- pkgs/by-name/cu/curv/package.nix | 32 +----------- pkgs/by-name/ks/kstars/package.nix | 35 +------------ pkgs/development/libraries/eigen/3.4.0.nix | 49 +++++++++++++++++++ .../development/libraries/libfive/default.nix | 31 +----------- pkgs/top-level/all-packages.nix | 2 + 6 files changed, 60 insertions(+), 128 deletions(-) create mode 100644 pkgs/development/libraries/eigen/3.4.0.nix diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index ef8c738055fc..b098cd354ba5 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, python, makeWrapper, - eigen, + eigen_3_4_0, fftw, libtiff, libpng, @@ -18,41 +18,8 @@ libXext, less, withGui ? true, - fetchFromGitLab, - fetchpatch, }: -let - # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' - # https://github.com/NixOS/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c - eigen' = ( - eigen.overrideAttrs (old: rec { - version = "3.4.0"; - src = fetchFromGitLab { - owner = "libeigen"; - repo = "eigen"; - tag = version; - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; - }; - patches = (old.patches or [ ]) ++ [ - # Fixes e.g. onnxruntime on aarch64-darwin: - # https://hydra.nixos.org/build/248915128/nixlog/1, - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. - # - # The patch is from - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) - # which is two years old, - # but Eigen hasn't had a release in two years either: - # https://gitlab.com/libeigen/eigen/-/issues/2699. - (fetchpatch { - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; - }) - ]; - }) - ); -in - stdenv.mkDerivation rec { pname = "mrtrix"; version = "3.0.4-unstable-2025-04-09"; @@ -74,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ ants - eigen' + eigen_3_4_0 python fftw libtiff @@ -113,7 +80,7 @@ stdenv.mkDerivation rec { configurePhase = '' runHook preConfigure - export EIGEN_CFLAGS="-isystem ${eigen'}/include/eigen3" + export EIGEN_CFLAGS="-isystem ${eigen_3_4_0}/include/eigen3" unset LD # similar to https://github.com/MRtrix3/mrtrix3/issues/1519 ./configure ${lib.optionalString (!withGui) "-nogui"}; runHook postConfigure diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix index 060efc4c84a4..2f63ddd9534f 100644 --- a/pkgs/by-name/cu/curv/package.nix +++ b/pkgs/by-name/cu/curv/package.nix @@ -2,13 +2,11 @@ lib, stdenv, fetchFromGitea, - fetchFromGitLab, - fetchpatch, cmake, git, pkg-config, boost, - eigen, + eigen_3_4_0, glm, libGL, libpng, @@ -43,33 +41,7 @@ stdenv.mkDerivation { buildInputs = [ boost - # https://codeberg.org/doug-moen/curv/issues/228 - # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' - # https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c - (eigen.overrideAttrs (old: rec { - version = "3.4.0"; - src = fetchFromGitLab { - owner = "libeigen"; - repo = "eigen"; - rev = version; - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; - }; - patches = (old.patches or [ ]) ++ [ - # Fixes e.g. onnxruntime on aarch64-darwin: - # https://hydra.nixos.org/build/248915128/nixlog/1, - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. - # - # The patch is from - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) - # which is two years old, - # but Eigen hasn't had a release in two years either: - # https://gitlab.com/libeigen/eigen/-/issues/2699. - (fetchpatch { - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; - }) - ]; - })) + eigen_3_4_0 glm libGL libpng diff --git a/pkgs/by-name/ks/kstars/package.nix b/pkgs/by-name/ks/kstars/package.nix index 69620c4ad5fc..4f48e54fedcc 100644 --- a/pkgs/by-name/ks/kstars/package.nix +++ b/pkgs/by-name/ks/kstars/package.nix @@ -2,12 +2,10 @@ lib, stdenv, fetchurl, - fetchFromGitLab, - fetchpatch, cfitsio, cmake, curl, - eigen, + eigen_3_4_0, gsl, indi-full, kdePackages, @@ -22,35 +20,6 @@ zlib, }: -let - # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' - # https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c - eigen' = eigen.overrideAttrs (old: rec { - version = "3.4.0"; - src = fetchFromGitLab { - owner = "libeigen"; - repo = "eigen"; - rev = version; - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; - }; - patches = (old.patches or [ ]) ++ [ - # Fixes e.g. onnxruntime on aarch64-darwin: - # https://hydra.nixos.org/build/248915128/nixlog/1, - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. - # - # The patch is from - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) - # which is two years old, - # but Eigen hasn't had a release in two years either: - # https://gitlab.com/libeigen/eigen/-/issues/2699. - (fetchpatch { - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; - }) - ]; - }); -in - stdenv.mkDerivation (finalAttrs: { pname = "kstars"; version = "3.7.5"; @@ -70,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { breeze-icons cfitsio curl - eigen' + eigen_3_4_0 gsl indi-full kconfig diff --git a/pkgs/development/libraries/eigen/3.4.0.nix b/pkgs/development/libraries/eigen/3.4.0.nix new file mode 100644 index 000000000000..069f486cb285 --- /dev/null +++ b/pkgs/development/libraries/eigen/3.4.0.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + fetchFromGitLab, + fetchpatch, + cmake, +}: + +stdenv.mkDerivation rec { + pname = "eigen"; + version = "3.4.0"; + + src = fetchFromGitLab { + owner = "libeigen"; + repo = "eigen"; + rev = version; + hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; + }; + + patches = [ + ./include-dir.patch + # Fixes e.g. onnxruntime on aarch64-darwin: + # https://hydra.nixos.org/build/248915128/nixlog/1, + # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. + # + # The patch is from + # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) + # which is two years old, + # but Eigen hasn't had a release in two years either: + # https://gitlab.com/libeigen/eigen/-/issues/2699. + (fetchpatch { + url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; + hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; + }) + ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + homepage = "https://eigen.tuxfamily.org"; + description = "C++ template library for linear algebra: vectors, matrices, and related algorithms"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ + sander + raskin + ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index dbb9fc8109ce..141bd8f17b2c 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -3,13 +3,11 @@ stdenv, wrapQtAppsHook, fetchFromGitHub, - fetchFromGitLab, - fetchpatch, unstableGitUpdater, cmake, ninja, pkg-config, - eigen, + eigen_3_4_0, zlib, libpng, boost, @@ -38,32 +36,7 @@ stdenv.mkDerivation { python.pkgs.pythonImportsCheckHook ]; buildInputs = [ - # reverts 'eigen: 3.4.0 -> 3.4.0-unstable-2022-05-19' - # https://github.com/nixos/nixpkgs/commit/d298f046edabc84b56bd788e11eaf7ed72f8171c - (eigen.overrideAttrs (old: rec { - version = "3.4.0"; - src = fetchFromGitLab { - owner = "libeigen"; - repo = "eigen"; - rev = version; - hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; - }; - patches = (old.patches or [ ]) ++ [ - # Fixes e.g. onnxruntime on aarch64-darwin: - # https://hydra.nixos.org/build/248915128/nixlog/1, - # originally suggested in https://github.com/NixOS/nixpkgs/pull/258392. - # - # The patch is from - # ["Fix vectorized reductions for Eigen::half"](https://gitlab.com/libeigen/eigen/-/merge_requests/699) - # which is two years old, - # but Eigen hasn't had a release in two years either: - # https://gitlab.com/libeigen/eigen/-/issues/2699. - (fetchpatch { - url = "https://gitlab.com/libeigen/eigen/-/commit/d0e3791b1a0e2db9edd5f1d1befdb2ac5a40efe0.patch"; - hash = "sha256-8qiNpuYehnoiGiqy0c3Mcb45pwrmc6W4rzCxoLDSvj0="; - }) - ]; - })) + eigen_3_4_0 zlib libpng boost diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 83f48cfe8b1f..2f5c84ae72e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9178,6 +9178,8 @@ with pkgs; eigen = callPackage ../development/libraries/eigen { }; + eigen_3_4_0 = callPackage ../development/libraries/eigen/3.4.0.nix { }; + eigen2 = callPackage ../development/libraries/eigen/2.0.nix { }; vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; From f315f83bdab10cd3d9ceb479c4165cedd279a304 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 11 Mar 2025 23:00:24 +0100 Subject: [PATCH 125/449] eigen{,2,_3_4_0}: migrate to by-name --- .../ei}/eigen/include-dir.patch | 0 .../ei/eigen/package.nix} | 0 .../2.0.nix => by-name/ei/eigen2/package.nix} | 0 pkgs/by-name/ei/eigen_3_4_0/include-dir.patch | 57 +++++++++++++++++++ .../ei/eigen_3_4_0/package.nix} | 0 pkgs/top-level/all-packages.nix | 6 -- 6 files changed, 57 insertions(+), 6 deletions(-) rename pkgs/{development/libraries => by-name/ei}/eigen/include-dir.patch (100%) rename pkgs/{development/libraries/eigen/default.nix => by-name/ei/eigen/package.nix} (100%) rename pkgs/{development/libraries/eigen/2.0.nix => by-name/ei/eigen2/package.nix} (100%) create mode 100644 pkgs/by-name/ei/eigen_3_4_0/include-dir.patch rename pkgs/{development/libraries/eigen/3.4.0.nix => by-name/ei/eigen_3_4_0/package.nix} (100%) diff --git a/pkgs/development/libraries/eigen/include-dir.patch b/pkgs/by-name/ei/eigen/include-dir.patch similarity index 100% rename from pkgs/development/libraries/eigen/include-dir.patch rename to pkgs/by-name/ei/eigen/include-dir.patch diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/by-name/ei/eigen/package.nix similarity index 100% rename from pkgs/development/libraries/eigen/default.nix rename to pkgs/by-name/ei/eigen/package.nix diff --git a/pkgs/development/libraries/eigen/2.0.nix b/pkgs/by-name/ei/eigen2/package.nix similarity index 100% rename from pkgs/development/libraries/eigen/2.0.nix rename to pkgs/by-name/ei/eigen2/package.nix diff --git a/pkgs/by-name/ei/eigen_3_4_0/include-dir.patch b/pkgs/by-name/ei/eigen_3_4_0/include-dir.patch new file mode 100644 index 000000000000..9928bbdbed1b --- /dev/null +++ b/pkgs/by-name/ei/eigen_3_4_0/include-dir.patch @@ -0,0 +1,57 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,5 @@ + # cmake_minimum_require must be the first command of the file +-cmake_minimum_required(VERSION 3.5.0) ++cmake_minimum_required(VERSION 3.7.0) + + project(Eigen3) + +@@ -443,7 +443,7 @@ set(PKGCONFIG_INSTALL_DIR + CACHE PATH "The directory relative to CMAKE_INSTALL_PREFIX where eigen3.pc is installed" + ) + +-foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) ++foreach(var CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR) + # If an absolute path is specified, make it relative to "{CMAKE_INSTALL_PREFIX}". + if(IS_ABSOLUTE "${${var}}") + file(RELATIVE_PATH "${var}" "${CMAKE_INSTALL_PREFIX}" "${${var}}") +@@ -466,13 +466,6 @@ install(FILES + DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel + ) + +-if(EIGEN_BUILD_PKGCONFIG) +- configure_file(eigen3.pc.in eigen3.pc @ONLY) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc +- DESTINATION ${PKGCONFIG_INSTALL_DIR} +- ) +-endif() +- + install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) + + +@@ -593,8 +586,15 @@ set ( EIGEN_VERSION_MAJOR ${EIGEN_WORLD_VERSION} ) + set ( EIGEN_VERSION_MINOR ${EIGEN_MAJOR_VERSION} ) + set ( EIGEN_VERSION_PATCH ${EIGEN_MINOR_VERSION} ) + set ( EIGEN_DEFINITIONS "") +-set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" ) + set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} ) ++GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR) ++ ++if(EIGEN_BUILD_PKGCONFIG) ++ configure_file(eigen3.pc.in eigen3.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc ++ DESTINATION ${PKGCONFIG_INSTALL_DIR} ++ ) ++endif() + + include (CMakePackageConfigHelpers) + +--- a/eigen3.pc.in ++++ b/eigen3.pc.in +@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r + Requires: + Version: @EIGEN_VERSION_NUMBER@ + Libs: +-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ ++Cflags: -I@EIGEN_INCLUDE_DIR@ diff --git a/pkgs/development/libraries/eigen/3.4.0.nix b/pkgs/by-name/ei/eigen_3_4_0/package.nix similarity index 100% rename from pkgs/development/libraries/eigen/3.4.0.nix rename to pkgs/by-name/ei/eigen_3_4_0/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f5c84ae72e6..9ef83fec3869 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9176,12 +9176,6 @@ with pkgs; stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv; }; - eigen = callPackage ../development/libraries/eigen { }; - - eigen_3_4_0 = callPackage ../development/libraries/eigen/3.4.0.nix { }; - - eigen2 = callPackage ../development/libraries/eigen/2.0.nix { }; - vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { }; vmmlib = callPackage ../development/libraries/vmmlib { From c9bcec080d0bf3ec610941114c2c1c647868f784 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 11 Mar 2025 23:00:44 +0100 Subject: [PATCH 126/449] eigen_3_4_0: add pbsds as maintainer --- pkgs/by-name/ei/eigen_3_4_0/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ei/eigen_3_4_0/package.nix b/pkgs/by-name/ei/eigen_3_4_0/package.nix index 069f486cb285..735a83b93cf7 100644 --- a/pkgs/by-name/ei/eigen_3_4_0/package.nix +++ b/pkgs/by-name/ei/eigen_3_4_0/package.nix @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sander raskin + pbsds ]; platforms = platforms.unix; }; From bfe0eaf4982e718452904e8aa4b8ef9451dd0c90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Apr 2025 04:26:55 +0000 Subject: [PATCH 127/449] firefox-devedition-unwrapped: 138.0b5 -> 138.0b9 --- .../browsers/firefox/packages/firefox-devedition.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 3467f1f9943e..79b2e0745b44 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = pname; - version = "138.0b5"; + version = "138.0b9"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "07da38a6aa19de812539ba9b286d5189607ef45e7d8665a0f42facdcf7b3f7854561ad3cb54dce7e049199574b7d6dff01dba03763730e49306efb82833270fb"; + sha512 = "cf737b8c394150430cda512a84ebdf04426db0c413863eb37a327c44fc952db7de1be07956aaded3ddb769480fb307a102c1f4f7dab4ba8a38f2371fdd35a961"; }; meta = { From 4f0c9ec59409151cabe3507a6454a41cd96646b5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 20 Apr 2025 10:02:36 +0200 Subject: [PATCH 128/449] frog-protocols: fix update script --- pkgs/by-name/fr/frog-protocols/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/frog-protocols/package.nix b/pkgs/by-name/fr/frog-protocols/package.nix index 0219d0461ff5..908475a3c895 100644 --- a/pkgs/by-name/fr/frog-protocols/package.nix +++ b/pkgs/by-name/fr/frog-protocols/package.nix @@ -3,7 +3,7 @@ lib, meson, ninja, - nix-update-script, + unstableGitUpdater, stdenv, testers, }: @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - updateScript = nix-update-script { }; + updateScript = unstableGitUpdater { }; tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; }; From eb8cdd126eadf2210c7af92e5f50daf0df8b5de6 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sun, 20 Apr 2025 11:52:12 +0200 Subject: [PATCH 129/449] prismlauncher-unwrapped: backport Qt 6.9 fix for darwin This only affects darwin builds, but I decided to apply the backport unconditionally as it's just a one-line change. https://github.com/PrismLauncher/PrismLauncher/pull/3622 https://github.com/NixOS/nixpkgs/issues/400119 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/pr/prismlauncher-unwrapped/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix index 3e6f66e430a6..d05ab5abcb56 100644 --- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix +++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix @@ -5,7 +5,7 @@ cmake, cmark, extra-cmake-modules, - fetchpatch, + fetchpatch2, gamemode, ghc_filesystem, jdk17, @@ -45,6 +45,16 @@ stdenv.mkDerivation (finalAttrs: { ln -s ${libnbtplusplus} source/libraries/libnbtplusplus ''; + patches = [ + # https://github.com/PrismLauncher/PrismLauncher/pull/3622 + # https://github.com/NixOS/nixpkgs/issues/400119 + (fetchpatch2 { + name = "fix-qt6.9-compatibility.patch"; + url = "https://github.com/PrismLauncher/PrismLauncher/commit/8bb9b168fb996df9209e1e34be854235eda3d42a.diff"; + hash = "sha256-hOqWBrUrVUhMir2cfc10gu1i8prdNxefTyr7lH6KA2c="; + }) + ]; + nativeBuildInputs = [ cmake ninja From 808f94a757d06fb3a08b0ed653ef9220fc0ce99c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Apr 2025 10:29:52 +0000 Subject: [PATCH 130/449] python312Packages.graph-tool: 2.96 -> 2.97 --- pkgs/development/python-modules/graph-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graph-tool/default.nix b/pkgs/development/python-modules/graph-tool/default.nix index a4bc599eb0ef..3cc2c2394f64 100644 --- a/pkgs/development/python-modules/graph-tool/default.nix +++ b/pkgs/development/python-modules/graph-tool/default.nix @@ -32,12 +32,12 @@ let in buildPythonPackage rec { pname = "graph-tool"; - version = "2.96"; + version = "2.97"; format = "other"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - hash = "sha256-kNW09I/5U2kwKFOCWRdsedoXtIdnZhg9Bjy1GOw1rVc="; + hash = "sha256-Yt2PuLuvvv4iNcv6UHzr5lTwFkReVtVO/znSADkxjKU="; }; postPatch = '' From c4a7eb686726ab7a47dee4a76bd9660240f0c84d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Apr 2025 12:00:31 +0000 Subject: [PATCH 131/449] python312Packages.gguf: 0.14.0 -> 0.16.2 --- pkgs/development/python-modules/gguf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index 5353a2b618f5..7e78143339e2 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -11,14 +11,14 @@ }: buildPythonPackage rec { pname = "gguf"; - version = "0.14.0"; + version = "0.16.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-2ZlvGXp3eDHPngHvrCTL+oF3hzdTBbjE7hYHR3jivOg="; + hash = "sha256-D8lWKJow0PHzr9dewNST9zriYpo/IfOEbdFofYeRx8E="; }; dependencies = [ From 09db531e79e77dda92af467106ab90e6644df6c2 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Mon, 2 Dec 2024 21:59:26 -0500 Subject: [PATCH 132/449] shipwright: 8.0.6 -> 9.0.2 --- pkgs/by-name/sh/shipwright/darwin-fixes.patch | 40 ++--- .../disable-downloading-stb_image.patch | 16 ++ pkgs/by-name/sh/shipwright/package.nix | 147 +++++++++++++----- 3 files changed, 147 insertions(+), 56 deletions(-) create mode 100644 pkgs/by-name/sh/shipwright/disable-downloading-stb_image.patch diff --git a/pkgs/by-name/sh/shipwright/darwin-fixes.patch b/pkgs/by-name/sh/shipwright/darwin-fixes.patch index ae5e936603dd..de9135876a22 100644 --- a/pkgs/by-name/sh/shipwright/darwin-fixes.patch +++ b/pkgs/by-name/sh/shipwright/darwin-fixes.patch @@ -1,37 +1,37 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2c8644af..157758c9 100644 +index 2771ee8c..0702adad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -166,17 +166,13 @@ endif() +@@ -250,17 +250,13 @@ endif() if(CMAKE_SYSTEM_NAME MATCHES "Darwin") add_custom_target(CreateOSXIcons COMMAND mkdir -p ${CMAKE_BINARY_DIR}/macosx/soh.iconset -- COMMAND sips -z 16 16 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png -- COMMAND sips -z 32 32 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png -- COMMAND sips -z 32 32 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png -- COMMAND sips -z 64 64 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png -- COMMAND sips -z 128 128 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png -- COMMAND sips -z 256 256 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png -- COMMAND sips -z 256 256 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png -- COMMAND sips -z 512 512 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png -- COMMAND sips -z 512 512 soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png -- COMMAND cp soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png +- COMMAND sips -z 16 16 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16.png +- COMMAND sips -z 32 32 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16x16@2x.png +- COMMAND sips -z 32 32 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32.png +- COMMAND sips -z 64 64 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32x32@2x.png +- COMMAND sips -z 128 128 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128.png +- COMMAND sips -z 256 256 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128x128@2x.png +- COMMAND sips -z 256 256 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256.png +- COMMAND sips -z 512 512 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256x256@2x.png +- COMMAND sips -z 512 512 ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png --out ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512.png +- COMMAND cp ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512x512@2x.png - COMMAND iconutil -c icns -o ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset -+ COMMAND convert soh/macosx/sohIcon.png -resize 16x16 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16.png -+ COMMAND convert soh/macosx/sohIcon.png -resize 32x32 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32.png -+ COMMAND convert soh/macosx/sohIcon.png -resize 64x64 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_64.png -+ COMMAND convert soh/macosx/sohIcon.png -resize 128x128 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128.png -+ COMMAND convert soh/macosx/sohIcon.png -resize 256x256 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256.png -+ COMMAND convert soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 16x16 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_16.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 32x32 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_32.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 64x64 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_64.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 128x128 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_128.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 256x256 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_256.png ++ COMMAND convert ${CMAKE_SOURCE_DIR}/soh/macosx/sohIcon.png -resize 512x512 ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_512.png + COMMAND png2icns ${CMAKE_BINARY_DIR}/macosx/soh.icns ${CMAKE_BINARY_DIR}/macosx/soh.iconset/icon_{16,32,64,128,256,512}.png WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMENT "Creating OSX icons ..." ) -@@ -201,7 +197,6 @@ install(DIRECTORY ${CMAKE_BINARY_DIR}/assets +@@ -288,7 +284,6 @@ INSTALL(CODE "FILE(RENAME \${CMAKE_INSTALL_PREFIX}/../MacOS/soh-macos \${CMAKE_I install(CODE " include(BundleUtilities) -- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/soh-macos\" \"\" \"${dirs}\") +- fixup_bundle(\"\${CMAKE_INSTALL_PREFIX}/../MacOS/soh\" \"\" \"${dirs}\") ") endif() diff --git a/pkgs/by-name/sh/shipwright/disable-downloading-stb_image.patch b/pkgs/by-name/sh/shipwright/disable-downloading-stb_image.patch new file mode 100644 index 000000000000..eade8db90a7b --- /dev/null +++ b/pkgs/by-name/sh/shipwright/disable-downloading-stb_image.patch @@ -0,0 +1,16 @@ +Submodule libultraship contains modified content +diff --git a/libultraship/cmake/dependencies/common.cmake b/libultraship/cmake/dependencies/common.cmake +index 596158c..c62d7b2 100644 +--- a/libultraship/cmake/dependencies/common.cmake ++++ b/libultraship/cmake/dependencies/common.cmake +@@ -47,10 +47,6 @@ set(stormlib_optimizations_patch git apply ${CMAKE_CURRENT_SOURCE_DIR}/cmake/dep + endif() + + #=================== STB =================== +-set(STB_DIR ${CMAKE_BINARY_DIR}/_deps/stb) +-file(DOWNLOAD "https://github.com/nothings/stb/raw/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h" "${STB_DIR}/stb_image.h") +-file(WRITE "${STB_DIR}/stb_impl.c" "#define STB_IMAGE_IMPLEMENTATION\n#include \"stb_image.h\"") +- + add_library(stb STATIC) + + target_sources(stb PRIVATE diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index 3c1511efdb52..5cbd8e1984bf 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -10,12 +10,6 @@ copyDesktopItems, makeDesktopItem, python3, - libX11, - libXrandr, - libXinerama, - libXcursor, - libXi, - libXext, glew, boost, SDL2, @@ -28,36 +22,91 @@ makeWrapper, darwin, libicns, + libzip, + nlohmann_json, + tinyxml-2, + spdlog, + writeTextFile, + shipwright, }: + +let + + # The following would normally get fetched at build time, or a specific version is required + + gamecontrollerdb = fetchFromGitHub { + owner = "mdqinc"; + repo = "SDL_GameControllerDB"; + rev = "a74711e1e87733ccdf02d7020d8fa9e4fa67176e"; + hash = "sha256-rXC4akz9BaKzr/C2CryZC6RGk6+fGVG7RsQryUFUUk0="; + }; + + imgui' = fetchFromGitHub { + owner = "ocornut"; + repo = "imgui"; + tag = "v1.91.6-docking"; + hash = "sha256-28wyzzwXE02W5vbEdRCw2iOF8ONkb3M3Al8XlYBvz1A="; + }; + + libgfxd = fetchFromGitHub { + owner = "glankk"; + repo = "libgfxd"; + rev = "008f73dca8ebc9151b205959b17773a19c5bd0da"; + hash = "sha256-AmHAa3/cQdh7KAMFOtz5TQpcM6FqO9SppmDpKPTjTt8="; + }; + + prism = fetchFromGitHub { + owner = "KiritoDv"; + repo = "prism-processor"; + rev = "fb3f8b4a2d14dfcbae654d0f0e59a73b6f6ca850"; + hash = "sha256-gGdQSpX/TgCNZ0uyIDdnazgVHpAQhl30e+V0aVvTFMM="; + }; + + stb_impl = writeTextFile { + name = "stb_impl.c"; + text = '' + #define STB_IMAGE_IMPLEMENTATION + #include "stb_image.h" + ''; + }; + + stb' = fetchurl { + name = "stb_image.h"; + url = "https://raw.githubusercontent.com/nothings/stb/0bc88af4de5fb022db643c2d8e549a0927749354/stb_image.h"; + hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw="; + }; + + stormlib' = fetchFromGitHub { + owner = "ladislav-zezula"; + repo = "StormLib"; + tag = "v9.25"; + hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc="; + }; + + thread_pool = fetchFromGitHub { + owner = "bshoshany"; + repo = "thread-pool"; + rev = "v4.1.0"; + hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88="; + }; +in stdenv.mkDerivation (finalAttrs: { pname = "shipwright"; - version = "8.0.6"; + version = "9.0.2"; src = fetchFromGitHub { owner = "harbourmasters"; repo = "shipwright"; tag = finalAttrs.version; - hash = "sha256-bA+Bm7M6udeZLpFhGa8fCtagfYBeRxWWqFuAj62XwGQ="; + hash = "sha256-xmRUUMjQt3CFJ0GxlUsUqmp//XTRWik3jSD4auql7Nk="; fetchSubmodules = true; }; patches = [ ./darwin-fixes.patch - (fetchpatch { - name = "gcc14.patch"; - url = "https://github.com/HarbourMasters/Shipwright/commit/1bc15d5bf3042d4fd64e1952eb68c47a7d5d8061.patch"; - hash = "sha256-OpjP+rGqx56DB4W8yzLkxuxSAQa6oXQqtbQ2cNcFjYQ="; - }) + ./disable-downloading-stb_image.patch ]; - # This would get fetched at build time otherwise, see: - # https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736 - gamecontrollerdb = fetchurl { - name = "gamecontrollerdb.txt"; - url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/075c1549075ef89a397fd7e0663d21e53a2485fd/gamecontrollerdb.txt"; - hash = "sha256-atjc0t921l6JSUAd/Yk7uup2R7mCp5ivAh6Dr7HBY7I="; - }; - nativeBuildInputs = [ cmake @@ -85,19 +134,23 @@ stdenv.mkDerivation (finalAttrs: { libpng ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXrandr - libXinerama - libXcursor - libXi - libXext libpulseaudio zenity + libzip + nlohmann_json + tinyxml-2 + spdlog ]; cmakeFlags = [ + (lib.cmakeBool "BUILD_REMOTE_CONTROL" true) (lib.cmakeBool "NON_PORTABLE" true) (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "/build/source/build/_deps/imgui-src") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "/build/source/build/_deps/stormlib-src") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}") ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int"; @@ -107,21 +160,43 @@ stdenv.mkDerivation (finalAttrs: { # Linking fails without this hardeningDisable = [ "format" ]; + preConfigure = '' + mkdir stb + cp ${stb'} ./stb/${stb'.name} + cp ${stb_impl} ./stb/${stb_impl.name} + substituteInPlace libultraship/cmake/dependencies/common.cmake \ + --replace-fail "\''${STB_DIR}" "/build/source/stb" + ''; + + postPatch = '' + # use the soh patched deps when building + + mkdir -p ./build/_deps/imgui-src + cp -R --no-preserve=mode,ownership ${imgui'}/* ./build/_deps/imgui-src + pushd ./build/_deps/imgui-src + patch -p1 < ${shipwright.src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch + popd + + mkdir -p ./build/_deps/stormlib-src + cp -R --no-preserve=mode,ownership ${stormlib'}/* ./build/_deps/stormlib-src + pushd ./build/_deps/stormlib-src + patch -p1 < ${shipwright.src}/libultraship/cmake/dependencies/patches/stormlib-optimizations.patch + popd + + ''; + postBuild = '' - cp ${finalAttrs.gamecontrollerdb} ${finalAttrs.gamecontrollerdb.name} + cp ${gamecontrollerdb}/gamecontrollerdb.txt gamecontrollerdb.txt + mv ../libultraship/src/graphic/Fast3D/shaders ../soh/assets/custom pushd ../OTRExporter python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver ${finalAttrs.version} popd ''; - preInstall = - lib.optionalString stdenv.hostPlatform.isLinux '' - # Cmake likes it here for its install paths - cp ../OTRExporter/soh.otr .. - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - cp ../OTRExporter/soh.otr soh/soh.otr - ''; + preInstall = '' + # Cmake likes it here for its install paths + cp ../OTRExporter/soh.otr soh/soh.otr + ''; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' From ea7859639368d4f0b1f39cfa783aa137a37ee2b8 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Fri, 4 Apr 2025 17:36:39 -0400 Subject: [PATCH 133/449] shipwright: update darwin dependencies and use applyPatches Added Darwin deps Metal.hpp, a macOS Metal C++ wrapper header library apple-sdk_13 (macOS 13.0+), required by the above spdlog Removed hardcoded "/build/source/*" paths, they do not work on Darwin Rewritten imgui' and stormlib' using applyPatches, so they end up in the nix store, and we don't need to specify absolute paths Simplified postInstallPhase(few things have changed since 8.x.x) Author: Matteo Pacini --- pkgs/by-name/sh/shipwright/package.nix | 120 ++++++++++++------------- 1 file changed, 58 insertions(+), 62 deletions(-) diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index 5cbd8e1984bf..e0b49a975314 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -1,4 +1,5 @@ { + apple-sdk_13, stdenv, cmake, lsb-release, @@ -6,7 +7,6 @@ lib, fetchFromGitHub, fetchurl, - fetchpatch, copyDesktopItems, makeDesktopItem, python3, @@ -27,6 +27,8 @@ tinyxml-2, spdlog, writeTextFile, + fixDarwinDylibNames, + applyPatches, shipwright, }: @@ -41,11 +43,16 @@ let hash = "sha256-rXC4akz9BaKzr/C2CryZC6RGk6+fGVG7RsQryUFUUk0="; }; - imgui' = fetchFromGitHub { - owner = "ocornut"; - repo = "imgui"; - tag = "v1.91.6-docking"; - hash = "sha256-28wyzzwXE02W5vbEdRCw2iOF8ONkb3M3Al8XlYBvz1A="; + imgui' = applyPatches { + src = fetchFromGitHub { + owner = "ocornut"; + repo = "imgui"; + tag = "v1.91.6-docking"; + hash = "sha256-28wyzzwXE02W5vbEdRCw2iOF8ONkb3M3Al8XlYBvz1A="; + }; + patches = [ + "${shipwright.src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch" + ]; }; libgfxd = fetchFromGitHub { @@ -76,19 +83,31 @@ let hash = "sha256-xUsVponmofMsdeLsI6+kQuPg436JS3PBl00IZ5sg3Vw="; }; - stormlib' = fetchFromGitHub { - owner = "ladislav-zezula"; - repo = "StormLib"; - tag = "v9.25"; - hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc="; + stormlib' = applyPatches { + src = fetchFromGitHub { + owner = "ladislav-zezula"; + repo = "StormLib"; + tag = "v9.25"; + hash = "sha256-HTi2FKzKCbRaP13XERUmHkJgw8IfKaRJvsK3+YxFFdc="; + }; + patches = [ + "${shipwright.src}/libultraship/cmake/dependencies/patches/stormlib-optimizations.patch" + ]; }; thread_pool = fetchFromGitHub { owner = "bshoshany"; repo = "thread-pool"; - rev = "v4.1.0"; + tag = "v4.1.0"; hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88="; }; + + metalcpp = fetchFromGitHub { + owner = "briaguya-ai"; + repo = "single-header-metal-cpp"; + tag = "macOS13_iOS16"; + hash = "sha256-CSYIpmq478bla2xoPL/cGYKIWAeiORxyFFZr0+ixd7I"; + }; in stdenv.mkDerivation (finalAttrs: { pname = "shipwright"; @@ -123,6 +142,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ libicns darwin.sigtool + fixDarwinDylibNames ]; buildInputs = @@ -132,28 +152,37 @@ stdenv.mkDerivation (finalAttrs: { SDL2 SDL2_net libpng - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - libpulseaudio - zenity libzip nlohmann_json tinyxml-2 spdlog + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libpulseaudio + zenity + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Metal.hpp requires macOS 13.x min. + apple-sdk_13 ]; - cmakeFlags = [ - (lib.cmakeBool "BUILD_REMOTE_CONTROL" true) - (lib.cmakeBool "NON_PORTABLE" true) - (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "/build/source/build/_deps/imgui-src") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "/build/source/build/_deps/stormlib-src") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}") - ]; + cmakeFlags = + [ + (lib.cmakeBool "BUILD_REMOTE_CONTROL" true) + (lib.cmakeBool "NON_PORTABLE" true) + (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SPDLOG" "${spdlog}") + ]; - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int -Wno-elaborated-enum-base"; dontAddPrefix = true; @@ -165,24 +194,7 @@ stdenv.mkDerivation (finalAttrs: { cp ${stb'} ./stb/${stb'.name} cp ${stb_impl} ./stb/${stb_impl.name} substituteInPlace libultraship/cmake/dependencies/common.cmake \ - --replace-fail "\''${STB_DIR}" "/build/source/stb" - ''; - - postPatch = '' - # use the soh patched deps when building - - mkdir -p ./build/_deps/imgui-src - cp -R --no-preserve=mode,ownership ${imgui'}/* ./build/_deps/imgui-src - pushd ./build/_deps/imgui-src - patch -p1 < ${shipwright.src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch - popd - - mkdir -p ./build/_deps/stormlib-src - cp -R --no-preserve=mode,ownership ${stormlib'}/* ./build/_deps/stormlib-src - pushd ./build/_deps/stormlib-src - patch -p1 < ${shipwright.src}/libultraship/cmake/dependencies/patches/stormlib-optimizations.patch - popd - + --replace-fail "\''${STB_DIR}" "$(readlink -f ./stb)" ''; postBuild = '' @@ -215,11 +227,6 @@ stdenv.mkDerivation (finalAttrs: { mv $out/MacOS $out/Applications/soh.app/Contents/MacOS - # Wrapper - cp $src/soh/macosx/soh-macos.sh.in $out/Applications/soh.app/Contents/MacOS/soh - chmod +x $out/Applications/soh.app/Contents/MacOS/soh - patchShebangs $out/Applications/soh.app/Contents/MacOS/soh - # "lib" contains all resources that are in "Resources" in the official bundle. # We move them to the right place and symlink them back to $out/lib, # as that's where the game expects them. @@ -231,19 +238,8 @@ stdenv.mkDerivation (finalAttrs: { # Copy icons cp -r ../build/macosx/soh.icns $out/Applications/soh.app/Contents/Resources/soh.icns - # Fix executable - install_name_tool -change @executable_path/../Frameworks/libSDL2-2.0.0.dylib \ - ${SDL2}/lib/libSDL2-2.0.0.dylib \ - $out/Applications/soh.app/Contents/Resources/soh-macos - install_name_tool -change @executable_path/../Frameworks/libGLEW.2.2.0.dylib \ - ${glew}/lib/libGLEW.2.2.0.dylib \ - $out/Applications/soh.app/Contents/Resources/soh-macos - install_name_tool -change @executable_path/../Frameworks/libpng16.16.dylib \ - ${libpng}/lib/libpng16.16.dylib \ - $out/Applications/soh.app/Contents/Resources/soh-macos - # Codesign (ad-hoc) - codesign -f -s - $out/Applications/soh.app/Contents/Resources/soh-macos + codesign -f -s - $out/Applications/soh.app/Contents/MacOS/soh ''; fixupPhase = lib.optionalString stdenv.hostPlatform.isLinux '' From 10218c015dcdee2a1c0118f3e838ed11ca891e8a Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Tue, 8 Apr 2025 00:14:39 -0400 Subject: [PATCH 134/449] shipwright: include git build details These git commands can't run in the sandbox, so populate them ourselves --- pkgs/by-name/sh/shipwright/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index e0b49a975314..91bc93f90f6b 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -119,6 +119,14 @@ stdenv.mkDerivation (finalAttrs: { tag = finalAttrs.version; hash = "sha256-xmRUUMjQt3CFJ0GxlUsUqmp//XTRWik3jSD4auql7Nk="; fetchSubmodules = true; + deepClone = true; + postFetch = '' + cd $out + git branch --show-current > GIT_BRANCH + git rev-parse --short=7 HEAD > GIT_COMMIT_HASH + git describe --tags --abbrev=0 --exact-match HEAD > GIT_COMMIT_TAG + rm -rf .git + ''; }; patches = [ @@ -197,6 +205,13 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "\''${STB_DIR}" "$(readlink -f ./stb)" ''; + postPatch = '' + substituteInPlace soh/src/boot/build.c.in \ + --replace-fail "@CMAKE_PROJECT_GIT_BRANCH@" "$(cat GIT_BRANCH)" \ + --replace-fail "@CMAKE_PROJECT_GIT_COMMIT_HASH@" "$(cat GIT_COMMIT_HASH)" \ + --replace-fail "@CMAKE_PROJECT_GIT_COMMIT_TAG@" "$(cat GIT_COMMIT_TAG)" + ''; + postBuild = '' cp ${gamecontrollerdb}/gamecontrollerdb.txt gamecontrollerdb.txt mv ../libultraship/src/graphic/Fast3D/shaders ../soh/assets/custom From 10d91c0f2fb83586c91579ee5981c14f174b237e Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Sun, 20 Apr 2025 11:41:09 -0400 Subject: [PATCH 135/449] shipwright: fix dev builds Fallback to empty string for GIT_COMMIT_TAG (this is the behavior of the CMake as well). https://github.com/HarbourMasters/Shipwright/blob/1b6dc13491460462f3a04e56b8fe1a28ada5d2a3/CMakeLists.txt#L68-L70 Grab --port-ver from the CMake cache instead of passing finalAttrs.version. For tagged releases that works fine but the game expects the --port-ver to match the CMake project version even for dev builds so failing to do this will result in the game failing to boot since it thinks there's a version mismatch between the executable and the OTR in the derivation. Author: Sirius902 --- pkgs/by-name/sh/shipwright/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix index 91bc93f90f6b..baba8dab5f9c 100644 --- a/pkgs/by-name/sh/shipwright/package.nix +++ b/pkgs/by-name/sh/shipwright/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { cd $out git branch --show-current > GIT_BRANCH git rev-parse --short=7 HEAD > GIT_COMMIT_HASH - git describe --tags --abbrev=0 --exact-match HEAD > GIT_COMMIT_TAG + (git describe --tags --abbrev=0 --exact-match HEAD 2>/dev/null || echo "") > GIT_COMMIT_TAG rm -rf .git ''; }; @@ -213,10 +213,11 @@ stdenv.mkDerivation (finalAttrs: { ''; postBuild = '' + port_ver=$(grep CMAKE_PROJECT_VERSION: "$PWD/CMakeCache.txt" | cut -d= -f2) cp ${gamecontrollerdb}/gamecontrollerdb.txt gamecontrollerdb.txt mv ../libultraship/src/graphic/Fast3D/shaders ../soh/assets/custom pushd ../OTRExporter - python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver ${finalAttrs.version} + python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver $port_ver popd ''; From f1d903df2bf00eeb10c6eef0e77632b4a15744aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Apr 2025 21:39:51 +0000 Subject: [PATCH 136/449] git-town: 18.1.0 -> 19.0.0 --- pkgs/by-name/gi/git-town/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix index 40decb9bb968..c6c6798a8cbf 100644 --- a/pkgs/by-name/gi/git-town/package.nix +++ b/pkgs/by-name/gi/git-town/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "git-town"; - version = "18.1.0"; + version = "19.0.0"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; tag = "v${version}"; - hash = "sha256-dx19gzHhCCcdlI80CYhbfKHRS0AQB0DnHphV2mqmI/Y="; + hash = "sha256-To+WtPkMbVDuUBaOkemua9i7WOs/X214YunWtbKt02Y="; }; vendorHash = null; From 9288d4025472f87f764d15c889904fd9ae263cf0 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Wed, 9 Apr 2025 22:29:12 +0200 Subject: [PATCH 137/449] rstudio: use electron_34 --- pkgs/applications/editors/rstudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 298c0efc6fe7..a5f327e5a5fc 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -33,7 +33,7 @@ zip, git, makeWrapper, - electron_33, + electron_34, server ? false, # build server version pam, nixosTests, @@ -42,7 +42,7 @@ let # Note: we shouldn't use the latest electron here, since the node-abi dependency might # need to be updated every time the latest electron gets a new abi version number - electron = electron_33; + electron = electron_34; mathJaxSrc = fetchzip { url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; From d7afeaea8ae76ffadf5da4e587454d238a1cd8a6 Mon Sep 17 00:00:00 2001 From: silvanshade Date: Sun, 20 Apr 2025 18:40:25 -0600 Subject: [PATCH 138/449] libblake3: 1.8.0 -> 1.8.2 --- pkgs/by-name/li/libblake3/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index 59306559958e..008a35b88254 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -5,23 +5,18 @@ fetchFromGitHub, tbb_2021_11, - # Until we have a release with - # https://github.com/BLAKE3-team/BLAKE3/pull/461 and similar, or those - # PRs are patched onto this current release. Even then, I think we - # still need to disable for MinGW build because - # https://github.com/BLAKE3-team/BLAKE3/issues/467 - useTBB ? false, + useTBB ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "libblake3"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; tag = finalAttrs.version; - hash = "sha256-Krh0yVNZKL6Mb0McqWTIMNownsgM3MUEX2IP+F/fu+k="; + hash = "sha256-IABVErXWYQFXZcwsFKfQhm3ox7UZUcW5uzVrGwsSp94="; }; sourceRoot = finalAttrs.src.name + "/c"; From e7d5fa3e3923b4f8fcc03c13647f0341222b8abe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 01:09:24 +0000 Subject: [PATCH 139/449] helio-workstation: 3.14 -> 3.15 --- pkgs/by-name/he/helio-workstation/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix index 198a5a67a60f..1a229e61fca7 100644 --- a/pkgs/by-name/he/helio-workstation/package.nix +++ b/pkgs/by-name/he/helio-workstation/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.14"; + version = "3.15"; src = fetchFromGitHub { owner = "helio-fm"; repo = "helio-workstation"; rev = version; fetchSubmodules = true; - hash = "sha256-o8vMHt6ypHY7HOHnhMifQphxGb5MjSg3hREVOnIdqfc="; + hash = "sha256-SDK3lLcMCmxu1FwkPduNzlgmDU7LKitPqIvsr6rOYDc="; }; buildInputs = [ From 8e9f0dc3f65d75d8cf067fb043356161644d1131 Mon Sep 17 00:00:00 2001 From: misilelab Date: Sun, 20 Apr 2025 19:57:06 +0900 Subject: [PATCH 140/449] gel: 7.0.3 -> 7.2.0 https://github.com/geldata/gel-cli/releases/tag/v7.1.0 https://github.com/geldata/gel-cli/releases/tag/v7.1.1 https://github.com/geldata/gel-cli/releases/tag/v7.2.0 Signed-off-by: misilelab --- pkgs/by-name/ge/gel/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ge/gel/package.nix b/pkgs/by-name/ge/gel/package.nix index f82431586d1d..84d82806f0e2 100644 --- a/pkgs/by-name/ge/gel/package.nix +++ b/pkgs/by-name/ge/gel/package.nix @@ -16,19 +16,19 @@ }: rustPlatform.buildRustPackage rec { pname = "gel"; - version = "7.0.3"; + version = "7.2.0"; src = fetchFromGitHub { owner = "geldata"; repo = "gel-cli"; tag = "v${version}"; - hash = "sha256-QP4LtLgF2OWCsPCFzpLR8k/RetfEevSd8Uv/PciHCwk="; + hash = "sha256-HqMfReKt1Gl2c7ectgcW514ARCgfNi8PaykvKJUZirY="; fetchSubmodules = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-s8UKYZs4GorM0qvAvE+HL+Qma2x05IDtuqYebMDrZHk="; + hash = "sha256-rxlJQSh3CN4lBFOWFMZmdH91xgRnBbywXA/gakSKsck="; }; nativeBuildInputs = [ @@ -60,11 +60,6 @@ rustPlatform.buildRustPackage rec { OPENSSL_NO_VENDOR = true; }; - # cli warns when edgedb found but gel doesn't - postInstall = '' - mv $out/bin/edgedb $out/bin/gel - ''; - doCheck = false; passthru.tests.version = testers.testVersion { From 7189808799bfab8016348324eab46690b95120b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 09:04:37 +0000 Subject: [PATCH 141/449] python312Packages.tenant-schemas-celery: 3.0.0 -> 4.0.0 --- .../python-modules/tenant-schemas-celery/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tenant-schemas-celery/default.nix b/pkgs/development/python-modules/tenant-schemas-celery/default.nix index d08e47ef284a..0becc555d2a9 100644 --- a/pkgs/development/python-modules/tenant-schemas-celery/default.nix +++ b/pkgs/development/python-modules/tenant-schemas-celery/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "tenant-schemas-celery"; - version = "3.0.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "maciej-gol"; repo = "tenant-schemas-celery"; tag = version; - hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg="; + hash = "sha256-SpjiVbgAXY+WzVpGYt3uislPn9u1buGN4z94Rg5MAwo="; }; build-system = [ setuptools ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Celery application implementation that allows celery tasks to cooperate with multi-tenancy provided by django-tenant-schemas and django-tenants packages"; homepage = "https://github.com/maciej-gol/tenant-schemas-celery"; - changelog = "https://github.com/maciej-gol/tenant-schemas-celery/releases/tag/${version}"; + changelog = "https://github.com/maciej-gol/tenant-schemas-celery/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jopejoe1 ]; }; From fa579770354c0b79877e88e65e5e04d51bfa229b Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Mon, 21 Apr 2025 12:42:19 +0300 Subject: [PATCH 142/449] geteduroam-cli: make use of finalAttrs --- pkgs/by-name/ge/geteduroam-cli/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ge/geteduroam-cli/package.nix b/pkgs/by-name/ge/geteduroam-cli/package.nix index 60a000488a20..f9e6f4dfa4cc 100644 --- a/pkgs/by-name/ge/geteduroam-cli/package.nix +++ b/pkgs/by-name/ge/geteduroam-cli/package.nix @@ -5,14 +5,14 @@ versionCheckHook, nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "geteduroam-cli"; version = "0.8"; src = fetchFromGitHub { owner = "geteduroam"; repo = "linux-app"; - tag = version; + tag = finalAttrs.version; hash = "sha256-2iAvE38r3iwulBqW+rrbrpNVgQlDhhcVUsjZSOT5P1A="; }; @@ -40,6 +40,6 @@ buildGoModule rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ viperML ]; platforms = lib.platforms.linux; - changelog = "https://github.com/geteduroam/linux-app/releases/tag/${version}"; + changelog = "https://github.com/geteduroam/linux-app/releases/tag/${finalAttrs.version}"; }; -} +}) From 36423a8b8b2c00bbed33bf9d75bf9a245e3ce8e8 Mon Sep 17 00:00:00 2001 From: Acid Bong Date: Mon, 21 Apr 2025 12:42:53 +0300 Subject: [PATCH 143/449] elf-info: make use of finalAttrs --- pkgs/by-name/el/elf-info/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/el/elf-info/package.nix b/pkgs/by-name/el/elf-info/package.nix index 776a386483f6..051e238e7fec 100644 --- a/pkgs/by-name/el/elf-info/package.nix +++ b/pkgs/by-name/el/elf-info/package.nix @@ -5,14 +5,14 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "elf-info"; version = "0.3.0"; src = fetchFromGitHub { owner = "kevin-lesenechal"; repo = "elf-info"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-wbFVuoarOoxV9FqmuHJ9eZlG4rRqy1rsnuqbGorC2Rk="; }; @@ -28,4 +28,4 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ viperML ]; mainProgram = "elf"; }; -} +}) From b0e1bb8c2dd43f6ae06c062e8b7b5ee13a3304c2 Mon Sep 17 00:00:00 2001 From: Philipp Arras Date: Mon, 21 Apr 2025 14:35:39 +0200 Subject: [PATCH 144/449] python3Packages.nanobind: 2.6.1 -> 2.7.0 --- pkgs/development/python-modules/nanobind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index 9f0710b79aef..b551b797c78e 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -27,14 +27,14 @@ }: buildPythonPackage rec { pname = "nanobind"; - version = "2.6.1"; + version = "2.7.0"; pyproject = true; src = fetchFromGitHub { owner = "wjakob"; repo = "nanobind"; tag = "v${version}"; - hash = "sha256-1CU5aRhiVPGXLVYZzOM8ELgRwa3hz7kQSwlTYsvFE7s="; + hash = "sha256-ex5svqDp9XJtiNCxu0249ORL6LbG679U6PvKQaWANmE="; fetchSubmodules = true; }; From 6948814fef68e133fc63209d4196cc68b7cf07e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 13:21:23 +0000 Subject: [PATCH 145/449] nvc: 1.15.2 -> 1.16.0 --- pkgs/by-name/nv/nvc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix index 0998757de52a..f7e2841d0e13 100644 --- a/pkgs/by-name/nv/nvc/package.nix +++ b/pkgs/by-name/nv/nvc/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.15.2"; + version = "1.16.0"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-GMgGnsEKItVgQLwk6gY8pU6lIGoGGWPGhkBJwmVRy+Q="; + hash = "sha256-RI86VdWuPTcjkQstwDBN/rDLv/Imy9kYH/nIJSGuIcI="; }; nativeBuildInputs = [ From d4af3929072fe6f5745bde19449623950adad9db Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Mon, 21 Apr 2025 08:53:55 -0500 Subject: [PATCH 146/449] tone: 0.2.4 -> 0.2.5 --- pkgs/by-name/to/tone/deps.json | 125 +++++++++++++++++++++---------- pkgs/by-name/to/tone/package.nix | 9 ++- 2 files changed, 92 insertions(+), 42 deletions(-) diff --git a/pkgs/by-name/to/tone/deps.json b/pkgs/by-name/to/tone/deps.json index 586dfac16f49..7930cc6e6152 100644 --- a/pkgs/by-name/to/tone/deps.json +++ b/pkgs/by-name/to/tone/deps.json @@ -6,8 +6,8 @@ }, { "pname": "CliWrap", - "version": "3.7.0", - "hash": "sha256-hXClLGuhscCrcBaymrp57Prh4m8Qe0vdE4S2ErIM13w=" + "version": "3.7.1", + "hash": "sha256-e0snh/9Ai6/Gw5ycQox2H5nGrPhKfT2sH9dQNjbrrCI=" }, { "pname": "CSharp.OperationResult", @@ -21,8 +21,8 @@ }, { "pname": "HtmlAgilityPack", - "version": "1.11.71", - "hash": "sha256-ddNrIXTfiu8gwrUs/5xYDjpD0sOth90kut6qCgxGUSE=" + "version": "1.11.72", + "hash": "sha256-MRt7yj6+/ORmr2WBERpQ+1gMRzIaPFKddHoB4zZmv2k=" }, { "pname": "Jint", @@ -31,44 +31,59 @@ }, { "pname": "Microsoft.Extensions.Configuration", - "version": "9.0.0", - "hash": "sha256-uBLeb4z60y8z7NelHs9uT3cLD6wODkdwyfJm6/YZLDM=" + "version": "9.0.1", + "hash": "sha256-QKWRIGi8RaZjheuW9gMouXa3oaL/nMwlmg28/xxEvgs=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", "version": "9.0.0", "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc=" }, + { + "pname": "Microsoft.Extensions.Configuration.Abstractions", + "version": "9.0.1", + "hash": "sha256-r3iWP+kwKo4Aib8SGo91kKWR5WusLrbFHUAw5uKQeNA=" + }, { "pname": "Microsoft.Extensions.Configuration.Binder", "version": "9.0.0", "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU=" }, + { + "pname": "Microsoft.Extensions.Configuration.Binder", + "version": "9.0.1", + "hash": "sha256-uq6i0gTobSTqaNm/0XZuv8GGjFpnvgwXnCCPWl9FP9g=" + }, { "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables", - "version": "9.0.0", - "hash": "sha256-tDJx2prYZpr0RKSwmJfsK9FlUGwaDmyuSz2kqQxsWoI=" + "version": "9.0.1", + "hash": "sha256-NS38eSGrEMQf1CgwwcLtmjMNmcLB6ssOWwU4EZw2zBk=" }, { "pname": "Microsoft.Extensions.Configuration.FileExtensions", - "version": "9.0.0", - "hash": "sha256-PsLo6mrLGYfbi96rfCG8YS1APXkUXBG4hLstpT60I4s=" + "version": "9.0.1", + "hash": "sha256-xEgobzCPSB+8NbAcjOjES1oYKBdwk5hVdfENL2XPWbk=" }, { "pname": "Microsoft.Extensions.Configuration.Json", - "version": "9.0.0", - "hash": "sha256-qQn7Ol0CvPYuyecYWYBkPpTMdocO7I6n+jXQI2udzLI=" + "version": "9.0.1", + "hash": "sha256-8mqWcbJk8FOonELQPaxmAQAkVEz8OrHqn/4sl8SDigM=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.0", - "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k=" + "version": "9.0.1", + "hash": "sha256-Kt9fczXVeOIlvwuxXdQDKRfIZKClay0ESGUIAJpYiOw=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "9.0.0", "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "9.0.1", + "hash": "sha256-2tWVTPHsw1NG2zO0zsxvi1GybryqeE1V00ZRE66YZB4=" + }, { "pname": "Microsoft.Extensions.DependencyModel", "version": "9.0.0", @@ -76,59 +91,79 @@ }, { "pname": "Microsoft.Extensions.Diagnostics", - "version": "9.0.0", - "hash": "sha256-JMbhtjdcWRlrcrbgPlowfj26+pM+MYhnPIaYKnv9byU=" + "version": "9.0.1", + "hash": "sha256-WOuWbkV9IxXnIN2xpqeoovoD3rbMpwAXSJlYKSI4dUI=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "9.0.0", - "hash": "sha256-wG1LcET+MPRjUdz3HIOTHVEnbG/INFJUqzPErCM79eY=" + "version": "9.0.1", + "hash": "sha256-/JkeyAQ//lfuHrWbq8ZFrHZiLvIXSnBj0MG0rU8eggQ=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "9.0.0", - "hash": "sha256-mVfLjZ8VrnOQR/uQjv74P2uEG+rgW72jfiGdSZhIfDc=" + "version": "9.0.1", + "hash": "sha256-ZVnTUbr2eIVFHdtTG9H1kR4DzgpDiMFzRcNx0brHf3o=" }, { "pname": "Microsoft.Extensions.FileProviders.Physical", - "version": "9.0.0", - "hash": "sha256-IzFpjKHmF1L3eVbFLUZa2N5aH3oJkJ7KE1duGIS7DP8=" + "version": "9.0.1", + "hash": "sha256-GKyzSDYPl5Y0AAHufaULu8BLKWQU1ofAUJt4YENVaXU=" }, { "pname": "Microsoft.Extensions.FileSystemGlobbing", - "version": "9.0.0", - "hash": "sha256-eBLa8pW/y/hRj+JbEr340zbHRABIeFlcdqE0jf5/Uhc=" + "version": "9.0.1", + "hash": "sha256-eoJViA7yWsT9gD/oY5WJHaEWHDibek6uClj8woyteHM=" }, { "pname": "Microsoft.Extensions.Http", - "version": "9.0.0", - "hash": "sha256-MsStH3oUfyBbcSEoxm+rfxFBKI/rtB5PZrSGvtDjVe0=" + "version": "9.0.1", + "hash": "sha256-MvQon3jJ/wIhXCLFuI2s0tW4+bh0jUAu6H5I5R8WjaQ=" }, { "pname": "Microsoft.Extensions.Logging", "version": "9.0.0", "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM=" }, + { + "pname": "Microsoft.Extensions.Logging", + "version": "9.0.1", + "hash": "sha256-IjszwetJ/r1NvwVyh+/SlavabNt9UXf3ZSGP9gGwnkk=" + }, { "pname": "Microsoft.Extensions.Logging.Abstractions", "version": "9.0.0", "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU=" }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "9.0.1", + "hash": "sha256-aFZeUno9yLLbvtrj53gA7oD41vxZZYkrJhlOghpMEjo=" + }, { "pname": "Microsoft.Extensions.Options", "version": "9.0.0", "hash": "sha256-DT5euAQY/ItB5LPI8WIp6Dnd0lSvBRP35vFkOXC68ck=" }, + { + "pname": "Microsoft.Extensions.Options", + "version": "9.0.1", + "hash": "sha256-wOKd/0+kRK3WrGA2HmS/KNYUTUwXHmTAD5IsClTFA10=" + }, { "pname": "Microsoft.Extensions.Options.ConfigurationExtensions", - "version": "9.0.0", - "hash": "sha256-r1Z3sEVSIjeH2UKj+KMj86har68g/zybSqoSjESBcoA=" + "version": "9.0.1", + "hash": "sha256-pzc49CPyBlSoyflWvW6J+xqk2RXEVfPczcDiR0Aj9xA=" }, { "pname": "Microsoft.Extensions.Primitives", "version": "9.0.0", "hash": "sha256-ZNLusK1CRuq5BZYZMDqaz04PIKScE2Z7sS2tehU7EJs=" }, + { + "pname": "Microsoft.Extensions.Primitives", + "version": "9.0.1", + "hash": "sha256-tdbtoC7eQGW5yh66FWCJQqmFJkNJD+9e6DDKTs7YAjs=" + }, { "pname": "Newtonsoft.Json", "version": "13.0.3", @@ -141,8 +176,8 @@ }, { "pname": "Sandreas.AudioMetadata", - "version": "0.2.7", - "hash": "sha256-GYD+nAURuU99/3JH/4QTthhzAVsau/qpcvih4eiJxtk=" + "version": "0.2.8", + "hash": "sha256-fxzUNFUC/HesKbucrFkOcfqzZfvGqSe3Kr3ZrUzJEic=" }, { "pname": "Sandreas.Files", @@ -189,16 +224,16 @@ "version": "0.49.1", "hash": "sha256-sar9rhft1ivDMj1kU683+4KxUPUZL+Fb++ewMA6RD4Q=" }, - { - "pname": "System.CodeDom", - "version": "9.0.0", - "hash": "sha256-578lcBgswW0eM16r0EnJzfGodPx86RxxFoZHc2PSzsw=" - }, { "pname": "System.Diagnostics.DiagnosticSource", "version": "9.0.0", "hash": "sha256-1VzO9i8Uq2KlTw1wnCCrEdABPZuB2JBD5gBsMTFTSvE=" }, + { + "pname": "System.Diagnostics.DiagnosticSource", + "version": "9.0.1", + "hash": "sha256-nIIvVK+5uyOhAuU2sERNADK4N/A/x0MilBH/EAr1gOA=" + }, { "pname": "System.IO.Abstractions", "version": "19.0.1", @@ -210,20 +245,30 @@ "hash": "sha256-vb0NrPjfEao3kfZ0tavp2J/29XnsQTJgXv3/qaAwwz0=" }, { - "pname": "System.Management", - "version": "9.0.0", - "hash": "sha256-UyLO5dgNVC7rBT1S6o/Ix6EQGlVTSWUQtVC+/cyTkfQ=" + "pname": "System.IO.Pipelines", + "version": "9.0.1", + "hash": "sha256-CnmDanknCGbNnoDjgZw62M/Grg8IMTJDa8x3P07UR2A=" }, { "pname": "System.Text.Encodings.Web", "version": "9.0.0", "hash": "sha256-WGaUklQEJywoGR2jtCEs5bxdvYu5SHaQchd6s4RE5x0=" }, + { + "pname": "System.Text.Encodings.Web", + "version": "9.0.1", + "hash": "sha256-iuAVcTiiZQLCZjDfDqdLLPHqZdZqvFabwLFHiVYdRJo=" + }, { "pname": "System.Text.Json", "version": "9.0.0", "hash": "sha256-aM5Dh4okLnDv940zmoFAzRmqZre83uQBtGOImJpoIqk=" }, + { + "pname": "System.Text.Json", + "version": "9.0.1", + "hash": "sha256-2dqE+Mx5eJZ8db74ofUiUXHOSxDCmXw5n9VC9w4fUr0=" + }, { "pname": "TestableIO.System.IO.Abstractions", "version": "19.0.1", @@ -241,7 +286,7 @@ }, { "pname": "z440.atl.core", - "version": "6.11.0", - "hash": "sha256-V1r1ftZ/Ud0pw/qwnqpJodRaGi9FyG3uIy3ykJUvxjg=" + "version": "6.14.0", + "hash": "sha256-H9Z9a+Vfn1P3u5ClwRB3x1ooXvUQbayyPrRvIiop9aU=" } ] diff --git a/pkgs/by-name/to/tone/package.nix b/pkgs/by-name/to/tone/package.nix index 03fb6388f1f6..4ac8a62707a2 100644 --- a/pkgs/by-name/to/tone/package.nix +++ b/pkgs/by-name/to/tone/package.nix @@ -10,15 +10,20 @@ buildDotnetModule rec { pname = "tone"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "sandreas"; repo = "tone"; tag = "v${version}"; - hash = "sha256-DX54NSlqAZzVQObm9qjUsYatjxjHKGcSLHH1kVD4Row="; + hash = "sha256-yqcxqwlCfVDTv5jkcneimlS5EgnDlB7ZvxPt53t9jbQ="; }; + patchPhase = '' + substituteInPlace tone/Program.cs \ + --replace-fail "@package_version@" ${version} + ''; + projectFile = "tone/tone.csproj"; executables = [ "tone" ]; nugetDeps = ./deps.json; From 562172f0bad1130dcb380330ec3697c36401a843 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 19 Apr 2025 20:51:11 +0200 Subject: [PATCH 147/449] dleyna-core: 0.7.0 -> 0.8.3 closes #399076 --- pkgs/by-name/dl/dleyna-core/package.nix | 53 --------------------- pkgs/by-name/dl/dleyna-core/setup-hook.sh | 8 ---- pkgs/by-name/dl/dleyna/package.nix | 57 +++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + 4 files changed, 58 insertions(+), 61 deletions(-) delete mode 100644 pkgs/by-name/dl/dleyna-core/package.nix delete mode 100644 pkgs/by-name/dl/dleyna-core/setup-hook.sh create mode 100644 pkgs/by-name/dl/dleyna/package.nix diff --git a/pkgs/by-name/dl/dleyna-core/package.nix b/pkgs/by-name/dl/dleyna-core/package.nix deleted file mode 100644 index 92f021ae594a..000000000000 --- a/pkgs/by-name/dl/dleyna-core/package.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - meson, - ninja, - pkg-config, - gupnp, -}: - -stdenv.mkDerivation rec { - pname = "dleyna-core"; - version = "0.7.0"; - - outputs = [ - "out" - "dev" - ]; - - setupHook = ./setup-hook.sh; - - src = fetchFromGitHub { - owner = "phako"; - repo = "dleyna-core"; - rev = "v${version}"; - sha256 = "i4L9+iyAdBNtgImbD54jkjYL5hvzeZ2OaAyFrcFmuG0="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - propagatedBuildInputs = [ - gupnp - ]; - - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.cc.isClang [ - "-Wno-error=implicit-function-declaration" - "-Wno-error=int-conversion" - ] - ); - - meta = with lib; { - description = "Library of utility functions that are used by the higher level dLeyna"; - homepage = "https://github.com/phako/dleyna-core"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/by-name/dl/dleyna-core/setup-hook.sh b/pkgs/by-name/dl/dleyna-core/setup-hook.sh deleted file mode 100644 index 287ad4dc1897..000000000000 --- a/pkgs/by-name/dl/dleyna-core/setup-hook.sh +++ /dev/null @@ -1,8 +0,0 @@ -addDleynaConnectorPath () { - if test -d "$1/lib/dleyna-1.0/connectors" - then - export DLEYNA_CONNECTOR_PATH="${DLEYNA_CONNECTOR_PATH-}${DLEYNA_CONNECTOR_PATH:+:}$1/lib/dleyna-1.0/connectors" - fi -} - -addEnvHooks "$targetOffset" addDleynaConnectorPath diff --git a/pkgs/by-name/dl/dleyna/package.nix b/pkgs/by-name/dl/dleyna/package.nix new file mode 100644 index 000000000000..d40c9b89bbcd --- /dev/null +++ b/pkgs/by-name/dl/dleyna/package.nix @@ -0,0 +1,57 @@ +{ + stdenv, + lib, + docutils, + fetchFromGitLab, + meson, + ninja, + pkg-config, + gupnp_1_6, + gupnp-av, + gupnp-dlna, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dleyna"; + version = "0.8.3"; + + outputs = [ + "out" + "dev" + ]; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "dLeyna"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ti4yF8sALpWyrdQTt/jVrMKQ4PLhakEi620fJNMxT0c="; + }; + + nativeBuildInputs = [ + meson + ninja + docutils + pkg-config + ]; + + buildInputs = [ + gupnp_1_6 + gupnp-dlna + gupnp-av + gupnp-dlna + ]; + + mesonFlags = [ + # Sphinx docs not installed, do not depend on sphinx + "-Ddocs=false" + ]; + + meta = { + description = "Library of utility functions that are used by the higher level dLeyna"; + homepage = "https://gitlab.gnome.org/World/dLeyna"; + maintainers = with lib.maintainers; [ jtojnar ]; + platforms = lib.platforms.unix; + license = lib.licenses.lgpl21Only; + }; +}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index fa635a073dd7..d7ce048a9e9c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -500,6 +500,7 @@ mapAliases { dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25 + dleyna-core = dleyna; # Added 2025-04-19 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02 From 6c5307e31b58f0a2e985b550720c7a3c262ca16d Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 19 Apr 2025 21:05:22 +0200 Subject: [PATCH 148/449] dleyna-connector-dbus: drop --- .../dl/dleyna-connector-dbus/package.nix | 53 ------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/by-name/dl/dleyna-connector-dbus/package.nix diff --git a/pkgs/by-name/dl/dleyna-connector-dbus/package.nix b/pkgs/by-name/dl/dleyna-connector-dbus/package.nix deleted file mode 100644 index f0b64e2f6361..000000000000 --- a/pkgs/by-name/dl/dleyna-connector-dbus/package.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - stdenv, - lib, - meson, - ninja, - pkg-config, - fetchFromGitHub, - fetchpatch, - dleyna-core, - glib, -}: - -stdenv.mkDerivation rec { - pname = "dleyna-connector-dbus"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "phako"; - repo = "dleyna-connector-dbus"; - rev = "v${version}"; - sha256 = "WDmymia9MD3BRU6BOCzCIMrz9V0ACRzmEGqjbbuUmlA="; - }; - - patches = [ - # Fix build with meson 1.2. We use the gentoo patch instead of the - # usptream one because the latter only applies on the libsoup_3 based - # merged dLeyna project. - # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 - (fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/4a0982b49a1d94aa785b05d9b7d256c26c499910/net-libs/dleyna-connector-dbus/files/meson-1.2.0.patch"; - sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - - buildInputs = [ - dleyna-core - glib - ]; - - meta = with lib; { - description = "D-Bus API for the dLeyna services"; - homepage = "https://github.com/phako/dleyna-connector-dbus"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7ce048a9e9c..014ea85d99b7 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -501,6 +501,7 @@ mapAliases { dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25 dleyna-core = dleyna; # Added 2025-04-19 + dleyna-connector-dbus = dleyna; # Added 2025-04-19 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02 From 56c54a5d8750451a4a00f2d13f4c7a9284e7da67 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 19 Apr 2025 21:06:16 +0200 Subject: [PATCH 149/449] dleyna-renderer: drop --- pkgs/by-name/dl/dleyna-renderer/package.nix | 76 --------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 pkgs/by-name/dl/dleyna-renderer/package.nix diff --git a/pkgs/by-name/dl/dleyna-renderer/package.nix b/pkgs/by-name/dl/dleyna-renderer/package.nix deleted file mode 100644 index d4d0adb60244..000000000000 --- a/pkgs/by-name/dl/dleyna-renderer/package.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - meson, - ninja, - pkg-config, - dleyna-connector-dbus, - dleyna-core, - gssdp, - gupnp, - gupnp-av, - gupnp-dlna, - libsoup_2_4, - makeWrapper, - docbook-xsl-nons, - libxslt, -}: - -stdenv.mkDerivation rec { - pname = "dleyna-renderer"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "phako"; - repo = "dleyna-renderer"; - rev = "v${version}"; - sha256 = "sha256-bGasT3XCa7QHV3D7z59TSHoqWksNSIgaO0z9zYfHHuw="; - }; - - patches = [ - # Fix build with meson 1.2. We use the gentoo patch instead of the - # usptream one because the latter only applies on the libsoup_3 based - # merged dLeyna project. - # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 - (fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/2ebe20ff4cda180cc248d31a021107d08ecf39d9/net-libs/dleyna-renderer/files/meson-1.2.0.patch"; - sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - makeWrapper - - # manpage - docbook-xsl-nons - libxslt # for xsltproc - ]; - - buildInputs = [ - dleyna-core - dleyna-connector-dbus # runtime dependency to be picked up to DLEYNA_CONNECTOR_PATH - gssdp - gupnp - gupnp-av - gupnp-dlna - libsoup_2_4 - ]; - - preFixup = '' - wrapProgram "$out/libexec/dleyna-renderer-service" \ - --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH" - ''; - - meta = with lib; { - description = "Library to discover and manipulate Digital Media Renderers"; - homepage = "https://github.com/phako/dleyna-renderer"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 014ea85d99b7..81ff363d4dcd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -502,6 +502,7 @@ mapAliases { diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25 dleyna-core = dleyna; # Added 2025-04-19 dleyna-connector-dbus = dleyna; # Added 2025-04-19 + dleyna-renderer = dleyna; # Added 2025-04-19 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02 From bbba0650329effba9d0f342b0e7daf1fd04c3763 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 19 Apr 2025 21:06:54 +0200 Subject: [PATCH 150/449] dleyna-server: drop --- pkgs/by-name/dl/dleyna-server/package.nix | 70 ----------------------- pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 pkgs/by-name/dl/dleyna-server/package.nix diff --git a/pkgs/by-name/dl/dleyna-server/package.nix b/pkgs/by-name/dl/dleyna-server/package.nix deleted file mode 100644 index 6850d3d8200c..000000000000 --- a/pkgs/by-name/dl/dleyna-server/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchpatch, - meson, - ninja, - makeWrapper, - pkg-config, - dleyna-core, - dleyna-connector-dbus, - gssdp, - gupnp, - gupnp-av, - gupnp-dlna, - libsoup_2_4, -}: - -stdenv.mkDerivation rec { - pname = "dleyna-server"; - version = "0.7.2"; - - src = fetchFromGitHub { - owner = "phako"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-jlF9Lr/NG+Fsy/bB7aLb7xOLqel8GueJK5luo9rsDME="; - }; - - patches = [ - # Fix build with meson 1.2. We use the gentoo patch instead of the - # usptream one because the latter only applies on the libsoup_3 based - # merged dLeyna project. - # https://gitlab.gnome.org/World/dLeyna/-/merge_requests/6 - (fetchpatch { - url = "https://github.com/gentoo/gentoo/raw/2e3a1f4f7a1ef0c3e387389142785d98b5834e60/net-misc/dleyna-server/files/meson-1.2.0.patch"; - sha256 = "sha256-/p2OaPO5ghWtPotwIir2TtcFF5IDFN9FFuyqPHevuFI="; - }) - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - makeWrapper - ]; - - buildInputs = [ - dleyna-core - dleyna-connector-dbus # runtime dependency to be picked up to DLEYNA_CONNECTOR_PATH - gssdp - gupnp - gupnp-av - gupnp-dlna - libsoup_2_4 - ]; - - preFixup = '' - wrapProgram "$out/libexec/dleyna-server-service" \ - --set DLEYNA_CONNECTOR_PATH "$DLEYNA_CONNECTOR_PATH" - ''; - - meta = with lib; { - description = "Library to discover, browse and manipulate Digital Media Servers"; - homepage = "https://github.com/phako/dleyna-server"; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 81ff363d4dcd..4d1a44078c9d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -503,6 +503,7 @@ mapAliases { dleyna-core = dleyna; # Added 2025-04-19 dleyna-connector-dbus = dleyna; # Added 2025-04-19 dleyna-renderer = dleyna; # Added 2025-04-19 + dleyna-server = dleyna; # Added 2025-04-19 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02 From 15660118e124ad038a0ea812a099b007aedbd018 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 19 Apr 2025 21:10:44 +0200 Subject: [PATCH 151/449] grilo-plugins, gnome-photos: don't use dleyna alias --- pkgs/by-name/gn/gnome-photos/package.nix | 4 ++-- pkgs/by-name/gr/grilo-plugins/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gn/gnome-photos/package.nix b/pkgs/by-name/gn/gnome-photos/package.nix index 199fa1f21246..fd7399ee677c 100644 --- a/pkgs/by-name/gn/gnome-photos/package.nix +++ b/pkgs/by-name/gn/gnome-photos/package.nix @@ -6,7 +6,7 @@ babl, dbus, desktop-file-utils, - dleyna-renderer, + dleyna, gdk-pixbuf, gegl, geocode-glib_2, @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { buildInputs = [ babl dbus - dleyna-renderer + dleyna gdk-pixbuf gegl geocode-glib_2 diff --git a/pkgs/by-name/gr/grilo-plugins/package.nix b/pkgs/by-name/gr/grilo-plugins/package.nix index 873886d95041..c2a798d39ec7 100644 --- a/pkgs/by-name/gr/grilo-plugins/package.nix +++ b/pkgs/by-name/gr/grilo-plugins/package.nix @@ -26,7 +26,7 @@ json-glib, avahi, tinysparql, - dleyna-server, + dleyna, itstool, totem-pl-parser, }: @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { avahi libmediaart tinysparql - dleyna-server + dleyna gst_all_1.gstreamer ]; From e3aa1e001782705f922595491a3ce0cc077db5a4 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Sat, 19 Apr 2025 21:21:33 +0200 Subject: [PATCH 152/449] nixos/dleyna-*: unify --- nixos/modules/module-list.nix | 3 +- .../services/desktops/dleyna-renderer.nix | 29 ---------------- .../services/desktops/dleyna-server.nix | 29 ---------------- nixos/modules/services/desktops/dleyna.nix | 33 +++++++++++++++++++ .../services/x11/desktop-managers/budgie.nix | 3 +- .../services/x11/desktop-managers/gnome.nix | 3 +- 6 files changed, 36 insertions(+), 64 deletions(-) delete mode 100644 nixos/modules/services/desktops/dleyna-renderer.nix delete mode 100644 nixos/modules/services/desktops/dleyna-server.nix create mode 100644 nixos/modules/services/desktops/dleyna.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 238f42652849..989cd0cb07b0 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -533,8 +533,7 @@ ./services/desktops/deepin/dde-api.nix ./services/desktops/deepin/app-services.nix ./services/desktops/deepin/dde-daemon.nix - ./services/desktops/dleyna-renderer.nix - ./services/desktops/dleyna-server.nix + ./services/desktops/dleyna.nix ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix diff --git a/nixos/modules/services/desktops/dleyna-renderer.nix b/nixos/modules/services/desktops/dleyna-renderer.nix deleted file mode 100644 index 78375735e6e1..000000000000 --- a/nixos/modules/services/desktops/dleyna-renderer.nix +++ /dev/null @@ -1,29 +0,0 @@ -# dleyna-renderer service. -{ - config, - lib, - pkgs, - ... -}: -{ - ###### interface - options = { - services.dleyna-renderer = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable dleyna-renderer service, a DBus service - for handling DLNA renderers. - ''; - }; - }; - }; - - ###### implementation - config = lib.mkIf config.services.dleyna-renderer.enable { - environment.systemPackages = [ pkgs.dleyna-renderer ]; - - services.dbus.packages = [ pkgs.dleyna-renderer ]; - }; -} diff --git a/nixos/modules/services/desktops/dleyna-server.nix b/nixos/modules/services/desktops/dleyna-server.nix deleted file mode 100644 index e36340405790..000000000000 --- a/nixos/modules/services/desktops/dleyna-server.nix +++ /dev/null @@ -1,29 +0,0 @@ -# dleyna-server service. -{ - config, - lib, - pkgs, - ... -}: -{ - ###### interface - options = { - services.dleyna-server = { - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable dleyna-server service, a DBus service - for handling DLNA servers. - ''; - }; - }; - }; - - ###### implementation - config = lib.mkIf config.services.dleyna-server.enable { - environment.systemPackages = [ pkgs.dleyna-server ]; - - services.dbus.packages = [ pkgs.dleyna-server ]; - }; -} diff --git a/nixos/modules/services/desktops/dleyna.nix b/nixos/modules/services/desktops/dleyna.nix new file mode 100644 index 000000000000..f34e3250067d --- /dev/null +++ b/nixos/modules/services/desktops/dleyna.nix @@ -0,0 +1,33 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + imports = [ + (lib.mkRenamedOptionModule [ "services" "dleyna-server" ] [ "services" "dleyna" ]) + (lib.mkRenamedOptionModule [ "services" "dleyna-renderer" ] [ "services" "dleyna" ]) + ]; + + ###### interface + options = { + services.dleyna = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable dleyna-renderer and dleyna-server service, + a DBus service for handling DLNA servers and renderers. + ''; + }; + }; + }; + + ###### implementation + config = lib.mkIf config.services.dleyna.enable { + environment.systemPackages = [ pkgs.dleyna ]; + + services.dbus.packages = [ pkgs.dleyna ]; + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index e278f2f2f87a..d9c0aee71e06 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -252,8 +252,7 @@ in services.system-config-printer.enable = config.services.printing.enable; # For BCC's Sharing panel. - services.dleyna-renderer.enable = mkDefault true; - services.dleyna-server.enable = mkDefault true; + services.dleyna.enable = mkDefault true; services.gnome.gnome-user-share.enable = mkDefault true; services.gnome.rygel.enable = mkDefault true; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index c3a3465f3a45..cf4fadd742fe 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -282,8 +282,7 @@ in programs.dconf.enable = true; security.polkit.enable = true; services.accounts-daemon.enable = true; - services.dleyna-renderer.enable = mkDefault true; - services.dleyna-server.enable = mkDefault true; + services.dleyna.enable = mkDefault true; services.power-profiles-daemon.enable = mkDefault true; services.gnome.at-spi2-core.enable = true; services.gnome.evolution-data-server.enable = true; From cb25ef82e638a8fc06d29123955adaa23519621a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Apr 2025 09:28:17 -0700 Subject: [PATCH 153/449] python313Packages.unstructured-client: 0.32.3 -> 0.33.0 Diff: https://github.com/Unstructured-IO/unstructured-python-client/compare/refs/tags/v0.32.3...refs/tags/v0.33.0 Changelog: https://github.com/Unstructured-IO/unstructured-python-client/blob/v0.33.0/RELEASES.md --- .../python-modules/unstructured-client/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured-client/default.nix b/pkgs/development/python-modules/unstructured-client/default.nix index 261c343d5c9f..4329ae297996 100644 --- a/pkgs/development/python-modules/unstructured-client/default.nix +++ b/pkgs/development/python-modules/unstructured-client/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "unstructured-client"; - version = "0.32.3"; + version = "0.33.0"; pyproject = true; src = fetchFromGitHub { owner = "Unstructured-IO"; repo = "unstructured-python-client"; tag = "v${version}"; - hash = "sha256-bHiYV86c3ViCLix6vR55GiM8qTv64jj9tD8nF/jMUm4="; + hash = "sha256-leQlBLR4BfirUpjhxSiXIgTm7Di6lh5ic0oELzON+Uw="; }; preBuild = '' @@ -37,6 +37,10 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ + "pydantic" + ]; + dependencies = [ aiofiles cryptography From 91fc051257a62adf1b86ff0c6e8bf431e19db320 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 16:50:02 +0000 Subject: [PATCH 154/449] python312Packages.pox: 0.3.5 -> 0.3.6 --- pkgs/development/python-modules/pox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index 43c30cd6d574..cae070e71203 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pox"; - version = "0.3.5"; + version = "0.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gSDuTJTpUObgSD4FCk8OVgduWQugqa3RlSTCVL0jwtE="; + hash = "sha256-hO7tOWABWaYoBKrPwA41Pt6q5n2MZHzKqrc6bv7T9gU="; }; # Test sare failing the sandbox From 75b3e6fc176659908796ad55257fbc51c96ca1cc Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 01:13:36 +0800 Subject: [PATCH 155/449] debian-devscripts: 2.23.5 -> 2.25.10 --- pkgs/by-name/de/debian-devscripts/package.nix | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix index 2d92cac2eea7..ec27b1091aba 100644 --- a/pkgs/by-name/de/debian-devscripts/package.nix +++ b/pkgs/by-name/de/debian-devscripts/package.nix @@ -27,13 +27,13 @@ let exec ''${EDITOR-${nano}/bin/nano} "$@" ''; in -stdenv.mkDerivation rec { - version = "2.23.5"; +stdenv.mkDerivation (finalAttrs: { pname = "debian-devscripts"; + version = "2.25.10"; src = fetchurl { - url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - hash = "sha256-j0fUVTS/lPKFdgeMhksiJz2+E5koB07IK2uEj55EWG0="; + url = "mirror://debian/pool/main/d/devscripts/devscripts_${finalAttrs.version}.tar.xz"; + hash = "sha256-pEzXrKV/bZbYG7j5QXjRDATZRGLt0fhdpwTDbCoKcus="; }; patches = [ @@ -45,15 +45,19 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace scripts/Makefile --replace /usr/share/dpkg ${dpkg}/share/dpkg - substituteInPlace scripts/debrebuild.pl --replace /usr/bin/perl ${perlPackages.perl}/bin/perl + substituteInPlace scripts/debrebuild.pl \ + --replace-fail "/usr/bin/perl" "${perlPackages.perl}/bin/perl" patchShebangs scripts + # Remove man7 target to avoid missing *.7 file error + substituteInPlace doc/Makefile \ + --replace-fail " install_man7" "" ''; nativeBuildInputs = [ makeWrapper pkg-config ]; + buildInputs = [ xz @@ -121,15 +125,14 @@ stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/${python.sitePackages}" \ --prefix PATH : "${dpkg}/bin" done - ln -s cvs-debi $out/bin/cvs-debc ln -s debchange $out/bin/dch ln -s pts-subscribe $out/bin/pts-unsubscribe ''; - meta = with lib; { + meta = { description = "Debian package maintenance scripts"; - license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO - maintainers = with maintainers; [ raskin ]; - platforms = platforms.unix; + license = lib.licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO + maintainers = with lib.maintainers; [ raskin ]; + platforms = lib.platforms.unix; }; -} +}) From 44b8b62a358008c030b51725b73237c4204c13bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 17:39:51 +0000 Subject: [PATCH 156/449] python312Packages.fake-useragent: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/fake-useragent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fake-useragent/default.nix b/pkgs/development/python-modules/fake-useragent/default.nix index 995dd533f769..4f804ecc1c8d 100644 --- a/pkgs/development/python-modules/fake-useragent/default.nix +++ b/pkgs/development/python-modules/fake-useragent/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "fake-useragent"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fake-useragent"; repo = "fake-useragent"; tag = version; - hash = "sha256-pEZfbFw9JWmR4Zf9AH0mw7zBJVbo6v9iUTU0awHSAt4="; + hash = "sha256-CaFIXcS5y6m9mAfy4fniuA4VPTl6JfFq1WHnlLFz6fA="; }; postPatch = '' From 3e41007cad62c3933ab1f0d338db608fb0832266 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 17:45:11 +0000 Subject: [PATCH 157/449] python312Packages.ariadne: 0.26.1 -> 0.26.2 --- pkgs/development/python-modules/ariadne/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ariadne/default.nix b/pkgs/development/python-modules/ariadne/default.nix index 7bbbf590efd1..ed617ed04164 100644 --- a/pkgs/development/python-modules/ariadne/default.nix +++ b/pkgs/development/python-modules/ariadne/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "ariadne"; - version = "0.26.1"; + version = "0.26.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "mirumee"; repo = "ariadne"; tag = version; - hash = "sha256-37SMBW49sSyaO2JrMtSZzS9wDUWo+otkPYCVrT9+4rY="; + hash = "sha256-zkxRg11O/P7+qU+vdDG3i8Tpn6dXByaGLN9t+e2dhyE="; }; patches = [ ./remove-opentracing.patch ]; From dc8397c07bcab0e8352edfc647494b0bb5010063 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 17 Apr 2025 11:31:58 +0200 Subject: [PATCH 158/449] upgrade nodejs_18 dependents in prevision for upcoming EOL --- nixos/modules/services/web-apps/peertube.nix | 4 ++-- nixos/modules/services/web-apps/wiki-js.nix | 2 +- pkgs/by-name/cl/clever-tools/package.nix | 4 ++-- pkgs/by-name/db/db-rest/package.nix | 4 ++-- pkgs/by-name/pe/peertube/package.nix | 4 ++-- pkgs/by-name/pu/pulsar/update.mjs | 2 +- pkgs/by-name/sl/slskd/package.nix | 4 ++-- pkgs/development/compilers/elm/default.nix | 2 +- .../compilers/elm/packages/node/node-composition.nix | 2 +- pkgs/misc/base16-builder/node-packages.nix | 2 +- pkgs/tools/admin/meshcentral/default.nix | 4 ++-- pkgs/tools/security/onlykey/onlykey.nix | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix index 2fe726e61525..c4b0186a77b4 100644 --- a/nixos/modules/services/web-apps/peertube.nix +++ b/nixos/modules/services/web-apps/peertube.nix @@ -489,7 +489,7 @@ in environment = env; path = with pkgs; [ - nodejs_18 + nodejs_20 yarn ffmpeg-headless openssl @@ -945,7 +945,7 @@ in }) (lib.attrsets.setAttrByPath [ cfg.user "packages" ] - [ peertubeEnv pkgs.nodejs_18 pkgs.yarn pkgs.ffmpeg-headless ] + [ peertubeEnv pkgs.nodejs_20 pkgs.yarn pkgs.ffmpeg-headless ] ) (lib.mkIf cfg.redis.enableUnixSocket { ${config.services.peertube.user}.extraGroups = [ "redis-peertube" ]; diff --git a/nixos/modules/services/web-apps/wiki-js.nix b/nixos/modules/services/web-apps/wiki-js.nix index 4c742c26afad..f313804a6d28 100644 --- a/nixos/modules/services/web-apps/wiki-js.nix +++ b/nixos/modules/services/web-apps/wiki-js.nix @@ -151,7 +151,7 @@ in WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; DynamicUser = true; PrivateTmp = true; - ExecStart = "${pkgs.nodejs_18}/bin/node ${pkgs.wiki-js}/server"; + ExecStart = "${pkgs.nodejs_20}/bin/node ${pkgs.wiki-js}/server"; }; }; }; diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 4c2b76aa1ca3..d88a71de53cf 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, - nodejs_18, + nodejs_20, installShellFiles, makeWrapper, stdenv, @@ -13,7 +13,7 @@ buildNpmPackage rec { version = "3.12.0"; - nodejs = nodejs_18; + nodejs = nodejs_20; src = fetchFromGitHub { owner = "CleverCloud"; diff --git a/pkgs/by-name/db/db-rest/package.nix b/pkgs/by-name/db/db-rest/package.nix index 6aa4e722d169..761170f118ca 100644 --- a/pkgs/by-name/db/db-rest/package.nix +++ b/pkgs/by-name/db/db-rest/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, - nodejs_18, + nodejs, nix-update-script, nixosTests, }: @@ -10,7 +10,7 @@ buildNpmPackage rec { pname = "db-rest"; version = "6.1.0"; - nodejs = nodejs_18; + inherit nodejs; src = fetchFromGitHub { owner = "derhuerst"; diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix index 0f99e03bab15..c80bc03c2ef6 100644 --- a/pkgs/by-name/pe/peertube/package.nix +++ b/pkgs/by-name/pe/peertube/package.nix @@ -10,7 +10,7 @@ fixup-yarn-lock, jq, fd, - nodejs_18, + nodejs_20, which, yarn, }: @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { fd ]; - buildInputs = [ nodejs_18 ]; + buildInputs = [ nodejs_20 ]; buildPhase = '' # Build node modules diff --git a/pkgs/by-name/pu/pulsar/update.mjs b/pkgs/by-name/pu/pulsar/update.mjs index 4da49b268d9a..215092faab02 100755 --- a/pkgs/by-name/pu/pulsar/update.mjs +++ b/pkgs/by-name/pu/pulsar/update.mjs @@ -1,6 +1,6 @@ #!/usr/bin/env nix-shell /* -#!nix-shell -i node -p nodejs_18 +#!nix-shell -i node -p nodejs */ import { promises as fs } from 'node:fs'; diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix index c42b98dad505..a5bc3bedfc3c 100644 --- a/pkgs/by-name/sl/slskd/package.nix +++ b/pkgs/by-name/sl/slskd/package.nix @@ -6,14 +6,14 @@ fetchFromGitHub, fetchNpmDeps, mono, - nodejs_18, + nodejs_20, slskd, testers, nix-update-script, }: let - nodejs = nodejs_18; + nodejs = nodejs_20; # https://github.com/NixOS/nixpkgs/blob/d88947e91716390bdbefccdf16f7bebcc41436eb/pkgs/build-support/node/build-npm-package/default.nix#L62 npmHooks = buildPackages.npmHooks.override { inherit nodejs; }; in diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index ae6c36d6bbb8..b27527246372 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -2,7 +2,7 @@ pkgs, lib, makeWrapper, - nodejs ? pkgs.nodejs_18, + nodejs ? pkgs.nodejs_20, }: let diff --git a/pkgs/development/compilers/elm/packages/node/node-composition.nix b/pkgs/development/compilers/elm/packages/node/node-composition.nix index e095e45b97db..a32e52788e8b 100644 --- a/pkgs/development/compilers/elm/packages/node/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node/node-composition.nix @@ -5,7 +5,7 @@ inherit system; }, system ? builtins.currentSystem, - nodejs ? pkgs."nodejs_18", + nodejs ? pkgs."nodejs_20", }: let diff --git a/pkgs/misc/base16-builder/node-packages.nix b/pkgs/misc/base16-builder/node-packages.nix index 1d9923295c8b..5c07f7cffc9e 100644 --- a/pkgs/misc/base16-builder/node-packages.nix +++ b/pkgs/misc/base16-builder/node-packages.nix @@ -5,7 +5,7 @@ inherit system; }, system ? builtins.currentSystem, - nodejs ? pkgs."nodejs_18", + nodejs ? pkgs."nodejs_20", }: let diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix index 97fb348219b4..f9eca2fc6a75 100644 --- a/pkgs/tools/admin/meshcentral/default.nix +++ b/pkgs/tools/admin/meshcentral/default.nix @@ -3,7 +3,7 @@ fetchzip, fetchYarnDeps, yarn2nix-moretea, - nodejs_18, + nodejs_20, dos2unix, }: @@ -37,7 +37,7 @@ yarn2nix-moretea.mkYarnPackage { preFixup = '' mkdir -p $out/bin chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js - sed -i '1i#!${nodejs_18}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js + sed -i '1i#!${nodejs_20}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral ''; diff --git a/pkgs/tools/security/onlykey/onlykey.nix b/pkgs/tools/security/onlykey/onlykey.nix index 1814e4887f8c..c0c0d8eaead8 100644 --- a/pkgs/tools/security/onlykey/onlykey.nix +++ b/pkgs/tools/security/onlykey/onlykey.nix @@ -5,7 +5,7 @@ inherit system; }, system ? builtins.currentSystem, - nodejs ? pkgs.nodejs_18, + nodejs ? pkgs.nodejs_20, }: let From fed7916bfd7c52a988100d23aecdf992df33b8cf Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 02:01:20 +0800 Subject: [PATCH 159/449] devcontainer: 0.72.0 -> 0.75.0 Diff: https://github.com/devcontainers/cli/compare/refs/tags/v0.72.0...refs/tags/v0.75.0 --- pkgs/by-name/de/devcontainer/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index d852ff4e50c8..c944fb162903 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -11,6 +11,7 @@ docker, yarn, docker-compose, + nix-update-script, }: let @@ -18,18 +19,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.72.0"; + version = "0.75.0"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-3rSWD6uxwcMQdHBSmmAQ0aevqevVXINigCj06jjEcRc="; + hash = "sha256-mzS5ejiD8HuvcD6aHIgbRU1pi43P8AiuDLaIlwpGllE="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-KSVr6RlBEeDAo8D+7laTN+pSH8Ukl6WTpeAULuG2fq8="; + hash = "sha256-ix9rixdrvt6hYtx4QTvsg3fm2uz3MvZxFZQfKkTDWc8="; }; nativeBuildInputs = [ @@ -81,6 +82,8 @@ stdenv.mkDerivation (finalAttrs: { } ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Dev container CLI, run and manage your dev environments via a devcontainer.json"; homepage = "https://containers.dev/"; From 2c0b7205acf968ab3cba766ac6143c554a254ea1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 18:07:18 +0000 Subject: [PATCH 160/449] python312Packages.pyixapi: 0.2.5 -> 0.2.6 --- pkgs/development/python-modules/pyixapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyixapi/default.nix b/pkgs/development/python-modules/pyixapi/default.nix index 7a4fdd39b5e6..4334f451ac59 100644 --- a/pkgs/development/python-modules/pyixapi/default.nix +++ b/pkgs/development/python-modules/pyixapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyixapi"; - version = "0.2.5"; + version = "0.2.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "peering-manager"; repo = "pyixapi"; tag = version; - hash = "sha256-jzRdseBaNOr3Dozp15/s3ZGTcwqmCBHqdGZmP3dtdsE="; + hash = "sha256-NS8rVzLpEtpuLal6sApXI3hjASiIeXZuZ4xyj9Zv1k0="; }; pythonRelaxDeps = [ "pyjwt" ]; From 4bc3397ceb9f6026839383b3fca98f9d3a7ef7a1 Mon Sep 17 00:00:00 2001 From: GueLaKais Date: Tue, 15 Apr 2025 10:32:42 +0200 Subject: [PATCH 161/449] cargo-ament-build: init at 0.1.9 --- pkgs/by-name/ca/cargo-ament-build/Cargo.lock | 122 ++++++++++++++++++ pkgs/by-name/ca/cargo-ament-build/package.nix | 36 ++++++ 2 files changed, 158 insertions(+) create mode 100644 pkgs/by-name/ca/cargo-ament-build/Cargo.lock create mode 100644 pkgs/by-name/ca/cargo-ament-build/package.nix diff --git a/pkgs/by-name/ca/cargo-ament-build/Cargo.lock b/pkgs/by-name/ca/cargo-ament-build/Cargo.lock new file mode 100644 index 000000000000..741bf0371325 --- /dev/null +++ b/pkgs/by-name/ca/cargo-ament-build/Cargo.lock @@ -0,0 +1,122 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "anyhow" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + +[[package]] +name = "autocfg" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + +[[package]] +name = "cargo-ament-build" +version = "0.1.9" +dependencies = [ + "anyhow", + "cargo-manifest", + "pico-args", +] + +[[package]] +name = "cargo-manifest" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf5acda331466fdea759172dbc2fb9e650e382dbca6a8dd3f576d9aeeac76da6" +dependencies = [ + "serde", + "serde_derive", + "toml", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "pico-args" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8bcd96cb740d03149cbad5518db9fd87126a10ab519c011893b1754134c468" + +[[package]] +name = "proc-macro2" +version = "1.0.94" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "serde" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.219" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "2.0.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "indexmap", + "serde", +] + +[[package]] +name = "unicode-ident" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" diff --git a/pkgs/by-name/ca/cargo-ament-build/package.nix b/pkgs/by-name/ca/cargo-ament-build/package.nix new file mode 100644 index 000000000000..d453f34dba96 --- /dev/null +++ b/pkgs/by-name/ca/cargo-ament-build/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cargo-ament-build"; + version = "0.1.9"; + + src = fetchFromGitHub { + owner = "ros2-rust"; + repo = "cargo-ament-build"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5D0eB3GCQLgVYuYkHMTkboruiYSAaWy3qZjF/hVpRP0="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = [ pkg-config ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cargo plugin for use with colcon workspaces"; + homepage = "https://github.com/ros2-rust/cargo-ament-build"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ guelakais ]; + }; +}) From bb1493df21f143ab3639160617fb8ff370ddb7e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 18:33:21 +0000 Subject: [PATCH 162/449] argocd: 2.14.9 -> 2.14.10 --- pkgs/by-name/ar/argocd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 93555ff00f00..bbc228e6f17d 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.14.9"; + version = "2.14.10"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-L8ipYgMpL6IhPh/fSanNywzUMDJQfMZc7pyYr2dtbAw="; + hash = "sha256-Z+xSA0LrvXHHmNg7+i53Y1mSYnLYURZUglXRKvkld14="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-j+uwLG9/r9dlK9JWrQmJdgBOqgZs/aIvkh1Sg81dm1I="; + vendorHash = "sha256-Xm9J08pxzm3fPQjMA6NDu+DPJGsvtUvj+n/qrOZ9BE4="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 From f0adba20a0be50463dadf71a5e4f4b62c73b71ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 21 Apr 2025 09:32:24 -0700 Subject: [PATCH 163/449] python312Packages.qcs-sdk-python: 0.21.12 -> 0.21.18 Diff: https://github.com/rigetti/qcs-sdk-rust/compare/refs/tags/python/v0.21.12...refs/tags/python/v0.21.18 Changelog: https://github.com/rigetti/qcs-sdk-rust/blob/python/v0.21.18/crates/python/CHANGELOG.md --- .../development/python-modules/qcs-sdk-python/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix index 1dba755dab02..ba6a6a2a397e 100644 --- a/pkgs/development/python-modules/qcs-sdk-python/default.nix +++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix @@ -18,19 +18,19 @@ buildPythonPackage rec { pname = "qcs-sdk-python"; - version = "0.21.12"; + version = "0.21.18"; pyproject = true; src = fetchFromGitHub { owner = "rigetti"; repo = "qcs-sdk-rust"; tag = "python/v${version}"; - hash = "sha256-5tabdxMvYW0g2k48MTAm15+o/OI7yFyL19xirUBN7D4="; + hash = "sha256-uN9SQnQR5y4gyJeQI5H04hT1OL1ZQBwCdz8GkNMMTLY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-YOBI0q7OsjFhoQUO2K4Q3CprcxHgJbTmg+klXj41p0o="; + hash = "sha256-PqQMG8RKF8Koz796AeoG/X9SeL1TruwOVPqwfKuq984="; }; buildAndTestSubdir = "crates/python"; @@ -71,6 +71,8 @@ buildPythonPackage rec { "test_get_report" "test_get_version_info" "test_list_quantum_processors_timeout" + "test_quilc_tracing" + "test_qvm_tracing" ]; meta = { From 8053b36ae97301de0f2dd9ab98c358d9ac45ef63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 18:57:13 +0000 Subject: [PATCH 164/449] starboard: 0.15.24 -> 0.15.25 --- pkgs/by-name/st/starboard/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix index a69598c32c5f..a14786838b63 100644 --- a/pkgs/by-name/st/starboard/package.nix +++ b/pkgs/by-name/st/starboard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.24"; + version = "0.15.25"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-GZ+KOnQV/eXPt1QGaqWj4JAlPNhNKpVn7rlC7W4zfDo="; + hash = "sha256-mCYnJ1SFa3OuYQlPWTq9vWV9s/jtaQ6dOousV/UNR18="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-5TeiEGu5B+5uNnkxdBlPqLu/g9FZ4VWrbZFfp/JsJiA="; + vendorHash = "sha256-qujObGBxUFGxtrdlJmTOTW6HUbDCjNSElPqhQfYqId4="; nativeBuildInputs = [ installShellFiles ]; From 4b526fb40f1787730a4a29e917966b729e8644ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 20:18:20 +0000 Subject: [PATCH 165/449] pscale: 0.239.0 -> 0.241.0 --- pkgs/by-name/ps/pscale/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index bf234bc22bda..174a3b39f63a 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.239.0"; + version = "0.241.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-y7SIZ/upQrzHQbncEyJM5OrJDXDuh7It3lOWSn3Y7hI="; + sha256 = "sha256-he9LLC8ijbgfmTDVURKZhU5RyOJC8U4vjPQBNNtC9WI="; }; - vendorHash = "sha256-qcv5pFCibYSJvekSmj4iLeQWunW9+U/mbzbaGTp1sso="; + vendorHash = "sha256-Gt2dDgIAn7Hjlb2VI5VBKP7IfzkMZvCyLmOYYBtLx3o="; ldflags = [ "-s" From 286a57ef463deb7228d087329cb134c188f510ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 20:27:06 +0000 Subject: [PATCH 166/449] decktape: 3.14.0 -> 3.15.0 --- pkgs/by-name/de/decktape/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/decktape/package.nix b/pkgs/by-name/de/decktape/package.nix index 7f5a1bf304e0..6ab216c334fd 100644 --- a/pkgs/by-name/de/decktape/package.nix +++ b/pkgs/by-name/de/decktape/package.nix @@ -6,16 +6,16 @@ }: buildNpmPackage rec { name = "decktape"; - version = "3.14.0"; + version = "3.15.0"; src = fetchFromGitHub { owner = "astefanutti"; repo = "decktape"; rev = "v${version}"; - hash = "sha256-V7JoYtwP7iQYFi/WhFpkELs7mNKF6CqrMyjWhxLkcTA="; + hash = "sha256-SsdjqkMEVD0pVgIZ9Upmrz/1KOWcb1KUy/v/xTCVGc0="; }; - npmDepsHash = "sha256-rahrIhB0GhqvzN2Vu6137Cywr19aQ70gVbNSSYzFD+s="; + npmDepsHash = "sha256-Z5fLGMvxVhM8nW81PQ5ZFPHK6m2uoYUv0A4XsTa3Z2Y="; npmPackFlags = [ "--ignore-scripts" ]; dontNpmBuild = true; From 3d7677af30dc9723ac01983b39d6b7671587148f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 20:44:57 +0000 Subject: [PATCH 167/449] python312Packages.crytic-compile: 0.3.8 -> 0.3.9 --- pkgs/development/python-modules/crytic-compile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index 6c75fea19b11..27001926b1ea 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "crytic-compile"; - version = "0.3.8"; + version = "0.3.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "crytic"; repo = "crytic-compile"; tag = version; - hash = "sha256-7hmak2tqyhBxIv6zEySuxxCAQoeJJRsKMjb1t196s7w="; + hash = "sha256-oXmjncNblC0r+qL39G5s9EXGKQZKIYBHwrJaSaLEkyc="; }; propagatedBuildInputs = [ From d3f77f6148fde269aeb8fb5c817f8a18207243b3 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Mon, 21 Apr 2025 23:18:31 +0200 Subject: [PATCH 168/449] dolphin-emu: 2503 -> 2503a Diff: https://github.com/dolphin-emu/dolphin/compare/refs/tags/2503...refs/tags/2503a --- pkgs/by-name/do/dolphin-emu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix index c22d4afd73d5..3b945d1a564d 100644 --- a/pkgs/by-name/do/dolphin-emu/package.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -53,14 +53,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "2503"; + version = "2503a"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-oqJKXFcsFgoYjUqdk3Z/CIFhOa8w0drcF4JwtHRI1Hs="; + hash = "sha256-vhXiEgJO8sEv937Ed87LaS7289PLZlxQGFTZGFjs1So="; }; strictDeps = true; From 9688081d5e88d093809f76b2408ba0e955f28600 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 22:13:15 +0000 Subject: [PATCH 169/449] librewolf-bin-unwrapped: 136.0.4-1 -> 137.0.2-1 --- pkgs/by-name/li/librewolf-bin-unwrapped/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix index 186397adb882..0ae94f0aa78f 100644 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -37,7 +37,7 @@ let pname = "librewolf-bin-unwrapped"; - version = "136.0.4-1"; + version = "137.0.2-1"; in stdenv.mkDerivation { @@ -47,9 +47,9 @@ stdenv.mkDerivation { url = "https://gitlab.com/api/v4/projects/44042130/packages/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; hash = { - i686-linux = "sha256-olqGXteeHqT456SEMEHjPWcnypABGZbFvlpWKBF962Y="; - x86_64-linux = "sha256-3zcI1ND+laXFAv7nDlUEDjM007XHglnMYyFkd1n+sR8="; - aarch64-linux = "sha256-9OwVuKsTJZ7js846BZSzXiyz53d0ebXwugXyrmnFFQc="; + i686-linux = "sha256-IhMtmemkgAGZgIn+KbETv4KYFETCkloM4VjTrBSqvLk="; + x86_64-linux = "sha256-Y11p3GMwxw8eJzH7uYjMQ7inmfiXPiQZcq/QfJtU/1g="; + aarch64-linux = "sha256-nQqYlZ8WeLYVmFx36uzhuXkqUUSDDCD9nHVICwA2/+g="; } .${stdenv.hostPlatform.system} or throwSystem; }; From 48fe1f7ed926e169fb64fd02d3ab3a3e20df2302 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 06:33:17 +0800 Subject: [PATCH 170/449] eprover: 3.1 -> 3.2 --- .../science/logic/eprover/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 02ab02728be5..d8685390bc1d 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -6,13 +6,13 @@ enableHO ? false, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "eprover"; - version = "3.1"; + version = "3.2"; src = fetchurl { - url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; - hash = "sha256-+E2z7JAkiNXhZrWRXFbhI5f9NmB0Q4eixab4GlAFqYY="; + url = "https://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${finalAttrs.version}/E.tgz"; + hash = "sha256-B0yOX8MGJHY0HOeQ/RWtgATTIta2YnhEvSdoqIML1K4="; }; buildInputs = [ which ]; @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's/ *CC *= *gcc$//' -i Makefile.vars ''; + configureFlags = [ "--exec-prefix=$(out)" @@ -29,13 +30,13 @@ stdenv.mkDerivation rec { "--enable-ho" ]; - meta = with lib; { + meta = { description = "Automated theorem prover for full first-order logic with equality"; homepage = "http://www.eprover.org/"; - license = licenses.gpl2; - maintainers = with maintainers; [ + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ raskin ]; - platforms = platforms.all; + platforms = lib.platforms.all; }; -} +}) From bf1e68a59b21d4aa7324262c12be9f8b4c381f58 Mon Sep 17 00:00:00 2001 From: Oughie <123173954+Oughie@users.noreply.github.com> Date: Tue, 22 Apr 2025 00:40:41 +0200 Subject: [PATCH 171/449] clock-rs: 0.1.214 -> 0.1.215 --- pkgs/by-name/cl/clock-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clock-rs/package.nix b/pkgs/by-name/cl/clock-rs/package.nix index dc657cba17c9..b6047daa75d7 100644 --- a/pkgs/by-name/cl/clock-rs/package.nix +++ b/pkgs/by-name/cl/clock-rs/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "clock-rs"; - version = "0.1.214"; + version = "0.1.215"; src = fetchFromGitHub { owner = "Oughie"; repo = "clock-rs"; tag = "v${version}"; - sha256 = "sha256-D0Wywl20TFIy8aQ9UkcI6T+5huyRuCCPc+jTeXsZd8g="; + sha256 = "sha256-uDEvJqaaBNRxohYqHE6qfqUF07ynRvGwJKWbYfgPEvg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-W4m4JffqNwebGWYNsMF6U0bDroqXJAixmcmqcqYjyzw="; + cargoHash = "sha256-Zry6mkOUdEgC95Y3U3RCXPJUsmaSoRPlHvUThI92GQU="; meta = { description = "Modern, digital clock that effortlessly runs in your terminal"; From f022060276aea4e1d77332648de8c85128a12b54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 22:57:31 +0000 Subject: [PATCH 172/449] python312Packages.mediapy: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/mediapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mediapy/default.nix b/pkgs/development/python-modules/mediapy/default.nix index 971fc02dda00..529f021ded34 100644 --- a/pkgs/development/python-modules/mediapy/default.nix +++ b/pkgs/development/python-modules/mediapy/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mediapy"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-QtmhqpPBg1ULgk27Tw3l2mGqXITbjwHwY6zR8juQ7wo="; + hash = "sha256-vDt5wXZ6OsCSbzShm+Ms9jhD5h3bMvBeMXOxmL65s7I="; }; nativeBuildInputs = [ flit-core ]; From 3c9c8d7c9f3b114846fbdf169c948f69c36f1779 Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Sat, 19 Apr 2025 15:39:52 +0200 Subject: [PATCH 173/449] sld3-image: add option to disable stb --- pkgs/by-name/sd/sdl3-image/package.nix | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index cf9a89d5a125..7e3f265631c6 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -9,8 +9,11 @@ cmake, fetchFromGitHub, validatePkgConfig, + libpng, + libjpeg, # Boolean flags enableTests ? true, + enableSTB ? true, enableImageIO ? stdenv.hostPlatform.isDarwin, }: @@ -39,18 +42,26 @@ stdenv.mkDerivation (finalAttrs: { validatePkgConfig ]; - buildInputs = [ - sdl3 - libtiff - libwebp - libavif - ] ++ (lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation); + buildInputs = + [ + sdl3 + libtiff + libwebp + libavif + ] + ++ (lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation) + ++ (lib.optionals (!enableSTB) [ + libpng + libjpeg + ]); cmakeFlags = [ # fail when a dependency could not be found (lib.cmakeBool "SDLIMAGE_STRICT" true) # disable shared dependencies as they're opened at runtime using SDL_LoadObject otherwise. (lib.cmakeBool "SDLIMAGE_DEPS_SHARED" false) + # disable stbi + (lib.cmakeBool "SDLIMAGE_BACKEND_STB" enableSTB) # enable imageio backend (lib.cmakeBool "SDLIMAGE_BACKEND_IMAGEIO" enableImageIO) # enable tests From 179580b3338cde77585aa4ab041662dd6aa58908 Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Sun, 20 Apr 2025 17:21:53 +0200 Subject: [PATCH 174/449] sdl3-image: remove usage of apple_sdk --- pkgs/by-name/sd/sdl3-image/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index 7e3f265631c6..f2b7cfd054c9 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -1,7 +1,6 @@ { lib, sdl3, - darwin, libavif, libtiff, libwebp, @@ -49,7 +48,6 @@ stdenv.mkDerivation (finalAttrs: { libwebp libavif ] - ++ (lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation) ++ (lib.optionals (!enableSTB) [ libpng libjpeg From 3911159486aa5b00d214232a36c6a2cd24f3b9a2 Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Mon, 21 Apr 2025 00:38:37 +0200 Subject: [PATCH 175/449] sdl3-image: remove uses of 'with' --- pkgs/by-name/sd/sdl3-image/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index f2b7cfd054c9..eb50102c9641 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { description = "SDL image library"; homepage = "https://github.com/libsdl-org/SDL_image"; license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ evythedemon ]; + maintainers = [ lib.maintainers.evythedemon ]; inherit (sdl3.meta) platforms; }; }) From c705d86bbc578c593717c8db14f5227f427e988e Mon Sep 17 00:00:00 2001 From: Evy Garden Date: Mon, 21 Apr 2025 00:54:13 +0200 Subject: [PATCH 176/449] sdl3-image: add updateScript --- pkgs/by-name/sd/sdl3-image/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/sd/sdl3-image/package.nix b/pkgs/by-name/sd/sdl3-image/package.nix index eb50102c9641..70754f72b4d0 100644 --- a/pkgs/by-name/sd/sdl3-image/package.nix +++ b/pkgs/by-name/sd/sdl3-image/package.nix @@ -10,6 +10,7 @@ validatePkgConfig, libpng, libjpeg, + nix-update-script, # Boolean flags enableTests ? true, enableSTB ? true, @@ -66,6 +67,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "SDLIMAGE_TESTS" enableTests) ]; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "release-(3\\..*)" + ]; + }; + meta = { description = "SDL image library"; homepage = "https://github.com/libsdl-org/SDL_image"; From ded005e7ec1e7f8c3eb74c0db29d7703f03e5925 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 21 Apr 2025 23:21:25 +0000 Subject: [PATCH 177/449] python312Packages.azure-mgmt-storage: 22.1.1 -> 22.2.0 --- .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 08f619139a57..e13baadc1fbf 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-storage"; - version = "22.1.1"; + version = "22.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_storage"; inherit version; - hash = "sha256-JaqlroxAww4vkfiq5vUpBrBVfpR9XBuYF9T/nezBE0A="; + hash = "sha256-f+1DPSROJ20G3fNPn6e5uHE08IX8Y0YBr1tn8qAITYY="; }; build-system = [ setuptools ]; From 27cd60c8f78c83fec73d7740bd8da2113e04a1f6 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 07:50:17 +0800 Subject: [PATCH 178/449] firebase-tools: 14.1.0 -> 14.2.0 Diff: https://github.com/firebase/firebase-tools/compare/refs/tags/v14.1.0...refs/tags/v14.2.0 Changelog: https://github.com/firebase/firebase-tools/blob/v14.2.0/CHANGELOG.md --- pkgs/by-name/fi/firebase-tools/package.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 076779c9dfb0..594265c13c2c 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -7,18 +7,19 @@ xcbuild, nix-update-script, }: + buildNpmPackage rec { pname = "firebase-tools"; - version = "14.1.0"; + version = "14.2.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-7yxDBK3A2Yosp/83JmFpV3cm+YEDxHMLVj5B+rwSIR8="; + hash = "sha256-ga0UsU/VTDIoz88XxdQIGX+md1G21DgctYYmXPr3zbQ="; }; - npmDepsHash = "sha256-r6vonG5edL/nTtyj8uXc/4w2xgihRce/Md+umxomTzo="; + npmDepsHash = "sha256-XiOLtZCm3qxd2Oq3vqMzxU64y37ZZfhivvkxT6m7ES4="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json @@ -32,9 +33,7 @@ buildNpmPackage rec { xcbuild ]; - env = { - PUPPETEER_SKIP_DOWNLOAD = true; - }; + env.PUPPETEER_SKIP_DOWNLOAD = true; passthru.updateScript = nix-update-script { }; From 1ccde7823f3600dd7a0f9e68294a125dd3d6ab75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 00:22:59 +0000 Subject: [PATCH 179/449] ov: 0.39.0 -> 0.40.1 --- pkgs/by-name/ov/ov/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix index cbdfb0f79d5e..b00edf98b157 100644 --- a/pkgs/by-name/ov/ov/package.nix +++ b/pkgs/by-name/ov/ov/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "ov"; - version = "0.39.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; tag = "v${version}"; - hash = "sha256-fjFQM1+K+ZOPqwDgqQAK43NqXTpH8CoLv95IhDDkJmA="; + hash = "sha256-IlLYEk9PZ5Mgi7opS6QnkmGdnaC47t6YJtoOTCzNdbg="; }; - vendorHash = "sha256-OJ3ZsDI0g6mOtt7vpyze52/kH9RS8dSJ3432fB6w7/k="; + vendorHash = "sha256-51jbTtCGOcEyI/FZOKi/vIoaN1i7IZ8Gzk9bcMa344g="; ldflags = [ "-s" From 9091c676be7af08c70770282f0a03fbffbbf7926 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 00:26:12 +0000 Subject: [PATCH 180/449] openttd-jgrpp: 0.64.2 -> 0.65.1 --- pkgs/games/openttd/jgrpp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index f30e5677468f..18485da14464 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -7,13 +7,13 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.64.2"; + version = "0.65.1"; src = fetchFromGitHub { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - hash = "sha256-xZuby/brO7JX937w/jK+/bKTJHt2SK1GaG9bM6XqeiU="; + hash = "sha256-nS9yUcCwRkzmC9vIjQvPaRDcdPvHt4Nzt0cyfUX+XTY="; }; patches = [ ]; From 6691b6673362255ed578443702fbf80bb394f129 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 22 Apr 2025 02:28:43 +0200 Subject: [PATCH 181/449] python313Packages.reflex: 0.7.7 -> 0.7.8 Changelog: https://github.com/reflex-dev/reflex/releases/tag/v0.7.8 --- pkgs/development/python-modules/reflex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 165d18dc770f..346630fcb367 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "reflex"; - version = "0.7.7"; + version = "0.7.8"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; tag = "v${version}"; - hash = "sha256-27sgU9ugSkStDOg64W1RgiqmlbOzrdxg7kz2AztfERA="; + hash = "sha256-/Kf1V1goGaoYarhJ9wlZ2lf6e3BUH/F7UJqoPEnMnk0="; }; # 'rich' is also somehow checked when building the wheel, From 226de203a67376528449761ba0912dbc47ee35e0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 22 Apr 2025 02:40:25 +0200 Subject: [PATCH 182/449] normcap: unbreak by relaxing jeepney --- pkgs/by-name/no/normcap/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/no/normcap/package.nix b/pkgs/by-name/no/normcap/package.nix index 29d8664ea2ce..c4c17deb190e 100644 --- a/pkgs/by-name/no/normcap/package.nix +++ b/pkgs/by-name/no/normcap/package.nix @@ -47,6 +47,7 @@ ps.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "jeepney" "shiboken6" ]; From 951bc0c0e2a49bc4529fbd29527eac3ffd9cd0b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 00:40:56 +0000 Subject: [PATCH 183/449] elfcat: 0.1.9 -> 0.1.10 --- pkgs/by-name/el/elfcat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix index b0c5dc1265e4..f82b051828f6 100644 --- a/pkgs/by-name/el/elfcat/package.nix +++ b/pkgs/by-name/el/elfcat/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "ruslashev"; repo = "elfcat"; rev = version; - sha256 = "sha256-lmoOwxRGXcInoFb2YDawLKaebkcUftzpPZ1iTXbl++c="; + sha256 = "sha256-8jyOYV455APlf8F6HmgyvgfNGddMzrcGhj7yFQT6qvg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3rqxST7dcp/2+B7DiY92C75P0vQyN2KY3DigBEZ1W1w="; + cargoHash = "sha256-oVl+40QunvKZIbhsOgqNTsvWduCXP/QJ0amT8ECSsMU="; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries"; From 1ed1a52d1fb5d29b9c45ff3f66280f72adc7d1e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 00:45:15 +0000 Subject: [PATCH 184/449] rke: 1.8.1 -> 1.8.2 --- pkgs/by-name/rk/rke/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix index 0994d8527043..d5376c7263ab 100644 --- a/pkgs/by-name/rk/rke/package.nix +++ b/pkgs/by-name/rk/rke/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rke"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-mTSeUFmkXI9yZ1yeBXzudf2BmLtdmoiTlB/wtn++NAo="; + hash = "sha256-/n6XGpwlGaaDDA5fJgCfDGr5GdaF3Qf5BS7fBdJmVYw="; }; - vendorHash = "sha256-5+BjXPh52RNoaU/ABpvgbAO+mKcW4Hg2SRxRhV9etIo="; + vendorHash = "sha256-OWC8OZhORHwntAR2YHd4KfQgB2Wtma6ayBWfY94uOA4="; subPackages = [ "." ]; From 0b90826d7063b7f8ebeccbe9487398e286b28b73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 01:10:29 +0000 Subject: [PATCH 185/449] go-chromecast: 0.3.3 -> 0.3.4 --- pkgs/by-name/go/go-chromecast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-chromecast/package.nix b/pkgs/by-name/go/go-chromecast/package.nix index 1fa05bc3e503..64de2292f07e 100644 --- a/pkgs/by-name/go/go-chromecast/package.nix +++ b/pkgs/by-name/go/go-chromecast/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "go-chromecast"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "vishen"; repo = "go-chromecast"; tag = "v${version}"; - hash = "sha256-6I10UZ7imH1R78L2uM/697PskPYjhKSiPHoMM7EFElU="; + hash = "sha256-FFe87Z0aiNP5aGAiJ2WJkKRAMCQGWEBB0gLDGBpE3fk="; }; - vendorHash = "sha256-cu8PuZLkWLatU46VieaeoV5oyejyjR0uVUMVzOrheLM="; + vendorHash = "sha256-MOC9Yqo5p02eZLFJYBE8CxHxZv3RcpqV2sEPZOWiDeE="; env.CGO_ENABLED = 0; From 547813ca4c118818947eccbb63be2506b5bbcdfd Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 16 Mar 2025 16:08:08 +0100 Subject: [PATCH 186/449] netdata: 1.47.5 -> 2.4.0 --- nixos/tests/netdata.nix | 27 ++-- .../system/netdata/dashboard-v2-removal.patch | 25 ---- .../system/netdata/dashboard-v3-add.patch | 35 +++++ pkgs/tools/system/netdata/default.nix | 136 ++++++++++-------- .../system/netdata/ndsudo-fix-path.patch | 6 +- .../netdata/use-local-libbacktrace.patch | 34 +++++ pkgs/top-level/all-packages.nix | 1 - 7 files changed, 154 insertions(+), 110 deletions(-) delete mode 100644 pkgs/tools/system/netdata/dashboard-v2-removal.patch create mode 100644 pkgs/tools/system/netdata/dashboard-v3-add.patch create mode 100644 pkgs/tools/system/netdata/use-local-libbacktrace.patch diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index a88bf1a77fa1..97a033f831a1 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -22,6 +22,7 @@ import ./make-test-python.nix ( ]; services.netdata = { enable = true; + package = pkgs.netdataCloud; python.recommendedPythonPackages = true; configDir."apps_groups.conf" = pkgs.writeText "apps_groups.conf" '' @@ -32,35 +33,25 @@ import ./make-test-python.nix ( }; testScript = '' - start_all() + start_all() - netdata.wait_for_unit("netdata.service") + netdata.wait_for_unit("netdata.service") - # wait for the service to listen before sending a request - netdata.wait_for_open_port(19999) + # wait for the service to listen before sending a request + netdata.wait_for_open_port(19999) # check if the netdata main page loads. - netdata.succeed("curl --fail http://localhost:19999/") + netdata.succeed("curl --fail http://127.0.0.1:19999") netdata.succeed("sleep 4") - # check if netdata can read disk ops for root owned processes. - # if > 0, successful. verifies both netdata working and - # apps.plugin has elevated capabilities. - url = "http://localhost:19999/api/v1/data?chart=user.root_disk_physical_io" - filter = '[.data[range(10)][2]] | add | . < 0' + # check if netdata api shows correct os + url = "http://127.0.0.1:19999/api/v3/info" + filter = '.agents[0].application.os.os | . == "NixOS"' cmd = f"curl -s {url} | jq -e '{filter}'" netdata.wait_until_succeeds(cmd) # check if the control socket is available netdata.succeed("sudo netdatacli ping") - - # check that custom groups in apps_groups.conf are used. - # if > 0, successful. verifies that user-specified apps_group.conf - # is used. - url = "http://localhost:19999/api/v1/data?chart=app.netdata_test_cpu_utilization" - filter = '[.data[range(10)][2]] | add | . > 0' - cmd = f"curl -s {url} | jq -e '{filter}'" - netdata.wait_until_succeeds(cmd, timeout=30) ''; } ) diff --git a/pkgs/tools/system/netdata/dashboard-v2-removal.patch b/pkgs/tools/system/netdata/dashboard-v2-removal.patch deleted file mode 100644 index 5eb7ef62eeb0..000000000000 --- a/pkgs/tools/system/netdata/dashboard-v2-removal.patch +++ /dev/null @@ -1,25 +0,0 @@ -# Original: https://github.com/netdata/netdata/pull/17240 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f37cbd18a..6db4c9f52 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -134,6 +134,7 @@ mark_as_advanced(DEFAULT_FEATURE_STATE) - # High-level features - option(ENABLE_ACLK "Enable Netdata Cloud support (ACLK)" ${DEFAULT_FEATURE_STATE}) - option(ENABLE_CLOUD "Enable Netdata Cloud by default at runtime" ${DEFAULT_FEATURE_STATE}) -+option(ENABLE_DASHBOARD_V2 "enable dashboard v2" True) - option(ENABLE_ML "Enable machine learning features" ${DEFAULT_FEATURE_STATE}) - option(ENABLE_DBENGINE "Enable dbengine metrics storage" True) - -@@ -2946,7 +2947,9 @@ endif() - # - - include(src/web/gui/v1/dashboard_v1.cmake) --include(src/web/gui/v2/dashboard_v2.cmake) -+if(ENABLE_DASHBOARD_V2) -+ include(src/web/gui/v2/dashboard_v2.cmake) -+endif() - include(src/web/gui/gui.cmake) - - function(cat IN_FILE OUT_FILE) \ No newline at end of file diff --git a/pkgs/tools/system/netdata/dashboard-v3-add.patch b/pkgs/tools/system/netdata/dashboard-v3-add.patch new file mode 100644 index 000000000000..a5d3dd17484b --- /dev/null +++ b/pkgs/tools/system/netdata/dashboard-v3-add.patch @@ -0,0 +1,35 @@ +diff --git a/packaging/cmake/Modules/NetdataDashboard.cmake b/packaging/cmake/Modules/NetdataDashboard.cmake +index 098eaffcf..e52375bd0 100644 +--- a/packaging/cmake/Modules/NetdataDashboard.cmake ++++ b/packaging/cmake/Modules/NetdataDashboard.cmake +@@ -26,29 +26,12 @@ function(bundle_dashboard) + set(dashboard_src_dir "${CMAKE_BINARY_DIR}/dashboard-src") + set(dashboard_src_prefix "${dashboard_src_dir}/dist/agent") + set(dashboard_bin_dir "${CMAKE_BINARY_DIR}/dashboard-bin") +- set(DASHBOARD_URL "https://app.netdata.cloud/agent.tar.gz" CACHE STRING +- "URL used to fetch the local agent dashboard code") + + message(STATUS "Preparing local agent dashboard code") + +- message(STATUS " Fetching ${DASHBOARD_URL}") +- file(DOWNLOAD +- "${DASHBOARD_URL}" +- "${CMAKE_BINARY_DIR}/dashboard.tar.gz" +- TIMEOUT 180 +- STATUS fetch_status) +- +- list(GET fetch_status 0 result) +- +- if(result) +- message(FATAL_ERROR "Failed to fetch dashboard code") +- else() +- message(STATUS " Fetching ${DASHBOARD_URL} -- Done") +- endif() +- + message(STATUS " Extracting dashboard code") + extract_gzipped_tarball( +- "${CMAKE_BINARY_DIR}/dashboard.tar.gz" ++ "@dashboardTarball@" + "${dashboard_src_dir}" + ) + message(STATUS " Extracting dashboard code -- Done") diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 00e2d44083cb..248b7693ba53 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,19 +1,23 @@ { - lib, - stdenv, - fetchFromGitHub, bash, + bison, buildGoModule, cmake, cups, curl, darwin, + dlib, + fetchFromGitHub, + fetchurl, + flex, freeipmi, go, google-cloud-cpp, grpc, jemalloc, json_c, + lib, + libbacktrace, libbpf, libcap, libelf, @@ -32,60 +36,55 @@ overrideSDK, pkg-config, protobuf, + replaceVars, snappy, + stdenv, systemd, - withCloud ? false, + zlib, + withCloudUi ? false, withConnPrometheus ? false, withConnPubSub ? false, withCups ? false, - withDBengine ? true, + withDBengine ? false, withDebug ? false, withEbpf ? false, withIpmi ? (stdenv.hostPlatform.isLinux), + withLibbacktrace ? true, + withNdsudo ? false, withNetfilter ? (stdenv.hostPlatform.isLinux), withNetworkViewer ? (stdenv.hostPlatform.isLinux), withSsl ? true, withSystemdJournal ? (stdenv.hostPlatform.isLinux), - zlib, - withNdsudo ? false, + withML ? true, }: let stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { - version = "1.47.5"; + version = "2.4.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${finalAttrs.version}"; - hash = - if withCloudUi then - "sha256-+cPYwjxg/+A5bNa517zg9xKEjUa8uPM9WD67tToPH5o=" - # we delete the v2 GUI after fetching - else - "sha256-0aiBUkDymmdIT/u1y2PG30QYAvb8Zc4i8ZgjOtlzt+A="; + hash = "sha256-egHsWmhnrl8D59gr7uD5hBnleCOI8gVEBGwdO5GSnOg="; fetchSubmodules = true; - - # Remove v2 dashboard distributed under NCUL1. Make sure an empty - # Makefile.am exists, as autoreconf will get confused otherwise. - postFetch = lib.optionalString (!withCloudUi) '' - rm -rf $out/src/web/gui/v2/* - touch $out/src/web/gui/v2/Makefile.am - ''; }; strictDeps = true; nativeBuildInputs = [ + bison cmake - pkg-config - makeWrapper + flex go + makeWrapper ninja + pkg-config ] ++ lib.optionals withCups [ cups.dev ]; + # bash is only used to rewrite shebangs buildInputs = [ @@ -94,8 +93,10 @@ stdenv'.mkDerivation (finalAttrs: { jemalloc json_c libuv - zlib libyaml + lz4 + protobuf + zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; @@ -110,34 +111,44 @@ stdenv'.mkDerivation (finalAttrs: { libuuid lm_sensors ] - ++ lib.optionals withCups [ cups ] - ++ lib.optionals withDBengine [ lz4 ] - ++ lib.optionals withIpmi [ freeipmi ] - ++ lib.optionals withNetfilter [ - libmnl - libnetfilter_acct - ] + ++ lib.optionals withConnPrometheus [ snappy ] ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ] - ++ lib.optionals withConnPrometheus [ snappy ] + ++ lib.optionals withCups [ cups ] ++ lib.optionals withEbpf [ - libelf libbpf + libelf ] - ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ] - ++ lib.optionals withSystemdJournal [ systemd ] - ++ lib.optionals withSsl [ openssl ]; + ++ lib.optionals withIpmi [ freeipmi ] + ++ lib.optionals withLibbacktrace [ libbacktrace ] + ++ lib.optionals withNetfilter [ + libmnl + libnetfilter_acct + ] + ++ lib.optionals withSsl [ openssl ] + ++ lib.optionals withSystemdJournal [ systemd ]; - patches = [ - # Allow ndsudo to use non-hardcoded `PATH` - # See https://github.com/netdata/netdata/pull/17377#issuecomment-2183017868 - # https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93 - ./ndsudo-fix-path.patch - # Allow building without non-free v2 dashboard. - ./dashboard-v2-removal.patch - ]; + patches = + [ + # Allow ndsudo to use non-hardcoded `PATH` + # See https://github.com/netdata/netdata/pull/17377#issuecomment-2183017868 + # https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93 + ./ndsudo-fix-path.patch + + ./use-local-libbacktrace.patch + ] + ++ lib.optional withCloudUi ( + replaceVars ./dashboard-v3-add.patch { + # FIXME web.archive.org link can be replace once https://github.com/netdata/netdata-cloud/issues/1081 resolved + # last update 03/16/2025 23:56:24 + dashboardTarball = fetchurl { + url = "https://web.archive.org/web/20250316235624/https://app.netdata.cloud/agent.tar.gz"; + hash = "sha256-Vtw+CbBgqGRenkis0ZR2/TLsoM83NjNA6mbndb95EK8="; + }; + } + ); # Guard against unused build-time development inputs in closure. Without # the ./skip-CONFIGURE_COMMAND.patch patch the closure retains inputs up @@ -146,7 +157,7 @@ stdenv'.mkDerivation (finalAttrs: { # We pick zlib.dev as a simple canary package with pkg-config input. disallowedReferences = lib.optional (!withDebug) zlib.dev; - donStrip = withDebug; + donStrip = withDebug || withLibbacktrace; env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = @@ -178,10 +189,6 @@ stdenv'.mkDerivation (finalAttrs: { mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ $out/libexec/netdata/plugins.d/network-viewer.plugin.org ''} - ${lib.optionalString (!withCloudUi) '' - rm -rf $out/share/netdata/web/index.html - cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html - ''} ${lib.optionalString withNdsudo '' mv $out/libexec/netdata/plugins.d/ndsudo \ $out/libexec/netdata/plugins.d/ndsudo.org @@ -215,27 +222,29 @@ stdenv'.mkDerivation (finalAttrs: { --replace-fail 'set(libconfigdir_POST "''${NETDATA_RUNTIME_PREFIX}/usr/lib/netdata/conf.d")' 'set(libconfigdir_POST "${placeholder "out"}/share/netdata/conf.d")' \ --replace-fail 'set(cachedir_POST "''${NETDATA_RUNTIME_PREFIX}/var/cache/netdata")' 'set(libconfigdir_POST "/var/cache/netdata")' \ --replace-fail 'set(registrydir_POST "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata/registry")' 'set(registrydir_POST "/var/lib/netdata/registry")' \ - --replace-fail 'set(varlibdir_POST "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")' 'set(varlibdir_POST "/var/lib/netdata")' + --replace-fail 'set(varlibdir_POST "''${NETDATA_RUNTIME_PREFIX}/var/lib/netdata")' 'set(varlibdir_POST "/var/lib/netdata")' \ + --replace-fail 'set(BUILD_INFO_CMAKE_CACHE_ARCHIVE_PATH "usr/share/netdata")' 'set(BUILD_INFO_CMAKE_CACHE_ARCHIVE_PATH "${placeholder "out"}/share/netdata")' ''; cmakeFlags = [ "-DWEB_DIR=share/netdata/web" - (lib.cmakeBool "ENABLE_CLOUD" withCloud) - # ACLK is agent cloud link. - (lib.cmakeBool "ENABLE_ACLK" withCloud) - (lib.cmakeBool "ENABLE_DASHBOARD_V2" withCloudUi) - (lib.cmakeBool "ENABLE_DBENGINE" withDBengine) - (lib.cmakeBool "ENABLE_PLUGIN_FREEIPMI" withIpmi) - (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_JOURNAL" withSystemdJournal) - (lib.cmakeBool "ENABLE_PLUGIN_NETWORK_VIEWER" withNetworkViewer) - (lib.cmakeBool "ENABLE_PLUGIN_EBPF" withEbpf) - (lib.cmakeBool "ENABLE_PLUGIN_XENSTAT" false) - (lib.cmakeBool "ENABLE_PLUGIN_CUPS" withCups) + (lib.cmakeBool "ENABLE_DASHBOARD" withCloudUi) + # FIXME uncomment when https://github.com/netdata/netdata/issues/19901#issuecomment-2819701451 resolved + (lib.cmakeBool "ENABLE_DBENGINE" true) + # (lib.cmakeBool "ENABLE_DBENGINE" withDBengine) (lib.cmakeBool "ENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE" withConnPrometheus) (lib.cmakeBool "ENABLE_JEMALLOC" true) + (lib.cmakeBool "ENABLE_LIBBACKTRACE" withLibbacktrace) + (lib.cmakeBool "ENABLE_PLUGIN_CUPS" withCups) + (lib.cmakeBool "ENABLE_PLUGIN_EBPF" withEbpf) + (lib.cmakeBool "ENABLE_PLUGIN_FREEIPMI" withIpmi) + (lib.cmakeBool "ENABLE_PLUGIN_NETWORK_VIEWER" withNetworkViewer) + (lib.cmakeBool "ENABLE_PLUGIN_SYSTEMD_JOURNAL" withSystemdJournal) + (lib.cmakeBool "ENABLE_PLUGIN_XENSTAT" false) + (lib.cmakeBool "ENABLE_ML" withML) # Suggested by upstream. "-G Ninja" - ]; + ] ++ lib.optional withML "-DNETDATA_DLIB_SOURCE_PATH=${dlib.src}"; postFixup = '' wrapProgram $out/bin/netdata-claim.sh --prefix PATH : ${lib.makeBinPath [ openssl ]} @@ -260,7 +269,7 @@ stdenv'.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d"; - vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0="; + vendorHash = "sha256-PgQs3+++iD9Lg8psTBVzF4b+kGJzhV5yNQBkw/+Dqks="; doCheck = false; proxyVendor = true; @@ -290,6 +299,7 @@ stdenv'.mkDerivation (finalAttrs: { platforms = platforms.unix; maintainers = with maintainers; [ mkg20001 + rhoriguchi ]; }; }) diff --git a/pkgs/tools/system/netdata/ndsudo-fix-path.patch b/pkgs/tools/system/netdata/ndsudo-fix-path.patch index be70032fff04..a85a7369fefd 100644 --- a/pkgs/tools/system/netdata/ndsudo-fix-path.patch +++ b/pkgs/tools/system/netdata/ndsudo-fix-path.patch @@ -1,10 +1,10 @@ # See https://github.com/netdata/netdata/pull/17377#issuecomment-2183017868 # https://github.com/netdata/netdata/security/advisories/GHSA-pmhq-4cxq-wj93 -diff --git a/src/collectors/plugins.d/ndsudo.c b/src/collectors/plugins.d/ndsudo.c +diff --git a/src/collectors/utils/ndsudo.c b/src/collectors/utils/ndsudo.c index d53ca9f28..b42a121bf 100644 ---- a/src/collectors/plugins.d/ndsudo.c -+++ b/src/collectors/plugins.d/ndsudo.c +--- a/src/collectors/utils/ndsudo.c ++++ b/src/collectors/utils/ndsudo.c @@ -357,9 +357,9 @@ int main(int argc, char *argv[]) { return 3; } diff --git a/pkgs/tools/system/netdata/use-local-libbacktrace.patch b/pkgs/tools/system/netdata/use-local-libbacktrace.patch new file mode 100644 index 000000000000..77d4facd92ad --- /dev/null +++ b/pkgs/tools/system/netdata/use-local-libbacktrace.patch @@ -0,0 +1,34 @@ +--- a/CMakeLists.txt 2025-03-29 00:48:23.397111607 +0100 ++++ b/CMakeLists.txt 2025-03-29 00:45:42.296199537 +0100 +@@ -501,10 +501,6 @@ + message(STATUS "Added compiler and linker flags for better stack trace support") + endif() + +-if(ENABLE_LIBBACKTRACE) +- netdata_bundle_libbacktrace() +-endif() +- + # + # check source compilation + # +@@ -2183,8 +2179,10 @@ + "$<$:m>" + "${SYSTEMD_LDFLAGS}") + +-if(HAVE_LIBBACKTRACE) +- netdata_add_libbacktrace_to_target(libnetdata) ++if(ENABLE_LIBBACKTRACE AND HAVE_LIBBACKTRACE) ++ target_link_libraries(libnetdata ${LIBBACKTRACE_LIBRARIES}) ++ target_include_directories(libnetdata PUBLIC ${LIBBACKTRACE_INCLUDE_DIRS}) ++ target_compile_options(libnetdata PUBLIC ${LIBBACKTRACE_CFLAGS_OTHER}) + endif() + + if(OS_WINDOWS) +--- /dev/null ++++ b/pkgs/tools/system/netdata/use-local-libbacktrace.patch +@@ -0,0 +1,5 @@ ++FIND_PATH(LIBBACKTRACE_INCLUDE_DIR NAMES backtrace.h) ++FIND_LIBRARY(LIBBACKTRACE_LIBRARIES NAMES libbacktrace) ++ ++INCLUDE(FindPackageHandleStandardArgs) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBBACKTRACE DEFAULT_MSG LIBBACKTRACE_LIBRARIES LIBBACKTRACE_INCLUDE_DIR) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 44ec2f5dc1f3..a512bcb125c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4179,7 +4179,6 @@ with pkgs; protobuf = protobuf_21; }; netdataCloud = netdata.override { - withCloud = true; withCloudUi = true; }; From 7c69711cfbb5e63315814bb3492863f5f2b4e25a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 22 Apr 2025 03:22:16 +0200 Subject: [PATCH 187/449] rspamd: fix openblas not actually being enabled --- pkgs/by-name/rs/rspamd/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix index 84704aa15f79..bca93857db6b 100644 --- a/pkgs/by-name/rs/rspamd/package.nix +++ b/pkgs/by-name/rs/rspamd/package.nix @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { "-DDBDIR=/var/lib/rspamd" "-DLOGDIR=/var/log/rspamd" "-DLOCAL_CONFDIR=/etc/rspamd" + "-DENABLE_BLAS=${if withBlas then "ON" else "OFF"}" "-DENABLE_JEMALLOC=ON" "-DSYSTEM_DOCTEST=ON" "-DSYSTEM_FMT=ON" From 2496f5d8f2fd8c2f0ac0a18f1f28356c4a3147a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 22 Apr 2025 03:22:28 +0200 Subject: [PATCH 188/449] rspamd: enable fasttext --- pkgs/by-name/rs/rspamd/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix index bca93857db6b..35b0839ea46f 100644 --- a/pkgs/by-name/rs/rspamd/package.nix +++ b/pkgs/by-name/rs/rspamd/package.nix @@ -13,6 +13,7 @@ pkg-config, sqlite, ragel, + fasttext, icu, vectorscan, jemalloc, @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { pcre sqlite ragel + fasttext icu jemalloc libsodium @@ -81,6 +83,7 @@ stdenv.mkDerivation rec { "-DLOGDIR=/var/log/rspamd" "-DLOCAL_CONFDIR=/etc/rspamd" "-DENABLE_BLAS=${if withBlas then "ON" else "OFF"}" + "-DENABLE_FASTTEXT=ON" "-DENABLE_JEMALLOC=ON" "-DSYSTEM_DOCTEST=ON" "-DSYSTEM_FMT=ON" From 8c815674e5c0d4f9ff83aeb9a930c7d7c0c40a5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 01:40:59 +0000 Subject: [PATCH 189/449] python312Packages.azure-mgmt-datafactory: 9.1.0 -> 9.2.0 --- .../python-modules/azure-mgmt-datafactory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 80bd69a98937..60f960f032cd 100644 --- a/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "9.1.0"; + version = "9.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_datafactory"; inherit version; - hash = "sha256-oVqOTpYnoaEMGZbqrpnxNlPIl+h582S7k3ijPC4RTIw="; + hash = "sha256-UTLpwkxEGsIl8qYCJZJLqlUHnKge/325mnDWYdZLsNc="; }; build-system = [ setuptools ]; From 0fe518aabd590e36dd7ed276b9826eb601c508e0 Mon Sep 17 00:00:00 2001 From: Ivan Petkov Date: Sun, 6 Apr 2025 09:49:47 -0700 Subject: [PATCH 190/449] lixPackageSets.nix-fast-build: init This adds nix-fast-build to the lixPackageSets scope, allowing the use of nix-fast-build with Lix and its version of nix-eval-jobs --- pkgs/tools/package-management/lix/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index 21834a5299c3..1ec7f9e39553 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -12,6 +12,7 @@ ncurses, stdenv, clangStdenv, + nix-fast-build, storeDir ? "/nix/store", stateDir ? "/nix/var", @@ -85,6 +86,10 @@ let nix-eval-jobs = self.callPackage (callPackage ./common-nix-eval-jobs.nix nix-eval-jobs-args) { stdenv = lixStdenv; }; + + nix-fast-build = nix-fast-build.override { + inherit (self) nix-eval-jobs; + }; } ); in From 79a99dd314f7a95d4a7dc156a1377434f01e98dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 02:14:10 +0000 Subject: [PATCH 191/449] python312Packages.aioapns: 3.3.1 -> 4.0 --- pkgs/development/python-modules/aioapns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioapns/default.nix b/pkgs/development/python-modules/aioapns/default.nix index 6bb210a1efa0..3f98072ad4e6 100644 --- a/pkgs/development/python-modules/aioapns/default.nix +++ b/pkgs/development/python-modules/aioapns/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "aioapns"; - version = "3.3.1"; + version = "4.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bfQpcp/oEBpFu9ywog8CFGGHR8Z5kL6l2O2nzZXaN90="; + hash = "sha256-NxX6q/P6bAJA52N/RCfYjQiv3M6w3PuVbG0JtvSUJ/g="; }; nativeBuildInputs = [ setuptools ]; From 0f141645180d43016f57419dca174282c2f0aa0c Mon Sep 17 00:00:00 2001 From: misilelab Date: Tue, 22 Apr 2025 11:23:40 +0900 Subject: [PATCH 192/449] python3Packages.dep-logic: 0.4.11 -> 0.5.0 https://github.com/pdm-project/dep-logic/releases/tag/0.5.0 Signed-off-by: misilelab --- pkgs/development/python-modules/dep-logic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix index 124622e7bd2b..497477dae109 100644 --- a/pkgs/development/python-modules/dep-logic/default.nix +++ b/pkgs/development/python-modules/dep-logic/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "dep-logic"; - version = "0.4.11"; + version = "0.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pdm-project"; repo = "dep-logic"; tag = version; - hash = "sha256-AS+ZCs50MBXKbsQsu0vIefpCOf3zU4iohCngzaKNIfA="; + hash = "sha256-30n3ZojY3hFUIRViap88V7HjyRiC6rHvnSHxESfK+o4="; }; nativeBuildInputs = [ pdm-backend ]; From 306cf6a6437d58ecb4154fef2da01540461cb395 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 02:31:13 +0000 Subject: [PATCH 193/449] python312Packages.google-cloud-speech: 2.31.1 -> 2.32.0 --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 9e068f6edc42..66b485a8bfbe 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.31.1"; + version = "2.32.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_speech"; inherit version; - hash = "sha256-/fDTUMBke1ZpRUAr2K7vK3r9pnq7UgbrTbTtQfkjtA8="; + hash = "sha256-icJhixMdMQxsAOfATSkP+ppdaMIBkQMHZqdzeFDwTnc="; }; build-system = [ setuptools ]; From 61193327f1ad3716d9974cb1f611a1aa08baa2f5 Mon Sep 17 00:00:00 2001 From: x807x Date: Tue, 4 Mar 2025 15:40:37 +0800 Subject: [PATCH 194/449] maintainers: add x807x --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 652c4355be8d..4677d4cde5c6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -26312,6 +26312,13 @@ github = "x3rAx"; githubId = 2268851; }; + x807x = { + name = "x807x"; + email = "s10855168@gmail.com"; + matrix = "@x807x:matrix.org"; + github = "x807x"; + githubId = 86676478; + }; xanderio = { name = "Alexander Sieg"; email = "alex@xanderio.de"; From 8b1f7e96adca22356ab2578a6adb4327552a33b9 Mon Sep 17 00:00:00 2001 From: x807x Date: Mon, 3 Mar 2025 13:48:29 +0800 Subject: [PATCH 195/449] usbfluxd: init at 1.0 --- pkgs/by-name/us/usbfluxd/package.nix | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/us/usbfluxd/package.nix diff --git a/pkgs/by-name/us/usbfluxd/package.nix b/pkgs/by-name/us/usbfluxd/package.nix new file mode 100644 index 000000000000..db2d9490f68c --- /dev/null +++ b/pkgs/by-name/us/usbfluxd/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + pkg-config, + libimobiledevice, + libusb1, + libusbmuxd, + usbmuxd, + libplist, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "usbfluxd"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "corellium"; + repo = "usbfluxd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-tfAy3e2UssPlRB/8uReLS5f8N/xUUzbjs8sKNlr40T0="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + libimobiledevice + libusb1 + libusbmuxd + usbmuxd + libplist + ]; + + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail 'with_static_libplist=yes' 'with_static_libplist=no' + substituteInPlace usbfluxd/utils.h \ + --replace-fail PLIST_FORMAT_BINARY //PLIST_FORMAT_BINARY \ + --replace-fail PLIST_FORMAT_XML, NOT_PLIST_FORMAT_XML + ''; + + meta = { + homepage = "https://github.com/corellium/usbfluxd"; + description = "Redirects the standard usbmuxd socket to allow connections to local and remote usbmuxd instances so remote devices appear connected locally"; + license = lib.licenses.gpl2Plus; + mainProgram = "usbfluxctl"; + maintainers = with lib.maintainers; [ x807x ]; + }; +}) From 071a813a47620125d94b0b9facf67b3c385ec7c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 02:50:27 +0000 Subject: [PATCH 196/449] python312Packages.coinmetrics-api-client: 2025.3.12.17 -> 2025.4.15.13 --- .../python-modules/coinmetrics-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index 905543a5bbbe..c142b3216c3b 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2025.3.12.17"; + version = "2025.4.15.13"; pyproject = true; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-vmmsslR+4fhNqkzvXB87ilc6vQ+b9PdMlj6LEV7ms7A="; + hash = "sha256-Wyst1/7CN4ZfkzvAkoUSDlSNECgwlx+11yQEzfddcJQ="; }; pythonRelaxDeps = [ "typer" ]; From baebcb715d7950b1ac98adb8d624540c0e73c445 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 03:45:17 +0000 Subject: [PATCH 197/449] python312Packages.azure-mgmt-netapp: 13.4.0 -> 13.5.0 --- pkgs/development/python-modules/azure-mgmt-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index fedd776b9894..0b6660bfb773 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "13.4.0"; + version = "13.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "azure_mgmt_netapp"; inherit version; - hash = "sha256-w095/AskU8P+jNAnkL+a8Fe6SqhP3Wd22I6GCjeRL6I="; + hash = "sha256-StCIk/lM+SceJVjw5CDwheg6avcSep1VYXLwi96UXJE="; }; build-system = [ setuptools ]; From 4ba8293c657c85a573a1761d1abf55280bb5c009 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 03:45:41 +0000 Subject: [PATCH 198/449] python312Packages.oracledb: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/oracledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index e40e7ae79722..680c4aba390b 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZNyG7lwDL+vFVnmLBuewAO9oKLsCUghPat2srTNj24U="; + hash = "sha256-94z3RSEo+lZKmBnSE1c6fJPjsFOysu9QXxg85+R7Hns="; }; build-system = [ From 9350ab1ed8cddf9f885d2217b5daf615ee0eb61b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 04:40:40 +0000 Subject: [PATCH 199/449] python312Packages.vfblib: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/vfblib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vfblib/default.nix b/pkgs/development/python-modules/vfblib/default.nix index 4bd46a3f8fba..4a88c543569b 100644 --- a/pkgs/development/python-modules/vfblib/default.nix +++ b/pkgs/development/python-modules/vfblib/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "vfblib"; - version = "0.9.1"; + version = "0.9.2"; pyproject = true; src = fetchFromGitHub { owner = "LucasFonts"; repo = "vfbLib"; rev = "v${version}"; - hash = "sha256-D37i4dJPWGruwhLVEEPY3mzu0ONM38JTbC3Pt+/35lQ="; + hash = "sha256-kXuaxdGj2dcenZ4SfRBiDjcLzA3Ehb25T7bKk4dXK9g="; }; build-system = [ From 4c39583f65e611b489975b3566a54fc86c2385f1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 22 Apr 2025 06:00:44 +0100 Subject: [PATCH 200/449] waypipe: 0.10.3 -> 0.10.4 Changes: https://gitlab.freedesktop.org/mstoeckl/waypipe/-/releases/v0.10.4 --- pkgs/by-name/wa/waypipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/waypipe/package.nix b/pkgs/by-name/wa/waypipe/package.nix index 01d18f7fc169..158e1733aece 100644 --- a/pkgs/by-name/wa/waypipe/package.nix +++ b/pkgs/by-name/wa/waypipe/package.nix @@ -22,18 +22,18 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "waypipe"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; tag = "v${version}"; - hash = "sha256-E0NJTOK8wf42dXgBtsOmCKlfSLC/zEuUxLKVxwcb9Ig="; + hash = "sha256-O47b1CHCEwUSigjk0Ml3uLhRRxcPC6Phj2cnIlX1Hkg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-T2/su0DQt8KZ8diHTNz3jzeMZaW3cGcAFA6MYs1Qn3k="; + hash = "sha256-c561GpU2XENILSzk0Zka0qrtXZm7xaq/hiJA4Iv++QI="; }; strictDeps = true; From 743cc42b97b7f2c93fa958a14dfe78f50cabea5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 05:16:06 +0000 Subject: [PATCH 201/449] python312Packages.google-cloud-texttospeech: 2.25.1 -> 2.26.0 --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index e41978bbd126..7d3538a7959b 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.25.1"; + version = "2.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_texttospeech"; inherit version; - hash = "sha256-N918PwI/WpfbcpiXGNllMOBfricOXR3kHRBLMWp3Cvw="; + hash = "sha256-Q68biKa5vs3mmju/iqgM36XxL4mZ5WvPnew3Q1Ttf2o="; }; build-system = [ setuptools ]; From d4055812d3a3fcf3800c4017a429ffd60b9b24b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 05:16:21 +0000 Subject: [PATCH 202/449] python312Packages.google-cloud-artifact-registry: 1.15.2 -> 1.16.0 --- .../python-modules/google-cloud-artifact-registry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix index b6ef25fa694d..afa2e4d8dcd9 100644 --- a/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix +++ b/pkgs/development/python-modules/google-cloud-artifact-registry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-artifact-registry"; - version = "1.15.2"; + version = "1.16.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_artifact_registry"; inherit version; - hash = "sha256-0w4HVBOqHnLechpkiVlnOrCPjSuQaXP84jDGtU6Q2RE="; + hash = "sha256-PDikL/ECsIdQn7gXoF04SVxpp7aZ9allTJL+pnd947E="; }; build-system = [ setuptools ]; From dd605421151ad5c2f9d49ec561294a2c034b8d4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 05:17:07 +0000 Subject: [PATCH 203/449] python312Packages.google-cloud-websecurityscanner: 1.17.1 -> 1.17.2 --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index cb92c7506e1b..8b9fa6f6c3ec 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.17.1"; + version = "1.17.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_websecurityscanner"; inherit version; - hash = "sha256-nDjk29d1V19fUNei6lJLtmJDwfLcBSnXm4jZQV2s+vI="; + hash = "sha256-EWTO9yWJUHe+mELBp1/CxB6OCaS0woZtooKFAGH4yGY="; }; build-system = [ setuptools ]; From 6e7073bec7ce7c07b1665fc2568c09faaf8b77b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 05:34:44 +0000 Subject: [PATCH 204/449] python312Packages.google-cloud-netapp: 0.3.20 -> 0.3.21 --- .../python-modules/google-cloud-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index ccfc365aa6b2..af987c906bd0 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.20"; + version = "0.3.21"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_netapp"; inherit version; - hash = "sha256-ZPJMw+fOPcKrRpwoZYPSBCUpuejJsDSXLqvbhNvMWfA="; + hash = "sha256-H6nkC+D2HSMV/ascQoKa3gJmRH5iuXugDiYM1NFR7tU="; }; build-system = [ setuptools ]; From 48690409dd5cf23b9732325bfb353084dabd2e86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 05:35:19 +0000 Subject: [PATCH 205/449] python312Packages.google-cloud-datacatalog: 3.26.0 -> 3.26.1 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 4ce3f4dbc3d0..c1a0856f772e 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.26.0"; + version = "3.26.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_datacatalog"; inherit version; - hash = "sha256-rE3KvGuBi4YIwxLiICX5b1AO93NAWL6IpapNW5a/FVY="; + hash = "sha256-qKCBos0KyFEZBHSNLmsU3CR3nmXiFht1zH4QdINlokg="; }; build-system = [ setuptools ]; From 0bfa66470b1f2b3e17feeb326da5f0d25905d058 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 05:36:22 +0000 Subject: [PATCH 206/449] python312Packages.google-cloud-secret-manager: 2.23.2 -> 2.23.3 --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 7fe77846fb34..0e22cb8961cf 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.23.2"; + version = "2.23.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_secret_manager"; inherit version; - hash = "sha256-h2M3mSqredhkfbFYk3G8tztJhmK1hhlZmfjJRVpZfyk="; + hash = "sha256-WYxMCp0Q1J1QDrSuoyVd/yUKovksAo9cl+OzZ/doyAg="; }; build-system = [ setuptools ]; From 52ed27bf69d5cfc014413bd8844a446a75e260df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 05:38:10 +0000 Subject: [PATCH 207/449] python312Packages.google-cloud-compute: 1.29.0 -> 1.30.0 --- .../python-modules/google-cloud-compute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-compute/default.nix b/pkgs/development/python-modules/google-cloud-compute/default.nix index 31471afaaa93..5d0d2300d1c4 100644 --- a/pkgs/development/python-modules/google-cloud-compute/default.nix +++ b/pkgs/development/python-modules/google-cloud-compute/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-compute"; - version = "1.29.0"; + version = "1.30.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_compute"; inherit version; - hash = "sha256-EVYtOEsTaVh+DKvDQhgwE0270Z94Yg9mm6CpPL0Z0Ug="; + hash = "sha256-iy0/43OA3lhZp4YIHZvMEgOg86IFMAg5on+CjVmCiic="; }; build-system = [ setuptools ]; From f643ce2af9f4bced40efd1fdb21e471aa841ca86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 05:40:15 +0000 Subject: [PATCH 208/449] sqlcl: 24.4.3.070.2106 -> 25.1.0.101.2353 --- pkgs/by-name/sq/sqlcl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sq/sqlcl/package.nix b/pkgs/by-name/sq/sqlcl/package.nix index 8c5fc902847a..da34d999a3e4 100644 --- a/pkgs/by-name/sq/sqlcl/package.nix +++ b/pkgs/by-name/sq/sqlcl/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "sqlcl"; - version = "24.4.3.070.2106"; + version = "25.1.0.101.2353"; src = fetchurl { url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip"; - hash = "sha256-7/8J+XY2Uk/CUWimrTf8/ikjZQT2+4/jNdhs8K1sWjI="; + hash = "sha256-gSjKgJL7DfEj9jbrqZIA/dZ5w1bdDs3BYVAWiCwoJ3U="; }; nativeBuildInputs = [ From 972612581fb63fe16bcd78a872f88769d8c4b214 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 06:10:07 +0000 Subject: [PATCH 209/449] python312Packages.okta: 2.9.11 -> 2.9.12 --- pkgs/development/python-modules/okta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index e748d6f6549f..ebf5da811746 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "okta"; - version = "2.9.11"; + version = "2.9.12"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ca+xjr1aqCX7MmEb7MXD63Dhib/8hggnudj32pjiTyw="; + hash = "sha256-pu5UEVgys6glBnWCIozj2dubQvnF75KCA6fxeujx/pA="; }; build-system = [ setuptools ]; From 8cf8920e0d1da3e4174125fd483b3a26961dc3dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 06:15:02 +0000 Subject: [PATCH 210/449] python312Packages.neoteroi-mkdocs: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/neoteroi-mkdocs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix index 76b62a721fce..08e2bb45fab1 100644 --- a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix +++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix @@ -15,14 +15,14 @@ }: buildPythonPackage rec { pname = "neoteroi-mkdocs"; - version = "1.1.0"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "Neoteroi"; repo = "mkdocs-plugins"; tag = "v${version}"; - hash = "sha256-qizF1Y3BUyr0ekoATJVa62q7gvpbMW3fIKViov2tFTI="; + hash = "sha256-EbhkhcH8sGxiwimg9dfmSSOJR7DYw7nfS3m1HUSH0vg="; }; buildInputs = [ hatchling ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/Neoteroi/mkdocs-plugins"; description = "Plugins for MkDocs"; - changelog = "https://github.com/Neoteroi/mkdocs-plugins/releases/v${version}"; + changelog = "https://github.com/Neoteroi/mkdocs-plugins/releases/${src.tag}"; license = licenses.mit; maintainers = with maintainers; [ aldoborrero From 074888d9f25d0b852e4c8103c481d3a68775fb48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 06:54:11 +0000 Subject: [PATCH 211/449] python312Packages.asf-search: 8.1.1 -> 8.1.2 --- pkgs/development/python-modules/asf-search/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index 5fa3f4f7cb2b..13676a88c6e7 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "8.1.1"; + version = "8.1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; tag = "v${version}"; - hash = "sha256-9NyBDpCIsRBPN2965SR106h6hxwML7kXv6sY3YlPseA="; + hash = "sha256-/EQpeTFGDbJnC/HnnK9v3eaz1xVvv3i0bSIZ27z9GVU="; }; pythonRelaxDeps = [ "tenacity" ]; @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the ASF SearchAPI"; homepage = "https://github.com/asfadmin/Discovery-asf_search"; - changelog = "https://github.com/asfadmin/Discovery-asf_search/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/asfadmin/Discovery-asf_search/blob/${src.tag}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ bzizou ]; }; From 284f928454e013a022e1731806629c89065c4b18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 07:16:17 +0000 Subject: [PATCH 212/449] hermitcli: 0.44.5 -> 0.44.6 --- pkgs/by-name/he/hermitcli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix index eaef48ad9e31..a4c29ca51752 100644 --- a/pkgs/by-name/he/hermitcli/package.nix +++ b/pkgs/by-name/he/hermitcli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hermit"; - version = "0.44.5"; + version = "0.44.6"; src = fetchFromGitHub { rev = "v${version}"; owner = "cashapp"; repo = "hermit"; - hash = "sha256-QPGN90iZd6UamSJv0v0eDRmLhKAhNRZW6jWhU9iRlfY="; + hash = "sha256-PNzMR9bYR7Dv62kN6tYBdabGR01iXw537WRUtJXl1CE="; }; - vendorHash = "sha256-TF9GtXvOyd6NH6bxT6YLibUby4VmrNBQrtw/0qhqxzQ="; + vendorHash = "sha256-GnZqM5ZKpg2yKAzUaXLOOKspbpjNnihscftkDT/7P9w="; subPackages = [ "cmd/hermit" ]; From 3fd20066ae5fabc7b00980cd70f55898a7e579ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 07:17:35 +0000 Subject: [PATCH 213/449] python312Packages.google-cloud-org-policy: 1.13.1 -> 1.14.0 --- .../python-modules/google-cloud-org-policy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index b25ff0c0cc8d..c51774dbc921 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.13.1"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_org_policy"; inherit version; - hash = "sha256-2yPr1sgmxMnQwk6Z1T9i2MFPeAxjb40r4IqNoAd7WZk="; + hash = "sha256-TId9QgosUStFTmLqzSVXy7x09zTAeZRuMOYfYnkbMZw="; }; build-system = [ setuptools ]; From d347d9cb008f665baae090ca058f0ed9de229419 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 07:18:40 +0000 Subject: [PATCH 214/449] jumppad: 0.18.1 -> 0.19.0 --- pkgs/by-name/ju/jumppad/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ju/jumppad/package.nix b/pkgs/by-name/ju/jumppad/package.nix index 672c8b188c45..66cc90d457cb 100644 --- a/pkgs/by-name/ju/jumppad/package.nix +++ b/pkgs/by-name/ju/jumppad/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "jumppad"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = "jumppad"; rev = version; - hash = "sha256-2QF37dDQP+rSaLeNE9a41sA8iWnlUQaeXS00FoLdnfY="; + hash = "sha256-dzxFNOMFXbygTs4WIrG7aZ7LlEpkxepTgOP/QVq9z8s="; }; vendorHash = "sha256-BuXbizA/OJiP11kSIO476tWPYPzGTKmzPHeyIqs8pWc="; From 0ccb1ff580ebd11c057b27c21806d49038c4f05f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 07:24:48 +0000 Subject: [PATCH 215/449] python312Packages.google-cloud-datastore: 2.20.2 -> 2.21.0 --- .../python-modules/google-cloud-datastore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix index cd2a14dc30ba..efd207015fe9 100644 --- a/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.20.2"; + version = "2.21.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_datastore"; inherit version; - hash = "sha256-lmXQCXKdlVEynZR29NW9qcEdNGkkPqiiwNlJC2WqiZ8="; + hash = "sha256-7uRU3UpV9bMn+fNEko/xoJpvd8I9Xj2QitMaE8wvQHM="; }; build-system = [ setuptools ]; From 078871c8e35a30f11293c5a76ae3223c020561b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 07:38:27 +0000 Subject: [PATCH 216/449] python312Packages.pytest-check: 2.5.2 -> 2.5.3 --- pkgs/development/python-modules/pytest-check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index f1d9dc5056a5..bf87e0cf98bd 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pytest-check"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; src = fetchPypi { pname = "pytest_check"; inherit version; - hash = "sha256-Ex+letLw4h45iG4FJVFCu1hOYYgaXkWE/QaxSq5j7l0="; + hash = "sha256-I1fX33fDldMMDElXck/fzhp16ovJ6yMIwP/lb2KscMo="; }; build-system = [ hatchling ]; From f65ff1d512e88cbd0c5c3ee6ddd29213a0398f67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 07:59:44 +0000 Subject: [PATCH 217/449] python312Packages.galois: 0.4.4 -> 0.4.5 --- pkgs/development/python-modules/galois/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 5bab592a0e69..c0533757cdbc 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.4.4"; + version = "0.4.5"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; tag = "v${version}"; - hash = "sha256-x24TyJYy+z3v41DpJyOTYin/YvkqMHd/Rg4bTivk9M0="; + hash = "sha256-FsJZaDHx1AagNMIRXBNS9BcDJBie2qwXwnQACW/Rzdk="; }; pythonRelaxDeps = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package that extends NumPy arrays to operate over finite fields"; homepage = "https://github.com/mhostetter/galois"; - changelog = "https://github.com/mhostetter/galois/releases/tag/v${version}"; + changelog = "https://github.com/mhostetter/galois/releases/tag/${src.tag}"; downloadPage = "https://github.com/mhostetter/galois/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ chrispattison ]; From 92a6d4d3f1d7230f1ac0f7b167dc3b93530afd12 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Tue, 22 Apr 2025 11:01:33 +0300 Subject: [PATCH 218/449] teleport_17: 17.4.3 -> 17.4.5 Changelogs: https://github.com/gravitational/teleport/releases/tag/v17.4.4 https://github.com/gravitational/teleport/releases/tag/v17.4.5 Diff: https://github.com/gravitational/teleport/compare/v17.4.3...v17.4.5 --- pkgs/servers/teleport/17/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/teleport/17/default.nix b/pkgs/servers/teleport/17/default.nix index 703bd067c819..cf595d02fb18 100644 --- a/pkgs/servers/teleport/17/default.nix +++ b/pkgs/servers/teleport/17/default.nix @@ -2,10 +2,10 @@ import ../generic.nix ( args // { - version = "17.4.3"; - hash = "sha256-MdtvtM5Nd+e7eSmHf4OwdjuQ2rUjwsAusvO7kATnru0="; - vendorHash = "sha256-03qkUH7UfAF0FwbG5enKf9Ke1teN89vmzk8yRfGvmPg="; - pnpmHash = "sha256-zx1OKAeFo5zWvGHDdOOvtmYB+tX9sW5sIrXY2AXjPN0="; - cargoHash = "sha256-0PT9y56V/WHo3M5TcpVWBuHcQMZ0w2L4rEuXuTvVNFU="; + version = "17.4.5"; + hash = "sha256-VsgwX/ffHY4640FsXLtEht5acUX4bnaAlLDxMnLb0Mg="; + vendorHash = "sha256-3G7Vw/R08vG/tC16RBNPM0oOu6lLOgNpRLN/FAaKvuQ="; + pnpmHash = "sha256-gc1m76w3o0N1F6xYr2ZS6DOGvwbjK8k6bC8G8+xVFVQ="; + cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs="; } ) From a95e5e51cf2bd8bb4154ee2ef75e006b50efa307 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Tue, 22 Apr 2025 11:02:35 +0300 Subject: [PATCH 219/449] teleport_16: 16.5.1 -> 16.5.3 Changelogs: https://github.com/gravitational/teleport/releases/tag/v16.5.1 https://github.com/gravitational/teleport/releases/tag/v16.5.3 Diff: https://github.com/gravitational/teleport/compare/v16.5.1...v16.5.3 --- pkgs/servers/teleport/16/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix index 15439eda05cd..a8dfa13a092b 100644 --- a/pkgs/servers/teleport/16/default.nix +++ b/pkgs/servers/teleport/16/default.nix @@ -2,10 +2,10 @@ args: import ../generic.nix ( args // { - version = "16.5.1"; - hash = "sha256-qDXJuKQ1IJ0+v4m5glEKNZVUBuLhG95MOzo0u3Ma2Qw="; + version = "16.5.3"; + hash = "sha256-yaHy75oS+HuO++qHEDaGByz11vwAqfaDT9qb94iKs3Y="; vendorHash = "sha256-pHAiJ080lyWtb7xbwSeD9g8JlyXZyqtZC2IpsUJ7YaY="; - pnpmHash = "sha256-XHiox+UYhGYgo+inrnOVy0qvPXm7xoCaGfAC4FQmaMM="; + pnpmHash = "sha256-JQca2eFxcKJDHIaheJBg93ivZU95UWMRgbcK7QE4R10="; cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I="; } ) From 85fb432aab8f9df2f8ddd9829d0dbaef82ebc464 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 08:35:46 +0000 Subject: [PATCH 220/449] python312Packages.command-runner: 1.7.2 -> 1.7.3 --- pkgs/development/python-modules/command-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/command-runner/default.nix b/pkgs/development/python-modules/command-runner/default.nix index a42209093cad..6327a7b0d093 100644 --- a/pkgs/development/python-modules/command-runner/default.nix +++ b/pkgs/development/python-modules/command-runner/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "command-runner"; - version = "1.7.2"; + version = "1.7.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "netinvent"; repo = "command_runner"; tag = "v${version}"; - hash = "sha256-2+Tvp0nFDcD6D99z/13RGRTrioFR0dhPDnicX9ZbIxY="; + hash = "sha256-BNjMMs44eDnGmcFXiMydJIU0RpsFOyd2TjH7BOGQP2E="; }; build-system = [ setuptools ]; From 395a0e604a316c85ca4df5683ac1af87dcdcc449 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 09:02:15 +0000 Subject: [PATCH 221/449] python312Packages.metaflow: 2.15.7 -> 2.15.9 --- pkgs/development/python-modules/metaflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix index 112d3d3fc457..ad4da62cbe0c 100644 --- a/pkgs/development/python-modules/metaflow/default.nix +++ b/pkgs/development/python-modules/metaflow/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "metaflow"; - version = "2.15.7"; + version = "2.15.9"; pyproject = true; src = fetchFromGitHub { owner = "Netflix"; repo = "metaflow"; tag = version; - hash = "sha256-D7BwlDmsj2/RiZ//3cyw6Wti+6P2PwRmn0xsvPkyI54="; + hash = "sha256-so9bmMD0IgUP9FJCyVZa6rCp1iHhbHfB92KScW/ltQU="; }; build-system = [ From 7779aaee9e17e22bfb63ce607d54d2dedf5d6424 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 09:10:19 +0000 Subject: [PATCH 222/449] python312Packages.lib4sbom: 0.8.3 -> 0.8.4 --- pkgs/development/python-modules/lib4sbom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix index 2f7ac46d9d55..5b8b4297cdf3 100644 --- a/pkgs/development/python-modules/lib4sbom/default.nix +++ b/pkgs/development/python-modules/lib4sbom/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lib4sbom"; - version = "0.8.3"; + version = "0.8.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "anthonyharrison"; repo = "lib4sbom"; tag = "v${version}"; - hash = "sha256-7ERjzfMIz1tRvShxO2hR+DzRYyfV3KxpHmgJTLErnRw="; + hash = "sha256-QTYtaEo5LdDPfv8KgQ3IUJgKphQl2xyQXrcSn19IeKo="; }; build-system = [ setuptools ]; From 571153e59e3627b67d069bf8af2ada50d331091d Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 22 Apr 2025 11:57:44 +0200 Subject: [PATCH 223/449] vulkan-cts: 1.4.1.3 -> 1.4.2.0 Changelog: https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-1.4.2.0 --- pkgs/by-name/vu/vulkan-cts/package.nix | 4 ++-- pkgs/by-name/vu/vulkan-cts/sources.nix | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-cts/package.nix b/pkgs/by-name/vu/vulkan-cts/package.nix index 03ae73b835ad..d5e752a47358 100644 --- a/pkgs/by-name/vu/vulkan-cts/package.nix +++ b/pkgs/by-name/vu/vulkan-cts/package.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.4.1.3"; + version = "1.4.2.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "vulkan-cts-${finalAttrs.version}"; - hash = "sha256-44UGGeuKMCP4fLsZnIPdWDjozd87su9TUbFBnftVrNY="; + hash = "sha256-+ydv67uQkoofU3GrSJWosb99DrGDGs80z+hq9MpFIpA="; }; prePatch = '' diff --git a/pkgs/by-name/vu/vulkan-cts/sources.nix b/pkgs/by-name/vu/vulkan-cts/sources.nix index 8442014d61ab..34a9ab4effbe 100644 --- a/pkgs/by-name/vu/vulkan-cts/sources.nix +++ b/pkgs/by-name/vu/vulkan-cts/sources.nix @@ -4,15 +4,15 @@ rec { amber = fetchFromGitHub { owner = "google"; repo = "amber"; - rev = "1ec5e96db7e0343d045a52c590e30eba154f74a8"; - hash = "sha256-4LoV7PfkwLrg+7GyuB1poC/9zE/3jy8nhs+uPe2U3lA="; + rev = "6fa5ac1fb3b01c93eef3caa2aeb8841565e38d90"; + hash = "sha256-JUrOz+hpGk8rgxMLzrCrfbM60HsLyRnf6cG4j2BqMq0="; }; glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "3a2834e7702651043ca9f35d022739e740563516"; - hash = "sha256-hHmqvdgBS23bLGCzlKJtlElw79/WvxEbPSwpbQFHQYY="; + rev = "1b65bd602b23d401d1c4c86dfa90a36a52c66294"; + hash = "sha256-W1a6qeW4W4eNMl2UXEl0HpuLngtUjVsJI/MaiZ5wcWQ="; }; jsoncpp = fetchFromGitHub { @@ -32,15 +32,15 @@ rec { spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "36d5e2ddaa54c70d2f29081510c66f4fc98e5e53"; - hash = "sha256-8hx8/1vaY4mRnfNaBsghWqpzyzY4hkVkNFbQEFZif9g="; + rev = "767e901c986e9755a17e7939b3046fc2911a4bbd"; + hash = "sha256-mXj6HDIEEjvGLO3nJEIRxdJN28/xUA2W+r9SRnh71LU="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "3fb52548bc8a68d349d31e21bd4e80e3d953e87c"; - hash = "sha256-RJ3Q3U4GjqvUXDy8Jd4NWgjhKOxYMMK1Jerj19dAqno="; + rev = "3364b982713a0440d1d342dd5eec65b122a61b71"; + hash = "sha256-zVo1i/AgwPBXVXgKpdubX0TTu7gqoX88BzZfhRZ4Z2o="; }; video_generator = fetchFromGitHub { @@ -53,15 +53,15 @@ rec { vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "c7a3955e47d223c6a37fb29e2061c973eec98d0a"; - hash = "sha256-dTkLzENuEfe0TVvJAgYevJNPyI/lWbjx8Pzz3Lj76PY="; + rev = "645c59c70e826d9738b6bb103316c03d887dfed3"; + hash = "sha256-r3JqAt0+JUwQS9JuWbKDx9L3ceDPQfYaAtnRz3l07ig="; }; vulkan-validationlayers = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; - rev = "902f3cf8d51e76be0c0deb4be39c6223abebbae2"; - hash = "sha256-p4DFlyU1jjfVFlEOE21aNHfqaTZ8QbSCFQfpsYS0KR0="; + rev = "6cf616f131e9870c499a50441bca2d07ccda9733"; + hash = "sha256-nKamcLF17IA56tcxQLc8zUbkB9yQCW+Nag+Wn8pUqUg="; }; vulkan-video-samples = fetchFromGitHub { From 5556905aa84850da2fe70c974a1521668fd8ecdb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:12:48 +0200 Subject: [PATCH 224/449] python313Packages.tencentcloud-sdk-python: 3.0.1362 -> 3.0.1363 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1362...refs/tags/3.0.1363 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1363/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index d241443375ea..47b310bc166d 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1362"; + version = "3.0.1363"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-twAjyHTHEy1FNH0yBRrvb8va2pau4HpeunN1oGiTNzY="; + hash = "sha256-VcPedb0qTAzZQpHBAcJtZZhBcGasMcBxH9MQ5tnHcks="; }; build-system = [ setuptools ]; From 530df28014e2486aa8bf2ca336edc6129d1d8257 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:13:08 +0200 Subject: [PATCH 225/449] python312Packages.mypy-boto3-arc-zonal-shift: 1.37.21 -> 1.37.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index d0a30c7ff52e..bb4a984168c7 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -138,8 +138,8 @@ rec { "sha256-4eY2gziQLvX2t39e201UitkV/Cs0E2RSP4yAG6/OdbI="; mypy-boto3-arc-zonal-shift = - buildMypyBoto3Package "arc-zonal-shift" "1.37.21" - "sha256-m88NXN/OxX65E92CnQoIZ9+Uq/D1idXzq3NvYQqEilM="; + buildMypyBoto3Package "arc-zonal-shift" "1.37.38" + "sha256-tCBeOSdgTbAYXxRfA9mH7ON5aAeXxbz3jNuRRoNxj5Q="; mypy-boto3-athena = buildMypyBoto3Package "athena" "1.37.0" From 0ad0f0777708ba4198403d9f03548652d71c0a83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:13:12 +0200 Subject: [PATCH 226/449] python312Packages.mypy-boto3-budgets: 1.37.0 -> 1.37.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index bb4a984168c7..839f425cd283 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -178,8 +178,8 @@ rec { "sha256-qGK4daMp3zODuppGz335Or5hpggK6uTkbQqfXOKq6eM="; mypy-boto3-budgets = - buildMypyBoto3Package "budgets" "1.37.0" - "sha256-M1WWs/HMcN0L9qK2eu4x+JmZsvbEbmxZzQBkjU5gfh4="; + buildMypyBoto3Package "budgets" "1.37.38" + "sha256-WdJfpMdYkmqNyh+YDnMJZ+q0gUC83e/L9lEnHsCQfrk="; mypy-boto3-ce = buildMypyBoto3Package "ce" "1.37.30" From f4861108feb60a7a53206cabfe1847fb07a13ec0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:13:36 +0200 Subject: [PATCH 227/449] python312Packages.mypy-boto3-firehose: 1.37.0 -> 1.37.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 839f425cd283..5d50d2f15e27 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -534,8 +534,8 @@ rec { "sha256-MNUVaGlc2+UUEePFnslKpti//rJddHW4NZ8yZdOuQBU="; mypy-boto3-firehose = - buildMypyBoto3Package "firehose" "1.37.0" - "sha256-+OaeV4txp25XN9UB9GSLc9me9Isha918q2Hn3gyAPHM="; + buildMypyBoto3Package "firehose" "1.37.38" + "sha256-yJ0qwf+3vVS7l4tXqCPC44vvCTXJrDDQ5q5cArRSjqM="; mypy-boto3-fis = buildMypyBoto3Package "fis" "1.37.0" From d9142b3b408c50f8de72738960ea6e5dceb67c76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:13:59 +0200 Subject: [PATCH 228/449] python312Packages.mypy-boto3-mediatailor: 1.37.21 -> 1.37.38 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5d50d2f15e27..1afe3fa3e86f 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -890,8 +890,8 @@ rec { "sha256-g/KoroOmWZgWPfC0HMgLGQrGpr9QWEirTL3S9t7iMjs="; mypy-boto3-mediatailor = - buildMypyBoto3Package "mediatailor" "1.37.21" - "sha256-SssQmTozr5f/uwsbwmMZpkXKG4SWG43IkEmehVG53Lw="; + buildMypyBoto3Package "mediatailor" "1.37.38" + "sha256-TobCXyGJhfpcRO8s6n6tl/gXxEHo4m8DXR5k1IkzWdw="; mypy-boto3-medical-imaging = buildMypyBoto3Package "medical-imaging" "1.37.0" From 867188fff7519aa82d0315a5a6a5b9783ab00dad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:14:36 +0200 Subject: [PATCH 229/449] python313Packages.botocore-stubs: 1.37.37 -> 1.37.38 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index cf091ef16a56..def4762de9e7 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.37.37"; + version = "1.37.38"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-0aWPUp6VSYknmqibg5FidCjJWOBj8CIEqgztpOMTYBU="; + hash = "sha256-ukdVtQZJZJ8xKbjympz8Rj1l1SlgXdOI8dpi+DbVYGc="; }; nativeBuildInputs = [ setuptools ]; From ae1326491bef443f40dff858946f50b2fb05ade5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:14:41 +0200 Subject: [PATCH 230/449] python313Packages.boto3-stubs: 1.37.37 -> 1.37.38 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index c9d5f83acfe2..07acc89e41a8 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.37.37"; + version = "1.37.38"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-5Ge3qmTJb3Embj09djzYJuNOQGPVEcDexDQdMHHTQow="; + hash = "sha256-14wt6I6fGmC+8Fz61bjtwFHxdivghlyDvr5xZEj1ZRA="; }; build-system = [ setuptools ]; From cd89be68c83668b9571d3783609f3c3d095c7cdc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:22:23 +0200 Subject: [PATCH 231/449] python313Packages.holidays: 0.70 -> 0.71 Diff: https://github.com/vacanza/python-holidays/compare/refs/tags/v0.70...refs/tags/v0.71 Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.71 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 1ff9a7e49695..5be98a23ea4e 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.70"; + version = "0.71"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; tag = "v${version}"; - hash = "sha256-0YjkuGJZbueoFerHKSHjIGn+NwFrz7rJRnrFLx28v6w="; + hash = "sha256-umfwSIi9Vu3fDvSVbq3cbQZ83q925VwxVPHedzrcqag="; }; build-system = [ From 683a9ffaf2c1b1b95d11e9d6779b8dca3594c080 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:24:35 +0200 Subject: [PATCH 232/449] python313Packages.playwrightcapture: 1.28.6 -> 1.29.0 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.29.0 --- .../python-modules/playwrightcapture/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 7f44fd294552..85a4726aceca 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -5,6 +5,7 @@ beautifulsoup4, buildPythonPackage, dateparser, + dnspython, fetchFromGitHub, playwright-stealth, playwright, @@ -22,7 +23,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.28.6"; + version = "1.29.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -31,7 +32,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; tag = "v${version}"; - hash = "sha256-f1XCNDc2oNJ/EM8S12nCSYtQh7nUi4UROEzTuOH41Ds="; + hash = "sha256-p2EprahxHqq4jL7bdnq1+BK3IPea5tZLu/X4N+kZLSY="; }; pythonRelaxDeps = [ @@ -50,6 +51,7 @@ buildPythonPackage rec { aiohttp-socks beautifulsoup4 dateparser + dnspython playwright playwright-stealth puremagic From 4a88a04b6dad16445e9df088a7e099e1b81f1006 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:26:32 +0200 Subject: [PATCH 233/449] python313Packages.lacuscore: 1.13.9 -> 1.14.0 Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.13.9...refs/tags/v1.14.0 Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.14.0 --- pkgs/development/python-modules/lacuscore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index 6b7028d6ad4f..ec1b40768c8c 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.13.9"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; tag = "v${version}"; - hash = "sha256-knAM4cdevww4/dheOw7AnGtegXuMiXt9R0Tmw1wNV80="; + hash = "sha256-szcvg4jfJ84kHYWjPBwecfvfsc258SS0OIuYle1lC1g="; }; pythonRelaxDeps = [ From 8a637f821a3a4b431e718e333d664a8faf067a78 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:29:59 +0200 Subject: [PATCH 234/449] python313Packages.pymodbus: 3.9.1 -> 3.9.2 Diff: https://github.com/pymodbus-dev/pymodbus/compare/refs/tags/v3.9.1...refs/tags/v3.9.2 Changelog: https://github.com/pymodbus-dev/pymodbus/releases/tag/v3.9.2 --- pkgs/development/python-modules/pymodbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index a776ccd96aa9..ed8b828215ca 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.9.1"; + version = "3.9.2"; pyproject = true; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = "pymodbus"; tag = "v${version}"; - hash = "sha256-O64r8/3AGZYr449FANo3wQCUiIJkIjN5eQ+VoTrvUHo="; + hash = "sha256-nzaIE8ZBIwo6ZChYBzQzMndCM/hOwCVKepkUACn8e80="; }; build-system = [ setuptools ]; From e68bf8f2b181474edf236984d348c380c6a4b1e8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:31:39 +0200 Subject: [PATCH 235/449] python313Packages.pyschlage: 2024.11.0 -> 2025.4.0 Diff: https://github.com/dknowles2/pyschlage/compare/refs/tags/2024.11.0...refs/tags/2025.4.0 Changelog: https://github.com/dknowles2/pyschlage/releases/tag/2025.4.0 --- pkgs/development/python-modules/pyschlage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix index f88ce75e525e..6ff308d47081 100644 --- a/pkgs/development/python-modules/pyschlage/default.nix +++ b/pkgs/development/python-modules/pyschlage/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyschlage"; - version = "2024.11.0"; + version = "2025.4.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "dknowles2"; repo = "pyschlage"; tag = version; - hash = "sha256-ftoBchKK3I0kzw70MPaAlo/M2YLUx8OFwMNkJQ3itbo="; + hash = "sha256-RgPobb9RhM+eFX3Y+wSKlDQ6SddnGKlNTG1nIeEVDFs="; }; build-system = [ From c918c2b59c9899eb4f80e833f11cd49c24391d15 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:32:06 +0200 Subject: [PATCH 236/449] python313Packages.pyexploitdb: 0.2.76 -> 0.2.77 Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index f6151005ae3b..bd8d73e15d8d 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.76"; + version = "0.2.77"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-HcedkHQVatxyoVHRxivTd5vPxs4zMkLC2X27cmmAcMo="; + hash = "sha256-x6RY+9jmZ/+7Q18FRmfoVgSqhCN8h7Kp0kMayY3xec8="; }; build-system = [ setuptools ]; From c7837d5c19fec52bd61e79c9aa56f511f6b7edea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 22 Apr 2025 12:32:45 +0200 Subject: [PATCH 237/449] python313Packages.venstarcolortouch: 0.19 -> 0.20 --- pkgs/development/python-modules/venstarcolortouch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/venstarcolortouch/default.nix b/pkgs/development/python-modules/venstarcolortouch/default.nix index 5d8dbb07e033..a68018983845 100644 --- a/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "venstarcolortouch"; - version = "0.19"; + version = "0.20"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-QjcoF46GrBH7ExGQno8xDgtOSGNxhAP+NycJb22hL+E="; + hash = "sha256-HX1GPhLksD7T0jbnGxk85CgF8bnPXWrUnbOgCKsmeT0="; }; propagatedBuildInputs = [ requests ]; From 76979d2ddd91a2417859d5d83d6c60d9b4c1ca47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 10:48:12 +0000 Subject: [PATCH 238/449] python312Packages.qpsolvers: 4.5.1 -> 4.6.0 --- pkgs/development/python-modules/qpsolvers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index d975ab138d12..de0ee8237318 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -23,14 +23,14 @@ }: buildPythonPackage rec { pname = "qpsolvers"; - version = "4.5.1"; + version = "4.6.0"; pyproject = true; src = fetchFromGitHub { owner = "qpsolvers"; repo = "qpsolvers"; tag = "v${version}"; - hash = "sha256-BPjuc1RyN4qy2LJCIpsUVooP+cmHaLtaYRG2Mp/+ETc="; + hash = "sha256-jbjqzy4cd9g0lMptIeHBPSJsPAA7fEDI7DZhrr/VuRc="; }; build-system = [ flit-core ]; From 11988bdfae4e24b9b0227082dfd472ea23c1a8d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 11:22:13 +0000 Subject: [PATCH 239/449] python312Packages.pystac: 1.12.2 -> 1.13.0 --- pkgs/development/python-modules/pystac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pystac/default.nix b/pkgs/development/python-modules/pystac/default.nix index 521511ca3a82..ce5407f191a3 100644 --- a/pkgs/development/python-modules/pystac/default.nix +++ b/pkgs/development/python-modules/pystac/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pystac"; - version = "1.12.2"; + version = "1.13.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "stac-utils"; repo = "pystac"; tag = "v${version}"; - hash = "sha256-Cz9VyHIAfeRvK+az1ETVrTXvBh/VpkgmtERElfgAdBo="; + hash = "sha256-DxRJsnbzXBnpQSJE0VwkXV3vyH6WffiMaZ3119XBxJ8="; }; build-system = [ setuptools ]; From fe65c22a83f130fd9de1e8c187d13880cab67719 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 12:10:37 +0000 Subject: [PATCH 240/449] python312Packages.bleak-esphome: 2.12.0 -> 2.13.1 --- pkgs/development/python-modules/bleak-esphome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index cbf1c6dc8dbf..89d74bc36a3f 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "bleak-esphome"; - version = "2.12.0"; + version = "2.13.1"; pyproject = true; src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "bleak-esphome"; tag = "v${version}"; - hash = "sha256-dR4KuaJWrWTVDWY11E/MRF12jCvOlC8c2flDOnkPjxw="; + hash = "sha256-ziUSqIox5tWp64EJ+Hacy1Wbh8NMpH/GUY9TUaN7Y3M="; }; postPatch = '' @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "Bleak backend of ESPHome"; homepage = "https://github.com/bluetooth-devices/bleak-esphome"; - changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/bluetooth-devices/bleak-esphome/blob/${src.tag}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 602c8884f8ef716095013d3b270fb78f07b2c08e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 12:38:05 +0000 Subject: [PATCH 241/449] cri-tools: 1.32.0 -> 1.33.0 --- pkgs/by-name/cr/cri-tools/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/cri-tools/package.nix b/pkgs/by-name/cr/cri-tools/package.nix index c0da20906e86..e2223020e38d 100644 --- a/pkgs/by-name/cr/cri-tools/package.nix +++ b/pkgs/by-name/cr/cri-tools/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.32.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - hash = "sha256-wdtsx5DIg+65VRRUPai5d8Tk/zQ4MhVjXNFKK4NCBFs="; + hash = "sha256-KxckDpZ3xfD+buCGrQ+udJF0X2D9sg/d3TLSQEcWyV4="; }; vendorHash = null; From c7dd612b983d8a2c835360f29b0a9dfe809992f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 12:38:10 +0000 Subject: [PATCH 242/449] gopass-hibp: 1.15.15 -> 1.15.16 --- pkgs/tools/security/gopass/hibp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index d458b99dba91..03e72889858e 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.15"; + version = "1.15.16"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-auY0Wg5ki4WIHtA172wJJj9VxQEHWMmQop5bIviinn8="; + hash = "sha256-wmZtLVZhIKAcaE7CC7mlGq/ybcANki1vzdgAoh+NXB8="; }; - vendorHash = "sha256-QgLQN5WjiDK/9AReoCXSWH+Mh7xF2NbUSJiiO/E8jpo="; + vendorHash = "sha256-5+DdlNqPNbStG7c6eX4t+4ICi3ZfCNQblkyw3eFZZL4="; subPackages = [ "." ]; From de199835d04653a461960f5821a30c34dc06c597 Mon Sep 17 00:00:00 2001 From: Simon Hauser Date: Tue, 22 Apr 2025 14:44:34 +0200 Subject: [PATCH 243/449] mariadb_105: remove due to EOL End of life is on 2025-06-24, see https://mariadb.org/about/#maintenance-policy --- doc/release-notes/rl-2505.section.md | 2 ++ pkgs/servers/sql/mariadb/default.nix | 7 +------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 5c7131be2f7d..08ac4a7c3f98 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -95,6 +95,8 @@ - `cassandra_3_0` and `cassandra_3_11` have been removed as they have reached end-of-life. Please update to `cassandra_4`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-4.0.17/NEWS.txt) for more information about the upgrade process. +- `mariadb_105` has been removed as it has reached end-of-life in 2025-06. Please update to `mariadb_106`. + - NetBox was updated to `>= 4.2.0`. Have a look at the breaking changes of the [4.1 release](https://github.com/netbox-community/netbox/releases/tag/v4.1.0) and the [4.2 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0), diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 232b10706468..da1630b4625c 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -362,13 +362,8 @@ let }; in self: { + mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # see https://mariadb.org/about/#maintenance-policy for EOLs - mariadb_105 = self.callPackage generic { - # Supported until 2025-06-24 - version = "10.5.28"; - hash = "sha256-C1BwII2gEWZA8gvQhfETZSf5mMwjJocVvL81Lnt/PME="; - inherit (self.darwin.apple_sdk.frameworks) CoreServices; - }; mariadb_106 = self.callPackage generic { # Supported until 2026-07-06 version = "10.6.21"; From cbfa0a9bcb643aedb972d4e1d0561e0a3c4ca811 Mon Sep 17 00:00:00 2001 From: misilelab Date: Tue, 22 Apr 2025 22:24:17 +0900 Subject: [PATCH 244/449] python3Packages.dep-logic: add misilelab to maintainers Signed-off-by: misilelab --- pkgs/development/python-modules/dep-logic/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dep-logic/default.nix b/pkgs/development/python-modules/dep-logic/default.nix index 497477dae109..fbad80861cee 100644 --- a/pkgs/development/python-modules/dep-logic/default.nix +++ b/pkgs/development/python-modules/dep-logic/default.nix @@ -35,6 +35,9 @@ buildPythonPackage rec { description = "Python dependency specifications supporting logical operations"; homepage = "https://github.com/pdm-project/dep-logic"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ tomasajt ]; + maintainers = with lib.maintainers; [ + tomasajt + misilelab + ]; }; } From c07687986badb7930cad566cab2c4d42d877f4ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 13:40:31 +0000 Subject: [PATCH 245/449] python312Packages.aioairzone-cloud: 0.6.11 -> 0.6.12 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 8de3366563e3..30446b44d993 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.6.11"; + version = "0.6.12"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; tag = version; - hash = "sha256-S/9j2QecmcEEn/nhyYe5iZ+nyVxgnXqdap09Ia7rhyY="; + hash = "sha256-maSYT1sd1GTe0Av0NvOUinI/GBYFzjUAemRLx7sDPUk="; }; build-system = [ setuptools ]; From 3fcd89aa6c166b1edb89a415aad5a63baabb5242 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 13:46:37 +0000 Subject: [PATCH 246/449] python312Packages.pybase64: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/pybase64/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 743f68bdb996..55547720b89a 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pybase64"; - version = "1.4.0"; + version = "1.4.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { repo = "pybase64"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-Yl0P9Ygy6IirjSFrutl+fmn4BnUL1nXzbQgADNQFg3I="; + hash = "sha256-mEwFcnqUKCWYYrcjELshJYNqTxQ//4w4OzaWhrzB5Mg="; }; build-system = [ setuptools ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { description = "Fast Base64 encoding/decoding"; mainProgram = "pybase64"; homepage = "https://github.com/mayeut/pybase64"; - changelog = "https://github.com/mayeut/pybase64/releases/tag/v${version}"; + changelog = "https://github.com/mayeut/pybase64/releases/tag/${src.tag}"; license = lib.licenses.bsd2; maintainers = [ ]; }; From e7bc43198684a6302640039679f8bf7bebbfd691 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 14:23:12 +0000 Subject: [PATCH 247/449] python312Packages.pylacus: 1.13.2 -> 1.14.0 --- pkgs/development/python-modules/pylacus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix index 653332482b1e..643fe413cc33 100644 --- a/pkgs/development/python-modules/pylacus/default.nix +++ b/pkgs/development/python-modules/pylacus/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pylacus"; - version = "1.13.2"; + version = "1.14.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "PyLacus"; tag = "v${version}"; - hash = "sha256-EZhlAlZbxcZRpdeAqIwEXV9YPyleW2jnea+e5jRL1EE="; + hash = "sha256-fpu22X4xWRP7Kzp15gIziNCxMmS7P8wb+Zcbr5wlUBc="; }; build-system = [ poetry-core ]; From bc75334210f6b14b1126160c42bd59e42695eccb Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 22 Apr 2025 16:42:51 +0200 Subject: [PATCH 248/449] linuxPackages_latest.prl-tools: 20.2.2-55879 -> 20.3.0-55895 --- pkgs/os-specific/linux/prl-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index b33d649e120a..762833d3eddd 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -43,13 +43,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "20.2.2-55879"; + version = "20.3.0-55895"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-MgToUW9H4NWjY+yBxTqg9wZ2VDNbbDu0tIeHcGZxPkM="; + hash = "sha256-Bs1hgEr5y9TYMGPXGrIOmqMgeyc6wHVo1x7OijTYifY="; }; hardeningDisable = [ From afdf5aaaadf616ad30a6cc9deb48282435381a38 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 22 Apr 2025 17:10:10 +0200 Subject: [PATCH 249/449] python312Packages.pettingzoo: 1.25.1 -> 1.25.0 Diff: https://github.com/Farama-Foundation/PettingZoo/compare/refs/tags/1.25.1...refs/tags/1.25.0 Changelog: https://github.com/Farama-Foundation/PettingZoo/releases/tag/1.25.0 --- pkgs/development/python-modules/pettingzoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix index f5f2926b9a89..71c456c48f36 100644 --- a/pkgs/development/python-modules/pettingzoo/default.nix +++ b/pkgs/development/python-modules/pettingzoo/default.nix @@ -33,14 +33,14 @@ buildPythonPackage rec { pname = "pettingzoo"; - version = "1.25.1"; + version = "1.25.0"; pyproject = true; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "PettingZoo"; tag = version; - hash = "sha256-e25+UNCGjBOAt2f440d6W4lvhxKXRmwLfDvNxeC2Jfk="; + hash = "sha256-hQe/TMlLG//Bn8aaSo0/FPOUvOEyKfztuTIS7SMsUQ4="; }; build-system = [ From a68ee204a5baa4d274dfebb33bda7b21889db08f Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 18 Apr 2025 21:02:44 +0200 Subject: [PATCH 250/449] redisinsight: 2.48.0 -> 2.68.0 --- pkgs/by-name/re/redisinsight/package.nix | 146 +++++++++--------- .../re/redisinsight/remove-cpu-features.patch | 70 +++++++++ 2 files changed, 146 insertions(+), 70 deletions(-) create mode 100644 pkgs/by-name/re/redisinsight/remove-cpu-features.patch diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 2c2f4bd345b6..9f8c88f2b136 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -1,108 +1,108 @@ { lib, stdenv, + fetchFromGitHub, - makeWrapper, - makeDesktopItem, - copyDesktopItems, - fixup-yarn-lock, - yarn, - nodejs_18, - python3, fetchYarnDeps, - electron, - nest-cli, - libsass, - buildPackages, + makeDesktopItem, + + copyDesktopItems, + dart-sass, + makeWrapper, + nodejs_20, pkg-config, + yarnConfigHook, + + electron, + libsecret, sqlite, - xdg-utils, }: let - nodejs = nodejs_18; + nodejs = nodejs_20; in stdenv.mkDerivation (finalAttrs: { pname = "redisinsight"; - version = "2.48.0"; + version = "2.68.0"; src = fetchFromGitHub { owner = "RedisInsight"; repo = "RedisInsight"; rev = finalAttrs.version; - hash = "sha256-ek0Fp8v6j+mZPK2cEuFNrBgInXdYIKBBUg0UD1I51Sg="; + hash = "sha256-rXp3C/Ui3vMBscsxlwU9fRF1bmvMrvXLtmJfGzfh1Rk="; }; - offlineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-ohtU1h6wrg7asXDxTt1Jlzx9GaS3zDrGQD9P9tgzCOE="; + patches = [ + # the `file:` specifier doesn't seem to be supported with fetchYarnDeps + # upstream uses it to point the cpu-features dependency to a stub package + # so it's safe to remove + ./remove-cpu-features.patch + ]; + + baseOfflineCache = fetchYarnDeps { + name = "redisinsight-${finalAttrs.version}-base-offline-cache"; + inherit (finalAttrs) src patches; + hash = "sha256-ORVftwl/8Yrug2MeqWfZTsHNTRJlpKGn2P7JCHUf3do="; }; - feOfflineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/redisinsight/yarn.lock"; - hash = "sha256-9xbIdDeLUEk4eNeK7RTwidqDGinA8SPfcumqml66kTw="; + innerOfflineCache = fetchYarnDeps { + name = "redisinsight-${finalAttrs.version}-inner-offline-cache"; + inherit (finalAttrs) src patches; + postPatch = "cd redisinsight"; + hash = "sha256-yFfkpWV/GD2CcAzb0D3lNZwmqzEN6Bi1MjPyRwClaQ0="; }; apiOfflineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/redisinsight/api/yarn.lock"; - hash = "sha256-4zbffuneTceMEyKb8atTXTFhTv0DhrsRMdepZWgoxMQ="; + name = "redisinsight-${finalAttrs.version}-api-offline-cache"; + inherit (finalAttrs) src patches; + postPatch = "cd redisinsight/api"; + hash = "sha256-go7IR1UsW8TrWjaFSlC6/biUvb9cHo3PgJa16tF0XHo="; }; nativeBuildInputs = [ - yarn - fixup-yarn-lock - nodejs - makeWrapper - (python3.withPackages (ps: [ ps.setuptools ])) - nest-cli - libsass - pkg-config copyDesktopItems + makeWrapper + nodejs + (nodejs.python.withPackages (ps: [ ps.setuptools ])) + pkg-config + yarnConfigHook ]; buildInputs = [ - sqlite - xdg-utils + sqlite # for `sqlite3` node module + libsecret # for `keytar` node module ]; + postPatch = '' + substituteInPlace redisinsight/api/config/default.ts \ + --replace-fail "process['resourcesPath']" "\"$out/share/redisinsight\"" + + # has irrelevant files + rm -r resources/app + ''; + + # will run yarnConfigHook manually later + dontYarnInstallDeps = true; + configurePhase = '' runHook preConfigure - export HOME=$(mktemp -d) - yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + yarnOfflineCache="$baseOfflineCache" yarnConfigHook + cd redisinsight + yarnOfflineCache="$innerOfflineCache" yarnConfigHook + cd api + yarnOfflineCache="$apiOfflineCache" yarnConfigHook + cd ../.. - yarn config --offline set yarn-offline-mirror ${finalAttrs.feOfflineCache} - fixup-yarn-lock redisinsight/yarn.lock - yarn --offline --cwd redisinsight/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - - yarn config --offline set yarn-offline-mirror ${finalAttrs.apiOfflineCache} - fixup-yarn-lock redisinsight/api/yarn.lock - yarn --offline --cwd redisinsight/api/ --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - - patchShebangs node_modules/ - patchShebangs redisinsight/node_modules/ - patchShebangs redisinsight/api/node_modules/ - - mkdir -p "$HOME/.node-gyp/${nodejs.version}" - echo 9 >"$HOME/.node-gyp/${nodejs.version}/installVersion" - ln -sfv "${nodejs}/include" "$HOME/.node-gyp/${nodejs.version}" - export npm_config_nodedir=${nodejs} - - # Build the sqlite3 package. - pushd redisinsight - npm_config_node_gyp="${buildPackages.nodejs}/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js" npm rebuild --verbose --sqlite=${sqlite.dev} sqlite3 - popd - - # Build node-sass - LIBSASS_EXT=auto npm rebuild --verbose node-sass - - substituteInPlace redisinsight/api/config/default.ts \ - --replace-fail "process['resourcesPath']" "\"$out/share/redisinsight\"" \ - - # has irrelevant files - rm -r resources/app + export npm_config_nodedir=${electron.headers} + export npm_config_sqlite=${lib.getDev sqlite} + export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + npm rebuild --verbose --no-progress + cd redisinsight + npm rebuild --verbose --no-progress + cd api + npm rebuild --verbose --no-progress + cd ../.. runHook postConfigure ''; @@ -110,14 +110,20 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - yarn config --offline set yarn-offline-mirror ${finalAttrs.offlineCache} + # force the sass npm dependency to use our own sass binary instead of the bundled one + substituteInPlace node_modules/sass/dist/lib/src/compiler-path.js \ + --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];' yarn --offline build:prod + # TODO: Generate defaults. Currently broken because it requires network access. + # yarn --offline --cwd=redisinsight/api build:defaults + yarn --offline electron-builder \ --dir \ -c.electronDist=${electron.dist} \ - -c.electronVersion=${electron.version} + -c.electronVersion=${electron.version} \ + -c.npmRebuild=false # we've already rebuilt the native libs using the electron headers runHook postBuild ''; @@ -159,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - description = "RedisInsight Redis client powered by Electron"; + description = "Developer GUI for Redis"; homepage = "https://github.com/RedisInsight/RedisInsight"; license = lib.licenses.sspl; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/re/redisinsight/remove-cpu-features.patch b/pkgs/by-name/re/redisinsight/remove-cpu-features.patch new file mode 100644 index 000000000000..a24964a6e322 --- /dev/null +++ b/pkgs/by-name/re/redisinsight/remove-cpu-features.patch @@ -0,0 +1,70 @@ +diff --git a/redisinsight/api/package.json b/redisinsight/api/package.json +index 4a24ac8..fab339c 100644 +--- a/redisinsight/api/package.json ++++ b/redisinsight/api/package.json +@@ -49,7 +49,6 @@ + "@nestjs/platform-socket.io/socket.io": "^4.8.0", + "@nestjs/cli/**/braces": "^3.0.3", + "**/semver": "^7.5.2", +- "**/cpu-features": "file:./stubs/cpu-features", + "**/cross-spawn": "^7.0.5", + "**/redis-parser": "3.0.0", + "winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0" +diff --git a/redisinsight/api/yarn.lock b/redisinsight/api/yarn.lock +index e0e8495..dfed1ae 100644 +--- a/redisinsight/api/yarn.lock ++++ b/redisinsight/api/yarn.lock +@@ -3223,9 +3223,6 @@ cosmiconfig@^8.2.0: + parse-json "^5.2.0" + path-type "^4.0.0" + +-"cpu-features@file:./stubs/cpu-features", cpu-features@~0.0.9: +- version "1.0.0" +- + create-jest@^29.7.0: + version "29.7.0" + resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320" +@@ -7969,7 +7966,6 @@ ssh2@^1.15.0: + asn1 "^0.2.6" + bcrypt-pbkdf "^1.0.2" + optionalDependencies: +- cpu-features "~0.0.9" + nan "^2.18.0" + + ssri@^8.0.0, ssri@^8.0.1: +diff --git a/redisinsight/package.json b/redisinsight/package.json +index 8649be7..354ed42 100644 +--- a/redisinsight/package.json ++++ b/redisinsight/package.json +@@ -16,8 +16,7 @@ + }, + "resolutions": { + "**/semver": "^7.5.2", +- "sqlite3/**/tar": "^6.2.1", +- "**/cpu-features": "file:./api/stubs/cpu-features" ++ "sqlite3/**/tar": "^6.2.1" + }, + "dependencies": { + "keytar": "^7.9.0", +diff --git a/redisinsight/yarn.lock b/redisinsight/yarn.lock +index 7a063ce..22f37a7 100644 +--- a/redisinsight/yarn.lock ++++ b/redisinsight/yarn.lock +@@ -183,9 +183,6 @@ console-control-strings@^1.1.0: + resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== + +-"cpu-features@file:./api/stubs/cpu-features", cpu-features@~0.0.10: +- version "1.0.0" +- + debug@4, debug@^4.3.3: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" +@@ -807,7 +804,6 @@ ssh2@^1.15.0: + asn1 "^0.2.6" + bcrypt-pbkdf "^1.0.2" + optionalDependencies: +- cpu-features "~0.0.10" + nan "^2.20.0" + + ssri@^8.0.0, ssri@^8.0.1: From c960437b9dd002c91f7f0c9d50882fd9e1ea4d73 Mon Sep 17 00:00:00 2001 From: Ivan Sosnov Date: Tue, 22 Apr 2025 17:10:52 +0200 Subject: [PATCH 251/449] mupen64plus: Patch src to remove unused mupen64plus-core headers --- pkgs/by-name/mu/mupen64plus/package.nix | 5 +++++ .../mu/mupen64plus/remove-unused-header.patch | 21 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/by-name/mu/mupen64plus/remove-unused-header.patch diff --git a/pkgs/by-name/mu/mupen64plus/package.nix b/pkgs/by-name/mu/mupen64plus/package.nix index 89d055326e77..9b9230e0ec06 100644 --- a/pkgs/by-name/mu/mupen64plus/package.nix +++ b/pkgs/by-name/mu/mupen64plus/package.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-KX4XGAzXanuOqAnRob4smO1cc1LccWllqA3rWYsh4TE="; }; + patches = [ + # Remove unused SDL2 header that erroneously adds libX11 dependency + ./remove-unused-header.patch + ]; + nativeBuildInputs = [ pkg-config nasm diff --git a/pkgs/by-name/mu/mupen64plus/remove-unused-header.patch b/pkgs/by-name/mu/mupen64plus/remove-unused-header.patch new file mode 100644 index 000000000000..4e56c2a8b09b --- /dev/null +++ b/pkgs/by-name/mu/mupen64plus/remove-unused-header.patch @@ -0,0 +1,21 @@ +From d737386a5422f798dcb196bc58a99808a0843317 Mon Sep 17 00:00:00 2001 +From: Marcin Serwin +Date: Sun, 20 Apr 2025 21:33:00 +0200 +Subject: [PATCH] Remove unused SDL_syswm header + +--- + src/main/eventloop.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/source/mupen64plus-core/src/main/eventloop.c b/source/mupen64plus-core/src/main/eventloop.c +index 6625638b4..eb0fd1919 100644 +--- a/source/mupen64plus-core/src/main/eventloop.c ++++ b/source/mupen64plus-core/src/main/eventloop.c +@@ -21,7 +21,6 @@ + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + #include +-#include + #include + #include + #include From 3ae70f3682209eb4c4f1c807dbdad819827edfe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 22 Apr 2025 17:12:58 +0200 Subject: [PATCH 252/449] prometheus-smartctl-exporter: 0.13.0 -> 0.14.0 https://github.com/prometheus-community/smartctl_exporter/releases/tag/v0.14.0 --- pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix index 7955ff2ca6f9..6a3547a37f91 100644 --- a/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-smartctl-exporter/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "smartctl_exporter"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = pname; tag = "v${version}"; - hash = "sha256-0WppsqDl4nKa6s/dyX9zsUzoqAgStDSBWMM0eolTPdk="; + hash = "sha256-9woQgqkPYKMu8p35aeSv3ua1l35BuMzFT4oCVpmyG2E="; }; - vendorHash = "sha256-Sy/lm55NAhYDdVLli5yQpoRVieJU8RJDRFzd4Len6eg="; + vendorHash = "sha256-bDO7EgCjmObNaYHllczDKuFyKTKH0iCFDSLke6VMsHI="; postPatch = '' substituteInPlace main.go README.md \ From d6b65b5c99d36f6580e1451ca1bc129def861cce Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 22 Apr 2025 19:05:36 +0300 Subject: [PATCH 253/449] pdfcpu: use writableTmpDirAsHomeHook --- pkgs/by-name/pd/pdfcpu/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix index 438d0a12e976..4c538e198f49 100644 --- a/pkgs/by-name/pd/pdfcpu/package.nix +++ b/pkgs/by-name/pd/pdfcpu/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + writableTmpDirAsHomeHook, }: buildGoModule rec { @@ -52,12 +53,16 @@ buildGoModule rec { # No tests doCheck = false; doInstallCheck = true; + installCheckInputs = [ + writableTmpDirAsHomeHook + ]; + # NOTE: Can't use `versionCheckHook` since a writeable $HOME is required and + # `versionCheckHook` uses --ignore-environment installCheckPhase = '' - export HOME=$(mktemp -d) echo checking the version print of pdfcpu $out/bin/pdfcpu version | grep ${version} - $out/bin/pdfcpu version | grep $(cat COMMIT | cut -c1-8) - $out/bin/pdfcpu version | grep $(cat SOURCE_DATE) + $out/bin/pdfcpu version | grep -q $(cat COMMIT | cut -c1-8) + $out/bin/pdfcpu version | grep -q $(cat SOURCE_DATE) ''; subPackages = [ "cmd/pdfcpu" ]; From d080e470f73a7711b06086f71465b701aae99d38 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 22 Apr 2025 19:10:23 +0300 Subject: [PATCH 254/449] pdfcpu: Use a grep-less version parts identification --- pkgs/by-name/pd/pdfcpu/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix index 4c538e198f49..5d85522796a4 100644 --- a/pkgs/by-name/pd/pdfcpu/package.nix +++ b/pkgs/by-name/pd/pdfcpu/package.nix @@ -60,9 +60,14 @@ buildGoModule rec { # `versionCheckHook` uses --ignore-environment installCheckPhase = '' echo checking the version print of pdfcpu - $out/bin/pdfcpu version | grep ${version} - $out/bin/pdfcpu version | grep -q $(cat COMMIT | cut -c1-8) - $out/bin/pdfcpu version | grep -q $(cat SOURCE_DATE) + versionOutput="$($out/bin/pdfcpu version)" + for part in ${version} $(cat COMMIT | cut -c1-8) $(cat SOURCE_DATE); do + if [[ ! "$versionOutput" =~ "$part" ]]; then + echo version output did not contain expected part $part . Output was: + echo "$versionOutput" + exit 3 + fi + done ''; subPackages = [ "cmd/pdfcpu" ]; From 877c0c5fd18335f93aa4154d527da154a36e31a1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 22 Apr 2025 19:11:45 +0300 Subject: [PATCH 255/449] pdfcpu: 0.9.1 -> 0.10.1 Diff: https://github.com/pdfcpu/pdfcpu/compare/v0.9.1...v0.10.1 --- pkgs/by-name/pd/pdfcpu/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix index 5d85522796a4..13b9f144b950 100644 --- a/pkgs/by-name/pd/pdfcpu/package.nix +++ b/pkgs/by-name/pd/pdfcpu/package.nix @@ -1,19 +1,20 @@ { lib, buildGoModule, + stdenv, fetchFromGitHub, writableTmpDirAsHomeHook, }: buildGoModule rec { pname = "pdfcpu"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - hash = "sha256-PJTEaWU/erqVJakvxfB0aYRsi/tcGxYYZjCdEvThmzM="; + hash = "sha256-IODE6/TIXZZC5Z8guFK24iiHTwj84fcf9RiAyFkX2F8="; # Apparently upstream requires that the compiled executable will know the # commit hash and the date of the commit. This information is also presented # in the output of `pdfcpu version` which we use as a sanity check in the @@ -36,7 +37,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-x5EXv2LkJg2LAdml+1I4MzgTvNo6Gl+6e6UHVQ+Z9rU="; + vendorHash = "sha256-27YTR/vYuNggjUIbpKs3/yEJheUXMaLZk8quGPwgNNk="; ldflags = [ "-s" @@ -60,6 +61,9 @@ buildGoModule rec { # `versionCheckHook` uses --ignore-environment installCheckPhase = '' echo checking the version print of pdfcpu + mkdir -p $HOME/"${ + if stdenv.hostPlatform.isDarwin then "Library/Application Support" else ".config" + }"/pdfcpu versionOutput="$($out/bin/pdfcpu version)" for part in ${version} $(cat COMMIT | cut -c1-8) $(cat SOURCE_DATE); do if [[ ! "$versionOutput" =~ "$part" ]]; then From 66b8619cc73ae854a3d64eba7421fb67e09f5088 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 16:14:56 +0000 Subject: [PATCH 256/449] gtree: 1.11.3 -> 1.11.4 --- pkgs/by-name/gt/gtree/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix index 03a40721b2f5..48b27869537a 100644 --- a/pkgs/by-name/gt/gtree/package.nix +++ b/pkgs/by-name/gt/gtree/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-VGlSc0NMl1yMoqLyIwxJn1s24Uw2DAv4BO2hM/7ffXA="; + hash = "sha256-a2kQVn/3PyGZliPOB/2hFULK+YJBv7JVv0p7cbmfsN0="; }; - vendorHash = "sha256-F4obYTU8LNsrNZtgFSf1A1a2N5aG2U94cXr91uVJT4s="; + vendorHash = "sha256-ARmyA8qYKv8xTmpaN77D/NlBfFJFVTGudpBeQG5apso="; subPackages = [ "cmd/gtree" From 1e8fd71b3c2380f17d81cfb071a6d105d7c07bb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 16:27:00 +0000 Subject: [PATCH 257/449] python312Packages.fedora-messaging: 3.7.0 -> 3.7.1 --- pkgs/development/python-modules/fedora-messaging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fedora-messaging/default.nix b/pkgs/development/python-modules/fedora-messaging/default.nix index 9c94ddbcebe3..ddb2a70c6a83 100644 --- a/pkgs/development/python-modules/fedora-messaging/default.nix +++ b/pkgs/development/python-modules/fedora-messaging/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "fedora-messaging"; - version = "3.7.0"; + version = "3.7.1"; pyproject = true; src = fetchFromGitHub { owner = "fedora-infra"; repo = "fedora-messaging"; tag = "v${version}"; - hash = "sha256-MBvFrOUrcPhsFR9yD7yqRM4Yf2StcNvL3sqFIn6XbMc="; + hash = "sha256-ZITCX6MFPpQvhr3OoFT/yxOubXihrljv5hwntUOSpf4="; }; build-system = [ poetry-core ]; From 61183015c28c0fbb75b32e97b3b563dedfde7cb7 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 28 Mar 2025 08:47:33 +0100 Subject: [PATCH 258/449] yarr: 2.4 -> 2.5 Signed-off-by: Christoph Heiss --- pkgs/by-name/ya/yarr/package.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix index e8f39fb3cc1a..85a5b0f95274 100644 --- a/pkgs/by-name/ya/yarr/package.nix +++ b/pkgs/by-name/ya/yarr/package.nix @@ -8,19 +8,17 @@ buildGoModule rec { pname = "yarr"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "nkanaev"; repo = "yarr"; rev = "v${version}"; - hash = "sha256-ZMQ+IX8dZuxyxQhD/eWAe4bGGCVcaCeVgF+Wqs79G+k="; + hash = "sha256-yII0KV4AKIS1Tfhvj588O631JDArnr0/30rNynTSwzk="; }; vendorHash = null; - subPackages = [ "src" ]; - ldflags = [ "-s" "-w" @@ -30,12 +28,9 @@ buildGoModule rec { tags = [ "sqlite_foreign_keys" - "release" + "sqlite_json" ]; - postInstall = '' - mv $out/bin/{src,yarr} - ''; passthru.tests.version = testers.testVersion { package = yarr; From 3590df4d9fba7f8dc45b4c60486fd82880b21f16 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 28 Mar 2025 08:47:59 +0100 Subject: [PATCH 259/449] yarr: switch to versionCheckHook Signed-off-by: Christoph Heiss --- pkgs/by-name/ya/yarr/package.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix index 85a5b0f95274..1329b2556e5a 100644 --- a/pkgs/by-name/ya/yarr/package.nix +++ b/pkgs/by-name/ya/yarr/package.nix @@ -2,8 +2,7 @@ lib, buildGoModule, fetchFromGitHub, - testers, - yarr, + versionCheckHook, }: buildGoModule rec { @@ -31,11 +30,9 @@ buildGoModule rec { "sqlite_json" ]; - - passthru.tests.version = testers.testVersion { - package = yarr; - version = "v${version}"; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; meta = with lib; { description = "Yet another rss reader"; From 200377f502f59998a8403f74b3bbe3ad824e85c3 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 28 Mar 2025 08:48:26 +0100 Subject: [PATCH 260/449] yarr: add `passthru.updateScript` Signed-off-by: Christoph Heiss --- pkgs/by-name/ya/yarr/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix index 1329b2556e5a..b54d2f69f91a 100644 --- a/pkgs/by-name/ya/yarr/package.nix +++ b/pkgs/by-name/ya/yarr/package.nix @@ -3,6 +3,7 @@ buildGoModule, fetchFromGitHub, versionCheckHook, + nix-update-script, }: buildGoModule rec { @@ -34,6 +35,8 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Yet another rss reader"; mainProgram = "yarr"; From 8b4a849da3e0e0dd5b61750e1c0e61684441585c Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Fri, 28 Mar 2025 08:49:20 +0100 Subject: [PATCH 261/449] yarr: add myself as maintainer I'm using the package actively and care about it, maintaining it properly. Signed-off-by: Christoph Heiss --- pkgs/by-name/ya/yarr/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix index b54d2f69f91a..8afed9689fbe 100644 --- a/pkgs/by-name/ya/yarr/package.nix +++ b/pkgs/by-name/ya/yarr/package.nix @@ -43,6 +43,9 @@ buildGoModule rec { homepage = "https://github.com/nkanaev/yarr"; changelog = "https://github.com/nkanaev/yarr/blob/v${version}/doc/changelog.txt"; license = licenses.mit; - maintainers = with maintainers; [ sikmir ]; + maintainers = with maintainers; [ + sikmir + christoph-heiss + ]; }; } From 0bb3023251ec2d2a6edcf820d999500ecb1b42e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 16:47:17 +0000 Subject: [PATCH 262/449] python312Packages.plaid-python: 29.1.0 -> 30.0.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index ef6699440c7a..1e2ddb96d5bb 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "29.1.0"; + version = "30.0.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "plaid_python"; inherit version; - hash = "sha256-wDYjgHg0FbQYNsa3aIAbSl3TtZe9lbe8tti5HZJq4Vc="; + hash = "sha256-qCaXtvLceFg5njbKbqPVHW81HniGswB4HIdWU51/4X4="; }; build-system = [ setuptools ]; From 655b1fe08d2806f2cc09351378f9cdd3f2539b51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 16:51:21 +0000 Subject: [PATCH 263/449] mirrord: 3.137.0 -> 3.139.1 --- pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index d77f266b7c00..e3e5fa4a71e6 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.137.0", + "version": "3.139.1", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.137.0/mirrord_linux_x86_64", - "hash": "sha256-IrsvX7Z+8k3OvtojhWuSeeiO75Okth6MCF3sPs3jIZo=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_linux_x86_64", + "hash": "sha256-VBmPo94DPWh/fvA8ZZfxcqCab9ZNqCVXKLwNcBMZm4E=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.137.0/mirrord_linux_aarch64", - "hash": "sha256-E5Jhx3FsaVNCbvC1SH0D2GPsgQDwKkMPe/wR9MoVzKs=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_linux_aarch64", + "hash": "sha256-ct/NyfVXI/GlR4HKAKX2vKrzU95+u2tO7ltw2aEbji0=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.137.0/mirrord_mac_universal", - "hash": "sha256-PKW2K5ITt1wagtET6MVx2rTn9CcqqujKaYt0XleIyzY=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_mac_universal", + "hash": "sha256-selcbXCfkvKVzNClhYkssVY3CvZFH8uXzYGKhA6N63w=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.137.0/mirrord_mac_universal", - "hash": "sha256-PKW2K5ITt1wagtET6MVx2rTn9CcqqujKaYt0XleIyzY=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.139.1/mirrord_mac_universal", + "hash": "sha256-selcbXCfkvKVzNClhYkssVY3CvZFH8uXzYGKhA6N63w=" } } } From ed1f41e7ddd65e3ff28028176dd4d3fd243347f1 Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Tue, 22 Apr 2025 19:14:33 +0200 Subject: [PATCH 264/449] obsidian: 1.8.9 -> 1.8.10 Changelog: https://obsidian.md/changelog/2025-04-22-desktop-v1.8.10/ --- pkgs/by-name/ob/obsidian/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index beae1bf30a37..d845b9ec919c 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -12,7 +12,7 @@ }: let pname = "obsidian"; - version = "1.8.9"; + version = "1.8.10"; appname = "Obsidian"; meta = with lib; { description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -36,9 +36,9 @@ let url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; hash = if stdenv.hostPlatform.isDarwin then - "sha256-OPK5GI0P52zk7EF8Gk5i15N/WddbNjS47YNy55o2A8k=" + "sha256-3BiPbT1ME75WpR/mTDl8/TI+yq6+WMU+RaZXykUG8yE=" else - "sha256-XVq0nQiyT2HvKQpzJIvhghsGgg4ye7uqZcyA1nH4O/o="; + "sha256-xZoi4Z9JMM/FEPfvjBXEag3pT/uJH9dvFp8qHnTFNKE="; }; icon = fetchurl { From b24513b56e0ca28a14f8759557544e4ffb172d54 Mon Sep 17 00:00:00 2001 From: GueLaKais Date: Fri, 11 Apr 2025 08:41:26 +0200 Subject: [PATCH 265/449] [python313Packages.]scspell: init at 2.3 --- pkgs/by-name/sc/scspell/package.nix | 1 + .../python-modules/scspell/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 48 insertions(+) create mode 100644 pkgs/by-name/sc/scspell/package.nix create mode 100644 pkgs/development/python-modules/scspell/default.nix diff --git a/pkgs/by-name/sc/scspell/package.nix b/pkgs/by-name/sc/scspell/package.nix new file mode 100644 index 000000000000..4910e200fd9a --- /dev/null +++ b/pkgs/by-name/sc/scspell/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication scspell diff --git a/pkgs/development/python-modules/scspell/default.nix b/pkgs/development/python-modules/scspell/default.nix new file mode 100644 index 000000000000..01b91ef12d6d --- /dev/null +++ b/pkgs/development/python-modules/scspell/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyxdg, + setuptools, + versionCheckHook, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "scspell"; + version = "2.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "myint"; + repo = "scspell"; + tag = "v${version}"; + hash = "sha256-XiUdz+uHOJlqo+TWd1V/PvzkGJ2kPXzJJSe5Smfdgec="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pyxdg + ]; + + nativeCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + + versionCheckProgramArg = "--version"; + + pythonImportsCheck = [ "scspell" ]; + + meta = { + description = "A spell checker for source code"; + homepage = "https://github.com/myint/scspell"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ guelakais ]; + mainProgram = "scspell"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a86891b0e65..2fc8a1aaa565 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15493,6 +15493,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate; }; + scspell = callPackage ../development/python-modules/scspell { }; + sdds = callPackage ../development/python-modules/sdds { }; sdjson = callPackage ../development/python-modules/sdjson { }; From c28f36f0f8d78e29c5040c1ad899d66e395f0dcc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 17:35:59 +0000 Subject: [PATCH 266/449] cdncheck: 1.1.14 -> 1.1.15 --- pkgs/by-name/cd/cdncheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 8b03704f2353..8b896d2f8842 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cdncheck"; - version = "1.1.14"; + version = "1.1.15"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${version}"; - hash = "sha256-VbFpZilrPR7Ajs1FY0a+qlkBnwvh+F18fmIf2oYlIFE="; + hash = "sha256-iIK/MnhX+1mZCHeGPEsdUO8T4HOpSA3Fy0fnjgVzG5g="; }; vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4="; From 492248f5364b9c4ae1a137e347c815974eba8cee Mon Sep 17 00:00:00 2001 From: Joaqim Planstedt Date: Tue, 22 Apr 2025 19:36:31 +0200 Subject: [PATCH 267/449] commitizen: 4.5.0 -> 4.6.0 --- pkgs/development/python-modules/commitizen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/commitizen/default.nix b/pkgs/development/python-modules/commitizen/default.nix index 381d55fd5b02..dab1786c7349 100644 --- a/pkgs/development/python-modules/commitizen/default.nix +++ b/pkgs/development/python-modules/commitizen/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "commitizen"; - version = "4.5.0"; + version = "4.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "commitizen-tools"; repo = "commitizen"; tag = "v${version}"; - hash = "sha256-J3jwCgiwM2SOJJ8tpXNxHodyhkMb631cb1Usr8Cnwx0="; + hash = "sha256-tn87aMJf6UeiTaMmG7Yr+1MenGBTSWrNRIM+QME+8uI="; }; pythonRelaxDeps = [ From ebf939da4f6b388a17f1bfd292cee2d3e9f22490 Mon Sep 17 00:00:00 2001 From: wuyoli Date: Tue, 22 Apr 2025 19:53:04 +0200 Subject: [PATCH 268/449] redeclipse: add missing libGL dependency --- pkgs/by-name/re/redeclipse/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/re/redeclipse/package.nix b/pkgs/by-name/re/redeclipse/package.nix index 1bb741380b45..797c5a659ee7 100644 --- a/pkgs/by-name/re/redeclipse/package.nix +++ b/pkgs/by-name/re/redeclipse/package.nix @@ -7,6 +7,7 @@ pkg-config, freetype, zlib, + libGL, libX11, SDL2, SDL2_image, @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ + libGL libX11 freetype zlib From 3901d15967d439f348b935fc29c3f2f72d6defe6 Mon Sep 17 00:00:00 2001 From: April Schleck Date: Wed, 9 Apr 2025 16:34:08 -0700 Subject: [PATCH 269/449] maintainers: add aschleck --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 652c4355be8d..5654fb0b546d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2129,6 +2129,11 @@ githubId = 11493130; name = "Asbjørn Olling"; }; + aschleck = { + name = "April Schleck"; + github = "aschleck"; + githubId = 115766; + }; ascii17 = { name = "Allen Conlon"; email = "software@conlon.dev"; From 5b2a4299660a09ebac2ea66fc1f29a9c2e759822 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 12:37:58 +0000 Subject: [PATCH 270/449] deconz: 2.28.1 -> 2.29.5 --- pkgs/servers/deconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/deconz/default.nix b/pkgs/servers/deconz/default.nix index ab6e4c312178..62dd20a976d7 100644 --- a/pkgs/servers/deconz/default.nix +++ b/pkgs/servers/deconz/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "deconz"; - version = "2.28.1"; + version = "2.29.5"; src = fetchurl { url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${version}-qt5.deb"; - sha256 = "sha256-uHbo0XerUx81o7gXK570iJKiotkQ0aCXUVcyYelMu4k="; + sha256 = "sha256-vUMnxduQfZv6YHA2hRnhbKf9sBvVCCE2n4ZnutmaRpw="; }; nativeBuildInputs = [ From 865ea4ed02521302b5a90112938f8c518bcb6426 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 18:08:51 +0000 Subject: [PATCH 271/449] ruffle: 0-nightly-2025-04-03 -> 0-nightly-2025-04-22 --- pkgs/by-name/ru/ruffle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index 7330bb888093..b8f8eafd5dbb 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -23,17 +23,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0-nightly-2025-04-03"; + version = "0-nightly-2025-04-22"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0-" finalAttrs.version; - hash = "sha256-qhHX+ZnVZOsyzapbvTl/86LM9/GUd+/IkRdVXkmiNT4="; + hash = "sha256-jOTwDH5R1OfsRIeGBo/LquAuQzbKiD8NrHcB76zB5eg="; }; useFetchCargoVendor = true; - cargoHash = "sha256-VDVm6CRq1x2ZZCgz96pvtCwwhq1igWYF3/55ECrwPxg="; + cargoHash = "sha256-oDFB4cWcrzXRG5VOIsblf4/mERJQfRew67MDSXyW644="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = From 902d4f604ffc001a3852f0a42f6adb6bd8f16465 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 22 Apr 2025 11:11:44 -0700 Subject: [PATCH 272/449] buildGoModule: add goSum attribute to make goModules rebuild (#399532) --- pkgs/build-support/go/module.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index db494fc82b27..9b692b4f6dec 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -37,6 +37,9 @@ lib.extendMkDerivation { "buildGoModule: vendorHash is missing" ), + # The go.sum file to track which can cause rebuilds. + goSum ? null, + # Whether to delete the vendor folder supplied with the source. deleteVendor ? false, @@ -69,13 +72,24 @@ lib.extendMkDerivation { vendorHash deleteVendor proxyVendor + goSum ; goModules = if (finalAttrs.vendorHash == null) then "" else (stdenv.mkDerivation { - name = "${finalAttrs.name or "${finalAttrs.pname}-${finalAttrs.version}"}-go-modules"; + name = + let + prefix = "${finalAttrs.name or "${finalAttrs.pname}-${finalAttrs.version}"}-"; + + # If "goSum" is supplied then it can cause "goModules" to rebuild. + # Attach the hash name of the "go.sum" file so we can rebuild when it changes. + suffix = lib.optionalString ( + finalAttrs.goSum != null + ) "-${(lib.removeSuffix "-go.sum" (lib.removePrefix "${builtins.storeDir}/" finalAttrs.goSum))}"; + in + "${prefix}go-modules${suffix}"; nativeBuildInputs = (finalAttrs.nativeBuildInputs or [ ]) ++ [ go @@ -83,7 +97,7 @@ lib.extendMkDerivation { cacert ]; - inherit (finalAttrs) src modRoot; + inherit (finalAttrs) src modRoot goSum; # The following inheritance behavior is not trivial to expect, and some may # argue it's not ideal. Changing it may break vendor hashes in Nixpkgs and From 1642cac9ec2d541d7e3e8cbf9b3f229c1096c1df Mon Sep 17 00:00:00 2001 From: April Schleck Date: Wed, 9 Apr 2025 15:40:57 -0700 Subject: [PATCH 273/449] dalphaball: init at 0-unstable-2023-06-15 DAlphaBall computes the surface area of unions of many small balls, which is used by software for designing protein. For example https://github.com/martinpacesa/BindCraft and https://github.com/RosettaCommons/RFDesign both depend on it. --- pkgs/by-name/da/dalphaball/package.nix | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/da/dalphaball/package.nix diff --git a/pkgs/by-name/da/dalphaball/package.nix b/pkgs/by-name/da/dalphaball/package.nix new file mode 100644 index 000000000000..5a1142f993e2 --- /dev/null +++ b/pkgs/by-name/da/dalphaball/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gfortran, + gmp, +}: + +stdenv.mkDerivation rec { + pname = "dalphaball"; + version = "0-unstable-2023-06-15"; + + src = fetchFromGitHub { + owner = "outpace-bio"; + repo = "DAlphaBall"; + rev = "7b9dc05fa2a40f7ea36c6d89973d150eaed459d9"; + hash = "sha256-mUxEL9b67z/mG+0pcM5uQ/jPAfEUpJlXOXPmqDea+U4="; + }; + + sourceRoot = "${src.name}/src"; + strictDeps = true; + + nativeBuildInputs = [ + gfortran + ]; + + buildInputs = [ + gfortran.cc.lib + gmp + ]; + + installPhase = '' + runHook preInstall + install -Dm755 DAlphaBall.gcc $out/bin/DAlphaBall + runHook postInstall + ''; + + meta = { + description = "Computes the surface area and volume of unions of many balls"; + mainProgram = "DAlphaBall"; + homepage = "https://github.com/outpace-bio/DAlphaBall"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ aschleck ]; + platforms = lib.platforms.unix; + }; +} From 1e08d9e6a0f767f26f34e7b06b667d2f1fe5b6c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 18:15:25 +0000 Subject: [PATCH 274/449] python312Packages.boto3-stubs: 1.37.37 -> 1.37.38 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index c9d5f83acfe2..07acc89e41a8 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.37.37"; + version = "1.37.38"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-5Ge3qmTJb3Embj09djzYJuNOQGPVEcDexDQdMHHTQow="; + hash = "sha256-14wt6I6fGmC+8Fz61bjtwFHxdivghlyDvr5xZEj1ZRA="; }; build-system = [ setuptools ]; From 96f4968703d18f8c4a2ebc28fa70dfd3dc190f10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 18:16:42 +0000 Subject: [PATCH 275/449] python312Packages.botocore-stubs: 1.37.37 -> 1.37.38 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index cf091ef16a56..def4762de9e7 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.37.37"; + version = "1.37.38"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-0aWPUp6VSYknmqibg5FidCjJWOBj8CIEqgztpOMTYBU="; + hash = "sha256-ukdVtQZJZJ8xKbjympz8Rj1l1SlgXdOI8dpi+DbVYGc="; }; nativeBuildInputs = [ setuptools ]; From 3dfffb742583d8391ed5e32f4913f80e8f1c4653 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 22 Apr 2025 20:26:25 +0200 Subject: [PATCH 276/449] evcc: 0.203.1 -> 0.203.2 https://github.com/evcc-io/evcc/releases/tag/0.203.2 --- pkgs/by-name/ev/evcc/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 0a4ed0777d54..a5af18874903 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.203.1"; + version = "0.203.2"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-TdEK63F7LQwyj6aPA1NKqZLUn2cnP0XgS51vqfzNVJ8="; + hash = "sha256-OMZUJ98oiKKFsgSKLxQtdnoId4yHBNO+wKjhsgZNo6w="; }; - vendorHash = "sha256-TqtJlsT/uaqQe/mAh1hw92N3uw6GLkdwh9aIMmdNbkY="; + vendorHash = "sha256-oC6aX8hAQfLpEEkpsPYm6ALxFqReKgDiAFse2WJGt60="; commonMeta = with lib; { license = licenses.mit; @@ -52,7 +52,7 @@ buildGo124Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-LaP6Ee13OKwRoAZ7oF/nH8rE5zqFYzrhq6CwPaaF9SE="; + hash = "sha256-5d6GoFrNgMV6Teb9/cE8MYrO7FowlZfwcGxHjsymQWM="; }; nativeBuildInputs = [ From 896cb724decc16528b7372e3beee77ffa85b68c0 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Tue, 22 Apr 2025 19:56:42 +0200 Subject: [PATCH 277/449] php81Extensions.ctype: fix build --- pkgs/top-level/php-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 84cd4b2370cc..24340f26413f 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -432,10 +432,12 @@ lib.makeScope pkgs.newScope ( { name = "calendar"; } { name = "ctype"; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' - # Broken test on aarch64-darwin - rm ext/ctype/tests/lc_ctype_inheritance.phpt - ''; + postPatch = + lib.optionalString (stdenv.hostPlatform.isDarwin && lib.versionAtLeast php.version "8.2") + # Broken test on aarch64-darwin + '' + rm ext/ctype/tests/lc_ctype_inheritance.phpt + ''; } { name = "curl"; From 5917b567ff1df7c419019d981433bd648d0e8219 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 18:54:46 +0000 Subject: [PATCH 278/449] quill-log: 9.0.1 -> 9.0.2 --- pkgs/by-name/qu/quill-log/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix index 18330dd65404..eea168fec2a9 100644 --- a/pkgs/by-name/qu/quill-log/package.nix +++ b/pkgs/by-name/qu/quill-log/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "quill-log"; - version = "9.0.1"; + version = "9.0.2"; src = fetchFromGitHub { owner = "odygrd"; repo = "quill"; rev = "v${version}"; - hash = "sha256-RPffzaFrkV7w40CAQLAXV47EyWv4M7pShaY7Phsmw1o="; + hash = "sha256-8BXdSITZKdJSstS4LbOCT9BedFHbmd/6bAPiQsCC+8Y="; }; nativeBuildInputs = [ cmake ]; From eb6ada290ba80d587280b31d16180005289a0b3a Mon Sep 17 00:00:00 2001 From: Artem Leshchev Date: Tue, 22 Apr 2025 14:27:17 -0500 Subject: [PATCH 279/449] python3Packages.empy: fix license The license was changed at version 4.0. --- pkgs/development/python-modules/empy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/empy/default.nix b/pkgs/development/python-modules/empy/default.nix index 347a8145ba24..abb1b361d1bd 100644 --- a/pkgs/development/python-modules/empy/default.nix +++ b/pkgs/development/python-modules/empy/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { description = "Templating system for Python"; mainProgram = "em.py"; maintainers = with maintainers; [ nkalupahana ]; - license = licenses.lgpl21Only; + license = licenses.bsd3; }; } From e9e3701b5f980e2d8fd546e2a4d589418cd8f779 Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Tue, 22 Apr 2025 21:26:19 +0200 Subject: [PATCH 280/449] python313Packages.pytibber: 0.31.0 -> 0.31.1 Diff: https://github.com/Danielhiversen/pyTibber/compare/refs/tags/0.31.0...0.31.1 Changelog: https://github.com/Danielhiversen/pyTibber/releases/tag/0.31.1 --- pkgs/development/python-modules/pytibber/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 35dd27c37979..bc6177c1a2ab 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.31.0"; + version = "0.31.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; tag = version; - hash = "sha256-NCzgh/hPbbKgJLvfOzXSkOCrV53w/F0F5TglQ2gOAJk="; + hash = "sha256-qQ/F7SF91wiWelV6kFBDjv5UmrrcD5TmwCsNuG5c25s="; }; build-system = [ setuptools ]; From e09224ce6262bac5bca621008d36216534bd22fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 12:43:46 +0000 Subject: [PATCH 281/449] nim-unwrapped: 2.2.2 -> 2.2.4 --- pkgs/by-name/ni/nim-unwrapped-2_2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix index 0ecdbe92b511..b9d371763bd0 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix @@ -85,12 +85,12 @@ in stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.2.2"; + version = "2.2.4"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-f8ybh6ycC6Wkif3Cbi2EgM6Wo8piIQDWJn75ITX9ih8="; + hash = "sha256-+CtBl1D8zlYfP4l6BIaxgBhoRddvtdmfJIzhZhCBicc="; }; buildInputs = [ From bb3e5ad57cb21336e1ce1085414c5255873c1433 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 22 Apr 2025 15:40:15 +0000 Subject: [PATCH 282/449] nim-2_0: 2.0.12 -> 2.0.16 --- pkgs/by-name/ni/nim-unwrapped-2_0/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix index ab8d1dc8120a..168dacbff336 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix @@ -7,10 +7,10 @@ nim-unwrapped-2_2.overrideAttrs ( finalAttrs: previousAttrs: { - version = "2.0.12"; + version = "2.0.16"; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-xIh5ScXrjX+an1bwrrK/IUD6vwruDwWAoxnioJgVczo="; + hash = "sha256-sucMbAEbVQcJMJCoiH+iUncyCP0EfuOPhWLiVp5cN4o="; }; patches = lib.lists.unique ( builtins.filter ( From c7ddb3d6ce563cc2835ef0f7ea5be0e3178c4c73 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 22 Apr 2025 15:45:57 +0000 Subject: [PATCH 283/449] syndicate_utils: 20250110 -> 20250422 --- pkgs/by-name/sy/syndicate_utils/package.nix | 4 +-- pkgs/by-name/sy/syndicate_utils/sbom.json | 28 ++++++++++----------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/sy/syndicate_utils/package.nix b/pkgs/by-name/sy/syndicate_utils/package.nix index c3a0ffb93ab2..ee314bdb22bb 100644 --- a/pkgs/by-name/sy/syndicate_utils/package.nix +++ b/pkgs/by-name/sy/syndicate_utils/package.nix @@ -17,7 +17,7 @@ buildNimSbom (finalAttrs: { owner = "ehmry"; repo = "syndicate_utils"; rev = finalAttrs.version; - hash = "sha256-X8sb/2mkhVp0jJpTk9uYSDhAVui4jHl355amRCnkNhA="; + hash = "sha256-zHVL2A5mAZX73Xk6Pcs02wHCAVfsOYxDO8/yKX0FvBs="; }; buildInputs = [ @@ -28,8 +28,6 @@ buildNimSbom (finalAttrs: { openssl ]; - nimFlags = [ "--define:nimPreviewHashRef" ]; - meta = finalAttrs.src.meta // { description = "Utilities for the Syndicated Actor Model"; homepage = "https://git.syndicate-lang.org/ehmry/syndicate_utils"; diff --git a/pkgs/by-name/sy/syndicate_utils/sbom.json b/pkgs/by-name/sy/syndicate_utils/sbom.json index 46a8e74877cf..c524b9cb0ec9 100644 --- a/pkgs/by-name/sy/syndicate_utils/sbom.json +++ b/pkgs/by-name/sy/syndicate_utils/sbom.json @@ -6,8 +6,8 @@ "type": "application", "bom-ref": "pkg:nim/syndicate_utils", "name": "syndicate_utils", - "description": "Utilites for Syndicated Actors and Synit", - "version": "20250110", + "description": "Utilities for Syndicated Actors and Synit", + "version": "20250422", "authors": [ { "name": "Emery Hemingway" @@ -96,7 +96,7 @@ "version": "trunk", "externalReferences": [ { - "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d.tar.gz", + "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/9c3dbbaa661dfc191ccb5be791a78cf977adec8b.tar.gz", "type": "source-distribution" }, { @@ -111,19 +111,19 @@ }, { "name": "nix:fod:path", - "value": "/nix/store/sg7dxaz3g2qgb2sp0lzyyl2iwddbxljl-source" + "value": "/nix/store/crza0j3plp9a0bw78cinyk6hwhn3llcf-source" }, { "name": "nix:fod:rev", - "value": "eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d" + "value": "9c3dbbaa661dfc191ccb5be791a78cf977adec8b" }, { "name": "nix:fod:sha256", - "value": "1gjjybfgw99dm8m5i6nm5zsgs7bavkqw6pgia8pc4n41h4ppshiw" + "value": "08pa25f7d0x1228hmrpzn7g2jd1bwip4fvihvw4mx335ssx317kw" }, { "name": "nix:fod:url", - "value": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/eb3c522f9f051ceeef4c8518820fcd90fe2a2c2d.tar.gz" + "value": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/9c3dbbaa661dfc191ccb5be791a78cf977adec8b.tar.gz" }, { "name": "nix:fod:ref", @@ -139,10 +139,10 @@ "type": "library", "bom-ref": "pkg:nim/preserves", "name": "preserves", - "version": "20241221", + "version": "20250214", "externalReferences": [ { - "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5.tar.gz", + "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e.tar.gz", "type": "source-distribution" }, { @@ -157,23 +157,23 @@ }, { "name": "nix:fod:path", - "value": "/nix/store/jr5la48ywfs0ghn5v5256rjqwyxzmd7a-source" + "value": "/nix/store/1d8nbd5nfqpl6l3c7c783h6r0gc47vwf-source" }, { "name": "nix:fod:rev", - "value": "c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5" + "value": "21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e" }, { "name": "nix:fod:sha256", - "value": "1fh8r9mhr3f4mf45fc1shnqfxdrdlif1nsvqd016ni16vmcvclmc" + "value": "136kr6pj5rv3184ykishbkmg86ss85nzygy5wc1lr9l0pgwx6936" }, { "name": "nix:fod:url", - "value": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/c9f5806b153b2fd3ed8f868f8cf36cdbc25cd3d5.tar.gz" + "value": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/21480c2fd0a6cc6ecfd34fb532ed975b135b0b8e.tar.gz" }, { "name": "nix:fod:ref", - "value": "20241221" + "value": "20250214" }, { "name": "nix:fod:srcDir", From c722b52fae28176ab116a6de96c56cda6073a72d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 19:35:48 +0000 Subject: [PATCH 284/449] minio-warp: 1.1.1 -> 1.1.2 --- pkgs/by-name/mi/minio-warp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix index 82c3baa2e8f3..45c438eb41da 100644 --- a/pkgs/by-name/mi/minio-warp/package.nix +++ b/pkgs/by-name/mi/minio-warp/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "minio-warp"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "minio"; repo = "warp"; rev = "v${version}"; - hash = "sha256-zRRvY/PpLSY8cx3vqcAGfVK7FJKzFnxtghhIwrlUh+Y="; + hash = "sha256-loyEGnJ6ExWMUyArNNpQGzpagFgwlNzaNBO8EPXkMws="; }; - vendorHash = "sha256-Qyb8ivuZplbOIxoS2cC+2FSZbW7CnChv1jaIKkCzgN4="; + vendorHash = "sha256-/+vKs5NzzyP9Ihz+zbxGf/OEHD0kaf0wZzE0Sg++3bE="; # See .goreleaser.yml ldflags = [ From b29c65613c8e5b24520e41f9c8514c4a32b8257b Mon Sep 17 00:00:00 2001 From: FKouhai Date: Tue, 22 Apr 2025 21:54:58 +0200 Subject: [PATCH 285/449] various: remove linuxmobile as maintainer --- maintainers/maintainer-list.nix | 6 ------ pkgs/by-name/fu/fum/package.nix | 2 +- pkgs/by-name/tu/tuicam/package.nix | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5654fb0b546d..0223bb59adf4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13888,12 +13888,6 @@ githubId = 74221543; name = "Moritz Goltdammer"; }; - linuxmobile = { - email = "bdiez19@gmail.com"; - github = "linuxmobile"; - githubId = 10554636; - name = "Braian A. Diez"; - }; linuxwhata = { email = "linuxwhata@qq.com"; matrix = "@lwa:envs.net"; diff --git a/pkgs/by-name/fu/fum/package.nix b/pkgs/by-name/fu/fum/package.nix index 5e44c8745a31..cc95bfdf5ff2 100644 --- a/pkgs/by-name/fu/fum/package.nix +++ b/pkgs/by-name/fu/fum/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/qxb3/fum"; changelog = "https://github.com/qxb3/fum/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ linuxmobile ]; + maintainers = with lib.maintainers; [ FKouhai ]; platforms = lib.platforms.linux; mainProgram = "fum"; }; diff --git a/pkgs/by-name/tu/tuicam/package.nix b/pkgs/by-name/tu/tuicam/package.nix index 338519fbeea1..344478d30ab1 100644 --- a/pkgs/by-name/tu/tuicam/package.nix +++ b/pkgs/by-name/tu/tuicam/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/hlsxx/tuicam"; changelog = "https://github.com/hlsxx/tuicam/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ linuxmobile ]; + maintainers = with lib.maintainers; [ FKouhai ]; platforms = lib.platforms.linux; mainProgram = "tuicam"; }; From 576ab0667b5c06a63f2ea291596b0074df95b7be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 20:00:30 +0000 Subject: [PATCH 286/449] nix-search-tv: 2.1.5 -> 2.1.6 --- pkgs/by-name/ni/nix-search-tv/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nix-search-tv/package.nix b/pkgs/by-name/ni/nix-search-tv/package.nix index 67b9f404a47e..8b4863e34fae 100644 --- a/pkgs/by-name/ni/nix-search-tv/package.nix +++ b/pkgs/by-name/ni/nix-search-tv/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "nix-search-tv"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "3timeslazy"; repo = "nix-search-tv"; tag = "v${finalAttrs.version}"; - hash = "sha256-9tOrEcSZ6chVKq82zCoFCy3as71p5k7poXXFO/mXhw0="; + hash = "sha256-AgFedZzkNuTXJFzIs+U2m0nELjFUwESYUbUCSmh0G3Q="; }; - vendorHash = "sha256-hgZWppiy+P3BfoKOMClzCot1shKcGTZnsMCJ/ItxckE="; + vendorHash = "sha256-hBkro++bjYGrhnq8rmSuKTgnkicagOHTkfRYluSBUX8="; subPackages = [ "cmd/nix-search-tv" ]; From 91bca2c3ea5616d16e833d1533bdc4c9b88c523b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 20:02:13 +0000 Subject: [PATCH 287/449] trufflehog: 3.88.24 -> 3.88.25 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 5682130d7c79..3a3409bf68ae 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.88.24"; + version = "3.88.25"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; tag = "v${version}"; - hash = "sha256-50IKxJAuR8IMcKArnIE8BHlssKSGthfFVc+h+M/+204="; + hash = "sha256-yAGeB2+FGtdL5zbJkYL96RPf+jBoCSPz1OpFV9tsGdk="; }; - vendorHash = "sha256-eyAHR9tx9Fvih/KZZX8FtcDZyMn93X6b08iADEyIiZw="; + vendorHash = "sha256-uNJmM1xVaSaAGolb1ArRkr3iQ8Yar2MEY8/G0AhGAuU="; nativeBuildInputs = [ makeWrapper ]; From ba3fecf0ef5f063197943dbbed748595996cbdbf Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 22 Apr 2025 22:08:33 +0200 Subject: [PATCH 288/449] nixos/yarr: init Signed-off-by: Christoph Heiss --- .../manual/release-notes/rl-2505.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/yarr.nix | 118 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/yarr.nix | 19 +++ pkgs/by-name/ya/yarr/package.nix | 7 +- 6 files changed, 147 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/misc/yarr.nix create mode 100644 nixos/tests/yarr.nix diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 6e0e1ef517b9..680d3ffb55be 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -160,6 +160,8 @@ - [GlitchTip](https://glitchtip.com/), an open source Sentry API compatible error tracking platform. Available as [services.glitchtip](#opt-services.glitchtip.enable). +- [`yarr`](https://github.com/nkanaev/yarr), a small, web-based feed aggregator and RSS reader. Available as [services.yarr](#opt-services.yarr.enable). + - [Stash](https://github.com/stashapp/stash), An organizer for your adult videos/images, written in Go. Available as [services.stash](#opt-services.stash.enable). - [vsmartcard-vpcd](https://frankmorgner.github.io/vsmartcard/virtualsmartcard/README.html), a virtual smart card driver. Available as [services.vsmartcard-vpcd](#opt-services.vsmartcard-vpcd.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8ecc712feb87..b59b1ad415cc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -929,6 +929,7 @@ ./services/misc/weechat.nix ./services/misc/workout-tracker.nix ./services/misc/xmrig.nix + ./services/misc/yarr.nix ./services/misc/ytdl-sub.nix ./services/misc/zoneminder.nix ./services/misc/zookeeper.nix diff --git a/nixos/modules/services/misc/yarr.nix b/nixos/modules/services/misc/yarr.nix new file mode 100644 index 000000000000..62cc54b9de19 --- /dev/null +++ b/nixos/modules/services/misc/yarr.nix @@ -0,0 +1,118 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + types + mkIf + mkOption + mkEnableOption + mkPackageOption + optionalString + ; + + cfg = config.services.yarr; +in +{ + meta.maintainers = with lib.maintainers; [ christoph-heiss ]; + + options.services.yarr = { + enable = mkEnableOption "Yet another rss reader"; + + package = mkPackageOption pkgs "yarr" { }; + + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Environment file for specifying additional settings such as secrets. + + See `yarr -help` for all available options. + ''; + }; + + address = mkOption { + type = types.str; + default = "localhost"; + description = "Address to run server on."; + }; + + port = mkOption { + type = types.port; + default = 7070; + description = "Port to run server on."; + }; + + baseUrl = mkOption { + type = types.nullOr types.str; + default = null; + description = "Base path of the service url."; + }; + + authFilePath = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to a file containing username:password. `null` means no authentication required to use the service."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.yarr = { + description = "Yet another rss reader"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment.XDG_CONFIG_HOME = "/var/lib/yarr/.config"; + + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + + StateDirectory = "yarr"; + StateDirectoryMode = "0700"; + WorkingDirectory = "/var/lib/yarr"; + EnvironmentFile = cfg.environmentFile; + + LoadCredential = mkIf (cfg.authFilePath != null) "authfile:${cfg.authFilePath}"; + + DynamicUser = true; + DevicePolicy = "closed"; + LockPersonality = "yes"; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = "AF_INET AF_INET6"; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + UMask = "0077"; + + ExecStart = '' + ${lib.getExe cfg.package} \ + -db storage.db \ + -addr "${cfg.address}:${toString cfg.port}" \ + ${optionalString (cfg.baseUrl != null) "-base ${cfg.baseUrl}"} \ + ${optionalString (cfg.authFilePath != null) "-auth-file /run/credentials/yarr.service/authfile"} + ''; + }; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5f9ae823011f..78cc8b6c3d68 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1478,6 +1478,7 @@ in xterm = runTest ./xterm.nix; xxh = runTest ./xxh.nix; yabar = runTest ./yabar.nix; + yarr = runTest ./yarr.nix; ydotool = handleTest ./ydotool.nix { }; yggdrasil = runTest ./yggdrasil.nix; your_spotify = runTest ./your_spotify.nix; diff --git a/nixos/tests/yarr.nix b/nixos/tests/yarr.nix new file mode 100644 index 000000000000..a35d574a5af1 --- /dev/null +++ b/nixos/tests/yarr.nix @@ -0,0 +1,19 @@ +{ lib, pkgs, ... }: + +{ + name = "yarr"; + meta.maintainers = with lib.maintainers; [ christoph-heiss ]; + + nodes.machine = + { pkgs, ... }: + { + services.yarr.enable = true; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("yarr.service") + machine.wait_for_open_port(7070) + machine.succeed("curl -sSf http://localhost:7070 | grep 'yarr!'") + ''; +} diff --git a/pkgs/by-name/ya/yarr/package.nix b/pkgs/by-name/ya/yarr/package.nix index 8afed9689fbe..cc3a5581b56a 100644 --- a/pkgs/by-name/ya/yarr/package.nix +++ b/pkgs/by-name/ya/yarr/package.nix @@ -1,9 +1,11 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, versionCheckHook, nix-update-script, + nixosTests, }: buildGoModule rec { @@ -35,7 +37,10 @@ buildGoModule rec { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux nixosTests.yarr; + }; meta = with lib; { description = "Yet another rss reader"; From 70566d844ea43f614e99d946eb61a576ab5f2dc4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 20:27:58 +0000 Subject: [PATCH 289/449] phpPackages.phpstan: 2.1.11 -> 2.1.12 --- pkgs/development/php-packages/phpstan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix index 77239e501a15..7072103a525f 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -7,16 +7,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpstan"; - version = "2.1.11"; + version = "2.1.12"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; tag = finalAttrs.version; - hash = "sha256-K9XhLR5b3bPIt/6lyBxM6y7SgPZmvy9TvRpyohOwtDM="; + hash = "sha256-KX5wvt6MGzxp24z9ga2U9NL1F9qUDeqLaILoISfB7dQ="; }; - vendorHash = "sha256-I3v585gdcBzA24PavB9zBt2JfW1w7WdY94cxLnOjQxg="; + vendorHash = "sha256-JFrRZMB8ety+ZJSIgaTRCTbE+t2HfAUmtyBLHwEg+9A="; composerStrictValidation = false; doInstallCheck = true; From b1398793b303e35b4c0bbfe55d10a6428b38258d Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 22 Apr 2025 22:37:14 +0200 Subject: [PATCH 290/449] fx-cast-bridge: bump nan version to support newer nodejs versions --- pkgs/by-name/fx/fx-cast-bridge/bump-nan.patch | 31 +++++++++++++++++++ pkgs/by-name/fx/fx-cast-bridge/package.nix | 18 ++++++++--- 2 files changed, 44 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/fx/fx-cast-bridge/bump-nan.patch diff --git a/pkgs/by-name/fx/fx-cast-bridge/bump-nan.patch b/pkgs/by-name/fx/fx-cast-bridge/bump-nan.patch new file mode 100644 index 000000000000..c487fddd754a --- /dev/null +++ b/pkgs/by-name/fx/fx-cast-bridge/bump-nan.patch @@ -0,0 +1,31 @@ +diff --git a/package-lock.json b/package-lock.json +index c856a73..59d3cc5 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -1240,9 +1240,10 @@ + } + }, + "node_modules/nan": { +- "version": "2.15.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", +- "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" ++ "version": "2.22.2", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz", ++ "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==", ++ "license": "MIT" + }, + "node_modules/napi-build-utils": { + "version": "1.0.2", +@@ -3189,9 +3190,9 @@ + "dev": true + }, + "nan": { +- "version": "2.15.0", +- "resolved": "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz", +- "integrity": "sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==" ++ "version": "2.22.2", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz", ++ "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==" + }, + "napi-build-utils": { + "version": "1.0.2", diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix index 99e7e80a9431..b5276379abc0 100644 --- a/pkgs/by-name/fx/fx-cast-bridge/package.nix +++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix @@ -3,7 +3,7 @@ buildNpmPackage, fetchFromGitHub, avahi-compat, - nodejs_18, + nodejs_22, python3, stdenv, }: @@ -12,7 +12,7 @@ buildNpmPackage rec { pname = "fx-cast-bridge"; version = "0.3.1"; - nodejs = nodejs_18; + nodejs = nodejs_22; src = fetchFromGitHub { owner = "hensm"; @@ -20,15 +20,23 @@ buildNpmPackage rec { rev = "v${version}"; hash = "sha256-hB4NVJW2exHoKsMp0CKzHerYgj8aR77rV+ZsCoWA1Dg="; }; + sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-GLrDRZqKcX1PDGREx+MLZ1TEjr88r9nz4TvZ9nvo40g="; + + patches = [ + # to support later versions of nodejs + # generated by running `npm update nan --ignore-scripts` in the ./app dir + ./bump-nan.patch + ]; + + npmDepsHash = "sha256-23EZC9v4ODu3k+O9NDVhOdGJ/FfaiTVWtTrK8liAevk="; nativeBuildInputs = [ python3 ]; buildInputs = [ avahi-compat ]; postPatch = '' substituteInPlace bin/lib/paths.js \ - --replace "../../../" "../../" + --replace-fail "../../../" "../../" ''; dontNpmInstall = true; @@ -38,7 +46,7 @@ buildNpmPackage rec { mkdir -p $out/{bin,lib/mozilla/native-messaging-hosts} substituteInPlace dist/app/fx_cast_bridge.json \ - --replace "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge" + --replace-fail "$(realpath dist/app/fx_cast_bridge.sh)" "$out/bin/fx_cast_bridge" mv dist/app/fx_cast_bridge.json $out/lib/mozilla/native-messaging-hosts rm dist/app/fx_cast_bridge.sh From 750167887ed3c6fa27bd35fc118fa327943abef7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 22 Apr 2025 22:20:08 +0200 Subject: [PATCH 291/449] python312Packages.papermill: fix, cleanup --- .../python-modules/papermill/default.nix | 82 +++++++++++-------- 1 file changed, 49 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index bbafe4f048a4..594fd654d594 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -1,32 +1,41 @@ { lib, stdenv, - aiohttp, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies ansicolors, + click, + entrypoints, + nbclient, + nbformat, + pyyaml, + requests, + tenacity, + tqdm, + pythonAtLeast, + aiohttp, + + # optional-dependencies azure-datalake-store, azure-identity, azure-storage-blob, - boto3, - buildPythonPackage, - click, - entrypoints, - fetchFromGitHub, gcsfs, + pygithub, + pyarrow, + boto3, + + # tests ipykernel, moto, - nbclient, - nbformat, - pyarrow, - pygithub, pytest-mock, pytestCheckHook, - pythonAtLeast, - pythonOlder, - pyyaml, - requests, - setuptools, - tenacity, - tqdm, + versionCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { @@ -34,8 +43,6 @@ buildPythonPackage rec { version = "2.6.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "nteract"; repo = "papermill"; @@ -46,15 +53,15 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - click - pyyaml - nbformat - nbclient - tqdm - requests - entrypoints - tenacity ansicolors + click + entrypoints + nbclient + nbformat + pyyaml + requests + tenacity + tqdm ] ++ lib.optionals (pythonAtLeast "3.12") [ aiohttp ]; optional-dependencies = { @@ -75,17 +82,25 @@ buildPythonPackage rec { moto pytest-mock pytestCheckHook + versionCheckHook + writableTmpDirAsHomeHook ] ++ optional-dependencies.azure ++ optional-dependencies.s3 ++ optional-dependencies.gcs; - - preCheck = '' - export HOME=$(mktemp -d) - ''; + versionCheckProgramArg = "--version"; pythonImportsCheck = [ "papermill" ]; + # Using pytestFlagsArray to prevent disabling false positives + pytestFlagsArray = [ + # AssertionError: 'error' != 'display_data' + "--deselect=papermill/tests/test_execute.py::TestBrokenNotebook2::test" + + # AssertionError: '\x1b[31mSystemExit\x1b[39m\x1b[31m:\x1b[39m 1\n' != '\x1b[0;31mSystemExit\x1b[0m\x1b[0;31m:\x1b[0m 1\n' + "--deselect=papermill/tests/test_execute.py::TestOutputFormatting::test_output_formatting" + ]; + disabledTests = [ # pytest 8 compat @@ -103,10 +118,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - meta = with lib; { + meta = { description = "Parametrize and run Jupyter and interact with notebooks"; homepage = "https://github.com/nteract/papermill"; - license = licenses.bsd3; + changelog = "https://papermill.readthedocs.io/en/latest/changelog.html"; + license = lib.licenses.bsd3; maintainers = [ ]; mainProgram = "papermill"; }; From fbe7895e0f0ee9cc1847760542eacc02b7c35b8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 20:46:43 +0000 Subject: [PATCH 292/449] google-alloydb-auth-proxy: 1.13.0 -> 1.13.1 --- pkgs/by-name/go/google-alloydb-auth-proxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix index 8cd72fa97153..47b0cd93799f 100644 --- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix +++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "google-alloydb-auth-proxy"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "alloydb-auth-proxy"; tag = "v${version}"; - hash = "sha256-yEtpCX7/QJsuFhCJFHBFQQiAMs+HV4ig3Ni0mJsygsE="; + hash = "sha256-GnuNn7nORSrgwzKnA+yx2J5pf4GV4hrN1ghEWYenJBI="; }; subPackages = [ "." ]; - vendorHash = "sha256-mH5ni9O/S5Hnb3h39eWmmQYMdU99uC9yg29RfHGz1Fk="; + vendorHash = "sha256-MudeGkVblLvIMhMmL9r2GNz/PjwUYscyVYDb1EJnZYw="; checkFlags = [ "-short" From 8965dab3a763b598f530122ba8a450af4c2447eb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 22 Apr 2025 22:44:24 +0200 Subject: [PATCH 293/449] python312Packages.bash-kernel: cleanup, fix on darwin --- .../python-modules/bash-kernel/default.nix | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/bash-kernel/default.nix b/pkgs/development/python-modules/bash-kernel/default.nix index 6e546b311d3f..68bdbd190951 100644 --- a/pkgs/development/python-modules/bash-kernel/default.nix +++ b/pkgs/development/python-modules/bash-kernel/default.nix @@ -1,14 +1,15 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + replaceVars, + bashInteractive, flit-core, filetype, ipykernel, - python, pexpect, - bashInteractive, - replaceVars, + writableTmpDirAsHomeHook, + python, }: buildPythonPackage rec { @@ -16,10 +17,11 @@ buildPythonPackage rec { version = "0.10.0"; pyproject = true; - src = fetchPypi { - pname = "bash_kernel"; - inherit version; - hash = "sha256-LtWgpBbEGNHXUecVBb1siJ4SFXREtQxCh6aF2ndcKMo="; + src = fetchFromGitHub { + owner = "takluyver"; + repo = "bash_kernel"; + tag = version; + hash = "sha256-ugFMcQx1B1nKoO9rhb6PMllRcoZi0O4B9um8dOu5DU4="; }; patches = [ @@ -36,9 +38,9 @@ buildPythonPackage rec { pexpect ]; - preBuild = '' - export HOME=$TMPDIR - ''; + nativeBuildInputs = [ + writableTmpDirAsHomeHook + ]; postInstall = '' ${python.pythonOnBuildForHost.interpreter} -m bash_kernel.install --prefix $out @@ -59,6 +61,8 @@ buildPythonPackage rec { runHook postCheck ''; + __darwinAllowLocalNetworking = true; + meta = { description = "Bash Kernel for Jupyter"; homepage = "https://github.com/takluyver/bash_kernel"; From b544345095d55ec9f0423709a2ce9aab6e765c41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 20:58:53 +0000 Subject: [PATCH 294/449] phpExtensions.phalcon: 5.9.2 -> 5.9.3 --- pkgs/development/php-packages/phalcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index d36cf582fbe6..7f67e6ef9a85 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -9,13 +9,13 @@ buildPecl rec { pname = "phalcon"; - version = "5.9.2"; + version = "5.9.3"; src = fetchFromGitHub { owner = "phalcon"; repo = "cphalcon"; rev = "v${version}"; - hash = "sha256-SuY65GZ4eys2N5jX3/cmRMF4g+tGTeeQecoZvFkOnr4="; + hash = "sha256-1+8+kIaKvgQCE+qvZOkYOW/RdDv4ln0njC5VzL9jvnQ="; }; internalDeps = [ From 11effb9b9872bceb35c24e8284cedca92cc18679 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 22 Apr 2025 18:15:50 +0200 Subject: [PATCH 295/449] slurm-nm: declare all unix platforms as officially supported --- pkgs/by-name/sl/slurm-nm/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sl/slurm-nm/package.nix b/pkgs/by-name/sl/slurm-nm/package.nix index cee4e5ee8f75..13c617d79cd2 100644 --- a/pkgs/by-name/sl/slurm-nm/package.nix +++ b/pkgs/by-name/sl/slurm-nm/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Generic network load monitor"; homepage = "https://github.com/mattthias/slurm"; license = licenses.gpl2Plus; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ mikaelfangel ]; mainProgram = "slurm"; }; From 9a10be54058e718de9b5e1447d3783bf721d69c3 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Tue, 22 Apr 2025 23:04:35 +0200 Subject: [PATCH 296/449] traefik: use finalAttrs pattern --- pkgs/by-name/tr/traefik/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index e2842ed056bd..ebf24214ddea 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -6,13 +6,13 @@ nix-update-script, }: -buildGo124Module rec { +buildGo124Module (finalAttrs: { pname = "traefik"; version = "3.3.6"; # Archive with static assets for webui src = fetchzip { - url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; + url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz"; hash = "sha256-HA/JSwcss5ytGPqe2dqsKTZxuhWeC/yi8Mva4YVFeDs="; stripRoot = false; }; @@ -30,8 +30,8 @@ buildGo124Module rec { ldflags="-s" ldflags+=" -w" - ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Version=${version}" - ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major version}/pkg/version.Codename=$CODENAME" + ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major finalAttrs.version}/pkg/version.Version=${finalAttrs.version}" + ldflags+=" -X github.com/traefik/traefik/v${lib.versions.major finalAttrs.version}/pkg/version.Codename=$CODENAME" ''; doCheck = false; @@ -45,7 +45,7 @@ buildGo124Module rec { meta = with lib; { homepage = "https://traefik.io"; description = "Modern reverse proxy"; - changelog = "https://github.com/traefik/traefik/raw/v${version}/CHANGELOG.md"; + changelog = "https://github.com/traefik/traefik/raw/v${finalAttrs.version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ djds @@ -53,4 +53,4 @@ buildGo124Module rec { ]; mainProgram = "traefik"; }; -} +}) From 630d9199748f1cf6f4b5b6eac33ee89923d32d8f Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 22 Apr 2025 23:04:42 +0200 Subject: [PATCH 297/449] packages-config: remove zabbix50 zabbix50 was removed, but missed in packageOverrides --- pkgs/top-level/packages-config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 8c8d1686c70d..853a330b2fc4 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -24,7 +24,6 @@ rPackages roundcubePlugins sourceHanPackages - zabbix50 zabbix60 ; From bf858f6010685e7f5473cd439eb63329c3f587b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 21:16:55 +0000 Subject: [PATCH 298/449] vuetorrent: 2.24.0 -> 2.24.1 --- pkgs/by-name/vu/vuetorrent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix index c7f29c3547b8..53020fc2bb16 100644 --- a/pkgs/by-name/vu/vuetorrent/package.nix +++ b/pkgs/by-name/vu/vuetorrent/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "vuetorrent"; - version = "2.24.0"; + version = "2.24.1"; src = fetchFromGitHub { owner = "VueTorrent"; repo = "VueTorrent"; tag = "v${version}"; - hash = "sha256-KvEjxo+ejXoGmeY2NsRBJHyn7yuBI3YK3tcqysy7v8E="; + hash = "sha256-FuX1wZVWB6+5G0ePE7Eb4Gkq736UKB/caW5AcCYJtUU="; }; - npmDepsHash = "sha256-HdRZ5LKFrHZJeMI2GaQytEuzZYsDT/xTH9KDlDzz8Lk="; + npmDepsHash = "sha256-lRTB4Wfkp9UAi0N9iOSJQIJNFBz3RDGTglFofWqIWZ0="; installPhase = '' runHook preInstall From ecf1a326b8ed0d6abf91585a26d6d037c900f671 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 20 Apr 2025 09:58:55 +0200 Subject: [PATCH 299/449] simplescreenrecorder: fix update script --- pkgs/applications/video/simplescreenrecorder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index c979752948d0..170fc7284321 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -20,7 +20,7 @@ qttools, cmake, ninja, - nix-update-script, + unstableGitUpdater, }: mkDerivation { @@ -70,7 +70,7 @@ mkDerivation { qtx11extras ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = unstableGitUpdater { }; meta = with lib; { description = "Screen recorder for Linux"; From 09787fba34015ffec55ffac5e1f3956f5fd23217 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Tue, 22 Apr 2025 23:08:46 +0200 Subject: [PATCH 300/449] traefik: remove with lib from meta --- pkgs/by-name/tr/traefik/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix index ebf24214ddea..238d77561386 100644 --- a/pkgs/by-name/tr/traefik/package.nix +++ b/pkgs/by-name/tr/traefik/package.nix @@ -42,12 +42,12 @@ buildGo124Module (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { homepage = "https://traefik.io"; description = "Modern reverse proxy"; changelog = "https://github.com/traefik/traefik/raw/v${finalAttrs.version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ djds vdemeester ]; From b5ee2e52cc1d45b04be2aa409e3cc1787fd1fdfc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 20 Apr 2025 09:59:16 +0200 Subject: [PATCH 301/449] simplescreenrecorder: 0.4.4-unstable-2024-08-13 -> 0.4.4-unstable-2025-01-25 --- .../video/simplescreenrecorder/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 170fc7284321..e6e8314a21a9 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, - mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, @@ -16,22 +15,24 @@ pkg-config, libpulseaudio, libv4l, + pipewire, qtbase, qttools, + wrapQtAppsHook, cmake, ninja, unstableGitUpdater, }: -mkDerivation { +stdenv.mkDerivation { pname = "simplescreenrecorder"; - version = "0.4.4-unstable-2024-08-13"; + version = "0.4.4-unstable-2025-01-25"; src = fetchFromGitHub { owner = "MaartenBaert"; repo = "ssr"; - rev = "4e3ba13dd212fc4213fe0911f371bc7d34033b8d"; - hash = "sha256-jBZkyrZOrUljWgO8U4SZOTCu3sOm83unQ7vyv+KkAuE="; + rev = "c50e83eea53f45eff503af58e6c86d0e928222f3"; + hash = "sha256-pTgIooEOIYwOrSuXD0L5S7J7IsUIyzRuEX2ZziiIiAM="; }; cmakeFlags = [ @@ -52,7 +53,9 @@ mkDerivation { pkg-config cmake ninja + wrapQtAppsHook ]; + buildInputs = [ alsa-lib ffmpeg @@ -65,6 +68,7 @@ mkDerivation { libGL libpulseaudio libv4l + pipewire qtbase qttools qtx11extras From 3ca8b685c8d7896baf39e5a6bd1d75d22a915f47 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 22 Apr 2025 23:39:18 +0200 Subject: [PATCH 302/449] lib.getAttrFromPath: fix docs --- lib/attrsets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 8482887023f7..4518a94b6745 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -301,9 +301,9 @@ rec { Nix has an [attribute selection operator](https://nixos.org/manual/nix/stable/language/operators#attribute-selection) which is sufficient for such queries, as long as the number of attributes is static. For example: ```nix - x.a.b == getAttrByPath ["a" "b"] x + x.a.b == getAttrFromPath ["a" "b"] x # and - x.${f p}."example.com" == getAttrByPath [ (f p) "example.com" ] x + x.${f p}."example.com" == getAttrFromPath [ (f p) "example.com" ] x ``` # Inputs From a09871dc983587be9e12490ddf849ba9ca75f27a Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Mon, 14 Apr 2025 12:06:47 +0200 Subject: [PATCH 303/449] mongodb-atlas-cli: init at 1.42.0 --- pkgs/by-name/mo/mongodb-atlas-cli/package.nix | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/mo/mongodb-atlas-cli/package.nix diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix new file mode 100644 index 000000000000..a7c0ab3fa31e --- /dev/null +++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix @@ -0,0 +1,57 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + nix-update-script, + testers, + mongodb-atlas-cli, +}: + +buildGoModule rec { + pname = "mongodb-atlas-cli"; + version = "1.42.0"; + + vendorHash = "sha256-5kCaQ4bBRiGjRh65Tx3g5SlwAb+/S8o+z/2x8IqSXDM="; + + src = fetchFromGitHub { + owner = "mongodb"; + repo = "mongodb-atlas-cli"; + rev = "refs/tags/atlascli/v${version}"; + sha256 = "sha256-7umwluhPNhY/AGmVhxITLeoAGJPglRP+1PuXOM6TmBA="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/mongodb/mongodb-atlas-cli/atlascli/internal/version.GitCommit=${src.rev}" + "-X github.com/mongodb/mongodb-atlas-cli/atlascli/internal/version.Version=v${version}" + ]; + + postInstall = '' + installShellCompletion --cmd atlas \ + --bash <($out/bin/atlas completion bash) \ + --fish <($out/bin/atlas completion fish) \ + --zsh <($out/bin/atlas completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--version-regex=atlascli/v(.+)" ]; + }; + tests.version = testers.testVersion { + package = mongodb-atlas-cli; + version = "v${version}"; + }; + }; + + meta = { + homepage = "https://www.mongodb.com/try/download/shell"; + description = "CLI utility to manage MongoDB Atlas from the terminal"; + maintainers = with lib.maintainers; [ aduh95 ]; + license = lib.licenses.asl20; + mainProgram = "atlas"; + }; +} From 47c9e2a0c4dd70083c579b19ffd9f9b121ca742f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 21:58:20 +0000 Subject: [PATCH 304/449] python312Packages.google-cloud-logging: 3.11.4 -> 3.12.1 --- .../python-modules/google-cloud-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index c10248b5f7d5..9c9cca8a1517 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.11.4"; + version = "3.12.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_logging"; inherit version; - hash = "sha256-MjBdmJMj88WGAwROKsXZzyPpRl7eURu+kLQwknDTGVw="; + hash = "sha256-Nu/II5hQVbIDkE6D4cj5+ZmzxkJwvNo51XOGyk7/1ng="; }; build-system = [ setuptools ]; From be92f5d364b02f56939262c4b6c1ed58920fed41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 22:02:39 +0000 Subject: [PATCH 305/449] candy-icons: 0-unstable-2025-04-02 -> 0-unstable-2025-04-14 --- pkgs/by-name/ca/candy-icons/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix index 6e7c3249a2bf..7f1a91366241 100644 --- a/pkgs/by-name/ca/candy-icons/package.nix +++ b/pkgs/by-name/ca/candy-icons/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "candy-icons"; - version = "0-unstable-2025-04-02"; + version = "0-unstable-2025-04-14"; src = fetchFromGitHub { owner = "EliverLara"; repo = "candy-icons"; - rev = "063a64161ec8f0fcb019e54db9be8a0f9a4be9ed"; - hash = "sha256-T9j5OCPpuaZRktsfN8b8n0G3osjti8hXmAwD4MaADBU="; + rev = "2ba176007c40957b43d26b7a9be2c9f23a480e98"; + hash = "sha256-6eWxf13ZBknN7IeLICpmDXu4GdxubkGJ9D4/ZEuOvfs="; }; nativeBuildInputs = [ gtk3 ]; From fee2c0bcb434f74b4abd3b303ddcb2534e0846a3 Mon Sep 17 00:00:00 2001 From: Grimm Date: Thu, 29 Aug 2024 09:56:09 -0700 Subject: [PATCH 306/449] maintainers: add fvckgrimm --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5654fb0b546d..8d26d4ed0a1a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8488,6 +8488,12 @@ githubId = 12715461; name = "Anders Bo Rasmussen"; }; + fvckgrimm = { + email = "nixpkgs@grimm.wtf"; + github = "fvckgrimm"; + githubId = 55907409; + name = "Grimm"; + }; fwc = { github = "fwc"; githubId = 29337229; From 5aa70730efad266bf1e5b55b27d30ce2744df7bf Mon Sep 17 00:00:00 2001 From: Grimm Date: Thu, 29 Aug 2024 10:07:19 -0700 Subject: [PATCH 307/449] angryoxide: init at 0.8.32 --- pkgs/by-name/an/angryoxide/package.nix | 59 ++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 pkgs/by-name/an/angryoxide/package.nix diff --git a/pkgs/by-name/an/angryoxide/package.nix b/pkgs/by-name/an/angryoxide/package.nix new file mode 100644 index 000000000000..5abe04cd555a --- /dev/null +++ b/pkgs/by-name/an/angryoxide/package.nix @@ -0,0 +1,59 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libxkbcommon, + sqlite, + zlib, + wayland, +}: + +let + libwifi = fetchFromGitHub { + owner = "Ragnt"; + repo = "libwifi"; + rev = "71268e1898ad88b8b5d709e186836db417b33e81"; + hash = "sha256-2X/TZyLX9Tb54c6Sdla4bsWdq05NU72MVSuPvNfxySk="; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "angryoxide"; + version = "0.8.32"; + + src = fetchFromGitHub { + owner = "Ragnt"; + repo = "AngryOxide"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Sla5lvyqZho9JE4QVS9r0fx5+DVlU90c8OSfO4/f0B4="; + }; + + postPatch = '' + rm -r libs/libwifi + ln -s ${libwifi} libs/libwifi + ''; + + useFetchCargoVendor = true; + cargoHash = "sha256-mry4l0a7DZOWkrChU40OVRCBjKwI39cyZtvEBA5tro0="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libxkbcommon + sqlite + wayland + zlib + ]; + + meta = { + description = "802.11 Attack Tool"; + changelog = "https://github.com/Ragnt/AngryOxide/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/Ragnt/AngryOxide/"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fvckgrimm ]; + mainProgram = "angryoxide"; + platforms = lib.platforms.linux; + }; +}) From 1fab1498a5a4875d203980fab8395b847aaf5acc Mon Sep 17 00:00:00 2001 From: Kiyotoko Date: Tue, 15 Apr 2025 00:34:00 +0200 Subject: [PATCH 308/449] beyond-all-reason: init at 1.2988.0 --- pkgs/by-name/be/beyond-all-reason/package.nix | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/be/beyond-all-reason/package.nix diff --git a/pkgs/by-name/be/beyond-all-reason/package.nix b/pkgs/by-name/be/beyond-all-reason/package.nix new file mode 100644 index 000000000000..65190afee71d --- /dev/null +++ b/pkgs/by-name/be/beyond-all-reason/package.nix @@ -0,0 +1,32 @@ +{ + lib, + fetchurl, + appimageTools, + openal, +}: +let + version = "1.2988.0"; + pname = "beyond-all-reason"; + + src = fetchurl { + url = "https://github.com/beyond-all-reason/BYAR-Chobby/releases/download/v${version}/Beyond-All-Reason-${version}.AppImage"; + hash = "sha256-ZJW5BdxxqyrM2TJTO0SBp4BXt3ILyi77EZx73X8hqJE="; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = pkgs: [ openal ]; + + meta = { + homepage = "https://www.beyondallreason.info/"; + downloadPage = "https://www.beyondallreason.info/download"; + changelog = "https://github.com/beyond-all-reason/BYAR-Chobby/releases/tag/v${version}"; + description = "Free Real Time Strategy Game with a grand scale and full physical simulation in a sci-fi setting"; + license = lib.licenses.gpl2Plus; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + kiyotoko + ]; + }; +} From 9b5e54fa653ad6ce03edb1c162aeea41dba64e98 Mon Sep 17 00:00:00 2001 From: Andy Zhang <1329212+zh4ngx@users.noreply.github.com> Date: Fri, 18 Apr 2025 14:37:45 -0700 Subject: [PATCH 309/449] beeper: fix desktop entry copy --- pkgs/by-name/be/beeper/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index ac81afa387b1..eba68ca2380e 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -27,12 +27,12 @@ appimageTools.wrapType2 { # disable creating a desktop file and icon in the home folder during runtime linuxConfigFilename=$out/resources/app/build/main/linux-*.mjs echo "export function registerLinuxConfig() {}" > $linuxConfigFilename - substituteInPlace $out/beepertexts.desktop --replace-fail "AppRun" "beeper" ''; extraInstallCommands = '' install -Dm 644 ${appimageContents}/beepertexts.png $out/share/icons/hicolor/512x512/apps/beepertexts.png install -Dm 644 ${appimageContents}/beepertexts.desktop -t $out/share/applications/ + substituteInPlace $out/share/applications/beepertexts.desktop --replace-fail "AppRun" "beeper" . ${makeWrapper}/nix-support/setup-hook wrapProgram $out/bin/beeper \ From 7485c2121615f4afb40220e3afebe6692f4ad662 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 23 Apr 2025 00:47:50 +0200 Subject: [PATCH 310/449] qt6Packages.qscintilla: unmark as broken on darwin --- pkgs/development/libraries/qscintilla/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index cb2416bdcd51..3ac9899bc498 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -71,7 +71,5 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ peterhoeg ]; platforms = lib.platforms.unix; - # ld: library not found for -lcups - broken = stdenv.hostPlatform.isDarwin && lib.versionAtLeast qtbase.version "6"; }; }) From cc82651c405e37f440c7f095dcc66436d5a28b11 Mon Sep 17 00:00:00 2001 From: Mateusz Wykurz Date: Mon, 13 Jan 2025 14:14:54 -0700 Subject: [PATCH 311/449] rcp: 0.15.0 -> 0.16.0 --- pkgs/by-name/rc/rcp/package.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index f6d630ae31af..3bd769fc014a 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -3,29 +3,21 @@ stdenv, fetchFromGitHub, rustPlatform, - darwin, }: rustPlatform.buildRustPackage rec { pname = "rcp"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${version}"; - hash = "sha256-gFkrUqG3GXPAg9Zqv7Wr3axQ30axYGXw8bo+P1kmSJM="; + hash = "sha256-mMSO5twpuxiA6pMG/bNMn3WJjs3ZwuoOk62M0WIrRBk="; }; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; - [ - IOKit - ] - ); - useFetchCargoVendor = true; - cargoHash = "sha256-izJRaxJhLvk064JB3hlzN50V7ZWmv/X1pbL0lRCZV60="; + cargoHash = "sha256-uVBWPxGxNgiahywA78QjN8msNx3gZ6vOyX7AkOdK2EM="; RUSTFLAGS = "--cfg tokio_unstable"; @@ -41,7 +33,8 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mit ]; mainProgram = "rcp"; maintainers = with maintainers; [ wykurz ]; - # = note: Undefined symbols for architecture x86_64: "_utimensat" - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; + # Building procfs on an for a unsupported platform. Currently only linux and android are supported + # (Your current target_os is macos) + broken = stdenv.hostPlatform.isDarwin; }; } From 25eeaba8a150d18460e0165a3f92c1c67f6f0384 Mon Sep 17 00:00:00 2001 From: ed9w2in6 <22890124+ed9w2in6@users.noreply.github.com> Date: Wed, 23 Apr 2025 07:25:29 +0800 Subject: [PATCH 312/449] dysk: platform meta declare linux support only --- pkgs/by-name/dy/dysk/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix index 4425ee65be01..ec2f05a4743c 100644 --- a/pkgs/by-name/dy/dysk/package.nix +++ b/pkgs/by-name/dy/dysk/package.nix @@ -38,5 +38,6 @@ rustPlatform.buildRustPackage rec { koral ]; mainProgram = "dysk"; + platforms = platforms.linux; }; } From e88a9b669c25bcebce56cb666d9e78566dee4c70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Apr 2025 23:35:46 +0000 Subject: [PATCH 313/449] weaviate: 1.29.1 -> 1.30.1 --- pkgs/by-name/we/weaviate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index ef0e55faacb4..587798733f30 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.29.1"; + version = "1.30.1"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-Akg0iY5M3X6ztKxhNEkhi03VnbNpNW7/Vcbv2KB6X54="; + hash = "sha256-Rxi21DifRnOzUgPO3U74LMQ/27NwvYzcj3INplTT1j4="; }; - vendorHash = "sha256-U2ean49ESKmcQ3fTtd6y9MwfWPr6tolvgioyKbQsBmU="; + vendorHash = "sha256-jXfVPdORMBOAl3Od3GknGo7Qtfb4H3RqGYdI6Jx1/5I="; subPackages = [ "cmd/weaviate-server" ]; From 653797d4e61603df11714c041407e3060a433531 Mon Sep 17 00:00:00 2001 From: Defelo Date: Tue, 22 Apr 2025 23:52:15 +0000 Subject: [PATCH 314/449] glance: 0.7.12 -> 0.7.13 --- pkgs/by-name/gl/glance/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index b62400a864e7..d40556da08fb 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "glance"; - version = "0.7.12"; + version = "0.7.13"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; tag = "v${finalAttrs.version}"; - hash = "sha256-HytxMin0IM6KAqGu/Cq/WCT79DiH01LpTK3RNgWf7iQ="; + hash = "sha256-MinskibgOCb8OytC+Uxg31g00Ha/un7MF+uvL9xosUU="; }; vendorHash = "sha256-+7mOCU5GNQV8+s9QPki+7CDi4qtOIpwjC//QracwzHI="; From 6a68bd660373b00989c7a3e2665e088bb9f547f9 Mon Sep 17 00:00:00 2001 From: April Schleck Date: Tue, 15 Apr 2025 14:29:41 -0700 Subject: [PATCH 315/449] google-cloud-sdk: 515.0.0 -> 519.0.0 --- .../admin/google-cloud-sdk/components.json | 424 +++++++++--------- pkgs/tools/admin/google-cloud-sdk/data.nix | 22 +- 2 files changed, 223 insertions(+), 223 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json index 24f1e744607f..d9becae5c1c5 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.json +++ b/pkgs/tools/admin/google-cloud-sdk/components.json @@ -5,7 +5,7 @@ "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", "size": 800, - "source": "components/google-cloud-sdk-alpha-20250314151217.tar.gz", + "source": "components/google-cloud-sdk-alpha-20250418150427.tar.gz", "type": "tar" }, "dependencies": [ @@ -23,8 +23,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20250314151217, - "version_string": "2025.03.14" + "build_number": 20250418150427, + "version_string": "2025.04.18" } }, { @@ -865,15 +865,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.20.0" + "version_string": "1.70.0" } }, { "data": { - "checksum": "ab866ccff1a9da0ea3a8e71c432c2f3c768827971192de9466938bb9e80a632e", - "contents_checksum": "e2eb0eec683ba513ac95ffa535cebccff326998033155cfb187eb2677f216e0c", - "size": 1957787, - "source": "components/google-cloud-sdk-app-engine-grpc-darwin-x86_64-20190426144518.tar.gz", + "checksum": "967f4b5bb66156e34f9435f1a16a128e89236452d7260762816e0c4a2ecacbeb", + "contents_checksum": "ad7baf813f1222840ebc9906d05e28eabd9bd683a4aad10858c1a5f8011b7049", + "size": 260, + "source": "components/google-cloud-sdk-app-engine-grpc-darwin-x86_64-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -900,16 +900,16 @@ }, "platform_required": false, "version": { - "build_number": 20190426144518, - "version_string": "1.20.0" + "build_number": 20250329020432, + "version_string": "1.70.0" } }, { "data": { - "checksum": "7da7ca03d04b770d96efbbf55a7b0e992328e947215d00ca702aaed8f5a27161", - "contents_checksum": "9f1bf2b01845ba427f5c833e3995c8919b98719a89c841269f15c55482012567", - "size": 2104919, - "source": "components/google-cloud-sdk-app-engine-grpc-linux-x86-20190426144518.tar.gz", + "checksum": "e208b70d5424fed71c31abbd898111d81f59bc35d6ceb884670bf100c331bcf9", + "contents_checksum": "0234ca0b138f35e454107b20e0c5e54567b5401b65b81db446d8ec7a3b12b8a2", + "size": 6237235, + "source": "components/google-cloud-sdk-app-engine-grpc-linux-x86-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -936,16 +936,16 @@ }, "platform_required": false, "version": { - "build_number": 20190426144518, - "version_string": "1.20.0" + "build_number": 20250329020432, + "version_string": "1.70.0" } }, { "data": { - "checksum": "e6f65a8ec8192f024e59a093279b2be53d36d77862d63a9173a637a4533ad3bb", - "contents_checksum": "1b1cfad1979caf370bd308a725e30623f6f65fea5370481b39fe9e3ebe23f6a2", - "size": 2153684, - "source": "components/google-cloud-sdk-app-engine-grpc-linux-x86_64-20190426144518.tar.gz", + "checksum": "30863d67b0e65da39b31d165e5d94196a8b14fd0a73eed04e7914e0b3773e661", + "contents_checksum": "e68afafc02d80034e5de3c3917acb594a3fb2c14d58bf9e804694aaaa8ccb265", + "size": 5850844, + "source": "components/google-cloud-sdk-app-engine-grpc-linux-x86_64-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -972,16 +972,16 @@ }, "platform_required": false, "version": { - "build_number": 20190426144518, - "version_string": "1.20.0" + "build_number": 20250329020432, + "version_string": "1.70.0" } }, { "data": { - "checksum": "c0c878b429d2ca9ee5196bb348576547062da65b144aac4bbd8cd4c5a1dde1d6", - "contents_checksum": "a3edadedc0287b30caaf1db8c27f85e5c9311de3b555a0dfb7c276b3348ab132", - "size": 1615365, - "source": "components/google-cloud-sdk-app-engine-grpc-windows-x86-20190426144518.tar.gz", + "checksum": "e94ad609925a0e8765f4fef491b391abf283c135d2f8a40db8585c07a1a914dc", + "contents_checksum": "a0db11966fb56a70bdb50f0b4fb24193c05ca68eec0201500a27d9590bab7bbf", + "size": 3555803, + "source": "components/google-cloud-sdk-app-engine-grpc-windows-x86-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -1008,16 +1008,16 @@ }, "platform_required": false, "version": { - "build_number": 20190426144518, - "version_string": "1.20.0" + "build_number": 20250329020432, + "version_string": "1.70.0" } }, { "data": { - "checksum": "ff3c75c9b459610c33c2dcc4060598bd5edec06ed01d916ded1e429e8defed5d", - "contents_checksum": "f6f05b6c3d087ff4e98c1cf9d841319adc30255e08dfff3fa85992238cb0f6a6", - "size": 1616022, - "source": "components/google-cloud-sdk-app-engine-grpc-windows-x86_64-20190426144518.tar.gz", + "checksum": "389ec799e4984da2645e593d75553066cc31489b1d935488e8f6d0f788e3a6f2", + "contents_checksum": "ea2b4ba3c02e8a353280175b18b7c2107260c8f62458b6e435b5fa05844b478a", + "size": 4245182, + "source": "components/google-cloud-sdk-app-engine-grpc-windows-x86_64-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -1044,16 +1044,16 @@ }, "platform_required": false, "version": { - "build_number": 20190426144518, - "version_string": "1.20.0" + "build_number": 20250329020432, + "version_string": "1.70.0" } }, { "data": { - "checksum": "52f2a6fdf43f33eca211a4547f68286c85dfec3fc43d048e6a0be6c2eadec410", - "contents_checksum": "d671a531b688255e0f337544ac0ad08035d8bea29de786072ac04224cb4407c0", - "size": 134684583, - "source": "components/google-cloud-sdk-app-engine-java-20250221145621.tar.gz", + "checksum": "ccc36a0cb97d6107d0b49528d7c821eee1f0d82961c58ed67f21a1e08f8d2a62", + "contents_checksum": "244c1ecf52436dbbee883160cdc01fbbc8f69475397a1e576717802386267530", + "size": 134508342, + "source": "components/google-cloud-sdk-app-engine-java-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -1072,8 +1072,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20250221145621, - "version_string": "2.0.33" + "build_number": 20250411141747, + "version_string": "2.0.34" } }, { @@ -1377,7 +1377,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20250314151217.tar.gz", + "source": "components/google-cloud-sdk-beta-20250418150427.tar.gz", "type": "tar" }, "dependencies": [ @@ -1395,8 +1395,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20250314151217, - "version_string": "2025.03.14" + "build_number": 20250418150427, + "version_string": "2025.04.18" } }, { @@ -1720,10 +1720,10 @@ }, { "data": { - "checksum": "129a39c8d5bc90290f2ce7b931173c23b16d9de80984766fe3a49cea3a89ab79", - "contents_checksum": "34f75ee5dfdf0c47e6c372fd34ed27489a1bb856a6a91abb3c075c60b830e4d2", - "size": 1845321, - "source": "components/google-cloud-sdk-bq-20250228155416.tar.gz", + "checksum": "d25fad8eb8eb7f8ea1137863f0569800a1df42b9cc5523c34a6eb99464c17286", + "contents_checksum": "fa9f12d6735ebe19cbc4e45b44db29ddf99c60fd7e163ff5b00a0e65da65a88e", + "size": 1843425, + "source": "components/google-cloud-sdk-bq-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -1743,8 +1743,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20250228155416, - "version_string": "2.1.14" + "build_number": 20250411141747, + "version_string": "2.1.15" } }, { @@ -3497,10 +3497,10 @@ }, { "data": { - "checksum": "efa47cdb348054920c04009ea32c8dd919ca682e6997c7b54c20004337fe806f", - "contents_checksum": "8c7a9405342cba570ef13d1cbd980faf2fc6fae9062529e537339ff1abcdb3bf", - "size": 22199856, - "source": "components/google-cloud-sdk-core-20250314151217.tar.gz", + "checksum": "d5bc6f49efbfd90846ed8936e081b811b7794e142c483be6e068c352de2e21ea", + "contents_checksum": "c5d5a23618780a95ae8288da37b87ab222bb96a14864c841a1d9614e1ad5793d", + "size": 22477312, + "source": "components/google-cloud-sdk-core-20250418150427.tar.gz", "type": "tar" }, "dependencies": [ @@ -3522,8 +3522,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20250314151217, - "version_string": "2025.03.14" + "build_number": 20250418150427, + "version_string": "2025.04.18" } }, { @@ -3902,15 +3902,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.3.5" + "version_string": "0.3.6" } }, { "data": { - "checksum": "c64f52a234bddd3ff2459457c2037dc5ba93a27e435f1e548ff5287f2bc1f5ef", - "contents_checksum": "d15b929bf2546465d6e729bfda635f27859fd74dd036e7ae3dc237e336cc1912", - "size": 7996616, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-arm-20250314151217.tar.gz", + "checksum": "e651a3d31fbfad094bd65867591c48c958609b90bedebfabf872d5b335961f64", + "contents_checksum": "7f97aec766f3338f2c161d5c00c1f55ce03641df30938d315be3ef68a8615ae1", + "size": 8015809, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-arm-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -3935,16 +3935,16 @@ }, "platform_required": false, "version": { - "build_number": 20250314151217, - "version_string": "0.3.5" + "build_number": 20250329020432, + "version_string": "0.3.6" } }, { "data": { - "checksum": "a4ffcce35ae48c4d559dce7ad212350e2f79928188a32ab811a6fb20c6afead3", - "contents_checksum": "dae93cc04a452d0747cf6587d575d3af2818f9932b73658667fcf3fb752ee134", - "size": 8788187, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-x86_64-20250314151217.tar.gz", + "checksum": "4056953cc922e3774dc3de30acdc26b7886ae1e7979c4727c40a7ca9e67ad486", + "contents_checksum": "9b7592799c09636ae4943ac99ce7e720a1fcc517b30948793824f31ccc8d742d", + "size": 8815451, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-darwin-x86_64-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -3969,16 +3969,16 @@ }, "platform_required": false, "version": { - "build_number": 20250314151217, - "version_string": "0.3.5" + "build_number": 20250329020432, + "version_string": "0.3.6" } }, { "data": { - "checksum": "d221cb52ecbff12545f1b4ec255ed409b6ca5ab3d7e900d76c5a41029ef774d9", - "contents_checksum": "f4431458664cbf55c1ff8c918ffdff1fbab6ecccaf7fa249a382acfe95472507", - "size": 10969861, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-linux-x86_64-20250314151217.tar.gz", + "checksum": "e45589a69f70a4cdedb81f447e4d65a43375c759e0f204b6ea60439aa2a74b25", + "contents_checksum": "821bbd9d8e0f8faac0170e7b28d7834cd918768b7a0275991ab9022e08b847ae", + "size": 10970257, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-linux-x86_64-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -4003,16 +4003,16 @@ }, "platform_required": false, "version": { - "build_number": 20250314151217, - "version_string": "0.3.5" + "build_number": 20250329020432, + "version_string": "0.3.6" } }, { "data": { - "checksum": "a409f8942090e43a717cf1633d4563876c6c7ca24e1071e2790aa91a3a5b7052", - "contents_checksum": "cc9f91ff2cf2feead85e87ca86c622818516a412dbd0e5eb3c14c2f0e3a4d114", - "size": 8463319, - "source": "components/google-cloud-sdk-enterprise-certificate-proxy-windows-x86_64-20250314151217.tar.gz", + "checksum": "7d2852490cf75f88d3dcb5530de5ebb375387dd5af8ae49ebf73e8d2f8b0e3ec", + "contents_checksum": "300f637794fc6e93c56c386bc2dcbe7f65c3c97b27387786c6817edbfc219160", + "size": 8462999, + "source": "components/google-cloud-sdk-enterprise-certificate-proxy-windows-x86_64-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -4037,8 +4037,8 @@ }, "platform_required": false, "version": { - "build_number": 20250314151217, - "version_string": "0.3.5" + "build_number": 20250329020432, + "version_string": "0.3.6" } }, { @@ -4338,10 +4338,10 @@ }, { "data": { - "checksum": "714a68a8b543026f4c6aceb969ad0f77ba15683307cb072068a27ebec97fdfd2", - "contents_checksum": "0405a8a00d094cda6cf4cd9a4a9b9fdf89820c343184b3f8a8818a4e3779f42d", - "size": 17665835, - "source": "components/google-cloud-sdk-gcloud-deps-20250314151217.tar.gz", + "checksum": "6b9765f6cd638fcece6475a52c61bd0641a8a3c65d625f841464d3e5a459bd32", + "contents_checksum": "3245cabc55bedc05cb13cb1a674abb7534ab1ecf6f1999fade047c748ce85975", + "size": 16902197, + "source": "components/google-cloud-sdk-gcloud-deps-20250418150427.tar.gz", "type": "tar" }, "dependencies": [ @@ -4365,8 +4365,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20250314151217, - "version_string": "2025.03.14" + "build_number": 20250418150427, + "version_string": "2025.04.18" } }, { @@ -4609,10 +4609,10 @@ }, { "data": { - "checksum": "554d51670a06796e42c730bb66c768eedf43ba29f4ec280c27b7f6374afc4a1f", - "contents_checksum": "2f2d5253e4007884e1097ff93daa0c675cb2e39a34976bbd264ccbff51205b5a", - "size": 7863197, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20250314151217.tar.gz", + "checksum": "c1272b3f2775c0594f3e2380cb24f13062f25ed888103324a5f5686aacafbba8", + "contents_checksum": "4f3b44604f4af1115a55ea3e9810320fe471f44653e69568d7606b81bcf23f31", + "size": 7997152, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20250418150427.tar.gz", "type": "tar" }, "dependencies": [ @@ -4638,7 +4638,7 @@ }, "platform_required": false, "version": { - "build_number": 20250314151217, + "build_number": 20250418150427, "version_string": "" } }, @@ -4919,10 +4919,10 @@ }, { "data": { - "checksum": "0874e6c1c7daa655add82f8ebba39eb3e531b04bdcee595adc8834cc99821ef8", - "contents_checksum": "e390c22f077b01e7e4aeae0fb6d0a4e7dfadff2a969df0587716ad37a9cc371a", - "size": 12368759, - "source": "components/google-cloud-sdk-gsutil-20241213184646.tar.gz", + "checksum": "0918565f0d1c5f59391c4ce7005f5fc156b6e05ea1234a9851095b02dd4ad380", + "contents_checksum": "a65ce603d995280c13ebd7636ac5794429b3d49b7ca160e5f4f3904170d19ce5", + "size": 12382702, + "source": "components/google-cloud-sdk-gsutil-20250418150427.tar.gz", "type": "tar" }, "dependencies": [ @@ -4942,8 +4942,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20241213184646, - "version_string": "5.33" + "build_number": 20250418150427, + "version_string": "5.34" } }, { @@ -5042,15 +5042,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.24.26" + "version_string": "1.20.825" } }, { "data": { - "checksum": "e2aa9e2f5924374d85c201160b3ef3f85b3fdc478c4786f4ee8ff2b3ac2a084b", - "contents_checksum": "d3aad7f7ba523163b6a9eafbe7007c002f28dcea90f12d4c2ea5976cfc6b2e53", - "size": 28513697, - "source": "components/google-cloud-sdk-istioctl-darwin-arm-20250221145621.tar.gz", + "checksum": "a2d69d8cdd92cff313bf801a7d2c81ecf1c141a59411aa7a42f3f21355ad7bf0", + "contents_checksum": "f7c93c39ed957384a4e9711c17ca48162bcbd040f2b730384d15a4c53eab8af6", + "size": 25069537, + "source": "components/google-cloud-sdk-istioctl-darwin-arm-20250324162232.tar.gz", "type": "tar" }, "dependencies": [ @@ -5075,16 +5075,16 @@ }, "platform_required": false, "version": { - "build_number": 20250221145621, - "version_string": "1.24.26" + "build_number": 20250324162232, + "version_string": "1.20.825" } }, { "data": { - "checksum": "01fee4b9064dfe33251487aa5250b2ab19a1baa6c0e0f057b414a2eb432cd8ed", - "contents_checksum": "802af2a09642953c581d1261f96d8e0b11f6ad593c278bd3b252536b7aeb3c33", - "size": 29830333, - "source": "components/google-cloud-sdk-istioctl-darwin-x86_64-20250221145621.tar.gz", + "checksum": "b8109553f15032c57bd0570deed2111fa07920ea362ae9930736735ff69b1754", + "contents_checksum": "d65363015ac4faec61fb25694179458f09eb37166aceae4225d84695b7938617", + "size": 26644097, + "source": "components/google-cloud-sdk-istioctl-darwin-x86_64-20250324162232.tar.gz", "type": "tar" }, "dependencies": [ @@ -5109,16 +5109,16 @@ }, "platform_required": false, "version": { - "build_number": 20250221145621, - "version_string": "1.24.26" + "build_number": 20250324162232, + "version_string": "1.20.825" } }, { "data": { - "checksum": "48bbec6968e228cdf3651b70f9ec469656b3afdeb9faa388a847e96f24b9a534", - "contents_checksum": "898408ec01d6467dba24001d311ceb1fd4bcaafcbed6329bbb91e3691727e74e", - "size": 26868832, - "source": "components/google-cloud-sdk-istioctl-linux-arm-20250221145621.tar.gz", + "checksum": "a50e74af10be5274f098ef03b5ad49d7c59dbfb66732cf9de37063a966f7b087", + "contents_checksum": "e18513c7f394ece33b569788dd30ce460e9c7aab45014e1691bfa91ce2d8a02c", + "size": 23659432, + "source": "components/google-cloud-sdk-istioctl-linux-arm-20250324162232.tar.gz", "type": "tar" }, "dependencies": [ @@ -5143,16 +5143,16 @@ }, "platform_required": false, "version": { - "build_number": 20250221145621, - "version_string": "1.24.26" + "build_number": 20250324162232, + "version_string": "1.20.825" } }, { "data": { - "checksum": "e87700845c7ac16f881caf2ce9d57a27f6fb7c0779c1274ec747170737ea9256", - "contents_checksum": "06b261db88e44b86fe1489fa86e57e57b5a3d40ca495519f3ae1968dc7c27987", - "size": 29142122, - "source": "components/google-cloud-sdk-istioctl-linux-x86_64-20250221145621.tar.gz", + "checksum": "36642a70042e012798671d42ee5a38dd71d34d03559e1eb840d0b0a4d2104809", + "contents_checksum": "e03aec67d0bf5f6cb6bb55fac6045575667ba64eb0e44cc7b314300cd6ccf1bd", + "size": 25941974, + "source": "components/google-cloud-sdk-istioctl-linux-x86_64-20250324162232.tar.gz", "type": "tar" }, "dependencies": [ @@ -5177,8 +5177,8 @@ }, "platform_required": false, "version": { - "build_number": 20250221145621, - "version_string": "1.24.26" + "build_number": 20250324162232, + "version_string": "1.20.825" } }, { @@ -6633,15 +6633,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.20.2-rc.2" + "version_string": "1.20.3-rc.1" } }, { "data": { - "checksum": "a907949fbaf0e4e75b7797c059ad85a37bd53222cc65e1ae820db333dd2d2cbe", - "contents_checksum": "d7c5bdda5a708660112f7efdad48c5780b3807839f0cee6432deb3d6d27f95e1", - "size": 35126710, - "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20250307152352.tar.gz", + "checksum": "cdf64b1bc6c791630287c4cb937592fceb1b59d2cbb067293e025971f5e8e88d", + "contents_checksum": "a65764a5b5780f5b8e4c9f7f7687806f9c214cffbc2dd284a65079e2f5413566", + "size": 35126508, + "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -6666,16 +6666,16 @@ }, "platform_required": false, "version": { - "build_number": 20250307152352, - "version_string": "1.20.2-rc.2" + "build_number": 20250329020432, + "version_string": "1.20.3-rc.1" } }, { "data": { - "checksum": "7b7962e3822712ebfc0c0d16182b01334fdf6e936abd2b72a00d05897a1e5384", - "contents_checksum": "432a04679168748dfa9f40eff486aba20e27d3e56d129c98d0de3c94f4a81bd7", - "size": 34927295, - "source": "components/google-cloud-sdk-nomos-linux-x86_64-20250307152352.tar.gz", + "checksum": "576900471642e3178410792e364492b799861b0b5f6508286b8af9ff7e91e4d8", + "contents_checksum": "5fa38d9341db20c5cb4d561283c26f056a9e460a906b845c9ea65db1b47d33c3", + "size": 34927100, + "source": "components/google-cloud-sdk-nomos-linux-x86_64-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -6700,8 +6700,8 @@ }, "platform_required": false, "version": { - "build_number": 20250307152352, - "version_string": "1.20.2-rc.2" + "build_number": 20250329020432, + "version_string": "1.20.3-rc.1" } }, { @@ -7074,15 +7074,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "2.14.1" + "version_string": "2.15.0" } }, { "data": { - "checksum": "8d432b23a03f1a001b1ae1505ddf9b82ed1fbc22524e4804f53d66d7f8f2cf05", - "contents_checksum": "cd10eb94a831e01250e555c114cb661ae3cfb15b1232bb0c997dedfcf21436f2", - "size": 34748006, - "source": "components/google-cloud-sdk-skaffold-darwin-arm-20250221145621.tar.gz", + "checksum": "5c75cce7f6b694fc4f8b051aa20a24940fd83832e72514a1b86578f5f4168b61", + "contents_checksum": "6467f8584170048a5a3bd3fd1ee2b299c743f23d5c19ef9cb9bcc8687613d67c", + "size": 34902174, + "source": "components/google-cloud-sdk-skaffold-darwin-arm-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -7108,16 +7108,16 @@ }, "platform_required": false, "version": { - "build_number": 20250221145621, - "version_string": "2.14.1" + "build_number": 20250411141747, + "version_string": "2.15.0" } }, { "data": { - "checksum": "b85da5c9f961dd11155b273f9d540d10da4fa8315ff9f42f5edf9eb11cae79c2", - "contents_checksum": "8a22ebc5bc292d7478dda3af35fcf1b24b8ffdadf4b04fcec584ace5811e92a8", - "size": 37504425, - "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20250221145621.tar.gz", + "checksum": "fcf8b328344cdabf1ec7cc9c87036d883978e7f095e186e24085f206a6d46711", + "contents_checksum": "15045dcae363785ec4fa4e672646fc381299f9972a8ff95ad4625be15847c124", + "size": 37805590, + "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -7143,16 +7143,16 @@ }, "platform_required": false, "version": { - "build_number": 20250221145621, - "version_string": "2.14.1" + "build_number": 20250411141747, + "version_string": "2.15.0" } }, { "data": { - "checksum": "4d29b50d4f9448e45643360a5c223039c4082a61ceaaa72b50e60119b599cb55", - "contents_checksum": "bd362b87993ea185e89bc70b21b845b638cd06f8a57508d4ce4f1576a8ee6f8f", - "size": 31307134, - "source": "components/google-cloud-sdk-skaffold-linux-arm-20250221145621.tar.gz", + "checksum": "3659839a796209a011e28fea66f659255fffa86b909cb269c9abc0368270905d", + "contents_checksum": "2eceaa88d8c1c31d669cb0fe0fe1d15ed8f854ddfba7ca55c6184fabb6d28539", + "size": 31548198, + "source": "components/google-cloud-sdk-skaffold-linux-arm-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -7178,16 +7178,16 @@ }, "platform_required": false, "version": { - "build_number": 20250221145621, - "version_string": "2.14.1" + "build_number": 20250411141747, + "version_string": "2.15.0" } }, { "data": { - "checksum": "6ade8254808ec2dfdba11c92e9b477f2413d06bda8c4377fe50fe1a9772e0954", - "contents_checksum": "36b9ef80c9809eb5904347c9b234e25ac66988e26be5aa3ccb03ca49dedc959c", - "size": 34145180, - "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20250221145621.tar.gz", + "checksum": "7388637bd8935f2543ace1bcfac4053d133e62fc518bead48e46ee70b821a877", + "contents_checksum": "976ec4bfb09d466fa4c3acca64d71c098fc30ce74cf8230e6edec09cfd686d2f", + "size": 34540333, + "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -7213,16 +7213,16 @@ }, "platform_required": false, "version": { - "build_number": 20250221145621, - "version_string": "2.14.1" + "build_number": 20250411141747, + "version_string": "2.15.0" } }, { "data": { - "checksum": "cf94c6825dc09080ec868ac4d3509f800397db0c60f7d3b62a2600b5f1b0f4b2", - "contents_checksum": "554b9b965ec7bf2bbaeb951b577070bfba686b7ac5a009556f631b6ace6816cd", - "size": 31861263, - "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20250221145621.tar.gz", + "checksum": "0d9d0785b7f360b29a2661119196df19bcbf50641f58f39fe4127d377338ccc4", + "contents_checksum": "62d953628241714818b7c292a61384095fa18d5e76d8f90266f03ca87d75c69a", + "size": 32229610, + "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -7248,8 +7248,8 @@ }, "platform_required": false, "version": { - "build_number": 20250221145621, - "version_string": "2.14.1" + "build_number": 20250411141747, + "version_string": "2.15.0" } }, { @@ -7276,15 +7276,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "3.6.1" + "version_string": "3.7.0" } }, { "data": { - "checksum": "79a24fb7bf4fa373719e0011c165d3cfb6da373ef53d3a3766c821dad9f470b8", - "contents_checksum": "812ddcde516ecc6a278af12b7885d5bba0300bacc0d17193d8725ae2e62715a8", - "size": 28820544, - "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20250314151217.tar.gz", + "checksum": "0cf7dc3546966e448d726a7936408d91932f7a99e54c48869ded2851e5cddbcb", + "contents_checksum": "6afeafa47c7a78d6c5613971458b65c83f7eb0fe6fc15d4e406a9a215d3757ec", + "size": 29451244, + "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20250329020432.tar.gz", "type": "tar" }, "dependencies": [ @@ -7309,8 +7309,8 @@ }, "platform_required": false, "version": { - "build_number": 20250314151217, - "version_string": "3.6.1" + "build_number": 20250329020432, + "version_string": "3.7.0" } }, { @@ -7399,15 +7399,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.11.1" + "version_string": "0.12.3" } }, { "data": { - "checksum": "60db5513b776dcf617b90149d4db21f64428ead3ac646aac098cbc2989747337", - "contents_checksum": "271ea534e65dae8cf88d14f90c35daf18f4ce094c4647d21e7a7584c989201f7", - "size": 66685257, - "source": "components/google-cloud-sdk-terraform-tools-darwin-arm-20230721154337.tar.gz", + "checksum": "755fafd43ec3445182c9c6ff7c915441e16b52b29269780e4f799ba6eb270ef0", + "contents_checksum": "f59359415ef10e331fb0ce124742820950c1bd6ced592b70c5cc2713265deb8c", + "size": 67088585, + "source": "components/google-cloud-sdk-terraform-tools-darwin-arm-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -7432,16 +7432,16 @@ }, "platform_required": false, "version": { - "build_number": 20230721154337, - "version_string": "0.11.1" + "build_number": 20250411141747, + "version_string": "0.12.3" } }, { "data": { - "checksum": "fb3589a142598f1a36541fe799769b849280e9e20a12b9938d4c39589c6872cb", - "contents_checksum": "c8cab19c95eabb6f7ec7912b0f3ca57c7d1c5306745359ae49400a3ffb000479", - "size": 69665153, - "source": "components/google-cloud-sdk-terraform-tools-darwin-x86_64-20230721154337.tar.gz", + "checksum": "0fe1819f56c12a957587f9d1c86adc6847e7180e42bcc04e316ccdbc662ac0df", + "contents_checksum": "3883086eac6bc2197613f738dcf3e680f330663699926830c08e1d83a1f8f585", + "size": 70055384, + "source": "components/google-cloud-sdk-terraform-tools-darwin-x86_64-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -7466,16 +7466,16 @@ }, "platform_required": false, "version": { - "build_number": 20230721154337, - "version_string": "0.11.1" + "build_number": 20250411141747, + "version_string": "0.12.3" } }, { "data": { - "checksum": "a227491c831d1ed3619bfebd69a3a4379729372b302de64c77891f0955316445", - "contents_checksum": "84c92ebb4b1ae244c96595c4774a9594857e37d900306958fb63fcc58ef61a0f", - "size": 64183072, - "source": "components/google-cloud-sdk-terraform-tools-linux-arm-20231201141418.tar.gz", + "checksum": "f5429b61bfd7ee621ffd08627185c38261c480cf6a4c2df0ccc6be3761bd3b47", + "contents_checksum": "546ae951caad55bd32647ffc78c4f25e137ded358ce4720833b8cb89e92808e5", + "size": 64594483, + "source": "components/google-cloud-sdk-terraform-tools-linux-arm-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -7500,16 +7500,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "0.11.1" + "build_number": 20250411141747, + "version_string": "0.12.3" } }, { "data": { - "checksum": "887c390cadafd0241c1475b39f7ddc60a59a71a669d6faa5ec8c4fea5a82a7cc", - "contents_checksum": "0af08dc9afbe622ca65f4eafbbe342c88e103e0e2cf6bacf5e553da5436b16ab", - "size": 69360426, - "source": "components/google-cloud-sdk-terraform-tools-linux-x86_64-20230721154337.tar.gz", + "checksum": "806da97678bd85ed6c2b5bb6cb536703069a726d2add27f644e4a23641b7d366", + "contents_checksum": "8ccd95fbf3dd6cbb9f204fb5d15a807f20ff36e4d8171ee32fd7481a551cffba", + "size": 69784405, + "source": "components/google-cloud-sdk-terraform-tools-linux-x86_64-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -7534,16 +7534,16 @@ }, "platform_required": false, "version": { - "build_number": 20230721154337, - "version_string": "0.11.1" + "build_number": 20250411141747, + "version_string": "0.12.3" } }, { "data": { - "checksum": "b286cfe232e3ee56c479d6ddfc6e6d13cf3f1b36267bf62168d02f931cbb5b64", - "contents_checksum": "08339495134abe71ec8afcd2d7bd7671da1235e7eb0698ce011e60818147f85f", - "size": 69440727, - "source": "components/google-cloud-sdk-terraform-tools-windows-x86_64-20230721154337.tar.gz", + "checksum": "d84f60a583b1845d4ae79f0bb942f5f20eb2668aa3fa9368b1d6a095b34a94cd", + "contents_checksum": "29e175392b2203d2208419510a151a1cce3d8cd16bb9d2626e287f7d2c3b2b75", + "size": 69845077, + "source": "components/google-cloud-sdk-terraform-tools-windows-x86_64-20250411141747.tar.gz", "type": "tar" }, "dependencies": [ @@ -7568,16 +7568,16 @@ }, "platform_required": false, "version": { - "build_number": 20230721154337, - "version_string": "0.11.1" + "build_number": 20250411141747, + "version_string": "0.12.3" } }, { "data": { - "checksum": "79f580f7e439a03db7ef5d237e3dbe9beff29312b339f64b9c3a49d3eba17f44", - "contents_checksum": "45c7264d5b144dab89a4b112e0a3fa1b05bf24303113964d955c6ca4f28b3870", - "size": 59237855, - "source": "components/google-cloud-sdk-tests-20250314151217.tar.gz", + "checksum": "b2be28ee32e2f0ab47f9448f45be73c68e59aa02bb83394f980c62019c87a4d2", + "contents_checksum": "5622b40cd073b840ad5bf641b3dcff0e54f756fbd44368e6eeb9a0f2e846d645", + "size": 59459698, + "source": "components/google-cloud-sdk-tests-20250418150427.tar.gz", "type": "tar" }, "dependencies": [ @@ -7595,8 +7595,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20250314151217, - "version_string": "2025.03.14" + "build_number": 20250418150427, + "version_string": "2025.04.18" } } ], @@ -7615,11 +7615,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20250314151217, + "revision": 20250418150427, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "515.0.0" + "version": "519.0.0" } diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index 3e8eeb9958df..5cda2d2e9be9 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,27 +1,27 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "515.0.0"; + version = "519.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-515.0.0-linux-x86_64.tar.gz"; - sha256 = "0r7a37px6bsglpx6szhqxaz69xn2yhhypi0vaav7nncqjhsl4kmz"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-519.0.0-linux-x86_64.tar.gz"; + sha256 = "05ix4a93c407cs4zs4qxc0cm1afqcf233vf602gn49lrsc5csb45"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-515.0.0-darwin-x86_64.tar.gz"; - sha256 = "0afjhybynhgd963vw72rxyhb8gkisay78n4xwvcn9910v8dyjkz7"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-519.0.0-darwin-x86_64.tar.gz"; + sha256 = "1vgi34i8l2d6j69dmz771hn38s6hazly94bkkvb164rykis4a214"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-515.0.0-linux-arm.tar.gz"; - sha256 = "0wmi3lgv2gd55p8ps0vfvqp5vrn84x27agssbych80qm6vlrm7xv"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-519.0.0-linux-arm.tar.gz"; + sha256 = "1vghaci1gqdbhhyr19cmsyfi8j8sg1mjswf5x919rri55h2r0bl8"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-515.0.0-darwin-arm.tar.gz"; - sha256 = "1x2m84glrz1ccip37kmi9svwmamrjiq000k9jndwfiqxpwyr3c72"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-519.0.0-darwin-arm.tar.gz"; + sha256 = "13b1xcrx9yacg380ywkw4yx7as9ac144h4drj0smn2vhn1y7l93m"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-515.0.0-linux-x86.tar.gz"; - sha256 = "1f7njdffbq16nknkhlpa76ssdpfd3kp2n6g266akiksppwg5hrfb"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-519.0.0-linux-x86.tar.gz"; + sha256 = "18yq0y1ribw8kyx81ligfsh5q9k25h8g7kawknvf01p3jx3wzrih"; }; }; } From 43429d17c10b287eeb506924883b67b29a5c90c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:13:10 +0000 Subject: [PATCH 316/449] yaziPlugins.toggle-pane: 25.2.26-unstable-2025-03-19 -> 25.2.26-unstable-2025-04-21 --- pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix index 5a1cefc8fda9..c01ac9a097da 100644 --- a/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/toggle-pane/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "toggle-pane.yazi"; - version = "25.2.26-unstable-2025-03-19"; + version = "25.2.26-unstable-2025-04-21"; src = fetchFromGitHub { owner = "yazi-rs"; repo = "plugins"; - rev = "273019910c1111a388dd20e057606016f4bd0d17"; - hash = "sha256-80mR86UWgD11XuzpVNn56fmGRkvj0af2cFaZkU8M31I="; + rev = "4b027c79371af963d4ae3a8b69e42177aa3fa6ee"; + hash = "sha256-auGNSn6tX72go7kYaH16hxRng+iZWw99dKTTUN91Cow="; }; meta = { From e76b49e83ecc46fad3bcb18819921a3a4528ad0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:17:54 +0000 Subject: [PATCH 317/449] yaziPlugins.rich-preview: 0-unstable-2025-01-18 -> 0-unstable-2025-04-22 --- pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix index ae6e5e8be0f0..ddc7f3dd9264 100644 --- a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "rich-preview.yazi"; - version = "0-unstable-2025-01-18"; + version = "0-unstable-2025-04-22"; src = fetchFromGitHub { owner = "AnirudhG07"; repo = "rich-preview.yazi"; - rev = "2559e5fa7c1651dbe7c5615ef6f3b5291347d81a"; - hash = "sha256-dW2gAAv173MTcQdqMV32urzfrsEX6STR+oCJoRVGGpA="; + rev = "fdcf37320e35f7c12e8087900eebffcdafaee8cb"; + hash = "sha256-HO9hTCfgGTDERClZaLnUEWDvsV9GMK1kwFpWNM1wq8I="; }; meta = { From 5df569cff455d56fedc90350260fe87649e5b392 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:21:27 +0000 Subject: [PATCH 318/449] yaziPlugins.duckdb: 25.4.8-unstable-2025-04-09 -> 25.4.8-unstable-2025-04-20 --- pkgs/by-name/ya/yazi/plugins/duckdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix index 9e022261fbad..91c8f9e5f99d 100644 --- a/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/duckdb/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "duckdb.yazi"; - version = "25.4.8-unstable-2025-04-09"; + version = "25.4.8-unstable-2025-04-20"; src = fetchFromGitHub { owner = "wylie102"; repo = "duckdb.yazi"; - rev = "eaa748c62e24f593104569d2dc15d50b1d48497b"; - hash = "sha256-snQ+n7n+71mqAsdzrXcI2v7Bg0trrbiHv3mIAxldqlc="; + rev = "6259e2d26236854b966ebc71d28de0397ddbe4d8"; + hash = "sha256-9DMqE/pihp4xT6Mo2xr51JJjudMRAesxD5JqQ4WXiM4="; }; meta = { From cc83e5d5a0bc37c3c75c63f53b3cd22e3744adae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:24:53 +0000 Subject: [PATCH 319/449] yaziPlugins.starship: 25.4.8-unstable-2025-04-09 -> 25.4.8-unstable-2025-04-20 --- pkgs/by-name/ya/yazi/plugins/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/starship/default.nix b/pkgs/by-name/ya/yazi/plugins/starship/default.nix index f3cc5e0863c6..27ec12b801b3 100644 --- a/pkgs/by-name/ya/yazi/plugins/starship/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/starship/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "starship.yazi"; - version = "25.4.8-unstable-2025-04-09"; + version = "25.4.8-unstable-2025-04-20"; src = fetchFromGitHub { owner = "Rolv-Apneseth"; repo = "starship.yazi"; - rev = "c0707544f1d526f704dab2da15f379ec90d613c2"; - hash = "sha256-H8j+9jcdcpPFXVO/XQZL3zq1l5f/WiOm4YUxAMduSRs="; + rev = "6fde3b2d9dc9a12c14588eb85cf4964e619842e6"; + hash = "sha256-+CSdghcIl50z0MXmFwbJ0koIkWIksm3XxYvTAwoRlDY="; }; meta = { From 3204bcc765a2ef97cc0c8655fc4cb1044caed463 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:28:31 +0000 Subject: [PATCH 320/449] allure: 2.33.0 -> 2.34.0 --- pkgs/by-name/al/allure/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix index bcce322418c9..cbb780c2ee5d 100644 --- a/pkgs/by-name/al/allure/package.nix +++ b/pkgs/by-name/al/allure/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.33.0"; + version = "2.34.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-ZRAvIBF89LFYWfmO/bPqL85/XQ9l0TRGOs/uQ9no7tA="; + hash = "sha256-1R4x8LjUv4ZQXfFeJ1HkHml3sRLhb1tRV3UqApVEo7U="; }; dontConfigure = true; From 8e00b8a60022155759f4e79d53383f035d5a2e78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:36:53 +0000 Subject: [PATCH 321/449] python312Packages.docling-serve: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/docling-serve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/docling-serve/default.nix b/pkgs/development/python-modules/docling-serve/default.nix index 4a521fbadbec..16694ea49e2f 100644 --- a/pkgs/development/python-modules/docling-serve/default.nix +++ b/pkgs/development/python-modules/docling-serve/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "docling-serve"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-serve"; tag = "v${version}"; - hash = "sha256-QasHVoJITOuys4hASwC43eIy5854G12Yvu7Zncr9ia8="; + hash = "sha256-ACoqhaGiYHf2dqulxfHQDH/JIhuUlH7wyu0JY4hd0U8="; }; build-system = [ From 5ae6b1e70efc033ab6f7ca336729537188cc9593 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:43:01 +0000 Subject: [PATCH 322/449] reddit-tui: 0.3.4 -> 0.3.5 --- pkgs/by-name/re/reddit-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/reddit-tui/package.nix b/pkgs/by-name/re/reddit-tui/package.nix index 810f998267af..afe93bfdd911 100644 --- a/pkgs/by-name/re/reddit-tui/package.nix +++ b/pkgs/by-name/re/reddit-tui/package.nix @@ -7,14 +7,14 @@ }: buildGoModule (finalAttrs: { pname = "reddit-tui"; - version = "0.3.4"; + version = "0.3.5"; src = fetchFromGitHub { owner = "tonymajestro"; repo = "reddit-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-FlGprSbt1/jTRe2p/aXt5f5aZAxnQlb6M70wvUdE9qk="; + hash = "sha256-M6GYfsKKvqVlDzEndaX92Zo5wwqVgrYGUKtbs94Krz4="; }; - vendorHash = "sha256-H2ukIIi30b8kGOjESXJGv/VW5pPgfxG2c3H6S4jRAA4="; + vendorHash = "sha256-Yqo80adzA9gtSD3qzM+fObzRt3WbcMATQef0g7/z2Dw="; doCheck = false; passthru.updateScript = nix-update-script { }; From 678549680218c11121d1fb5ca32c107ac9909444 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:48:23 +0000 Subject: [PATCH 323/449] git-credential-gopass: 1.15.15 -> 1.15.16 --- pkgs/tools/security/gopass/git-credential.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index f6ee7ceb28a2..5812f2730979 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "git-credential-gopass"; - version = "1.15.15"; + version = "1.15.16"; src = fetchFromGitHub { owner = "gopasspw"; repo = "git-credential-gopass"; rev = "v${version}"; - hash = "sha256-xtZAT1Lb7YJ0Hy2cMT2riVbEoWtz7lusKJ9QT4ZI6Ek="; + hash = "sha256-R3PQtBUu2qApexr1jk1cROr73sWsGfDHimf2oZa1Y8U="; }; - vendorHash = "sha256-onpg0CRm5HSfMEejhn2ycnV1GuukX1SK4FZN/KjEiR4="; + vendorHash = "sha256-FE4ZZjXOWx4swj5FMNN7keZjK2BHkGF0deegbZaBak0="; subPackages = [ "." ]; From 385bbb5d7281e06eefb8c753f38442aef1b4ccc8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:49:00 +0000 Subject: [PATCH 324/449] redu: 0.2.12 -> 0.2.13 --- pkgs/by-name/re/redu/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/redu/package.nix b/pkgs/by-name/re/redu/package.nix index 5da1913d43a9..e81994bb9604 100644 --- a/pkgs/by-name/re/redu/package.nix +++ b/pkgs/by-name/re/redu/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "redu"; - version = "0.2.12"; + version = "0.2.13"; src = fetchFromGitHub { owner = "drdo"; repo = "redu"; tag = "v${finalAttrs.version}"; - hash = "sha256-3DcBTpog5tWv2qdmhOlDLHFY77Cug6mCpDQEAtViw74="; + hash = "sha256-iea3tt1WB0/5XPNeCAk38/UoCHVSngXfNmfZQyspmsw="; }; - cargoHash = "sha256-Rp8y2tBnpzBVEoLP4fTMulIJpu1j2TpJNh5M9kjnuEo="; + cargoHash = "sha256-fiMZIFIVeFnBnRBgmdUB8E5A2pM5nrTfUgD1LS6a4LQ="; env.RUSTC_BOOTSTRAP = 1; From f7b0f2597f1b07ff91fc2ebe7a5d7e6eb81482d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:56:03 +0000 Subject: [PATCH 325/449] python312Packages.notus-scanner: 22.6.5 -> 22.7.1 --- pkgs/development/python-modules/notus-scanner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/notus-scanner/default.nix b/pkgs/development/python-modules/notus-scanner/default.nix index 8fe4c5e02728..5da6021893c1 100644 --- a/pkgs/development/python-modules/notus-scanner/default.nix +++ b/pkgs/development/python-modules/notus-scanner/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "notus-scanner"; - version = "22.6.5"; + version = "22.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = "notus-scanner"; tag = "v${version}"; - hash = "sha256-PPwQjZIKSQ1OmyYJ8ErkqdbHZfH4iHPMiDdKZ3imBwo="; + hash = "sha256-iTcGo33GRf+CihSRuK1GFXOpYL6TT8e3CRyK2/AA38U="; }; pythonRelaxDeps = [ @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helper to create results from local security checks"; homepage = "https://github.com/greenbone/notus-scanner"; - changelog = "https://github.com/greenbone/notus-scanner/releases/tag/v${version}"; + changelog = "https://github.com/greenbone/notus-scanner/releases/tag/${src.tag}"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ fab ]; }; From 2152f51ec73f4c7e18202b1846ac35a59c21f620 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 00:57:28 +0000 Subject: [PATCH 326/449] chamber: 3.1.1 -> 3.1.2 --- pkgs/by-name/ch/chamber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chamber/package.nix b/pkgs/by-name/ch/chamber/package.nix index 4f6dd8670f67..9f721954031f 100644 --- a/pkgs/by-name/ch/chamber/package.nix +++ b/pkgs/by-name/ch/chamber/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "chamber"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ySOlP0sFk3+IRt/zstZK6lEE2pzoVSiZz3wFxdesgc="; + sha256 = "sha256-9+I/zH4sHlLQkEn+fCboI3vCjYjlk+hdYnWuxq47r5I="; }; env.CGO_ENABLED = 0; - vendorHash = "sha256-KlouLjW9hVKFi9uz34XHd4CzNOiyO245QNygkB338YQ="; + vendorHash = "sha256-IjCBf1h6r+EDLfgGqP/VfsHaD5oPkIR33nYBAcb6SLY="; ldflags = [ "-s" From cd3a95024926c112dfe5971197e80a7cd48ac2ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 01:11:54 +0000 Subject: [PATCH 327/449] ignite-cli: 28.8.2 -> 28.9.0 --- pkgs/by-name/ig/ignite-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ig/ignite-cli/package.nix b/pkgs/by-name/ig/ignite-cli/package.nix index 8f66cb6b0e99..4c9123b2c842 100644 --- a/pkgs/by-name/ig/ignite-cli/package.nix +++ b/pkgs/by-name/ig/ignite-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "ignite-cli"; - version = "28.8.2"; + version = "28.9.0"; src = fetchFromGitHub { repo = "cli"; owner = "ignite"; rev = "v${version}"; - hash = "sha256-d7+T0VlmKQgmAJ8eyDg8JDL9HHJbU+nOTvJP0GTuIRY="; + hash = "sha256-NLQ+Zd77JyHuih7hPeM067fcpny1V50GFDLGhtclGms="; }; vendorHash = "sha256-EaOs3m5AN0EYMO8j3mkKPOQwapi0WRaTIUJKTjDpmCo="; From 1f496b8f387f9f0a3afb42d0aba05545cddd13b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 01:12:14 +0000 Subject: [PATCH 328/449] clusterctl: 1.9.6 -> 1.10.0 --- pkgs/by-name/cl/clusterctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index ac81adcf2569..d38a5f096670 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.9.6"; + version = "1.10.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-XXtVGIpoR2JfkR7urfHuh6xKoIvsF42NV+4yjxb8nls="; + hash = "sha256-04ytG4U8Luc5yh5VAbS1AQpjjapKsWWZSSB3IU5Rf6U="; }; - vendorHash = "sha256-SdLeME6EFraGUXE1zUdEfxTETUKLDmecYpWEg5DE4PQ="; + vendorHash = "sha256-iProsOETP9ahyemF2tHUVmoiqjG+ghjZkHb6PAhygb4="; subPackages = [ "cmd/clusterctl" ]; From ede4510df89c55eb19a691375d76baa22b6800be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 01:18:15 +0000 Subject: [PATCH 329/449] quiet: 4.0.3 -> 4.1.2 --- pkgs/by-name/qu/quiet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quiet/package.nix b/pkgs/by-name/qu/quiet/package.nix index 7a94f9b14ee9..94d9398c2490 100644 --- a/pkgs/by-name/qu/quiet/package.nix +++ b/pkgs/by-name/qu/quiet/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "quiet"; - version = "4.0.3"; + version = "4.1.2"; src = fetchurl { url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.AppImage"; - hash = "sha256-BeN0O/Q95M42+2iRtYoko0mM4rLFVlzeRPXdls+5zOs="; + hash = "sha256-oYN+oXUvSeAR+gaRxEuBZHHV6lKTS7OrYVW4MMGoUO0="; }; meta = { From cb201672417be47d505aefb534cdd3ff7ecb22e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 01:33:39 +0000 Subject: [PATCH 330/449] litefs: 0.5.11 -> 0.5.14 --- pkgs/by-name/li/litefs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/litefs/package.nix b/pkgs/by-name/li/litefs/package.nix index 5277cda5c178..83226ec9b449 100644 --- a/pkgs/by-name/li/litefs/package.nix +++ b/pkgs/by-name/li/litefs/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "litefs"; - version = "0.5.11"; + version = "0.5.14"; src = fetchFromGitHub { owner = "superfly"; repo = pname; rev = "v${version}"; - sha256 = "sha256-I12bKImZkvAMyfwb6r/NxE+BcUk+SalN+cIDXP0q4xA="; + sha256 = "sha256-URwHnOvvz/UnrxoFIuUYpw10uPHgxQf9LPO1xECixDE="; }; - vendorHash = "sha256-FcYPe4arb+jbxj4Tl6bRRAnkEvw0rkECIo8/zC79lOA="; + vendorHash = "sha256-i0gYhPwcs3dfWy6GANlUl1Nc+dXD8KuAT71FATwxpDo="; subPackages = [ "cmd/litefs" ]; From 0b23c0119c069bd19b235507f3b731de91987a92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 02:15:12 +0000 Subject: [PATCH 331/449] monsoon: 0.10.0 -> 0.10.1 --- pkgs/by-name/mo/monsoon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/monsoon/package.nix b/pkgs/by-name/mo/monsoon/package.nix index d3d6d3bfa04f..fc0cb5fe1cc2 100644 --- a/pkgs/by-name/mo/monsoon/package.nix +++ b/pkgs/by-name/mo/monsoon/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "monsoon"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = "monsoon"; tag = "v${version}"; - hash = "sha256-efVwOon499DUJ17g6aQveMd2g544Ck+/P7VttYnR+No="; + hash = "sha256-vgwoW7jrcLVHDm1cYrIpFcfrgKImCAVOtHg8lMQ6aic="; }; - vendorHash = "sha256-i96VDKNRNrkrkg2yBd+muXIQK0vZCGIoQrZsq+kBMsk="; + vendorHash = "sha256-hGEUO1sl8IKXo4rkS81Wlf7187lu2PrSujNlGNTLwmE="; # Tests fails on darwin doCheck = !stdenv.hostPlatform.isDarwin; From b746199eda16532a5eed9c954707fe524b2bf8ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 02:17:39 +0000 Subject: [PATCH 332/449] mev-boost: 1.8 -> 1.9 --- pkgs/by-name/me/mev-boost/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/mev-boost/package.nix b/pkgs/by-name/me/mev-boost/package.nix index f99e1b0ce3fb..f36c87d7f615 100644 --- a/pkgs/by-name/me/mev-boost/package.nix +++ b/pkgs/by-name/me/mev-boost/package.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "mev-boost"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "flashbots"; repo = "mev-boost"; rev = "v${version}"; - hash = "sha256-EFPVBSSIef3cTrYp3X1xCEOtYcGpuW/GZXHXX+0wGd8="; + hash = "sha256-VBvbiB7M6X+bQ5xEwmJo5dptiR7PIBiFDqkg1fyU8ro="; }; - vendorHash = "sha256-xkncfaqNfgPt5LEQ3JyYXHHq6slOUchomzqwkZCgCOM="; + vendorHash = "sha256-OyRyMsINy4I04E2QvToOEY7UKh2s6NUeJJO0gJI5uS0="; meta = with lib; { description = "Ethereum block-building middleware"; From 1f0c0201d1aab1721b25ff75614c065962de89dd Mon Sep 17 00:00:00 2001 From: VuiMuich Date: Wed, 23 Apr 2025 04:21:43 +0200 Subject: [PATCH 333/449] blender: 4.4.0 -> 4.4.1 (#399292) --- pkgs/by-name/bl/blender/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 87dbe51ba6b5..ea942a8ec9f6 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -112,12 +112,12 @@ in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.4.0"; + version = "4.4.1"; srcs = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-pAzOayAPyRYgTixAyg2prkUtI70uFulRuBYhgU9ZNw4="; + hash = "sha256-5MsJ7UFpwwtaq905CiTkas/qPYOaeiacSSl3qu9h5w0="; }; patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; From b823d7721f174ac9094f0eeb666f6180a6486d75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=A9tan=20Lepage?= <33058747+GaetanLepage@users.noreply.github.com> Date: Wed, 23 Apr 2025 04:23:11 +0200 Subject: [PATCH 334/449] python312Packages.vector: 1.6.1 -> 1.6.2 (#400912) Diff: https://github.com/scikit-hep/vector/compare/refs/tags/v1.6.1...refs/tags/v1.6.2 Changelog: https://github.com/scikit-hep/vector/releases/tag/v1.6.2 --- pkgs/development/python-modules/vector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix index 715a13dbdf06..f39a670a898a 100644 --- a/pkgs/development/python-modules/vector/default.nix +++ b/pkgs/development/python-modules/vector/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "vector"; - version = "1.6.1"; + version = "1.6.2"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "vector"; tag = "v${version}"; - hash = "sha256-EHvdz6Tv3qJr6yUAw3/TuoMSrOCAQpsFBF1sS5I2p2k="; + hash = "sha256-IMr3+YveR/FDQ2MbgbWr1KJFrdH9B+KOFVNGJjz6Zdk="; }; build-system = [ From 465759d454d40d1708ca769f1bf9a50002073eaa Mon Sep 17 00:00:00 2001 From: Keenan Weaver Date: Fri, 18 Apr 2025 19:22:33 -0500 Subject: [PATCH 335/449] fooyin: fix build, add libebur128 for ReplayGain --- pkgs/by-name/fo/fooyin/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index f4723504c5cf..e2341b74e49b 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -10,12 +10,14 @@ kdsingleapplication, pipewire, taglib, + libebur128, libvgm, libsndfile, libarchive, libopenmpt, game-music-emu, SDL2, + fetchpatch, }: stdenv.mkDerivation (finalAttrs: { @@ -42,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { pipewire SDL2 # input plugins + libebur128 libvgm libsndfile libarchive @@ -63,6 +66,15 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "INSTALL_FHS" true) ]; + # Remove after next release + patches = [ + (fetchpatch { + name = "qbrush.patch"; + url = "https://github.com/fooyin/fooyin/commit/e44e08abb33f01fe85cc896170c55dbf732ffcc9.patch"; + hash = "sha256-soDj/SFctxxsnkePv4dZgyDHYD2eshlEziILOZC4ddM="; + }) + ]; + env.LANG = "C.UTF-8"; meta = { From 21f623d62d0af0381e7a143db89597eaefd42644 Mon Sep 17 00:00:00 2001 From: awwpotato Date: Tue, 22 Apr 2025 19:47:13 -0700 Subject: [PATCH 336/449] maintainers: awwpotato add matrix --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7f0f40563522..5c1d1fb103c8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2513,6 +2513,7 @@ }; awwpotato = { email = "awwpotato@voidq.com"; + matrix = "@awwpotato:envs.net"; github = "awwpotato"; githubId = 153149335; name = "awwpotato"; From 703b7e8618581fe0038c9687df9618eb5421e77c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 02:49:32 +0000 Subject: [PATCH 337/449] muffet: 2.10.8 -> 2.10.9 --- pkgs/by-name/mu/muffet/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index ad69ddb22310..3723c584bff7 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "muffet"; - version = "2.10.8"; + version = "2.10.9"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; rev = "v${version}"; - hash = "sha256-vpckg0zx8RNR7dAKjdlSHyevn7kDslrysah8jCLSaBw="; + hash = "sha256-I4xLa4R9vxP+bHa1wP4ci5r4ZIlH2KUif+udSVLUsNk="; }; - vendorHash = "sha256-IbpTQdJ6OssyzwS2H4iNgJybC9rvvlW6UYkihNkBYOE="; + vendorHash = "sha256-scma8hrm8e/KU2x+TIGOvaUk6nYxKIZ1eaGqs/W2I0I="; meta = with lib; { description = "Website link checker which scrapes and inspects all pages in a website recursively"; From d7cec8383ce532e988e9abba5134898b7c60501a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 03:04:37 +0000 Subject: [PATCH 338/449] url-parser: 2.1.4 -> 2.1.5 --- pkgs/by-name/ur/url-parser/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix index 5dcd620579e3..bd274af50f68 100644 --- a/pkgs/by-name/ur/url-parser/package.nix +++ b/pkgs/by-name/ur/url-parser/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "url-parser"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; tag = "v${version}"; - hash = "sha256-GIJj4t6xDXfXMWfSpUR1iI1Ju/W/2REedgtyEFgbylE="; + hash = "sha256-Kwjub9qAfHhqNL3mRzlJws1wnwVPAJ3jPYh0s/cu7+8="; }; - vendorHash = "sha256-gYkuSBgkDdAaJArsvTyZXkvYCKXkhic5XzLqPbbGVOw="; + vendorHash = "sha256-MR8SjQ8IrHC6hZTvmnqXvqJ6odo0+RIMDtMpYwY+iMs="; ldflags = [ "-s" From e8b8d8207accaa668f5f03cdf2017475af64299c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 03:11:36 +0000 Subject: [PATCH 339/449] exoscale-cli: 1.84.0 -> 1.84.1 --- pkgs/by-name/ex/exoscale-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix index f5370d1d1ab9..a9bf6efbec02 100644 --- a/pkgs/by-name/ex/exoscale-cli/package.nix +++ b/pkgs/by-name/ex/exoscale-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.84.0"; + version = "1.84.1"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-PO6LIp5eortBEygdIRf2LpPJalSEMGosW8KtqBV/MlM="; + sha256 = "sha256-Bt/IeZ7w1EAHNKMctugOq5XN2qJEhW26M0KE74baGJc="; }; vendorHash = null; From 0ed5da034c050ee657af8c3265b97df262f6306d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 03:12:42 +0000 Subject: [PATCH 340/449] kbld: 0.45.1 -> 0.45.2 --- pkgs/by-name/kb/kbld/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kb/kbld/package.nix b/pkgs/by-name/kb/kbld/package.nix index dac56864246e..471d845503e1 100644 --- a/pkgs/by-name/kb/kbld/package.nix +++ b/pkgs/by-name/kb/kbld/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kbld"; - version = "0.45.1"; + version = "0.45.2"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kbld"; rev = "v${version}"; - hash = "sha256-ikrxgukixnUCwwEt5FBzTmpjpjkjgtYTjr/AwNZ9kiI="; + hash = "sha256-ozsbuQLCD+YfHmF8+VmvNQElXvh59ZWuTecXuWAQIjM="; }; vendorHash = null; From c287093332d75edbbc76b8199cef83fc8d6b4e47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 03:12:53 +0000 Subject: [PATCH 341/449] regal: 0.32.0 -> 0.33.1 --- pkgs/by-name/re/regal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index e29b786008b2..2a5e7fb0b346 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { name = "regal"; - version = "0.32.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "StyraInc"; repo = "regal"; rev = "v${version}"; - hash = "sha256-fO/hZw5aoDshemK0vmlwUJiSqGQ2peF5egT40029aAg="; + hash = "sha256-4H2/qHJA+/a2yoFNHhVUAslsyetesGdDqA8jHWN8L7E="; }; - vendorHash = "sha256-ExM7v2n2j8IhcuhA9S05gJvQq5x+jDjZtTcG+nXIorM="; + vendorHash = "sha256-JlbNTQYRGlmzoPP+mIEVjtObGNI1/uuseLz5trxN5gM="; ldflags = [ "-s" From 221e38cfa779321fb58fb99d808dd7b7e3e0d3e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 03:26:06 +0000 Subject: [PATCH 342/449] splash: 3.11.2 -> 3.11.3 --- pkgs/by-name/sp/splash/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix index ff66011a3629..d014f3808a2f 100644 --- a/pkgs/by-name/sp/splash/package.nix +++ b/pkgs/by-name/sp/splash/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "splash"; - version = "3.11.2"; + version = "3.11.3"; src = fetchFromGitHub { owner = "danieljprice"; repo = "splash"; rev = "v${finalAttrs.version}"; - hash = "sha256-YB0cgxpRlya8/7fYxPKWBCovHvE/N7HY/7nwKnzYiJc="; + hash = "sha256-deuQTCDSLzScd9lFxv83Y8gX7D7WZtikIUfMxbmH2m8="; }; nativeBuildInputs = [ From c4ebe103c9e45cde8465780716f6b03f4776ff85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 03:37:24 +0000 Subject: [PATCH 343/449] cnspec: 11.50.0 -> 11.51.1 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index dbcdf20fc543..429a6bf58969 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.50.0"; + version = "11.51.1"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-Ope7bPXTNMWuRlGWBuqjp31xCH6bjbgu6Hjf9sSQB+0="; + hash = "sha256-iTS8+ZmJWHRA6VSwei9mIWPqZHshb8JniXSXl+hGyPg="; }; proxyVendor = true; - vendorHash = "sha256-EChYXDMsk40NyOHTZNMEbfcTu3vqoFgR4n8PXTlerV0="; + vendorHash = "sha256-TbIXNPMygNXqX2TCbkZOhXpdoz/cjZD5uoItgmYf7wk="; subPackages = [ "apps/cnspec" ]; From 76c01232b9f2a2ee433d3d0c283086b91775b647 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 03:45:01 +0000 Subject: [PATCH 344/449] gosmee: 0.23.4 -> 0.24.0 --- pkgs/by-name/go/gosmee/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix index 085ee18b5edc..c633b867aaea 100644 --- a/pkgs/by-name/go/gosmee/package.nix +++ b/pkgs/by-name/go/gosmee/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gosmee"; - version = "0.23.4"; + version = "0.24.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "gosmee"; rev = "v${version}"; - hash = "sha256-orQDLuEbfxWWXmothxfTgeaMiqzJeTOFeNnPNDHwnYU="; + hash = "sha256-hE9iZkIkMzCICw9n1XhJ2PO5SvqE0EVhLJQO7tCUw3U="; }; vendorHash = null; From 93dea11f174d1330c6f6b5381256e47716150b11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 03:55:18 +0000 Subject: [PATCH 345/449] ibus-engines.typing-booster-unwrapped: 2.27.29 -> 2.27.36 --- .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 1c94f999ded8..3ff3da61c36c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -25,13 +25,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.27.29"; + version = "2.27.36"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-0dyp7kNnmuw9YcYTH/5Eln+EzIbM2HTojXXC9NCA8vE="; + hash = "sha256-GxyLKle2BfeFn++4Ep7tJa2Xdlt6LLHGz8RoiGhqey4="; }; nativeBuildInputs = [ From b2115e880ffe54782532e4d304af3a6684bce256 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 04:05:50 +0000 Subject: [PATCH 346/449] zwave-js-ui: 10.1.5 -> 10.3.0 --- pkgs/by-name/zw/zwave-js-ui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 4a7ea1e56548..26c67583e4fe 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "10.1.5"; + version = "10.3.0"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-z0uLX8tVL5g9Vnneu4r35iucRi3mDOJXC3mx9Xwz5So="; + hash = "sha256-RfjjGpQhjpRV/+Uqh/uki9GRQQ3IrkyPkYY9hWUGWoA="; }; - npmDepsHash = "sha256-mO+PJFbhj8n/HRpBc9YyJHnvcXHnC3gT4pQM91PbL3M="; + npmDepsHash = "sha256-vjHqL3t5FiBWlh2lEeRr31Ynyu4peHyMC82zHsBbQ8E="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; From 8923784c1365ed59297104df16dd8e2a310f9a28 Mon Sep 17 00:00:00 2001 From: Morxemplum Date: Wed, 23 Apr 2025 00:13:06 -0400 Subject: [PATCH 347/449] mcpelauncher-ui-qt: fix build on Qt 6.9 --- pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix index 81352635f66d..d0c0241be79d 100644 --- a/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix +++ b/pkgs/by-name/mc/mcpelauncher-ui-qt/package.nix @@ -3,6 +3,7 @@ stdenv, mcpelauncher-client, fetchFromGitHub, + fetchpatch, cmake, pkg-config, zlib, @@ -27,6 +28,16 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./dont_download_glfw_ui.patch + # Qt 6.9 no longer implicitly converts non-char types (such as booleans) to + # construct a QChar. This leads to a build failure with Qt 6.9. Upstream + # has merged a patch, but has not yet formalized it through a release, so + # we must fetch it manually. Remove this fetch on the next point release. + (fetchpatch { + url = "https://github.com/minecraft-linux/mcpelauncher-ui-qt/commit/0526b1fd6234d84f63b216bf0797463f41d2bea0.diff"; + hash = "sha256-vL5iqbs50qVh4BKDxTOpCwFQWO2gLeqrVLfnpeB6Yp8="; + stripLen = 1; + extraPrefix = "mcpelauncher-ui-qt/"; + }) ]; nativeBuildInputs = [ From 946fd06af27bbe8ec63aef4dcc848327edcb55f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 04:14:51 +0000 Subject: [PATCH 348/449] yaziPlugins.relative-motions: 25.2.7-unstable-2025-04-07 -> 25.4.8-unstable-2025-04-16 --- pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix index f215b9c0b7f3..c899450c6974 100644 --- a/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/relative-motions/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "relative-motions.yazi"; - version = "25.2.7-unstable-2025-04-07"; + version = "25.4.8-unstable-2025-04-16"; src = fetchFromGitHub { owner = "dedukun"; repo = "relative-motions.yazi"; - rev = "61ae7950daeea3e1d960aa777b7a07cde4539b29"; - hash = "sha256-L5B5X762rBoxgKrUi0uRLDmAOJ/jPALc2bP9MYLiGYw="; + rev = "ce2e890227269cc15cdc71d23b35a58fae6d2c27"; + hash = "sha256-Ijz1wYt+L+24Fb/rzHcDR8JBv84z2UxdCIPqTdzbD14="; }; meta = { From 7fa68396e422e593f9c5833de2b3c6df2686dac6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 04:15:41 +0000 Subject: [PATCH 349/449] yaziPlugins.glow: 0-unstable-2025-04-14 -> 0-unstable-2025-04-15 --- pkgs/by-name/ya/yazi/plugins/glow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yazi/plugins/glow/default.nix b/pkgs/by-name/ya/yazi/plugins/glow/default.nix index d7755ae98fd1..6a5dc9df47af 100644 --- a/pkgs/by-name/ya/yazi/plugins/glow/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/glow/default.nix @@ -5,12 +5,12 @@ }: mkYaziPlugin { pname = "glow.yazi"; - version = "0-unstable-2025-04-14"; + version = "0-unstable-2025-04-15"; src = fetchFromGitHub { owner = "Reledia"; repo = "glow.yazi"; - rev = "a1711f10e815f7f7b6e529e0814342b8518d9ee6"; + rev = "2da96e3ffd9cd9d4dd53e0b2636f83ff69fe9af0"; hash = "sha256-4krck4U/KWmnl32HWRsblYW/biuqzDPysrEn76buRck="; }; From 330e852083ab29eb8b4916e553c912e9dfbecde6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 04:40:16 +0000 Subject: [PATCH 350/449] python312Packages.google-generativeai: 0.8.4 -> 0.8.5 --- .../python-modules/google-generativeai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index ebd8b43d09cc..812da630b951 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.8.4"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; tag = "v${version}"; - hash = "sha256-Snsp6hP1BKNLSFGbcotdhmluTuuBPZBcLkNY8mtOl6o="; + hash = "sha256-wc35JSc98xvepI7Gpe5jSJ+c8n7WLKa96axoWVcH7UM="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for Google's large language model PaLM API"; homepage = "https://github.com/google/generative-ai-python"; - changelog = "https://github.com/google/generative-ai-python/releases/tag/v${version}"; + changelog = "https://github.com/google/generative-ai-python/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From ffe304a6fcff8f9b85498d7beafaf8eb0134aa00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 04:50:42 +0000 Subject: [PATCH 351/449] python312Packages.cf-xarray: 0.10.4 -> 0.10.5 --- pkgs/development/python-modules/cf-xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cf-xarray/default.nix b/pkgs/development/python-modules/cf-xarray/default.nix index 7d775d084289..b14205bcc70b 100644 --- a/pkgs/development/python-modules/cf-xarray/default.nix +++ b/pkgs/development/python-modules/cf-xarray/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cf-xarray"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; src = fetchFromGitHub { owner = "xarray-contrib"; repo = "cf-xarray"; tag = "v${version}"; - hash = "sha256-OlPoCFTeLTrYEUONu5PMZyfkQiHoqF/2Bj4OkUOCei8="; + hash = "sha256-ty7gPBs2vp0mVnn914F84Dg4+DLCBLl7aHMqqrXx9So="; }; build-system = [ From e326838d22f2e0c65a8d36143faa60147e6f96bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 04:51:07 +0000 Subject: [PATCH 352/449] python312Packages.pylutron: 0.2.16 -> 0.2.18 --- pkgs/development/python-modules/pylutron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index 4de059acab08..98771a198cae 100644 --- a/pkgs/development/python-modules/pylutron/default.nix +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pylutron"; - version = "0.2.16"; + version = "0.2.18"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-SuG5x8GWTsCOve3jj1hrtsm37yNRHVFuFjapQafHTbA="; + hash = "sha256-7ZnNfa4POUTMi9sDGMyR6gu9Xpg+j/JmyWVnBBSnRSE="; }; build-system = [ setuptools ]; From 7c944c8153dfa98fc3aa0312bd5a712be7d9e860 Mon Sep 17 00:00:00 2001 From: Julius Michaelis Date: Wed, 23 Apr 2025 14:10:03 +0900 Subject: [PATCH 353/449] lls: 0.4.1 -> 0.4.2 --- pkgs/by-name/ll/lls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ll/lls/package.nix b/pkgs/by-name/ll/lls/package.nix index 88f7c84e4afa..7d7edcc5a8ee 100644 --- a/pkgs/by-name/ll/lls/package.nix +++ b/pkgs/by-name/ll/lls/package.nix @@ -5,17 +5,17 @@ }: rustPlatform.buildRustPackage rec { pname = "lls"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "jcaesar"; repo = "lls"; tag = "v${version}"; - hash = "sha256-OszKEWrpXEyi+0ayTzqy6O+cMZ/AVmesN3QJWCAHF7Q="; + hash = "sha256-eFGyrGtH57a5iRWHWqt1h58QMdmPf2rPqHnuVj5u6PQ="; }; useFetchCargoVendor = true; - cargoHash = "sha256-GIAGy0yLV7hRUk7cMEKxjmXJxpZSNyMXICEGr4vfIxc="; + cargoHash = "sha256-TY7s0sIeW+FgxqbbYvK3uZ2RwPLVKKhLq3DOurer+Gc="; meta = with lib; { description = "Tool to list listening sockets"; From 4c38c704aacd3b89c54fff2998354e5513363e76 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 23 Apr 2025 08:10:54 +0300 Subject: [PATCH 354/449] Revert "mongoc: 1.30.2 -> 2.0.0" --- pkgs/by-name/mo/mongoc/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mongoc/package.nix b/pkgs/by-name/mo/mongoc/package.nix index 68d892aedd33..5812ffda8bef 100644 --- a/pkgs/by-name/mo/mongoc/package.nix +++ b/pkgs/by-name/mo/mongoc/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "2.0.0"; + version = "1.30.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; tag = version; - hash = "sha256-GKXfTrZqdfgxzNi0fM9Ik4XeZGn9IlX75+cXmm5tXPY="; + hash = "sha256-RDUrD8MPZd1VBePyR+L5GiT/j5EZIY1KHLQKG5MsuSM="; }; nativeBuildInputs = [ From acc0cc6843957ddea1fd0f66232f380ca13a75f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 05:11:52 +0000 Subject: [PATCH 355/449] python312Packages.globus-sdk: 3.54.0 -> 3.55.0 --- pkgs/development/python-modules/globus-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index ad04d1c42273..706b3e3610dd 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "3.54.0"; + version = "3.55.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "globus"; repo = "globus-sdk-python"; tag = version; - hash = "sha256-Be3sHPGd0//8jz2U6Ew/EsOQVXnJ7L7gJ07+QCLK9VM="; + hash = "sha256-3Mf4saBxpyHJC9cz27AaVMn3/IF9XKONMHvpWhCFnSo="; }; build-system = [ setuptools ]; From ed3789c02b5eb3544af1ad6e1ecd1ea702e9f507 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 22 Apr 2025 06:00:15 +0800 Subject: [PATCH 356/449] duply: 2.4 -> 2.5.5 --- pkgs/by-name/du/duply/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/du/duply/package.nix b/pkgs/by-name/du/duply/package.nix index c963bc589be8..d3157d64781e 100644 --- a/pkgs/by-name/du/duply/package.nix +++ b/pkgs/by-name/du/duply/package.nix @@ -14,21 +14,24 @@ which, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "duply"; - version = "2.4"; + version = "2.5.5"; src = fetchurl { - url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.4.x/duply_${version}.tgz"; - hash = "sha256-DCrp3o/ukzkfnVaLbIK84bmYnXvqKsvlkGn3GJY3iNg="; + url = "mirror://sourceforge/project/ftplicity/duply%20%28simple%20duplicity%29/2.5.x/duply_${finalAttrs.version}.tgz"; + hash = "sha256-ABryuV5jJNoxcJLsSjODLOHuLKrSEhY3buzy1cQh+AU="; }; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ txt2man ]; postPatch = "patchShebangs ."; installPhase = '' + runHook preInstall + mkdir -p "$out/bin" mkdir -p "$out/share/man/man1" install -vD duply "$out/bin" @@ -45,9 +48,11 @@ stdenv.mkDerivation rec { which ]} "$out/bin/duply" txt2man > "$out/share/man/man1/duply.1" + + runHook postInstall ''; - meta = with lib; { + meta = { description = "Shell front end for the duplicity backup tool"; mainProgram = "duply"; longDescription = '' @@ -57,8 +62,8 @@ stdenv.mkDerivation rec { secure backups on non-trusted spaces are no child's play? ''; homepage = "https://duply.net/"; - license = licenses.gpl2Only; - maintainers = [ maintainers.bjornfor ]; + license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.bjornfor ]; platforms = lib.platforms.unix; }; -} +}) From 827c8207ea25b11f0c91cf12e5ceda9691e02d6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 05:48:07 +0000 Subject: [PATCH 357/449] syncthingtray-minimal: 1.7.5 -> 1.7.6 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b2687050b54b..a5cd70d6faea 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -38,14 +38,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.7.5"; + version = "1.7.6"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-/1X+wbVwLu0+SOMaVDJejBA+Z3szgs8IDtAZ9Yj7hXs="; + hash = "sha256-vJIHDp91T9oMtUT7bsSCxj6XkvT4bLMol9wEr19Wkig="; }; buildInputs = From 37e1c3f76fc9ab398ac90c238114adc0bb95ef8a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 06:11:30 +0000 Subject: [PATCH 358/449] python312Packages.lib4package: 0.3.1 -> 0.3.2 --- pkgs/development/python-modules/lib4package/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/lib4package/default.nix b/pkgs/development/python-modules/lib4package/default.nix index f0682f272979..c1ff25fb161e 100644 --- a/pkgs/development/python-modules/lib4package/default.nix +++ b/pkgs/development/python-modules/lib4package/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "lib4package"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "anthonyharrison"; repo = "lib4package"; tag = "v${version}"; - hash = "sha256-ZU5Lne2/xBgaFrTumWpZsuL9ckqdACrb0iRraWo+Rk0="; + hash = "sha256-AxAnSxm8eEnfi63SedWIdUvad1bD4g0rqBk4W/DQGHY="; }; build-system = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/anthonyharrison/lib4package/releases/tag/v${version}"; + changelog = "https://github.com/anthonyharrison/lib4package/releases/tag/${src.tag}"; description = "Utility for handling package metadata to include in Software Bill of Materials (SBOMs"; homepage = "https://github.com/anthonyharrison/lib4package"; license = lib.licenses.asl20; From 3f95202245481880e3aa486d0162150428e3c207 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 06:57:19 +0000 Subject: [PATCH 359/449] python312Packages.posthog: 3.23.0 -> 3.25.0 --- pkgs/development/python-modules/posthog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/posthog/default.nix b/pkgs/development/python-modules/posthog/default.nix index d3ffd2b75a3c..dc7f7af23c05 100644 --- a/pkgs/development/python-modules/posthog/default.nix +++ b/pkgs/development/python-modules/posthog/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "posthog"; - version = "3.23.0"; + version = "3.25.0"; pyproject = true; src = fetchFromGitHub { owner = "PostHog"; repo = "posthog-python"; tag = "v${version}"; - hash = "sha256-+nmCmO1vPnNgZJdZSWwapeFfckNXEcdc/129yaLygf8="; + hash = "sha256-DETcD6VJseQelGhSYKqXpIxsQxB3/5RY2wWB9pxhI68="; }; build-system = [ setuptools ]; From 3c1dff239d2f6824487da6ee1e1af1ce4c98b98b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Apr 2025 09:10:17 +0200 Subject: [PATCH 360/449] exploitdb: 2025-04-19 -> 2025-04-23 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2025-04-19...2025-04-23 --- pkgs/by-name/ex/exploitdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 149e76b5b517..32e5258cc5d7 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2025-04-19"; + version = "2025-04-23"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-Gq+Yg9Qf1D86vM0d+FFPneztm0KMdbheghmef334+Ps="; + hash = "sha256-K5WQhYVO3z6gR2Jl5yJJW8vK8BA89iAwPzhq4jX27y0="; }; nativeBuildInputs = [ makeWrapper ]; From 984f8946a08347bc351beeadf01af439b4dddb31 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 19 Apr 2025 23:47:28 -0700 Subject: [PATCH 361/449] armagetronad: update unstable --- pkgs/games/armagetronad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 51cf2829be7f..84c3dc625f18 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -70,8 +70,8 @@ let # https://gitlab.com/armagetronad/armagetronad/-/commits/trunk/?ref_type=heads ${unstableVersionMajor} = let - rev = "391a74625c1222dd180f069f1b61c3e069a3ba8c"; - hash = "sha256-fUY0dBj85k0QhnAoDzyBmmKmRh9oCYC6r6X4ukt7/L0="; + rev = "1830e09888597b372fad192b0d246aefe555540c"; + hash = "sha256-svVcg2AMk2GHmg1Szny10KCLZQ6Cly1RrSVNGmf7Fdg="; in dedicatedServer: { version = "${unstableVersionMajor}-${builtins.substring 0 8 rev}"; From fd15f0eb3cfa66f56c8188a7f865886e652a16f1 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 19 Apr 2025 23:48:12 -0700 Subject: [PATCH 362/449] nixosTests.armagetronad: make test more reliable to fix ZHF Previously, we relied heavily on OCR to get past the game's tutorial level, which timed out on aarch64 builders. We also relied on some timed inputs. We can just do this by writing a line to the configuration, and letting the simulated "players" die instead of trying to coredump each other which takes better timing. --- nixos/tests/armagetronad.nix | 125 +++++++++++++++++------------------ 1 file changed, 60 insertions(+), 65 deletions(-) diff --git a/nixos/tests/armagetronad.nix b/nixos/tests/armagetronad.nix index 392cdb0437bb..4e7833b3520b 100644 --- a/nixos/tests/armagetronad.nix +++ b/nixos/tests/armagetronad.nix @@ -115,7 +115,7 @@ in self.node.wait_for_text(text) self.send(*keys) - Server = namedtuple('Server', ('node', 'name', 'address', 'port', 'welcome', 'attacker', 'victim', 'coredump_delay')) + Server = namedtuple('Server', ('node', 'name', 'address', 'port', 'welcome', 'player1', 'player2')) # Clients and their in-game names clients = ( @@ -125,9 +125,9 @@ in # Server configs. servers = ( - Server(server, 'high-rubber', 'server', 4534, 'NixOS Smoke Test Server', 'SmOoThIcE', 'Arduino', 8), - Server(server, 'sty', 'server', 4535, 'NixOS Smoke Test sty+ct+ap Server', 'Arduino', 'SmOoThIcE', 8), - Server(server, 'trunk', 'server', 4536, 'NixOS Smoke Test 0.4 Server', 'Arduino', 'SmOoThIcE', 8) + Server(server, 'high-rubber', 'server', 4534, 'NixOS Smoke Test Server', 'SmOoThIcE', 'Arduino'), + Server(server, 'sty', 'server', 4535, 'NixOS Smoke Test sty+ct+ap Server', 'Arduino', 'SmOoThIcE'), + Server(server, 'trunk', 'server', 4536, 'NixOS Smoke Test 0.4 Server', 'Arduino', 'SmOoThIcE') ) """ @@ -146,8 +146,55 @@ in client.node.screenshot(f"screen_{client.name}_{screenshot_idx}") return screenshot_idx + 1 - # Wait for the servers to come up. + """ + Sets up a client, waiting for the given barrier on completion. + """ + def client_setup(client, servers, barrier): + client.node.wait_for_x() + + # Configure Armagetron so we skip the tutorial. + client.node.succeed( + run("mkdir -p ~/.armagetronad/var"), + run(f"echo 'PLAYER_1 {client.name}' >> ~/.armagetronad/var/autoexec.cfg"), + run("echo 'FIRST_USE 0' >> ~/.armagetronad/var/autoexec.cfg") + ) + for idx, srv in enumerate(servers): + client.node.succeed( + run(f"echo 'BOOKMARK_{idx+1}_ADDRESS {srv.address}' >> ~/.armagetronad/var/autoexec.cfg"), + run(f"echo 'BOOKMARK_{idx+1}_NAME {srv.name}' >> ~/.armagetronad/var/autoexec.cfg"), + run(f"echo 'BOOKMARK_{idx+1}_PORT {srv.port}' >> ~/.armagetronad/var/autoexec.cfg") + ) + + # Start Armagetron. Use the recording mode since it skips the splashscreen. + client.node.succeed(run("cd; ulimit -c unlimited; armagetronad --record test.aarec >&2 & disown")) + client.node.wait_until_succeeds( + run( + "${xdo "create_new_win-select_main_window" '' + search --onlyvisible --name "Armagetron Advanced" + windowfocus --sync + windowactivate --sync + ''}" + ) + ) + + # Get into the multiplayer menu. + client.send_on('Armagetron Advanced', 'ret') + client.send_on('Play Game', 'ret') + + # Online > LAN > Network Setup > Mates > Server Bookmarks + client.send_on('Multiplayer', 'down', 'down', 'down', 'down', 'ret') + + barrier.wait() + + # Start everything. start_all() + + # Get to the Server Bookmarks screen on both clients. This takes a while so do it asynchronously. + barrier = threading.Barrier(len(clients) + 1, timeout=600) + for client in clients: + threading.Thread(target=client_setup, args=(client, servers, barrier)).start() + + # Wait for the servers to come up. for srv in servers: srv.node.wait_for_unit(f"armagetronad-{srv.name}") srv.node.wait_until_succeeds(f"ss --numeric --udp --listening | grep -q {srv.port}") @@ -167,55 +214,7 @@ in f"journalctl -u armagetronad-{srv.name} -e | grep -q 'Admin: Testing again!'" ) - """ - Sets up a client, waiting for the given barrier on completion. - """ - def client_setup(client, servers, barrier): - client.node.wait_for_x() - - # Configure Armagetron. - client.node.succeed( - run("mkdir -p ~/.armagetronad/var"), - run(f"echo 'PLAYER_1 {client.name}' >> ~/.armagetronad/var/autoexec.cfg") - ) - for idx, srv in enumerate(servers): - client.node.succeed( - run(f"echo 'BOOKMARK_{idx+1}_ADDRESS {srv.address}' >> ~/.armagetronad/var/autoexec.cfg"), - run(f"echo 'BOOKMARK_{idx+1}_NAME {srv.name}' >> ~/.armagetronad/var/autoexec.cfg"), - run(f"echo 'BOOKMARK_{idx+1}_PORT {srv.port}' >> ~/.armagetronad/var/autoexec.cfg") - ) - - # Start Armagetron. - client.node.succeed(run("ulimit -c unlimited; armagetronad >&2 & disown")) - client.node.wait_until_succeeds( - run( - "${xdo "create_new_win-select_main_window" '' - search --onlyvisible --name "Armagetron Advanced" - windowfocus --sync - windowactivate --sync - ''}" - ) - ) - - # Get through the tutorial. - client.send_on('Language Settings', 'ret') - client.send_on('First Setup', 'ret') - client.send_on('Welcome to Armagetron Advanced', 'ret') - client.send_on('round 1', 'esc') - client.send_on('Menu', 'up', 'up', 'ret') - client.send_on('We hope you', 'ret') - client.send_on('Armagetron Advanced', 'ret') - client.send_on('Play Game', 'ret') - - # Online > LAN > Network Setup > Mates > Server Bookmarks - client.send_on('Multiplayer', 'down', 'down', 'down', 'down', 'ret') - - barrier.wait() - - # Get to the Server Bookmarks screen on both clients. This takes a while so do it asynchronously. - barrier = threading.Barrier(len(clients) + 1, timeout=240) - for client in clients: - threading.Thread(target=client_setup, args=(client, servers, barrier)).start() + # Wait for the client setup to complete. barrier.wait() # Main testing loop. Iterates through each server bookmark and connects to them in sequence. @@ -245,18 +244,14 @@ in f"journalctl -u armagetronad-{srv.name} -e | grep -q 'Go (round 1 of 10)'" ) - # Wait a bit - srv.node.sleep(srv.coredump_delay) - - # Turn the attacker player's lightcycle left - attacker = next(client for client in clients if client.name == srv.attacker) - victim = next(client for client in clients if client.name == srv.victim) - attacker.send('left') - screenshot_idx = take_screenshots(screenshot_idx) - - # Wait for coredump. + # Wait for the players to die by running into the wall. + player1 = next(client for client in clients if client.name == srv.player1) + player2 = next(client for client in clients if client.name == srv.player2) srv.node.wait_until_succeeds( - f"journalctl -u armagetronad-{srv.name} -e | grep -q '{attacker.name} core dumped {victim.name}'" + f"journalctl -u armagetronad-{srv.name} -e | grep -q '{player1.name}.*lost 4 points'" + ) + srv.node.wait_until_succeeds( + f"journalctl -u armagetronad-{srv.name} -e | grep -q '{player2.name}.*lost 4 points'" ) screenshot_idx = take_screenshots(screenshot_idx) From 93bcaf13110fec550812012fc7a8088c7f53265b Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 21 Apr 2025 00:35:01 -0700 Subject: [PATCH 363/449] z3: remove all but 4.14 Clean up this package set, since nothing depends on it now, and deal-solver now appears to work fine. --- .../science/logic/z3/4-8-5-typos.diff | 26 --- .../applications/science/logic/z3/default.nix | 216 ------------------ .../science/logic/z3/lower-bound-typo.diff | 13 -- .../science/logic/z3/tail-matrix.diff | 12 - .../z3/z3-tptp/package.nix} | 2 +- pkgs/by-name/z3/z3/package.nix | 6 + pkgs/by-name/z3/z3_4_14/package.nix | 130 +++++++++++ pkgs/top-level/all-packages.nix | 11 - pkgs/top-level/python-packages.nix | 7 +- 9 files changed, 138 insertions(+), 285 deletions(-) delete mode 100644 pkgs/applications/science/logic/z3/4-8-5-typos.diff delete mode 100644 pkgs/applications/science/logic/z3/default.nix delete mode 100644 pkgs/applications/science/logic/z3/lower-bound-typo.diff delete mode 100644 pkgs/applications/science/logic/z3/tail-matrix.diff rename pkgs/{applications/science/logic/z3/tptp.nix => by-name/z3/z3-tptp/package.nix} (90%) create mode 100644 pkgs/by-name/z3/z3/package.nix create mode 100644 pkgs/by-name/z3/z3_4_14/package.nix diff --git a/pkgs/applications/science/logic/z3/4-8-5-typos.diff b/pkgs/applications/science/logic/z3/4-8-5-typos.diff deleted file mode 100644 index 64a4887e0ef4..000000000000 --- a/pkgs/applications/science/logic/z3/4-8-5-typos.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/util/lp/lp_core_solver_base.h b/src/util/lp/lp_core_solver_base.h -index 4c17df2..4c3c311 100644 ---- a/src/util/lp/lp_core_solver_base.h -+++ b/src/util/lp/lp_core_solver_base.h -@@ -600,8 +600,6 @@ public: - out << " \n"; - } - -- bool column_is_free(unsigned j) const { return this->m_column_type[j] == free; } -- - bool column_has_upper_bound(unsigned j) const { - switch(m_column_types[j]) { - case column_type::free_column: -diff --git a/src/util/lp/static_matrix_def.h b/src/util/lp/static_matrix_def.h -index 7949573..2f1cb42 100644 ---- a/src/util/lp/static_matrix_def.h -+++ b/src/util/lp/static_matrix_def.h -@@ -86,7 +86,7 @@ static_matrix::static_matrix(static_matrix const &A, unsigned * /* basis * - init_row_columns(m, m); - while (m--) { - for (auto & col : A.m_columns[m]){ -- set(col.var(), m, A.get_value_of_column_cell(col)); -+ set(col.var(), m, A.get_column_cell(col)); - } - } - } diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix deleted file mode 100644 index 2152f68fe270..000000000000 --- a/pkgs/applications/science/logic/z3/default.nix +++ /dev/null @@ -1,216 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - python, - fixDarwinDylibNames, - javaBindings ? false, - ocamlBindings ? false, - pythonBindings ? true, - jdk ? null, - ocaml ? null, - findlib ? null, - zarith ? null, - writeScript, - replaceVars, -}: - -assert javaBindings -> jdk != null; -assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; - -let - common = - { - version, - sha256, - patches ? [ ], - tag ? "z3", - doCheck ? true, - }: - stdenv.mkDerivation rec { - pname = "z3"; - inherit version sha256 patches; - src = fetchFromGitHub { - owner = "Z3Prover"; - repo = "z3"; - rev = "${tag}-${version}"; - sha256 = sha256; - }; - - strictDeps = true; - - nativeBuildInputs = - [ python ] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames - ++ lib.optional javaBindings jdk - ++ lib.optionals ocamlBindings [ - ocaml - findlib - ]; - propagatedBuildInputs = [ python.pkgs.setuptools ] ++ lib.optionals ocamlBindings [ zarith ]; - enableParallelBuilding = true; - - postPatch = - lib.optionalString ocamlBindings '' - export OCAMLFIND_DESTDIR=$ocaml/lib/ocaml/${ocaml.version}/site-lib - mkdir -p $OCAMLFIND_DESTDIR/stublibs - '' - + - lib.optionalString - ((lib.versionAtLeast python.version "3.12") && (lib.versionOlder version "4.8.14")) - '' - # See https://github.com/Z3Prover/z3/pull/5729. This is a specialization of this patch for 4.8.5. - for file in scripts/mk_util.py src/api/python/CMakeLists.txt; do - substituteInPlace "$file" \ - --replace-fail "distutils.sysconfig.get_python_lib()" "sysconfig.get_path('purelib')" \ - --replace-fail "distutils.sysconfig" "sysconfig" - done - ''; - - configurePhase = - lib.concatStringsSep " " ( - [ "${python.pythonOnBuildForHost.interpreter} scripts/mk_make.py --prefix=$out" ] - ++ lib.optional javaBindings "--java" - ++ lib.optional ocamlBindings "--ml" - ++ lib.optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}" - ) - + "\n" - + "cd build"; - - inherit doCheck; - checkPhase = '' - make -j $NIX_BUILD_CORES test - ./test-z3 -a - ''; - - postInstall = - '' - mkdir -p $dev $lib - mv $out/lib $lib/lib - mv $out/include $dev/include - '' - + lib.optionalString pythonBindings '' - mkdir -p $python/lib - mv $lib/lib/python* $python/lib/ - ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} - '' - + lib.optionalString javaBindings '' - mkdir -p $java/share/java - mv com.microsoft.z3.jar $java/share/java - moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java" - ''; - - doInstallCheck = true; - installCheckPhase = '' - $out/bin/z3 -version 2>&1 | grep -F "Z3 version $version" - ''; - - outputs = - [ - "out" - "lib" - "dev" - "python" - ] - ++ lib.optional javaBindings "java" - ++ lib.optional ocamlBindings "ocaml"; - - meta = with lib; { - description = "High-performance theorem prover and SMT solver"; - mainProgram = "z3"; - homepage = "https://github.com/Z3Prover/z3"; - changelog = "https://github.com/Z3Prover/z3/releases/tag/z3-${version}"; - license = licenses.mit; - platforms = platforms.unix; - maintainers = with maintainers; [ - thoughtpolice - ttuegel - numinit - ]; - }; - }; - - static-matrix-def-patch = fetchpatch { - # clang / gcc fixes. fixes typos in some member names - name = "gcc-15-fixes.patch"; - url = "https://github.com/Z3Prover/z3/commit/2ce89e5f491fa817d02d8fdce8c62798beab258b.patch"; - includes = [ "src/math/lp/static_matrix_def.h" ]; - hash = "sha256-rEH+UzylzyhBdtx65uf8QYj5xwuXOyG6bV/4jgKkXGo="; - }; - - static-matrix-patch = fetchpatch { - # clang / gcc fixes. fixes typos in some member names - name = "gcc-15-fixes.patch"; - url = "https://github.com/Z3Prover/z3/commit/2ce89e5f491fa817d02d8fdce8c62798beab258b.patch"; - includes = [ "src/@dir@/lp/static_matrix.h" ]; - stripLen = 3; - extraPrefix = "src/@dir@/"; - hash = "sha256-+H1/VJPyI0yq4M/61ay8SRCa6OaoJ/5i+I3zVTAPUVo="; - }; - - # replace @dir@ in the path of the given list of patches - fixupPatches = dir: map (patch: replaceVars patch { inherit dir; }); -in -{ - z3_4_14 = common { - version = "4.14.1"; - sha256 = "sha256-pTsDzf6Frk4mYAgF81wlR5Kb1x56joFggO5Fa3G2s70="; - }; - z3_4_13 = common { - version = "4.13.4"; - sha256 = "sha256-8hWXCr6IuNVKkOegEmWooo5jkdmln9nU7wI8T882BSE="; - }; - z3_4_12 = common { - version = "4.12.6"; - sha256 = "sha256-X4wfPWVSswENV0zXJp/5u9SQwGJWocLKJ/CNv57Bt+E="; - patches = - fixupPatches "math" [ - ./lower-bound-typo.diff - static-matrix-patch - ] - ++ [ - static-matrix-def-patch - ]; - }; - z3_4_11 = common { - version = "4.11.2"; - sha256 = "sha256-OO0wtCvSKwGxnKvu+AfXe4mEzv4nofa7A00BjX+KVjc="; - patches = - fixupPatches "math" [ - ./lower-bound-typo.diff - static-matrix-patch - ./tail-matrix.diff - ] - ++ [ - static-matrix-def-patch - ]; - }; - z3_4_8 = common { - version = "4.8.17"; - sha256 = "sha256-BSwjgOU9EgCcm18Zx0P9mnoPc9ZeYsJwEu0ffnACa+8="; - patches = - fixupPatches "math" [ - ./lower-bound-typo.diff - static-matrix-patch - ./tail-matrix.diff - ] - ++ [ - static-matrix-def-patch - ]; - }; - z3_4_8_5 = common { - tag = "Z3"; - version = "4.8.5"; - sha256 = "sha256-ytG5O9HczbIVJAiIGZfUXC/MuYH7d7yLApaeTRlKXoc="; - patches = - fixupPatches "util" [ - ./lower-bound-typo.diff - static-matrix-patch - ./tail-matrix.diff - ] - ++ [ - ./4-8-5-typos.diff - ]; - }; -} diff --git a/pkgs/applications/science/logic/z3/lower-bound-typo.diff b/pkgs/applications/science/logic/z3/lower-bound-typo.diff deleted file mode 100644 index 254c35be5369..000000000000 --- a/pkgs/applications/science/logic/z3/lower-bound-typo.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/@dir@/lp/column_info.h b/src/@dir@/lp/column_info.h -index 1dc0c60..9cbeea6 100644 ---- a/src/@dir@/lp/column_info.h -+++ b/src/@dir@/lp/column_info.h -@@ -47,7 +47,7 @@ public: - m_lower_bound_is_strict == c.m_lower_bound_is_strict && - m_upper_bound_is_set == c.m_upper_bound_is_set&& - m_upper_bound_is_strict == c.m_upper_bound_is_strict&& -- (!m_lower_bound_is_set || m_lower_bound == c.m_low_bound) && -+ (!m_lower_bound_is_set || m_lower_bound == c.m_lower_bound) && - (!m_upper_bound_is_set || m_upper_bound == c.m_upper_bound) && - m_cost == c.m_cost && - m_is_fixed == c.m_is_fixed && diff --git a/pkgs/applications/science/logic/z3/tail-matrix.diff b/pkgs/applications/science/logic/z3/tail-matrix.diff deleted file mode 100644 index 4f680e7617d2..000000000000 --- a/pkgs/applications/science/logic/z3/tail-matrix.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/@dir@/lp/tail_matrix.h b/src/@dir@/lp/tail_matrix.h -index 2047e8c..c84340e 100644 ---- a/src/@dir@/lp/tail_matrix.h -+++ b/src/@dir@/lp/tail_matrix.h -@@ -43,7 +43,6 @@ public: - const tail_matrix & m_A; - unsigned m_row; - ref_row(const tail_matrix& m, unsigned row): m_A(m), m_row(row) {} -- T operator[](unsigned j) const { return m_A.get_elem(m_row, j);} - }; - ref_row operator[](unsigned i) const { return ref_row(*this, i);} - }; diff --git a/pkgs/applications/science/logic/z3/tptp.nix b/pkgs/by-name/z3/z3-tptp/package.nix similarity index 90% rename from pkgs/applications/science/logic/z3/tptp.nix rename to pkgs/by-name/z3/z3-tptp/package.nix index 8e1da19c6008..b7ab814255b3 100644 --- a/pkgs/applications/science/logic/z3/tptp.nix +++ b/pkgs/by-name/z3/z3-tptp/package.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { meta = { inherit (z3.meta) license homepage platforms; description = "TPTP wrapper for Z3 prover"; - maintainers = [ lib.maintainers.raskin ]; + maintainers = z3.meta.maintainers ++ [ lib.maintainers.raskin ]; }; } diff --git a/pkgs/by-name/z3/z3/package.nix b/pkgs/by-name/z3/z3/package.nix new file mode 100644 index 000000000000..cc80e0151581 --- /dev/null +++ b/pkgs/by-name/z3/z3/package.nix @@ -0,0 +1,6 @@ +{ + z3_4_14, + ... +}@args: + +z3_4_14.override args diff --git a/pkgs/by-name/z3/z3_4_14/package.nix b/pkgs/by-name/z3/z3_4_14/package.nix new file mode 100644 index 000000000000..60339b94e30f --- /dev/null +++ b/pkgs/by-name/z3/z3_4_14/package.nix @@ -0,0 +1,130 @@ +{ + lib, + stdenv, + fetchFromGitHub, + python3, + fixDarwinDylibNames, + nix-update-script, + javaBindings ? false, + ocamlBindings ? false, + pythonBindings ? true, + jdk ? null, + ocaml ? null, + findlib ? null, + zarith ? null, + versionInfo ? { + regex = "^v(4\\.14\\.[0-9]+)$"; + version = "4.14.1"; + hash = "sha256-pTsDzf6Frk4mYAgF81wlR5Kb1x56joFggO5Fa3G2s70="; + }, + ... +}: + +assert javaBindings -> jdk != null; +assert ocamlBindings -> ocaml != null && findlib != null && zarith != null; + +stdenv.mkDerivation (finalAttrs: { + pname = "z3"; + inherit (versionInfo) version; + + src = fetchFromGitHub { + owner = "Z3Prover"; + repo = "z3"; + rev = "z3-${finalAttrs.version}"; + inherit (versionInfo) hash; + }; + + strictDeps = true; + + nativeBuildInputs = + [ python3 ] + ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames + ++ lib.optional javaBindings jdk + ++ lib.optionals ocamlBindings [ + ocaml + findlib + ]; + propagatedBuildInputs = [ python3.pkgs.setuptools ] ++ lib.optionals ocamlBindings [ zarith ]; + enableParallelBuilding = true; + + postPatch = lib.optionalString ocamlBindings '' + export OCAMLFIND_DESTDIR=$ocaml/lib/ocaml/${ocaml.version}/site-lib + mkdir -p $OCAMLFIND_DESTDIR/stublibs + ''; + + configurePhase = + lib.concatStringsSep " " ( + [ "${python3.pythonOnBuildForHost.interpreter} scripts/mk_make.py --prefix=$out" ] + ++ lib.optional javaBindings "--java" + ++ lib.optional ocamlBindings "--ml" + ++ lib.optional pythonBindings "--python --pypkgdir=$out/${python3.sitePackages}" + ) + + "\n" + + "cd build"; + + doCheck = true; + checkPhase = '' + make -j $NIX_BUILD_CORES test + ./test-z3 -a + ''; + + postInstall = + '' + mkdir -p $dev $lib + mv $out/lib $lib/lib + mv $out/include $dev/include + '' + + lib.optionalString pythonBindings '' + mkdir -p $python/lib + mv $lib/lib/python* $python/lib/ + ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python3.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} + '' + + lib.optionalString javaBindings '' + mkdir -p $java/share/java + mv com.microsoft.z3.jar $java/share/java + moveToOutput "lib/libz3java.${stdenv.hostPlatform.extensions.sharedLibrary}" "$java" + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/z3 -version 2>&1 | grep -F "Z3 version $version" + ''; + + outputs = + [ + "out" + "lib" + "dev" + "python" + ] + ++ lib.optional javaBindings "java" + ++ lib.optional ocamlBindings "ocaml"; + + passthru = { + updateScript = nix-update-script { + extraArgs = + [ + "--version-regex" + versionInfo.regex + ] + ++ lib.optionals (versionInfo.autoUpdate or null != null) [ + "--override-filename" + versionInfo.autoUpdate + ]; + }; + }; + + meta = { + description = "High-performance theorem prover and SMT solver"; + mainProgram = "z3"; + homepage = "https://github.com/Z3Prover/z3"; + changelog = "https://github.com/Z3Prover/z3/releases/tag/z3-${finalAttrs.version}"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + thoughtpolice + ttuegel + numinit + ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6d147cebaa3..8a849090ac98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18133,17 +18133,6 @@ with pkgs; gmp-static = gmp.override { withStatic = true; }; }; - inherit (callPackages ../applications/science/logic/z3 { python = python3; }) - z3_4_14 - z3_4_13 - z3_4_12 - z3_4_11 - z3_4_8 - z3_4_8_5 - ; - z3 = z3_4_13; - z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix { }; - tlaplus = callPackage ../applications/science/logic/tlaplus { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2fc8a1aaa565..23bce3243eca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19224,12 +19224,7 @@ self: super: with self; { yubico-client = callPackage ../development/python-modules/yubico-client { }; - z3-solver = - (toPythonModule ( - (pkgs.z3.override { inherit python; }).overrideAttrs (_: { - pname = "z3-solver"; - }) - )).python; + z3-solver = (toPythonModule (pkgs.z3.override { python3 = python; })).python; z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; From 8cd78079a435b350f43cb66ad1d3e0ce48f63c95 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 21 Apr 2025 00:42:37 -0700 Subject: [PATCH 364/449] release-notes: explain z3 changes --- doc/release-notes/rl-2505.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 16183f7c1143..b434691b279d 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -251,7 +251,7 @@ - `nodePackages.meshcommander` has been removed, as the package was deprecated by Intel. -- The default version of `z3` has been updated from 4.8 to 4.13. There are still a few packages that need specific older versions; those will continue to be maintained as long as other packages depend on them but may be removed in the future. +- The default version of `z3` has been updated from 4.8 to 4.14, and all old versions have been dropped. Note that `fstar` still depends on specific versions, and maintains them as overrides. - `prometheus` has been updated from 2.55.0 to 3.1.0. Read the [release blog post](https://prometheus.io/blog/2024/11/14/prometheus-3-0/) and From ee48cc91f8bd6a40f2013feb1df596fcab6256f9 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 1 Feb 2025 16:56:37 -0800 Subject: [PATCH 365/449] ovftool: 4.6.2 -> 4.6.3 This removes the vulnerable version of OpenSSL that was packaged before and switches to OpenSSL 3 on Linux. macOS is still on OpenSSL 1.0.2. Since ovftool is now published by Broadcom, they have a new, exciting EULA that its usage is now gated behind. Since the website has a POST endpoint to download it now (but it's at least possible without an account) we can still automate it but need to add an `acceptBroadcomEula` package override argument that's false by default, similarly to how we handle Android. The license has not changed; it is still unfree. --- pkgs/by-name/ov/ovftool/package.nix | 154 +++++++++++++++++++--------- 1 file changed, 104 insertions(+), 50 deletions(-) diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix index 10156450bec7..8afd9a846ec9 100644 --- a/pkgs/by-name/ov/ovftool/package.nix +++ b/pkgs/by-name/ov/ovftool/package.nix @@ -1,62 +1,108 @@ { autoPatchelfHook, c-ares, + curl, darwin, expat, fetchurl, glibc, icu60, + jq, lib, libiconv, libredirect, libxcrypt-legacy, libxml2, makeWrapper, + openssl, stdenv, unzip, xercesc, zlib, + acceptBroadcomEula ? false, }: let + # Returns the base URL for the given tool ID. + mkBaseUrl = toolId: "https://developer.broadcom.com/tools/${toolId}/latest"; + ovftoolId = "open-virtualization-format-ovf-tool"; - ovftoolSystems = - let - baseUrl = "https://vdc-download.vmware.com/vmwb-repository/dcr-public"; - in + # Use browser devtools to figure out how this works. + fetchFromBroadcom = { - "i686-linux" = rec { - name = "VMware-ovftool-${version}-lin.i386.zip"; - # As of 2024-02-20 the "Zip of OVF Tool for 32-bit Linux" download link - # on the v4.6.2 page links to v4.6.0. - version = "4.6.0-21452615"; - url = "${baseUrl}/7254abb2-434d-4f5d-83e2-9311ced9752e/57e666a2-874c-48fe-b1d2-4b6381f7fe97/${name}"; - hash = "sha256-qEOr/3SW643G5ZQQNJTelZbUxB8HmxPd5uD+Gqsoxz0="; - }; - "x86_64-linux" = rec { - name = "VMware-ovftool-${version}-lin.x86_64.zip"; - version = "4.6.2-22220919"; - url = "${baseUrl}/8a93ce23-4f88-4ae8-b067-ae174291e98f/c609234d-59f2-4758-a113-0ec5bbe4b120/${name}"; - hash = "sha256-3B1cUDldoTqLsbSARj2abM65nv+Ot0z/Fa35/klJXEY="; - }; - "x86_64-darwin" = rec { - name = "VMware-ovftool-${version}-mac.x64.zip"; - version = "4.6.2-22220919"; - url = "${baseUrl}/91091b23-280a-487a-a048-0c2594303c92/dc666e23-104f-4b9b-be11-6d88dcf3ab98/${name}"; - hash = "sha256-AZufZ0wxt5DYjnpahDfy36W8i7kjIfEkW6MoELSx11k="; + fileName, + version, + toolId ? ovftoolId, + artifactId ? 21342, + fileType ? "Download", + source ? "", + hash ? "", + }: + let + requestJson = builtins.toJSON { + inherit + fileName + artifactId + fileType + source + ; }; + in + fetchurl { + name = fileName; + url = + (mkBaseUrl toolId) + + "?p_p_id=SDK_AND_TOOL_DETAILS_INSTANCE_iwlk&p_p_lifecycle=2&p_p_resource_id=documentDownloadArtifact"; + curlOptsList = [ + "--json" + requestJson + ]; + downloadToTemp = true; + nativeBuildInputs = [ jq ]; + postFetch = '' + # Try again with the new URL + urls="$(jq -r 'if (.success == true) then .data.downloadUrl else error(. | tostring) end' < "$downloadedFile" || exit $?)" \ + downloadToTemp="" \ + curlOptsList="" \ + curlOpts="" \ + postFetch="" \ + exec "$SHELL" "''${BASH_ARGV[@]}" + ''; + inherit hash; }; - ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); + ovftoolSystems = { + "x86_64-linux" = rec { + version = "4.6.3-24031167"; + fileName = "VMware-ovftool-${version}-lin.x86_64.zip"; + hash = "sha256-NEwwgmEh/mrZkMMhI+Kq+SYdd3MJ0+IBLdUhd1+kPow="; + }; + "x86_64-darwin" = rec { + version = "4.6.3-24031167"; + fileName = "VMware-ovftool-${version}-mac.x64.zip"; + hash = "sha256-vhACcc4tjaQhvKwZyWkgpaKaoC+coWGl1zfSIC6WebM="; + }; + }; + ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); in -stdenv.mkDerivation { +stdenv.mkDerivation (final: { pname = "ovftool"; inherit (ovftoolSystem) version; - src = fetchurl { - inherit (ovftoolSystem) name url hash; - }; + src = + if acceptBroadcomEula then + fetchFromBroadcom { + inherit (ovftoolSystem) fileName version hash; + } + else + throw '' + See the following URL for terms of using this software: + ${mkBaseUrl ovftoolId} + + Use `${final.pname}.override { acceptBroadcomEula = true; }` if you accept Broadcom's terms + and would like to use this package. + ''; buildInputs = [ @@ -67,9 +113,11 @@ stdenv.mkDerivation { libxcrypt-legacy xercesc zlib + curl ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glibc + openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.Libsystem @@ -98,12 +146,11 @@ stdenv.mkDerivation { # with the addition of a libexec directory and a Nix-style binary wrapper. # Almost all libs in the package appear to be VMware proprietary except for - # libgoogleurl and libcurl. The rest of the libraries that the installer - # extracts are omitted here, and provided in buildInputs. Since libcurl - # depends on VMware's OpenSSL, both libs are still used. + # libgoogleurl and libcurl. + # # FIXME: Replace libgoogleurl? Possibly from Chromium? - # FIXME: Tell VMware to use a modern version of OpenSSL. As of ovftool - # v4.6.2 ovftool uses openssl-1.0.2zh which in seems to be the extended + # FIXME: Tell VMware to use a modern version of OpenSSL on macOS. As of ovftool + # v4.6.3 ovftool uses openssl-1.0.2zj which in seems to be the extended # support LTS release: https://www.openssl.org/support/contracts.html # Install all libs that are not patched in preFixup. @@ -112,18 +159,15 @@ stdenv.mkDerivation { install -m 644 -t "$out/lib" \ '' + lib.optionalString stdenv.hostPlatform.isLinux '' - libcrypto.so.1.0.2 \ - libcurl.so.4 \ libgoogleurl.so.59 \ - libssl.so.1.0.2 \ libssoclient.so \ libvim-types.so \ libvmacore.so \ libvmomi.so '' + # macOS still relies on OpenSSL 1.0.2 as of v4.6.3, but Linux is in the clear + lib.optionalString stdenv.hostPlatform.isDarwin '' lib/libcrypto.1.0.2.dylib \ - lib/libcurl.4.dylib \ lib/libgoogleurl.59.0.30.45.2.dylib \ lib/libssl.1.0.2.dylib \ lib/libssoclient.dylib \ @@ -152,6 +196,7 @@ stdenv.mkDerivation { install -m 644 -t "$out/share/licenses" \ "vmware.eula" \ "vmware-eula.rtf" \ + "README.txt" \ "open_source_licenses.txt" # Install Docs @@ -197,8 +242,12 @@ stdenv.mkDerivation { change_args+=(-change @loader_path/lib/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib) change_args+=(-change @loader_path/lib/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib) + # lolwut + change_args+=(-change @GOBUILD_CAYMAN_CURL_ROOT@/apple_mac64/lib/libcurl.4.dylib ${curl.out}/lib/libcurl.4.dylib) + # Patch binary install_name_tool "''${change_args[@]}" "$out/libexec/ovftool" + otool -L "$out/libexec/ovftool" # Additional patches for ovftool dylibs change_args+=(-change /usr/lib/libresolv.9.dylib ${darwin.Libsystem}/lib/libresolv.9.dylib) @@ -208,7 +257,7 @@ stdenv.mkDerivation { change_args+=(-change @loader_path/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib) change_args+=(-change @loader_path/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib) - # Add new abolute paths for other libs to all libs + # Add new absolute paths for other libs to all libs for lib in $out/lib/*.dylib; do libname=$(basename $lib) change_args+=(-change "@loader_path/$libname" "$out/lib/$libname") @@ -219,6 +268,7 @@ stdenv.mkDerivation { libname=$(basename $lib) install_name_tool -id "$libname" "$lib" install_name_tool "''${change_args[@]}" "$lib" + otool -L "$lib" done ''; @@ -229,29 +279,34 @@ stdenv.mkDerivation { (allow file-read* (subpath "/System/Library/TextEncodings")) ''; - doInstallCheck = true; + # Seems to get stuck and return 255, but works outside the sandbox + doInstallCheck = !stdenv.hostPlatform.isDarwin; postInstallCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' export HOME=$TMPDIR # Construct a dummy /etc/passwd file - ovftool attempts to determine the # user's "real" home using this - DUMMY_PASSWD="$(realpath $HOME/dummy-passwd)" + DUMMY_PASSWD="$HOME/dummy-passwd" cat > $DUMMY_PASSWD < Date: Wed, 23 Apr 2025 09:11:05 +0200 Subject: [PATCH 366/449] vimPlugins.sonarlint-nvim: fix the update script --- .../vim/plugins/non-generated/sonarlint-nvim/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix index 0a6bff6bebdc..39a0a0c2bea0 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/sonarlint-nvim/default.nix @@ -15,7 +15,9 @@ vimUtils.buildVimPlugin { hash = "sha256-EUwuIFFe4tmw8u6RqEvOLL0Yi8J5cLBQx7ICxnmkT4k="; }; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; meta = { homepage = "https://gitlab.com/schrieveslaach/sonarlint.nvim"; From 20a72fcc3af7de0dcb15cd60f285ba335ce632f9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 23 Apr 2025 09:38:11 +0200 Subject: [PATCH 367/449] python313Packages.model-checker: 0.9.17 -> 0.9.18 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index e133cfc3644b..f5d14e88777d 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.9.17"; + version = "0.9.18"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-MD0w45a8c1sXUVfM5/pAZZ/WbM1bFGwBVQ37bch+Fcw="; + hash = "sha256-soOwym5oZZMLOOWTF14ZLcFX0RQcGnvC1Eg+k8qUMbo="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From e78e311eb5d9b16d4c1bfffe0caa1bb4c08b609b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 07:40:35 +0000 Subject: [PATCH 368/449] all-the-package-names: 2.0.2129 -> 2.0.2137 --- pkgs/by-name/al/all-the-package-names/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index abf837275c16..46d2d7a06198 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2129"; + version = "2.0.2137"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-aq4WxaeMprw9ohcwd9HuiWq5GUpW6dI3FSudMyUo6Fg="; + hash = "sha256-1HabSjZUHjPWkKZc+Xeh11bzb6ycQ1V7GS/XGycFoKc="; }; - npmDepsHash = "sha256-WM2FO/qsDcXaV/2oqBlRGXc+VHaPUxFVg1DF6F0iGso="; + npmDepsHash = "sha256-zSGpKDcmBYod81wCeoSzOqse1zSao4aURngh55wq6CA="; passthru.updateScript = nix-update-script { }; From 395fb046da50968a2d886ce4b8672ff048946085 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 08:14:30 +0000 Subject: [PATCH 369/449] oxlint: 0.15.14 -> 0.16.7 --- pkgs/by-name/ox/oxlint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 03798b666fc7..ac9043901a7c 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.15.14"; + version = "0.16.7"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-PCaS60UjD502YI9lZsvbSa3utwrYl8YazZj/CF91euQ="; + hash = "sha256-bnfo/4hRO9ZT9Rj1NX9o4Z8pbWKux7L08YH+owolYXI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-/OLcyHTTevqpkrHY3Ueo38xtIjhjE4quqPTEZfPEcaY="; + cargoHash = "sha256-OdV80+B/H/xMfZDeFw+oaoFLgJrIDsR3mDkfaSw5+W4="; buildInputs = [ From 9e1552a7f2fa89b0245c89ef5250f1d4a5afcf7a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 23 Apr 2025 10:55:41 +0200 Subject: [PATCH 370/449] grafana: 11.6.0 -> 11.6.0+security-01 https://github.com/grafana/grafana/releases/tag/v11.6.0%2Bsecurity-01 Fixes CVE-2025-2703 CVE-2025-3454 CVE-2025-3260 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 1b30c6ead78f..633a1af15573 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -44,7 +44,7 @@ let in buildGoModule rec { pname = "grafana"; - version = "11.6.0"; + version = "11.6.0+security-01"; subPackages = [ "pkg/cmd/grafana" @@ -56,7 +56,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-oXotHi79XBhxD/qYC7QDQwn7jiX0wKWe/RXZS5DwN9o="; + hash = "sha256-JG4Dr0CGDYHH6hBAAtdHPO8Vy9U/bg4GPzX6biZk028="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -106,7 +106,7 @@ buildGoModule rec { postPatch = patchGoVersion; - vendorHash = "sha256-cYE43OAagPHFhWsUJLMcJVfsJj6d0vUqzjbAviYSuSc="; + vendorHash = "sha256-Ziohfy9fMVmYnk9c0iRNi4wJZd2E8vCP+ozsTM0eLTA="; proxyVendor = true; From dc6728cde4986eedc4deab18b28ebf9313901151 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 10:58:35 +0200 Subject: [PATCH 371/449] python312Packages.dask-image: fix failing test --- pkgs/development/python-modules/dask-image/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 1c9e706633b7..f22fb5bda5e9 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -35,6 +35,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace dask_image/ndinterp/__init__.py \ --replace-fail "out_bounds.ptp(axis=1)" "np.ptp(out_bounds, axis=1)" + + substituteInPlace tests/test_dask_image/test_imread/test_core.py \ + --replace-fail "fh.save(" "fh.write(" ''; build-system = [ @@ -64,6 +67,7 @@ buildPythonPackage rec { # AttributeError: 'str' object has no attribute 'start' "test_find_objects" "test_3d_find_objects" + # AssertionError (comparing slices) "test_find_objects_with_empty_chunks" ]; From f35c0b9b7b0f295b45de8060036d6ab9f179c1a7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 11:07:42 +0200 Subject: [PATCH 372/449] python312Packages.kfactory: 0.21.7 -> 1.4.4 Diff: https://github.com/gdsfactory/kfactory/compare/v0.21.7...v1.4.4 --- .../python-modules/kfactory/default.nix | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix index 3652d517d048..2f661515e329 100644 --- a/pkgs/development/python-modules/kfactory/default.nix +++ b/pkgs/development/python-modules/kfactory/default.nix @@ -2,37 +2,43 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, + + # build-system setuptools, setuptools-scm, - klayout, + + # dependencies aenum, cachetools, gitpython, + klayout, loguru, + numpy, pydantic, pydantic-settings, rectangle-packer, requests, + ruamel-yaml, ruamel-yaml-string, scipy, tomli, toolz, typer, - numpy, - ruamel-yaml, + + # tests + pytestCheckHook, }: buildPythonPackage rec { pname = "kfactory"; - version = "0.21.7"; + version = "1.4.4"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "kfactory"; - rev = "v${version}"; - sha256 = "sha256-VLhAJ5rOBKEO1FDCnlaseA+SmrMSoyS+BaEzjdHm59Y="; + tag = "v${version}"; + hash = "sha256-/dhlAcrqQP/YeKGhnBAVMEy80X3yShn65ywoZMRU/ZM="; }; build-system = [ @@ -63,15 +69,16 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - # https://github.com/gdsfactory/kfactory/issues/511 disabledTestPaths = [ + # https://github.com/gdsfactory/kfactory/issues/511 "tests/test_pdk.py" ]; - meta = with lib; { + meta = { description = "KLayout API implementation of gdsfactory"; homepage = "https://github.com/gdsfactory/kfactory"; - license = licenses.mit; - maintainers = with maintainers; [ fbeffa ]; + changelog = "https://github.com/gdsfactory/kfactory/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fbeffa ]; }; } From 27f0b9aa940658a1d1b6c48c3ff32f6f8cb3ed71 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 11:02:38 +0200 Subject: [PATCH 373/449] python312Packages.gdsfactory: 8.18.1 -> 9.5.1 Diff: https://github.com/gdsfactory/gdsfactory/compare/v8.18.1...v9.5.1 --- .../python-modules/gdsfactory/default.nix | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix index b2282a04a1c0..0499fd810b80 100644 --- a/pkgs/development/python-modules/gdsfactory/default.nix +++ b/pkgs/development/python-modules/gdsfactory/default.nix @@ -2,8 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, + + # build-system flit-core, + + # dependencies jinja2, loguru, matplotlib, @@ -32,21 +35,25 @@ ipykernel, attrs, graphviz, + pyglet, + typing-extensions, + # tests jsondiff, jsonschema, pytest-regressions, + pytestCheckHook, }: buildPythonPackage rec { pname = "gdsfactory"; - version = "8.18.1"; + version = "9.5.1"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "gdsfactory"; - rev = "v${version}"; - hash = "sha256-wDz8QpRgu40FB8+otnGsHVn2e6/SWXIZgA1aeMqMhPQ="; + tag = "v${version}"; + hash = "sha256-z8zKPbWLl554MZq6/Iy3ecvwWiRpy57VYji8xHR+JBo="; }; build-system = [ flit-core ]; @@ -80,13 +87,15 @@ buildPythonPackage rec { ipykernel attrs graphviz + pyglet + typing-extensions ]; nativeCheckInputs = [ jsondiff jsonschema - pytestCheckHook pytest-regressions + pytestCheckHook ]; pythonRelaxDeps = [ @@ -99,10 +108,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "gdsfactory" ]; - meta = with lib; { + meta = { description = "Python library to generate GDS layouts"; homepage = "https://github.com/gdsfactory/gdsfactory"; - license = licenses.mit; - maintainers = with maintainers; [ fbeffa ]; + changelog = "https://github.com/gdsfactory/gdsfactory/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fbeffa ]; }; } From 55d9e32f9673b5b9b43bafb45a6c62008cd1b822 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 11:18:53 +0200 Subject: [PATCH 374/449] python312Packages.pydantic-compat: cleanup, fix --- .../pydantic-compat/default.nix | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pydantic-compat/default.nix b/pkgs/development/python-modules/pydantic-compat/default.nix index 7878fa03ba12..e47211217593 100644 --- a/pkgs/development/python-modules/pydantic-compat/default.nix +++ b/pkgs/development/python-modules/pydantic-compat/default.nix @@ -2,13 +2,12 @@ lib, buildPythonPackage, fetchFromGitHub, - git, hatch-vcs, hatchling, + gitMinimal, importlib-metadata, pydantic, pytestCheckHook, - pythonOlder, }: buildPythonPackage rec { @@ -16,36 +15,45 @@ buildPythonPackage rec { version = "0.1.2"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "pyapp-kit"; repo = "pydantic-compat"; tag = "v${version}"; - hash = "sha256-YJUfWu+nyGlwpJpxYghCKzj3CasdAaqYoNVCcfo/7YE="; leaveDotGit = true; + hash = "sha256-YJUfWu+nyGlwpJpxYghCKzj3CasdAaqYoNVCcfo/7YE="; }; - nativeBuildInputs = [ - git + build-system = [ hatch-vcs hatchling ]; - propagatedBuildInputs = [ + nativeBuildInputs = [ + gitMinimal + ]; + + dependencies = [ importlib-metadata pydantic ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "pydantic_compat" ]; - meta = with lib; { + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + "-W" + # pydantic.warnings.PydanticDeprecatedSince211: Accessing this attribute on the instance is + # deprecated, and will be removed in Pydantic V3. Instead, you should access this attribute from + # the model class. Deprecated in Pydantic V2.11 to be removed in V3.0. + "ignore::pydantic.warnings.PydanticDeprecatedSince211" + ]; + + meta = { description = "Compatibility layer for pydantic v1/v2"; homepage = "https://github.com/pyapp-kit/pydantic-compat"; changelog = "https://github.com/pyapp-kit/pydantic-compat/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; }; } From e73cd4573dfc100503657e486cd0d3d78085e085 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 21 Apr 2025 12:50:56 +0200 Subject: [PATCH 375/449] osrm-backend: move to pkgs/by-name --- .../os}/osrm-backend/boost187-compat.patch | 0 .../default.nix => by-name/os/osrm-backend/package.nix} | 5 ++++- pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/{servers => by-name/os}/osrm-backend/boost187-compat.patch (100%) rename pkgs/{servers/osrm-backend/default.nix => by-name/os/osrm-backend/package.nix} (97%) diff --git a/pkgs/servers/osrm-backend/boost187-compat.patch b/pkgs/by-name/os/osrm-backend/boost187-compat.patch similarity index 100% rename from pkgs/servers/osrm-backend/boost187-compat.patch rename to pkgs/by-name/os/osrm-backend/boost187-compat.patch diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/by-name/os/osrm-backend/package.nix similarity index 97% rename from pkgs/servers/osrm-backend/default.nix rename to pkgs/by-name/os/osrm-backend/package.nix index ed811594bfc2..cc27fa5b2f73 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/by-name/os/osrm-backend/package.nix @@ -10,11 +10,14 @@ boost, lua, luabind, - tbb, + tbb_2021_11, expat, nixosTests, }: +let + tbb = tbb_2021_11; +in stdenv.mkDerivation { pname = "osrm-backend"; version = "5.27.1-unstable-2024-11-03"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 173d75522063..72fb3437461f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12135,9 +12135,6 @@ with pkgs; opensmtpd = callPackage ../servers/mail/opensmtpd { }; opensmtpd-extras = callPackage ../servers/mail/opensmtpd/extras.nix { }; opensmtpd-filter-rspamd = callPackage ../servers/mail/opensmtpd/filter-rspamd.nix { }; - osrm-backend = callPackage ../servers/osrm-backend { - tbb = tbb_2021_11; - }; system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { }); From 4ad0cfd3c4a839f9553904eae4540945e5aa9690 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 21 Apr 2025 13:21:35 +0200 Subject: [PATCH 376/449] osrm-backend: 5.27.1-unstable-2024-11-03 -> 6.0.0 Changelog: https://github.com/Project-OSRM/osrm-backend/blob/V6.0.0/CHANGELOG.md --- .../os/osrm-backend/boost187-compat.patch | 14 ------------- pkgs/by-name/os/osrm-backend/package.nix | 21 +++++++------------ 2 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 pkgs/by-name/os/osrm-backend/boost187-compat.patch diff --git a/pkgs/by-name/os/osrm-backend/boost187-compat.patch b/pkgs/by-name/os/osrm-backend/boost187-compat.patch deleted file mode 100644 index 4c5aa5eb05a8..000000000000 --- a/pkgs/by-name/os/osrm-backend/boost187-compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/include/server/server.hpp b/include/server/server.hpp -index 34b8982e67a..02b0dda050d 100644 ---- a/include/server/server.hpp -+++ b/include/server/server.hpp -@@ -53,8 +53,7 @@ class Server - const auto port_string = std::to_string(port); - - boost::asio::ip::tcp::resolver resolver(io_context); -- boost::asio::ip::tcp::resolver::query query(address, port_string); -- boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query); -+ boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(address, port_string).begin(); - - acceptor.open(endpoint.protocol()); - #ifdef SO_REUSEPORT diff --git a/pkgs/by-name/os/osrm-backend/package.nix b/pkgs/by-name/os/osrm-backend/package.nix index cc27fa5b2f73..de9207b66365 100644 --- a/pkgs/by-name/os/osrm-backend/package.nix +++ b/pkgs/by-name/os/osrm-backend/package.nix @@ -10,30 +10,25 @@ boost, lua, luabind, - tbb_2021_11, + tbb_2022_0, expat, nixosTests, }: let - tbb = tbb_2021_11; + tbb = tbb_2022_0; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "osrm-backend"; - version = "5.27.1-unstable-2024-11-03"; + version = "6.0.0"; src = fetchFromGitHub { owner = "Project-OSRM"; repo = "osrm-backend"; - rev = "3614af7f6429ee35c3f2e836513b784a74664ab6"; - hash = "sha256-iix++G49cC13wZGZIpXu1SWGtVAcqpuX3GhsIaETzUU="; + tag = "V${version}"; + hash = "sha256-R2Sx+DbT6gROI8X1fkxqOGbMqgmsnNiw2rUX6gSZuTs="; }; - patches = [ - # Taken from https://github.com/Project-OSRM/osrm-backend/pull/7073. - ./boost187-compat.patch - ]; - nativeBuildInputs = [ cmake pkg-config @@ -63,9 +58,9 @@ stdenv.mkDerivation { }; meta = { - homepage = "https://github.com/Project-OSRM/osrm-backend/wiki"; + homepage = "https://project-osrm.org/"; description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project"; - changelog = "https://github.com/Project-OSRM/osrm-backend/blob/master/CHANGELOG.md"; + changelog = "https://github.com/Project-OSRM/osrm-backend/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ erictapen ]; platforms = lib.platforms.unix; From f52dfae760a7135cbb66a38ab60d926b5557ecc3 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 17 Apr 2025 11:31:58 +0200 Subject: [PATCH 377/449] nodejs_18: drop due to upstream EOL --- doc/release-notes/rl-2505.section.md | 2 + .../ma/matrix-appservice-slack/package.nix | 6 +- pkgs/by-name/me/mealie/mealie-frontend.nix | 8 +- .../by-name/op/open-stage-control/package.nix | 6 +- .../nodejs/configure-emulator-node18.patch | 138 ------------------ ...ble-darwin-v8-system-instrumentation.patch | 16 -- .../nodejs/revert-arm64-pointer-auth.patch | 13 -- .../web/nodejs/trap-handler-backport.patch | 76 ---------- pkgs/development/web/nodejs/v18.nix | 86 ----------- pkgs/servers/mx-puppet-discord/default.nix | 7 +- .../mx-puppet-discord/node-composition.nix | 2 +- pkgs/servers/openvscode-server/default.nix | 2 + pkgs/top-level/all-packages.nix | 10 +- 13 files changed, 27 insertions(+), 345 deletions(-) delete mode 100644 pkgs/development/web/nodejs/configure-emulator-node18.patch delete mode 100644 pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch delete mode 100644 pkgs/development/web/nodejs/revert-arm64-pointer-auth.patch delete mode 100644 pkgs/development/web/nodejs/trap-handler-backport.patch delete mode 100644 pkgs/development/web/nodejs/v18.nix diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index b434691b279d..346319db23ab 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -191,6 +191,8 @@ - `mkBinaryCache` now defaults to using `zstd` compression for the binary caches it creates. The previous `xz` compression method can be used by passing `compression = "xz";`. +- `nodejs_18` package was removed due to upstream End-of-Life in April 2025. + - `nodePackages."@commitlint/config-conventional"` has been removed, as it is a library, and projects should depend on it instead. - zigbee2mqtt is now available in version 2.x as `zigbee2mqtt_2`. In NixOS 25.11 we'll remove `zigbee2mqtt_1` and default to `zigbee2mqtt_2`. See the [breaking changes](https://github.com/Koenkk/zigbee2mqtt/discussions/24198) announcement for 2.0.0. diff --git a/pkgs/by-name/ma/matrix-appservice-slack/package.nix b/pkgs/by-name/ma/matrix-appservice-slack/package.nix index b37ebccbf2f2..0a24e694698a 100644 --- a/pkgs/by-name/ma/matrix-appservice-slack/package.nix +++ b/pkgs/by-name/ma/matrix-appservice-slack/package.nix @@ -4,13 +4,13 @@ fetchYarnDeps, makeWrapper, mkYarnPackage, - nodejs_18, + nodejs_20, callPackage, }: let data = lib.importJSON ./pin.json; - nodejs = nodejs_18; + nodejs = nodejs_20; matrix-sdk-crypto-nodejs = callPackage ./matrix-sdk-crypto-nodejs-0_1_0-beta_3/package.nix { }; in mkYarnPackage rec { @@ -59,5 +59,7 @@ mkYarnPackage rec { chvp ]; license = licenses.asl20; + # Depends on nodejs_18 that has been removed. + broken = true; }; } diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix index bbf356cad3e3..2947ffb2ab6c 100644 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ b/pkgs/by-name/me/mealie/mealie-frontend.nix @@ -2,7 +2,7 @@ src: version: { lib, fetchYarnDeps, - nodejs_18, + nodejs_20, fixup-yarn-lock, stdenv, yarn, @@ -19,8 +19,8 @@ stdenv.mkDerivation { nativeBuildInputs = [ fixup-yarn-lock - nodejs_18 - (yarn.override { nodejs = nodejs_18; }) + nodejs_20 + (yarn.override { nodejs = nodejs_20; }) ]; configurePhase = '' @@ -55,5 +55,7 @@ stdenv.mkDerivation { description = "Frontend for Mealie"; license = licenses.agpl3Only; maintainers = with maintainers; [ litchipi ]; + # Depends on nodejs_18 that has been removed. + broken = true; }; } diff --git a/pkgs/by-name/op/open-stage-control/package.nix b/pkgs/by-name/op/open-stage-control/package.nix index 7df60380a38f..6ffa6b95ec41 100644 --- a/pkgs/by-name/op/open-stage-control/package.nix +++ b/pkgs/by-name/op/open-stage-control/package.nix @@ -5,7 +5,7 @@ makeBinaryWrapper, makeDesktopItem, copyDesktopItems, - nodejs_18, + nodejs_20, electron, python3, nix-update-script, @@ -29,7 +29,7 @@ buildNpmPackage rec { npmDepsHash = "sha256-UqjYNXdNoQmirIgU9DRgkp14SIrawfrfi9mD2h6ACyU="; - nodejs = nodejs_18; + nodejs = nodejs_20; nativeBuildInputs = [ copyDesktopItems @@ -97,5 +97,7 @@ buildNpmPackage rec { maintainers = [ ]; platforms = platforms.linux; mainProgram = "open-stage-control"; + # Depends on nodejs_18 that has been removed. + broken = true; }; } diff --git a/pkgs/development/web/nodejs/configure-emulator-node18.patch b/pkgs/development/web/nodejs/configure-emulator-node18.patch deleted file mode 100644 index f7faddb7e005..000000000000 --- a/pkgs/development/web/nodejs/configure-emulator-node18.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 4b83f714c821d6d4d2306673ee3a87907cfec80e Mon Sep 17 00:00:00 2001 -From: Ivan Trubach -Date: Fri, 19 Jul 2024 10:45:13 +0300 -Subject: [PATCH] build: support setting an emulator from configure script -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -V8’s JIT infrastructure requires binaries such as mksnapshot to be run -during the build. However, these binaries must have the same bit-width -as the host platform (e.g. a x86_64 build platform targeting ARMv6 needs -to produce a 32-bit binary). - -To work around this issue, allow building the binaries for the host -platform and running them on the build platform with an emulator. - -Based on Buildroot’s nodejs-src 0001-add-qemu-wrapper-support.patch. -https://gitlab.com/buildroot.org/buildroot/-/blob/c1d5eada4d4db9eeaa1c44dd1dea95a67c8a70ca/package/nodejs/nodejs-src/0001-add-qemu-wrapper-support.patch - -Upstream: https://github.com/nodejs/node/pull/53899 ---- - common.gypi | 1 + - configure.py | 14 ++++++++++++++ - node.gyp | 3 +++ - tools/v8_gypfiles/v8.gyp | 4 ++++ - 4 files changed, 22 insertions(+) - -diff --git a/common.gypi b/common.gypi -index ec92c9df4c..6474495ab6 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -13,6 +13,7 @@ - 'enable_pgo_generate%': '0', - 'enable_pgo_use%': '0', - 'python%': 'python', -+ 'emulator%': [], - - 'node_shared%': 'false', - 'force_dynamic_crt%': 0, -diff --git a/configure.py b/configure.py -index 82916748fd..10dc0becbb 100755 ---- a/configure.py -+++ b/configure.py -@@ -112,6 +112,12 @@ parser.add_argument('--dest-cpu', - choices=valid_arch, - help=f"CPU architecture to build for ({', '.join(valid_arch)})") - -+parser.add_argument('--emulator', -+ action='store', -+ dest='emulator', -+ default=None, -+ help='emulator command that can run executables built for the target system') -+ - parser.add_argument('--cross-compiling', - action='store_true', - dest='cross_compiling', -@@ -2160,6 +2166,14 @@ write('config.mk', do_not_edit + config_str) - gyp_args = ['--no-parallel', '-Dconfiguring_node=1'] - gyp_args += ['-Dbuild_type=' + config['BUILDTYPE']] - -+if options.emulator is not None: -+ if not options.cross_compiling: -+ # Note that emulator is a list so we have to quote the variable. -+ gyp_args += ['-Demulator=' + shlex.quote(options.emulator)] -+ else: -+ # TODO: perhaps use emulator for tests? -+ warn('The `--emulator` option has no effect when cross-compiling.') -+ - if options.use_ninja: - gyp_args += ['-f', 'ninja-' + flavor] - elif flavor == 'win' and sys.platform != 'msys': -diff --git a/node.gyp b/node.gyp -index 08cb3f38e8..515b305933 100644 ---- a/node.gyp -+++ b/node.gyp -@@ -332,6 +332,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', - ], - 'action': [ -+ '<@(emulator)', - '<(node_mksnapshot_exec)', - '--build-snapshot', - '<(node_snapshot_main)', -@@ -351,6 +352,7 @@ - '<(SHARED_INTERMEDIATE_DIR)/node_snapshot.cc', - ], - 'action': [ -+ '<@(emulator)', - '<@(_inputs)', - '<@(_outputs)', - ], -@@ -1520,6 +1522,7 @@ - '<(PRODUCT_DIR)/<(node_core_target_name).def', - ], - 'action': [ -+ '<@(emulator)', - '<(PRODUCT_DIR)/gen_node_def.exe', - '<@(_inputs)', - '<@(_outputs)', -diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp -index ba8b161f0f..d5c90dad50 100644 ---- a/tools/v8_gypfiles/v8.gyp -+++ b/tools/v8_gypfiles/v8.gyp -@@ -99,6 +99,7 @@ - '<@(torque_outputs_inc)', - ], - 'action': [ -+ '<@(emulator)', - '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)', - '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated', - '-v8-root', '<(V8_ROOT)', -@@ -219,6 +220,7 @@ - 'action': [ - '<(python)', - '<(V8_ROOT)/tools/run.py', -+ '<@(emulator)', - '<@(_inputs)', - '<@(_outputs)', - ], -@@ -442,6 +444,7 @@ - }], - ], - 'action': [ -+ '<@(emulator)', - '>@(_inputs)', - '>@(mksnapshot_flags)', - ], -@@ -1577,6 +1580,7 @@ - 'action': [ - '<(python)', - '<(V8_ROOT)/tools/run.py', -+ '<@(emulator)', - '<@(_inputs)', - '<@(_outputs)', - ], --- -2.44.1 - diff --git a/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch b/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch deleted file mode 100644 index 63e9107b33d0..000000000000 --- a/pkgs/development/web/nodejs/disable-darwin-v8-system-instrumentation.patch +++ /dev/null @@ -1,16 +0,0 @@ -Disable v8 system instrumentation on Darwin - -On Darwin, the v8 system instrumentation requires the header "os/signpost.h" -which is available since apple_sdk 11+. See: https://github.com/nodejs/node/issues/39584 - ---- old/tools/v8_gypfiles/features.gypi -+++ new/tools/v8_gypfiles/features.gypi -@@ -62,7 +62,7 @@ - }, { - 'is_component_build': 0, - }], -- ['OS == "win" or OS == "mac"', { -+ ['OS == "win"', { - # Sets -DSYSTEM_INSTRUMENTATION. Enables OS-dependent event tracing - 'v8_enable_system_instrumentation': 1, - }, { diff --git a/pkgs/development/web/nodejs/revert-arm64-pointer-auth.patch b/pkgs/development/web/nodejs/revert-arm64-pointer-auth.patch deleted file mode 100644 index f5827983d7f2..000000000000 --- a/pkgs/development/web/nodejs/revert-arm64-pointer-auth.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fixes cross compilation to aarch64-linux by reverting -https://github.com/nodejs/node/pull/43200 - ---- old/configure.py -+++ new/configure.py -@@ -1236,7 +1236,6 @@ - - # Enable branch protection for arm64 - if target_arch == 'arm64': -- o['cflags']+=['-msign-return-address=all'] - o['variables']['arm_fpu'] = options.arm_fpu or 'neon' - - if options.node_snapshot_main is not None: diff --git a/pkgs/development/web/nodejs/trap-handler-backport.patch b/pkgs/development/web/nodejs/trap-handler-backport.patch deleted file mode 100644 index c562aea3a6e2..000000000000 --- a/pkgs/development/web/nodejs/trap-handler-backport.patch +++ /dev/null @@ -1,76 +0,0 @@ -Backport V8_TRAP_HANDLER_SUPPORTED conditional compilation for trap -handler implementation. - -See https://github.com/v8/v8/commit/e7bef8d4cc4f38cc3d5a532fbcc445dc62adc08f - -E.g. when cross-compiling from aarch64-linux for x86_64-linux target, -handler-inside-posix.cc is built on aarch64-linux even though it is not -supported; see src/trap-handler/trap-handler.h in v8 for (host, target) -combinations where trap handler is supported. - -Note that handler-inside-posix.cc fails to build in the case above. - -diff --git a/deps/v8/src/trap-handler/handler-inside-posix.cc b/deps/v8/src/trap-handler/handler-inside-posix.cc -index e4454c378f..17af3d75dc 100644 ---- a/deps/v8/src/trap-handler/handler-inside-posix.cc -+++ b/deps/v8/src/trap-handler/handler-inside-posix.cc -@@ -47,6 +47,8 @@ namespace v8 { - namespace internal { - namespace trap_handler { - -+#if V8_TRAP_HANDLER_SUPPORTED -+ - #if V8_OS_LINUX - #define CONTEXT_REG(reg, REG) &uc->uc_mcontext.gregs[REG_##REG] - #elif V8_OS_DARWIN -@@ -181,6 +183,8 @@ void HandleSignal(int signum, siginfo_t* info, void* context) { - // TryHandleSignal modifies context to change where we return to. - } - -+#endif -+ - } // namespace trap_handler - } // namespace internal - } // namespace v8 -diff --git a/deps/v8/src/trap-handler/handler-inside-win.cc b/deps/v8/src/trap-handler/handler-inside-win.cc -index fcccc78ee5..3d7a2c416a 100644 ---- a/deps/v8/src/trap-handler/handler-inside-win.cc -+++ b/deps/v8/src/trap-handler/handler-inside-win.cc -@@ -38,6 +38,8 @@ namespace v8 { - namespace internal { - namespace trap_handler { - -+#if V8_TRAP_HANDLER_SUPPORTED -+ - // The below struct needed to access the offset in the Thread Environment Block - // to see if the thread local storage for the thread has been allocated yet. - // -@@ -129,6 +131,8 @@ LONG HandleWasmTrap(EXCEPTION_POINTERS* exception) { - return EXCEPTION_CONTINUE_SEARCH; - } - -+#endif -+ - } // namespace trap_handler - } // namespace internal - } // namespace v8 -diff --git a/deps/v8/src/trap-handler/handler-outside-simulator.cc b/deps/v8/src/trap-handler/handler-outside-simulator.cc -index 179eab0659..5e58719e7f 100644 ---- a/deps/v8/src/trap-handler/handler-outside-simulator.cc -+++ b/deps/v8/src/trap-handler/handler-outside-simulator.cc -@@ -4,6 +4,9 @@ - - #include "include/v8config.h" - #include "src/trap-handler/trap-handler-simulator.h" -+#include "src/trap-handler/trap-handler.h" -+ -+#if V8_TRAP_HANDLER_SUPPORTED - - #if V8_OS_DARWIN - #define SYMBOL(name) "_" #name -@@ -35,3 +38,5 @@ asm( - SYMBOL(v8_probe_memory_continuation) ": \n" - // If the trap handler continues here, it wrote the landing pad in %rax. - " ret \n"); -+ -+#endif diff --git a/pkgs/development/web/nodejs/v18.nix b/pkgs/development/web/nodejs/v18.nix deleted file mode 100644 index f63676f25823..000000000000 --- a/pkgs/development/web/nodejs/v18.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ - callPackage, - lib, - openssl, - python311, - fetchpatch2, - icu75, - enableNpm ? true, -}: - -let - buildNodejs = callPackage ./nodejs.nix { - inherit openssl; - python = python311; - icu = icu75; # does not build with newer - }; - - gypPatches = callPackage ./gyp-patches.nix { } ++ [ - ./gyp-patches-pre-v22-import-sys.patch - ]; -in -buildNodejs { - inherit enableNpm; - version = "18.20.8"; - sha256 = "36a7bf1a76d62ce4badd881ee5974a323c70e1d8d19165732684e145632460d9"; - patches = [ - ./configure-emulator-node18.patch - ./configure-armv6-vfpv2.patch - ./disable-darwin-v8-system-instrumentation.patch - ./bypass-darwin-xcrun-node16.patch - ./revert-arm64-pointer-auth.patch - ./node-npm-build-npm-package-logic.patch - ./trap-handler-backport.patch - ./use-correct-env-in-tests.patch - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch"; - hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch"; - hash = "sha256-JJi8z9aaWnu/y3nZGOSUfeNzNSCYzD9dzoHXaGkeaEA="; - includes = [ "test/common/assertSnapshot.js" ]; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch"; - hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k="; - }) - # Remove unused `fdopen` in vendored zlib, which causes compilation failures with clang 18 on Darwin. - (fetchpatch2 { - url = "https://github.com/madler/zlib/commit/4bd9a71f3539b5ce47f0c67ab5e01f3196dc8ef9.patch?full_index=1"; - extraPrefix = "deps/v8/third_party/zlib/"; - stripLen = 1; - hash = "sha256-WVxsoEcJu0WBTyelNrVQFTZxJhnekQb1GrueeRBRdnY="; - }) - # Backport V8 fixes for LLVM 19. - (fetchpatch2 { - url = "https://chromium.googlesource.com/v8/v8/+/182d9c05e78b1ddb1cb8242cd3628a7855a0336f%5E%21/?format=TEXT"; - decode = "base64 -d"; - extraPrefix = "deps/v8/"; - stripLen = 1; - hash = "sha256-bDTwFbATPn5W4VifWz/SqaiigXYDWHq785C64VezuUE="; - }) - (fetchpatch2 { - url = "https://chromium.googlesource.com/v8/v8/+/1a3ecc2483b2dba6ab9f7e9f8f4b60dbfef504b7%5E%21/?format=TEXT"; - decode = "base64 -d"; - extraPrefix = "deps/v8/"; - stripLen = 1; - hash = "sha256-6y3aEqxNC4iTQEv1oewodJrhOHxjp5xZMq1P1QL94Rg="; - }) - # Fix for https://github.com/NixOS/nixpkgs/issues/355919 - # FIXME: remove after a minor point release - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/a094a8166cd772f89e92b5deef168e5e599fa815.patch?full_index=1"; - hash = "sha256-5FZfozYWRa1ZI/f+e+xpdn974Jg2DbiHbua13XUQP5E="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/f270462c09ddfd770291a7c8a2cd204b2c63d730.patch?full_index=1"; - hash = "sha256-Err0i5g7WtXcnhykKgrS3ocX7/3oV9UrT0SNeRtMZNU="; - }) - # fix test failure on macos 15.4 - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1"; - hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU="; - }) - ] ++ gypPatches; -} diff --git a/pkgs/servers/mx-puppet-discord/default.nix b/pkgs/servers/mx-puppet-discord/default.nix index a4e4da2f5343..b7418016a52e 100644 --- a/pkgs/servers/mx-puppet-discord/default.nix +++ b/pkgs/servers/mx-puppet-discord/default.nix @@ -4,7 +4,7 @@ pkgs, lib, node-pre-gyp, - nodejs_18, + nodejs_20, pkg-config, libjpeg, pixman, @@ -15,7 +15,7 @@ }: let - nodejs = nodejs_18; + nodejs = nodejs_20; version = "0.1.1"; @@ -72,7 +72,8 @@ myNodePackages.package.override { maintainers = [ ]; platforms = platforms.unix; # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; + # Depends on nodejs_18 that has been removed. + broken = true; mainProgram = "mx-puppet-discord"; }; } diff --git a/pkgs/servers/mx-puppet-discord/node-composition.nix b/pkgs/servers/mx-puppet-discord/node-composition.nix index e7922d509acb..bea673390a92 100644 --- a/pkgs/servers/mx-puppet-discord/node-composition.nix +++ b/pkgs/servers/mx-puppet-discord/node-composition.nix @@ -5,7 +5,7 @@ inherit system; }, system ? builtins.currentSystem, - nodejs ? pkgs."nodejs_18", + nodejs ? pkgs."nodejs_20", }: let diff --git a/pkgs/servers/openvscode-server/default.nix b/pkgs/servers/openvscode-server/default.nix index 309030b4d303..9eb723753496 100644 --- a/pkgs/servers/openvscode-server/default.nix +++ b/pkgs/servers/openvscode-server/default.nix @@ -265,6 +265,8 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-darwin" "aarch64-darwin" ]; + # Depends on nodejs_18 that has been removed. + broken = true; mainProgram = "openvscode-server"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 173d75522063..103411685a3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4164,9 +4164,9 @@ with pkgs; nodejs-slim = nodejs-slim_22; corepack = hiPrio corepack_22; - nodejs_18 = callPackage ../development/web/nodejs/v18.nix { }; - nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix { enableNpm = false; }; - corepack_18 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_18; }); + nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; + nodejs-slim_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; + corepack_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; }; @@ -11990,7 +11990,7 @@ with pkgs; }; lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix { - nodejs = nodejs_18; + nodejs = nodejs_20; }; mailmanPackages = callPackage ../servers/mail/mailman { }; @@ -16467,7 +16467,7 @@ with pkgs; }; openvscode-server = callPackage ../servers/openvscode-server { - nodejs = nodejs_18; + nodejs = nodejs_20; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security; }; From 904bb6711c331350ac6fbf252475856cef471adb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 10:38:03 +0200 Subject: [PATCH 378/449] python312Packages.rioxarray: 0.18.2 -> 0.19.0 Diff: https://github.com/corteva/rioxarray/compare/refs/tags/0.18.2...refs/tags/0.19.0 Changelog: https://github.com/corteva/rioxarray/releases/tag/0.19.0 --- .../python-modules/rioxarray/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix index 483598a8d7f6..834f206d002e 100644 --- a/pkgs/development/python-modules/rioxarray/default.nix +++ b/pkgs/development/python-modules/rioxarray/default.nix @@ -1,17 +1,18 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system setuptools, + # dependencies numpy, packaging, pyproj, rasterio, xarray, + # tests dask, netcdf4, @@ -21,15 +22,14 @@ buildPythonPackage rec { pname = "rioxarray"; - version = "0.18.2"; + version = "0.19.0"; pyproject = true; - disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "corteva"; repo = "rioxarray"; tag = version; - hash = "sha256-HNtMLY83e6MQakIlmsJohmhjDWiM5/hqq25qSY1dPBw="; + hash = "sha256-tNcBuMyBVDVPbmujfn4WauquutOEn727lxcR19hfyuE="; }; build-system = [ setuptools ]; @@ -49,21 +49,22 @@ buildPythonPackage rec { ]; disabledTests = - [ "test_clip_geojson__no_drop" ] - ++ lib.optionals - (stdenv.hostPlatform.system == "aarch64-linux" || stdenv.hostPlatform.system == "aarch64-darwin") - [ - # numerical errors - "test_clip_geojson" - "test_open_rasterio_mask_chunk_clip" - ]; + [ + # AssertionError: assert 535727386 == 535691205 + "test_clip_geojson__no_drop" + ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ + # numerical errors + "test_clip_geojson" + "test_open_rasterio_mask_chunk_clip" + ]; pythonImportsCheck = [ "rioxarray" ]; meta = { - description = "geospatial xarray extension powered by rasterio"; + description = "Geospatial xarray extension powered by rasterio"; homepage = "https://corteva.github.io/rioxarray/"; - changelog = "https://github.com/corteva/rioxarray/releases/tag/${src.tag}"; + changelog = "https://github.com/corteva/rioxarray/releases/tag/${version}"; license = lib.licenses.asl20; maintainers = lib.teams.geospatial.members; }; From 1a2ad32a4b68aca8068a839f82782139c90cdf97 Mon Sep 17 00:00:00 2001 From: "\"Bruno BELANYI\"" <"bruno@belanyi.fr"> Date: Wed, 23 Apr 2025 10:48:51 +0000 Subject: [PATCH 379/449] vimPlugins.unimpaired-which-key-nvim: init at 2024-08-16 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 95777334f68e..156477bc8a41 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -14937,6 +14937,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + unimpaired-which-key-nvim = buildVimPlugin { + pname = "unimpaired-which-key.nvim"; + version = "2024-08-16"; + src = fetchFromGitHub { + owner = "afreakk"; + repo = "unimpaired-which-key.nvim"; + rev = "c35f413a631e2d2a29778cc390e4d2da28fc2727"; + sha256 = "11skr474c9drq25823rx1jxcv5d57si0085zw60nq3wxmx999cg3"; + }; + meta.homepage = "https://github.com/afreakk/unimpaired-which-key.nvim/"; + meta.hydraPlatforms = [ ]; + }; + unison = buildVimPlugin { pname = "unison"; version = "2025-04-18"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4a804f2223f9..3e41ac143fd9 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -1145,6 +1145,7 @@ https://github.com/altermo/ultimate-autopair.nvim/,HEAD, https://github.com/SirVer/ultisnips/,, https://github.com/mbbill/undotree/,, https://github.com/chrisbra/unicode.vim/,, +https://github.com/afreakk/unimpaired-which-key.nvim/,HEAD, https://github.com/tummetott/unimpaired.nvim/,HEAD, https://github.com/unisonweb/unison/,, https://github.com/Shougo/unite.vim/,, From 5af1a57eb1084f70e2ae263c579aef4363e0ad78 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 12:52:04 +0200 Subject: [PATCH 380/449] python312Packages.jaxtyping: 0.3.1 -> 0.3.2 Diff: https://github.com/google/jaxtyping/compare/refs/tags/v0.3.1...refs/tags/v0.3.2 Changelog: https://github.com/patrick-kidger/jaxtyping/releases/tag/v0.3.2 --- pkgs/development/python-modules/jaxtyping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index 4d557ef3cb68..83d4ad031b7d 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -23,14 +23,14 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.3.1"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "jaxtyping"; tag = "v${version}"; - hash = "sha256-rEKZ04R6PwDTk76KSjPprn58RUIQ+U8WVlxgrAwktLI="; + hash = "sha256-zRuTOt9PqFGDZbSGvkzxIWIi3z+vU0FmAEecPRcGy2w="; }; build-system = [ hatchling ]; From 1d868ace31b89415ddd5b0316cac6e862519f5c0 Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 15 Feb 2025 15:15:48 +0100 Subject: [PATCH 381/449] your_spotify: fix broken symlinks --- pkgs/by-name/yo/your_spotify/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/yo/your_spotify/package.nix b/pkgs/by-name/yo/your_spotify/package.nix index 9ab6e61af77b..6bd736ea2701 100644 --- a/pkgs/by-name/yo/your_spotify/package.nix +++ b/pkgs/by-name/yo/your_spotify/package.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/your_spotify cp -r node_modules $out/share/your_spotify/node_modules + rm $out/share/your_spotify/node_modules/@your_spotify/{client,dev,server} cp -r ./apps/server/{lib,package.json} $out mkdir -p $out/bin makeWrapper ${lib.escapeShellArg (lib.getExe nodejs)} "$out/bin/your_spotify_migrate" \ From e07930358d556231af35423f8a07f13f7a4006c4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 23 Apr 2025 14:25:39 +0300 Subject: [PATCH 382/449] Revert "libblake3: 1.8.0 -> 1.8.2" This reverts commit d7afeaea8ae76ffadf5da4e587454d238a1cd8a6. It breaks the Nix build, as well as the nixos docs. --- pkgs/by-name/li/libblake3/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index 008a35b88254..59306559958e 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -5,18 +5,23 @@ fetchFromGitHub, tbb_2021_11, - useTBB ? true, + # Until we have a release with + # https://github.com/BLAKE3-team/BLAKE3/pull/461 and similar, or those + # PRs are patched onto this current release. Even then, I think we + # still need to disable for MinGW build because + # https://github.com/BLAKE3-team/BLAKE3/issues/467 + useTBB ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "libblake3"; - version = "1.8.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; tag = finalAttrs.version; - hash = "sha256-IABVErXWYQFXZcwsFKfQhm3ox7UZUcW5uzVrGwsSp94="; + hash = "sha256-Krh0yVNZKL6Mb0McqWTIMNownsgM3MUEX2IP+F/fu+k="; }; sourceRoot = finalAttrs.src.name + "/c"; From 41ec0a61e6ee020e30b55fc303c97653ff39b84d Mon Sep 17 00:00:00 2001 From: GueLaKais Date: Thu, 10 Apr 2025 21:48:33 +0200 Subject: [PATCH 383/449] gz-cmake: init at 4.1.1 --- pkgs/by-name/gz/gz-cmake/package.nix | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/gz/gz-cmake/package.nix diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix new file mode 100644 index 000000000000..215ebb8d98bc --- /dev/null +++ b/pkgs/by-name/gz/gz-cmake/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + doxygen, + graphviz, + pkg-config, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "gz-cmake"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "gazebosim"; + repo = "gz-cmake"; + tag = "gz-cmake${lib.versions.major finalAttrs.version}_${finalAttrs.version}"; + hash = "sha256-BWgRm+3UW65Cu7TqXtFFG05JlYF52dbpAsIE8aDnJM0="; + }; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + pkg-config + ]; + + meta = { + description = "CMake modules to build Gazebo projects"; + homepage = "https://github.com/gazebosim/gz-cmake"; + changelog = "https://github.com/gazebosim/gz-cmake/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ guelakais ]; + }; +}) From 50ee1e273e8f7adadfbb751df55405fc337e0020 Mon Sep 17 00:00:00 2001 From: Vladyslav Pekker Date: Tue, 22 Apr 2025 15:03:00 -0300 Subject: [PATCH 384/449] pgformatter: 5.5 -> 5.6 --- pkgs/by-name/pg/pgformatter/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 0f3547ed42c7..8ee301ef4dfa 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -3,19 +3,18 @@ stdenv, perlPackages, fetchFromGitHub, - fetchpatch, shortenPerlShebang, }: perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.5"; + version = "5.6"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - hash = "sha256-4KtrsckO9Q9H0yIM0877YvWaDW02CQVAQiOKD919e9w="; + hash = "sha256-EJLAP1uBmWxWEsdLJYTuViMv4o0iEi2fqy79ixyRijU="; }; outputs = [ "out" ]; @@ -25,14 +24,6 @@ perlPackages.buildPerlPackage rec { # Avoid creating perllocal.pod, which contains a timestamp installTargets = [ "pure_install" ]; - patches = [ - # Fix an uninitialized variable error. Remove with the next release. - (fetchpatch { - url = "https://github.com/darold/pgFormatter/commit/c2622c47d48cee47effecbf58a588c3cd3a7bf1a.patch"; - sha256 = "sha256-WnQIOvfuzL2HrwtL0HaaYObrBxhXDu82jxGcqggQVhc="; - }) - ]; - # Makefile.PL only accepts DESTDIR and INSTALLDIRS, but we need to set more to make this work for NixOS. patchPhase = '' substituteInPlace pg_format \ From df7855f54c4cd8c9c5a2832d23336a1129218091 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 14:08:54 +0200 Subject: [PATCH 385/449] python312Packages.yabadaba: 0.2.2 -> 0.3.1 Diff: https://github.com/usnistgov/yabadaba/compare/refs/tags/v0.2.2...refs/tags/v0.3.1 Changelog: https://github.com/usnistgov/yabadaba/releases/tag/v0.3.1 --- .../python-modules/yabadaba/default.nix | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/yabadaba/default.nix b/pkgs/development/python-modules/yabadaba/default.nix index 4e748ac1c800..f212cf70b81e 100644 --- a/pkgs/development/python-modules/yabadaba/default.nix +++ b/pkgs/development/python-modules/yabadaba/default.nix @@ -1,32 +1,37 @@ { lib, buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies cdcs, datamodeldict, - fetchFromGitHub, ipython, lxml, numpy, pandas, + pillow, pymongo, - pytestCheckHook, - pythonOlder, - setuptools, tqdm, + + # tests + pytestCheckHook, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "yabadaba"; - version = "0.2.2"; + version = "0.3.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "usnistgov"; repo = "yabadaba"; tag = "v${version}"; - hash = "sha256-NfvnUrTnOeNfiTMrcRtWU3a/Wb6qsDeQlk5jwZ1OpgI="; + hash = "sha256-DpkJvi4w0aoD7RC2IFORy8uZ12TuLdcJxfLaSGyATac="; }; build-system = [ setuptools ]; @@ -38,23 +43,23 @@ buildPythonPackage rec { lxml numpy pandas + pillow pymongo tqdm ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + writableTmpDirAsHomeHook + ]; pythonImportsCheck = [ "yabadaba" ]; - preCheck = '' - export HOME=$(mktemp -d); - ''; - - meta = with lib; { + meta = { description = "Abstraction layer allowing for common interactions with databases and records"; homepage = "https://github.com/usnistgov/yabadaba"; changelog = "https://github.com/usnistgov/yabadaba/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From d5c4969179acb116cf546f071d69cbe955cd0398 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 14:11:27 +0200 Subject: [PATCH 386/449] python312Packages.potentials: cleanup --- .../python-modules/potentials/default.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/potentials/default.nix b/pkgs/development/python-modules/potentials/default.nix index 36aeac395517..df99f4caaa9d 100644 --- a/pkgs/development/python-modules/potentials/default.nix +++ b/pkgs/development/python-modules/potentials/default.nix @@ -1,20 +1,24 @@ { lib, - bibtexparser, buildPythonPackage, + fetchPypi, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + bibtexparser, cdcs, datamodeldict, - fetchPypi, habanero, ipywidgets, lxml, matplotlib, numpy, pandas, - pythonOlder, requests, scipy, - setuptools, unidecode, xmltodict, yabadaba, @@ -25,11 +29,11 @@ buildPythonPackage rec { version = "0.4.0"; pyproject = true; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-7ujcfFa/cweUtCY2MrEh3bTkwAVzvbF+5AJ4fs5o6bE="; + src = fetchFromGitHub { + owner = "usnistgov"; + repo = "potentials"; + tag = "v${version}"; + hash = "sha256-VDA3dQ34kvrs3XMfC0j3T63KrXlmOa/hPvOni/UkgP4="; }; build-system = [ setuptools ]; @@ -56,11 +60,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "potentials" ]; - meta = with lib; { + meta = { description = "Python API database tools for accessing the NIST Interatomic Potentials Repository"; homepage = "https://github.com/usnistgov/potentials"; changelog = "https://github.com/usnistgov/potentials/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ fab ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; }; } From 3c40ba828fba15ee08e6a2f34ed928c552077aa4 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 23 Apr 2025 11:37:05 +0200 Subject: [PATCH 387/449] wine: fix stable / yabridge builds with binutils 2.44 This patch is included in wine 10.2 onwards, so unstable / staging don't need it. --- pkgs/applications/emulators/wine/sources.nix | 31 ++++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index d5e34fc625a5..38bbca910c7a 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -65,6 +65,23 @@ let source ${./update-lib.sh} ''; + # Needed for wine versions < 10.2 to fix compatibility with binutils 2.44 + # https://github.com/NixOS/nixpkgs/issues/399714 + # https://bugs.winehq.org/show_bug.cgi?id=57819 + # https://gitlab.winehq.org/wine/wine/-/merge_requests/7328 + patches-binutils-2_44-fix-wine-older-than-10_2 = [ + (pkgs.fetchpatch { + name = "ntdll-use-signed-type"; + url = "https://gitlab.winehq.org/wine/wine/-/commit/fd59962827a715d321f91c9bdb43f3e61f9ebbc.patch"; + hash = "sha256-PvFom9NJ32XZO1gYor9Cuk8+eaRFvmG572OAtNx1tks="; + }) + (pkgs.fetchpatch { + name = "winebuild-avoid using-idata-section"; + url = "https://gitlab.winehq.org/wine/wine/-/commit/c9519f68ea04915a60704534ab3afec5ec1b8fd7.patch"; + hash = "sha256-vA58SfAgCXoCT+NB4SRHi85AnI4kj9S2deHGp4L36vI="; + }) + ]; + inherit (pkgs) writeShellScript; in rec { @@ -96,7 +113,7 @@ rec { patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE ./cert-path.patch - ]; + ] ++ patches-binutils-2_44-fix-wine-older-than-10_2; updateScript = writeShellScript "update-wine-stable" ('' ${updateScriptPreamble} @@ -118,7 +135,11 @@ rec { version = "10.5"; url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; hash = "sha256-wDbsHvR2dHdKX5lFgwIuni62j+j8GLOox55oWzvsibw="; - inherit (stable) patches; + + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path.patch + ]; # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { @@ -177,7 +198,11 @@ rec { version = "9.21"; url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz"; hash = "sha256-REK0f/2bLqRXEA427V/U5vTYKdnbeaJeYFF1qYjKL/8="; - inherit (stable) patches; + + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path.patch + ] ++ patches-binutils-2_44-fix-wine-older-than-10_2; # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { From f3320bafd2cda0f94971ae1efd058bdc963ace5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 12:58:12 +0000 Subject: [PATCH 388/449] quantlib: 1.37 -> 1.38 --- pkgs/by-name/qu/quantlib/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix index 6401c2e8f110..fc8555fc7cb8 100644 --- a/pkgs/by-name/qu/quantlib/package.nix +++ b/pkgs/by-name/qu/quantlib/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "quantlib"; - version = "1.37"; + version = "1.38"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "lballabio"; repo = "QuantLib"; rev = "v${finalAttrs.version}"; - hash = "sha256-Q8Bz94yd4A0VCDldtiichFKgiZMN4dHHJJep/tcE/z0="; + hash = "sha256-4a86sGUOz/B5IQHE41r5+OTvR9es4FgXeufy3bKRWAc="; }; nativeBuildInputs = [ cmake ]; From f15cf2ebb49018f21e87be0e1734dee94c691718 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 13:23:13 +0000 Subject: [PATCH 389/449] octoscan: 0.1.4 -> 0.1.5 --- pkgs/by-name/oc/octoscan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oc/octoscan/package.nix b/pkgs/by-name/oc/octoscan/package.nix index 93f7f5ad0b09..3b2636a2bec1 100644 --- a/pkgs/by-name/oc/octoscan/package.nix +++ b/pkgs/by-name/oc/octoscan/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "octoscan"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "synacktiv"; repo = "octoscan"; tag = "v${version}"; - hash = "sha256-7Y33HUqI3EKyWcVdJt+gj6VaMcXRp20fxuz9gNutOIo="; + hash = "sha256-SG6QHpDG9kPfb9jvHwz58U7+HZpFwYzwsDERNRW5R10="; }; vendorHash = "sha256-Jx4OEVqCTiW/BSygeLtwwqijiACEuPk0BT26JQoL3Ds="; From 20d875ff1d10cede5e957cadcd3f54f4d755c38b Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sat, 19 Apr 2025 18:29:57 +0300 Subject: [PATCH 390/449] equicord: switch to new tag format --- pkgs/by-name/eq/equicord/package.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index bc12644fa050..e8f6b97529d7 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -10,18 +10,22 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "equicord"; - version = "1.11.4"; + # Upstream discourages inferring the package version from the package.json found in + # the Equicord repository. Dates as tags (and automatic releases) were the compromise + # we came to with upstream. Please do not change the version schema (e.g., to semver) + # unless upstream changes the tag schema from dates. + version = "2025-04-17"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equicord"; - tag = "v${finalAttrs.version}"; - hash = "sha256-BjAp+bubpG9tTo8y5LWcTCnpLbiyuY1Q6ZnprgeKoZg="; + tag = "${finalAttrs.version}"; + hash = "sha256-pAuNqPrQBeL2qPIoIvyBl1PrUBz81TrBd5RT15Iuuus="; }; pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-4uCo/pQ4f8k/7DNpCPDAeqfroZ9icFiTwapwS10uWkE="; + hash = "sha256-fjfzBy1Z7AUKA53yjjCQ6yasHc5QMaOBtXtXA5fNK5s="; }; nativeBuildInputs = [ @@ -52,7 +56,12 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^\d{4}-\d{2}-\d{2}$" + ]; + }; meta = { description = "The other cutest Discord client mod"; From c5d7c34c49e1c12c8e4b5e4749bc61a82cf3b179 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 13:38:25 +0000 Subject: [PATCH 391/449] kubecolor: 0.5.0 -> 0.5.1 --- pkgs/by-name/ku/kubecolor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubecolor/package.nix b/pkgs/by-name/ku/kubecolor/package.nix index 56f75358792d..a27ee83fb0aa 100644 --- a/pkgs/by-name/ku/kubecolor/package.nix +++ b/pkgs/by-name/ku/kubecolor/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "kubecolor"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "kubecolor"; repo = "kubecolor"; rev = "v${version}"; - sha256 = "sha256-Q3Bl1ejuSpiMpQgiqKa2x/g02hNx326GM2MIDoi7q7o="; + sha256 = "sha256-FyHTceFpB3Osj8SUw+IRk+JWnoREVZgl8YHczDyY+Ak="; }; - vendorHash = "sha256-SWJbJ/zr9ygZYUuH8QNvgmUXdxb/3OViai48CFmWmXw="; + vendorHash = "sha256-eF0NcymLmRsFetkI67ZVUfOcIYtht0iYFcPIy2CWr+M="; ldflags = [ "-s" From a2412aa76dfd419d2acdd430581bb47410d93471 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Wed, 26 Mar 2025 18:59:28 +0100 Subject: [PATCH 392/449] adguardhome: 0.107.57 -> 0.107.61 --- pkgs/servers/adguardhome/bins.nix | 28 ++++++++++++++-------------- pkgs/servers/adguardhome/default.nix | 2 +- pkgs/servers/adguardhome/update.sh | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/servers/adguardhome/bins.nix b/pkgs/servers/adguardhome/bins.nix index a5ab452bc298..bd4755c451d7 100644 --- a/pkgs/servers/adguardhome/bins.nix +++ b/pkgs/servers/adguardhome/bins.nix @@ -1,31 +1,31 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-wNDPmB/RyTc3ZZWx7glhDx3aeWFrvcsiNv7hvsnWWu4="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-/xwRH9+qJQ91z2alo2sBdnLs2Z2wXUMHqJvxagptx5U="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-gm9QHJFrCbKyEK6RsSKCeIQY2eYJIXO1n4vAkA3yatY="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-60uD8dH4Dqbey21HGx/PIzWBcN/00V1/oS1ubrucayY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-2TVrjG4C4uLsBUJoya4YxiOlTJlcmzPG6lUWcCj/PYE="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-RJeU+n46IMncX5MXDedw/7DSe6pISsTJEyfI5B1pEcY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-E2bzQIYsRpijlJnjD+V3lh5a1nauD5aMVoI/9tHfrRM="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-jZV/U4DUw70J1xmZLM5+gqAgpUP7fdyw46Neq8fQxT0="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-0yedCjUkpye2Rly87a5Qdyfy8/kgrEOrHKpbZ0YhruM="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-TtD8KR92Mv3Z3nCz4xIT+FcuxwqgDTq3C1lGIELrEQU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_arm64.tar.gz"; }; armv6l-linux = fetchurl { - sha256 = "sha256-RhPXB3G9iDmijTCsljXedJxqLr8Zna5IzU18KITU0m0="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_armv6.tar.gz"; + sha256 = "sha256-MosFBi72sgdZshUzAxi/ht56VpeHMguRQawU3DI5Va8="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_armv6.tar.gz"; }; armv7l-linux = fetchurl { - sha256 = "sha256-tAtuMWgy+HMUIMbKLQZOMVO7z65UuPIZnHpJr1IYpJw="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.57/AdGuardHome_linux_armv7.tar.gz"; + sha256 = "sha256-7YFzd6z9eCGBHlyYgDiwE+cpQzEuQIHDYfbCopapYrw="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.61/AdGuardHome_linux_armv7.tar.gz"; }; } diff --git a/pkgs/servers/adguardhome/default.nix b/pkgs/servers/adguardhome/default.nix index 1790e88e4a35..17835e373b1d 100644 --- a/pkgs/servers/adguardhome/default.nix +++ b/pkgs/servers/adguardhome/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.57"; + version = "0.107.61"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh index 4e3ecfbfaca4..b85129e8289a 100755 --- a/pkgs/servers/adguardhome/update.sh +++ b/pkgs/servers/adguardhome/update.sh @@ -36,7 +36,7 @@ for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHom if [ -n "$adg_system" ]; then fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)" nix_system=${systems[$adg_system]} - nix_src="$(nix-prefetch -s --output nix $fetch --url $url)" + nix_src="$(nix-prefetch --option extra-experimental-features flakes -s --output nix $fetch --url $url)" echo "$nix_system = $fetch $nix_src;" >> $bins fi done From 3e63f12d74dc3103c202f87d25f7ff25ca8b3c84 Mon Sep 17 00:00:00 2001 From: GueLaKais Date: Wed, 16 Apr 2025 20:23:25 +0200 Subject: [PATCH 393/449] python313Packages.colcon-defaults: init at 0.2.9 --- .../colcon-defaults/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/development/python-modules/colcon-defaults/default.nix diff --git a/pkgs/development/python-modules/colcon-defaults/default.nix b/pkgs/development/python-modules/colcon-defaults/default.nix new file mode 100644 index 000000000000..ec88506b73e7 --- /dev/null +++ b/pkgs/development/python-modules/colcon-defaults/default.nix @@ -0,0 +1,61 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + # build-system + setuptools, + #dependencies + colcon, + pyaml, + # tests + pytestCheckHook, + pytest-cov-stub, + pytest-repeat, + pytest-rerunfailures, + scspell, + writableTmpDirAsHomeHook, +}: +buildPythonPackage rec { + pname = "colcon-defaults"; + version = "0.2.9"; + pyproject = true; + + src = fetchFromGitHub { + owner = "colcon"; + repo = "colcon-defaults"; + tag = version; + hash = "sha256-Nb6D9jpbCvUnCNgRLBgWQFybNx0hyWVLSKj6gmTWjVs="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + colcon + pyaml + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + pytest-repeat + pytest-rerunfailures + scspell + writableTmpDirAsHomeHook + ]; + + disabledTestPaths = [ + # Skip formatting checks to prevent depending on flake8 + "test/test_flake8.py" + ]; + + pythonImportsCheck = [ "colcon_defaults" ]; + + meta = { + description = "Extension for colcon to read defaults from a config file"; + homepage = "https://github.com/colcon/colcon-defaults"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ guelakais ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23bce3243eca..a8cd8cf40b74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2665,6 +2665,8 @@ self: super: with self; { colcon-argcomplete = callPackage ../development/python-modules/colcon-argcomplete { }; + colcon-defaults = callPackage ../development/python-modules/colcon-defaults { }; + collections-extended = callPackage ../development/python-modules/collections-extended { }; collidoscope = callPackage ../development/python-modules/collidoscope { }; From d6373fecb3b118217d72ff22177d640754767450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=AErekc=C3=A4H=20nitraM=E2=80=AE?= Date: Fri, 13 Dec 2024 08:12:30 +0100 Subject: [PATCH 394/449] docs: Update reference to built architectures in https://github.com/NixOS/nixpkgs/pull/361521 this was changed to aarch64-darwin. --- doc/preface.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index e6a0905c5a95..56f089703021 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -42,7 +42,7 @@ shows the status of tests for the `nixpkgs-unstable` channel. The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/), which also builds binary packages from the Nix expressions in Nixpkgs for -`x86_64-linux`, `i686-linux` and `x86_64-darwin`. +`x86_64-linux`, `aarch64-linux`, `x86_64-darwin` and `aarch64-darwin`. The binaries are made available via a [binary cache](https://cache.nixos.org). The current Nix expressions of the channels are available in the From 0012df53404ccaf45407b356a01db4403bb5d09d Mon Sep 17 00:00:00 2001 From: Onni Hakala Date: Fri, 14 Mar 2025 19:05:33 +0100 Subject: [PATCH 395/449] age-plugin-se: init at 0.1.4 --- maintainers/maintainer-list.nix | 11 ++++ pkgs/by-name/ag/age-plugin-se/package.nix | 63 +++++++++++++++++++++++ pkgs/by-name/ag/age/package.nix | 2 + 3 files changed, 76 insertions(+) create mode 100644 pkgs/by-name/ag/age-plugin-se/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e5b22f2d6af7..0a05226b6fd6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18055,6 +18055,12 @@ githubId = 817073; name = "Yc. Shen"; }; + onnimonni = { + email = "onni@flaky.build"; + github = "onnimonni"; + githubId = 5691777; + name = "Onni Hakala"; + }; onny = { email = "onny@project-insanity.org"; github = "onny"; @@ -20386,6 +20392,11 @@ githubId = 4196789; name = "Nathan Ringo"; }; + remko = { + github = "remko"; + githubId = 12300; + name = "Remko Tronçon"; + }; remyvv = { name = "Remy van Velthuijsen"; email = "remy@remysplace.de"; diff --git a/pkgs/by-name/ag/age-plugin-se/package.nix b/pkgs/by-name/ag/age-plugin-se/package.nix new file mode 100644 index 000000000000..1be525dfd59d --- /dev/null +++ b/pkgs/by-name/ag/age-plugin-se/package.nix @@ -0,0 +1,63 @@ +{ + lib, + fetchFromGitHub, + swiftPackages, + swift, + swiftpm, + nix-update-script, +}: +let + inherit (swiftPackages) stdenv; +in +stdenv.mkDerivation (finalAttrs: { + pname = "age-plugin-se"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "remko"; + repo = "age-plugin-se"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sg73DzlW4aXNbIIePZox4JkF10OfsMtPw0q/0DWwgDk="; + }; + + nativeBuildInputs = [ + swift + swiftpm + ]; + + postPatch = + let + swift-crypto = fetchFromGitHub { + owner = "apple"; + repo = "swift-crypto"; + # FIXME: Update to a newer version once https://github.com/NixOS/nixpkgs/issues/343210 is fixed + # This is the last version to support swift tools 5.8 which is newest version supported by nixpkgs: + # https://github.com/apple/swift-crypto/commit/35703579f63c2518fc929a1ce49805ba6134137c + tag = "3.7.1"; + hash = "sha256-zxmHxTryAezgqU5qjXlFFThJlfUsPxb1KRBan4DSm9A="; + }; + in + '' + ln -s ${swift-crypto} swift-crypto + substituteInPlace Package.swift --replace-fail 'url: "https://github.com/apple/swift-crypto.git"' 'path: "./swift-crypto"), //' + ''; + + makeFlags = [ + "PREFIX=$(out)" + "RELEASE=1" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Age plugin for Apple's Secure Enclave"; + homepage = "https://github.com/remko/age-plugin-se/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + onnimonni + remko + ]; + mainProgram = "age-plugin-se"; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ag/age/package.nix b/pkgs/by-name/ag/age/package.nix index 5041f3ba66b5..bccae445b5ca 100644 --- a/pkgs/by-name/ag/age/package.nix +++ b/pkgs/by-name/ag/age/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, installShellFiles, age-plugin-tpm, + age-plugin-se, age-plugin-sss, age-plugin-ledger, age-plugin-yubikey, @@ -59,6 +60,7 @@ buildGoModule (final: { passthru.plugins = { inherit age-plugin-tpm + age-plugin-se age-plugin-sss age-plugin-ledger age-plugin-yubikey From ebd02c0cb50878a9ee94b12086a2d67bb43bafae Mon Sep 17 00:00:00 2001 From: GueLaKais Date: Thu, 10 Apr 2025 11:41:29 +0200 Subject: [PATCH 396/449] python313Packages.colcon-notification: init at 0.3.0 --- .../colcon-notification/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/colcon-notification/default.nix diff --git a/pkgs/development/python-modules/colcon-notification/default.nix b/pkgs/development/python-modules/colcon-notification/default.nix new file mode 100644 index 000000000000..688348b52857 --- /dev/null +++ b/pkgs/development/python-modules/colcon-notification/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + colcon, + notify2, + pytestCheckHook, + scspell, + setuptools, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "colcon-notification"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "colcon"; + repo = "colcon-notification"; + tag = version; + hash = "sha256-78LruNk3KlHFgwujSbnbkjC24IN6jGnfRN+qdjvZh+k="; + }; + build-system = [ setuptools ]; + dependencies = [ + colcon + notify2 + ]; + + nativeCheckInputs = [ + pytestCheckHook + scspell + writableTmpDirAsHomeHook + ]; + + pythonImportsCheck = [ + "colcon_notification" + ]; + + disabledTestPaths = [ + # Linting/formatting tests are not relevant and would require extra dependencies + "test/test_flake8.py" + ]; + + meta = { + description = "Extension for colcon-core to provide status notifications"; + homepage = "https://github.com/colcon/colcon-notification"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ guelakais ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8cd8cf40b74..b158c2b21768 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2667,6 +2667,8 @@ self: super: with self; { colcon-defaults = callPackage ../development/python-modules/colcon-defaults { }; + colcon-notification = callPackage ../development/python-modules/colcon-notification { }; + collections-extended = callPackage ../development/python-modules/collections-extended { }; collidoscope = callPackage ../development/python-modules/collidoscope { }; From 71589f934d6119139fd348376ddf105262c178c1 Mon Sep 17 00:00:00 2001 From: misilelab Date: Wed, 23 Apr 2025 23:29:15 +0900 Subject: [PATCH 397/449] fzf: 0.61.2 -> 0.61.3 https://github.com/junegunn/fzf/releases/tag/v0.61.3 Signed-off-by: misilelab --- pkgs/by-name/fz/fzf/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index da1181ce8be1..a2cbccaf403f 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.61.2"; + version = "0.61.3"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = "v${version}"; - hash = "sha256-k5yxsD7hTvinVYDOJb6rmI7ppkVW09dOivD8028Onxk="; + hash = "sha256-J/udSravvLZAStYDhMRh8KCD9ae8WH6ELtKXiWlWJ+8="; }; vendorHash = "sha256-WcrJfvY3GZLDuRr2PZR1ooNPJ6FQ4S3RvUc2+zePw5w="; From 78d7406d6242ad102cf3ef18a26c307d1e4d2478 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 23 Apr 2025 17:30:58 +0300 Subject: [PATCH 398/449] notion: fix build failure --- pkgs/by-name/no/notion/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix index ed09967977b0..6b76b509ca75 100644 --- a/pkgs/by-name/no/notion/package.nix +++ b/pkgs/by-name/no/notion/package.nix @@ -19,7 +19,6 @@ xmessage, xterm, }: - stdenv.mkDerivation (finalAttrs: { pname = "notion"; version = "4.0.2"; @@ -31,8 +30,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-u5KoTI+OcnQu9m8/Lmsmzr8lEk9tulSE7RRFhj1oXJM="; }; - # error: 'PATH_MAX' undeclared postPatch = '' + # Fix build failure due missing headers + sed -i '1i#define _POSIX_C_SOURCE 200809L' mod_notionflux/notionflux/notionflux.c + sed -i '2i#include ' mod_notionflux/notionflux/notionflux.c + sed -i '3i#include ' mod_notionflux/notionflux/notionflux.c + + # error: 'PATH_MAX' undeclared sed 1i'#include ' -i mod_notionflux/notionflux/notionflux.c ''; From ccb369af5797a22e2795e4d355a2a241139ee4f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 14:32:52 +0000 Subject: [PATCH 399/449] libmsquic: 2.4.8 -> 2.4.9 --- pkgs/by-name/li/libmsquic/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix index f8e38afd0b2f..8e81434c8b4d 100644 --- a/pkgs/by-name/li/libmsquic/package.nix +++ b/pkgs/by-name/li/libmsquic/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmsquic"; - version = "2.4.8"; + version = "2.4.9"; src = fetchFromGitHub { owner = "microsoft"; repo = "msquic"; tag = "v${finalAttrs.version}"; - hash = "sha256-cgLrTcoa77XuVsMBvOWw9oKoNtD1ihJM553YpZ+GzQQ="; + hash = "sha256-XcqSM4Kt6YuLsbqYcMd+g4pfBjoMMfX9xA85fWQhcck="; fetchSubmodules = true; }; From f741578bafe8e1285b1637193a0c2b3de371aa33 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 23 Apr 2025 17:39:54 +0300 Subject: [PATCH 400/449] notion: 4.0.2 -> 4.0.3 --- pkgs/by-name/no/notion/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix index 6b76b509ca75..9e4d70eb6ac7 100644 --- a/pkgs/by-name/no/notion/package.nix +++ b/pkgs/by-name/no/notion/package.nix @@ -21,13 +21,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "notion"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "raboof"; repo = "notion"; - rev = finalAttrs.version; - hash = "sha256-u5KoTI+OcnQu9m8/Lmsmzr8lEk9tulSE7RRFhj1oXJM="; + tag = finalAttrs.version; + hash = "sha256-Ll4thDS8fHxkm2IuGjePPVPyPPrz7yDzpKVloFuk/yE="; }; postPatch = '' From ea909ef08ee059f6cfbfa7e39d00326dbeabd91b Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 23 Apr 2025 17:40:29 +0300 Subject: [PATCH 401/449] notion: add NotAShelf to maintainers --- pkgs/by-name/no/notion/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix index 9e4d70eb6ac7..47621d626d88 100644 --- a/pkgs/by-name/no/notion/package.nix +++ b/pkgs/by-name/no/notion/package.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ jfb raboof + NotAShelf ]; platforms = lib.platforms.linux; }; From d34a8934bfc587da384d981d442d6c89bb279bb3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 16:46:26 +0200 Subject: [PATCH 402/449] python312Packages.devito: 4.8.14 -> 4.8.15 Diff: https://github.com/devitocodes/devito/compare/refs/tags/v4.8.14...refs/tags/v4.8.15 Changelog: https://github.com/devitocodes/devito/releases/tag/v4.8.15 --- pkgs/development/python-modules/devito/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devito/default.nix b/pkgs/development/python-modules/devito/default.nix index 988e2a5c7c7c..4275f28f8532 100644 --- a/pkgs/development/python-modules/devito/default.nix +++ b/pkgs/development/python-modules/devito/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "devito"; - version = "4.8.14"; + version = "4.8.15"; pyproject = true; src = fetchFromGitHub { owner = "devitocodes"; repo = "devito"; tag = "v${version}"; - hash = "sha256-NM60H8Fx0pe4JEF7K8A+1i1MbxKhgab5cGcCD8wl9l8="; + hash = "sha256-Eb8ndWtc8TxQGO/7BCa+gU/3SUVPaOvZQBtj7YHT3PA="; }; pythonRemoveDeps = [ "pip" ]; From d965f09a174ed87611ec186bb486e17b5a5506b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 14:58:30 +0000 Subject: [PATCH 403/449] moar: 1.31.4 -> 1.31.5 --- pkgs/by-name/mo/moar/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/moar/package.nix b/pkgs/by-name/mo/moar/package.nix index 2a79dcb2678b..cbac530d7a6d 100644 --- a/pkgs/by-name/mo/moar/package.nix +++ b/pkgs/by-name/mo/moar/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "moar"; - version = "1.31.4"; + version = "1.31.5"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-28rD8NYuvfNoBtegGXBuoa5qb3f1eYilkmE4ykIeHTU="; + hash = "sha256-o3vPC8P3yu3i0B/+BsIOFWfS2cWNFNYz4Ae0Z8L2TvE="; }; vendorHash = "sha256-J9u7LxzXk4npRyymmMKyN2ZTmhT4WwKjy0X5ITcHtoE="; From c4a7273c3962197ed2f58871a626745a30525930 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 15:05:51 +0000 Subject: [PATCH 404/449] kube-bench: 0.10.4 -> 0.10.5 --- pkgs/by-name/ku/kube-bench/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix index 6941c8dafe24..60faa6132cfd 100644 --- a/pkgs/by-name/ku/kube-bench/package.nix +++ b/pkgs/by-name/ku/kube-bench/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; tag = "v${version}"; - hash = "sha256-BlznHX8iUFv9knFlv80Ac6SADfGtnB2F5atG8yfKQ0E="; + hash = "sha256-SI7rkJdl54e6b+zZEsj7CIU0wheDRcrAmCLoNWr7O8E="; }; - vendorHash = "sha256-dO4rJ7pNVtz8ZZlO1vEHQU3sIMEy/qM30rlDvsfuuso="; + vendorHash = "sha256-BB7DHACKELwvquOwmBSXl1kwKw43mNnpp5yY33wwdVo="; nativeBuildInputs = [ installShellFiles ]; From 800b5d3d66d9a99ca7765f0d2562040d50991455 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 15:14:33 +0000 Subject: [PATCH 405/449] dependabot-cli: 1.62.1 -> 1.62.2 --- pkgs/by-name/de/dependabot-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index 9ad93c9d4cfa..d4c61789e782 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -11,7 +11,7 @@ }: let pname = "dependabot-cli"; - version = "1.62.1"; + version = "1.62.2"; # vv Also update this vv tag = "nixpkgs-dependabot-cli-${version}"; @@ -45,7 +45,7 @@ buildGoModule { owner = "dependabot"; repo = "cli"; rev = "v${version}"; - hash = "sha256-BD95YCPKoU/crlBPWYejI6kydpXhmYNAgtMEGi+iRsY="; + hash = "sha256-LtmCh3RmfKP+9x5pJX7hWLR3EWaWWQ2Vn7Th9fUHsWY="; }; vendorHash = "sha256-0Q2+UK8giWL4cYJwfZ8gAAAEIYSqjadnUWJghVeIPjQ="; From 358fb704bac4b6459383fdf8c28d0ad3b4283c31 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Wed, 23 Apr 2025 15:32:59 +0200 Subject: [PATCH 406/449] nodejs_18: fix aliases --- pkgs/top-level/aliases.nix | 3 +++ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 64052c41fd93..af47cb7300fd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1287,6 +1287,9 @@ mapAliases { nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17 + nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23 + nodejs-slim_18 = nodejs_18; # Added 2025-04-23 + corepack_18 = nodejs_18; # Added 2025-04-23 nodejs-18_x = nodejs_18; # Added 2022-11-06 nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06 nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c61658d858f..ce35fc6c5a5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4165,10 +4165,6 @@ with pkgs; nodejs-slim = nodejs-slim_22; corepack = hiPrio corepack_22; - nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; - nodejs-slim_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; - corepack_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; - nodejs_20 = callPackage ../development/web/nodejs/v20.nix { }; nodejs-slim_20 = callPackage ../development/web/nodejs/v20.nix { enableNpm = false; }; corepack_20 = hiPrio (callPackage ../development/web/nodejs/corepack.nix { nodejs = nodejs_20; }); From e4c1dd71baf134ab416015ff675d55a03c9fdc80 Mon Sep 17 00:00:00 2001 From: silvanshade Date: Wed, 23 Apr 2025 09:23:50 -0600 Subject: [PATCH 407/449] libblake3: 1.8.0 -> 1.8.2 (fixed nix build) --- pkgs/by-name/li/libblake3/package.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/li/libblake3/package.nix b/pkgs/by-name/li/libblake3/package.nix index 59306559958e..81330f818f79 100644 --- a/pkgs/by-name/li/libblake3/package.nix +++ b/pkgs/by-name/li/libblake3/package.nix @@ -5,30 +5,25 @@ fetchFromGitHub, tbb_2021_11, - # Until we have a release with - # https://github.com/BLAKE3-team/BLAKE3/pull/461 and similar, or those - # PRs are patched onto this current release. Even then, I think we - # still need to disable for MinGW build because - # https://github.com/BLAKE3-team/BLAKE3/issues/467 - useTBB ? false, + useTBB ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "libblake3"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; tag = finalAttrs.version; - hash = "sha256-Krh0yVNZKL6Mb0McqWTIMNownsgM3MUEX2IP+F/fu+k="; + hash = "sha256-IABVErXWYQFXZcwsFKfQhm3ox7UZUcW5uzVrGwsSp94="; }; sourceRoot = finalAttrs.src.name + "/c"; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals useTBB [ + propagatedBuildInputs = lib.optionals useTBB [ # 2022.0 crashes on macOS at the moment tbb_2021_11 ]; From 224f27a26566db8faef9265bd06e4895e30d33cd Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Tue, 22 Apr 2025 20:35:35 +0200 Subject: [PATCH 408/449] furnace: fix deps after SDL2 migration --- pkgs/by-name/fu/furnace/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 286a7e51dc4f..1ca6761b33c2 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -12,6 +12,7 @@ freetype, libsndfile, libX11, + libGL, rtmidi, SDL2, zlib, @@ -63,16 +64,19 @@ stdenv.mkDerivation (finalAttrs: { libsndfile rtmidi SDL2 - libX11 zlib portaudio ] + ++ lib.optionals withGL [ + libGL + ] ++ lib.optionals withJACK [ libjack2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # portaudio pkg-config is pulling this in as a link dependency, not set in propagatedBuildInputs alsa-lib + libX11 ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From 09f3fac746d7436a147abf415ef8c108115ed163 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 15:47:22 +0000 Subject: [PATCH 409/449] vscode-extensions.ms-pyright.pyright: 1.1.399 -> 1.1.400 --- .../editors/vscode/extensions/ms-pyright.pyright/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix index 41a721af1bc3..f2fd32afd155 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-pyright"; name = "pyright"; - version = "1.1.399"; - hash = "sha256-dKkx01NVbg0f6+LkZPs1/djqJjOAY/BjROEr4455Shc="; + version = "1.1.400"; + hash = "sha256-Twpsxtr6fUSDgCfMYFJF3asgaKLB/axIvOZRItuFyig="; }; meta = { From 8cea6c8f50479de7aeec1178646e0434c8d61001 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 15:48:24 +0000 Subject: [PATCH 410/449] vpl-gpu-rt: 25.2.0 -> 25.2.1 --- pkgs/by-name/vp/vpl-gpu-rt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index d22026b9ec9d..7bfa075c2803 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "vpl-gpu-rt"; - version = "25.2.0"; + version = "25.2.1"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${version}"; - hash = "sha256-fQAnyUh9xuWsR8+yLtDdalJhW6kmBj1GBF20UZM7M6w="; + hash = "sha256-K6w5A0LbQDTKM5y5AzZ/Hr/FwQLZqHov0tiJHbzUE4w="; }; nativeBuildInputs = [ From 9fc2bfda831466bbc62182f2095f5773eb51342d Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 23 Apr 2025 16:47:04 +0100 Subject: [PATCH 411/449] emacs: disable native compilation on Darwin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The duplicate `rpath` issue prevents running Emacs on macOS 15.4 and also breaks the build on that platform, blocking the channels. From asking around, it seems like native compilation shouldn’t have such a huge impact on performance as to not make this worth it as a temporary hack to unblock security fixes and give us more time to sort out a proper solution. --- pkgs/applications/editors/emacs/make-emacs.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index b8156c5b3bcc..4f6fbd9a55c5 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -66,7 +66,11 @@ zlib, # Boolean flags - withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, + + # FIXME: Native compilation breaks build and runtime on macOS 15.4; + # see . + withNativeCompilation ? + stdenv.buildPlatform.canExecute stdenv.hostPlatform && !stdenv.hostPlatform.isDarwin, noGui ? false, srcRepo ? true, withAcl ? false, From 25499d19550e3828177e893292b79be8bb4d4fa6 Mon Sep 17 00:00:00 2001 From: myypo Date: Wed, 23 Apr 2025 19:26:27 +0300 Subject: [PATCH 412/449] postgres-lsp: 0.5.0 -> 0.6.0 --- pkgs/by-name/po/postgres-lsp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix index be8814b96a81..20d486ca3cd7 100644 --- a/pkgs/by-name/po/postgres-lsp/package.nix +++ b/pkgs/by-name/po/postgres-lsp/package.nix @@ -5,13 +5,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "postgres-lsp"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "supabase-community"; repo = "postgres-language-server"; tag = finalAttrs.version; - hash = "sha256-JRCuqJvC+OBdYe2JORwOfghr7smVLsROwrhk5H+SSkc="; + hash = "sha256-PL8irQ3R8m//BbtTjODBrBcG/bAdK+t6GZGAj0PkJwE="; fetchSubmodules = true; }; From cf0af74237630bbcff00f1f881a6288dea8f21c4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 18:19:55 +0200 Subject: [PATCH 413/449] python312Packages.mlcroissant: init at 1.0.17 --- .../python-modules/mlcroissant/default.nix | 97 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 99 insertions(+) create mode 100644 pkgs/development/python-modules/mlcroissant/default.nix diff --git a/pkgs/development/python-modules/mlcroissant/default.nix b/pkgs/development/python-modules/mlcroissant/default.nix new file mode 100644 index 000000000000..7711374c5370 --- /dev/null +++ b/pkgs/development/python-modules/mlcroissant/default.nix @@ -0,0 +1,97 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + absl-py, + etils, + jsonpath-rw, + networkx, + pandas, + pandas-stubs, + python-dateutil, + rdflib, + requests, + scipy, + tqdm, + + # tests + apache-beam, + gitpython, + pillow, + pytestCheckHook, + pyyaml, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "mlcroissant"; + version = "1.0.17"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mlcommons"; + repo = "croissant"; + tag = "v${version}"; + hash = "sha256-jiyr8x+YRSsRwOVxDPaWemPqglTKVb5jg4rRzUXd3BE="; + }; + + sourceRoot = "${src.name}/python/mlcroissant"; + + build-system = [ + setuptools + ]; + + dependencies = [ + absl-py + etils + jsonpath-rw + networkx + pandas + pandas-stubs + python-dateutil + rdflib + requests + scipy + tqdm + ] ++ etils.optional-dependencies.epath; + + pythonImportsCheck = [ "mlcroissant" ]; + + nativeCheckInputs = [ + apache-beam + gitpython + pillow + pytestCheckHook + pyyaml + writableTmpDirAsHomeHook + ]; + + disabledTests = [ + # Requires internet access + "test_hermetic_loading_1_1" + "test_load_from_huggingface" + "test_nonhermetic_loading" + "test_nonhermetic_loading_1_0" + + # AssertionError: assert {'records/aud...t32), 22050)'} == {'records/aud...t32), 22050)'} + "test_hermetic_loading" + + # AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs' + "test_beam_hermetic_loading" + ]; + + meta = { + description = "High-level format for machine learning datasets that brings together four rich layers"; + homepage = "https://github.com/mlcommons/croissant"; + changelog = "https://github.com/mlcommons/croissant/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + platforms = lib.platforms.all; + mainProgram = "mlcroissant"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b158c2b21768..9fa4de0a4e78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8902,6 +8902,8 @@ self: super: with self; { ml-dtypes = callPackage ../development/python-modules/ml-dtypes { }; + mlcroissant = callPackage ../development/python-modules/mlcroissant { }; + mlflow = callPackage ../development/python-modules/mlflow { }; mlrose = callPackage ../development/python-modules/mlrose { }; From fbb2b72e8f46d43b0954b7a975377bcc20a811df Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 23 Apr 2025 18:39:01 +0200 Subject: [PATCH 414/449] nixos-rebuild: fix typo --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index bd314e86a39d..55759722fec5 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -864,14 +864,14 @@ if [ -z "$rollback" ]; then value = import \"$(realpath $buildFile)\"; set = if builtins.isFunction value then value {} else value; in set.${attr:+$attr.}config.system.build.images.$imageVariant.v.passthru.filePath" \ - "${extraBuildFlags[@]}" + "${extraBuildFlags[@]}" \ | jq -r . )" elif [[ -z $flake ]]; then imageName="$( runCmd nix-instantiate --eval --strict --json --expr \ "with import {}; config.system.build.images.$imageVariant.passthru.filePath" \ - "${extraBuildFlags[@]}" + "${extraBuildFlags[@]}" \ | jq -r . )" else From 4880d3ae43d1c813c476ee70766a1132d0a4d3df Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Wed, 23 Apr 2025 18:41:21 +0200 Subject: [PATCH 415/449] gotosocial: 0.18.3 -> 0.19.0 Release notes: https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.19.0 Full changelog: https://github.com/superseriousbusiness/gotosocial/compare/v0.18.3...v0.19.0 --- pkgs/by-name/go/gotosocial/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix index 6a6f48c67f6d..639d0718a22b 100644 --- a/pkgs/by-name/go/gotosocial/package.nix +++ b/pkgs/by-name/go/gotosocial/package.nix @@ -9,11 +9,11 @@ let owner = "superseriousbusiness"; repo = "gotosocial"; - version = "0.18.3"; + version = "0.19.0"; web-assets = fetchurl { url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz"; - hash = "sha256-60aSiWHHHDxZggreqTVHip2Ld/PyN9T4k+NGjX/ONQc="; + hash = "sha256-Ba497VKK30MWcLlR4CDDUrFZKWf/UXiSgeDr/f7fFkc="; }; in buildGoModule rec { @@ -23,7 +23,7 @@ buildGoModule rec { src = fetchFromGitHub { inherit owner repo; tag = "v${version}"; - hash = "sha256-fn3QrfTrKYWABRMF3imyoeVEpARl13fcq6Fu2GwsrcE="; + hash = "sha256-ioIsa2L1w4z1b7tWFhHScmPwRRq0WLngIdm4r2eCveM="; }; vendorHash = null; From 8186ecd283bf2afab1b887ac196b4c7394fcfa60 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 16 Oct 2024 09:33:34 +0200 Subject: [PATCH 416/449] python311Packages.tensorflow-metadata: cleanup --- .../python-modules/tensorflow-metadata/build.patch | 2 +- .../python-modules/tensorflow-metadata/default.nix | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/build.patch b/pkgs/development/python-modules/tensorflow-metadata/build.patch index 75a774535947..14469d1f60fa 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/build.patch +++ b/pkgs/development/python-modules/tensorflow-metadata/build.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index 7a09b2f..94c5aa6 100644 +index 30ac370..a05812d 100644 --- a/setup.py +++ b/setup.py @@ -141,8 +141,4 @@ setup( diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index b961578c8810..c1ccd3c3befd 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -45,11 +45,16 @@ buildPythonPackage rec { # has no tests doCheck = false; - pythonImportsCheck = [ "tensorflow_metadata" ]; + pythonImportsCheck = [ + "tensorflow_metadata" + "tensorflow_metadata.proto.v0" + "google.protobuf.runtime_version" + ]; meta = { description = "Standard representations for metadata that are useful when training machine learning models with TensorFlow"; homepage = "https://github.com/tensorflow/metadata"; + changelog = "https://github.com/tensorflow/metadata/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ndl ]; }; From 28177221cb1e24acdce4435aa5b45b4706c3f43d Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 12 Mar 2025 17:44:16 +0100 Subject: [PATCH 417/449] python312Packages.array-record: 0.5.0 -> 0.7.1 --- .../python-modules/array-record/default.nix | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/array-record/default.nix b/pkgs/development/python-modules/array-record/default.nix index 83385b535429..e151d2aa071e 100644 --- a/pkgs/development/python-modules/array-record/default.nix +++ b/pkgs/development/python-modules/array-record/default.nix @@ -7,18 +7,14 @@ fetchPypi, absl-py, etils, - importlib-resources, - typing-extensions, - zipp, }: buildPythonPackage rec { pname = "array-record"; - version = "0.5.0"; + version = "0.7.1"; format = "wheel"; - # As of 2023-10-31, PyPI includes wheels for Python 3.9, 3.10, and 3.11. - disabled = pythonOlder "3.9" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.10" || pythonAtLeast "3.13"; src = let @@ -33,28 +29,25 @@ buildPythonPackage rec { platform = "manylinux_2_17_x86_64.manylinux2014_x86_64"; hash = { - cp39 = "sha256-BzMOVue7E1S1+5+XTcPELko81ujc9MbmqLhNsU7pqO0="; - cp310 = "sha256-eUD9pQu9GsbV8MPD1MiF3Ihr+zYioSOo6P15hYIwPYo="; - cp311 = "sha256-rAmkI3EIZPYiXrxFowfDC0Gf3kRw0uX0i6Kx6Zu+hNM="; + cp310 = "sha256-JDaj1iJy1BQ7fHjmCbGQkNqG5rIRuwTwENbanM9a8hg="; + cp311 = "sha256-QVynMK9t0BnEtgdfbJ5T3s7N02i0XD2siUSRxKtrI+M="; + cp312 = "sha256-xJJGm6kLQ2/TzVYTrBtQ1Hqky1odHfbhe/g+PSSYt1c="; } .${pyShortVersion} or (throw "${pname} is missing hash for ${pyShortVersion}"); }; - propagatedBuildInputs = [ + dependencies = [ absl-py etils - importlib-resources - typing-extensions - zipp - ]; + ] ++ etils.optional-dependencies.epath; pythonImportsCheck = [ "array_record" ]; - meta = with lib; { + meta = { description = "ArrayRecord is a new file format derived from Riegeli, achieving a new frontier of IO efficiency"; homepage = "https://github.com/google/array_record"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = [ "x86_64-linux" ]; }; } From 16ed352de88c86f090aaf1202f41891bc26129dc Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 5 Jun 2024 11:01:09 +0200 Subject: [PATCH 418/449] python311Packages.tensorflow-datasets: 4.9.7 -> 4.9.8 Changelog: https://github.com/tensorflow/datasets/releases/tag/v4.9.8 Diff: https://github.com/tensorflow/datasets/compare/v4.9.7...v4.9.8 --- .../tensorflow-datasets/corruptions.patch | 22 ----- .../tensorflow-datasets/default.nix | 91 ++++++++++++------- 2 files changed, 58 insertions(+), 55 deletions(-) delete mode 100644 pkgs/development/python-modules/tensorflow-datasets/corruptions.patch diff --git a/pkgs/development/python-modules/tensorflow-datasets/corruptions.patch b/pkgs/development/python-modules/tensorflow-datasets/corruptions.patch deleted file mode 100644 index 71e5da5e11bb..000000000000 --- a/pkgs/development/python-modules/tensorflow-datasets/corruptions.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/tensorflow_datasets/image_classification/corruptions.py b/tensorflow_datasets/image_classification/corruptions.py -index 066c4460..cb9a6667 100644 ---- a/tensorflow_datasets/image_classification/corruptions.py -+++ b/tensorflow_datasets/image_classification/corruptions.py -@@ -35,7 +35,7 @@ FROST_FILENAMES = [] - - - def _imagemagick_bin(): -- return 'imagemagick' # pylint: disable=unreachable -+ return 'convert' # pylint: disable=unreachable - - - # /////////////// Corruption Helpers /////////////// -@@ -675,7 +675,7 @@ def spatter(x, severity=1): - # ker = np.array([[-1,-2,-3],[-2,0,0],[-3,0,1]], dtype=np.float32) - # ker -= np.mean(ker) - ker = np.array([[-2, -1, 0], [-1, 1, 1], [0, 1, 2]]) -- dist = cv2.filter2D(dist, cv2.CVX_8U, ker) -+ dist = cv2.filter2D(dist, cv2.CV_8U, ker) - dist = cv2.blur(dist, (3, 3)).astype(np.float32) - - m = cv2.cvtColor(liquid_layer * dist, cv2.COLOR_GRAY2BGRA) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index efe19803d25a..625619e9bd0a 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -1,81 +1,94 @@ { - apache-beam, - array-record, - attrs, - beautifulsoup4, + lib, buildPythonPackage, - click, - datasets, + fetchFromGitHub, + fetchpatch, + + # dependencies + array-record, dill, dm-tree, - fetchFromGitHub, - ffmpeg, future, - imagemagick, + immutabledict, importlib-resources, + numpy, + promise, + protobuf, + psutil, + requests, + simple-parsing, + six, + tensorflow-metadata, + termcolor, + tqdm, + + # tests + apache-beam, + beautifulsoup4, + click, + datasets, + ffmpeg, + imagemagick, jax, jaxlib, jinja2, langdetect, - lib, lxml, matplotlib, + mlcroissant, mwparserfromhell, mwxml, networkx, nltk, - numpy, opencv4, pandas, pillow, - promise, - protobuf, - psutil, pycocotools, pydub, pytest-xdist, pytestCheckHook, - requests, scikit-image, scipy, - six, + sortedcontainers, tensorflow, - tensorflow-metadata, - termcolor, tifffile, - tqdm, zarr, }: buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.9.7"; - format = "setuptools"; + version = "4.9.8"; + pyproject = true; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; tag = "v${version}"; - hash = "sha256-pnut5z3rEYIOOhsQT6uVjPdy+SqftKptSQMwxbMXoKA="; + hash = "sha256-nqveZ+8b0f5sGIn6WufKeA37yEsZjzhCIbCfwMZ9JOM="; }; patches = [ - # addresses https://github.com/tensorflow/datasets/issues/3673 - ./corruptions.patch + # mlmlcroissant uses encoding_formats, not encoding_formats. + # Backport https://github.com/tensorflow/datasets/pull/11037 until released. + (fetchpatch { + url = "https://github.com/tensorflow/datasets/commit/92cbcff725a1036569a515cc3356aa8480740451.patch"; + hash = "sha256-2hnMvQP83+eAJllce19aHujcoWQzUz3+LsasWCo4BtM="; + }) ]; - propagatedBuildInputs = [ + dependencies = [ array-record - attrs dill dm-tree future + immutabledict importlib-resources numpy promise protobuf psutil requests + simple-parsing six tensorflow-metadata termcolor @@ -97,6 +110,7 @@ buildPythonPackage rec { langdetect lxml matplotlib + mlcroissant mwparserfromhell mwxml networkx @@ -110,11 +124,18 @@ buildPythonPackage rec { pytestCheckHook scikit-image scipy + sortedcontainers tensorflow tifffile zarr ]; + pytestFlagsArray = [ + # AttributeError: 'NoneType' object has no attribute 'Table' + "--deselect=tensorflow_datasets/core/file_adapters_test.py::test_read_write" + "--deselect=tensorflow_datasets/text/c4_wsrs/c4_wsrs_test.py::C4WSRSTest" + ]; + disabledTestPaths = [ # Sandbox violations: network access, filesystem write attempts outside of build dir, ... "tensorflow_datasets/core/dataset_builder_test.py" @@ -126,6 +147,7 @@ buildPythonPackage rec { "tensorflow_datasets/import_without_tf_test.py" "tensorflow_datasets/proto/build_tf_proto_test.py" "tensorflow_datasets/scripts/cli/build_test.py" + "tensorflow_datasets/datasets/imagenet2012_corrupted/imagenet2012_corrupted_dataset_builder_test.py" # Requires `pretty_midi` which is not packaged in `nixpkgs`. "tensorflow_datasets/audio/groove.py" @@ -143,14 +165,16 @@ buildPythonPackage rec { # Requires `gcld3` and `pretty_midi` which are not packaged in `nixpkgs`. "tensorflow_datasets/core/lazy_imports_lib_test.py" + # AttributeError: 'NoneType' object has no attribute 'Table' + "tensorflow_datasets/core/dataset_builder_beam_test.py" + "tensorflow_datasets/core/dataset_builders/adhoc_builder_test.py" + "tensorflow_datasets/core/split_builder_test.py" + "tensorflow_datasets/core/writer_test.py" + # Requires `tensorflow_io` which is not packaged in `nixpkgs`. "tensorflow_datasets/core/features/audio_feature_test.py" "tensorflow_datasets/image/lsun_test.py" - # Requires `envlogger` which is not packaged in `nixpkgs`. - "tensorflow_datasets/rlds/locomotion/locomotion_test.py" - "tensorflow_datasets/rlds/robosuite_panda_pick_place_can/robosuite_panda_pick_place_can_test.py" - # Fails with `TypeError: Constant constructor takes either 0 or 2 positional arguments` # deep in TF AutoGraph. Doesn't reproduce in Docker with Ubuntu 22.04 => might be related # to the differences in some of the dependencies? @@ -171,10 +195,11 @@ buildPythonPackage rec { "tensorflow_datasets/text/c4_utils_test.py" ]; - meta = with lib; { + meta = { description = "Library of datasets ready to use with TensorFlow"; homepage = "https://www.tensorflow.org/datasets/overview"; - license = licenses.asl20; - maintainers = with maintainers; [ ndl ]; + changelog = "https://github.com/tensorflow/datasets/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ndl ]; }; } From 0c98d718145877e4c9a454f6086b4bd00ac46ba0 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Wed, 23 Apr 2025 09:59:46 +0200 Subject: [PATCH 419/449] nu_scripts: 0-unstable-2025-04-14 -> 0-unstable-2025-04-23 --- pkgs/by-name/nu/nu_scripts/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix index ba5531df44c2..3c96e4592374 100644 --- a/pkgs/by-name/nu/nu_scripts/package.nix +++ b/pkgs/by-name/nu/nu_scripts/package.nix @@ -5,15 +5,15 @@ unstableGitUpdater, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "nu_scripts"; - version = "0-unstable-2025-04-14"; + version = "0-unstable-2025-04-23"; src = fetchFromGitHub { owner = "nushell"; - repo = pname; - rev = "c639113adebdf05f25e0e33b833798a6b0c624d4"; - hash = "sha256-aeYe642070aAvhIES9apQAC/vyj7pnXiQbn7QTYVVlQ="; + repo = "nu_scripts"; + rev = "9560df937090b640ed04aa270641a77b8d5f991c"; + hash = "sha256-Zw6eIo9BTn6/4qd03Jca3Kp3KZwHJEwEoUcnuS3Z9NM="; }; installPhase = '' @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Place to share Nushell scripts with each other"; homepage = "https://github.com/nushell/nu_scripts"; - license = lib.licenses.free; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.CardboardTurkey ]; From 31f64ab02d5a386e46a875ab7dea151988797ead Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Wed, 23 Apr 2025 13:02:21 +0200 Subject: [PATCH 420/449] monit: fix hash of 5.35.0 closes #400936 --- pkgs/by-name/mo/monit/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mo/monit/package.nix b/pkgs/by-name/mo/monit/package.nix index b0f3cfbba160..f0a2e64e1048 100644 --- a/pkgs/by-name/mo/monit/package.nix +++ b/pkgs/by-name/mo/monit/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://mmonit.com/monit/dist/monit-${version}.tar.gz"; - sha256 = "sha256-l2DDqihhH8FDhmZUCs4A1XKk8pdCo6VG1lYodEr19HQ="; + hash = "sha256-6VIqeLlU6u6TPEgQ23uZo2+UHgIsorAVcBhdTOQdjxI="; }; nativeBuildInputs = From e9ce1c21e7fa055d8aa2e096a11bb9b993b81743 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 19:22:34 +0200 Subject: [PATCH 421/449] python312Packages.dm-sonnet: cleanup, fix build --- .../python-modules/dm-sonnet/default.nix | 65 +++++++++++++------ 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 06b01a447843..62cae899b80e 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -1,43 +1,45 @@ { lib, buildPythonPackage, - click, - dm-tree, - docutils, - etils, fetchFromGitHub, - fetchpatch, + + # build-system + setuptools, + + # dependencies + dm-tree, + etils, numpy, - pythonOlder, tabulate, + wrapt, + + # tests + click, + docutils, + keras, + pytestCheckHook, tensorflow, tensorflow-datasets, - wrapt, + tf-keras, }: buildPythonPackage rec { pname = "dm-sonnet"; version = "2.0.2"; - format = "setuptools"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "deepmind"; repo = "sonnet"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-WkloUbqSyPG3cbLG8ktsjdluACkCbUZ7t6rYWst8rs8="; }; - patches = [ - (fetchpatch { - name = "replace-np-bool-with-np-bool_.patch"; - url = "https://github.com/deepmind/sonnet/commit/df5d099d4557a9a81a0eb969e5a81ed917bcd612.patch"; - hash = "sha256-s7abl83osD4wa0ZhqgDyjqQ3gagwGYCdQifwFqhNp34="; - }) + build-system = [ + setuptools ]; - propagatedBuildInputs = [ + dependencies = [ dm-tree etils numpy @@ -52,16 +54,37 @@ buildPythonPackage rec { nativeCheckInputs = [ click docutils + keras + pytestCheckHook tensorflow tensorflow-datasets + tf-keras + ]; + + # ImportError: `keras.optimizers.legacy` is not supported in Keras 3 + preCheck = '' + export TF_USE_LEGACY_KERAS=True + ''; + + disabledTests = [ + # AssertionError: 2 != 0 : 2 doctests failed + "test_doctest_sonnet.functional" + + # AssertionError: Not equal to tolerance + "testComputationAgainstNumPy1" + + # tensorflow.python.framework.errors_impl.InvalidArgumentError: cannot compute MatMul as input #1(zero-based) was expected to be a float tensor but is a half tensor [Op:MatMul] + "testComputationAgainstNumPy0" + "testComputationAgainstNumPy1" ]; pythonImportsCheck = [ "sonnet" ]; - meta = with lib; { + meta = { description = "Library for building neural networks in TensorFlow"; homepage = "https://github.com/deepmind/sonnet"; - license = licenses.asl20; - maintainers = with maintainers; [ onny ]; + changelog = "https://github.com/google-deepmind/sonnet/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ onny ]; }; } From ce207587ab1d53c99f71ba83a347aa8411a66254 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Wed, 23 Apr 2025 19:47:51 +0200 Subject: [PATCH 422/449] nixosTests.noto-fonts: migrate to runTest Part of #386873 --- nixos/tests/all-tests.nix | 2 +- nixos/tests/noto-fonts.nix | 58 +++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 78cc8b6c3d68..e3e2f5763d17 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -948,7 +948,7 @@ in nomad = runTest ./nomad.nix; non-default-filesystems = handleTest ./non-default-filesystems.nix { }; non-switchable-system = runTest ./non-switchable-system.nix; - noto-fonts = handleTest ./noto-fonts.nix { }; + noto-fonts = runTest ./noto-fonts.nix; noto-fonts-cjk-qt-default-weight = handleTest ./noto-fonts-cjk-qt-default-weight.nix { }; novacomd = handleTestOn [ "x86_64-linux" ] ./novacomd.nix { }; npmrc = handleTest ./npmrc.nix { }; diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix index 2d204131dcf9..719ea9f33eac 100644 --- a/nixos/tests/noto-fonts.nix +++ b/nixos/tests/noto-fonts.nix @@ -1,13 +1,14 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "noto-fonts"; - meta.maintainers = with lib.maintainers; [ - nickcao - midchildan - ]; +{ lib, ... }: +{ + name = "noto-fonts"; + meta.maintainers = with lib.maintainers; [ + nickcao + midchildan + ]; - nodes.machine = { + nodes.machine = + { pkgs, ... }: + { imports = [ ./common/x11.nix ]; environment.systemPackages = [ pkgs.gedit ]; fonts = { @@ -36,24 +37,23 @@ import ./make-test-python.nix ( }; }; - testScript = - # extracted from http://www.clagnut.com/blog/2380/ - let - testText = builtins.toFile "test.txt" '' - the quick brown fox jumps over the lazy dog - 視野無限廣,窗外有藍天 - Eĥoŝanĝo ĉiuĵaŭde. - いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす - 다람쥐 헌 쳇바퀴에 타고파 - 中国智造,慧及全球 - ''; - in - '' - machine.wait_for_x() - machine.succeed("gedit ${testText} >&2 &") - machine.wait_for_window(".* - gedit") - machine.sleep(10) - machine.screenshot("screen") + testScript = + # extracted from http://www.clagnut.com/blog/2380/ + let + testText = builtins.toFile "test.txt" '' + the quick brown fox jumps over the lazy dog + 視野無限廣,窗外有藍天 + Eĥoŝanĝo ĉiuĵaŭde. + いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす + 다람쥐 헌 쳇바퀴에 타고파 + 中国智造,慧及全球 ''; - } -) + in + '' + machine.wait_for_x() + machine.succeed("gedit ${testText} >&2 &") + machine.wait_for_window(".* - gedit") + machine.sleep(10) + machine.screenshot("screen") + ''; +} From e69b780ddd91f425e196209f5b9fe0d73748eaa1 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 23 Apr 2025 20:07:29 +0200 Subject: [PATCH 423/449] python312Packages.nanobind: cleanup --- pkgs/development/python-modules/nanobind/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/nanobind/default.nix b/pkgs/development/python-modules/nanobind/default.nix index b551b797c78e..fb8bd35a91fc 100644 --- a/pkgs/development/python-modules/nanobind/default.nix +++ b/pkgs/development/python-modules/nanobind/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, fetchFromGitHub, - pythonOlder, # build-system cmake, @@ -34,12 +33,10 @@ buildPythonPackage rec { owner = "wjakob"; repo = "nanobind"; tag = "v${version}"; - hash = "sha256-ex5svqDp9XJtiNCxu0249ORL6LbG679U6PvKQaWANmE="; fetchSubmodules = true; + hash = "sha256-ex5svqDp9XJtiNCxu0249ORL6LbG679U6PvKQaWANmE="; }; - disabled = pythonOlder "3.8"; - build-system = [ cmake ninja @@ -68,7 +65,7 @@ buildPythonPackage rec { scipy torch ] - ++ lib.optionals (!(builtins.elem stdenv.hostPlatform.system tensorflow-bin.meta.badPlatforms)) [ + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform tensorflow-bin) [ tensorflow-bin jax jaxlib From 194b153c033e818ca58b1848cd405f37624a68d6 Mon Sep 17 00:00:00 2001 From: Shelvacu Date: Mon, 14 Apr 2025 16:26:41 -0700 Subject: [PATCH 424/449] bandcamp-collection-downloader: init at 0-unstable-2024-10-29 (fe8a98d9) --- .../bandcamp-collection-downloader/deps.json | 340 ++++++++++++++++++ .../package.nix | 68 ++++ 2 files changed, 408 insertions(+) create mode 100644 pkgs/by-name/ba/bandcamp-collection-downloader/deps.json create mode 100644 pkgs/by-name/ba/bandcamp-collection-downloader/package.nix diff --git a/pkgs/by-name/ba/bandcamp-collection-downloader/deps.json b/pkgs/by-name/ba/bandcamp-collection-downloader/deps.json new file mode 100644 index 000000000000..719f1aacb4f8 --- /dev/null +++ b/pkgs/by-name/ba/bandcamp-collection-downloader/deps.json @@ -0,0 +1,340 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { + "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", + "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { + "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", + "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", + "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", + "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { + "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", + "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { + "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", + "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", + "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { + "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", + "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", + "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { + "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", + "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { + "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", + "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { + "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", + "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { + "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", + "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" + }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { + "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", + "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" + }, + "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { + "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", + "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { + "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", + "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" + }, + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.21": { + "pom": "sha256-Jk8V5sp1XIU/oPWvEPa9GgHwmLKsDPmOHP05kBF/tjo=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + }, + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, + "com/sun/mail#all/1.6.2": { + "pom": "sha256-S36Dqpt31l4AfpfLUPm4nNt1T6rxZBHl/ZTR49q3brM=" + }, + "com/sun/mail#javax.mail/1.6.2": { + "jar": "sha256-RbUV5xBJRMCeRbnHuxzl3/ZASGN0hS3SsugMw3Ut+hE=", + "pom": "sha256-xCKcBbWDbwAlITY9NDXz0HJmJ0RUi/F+fnreyv5ouf0=" + }, + "info/picocli#picocli/4.6.1": { + "jar": "sha256-Km4DMQ2xSfihHrBYqnjndcIp74FjM8loc3l2LSKDOtY=", + "pom": "sha256-sQOC7VBz9mKP84EayWFEkbHv8wLDz55Cmo81P2w75M8=" + }, + "javax/activation#activation/1.1": { + "jar": "sha256-KIHHnJ1u8BxY5ivuoT6dGsi4uqFvL8GYrW5ndt79zdM=", + "pom": "sha256-1JDlQKEVBLnXFxixyF/vez3mgCNhKQgkU5sHbVj6qKA=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/ini4j#ini4j/0.5.4": { + "jar": "sha256-qtYGNe7lZyVO0p8Y+xjA+eTE2s9RyCKRKCAxg7s14t0=", + "pom": "sha256-XMYUkRJoPvybUbn9k3h307NQPfboBdMHHOTbOb41mY8=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { + "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", + "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { + "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", + "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.0.21": { + "jar": "sha256-2Gv0M4pthBzM37v/LaBb0DpJw9uMP5erhed+AhrQhFs=", + "pom": "sha256-esgfO7B8TWqo+pj/WjmaR6vRzhx4bU8/rZbvKBIL34o=" + }, + "org/jetbrains/kotlin#kotlin-native-prebuilt/2.0.21": { + "pom": "sha256-Gv4wJE4ZR67Wy+01BBrTbFnw6nZK/bxv/56agY7loEE=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { + "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", + "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { + "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", + "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { + "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", + "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { + "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", + "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { + "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", + "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21/all": { + "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg=" + }, + "org/jetbrains/kotlin#kotlin-test-junit5/2.0.21": { + "jar": "sha256-rEfeYZt9h+K/339u7Gpiph0b3AwyV0DfUhhrFBk2cT0=", + "module": "sha256-pJ3WSbaBmpF2wNksgkT2sD6Q4xvXpTO3oJGsud6wleQ=", + "pom": "sha256-rdbbLWF1KU0hNI3eEMyqHeUWNT9uQHp24FNbS1RcJ30=" + }, + "org/jetbrains/kotlin#kotlin-test/2.0.21": { + "jar": "sha256-qJeyjGo+qOyPAO12aUGgwN+ZPX9lkIh1h5ho4IzriYU=", + "module": "sha256-1GaHPese5eDSFPdNDVC5BCGQZV+eUBRW/Qk72SCkL40=", + "pom": "sha256-6jadb0j7+WeUIXBPuf9tTM4mA3iZUKl8pd5bLsH5c4o=" + }, + "org/jetbrains/kotlin#kotlin-test/2.0.21/all": { + "jar": "sha256-2iho+pWj+4814rTjMcouKTIUhnAZZex2a66CD5jgJ3w=" + }, + "org/jetbrains/kotlin/kotlin-native-prebuilt/2.0.21/kotlin-native-prebuilt-2.0.21-linux-x86_64": { + "tar.gz": "sha256-8SXMZFcnRldupsPfHmVklSr9dpJcJNdc/4X4zdRG/ls=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, + "org/jsoup#jsoup/1.18.1": { + "jar": "sha256-O7Ww7AKZir5FpR83185nwwaLTM1KtjyWWSnsUHTWTpE=", + "pom": "sha256-xN46hPu17vS9IpjW3pgcbNlyKHlQXINz4bZ/EdHK8n0=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.1": { + "jar": "sha256-YNXDmMMtxwObmSglFK1gZAYdhBfPlZofa9IDjMkHyRM=", + "module": "sha256-+H9zEVSfSf4k5igqEWXpB+AXqR6XnK2r/fm/VMP3EG8=", + "pom": "sha256-PK9ZSxPa5xB1EN2Zj02en6J3MFzcohMh/dWRmdyHzz0=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.1": { + "jar": "sha256-ApMN/klfk/5wsmVQrOOij34bkAyEQmwuRibOAgxygtY=", + "module": "sha256-VBIeWCzLLUYl7J+lRnlDbJA/oFPHQJe75F/fud22f7g=", + "pom": "sha256-MHCG3F5wjLdZAQhoXAQOCOCK3g7UlUkwsvM8BttT6l4=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/platform#junit-platform-commons/1.10.1": { + "jar": "sha256-fZhV7j8/cfAV6xR5VZv5I3gyQ8JPv72LKb7Y6AmbVnI=", + "module": "sha256-VtNwYvzicEHwtaNfOTxoyK0jr+NLLTDvjgewT8EZ1N0=", + "pom": "sha256-Su81pl6VGRWhPZ920fr/CaeMND5SJC+vNSBDtwx/bzA=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.10.1": { + "jar": "sha256-uqSORw1t7nNpoKiCDFHaicFGMnntpuE6ME0R9Fkix2A=", + "module": "sha256-KXiTcRuSz0lfdH41o6rLSDELHRNBpFzYTSP5QxxS4p0=", + "pom": "sha256-3X1k/Zr2eJywPFDCWGyRW7hrHizIwH+5dPHbDvhhZA0=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/platform#junit-platform-launcher/1.10.1": { + "jar": "sha256-3tQUxQTojQInAzEHGWkIThsv2bz4RD811E2ixuMwG8I=", + "module": "sha256-3ZcDx0TqC54Vv4yeP+vM/B40cBalXXHvf/qbC8TEBRI=", + "pom": "sha256-unroFwQMcqPCbTY6R/wTZIoc0MZOmjgYDd6YGKG1DjM=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/slf4j#slf4j-api/1.6.6": { + "pom": "sha256-cxmZMiteIokinNntRiTJQexXG3xh0qJ9alB+9zuXyho=" + }, + "org/slf4j#slf4j-api/1.7.32": { + "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=", + "pom": "sha256-ABzeWzxrqRBwQlz+ny5pXkrri8KQotTNllMRJ6skT+U=" + }, + "org/slf4j#slf4j-parent/1.6.6": { + "pom": "sha256-QrjCR2CP2OENW2Zs98gKW1nSseEoRQ97bZ0sIM+2sxs=" + }, + "org/slf4j#slf4j-parent/1.7.32": { + "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA=" + }, + "org/slf4j#slf4j-simple/1.7.32": { + "jar": "sha256-0v3XtzyiAZogYtFFoNhheaWPmMjD41ynxzWieztWIcM=", + "pom": "sha256-VVTmGS0A/7oRfST9+HBIj50DkABH6Lq1XgDugzgvQdg=" + }, + "org/xerial#sqlite-jdbc/3.47.0.0": { + "jar": "sha256-k9R8AGN3xHb497RdANIGBrd9WVFCPzRu9WtbCBNhwtM=", + "pom": "sha256-3SmXElydGbywbhuMYYZoJWi8iqHfmOguXp9Litbx/X0=" + }, + "org/zeroturnaround#zt-zip/1.14": { + "jar": "sha256-lkDsuPjrnDFVsVbtu0BJyT3uXaKz31U6UdlGmK+3aNk=", + "pom": "sha256-esRAYySqeauHFiEV/lpCdp4yB8eCFbvCMZ2ZNeNV5hg=" + } + } +} diff --git a/pkgs/by-name/ba/bandcamp-collection-downloader/package.nix b/pkgs/by-name/ba/bandcamp-collection-downloader/package.nix new file mode 100644 index 000000000000..e0318ef03109 --- /dev/null +++ b/pkgs/by-name/ba/bandcamp-collection-downloader/package.nix @@ -0,0 +1,68 @@ +{ + lib, + jre, + gradle_8, + + makeWrapper, + stdenv, + fetchFromGitLab, +}: +let + gradle = gradle_8; +in +stdenv.mkDerivation (finalAttrs: { + pname = "bandcamp-collection-downloader"; + version = "0-unstable-2024-10-29"; + + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "Ezwen"; + repo = "bandcamp-collection-downloader"; + rev = "fe8a98d92d776d194be196b6860f55e194a999f8"; + hash = "sha256-OaloKYlENq2kSzC8jvt4JJ7PsxLuqUuOdnYoazW5YUE="; + }; + + nativeBuildInputs = [ + gradle + makeWrapper + ]; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + # this is required for using mitm-cache on Darwin + __darwinAllowLocalNetworking = true; + + # tests want to talk to bandcamp + doCheck = false; + + gradleBuildTask = "fatjar"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/bandcamp-collection-downloader + cp build/libs/bandcamp-collection-downloader.jar $out/share/bandcamp-collection-downloader/bandcamp-collection-downloader.jar + + makeWrapper ${lib.getExe jre} $out/bin/bandcamp-collection-downloader \ + --add-flags "-jar $out/share/bandcamp-collection-downloader/bandcamp-collection-downloader.jar" + + runHook postInstall + ''; + + meta = { + description = "Tool to automatically download purchased music from bandcamp"; + license = lib.licenses.agpl3Only; + homepage = "https://framagit.org/Ezwen/bandcamp-collection-downloader"; + maintainers = [ lib.maintainers.shelvacu ]; + mainProgram = "bandcamp-collection-downloader"; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; + }; +}) From 94ab289a6eb3e0ab601e462de017736976b063c5 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Wed, 9 Apr 2025 17:40:35 +0100 Subject: [PATCH 425/449] python3Packages.reactionmenu: init at 3.1.7 --- .../python-modules/reactionmenu/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/reactionmenu/default.nix diff --git a/pkgs/development/python-modules/reactionmenu/default.nix b/pkgs/development/python-modules/reactionmenu/default.nix new file mode 100644 index 000000000000..1d8e4cc45461 --- /dev/null +++ b/pkgs/development/python-modules/reactionmenu/default.nix @@ -0,0 +1,44 @@ +{ + buildPythonPackage, + fetchFromGitHub, + setuptools, + discordpy, + lib, +}: +let + pname = "reactionmenu"; + version = "3.1.7"; +in +buildPythonPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "Defxult"; + repo = "reactionmenu"; + tag = "v${version}"; + hash = "sha256-ftRrpNOJIa2DSBr9YOH3Bhn8iXE1Pgtv0f57/rsCqJU="; + }; + pyproject = true; + + build-system = [ + setuptools + ]; + + dependencies = [ + discordpy + ]; + + pythonImportsCheck = [ "reactionmenu" ]; + + meta = { + description = "Library to create a discord.py 2.0+ paginator"; + longDescription = '' + A Python library to create a discord.py 2.0+ paginator (reaction menu/buttons menu). + Supports pagination with buttons, reactions, and category selection using selects. + ''; + homepage = "https://github.com/Defxult/reactionmenu"; + changelog = "https://github.com/Defxult/reactionmenu/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ amadaluzia ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9fa4de0a4e78..e3c9e1b31ff9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14789,6 +14789,8 @@ self: super: with self; { re-assert = callPackage ../development/python-modules/re-assert { }; + reactionmenu = callPackage ../development/python-modules/reactionmenu { }; + reactivex = callPackage ../development/python-modules/reactivex { }; readabilipy = callPackage ../development/python-modules/readabilipy { }; From e49c5813d9313a059e52fd6719fae2d3cc0c4e33 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 23 Apr 2025 20:45:09 +0200 Subject: [PATCH 426/449] chromium,chromedriver: 135.0.7049.95 -> 135.0.7049.114 https://chromereleases.googleblog.com/2025/04/stable-channel-update-for-desktop_22.html This update includes 1 security fix. --- .../networking/browsers/chromium/info.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 76ab98a318d7..d9da5e0104b5 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "135.0.7049.95", + "version": "135.0.7049.114", "chromedriver": { - "version": "135.0.7049.96", - "hash_darwin": "sha256-MmL/hQGPk/kGBtbXSekE+lHktucPCv3HFr8VYTnff5w=", - "hash_darwin_aarch64": "sha256-TGiVrAYgeLGniGBZ2dHUBk6Hg996ouBSJHZm9hXExQ4=" + "version": "135.0.7049.115", + "hash_darwin": "sha256-fEqjiSP6p//NY8HCi409sftXlK6CVvzsw2oZbSgTgJ4=", + "hash_darwin_aarch64": "sha256-K1jH+yxYio8yyxZ7M15QhOQ9fu2VhjeaevS8zM5D8Lk=" }, "deps": { "depot_tools": { @@ -20,8 +20,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "de2eb485a1951079e63bdb57ce25544d2dc79c15", - "hash": "sha256-6ydyJWsDawt0bfYAFHotTB9ujmIYsqUUpNwB6q6RNQE=", + "rev": "63fd8a7d9d09e41ba37b84386c85d5f249f848f7", + "hash": "sha256-U6OJHocA6vI36QCU8UITUsVlentm210CwdThCwlDw5E=", "recompress": true }, "src/third_party/clang-format/script": { From 5b23b92ec97280a38ae0ebabd45f90a3dc93dbb3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 03:34:47 +0000 Subject: [PATCH 427/449] faircamp: 1.3.0 -> 1.4.0 --- pkgs/by-name/fa/faircamp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fa/faircamp/package.nix b/pkgs/by-name/fa/faircamp/package.nix index bbb53aabcecf..ecf889379009 100644 --- a/pkgs/by-name/fa/faircamp/package.nix +++ b/pkgs/by-name/fa/faircamp/package.nix @@ -17,19 +17,19 @@ rustPlatform.buildRustPackage rec { pname = "faircamp"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "simonrepp"; repo = "faircamp"; rev = version; - hash = "sha256-zKwKuGN+8HT1rSbweQGvpkvMtF2WAB8EEV9pGeKtdlw="; + hash = "sha256-41mec9AdNdWRJz+5xFU7to/4LxIb7fEgm1EQVMAtyto="; }; useFetchCargoVendor = true; - cargoHash = "sha256-5suzKkdGHxPuJWWvu17Dph+zli/1yIDB0GcAemmahtI="; + cargoHash = "sha256-xLRoI4MN1DApL4jXBXnMzsqTaOVUn2FZy3o2mTetvJ8="; buildFeatures = [ "libvips" ]; From 72b03e1ae8349d98be141418a69f76a2ea0857be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 18:49:38 +0000 Subject: [PATCH 428/449] tail-tray: 0.2.19 -> 0.2.20 --- pkgs/by-name/ta/tail-tray/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index 79fbf5a6b481..88e0e6765085 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "tail-tray"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "SneWs"; repo = "tail-tray"; tag = "v${version}"; - sha256 = "sha256-33BJknkX4gyR8AlyTX3fQX/P/4xd0iXlzX9ld0Lbpis="; + sha256 = "sha256-vsxWGXpmkznfqFwtuLdG6yGAS/Lhs6NLRuzQ/g/WLu8="; }; nativeBuildInputs = with kdePackages; [ From 7486ec0e387ec5885e21c82785028656d60ac6aa Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 23 Apr 2025 22:11:47 +0300 Subject: [PATCH 429/449] nh: 3.6.0 -> 4.0.0 --- pkgs/by-name/nh/nh/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index 90b23a32c65c..de14c9ca3470 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -19,13 +19,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "nh"; - version = "3.6.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nh"; tag = "v${finalAttrs.version}"; - hash = "sha256-k8rz5RF1qi7RXzQYWGbw5pJRNRFIdX85SIYN+IHiVL4="; + hash = "sha256-Pqff6gVSNP2kA0Oo0t9CUy9cdf2yGnwSfwlOvS5LtKM="; }; strictDeps = true; @@ -45,9 +45,9 @@ rustPlatform.buildRustPackage (finalAttrs: { in '' mkdir completions - ${emulator} $out/bin/nh completions --shell bash > completions/nh.bash - ${emulator} $out/bin/nh completions --shell zsh > completions/nh.zsh - ${emulator} $out/bin/nh completions --shell fish > completions/nh.fish + ${emulator} $out/bin/nh completions bash > completions/nh.bash + ${emulator} $out/bin/nh completions zsh > completions/nh.zsh + ${emulator} $out/bin/nh completions fish > completions/nh.fish installShellCompletion completions/* '' @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-Csh8M5BquAD2vUYIu0nNWSvznTZxno1WxvkEhBVN+9c="; + cargoHash = "sha256-alZFjeBJskp4vu+uaEy9tMkdS1aXcv8d6AQ8jeJKEOA="; passthru.updateScript = nix-update-script { }; From 2a9a8f20eb20de32c646fd7e4bb7153c7d025793 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Wed, 23 Apr 2025 22:12:29 +0300 Subject: [PATCH 430/449] nh: add NotAShelf to maintainers --- pkgs/by-name/nh/nh/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index de14c9ca3470..ba7aa95779a6 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -70,6 +70,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "nh"; maintainers = with lib.maintainers; [ drupol + NotAShelf viperML ]; }; From 3dd2a4ef5efd73b52bd19a5409c3df50a22bbbce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 19:16:14 +0000 Subject: [PATCH 431/449] openfga-cli: 0.6.5 -> 0.6.6 --- pkgs/by-name/op/openfga-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix index 52648b3ae2d8..0c59cfb1d84d 100644 --- a/pkgs/by-name/op/openfga-cli/package.nix +++ b/pkgs/by-name/op/openfga-cli/package.nix @@ -7,7 +7,7 @@ let pname = "openfga-cli"; - version = "0.6.5"; + version = "0.6.6"; in buildGoModule { @@ -17,10 +17,10 @@ buildGoModule { owner = "openfga"; repo = "cli"; rev = "v${version}"; - hash = "sha256-p68dlo6U8cgwHzY6lkukSglNOAWtjAFwX163bpXCIl0="; + hash = "sha256-cmeWRtdt3mm5FqOq28pWNPgwQeJs/5amZ5RHT8VzwYQ="; }; - vendorHash = "sha256-5M4sYaNaoZPpDU0JPKxRvtH3MjiKmBaCg6Lo2qu63QY="; + vendorHash = "sha256-vIkG78ep/JcjhlQznn93ImLrZCpKX6GU6FEzbJBPu2Y="; nativeBuildInputs = [ installShellFiles ]; From c1e69c92d50d7395c0d7e9b53bd91bb0515e86dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 20:02:05 +0000 Subject: [PATCH 432/449] grpc_cli: 1.71.0 -> 1.71.1 --- pkgs/by-name/gr/grpc_cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grpc_cli/package.nix b/pkgs/by-name/gr/grpc_cli/package.nix index b42c9c89e35e..debe8f09f95e 100644 --- a/pkgs/by-name/gr/grpc_cli/package.nix +++ b/pkgs/by-name/gr/grpc_cli/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.71.0"; + version = "1.71.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-QKSdMpfl0pdKy/r4z8VKcGN0gsQmx9lBRHlCjaaF5Sg="; + hash = "sha256-5O+KsiytR1UBi8eS9pPuGrt7KCZSY0VGHMHVO/LZkg8="; fetchSubmodules = true; }; nativeBuildInputs = [ From 81bb227d58755386faa1ebeb9eec00766aa797aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 20:35:56 +0000 Subject: [PATCH 433/449] crystal-dock: 2.11 -> 2.12 --- pkgs/by-name/cr/crystal-dock/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix index 59797607d4fd..c263f3f7cb3c 100644 --- a/pkgs/by-name/cr/crystal-dock/package.nix +++ b/pkgs/by-name/cr/crystal-dock/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "crystal-dock"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "dangvd"; repo = "crystal-dock"; rev = "v${finalAttrs.version}"; - hash = "sha256-edTBlqCJkw9ER06yZeXvJXQeQ5bJn//ss5ceYwt0QUU="; + hash = "sha256-8QxewksN4iWFpIChRm0+QnU5MFuup0dO/QNxPBLlmPU="; }; nativeBuildInputs = [ From d9c1bad8badb8335e30cf4bb592d8847721c2c88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 20:37:01 +0000 Subject: [PATCH 434/449] dblab: 0.30.1 -> 0.31.0 --- pkgs/by-name/db/dblab/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index 703ab3dcfb90..8fdf92ede345 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dblab"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; rev = "v${version}"; - hash = "sha256-a0452fNr78FDhVoBF8RkKbtamvc5e6gEbTOeRdgGQs4="; + hash = "sha256-ssxfKIHbhiekZFONRDFzb38mEKVgEKXEq4TIyj8FXjU="; }; - vendorHash = "sha256-n1Z3sNvNLX1QpfpDSGDygjbC6IE85SBJHvyliy11OjU="; + vendorHash = "sha256-WxIlGdd3Si3Lyf9FZOCAepDlRo2F3EDRy00EawkZATY="; ldflags = [ "-s -w -X main.version=${version}" ]; From 4b9e256058ad4a5cf2f8456872ac34ba1ab9d9c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 20:38:10 +0000 Subject: [PATCH 435/449] atasm: 1.26 -> 1.27 --- pkgs/by-name/at/atasm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/atasm/package.nix b/pkgs/by-name/at/atasm/package.nix index e6155b1bf927..375565927900 100644 --- a/pkgs/by-name/at/atasm/package.nix +++ b/pkgs/by-name/at/atasm/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "atasm"; - version = "1.26"; + version = "1.27"; src = fetchFromGitHub { owner = "CycoPH"; repo = "atasm"; rev = "V${version}"; - hash = "sha256-W9I1Wf2IVBy2l+jyrAOmlpO59uZM1SkBLuNcu2fXI1M="; + hash = "sha256-owr0mqib3zXMYcYliseCIkHp41nevpIPCC6nTqouAkA="; }; makefile = "Makefile"; From 91e5816acd146dc210c4ea2e3a8d468c6cddaa49 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 1 Apr 2025 22:06:02 +0200 Subject: [PATCH 436/449] recon-ng: use replaceVars instead of substituteAll --- pkgs/by-name/re/recon-ng/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/recon-ng/package.nix b/pkgs/by-name/re/recon-ng/package.nix index 03aed8ec2638..1a08b38e3462 100644 --- a/pkgs/by-name/re/recon-ng/package.nix +++ b/pkgs/by-name/re/recon-ng/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, python3, - substituteAll, + replaceVars, fetchpatch, }: python3.pkgs.buildPythonApplication rec { @@ -49,8 +49,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = let - setup = substituteAll { - src = ./setup.py; + setup = replaceVars ./setup.py { inherit pname version; }; in From 78a0cd852f4dea005858981de8258a6929fd62bc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 1 Apr 2025 22:06:22 +0200 Subject: [PATCH 437/449] supercell-wx: use replaceVars instead of substituteAll --- pkgs/by-name/su/supercell-wx/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix index a13e18c80c5c..4ee9dfbe87f1 100644 --- a/pkgs/by-name/su/supercell-wx/package.nix +++ b/pkgs/by-name/su/supercell-wx/package.nix @@ -26,7 +26,7 @@ qt6, tbb_2021_11, tracy, - substituteAll, + replaceVars, python3, }: let @@ -94,9 +94,8 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # These are for Nix compatibility {{{ ./patches/use-find-package.patch # Replace some vendored dependencies with Nix provided versions - (substituteAll { + (replaceVars ./patches/skip-git-versioning.patch { # Skip tagging build with git version, and substitute it with the src revision (still uses current year timestamp) - src = ./patches/skip-git-versioning.patch; rev = finalAttrs.src.rev; }) # Prevents using some Qt scripts that seemed to break the install step. Fixes missing link to some targets. From 4e38e744d70aca7143a22802cd1a3544e1cb308d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 1 Apr 2025 22:06:46 +0200 Subject: [PATCH 438/449] xdg-desktop-portal: use replaceVars instead of substituteAll --- pkgs/development/libraries/xdg-desktop-portal/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 239cbd16be0f..69f97a833a47 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -27,7 +27,7 @@ gst_all_1, libgudev, umockdev, - substituteAll, + replaceVars, enableGeoLocation ? true, enableSystemd ? true, }: @@ -51,14 +51,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # The icon validator copied from Flatpak needs to access the gdk-pixbuf loaders # in the Nix store and cannot bind FHS paths since those are not available on NixOS. - (substituteAll { - src = ./fix-icon-validation.patch; + (replaceVars ./fix-icon-validation.patch { inherit (builtins) storeDir; }) # Same for the sound validator, except the gdk-pixbuf part. - (substituteAll { - src = ./fix-sound-validation.patch; + (replaceVars ./fix-sound-validation.patch { inherit (builtins) storeDir; }) From a78b73aefd641e32fda3dfca97905e3c17db6dc3 Mon Sep 17 00:00:00 2001 From: FKouhai Date: Tue, 22 Apr 2025 22:07:03 +0200 Subject: [PATCH 439/449] gowall: 0.2.0 > 0.2.1 --- pkgs/by-name/go/gowall/package.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix index 581840505d15..52560b3b6a92 100644 --- a/pkgs/by-name/go/gowall/package.nix +++ b/pkgs/by-name/go/gowall/package.nix @@ -4,22 +4,28 @@ buildGoModule, fetchFromGitHub, installShellFiles, + nix-update-script, + writableTmpDirAsHomeHook, }: buildGoModule rec { pname = "gowall"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "Achno"; repo = "gowall"; rev = "v${version}"; - hash = "sha256-QKukWA8TB0FoNHu0Wyco55x4oBY+E33qdoT/SaXW6DE="; + hash = "sha256-fgO4AoyHR51zD86h75b06BXV0ONlFfHdBvxfJvcD7J8="; }; - vendorHash = "sha256-H2Io1K2LEFmEPJYVcEaVAK2ieBrkV6u+uX82XOvNXj4="; + vendorHash = "sha256-V/VkbJZIzy4KlEPtlTTqdUIPG6lKD+XidNM0NWpATbk="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + # using writableTmpDirAsHomeHook to prevent issues when creating config dir for shell completions + writableTmpDirAsHomeHook + ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd gowall \ --bash <($out/bin/gowall completion bash) \ @@ -27,6 +33,8 @@ buildGoModule rec { --zsh <($out/bin/gowall completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/Achno/gowall/releases/tag/v${version}"; description = "Tool to convert a Wallpaper's color scheme / palette"; @@ -36,6 +44,7 @@ buildGoModule rec { maintainers = with lib.maintainers; [ crem emilytrau + FKouhai ]; }; } From 9c45add790213c6fae7c4d2fccb3c99f33916044 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 23 Apr 2025 23:26:29 +0200 Subject: [PATCH 440/449] rocmPackages.llvm.clang-unwrapped: use replaceVars instead of substituteAll --- pkgs/development/rocm-modules/6/llvm/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix index dc2b3561936c..5131fc979df8 100644 --- a/pkgs/development/rocm-modules/6/llvm/default.nix +++ b/pkgs/development/rocm-modules/6/llvm/default.nix @@ -15,7 +15,7 @@ zlib, gcc-unwrapped, glibc, - substituteAll, + replaceVars, libffi, libxml2, removeReferencesTo, @@ -319,8 +319,7 @@ rec { }) # FIXME: Needed due to https://github.com/NixOS/nixpkgs/issues/375431 # Once we can switch to overrideScope this can be removed - (substituteAll { - src = ./../../../compilers/llvm/common/clang/clang-at-least-16-LLVMgold-path.patch; + (replaceVars ./../../../compilers/llvm/common/clang/clang-at-least-16-LLVMgold-path.patch { libllvmLibdir = "${llvm.lib}/lib"; }) ]; From 2b7b39cdd6134cb86b67062f0280d1fcf05f3f9d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 23 Apr 2025 23:26:47 +0200 Subject: [PATCH 441/449] fim: use replaceVars instead of substituteAll --- pkgs/by-name/fi/fim/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/fim/package.nix b/pkgs/by-name/fi/fim/package.nix index 3a452fac4bda..d31448da9c88 100644 --- a/pkgs/by-name/fi/fim/package.nix +++ b/pkgs/by-name/fi/fim/package.nix @@ -4,7 +4,7 @@ autoconf, automake, pkg-config, - substituteAll, + replaceVars, lib, perl, flex, @@ -41,9 +41,11 @@ stdenv.mkDerivation rec { patches = [ # build tools with a build compiler - (substituteAll { - src = ./native-tools.patch; + (replaceVars ./native-tools.patch { cc_for_build = lib.getExe buildPackages.stdenv.cc; + # patch context + FIM_WANT_CUSTOM_HARDCODED_CONSOLEFONT_TRUE = null; + HAVE_RUNNABLE_TESTS_TRUE = null; }) ]; From 3bfa33ed9958418600ec665825339a1f14d480af Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 23 Apr 2025 23:27:00 +0200 Subject: [PATCH 442/449] box2d: use replaceVars instead of substituteAll --- pkgs/by-name/bo/box2d/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/box2d/package.nix b/pkgs/by-name/bo/box2d/package.nix index 8b29fa3afa45..27da46b1027e 100644 --- a/pkgs/by-name/bo/box2d/package.nix +++ b/pkgs/by-name/bo/box2d/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, - substituteAll, + replaceVars, # nativeBuildInputs cmake, @@ -41,8 +41,7 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # prevent CMake from trying to download some libraries from the internet - (substituteAll { - src = ./cmake_dont_fetch_enkits.patch; + (replaceVars ./cmake_dont_fetch_enkits.patch { enkits_src = fetchFromGitHub { owner = "dougbinks"; repo = "enkiTS"; From fe7dba685893030b2dec2b002164069ec9b7366a Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 1 Apr 2025 22:11:42 +0200 Subject: [PATCH 443/449] substituteAll: deprecate --- doc/release-notes/rl-2505.section.md | 2 + .../substitute/substitute-all.nix | 39 ++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 346319db23ab..1d9cd80d851b 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -112,6 +112,8 @@ - All support for 32‐bit Darwin systems has been dropped. +- `substituteAll` has been deprecated in favor of `replaceVars` and will be removed in the next release. + - Default ICU version updated from 74 to 76 - Apache Kafka was updated to `>= 4.0.0`. Please note that this is the first release which operates diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 7f8d55449472..1135c822e22d 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -6,21 +6,24 @@ let isInvalidArgName = x: builtins.match "^[a-z][a-zA-Z0-9_]*$" x == null; invalidArgs = builtins.filter isInvalidArgName (builtins.attrNames args); in -if invalidArgs == [ ] then - stdenvNoCC.mkDerivation ( - { - name = if args ? name then args.name else baseNameOf (toString args.src); - builder = ./substitute-all.sh; - inherit (args) src; - preferLocalBuild = true; - allowSubstitutes = false; - } - // args - ) -else - throw '' - Argument names for `pkgs.substituteAll` must: - - start with a lower case ASCII letter - - only contain ASCII letters, digits and underscores - Found invalid argument names: ${lib.concatStringsSep ", " invalidArgs}. - '' +# TODO(@wolfgangwalther): Remove substituteAll, the nix function, after 25.05 branch-off. +lib.warn "substituteAll is deprecated and will be removed in 25.11. Use replaceVars instead." ( + if invalidArgs == [ ] then + stdenvNoCC.mkDerivation ( + { + name = if args ? name then args.name else baseNameOf (toString args.src); + builder = ./substitute-all.sh; + inherit (args) src; + preferLocalBuild = true; + allowSubstitutes = false; + } + // args + ) + else + throw '' + Argument names for `pkgs.substituteAll` must: + - start with a lower case ASCII letter + - only contain ASCII letters, digits and underscores + Found invalid argument names: ${lib.concatStringsSep ", " invalidArgs}. + '' +) From ac825aaea5f4092b652d56694b3dfba696d7736c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 5 Apr 2025 14:39:42 +0200 Subject: [PATCH 444/449] substituteAllFiles: deprecate --- doc/release-notes/rl-2505.section.md | 2 +- .../substitute-files/substitute-all-files.nix | 45 ++++++++++--------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/doc/release-notes/rl-2505.section.md b/doc/release-notes/rl-2505.section.md index 1d9cd80d851b..774954bc3bc9 100644 --- a/doc/release-notes/rl-2505.section.md +++ b/doc/release-notes/rl-2505.section.md @@ -112,7 +112,7 @@ - All support for 32‐bit Darwin systems has been dropped. -- `substituteAll` has been deprecated in favor of `replaceVars` and will be removed in the next release. +- `substituteAll` and `substituteAllFiles` have been deprecated in favor of `replaceVars` and will be removed in the next release. - Default ICU version updated from 74 to 76 diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix index 66cafe07c058..b8d1ae8a6834 100644 --- a/pkgs/build-support/substitute-files/substitute-all-files.nix +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -2,27 +2,32 @@ args: -stdenv.mkDerivation ( - { - name = if args ? name then args.name else baseNameOf (toString args.src); - builder = builtins.toFile "builder.sh" '' - set -o pipefail +# TODO(@wolfgangwalther): Remove substituteAllFiles after 25.05 branch-off. +lib.warn + "substituteAllFiles is deprecated and will be removed in 25.11. Use replaceVars for each file instead." + ( + stdenv.mkDerivation ( + { + name = if args ? name then args.name else baseNameOf (toString args.src); + builder = builtins.toFile "builder.sh" '' + set -o pipefail - eval "$preInstall" + eval "$preInstall" - args= + args= - pushd "$src" - echo -ne "${lib.concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do - mkdir -p "$out/$(dirname "$line")" - substituteAll "$line" "$out/$line" - done - popd + pushd "$src" + echo -ne "${lib.concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do + mkdir -p "$out/$(dirname "$line")" + substituteAll "$line" "$out/$line" + done + popd - eval "$postInstall" - ''; - preferLocalBuild = true; - allowSubstitutes = false; - } - // args -) + eval "$postInstall" + ''; + preferLocalBuild = true; + allowSubstitutes = false; + } + // args + ) + ) From d3842f26e8c6c9a8ba92fa406a7005f604662c49 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 5 Apr 2025 15:22:01 +0200 Subject: [PATCH 445/449] doc/build-support: replace substituteAll with replaceVars --- doc/languages-frameworks/gnome.section.md | 4 +- doc/packages/build-support.md | 61 ++++++++++++----------- doc/redirects.json | 28 ++++++----- 3 files changed, 50 insertions(+), 43 deletions(-) diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 03b030fb7be5..718c296bce80 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -214,7 +214,7 @@ stdenv.mkDerivation { You can rely on applications depending on the library setting the necessary environment variables but that is often easy to miss. Instead we recommend to patch the paths in the source code whenever possible. Here are some examples: -- []{#ssec-gnome-common-issues-unwrappable-package-gnome-shell-ext} [Replacing a `GI_TYPELIB_PATH` in GNOME Shell extension](https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix#L21-L24) – we are using `substituteAll` to include the path to a typelib into a patch. +- []{#ssec-gnome-common-issues-unwrappable-package-gnome-shell-ext} [Replacing a `GI_TYPELIB_PATH` in GNOME Shell extension](https://github.com/NixOS/nixpkgs/blob/e981466fbb08e6231a1377539ff17fbba3270fda/pkgs/by-name/gn/gnome-shell-extensions/package.nix#L25-L32) – we are using `replaceVars` to include the path to a typelib into a patch. - []{#ssec-gnome-common-issues-unwrappable-package-gsettings} The following examples are hardcoding GSettings schema paths. To get the schema paths we use the functions @@ -222,7 +222,7 @@ You can rely on applications depending on the library setting the necessary envi * `glib.makeSchemaPath` Takes a package output like `$out` and a derivation name. You should use this if the schemas you need to hardcode are in the same derivation. - []{#ssec-gnome-common-issues-unwrappable-package-gsettings-vala} [Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library)](https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/pantheon/apps/elementary-files/default.nix#L78-L86) – here, `substituteAll` cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a [Nix bug](https://github.com/NixOS/nix/issues/1846). + []{#ssec-gnome-common-issues-unwrappable-package-gsettings-vala} [Hard-coding GSettings schema path in Vala plug-in (dynamically loaded library)](https://github.com/NixOS/nixpkgs/blob/7bb8f05f12ca3cff9da72b56caa2f7472d5732bc/pkgs/desktops/pantheon/apps/elementary-files/default.nix#L78-L86) – here, `replaceVars` cannot be used since the schema comes from the same package preventing us from pass its path to the function, probably due to a [Nix bug](https://github.com/NixOS/nix/issues/1846). []{#ssec-gnome-common-issues-unwrappable-package-gsettings-c} [Hard-coding GSettings schema path in C library](https://github.com/NixOS/nixpkgs/blob/29c120c065d03b000224872251bed93932d42412/pkgs/development/libraries/glib-networking/default.nix#L31-L34) – nothing special other than using [Coccinelle patch](https://github.com/NixOS/nixpkgs/pull/67957#issuecomment-527717467) to generate the patch itself. diff --git a/doc/packages/build-support.md b/doc/packages/build-support.md index 80392f4d121e..1e4756d7f258 100644 --- a/doc/packages/build-support.md +++ b/doc/packages/build-support.md @@ -30,13 +30,12 @@ substitute { ``` ::: -## `pkgs.substituteAll` {#pkgs-substituteall} +## `pkgs.replaceVars` {#pkgs-replacevars} -`pkgs.substituteAll` substitutes all instances of `@varName@` (`@`s included) in file `src` with the value of the corresponding environment variable. -As this uses the [`substituteAll`] (#fun-substitute) function, its limitations regarding variable names that will or will not be replaced also apply here. +`pkgs.replaceVars ` replaces all instances of `@varName@` (`@`s included) in file `src` with the respective value in the attribute set `replacements`. -:::{.example #ex-pkgs-substituteAll} -# Usage of `pkgs.substituteAll` +:::{.example #ex-pkgs-replace-vars} +# Usage of `pkgs.replaceVars` If `say-goodbye.sh` contains the following: @@ -51,16 +50,14 @@ the following derivation will make substitutions to `@bash@`, `@hello@`, and `@g ```nix { - substituteAll, + replaceVars, bash, hello, }: -substituteAll { - src = ./say-goodbye.sh; - env = { - inherit bash hello; - greeting = "goodbye"; - }; +replaceVars ./say-goodbye.sh { + inherit bash hello; + greeting = "goodbye"; + unchanged = null; } ``` @@ -72,31 +69,37 @@ such that `$out` will result in something like the following: echo @unchanged@ /nix/store/566f5isbvw014h7knmzmxa5l6hshx43k-hello-2.12.1/bin/hello --greeting goodbye ``` + +Note that, in contrast to the old `substituteAll`, `unchanged = null` must explicitly be set. +Any unreferenced `@...@` pattern in the source file will throw an error. ::: -## `pkgs.substituteAllFiles` {#pkgs-substituteallfiles} +## `pkgs.replaceVarsWith` {#pkgs-replacevarswith} -`pkgs.substituteAllFiles` replaces `@varName@` with the value of the environment variable `varName`. -It expects `src` to be a directory and requires a `files` argument that specifies which files will be subject to replacements; only these files will be placed in `$out`. +`pkgs.replaceVarsWith` works the same way as [pkgs.replaceVars](#pkgs-replacevars), but additionally allows more options. -As it also uses the `substituteAll` function, it is subject to the same limitations on environment variables as discussed in [pkgs.substituteAll](#pkgs-substituteall). +:::{.example #ex-pkgs-replace-vars-with} +# Usage of `pkgs.replaceVarsWith` -:::{.example #ex-pkgs-substitute-all-files} -# Usage of `pkgs.substituteAllFiles` - -If the current directory contains `{foo,bar,baz}.txt` and the following `default.nix` +With the example file `say-goodbye.sh`, consider: ```nix -{ substituteAllFiles }: -substituteAllFiles { - src = ./.; - files = [ - "foo.txt" - "bar.txt" - ]; - hello = "there"; +{ replaceVarsWith }: +replaceVarsWith { + src = ./say-goodbye.sh; + + replacements = { + inherit bash hello; + greeting = "goodbye"; + unchanged = null; + }; + + name = "say-goodbye"; + dir = "bin"; + isExecutable = true; + meta.mainProgram = "say-goodbye"; } ``` -in the resulting derivation, every instance of `@hello@` will be replaced with `there` in `$out/foo.txt` and `$out/bar.txt`; `baz.txt` will not be processed nor will it appear in `$out`. +This will make the resulting file executable, put it in `bin/say-goodbye` and set `meta` attributes respectively. ::: diff --git a/doc/redirects.json b/doc/redirects.json index 627b4137281d..15141bb96426 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -8,6 +8,14 @@ "ex-build-helpers-extendMkDerivation": [ "index.html#ex-build-helpers-extendMkDerivation" ], + "ex-pkgs-replace-vars": [ + "index.html#ex-pkgs-replace-vars", + "index.html#ex-pkgs-substituteAll", + "index.html#ex-pkgs-substitute-all-files" + ], + "ex-pkgs-replace-vars-with": [ + "index.html#ex-pkgs-replace-vars-with" + ], "ex-shfmt": [ "index.html#ex-shfmt" ], @@ -35,6 +43,14 @@ "no-broken-symlinks.sh": [ "index.html#no-broken-symlinks.sh" ], + "pkgs-replacevars": [ + "index.html#pkgs-replacevars", + "index.html#pkgs-substituteall", + "index.html#pkgs-substituteallfiles" + ], + "pkgs-replacevarswith": [ + "index.html#pkgs-replacevarswith" + ], "preface": [ "index.html#preface" ], @@ -4193,18 +4209,6 @@ "ex-pkgs-substitute": [ "index.html#ex-pkgs-substitute" ], - "pkgs-substituteall": [ - "index.html#pkgs-substituteall" - ], - "ex-pkgs-substituteAll": [ - "index.html#ex-pkgs-substituteAll" - ], - "pkgs-substituteallfiles": [ - "index.html#pkgs-substituteallfiles" - ], - "ex-pkgs-substitute-all-files": [ - "index.html#ex-pkgs-substitute-all-files" - ], "part-development": [ "index.html#part-development" ], From 005a9dbfed005e8aae280f79d8418bc984adf398 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 21:30:20 +0000 Subject: [PATCH 446/449] phpunit: 12.1.2 -> 12.1.3 --- pkgs/by-name/ph/phpunit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix index 9f4a0a6a12fa..d05f008af9aa 100644 --- a/pkgs/by-name/ph/phpunit/package.nix +++ b/pkgs/by-name/ph/phpunit/package.nix @@ -10,16 +10,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpunit"; - version = "12.1.2"; + version = "12.1.3"; src = fetchFromGitHub { owner = "sebastianbergmann"; repo = "phpunit"; tag = finalAttrs.version; - hash = "sha256-ug4fi+PJbtwbxL3qS2dzaVTdKr0o4hwFA3+Us7JCFIY="; + hash = "sha256-JwEeH3oMiiIa1awLwOrtGfkwN3srhPErkpHaAJ2IFVE="; }; - vendorHash = "sha256-EN9iYbFht77/N5Ull/+TS3BjzMR7YCujz9p5Rgqos6g="; + vendorHash = "sha256-3wwv+g9VsNzqgj1m9fea6OhWzbU203I8CPXcJRyWEpg="; passthru = { updateScript = nix-update-script { }; From 711e70a88599af2c2e533397ed8ec01bb9a8bb87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Apr 2025 21:34:06 +0000 Subject: [PATCH 447/449] flexget: 3.15.32 -> 3.15.37 --- pkgs/by-name/fl/flexget/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index ae94950eacbe..fd3006933239 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.15.32"; + version = "3.15.37"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-jKjsqj5q3egjyRzISW4UXpTpxq9QeqUQMfJ0wjC1PsQ="; + hash = "sha256-g/RFU2HT4SjiexbfBFkYp7N3qqvoBxJiIwxZQ3+//5s="; }; pythonRelaxDeps = true; From d9f717f6e153e6f35213cf67c452937e1ae08901 Mon Sep 17 00:00:00 2001 From: Jennings Zhang Date: Wed, 23 Apr 2025 18:51:43 -0400 Subject: [PATCH 448/449] inv-sig-helper: 0-unstable-2025-04-03 -> 0-unstable-2025-04-23 --- pkgs/by-name/in/inv-sig-helper/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inv-sig-helper/package.nix b/pkgs/by-name/in/inv-sig-helper/package.nix index 1cecccd3ce49..69757859c6cb 100644 --- a/pkgs/by-name/in/inv-sig-helper/package.nix +++ b/pkgs/by-name/in/inv-sig-helper/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage { pname = "inv-sig-helper"; - version = "0-unstable-2025-04-03"; + version = "0-unstable-2025-04-23"; src = fetchFromGitHub { owner = "iv-org"; repo = "inv_sig_helper"; - rev = "9073c15822c33ffefa27b55ef2d05fbddfc03273"; - hash = "sha256-HVaux1QzN625f9rS2J1i3es/ZMjvVqKTY6MvBdcgg/o="; + rev = "5d3c7a4574fafe0bc5fbed9e7e33483889832fd4"; + hash = "sha256-WGh62tjKGe9OD19aq+lP9GfYs5PrGqkeT6VvmtNottQ="; }; useFetchCargoVendor = true; From b7d20dbed14b3e3418f9bf25305fbd1133d0b312 Mon Sep 17 00:00:00 2001 From: Garklein Date: Fri, 18 Apr 2025 15:30:54 -0400 Subject: [PATCH 449/449] nixos/exwm: add option to specify Emacs package This allows a custom Emacs package to be used for EXWM (see #99424) Co-authored-by: Lin Jian --- nixos/modules/services/x11/window-managers/exwm.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix index 301a3c85d9e1..f6a52ea808e3 100644 --- a/nixos/modules/services/x11/window-managers/exwm.nix +++ b/nixos/modules/services/x11/window-managers/exwm.nix @@ -13,7 +13,7 @@ let ${cfg.loadScript} ''; packages = epkgs: cfg.extraPackages epkgs ++ [ epkgs.exwm ]; - exwm-emacs = pkgs.emacs.pkgs.withPackages packages; + exwm-emacs = cfg.package.pkgs.withPackages packages; in { @@ -38,6 +38,10 @@ in file. ''; }; + package = mkPackageOption pkgs "Emacs" { + default = "emacs"; + example = [ "emacs-gtk" ]; + }; extraPackages = mkOption { type = types.functionTo (types.listOf types.package); default = epkgs: [ ];