From 9c2c6f35de1ed1e18467cf224ed86689e6f589c4 Mon Sep 17 00:00:00 2001 From: David Knaack Date: Sun, 31 Mar 2024 15:55:30 +0200 Subject: [PATCH 001/246] kavita: restore db migrations --- pkgs/servers/web-apps/kavita/default.nix | 6 + .../web-apps/kavita/restore-migrations.diff | 147 ++++++++++++++++++ 2 files changed, 153 insertions(+) create mode 100644 pkgs/servers/web-apps/kavita/restore-migrations.diff diff --git a/pkgs/servers/web-apps/kavita/default.nix b/pkgs/servers/web-apps/kavita/default.nix index cf9e80c89d3e..25965716d180 100644 --- a/pkgs/servers/web-apps/kavita/default.nix +++ b/pkgs/servers/web-apps/kavita/default.nix @@ -26,6 +26,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { patches = [ # The webroot is hardcoded as ./wwwroot ./change-webroot.diff + # Upstream removes database migrations between versions + # Restore them to avoid breaking on updates + # Info: Restores migrations for versions between v0.7.1.4 and v0.7.9 + # On update: check if more migrations need to be restored! + # Migrations should at least allow updates from previous NixOS versions + ./restore-migrations.diff ]; postPatch = '' substituteInPlace API/Services/DirectoryService.cs --subst-var out diff --git a/pkgs/servers/web-apps/kavita/restore-migrations.diff b/pkgs/servers/web-apps/kavita/restore-migrations.diff new file mode 100644 index 000000000000..d158f503e329 --- /dev/null +++ b/pkgs/servers/web-apps/kavita/restore-migrations.diff @@ -0,0 +1,147 @@ +diff --git a/API/Data/ManualMigrations/MigrateDisableScrobblingOnComicLibraries.cs b/API/Data/ManualMigrations/MigrateDisableScrobblingOnComicLibraries.cs +new file mode 100644 +index 00000000..0de7bf5d +--- /dev/null ++++ b/API/Data/ManualMigrations/MigrateDisableScrobblingOnComicLibraries.cs +@@ -0,0 +1,38 @@ ++using System.Linq; ++using System.Threading.Tasks; ++using API.Entities.Enums; ++using Microsoft.EntityFrameworkCore; ++using Microsoft.Extensions.Logging; ++ ++namespace API.Data.ManualMigrations; ++ ++/// ++/// v0.7.4 introduced Scrobbling with Kavita+. By default, it is on, but Comic libraries have no scrobble providers, so disable ++/// ++public static class MigrateDisableScrobblingOnComicLibraries ++{ ++ public static async Task Migrate(IUnitOfWork unitOfWork, DataContext dataContext, ILogger logger) ++ { ++ if (!await dataContext.Library.Where(s => s.Type == LibraryType.Comic).Where(l => l.AllowScrobbling).AnyAsync()) ++ { ++ return; ++ } ++ logger.LogInformation("Running MigrateDisableScrobblingOnComicLibraries migration. Please be patient, this may take some time"); ++ ++ ++ foreach (var lib in await dataContext.Library.Where(s => s.Type == LibraryType.Comic).Where(l => l.AllowScrobbling).ToListAsync()) ++ { ++ lib.AllowScrobbling = false; ++ unitOfWork.LibraryRepository.Update(lib); ++ } ++ ++ if (unitOfWork.HasChanges()) ++ { ++ await unitOfWork.CommitAsync(); ++ } ++ ++ logger.LogInformation("MigrateDisableScrobblingOnComicLibraries migration finished"); ++ ++ } ++ ++} +diff --git a/API/Data/ManualMigrations/MigrateLoginRoles.cs b/API/Data/ManualMigrations/MigrateLoginRoles.cs +new file mode 100644 +index 00000000..f649908a +--- /dev/null ++++ b/API/Data/ManualMigrations/MigrateLoginRoles.cs +@@ -0,0 +1,36 @@ ++using System.Threading.Tasks; ++using API.Constants; ++using API.Entities; ++using Microsoft.AspNetCore.Identity; ++using Microsoft.Extensions.Logging; ++ ++namespace API.Data.ManualMigrations; ++ ++/// ++/// Added in v0.7.1.18 ++/// ++public static class MigrateLoginRoles ++{ ++ /// ++ /// Will not run if any users have the role already ++ /// ++ /// ++ /// ++ /// ++ public static async Task Migrate(IUnitOfWork unitOfWork, UserManager userManager, ILogger logger) ++ { ++ var usersWithRole = await userManager.GetUsersInRoleAsync(PolicyConstants.LoginRole); ++ if (usersWithRole.Count != 0) return; ++ ++ logger.LogCritical("Running MigrateLoginRoles migration"); ++ ++ var allUsers = await unitOfWork.UserRepository.GetAllUsersAsync(); ++ foreach (var user in allUsers) ++ { ++ await userManager.RemoveFromRoleAsync(user, PolicyConstants.LoginRole); ++ await userManager.AddToRoleAsync(user, PolicyConstants.LoginRole); ++ } ++ ++ logger.LogInformation("MigrateLoginRoles migration complete"); ++ } ++} +diff --git a/API/Data/ManualMigrations/MigrateRemoveWebPSettingRows.cs b/API/Data/ManualMigrations/MigrateRemoveWebPSettingRows.cs +new file mode 100644 +index 00000000..07e98ef6 +--- /dev/null ++++ b/API/Data/ManualMigrations/MigrateRemoveWebPSettingRows.cs +@@ -0,0 +1,31 @@ ++using System.Threading.Tasks; ++using API.Entities.Enums; ++using Microsoft.Extensions.Logging; ++ ++namespace API.Data.ManualMigrations; ++ ++/// ++/// Added in v0.7.2.7/v0.7.3 in which the ConvertXToWebP Setting keys were removed. This migration will remove them. ++/// ++public static class MigrateRemoveWebPSettingRows ++{ ++ public static async Task Migrate(IUnitOfWork unitOfWork, ILogger logger) ++ { ++ logger.LogCritical("Running MigrateRemoveWebPSettingRows migration - Please be patient, this may take some time. This is not an error"); ++ ++ var key = await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.ConvertBookmarkToWebP); ++ var key2 = await unitOfWork.SettingsRepository.GetSettingAsync(ServerSettingKey.ConvertCoverToWebP); ++ if (key == null && key2 == null) ++ { ++ logger.LogCritical("Running MigrateRemoveWebPSettingRows migration - complete. Nothing to do"); ++ return; ++ } ++ ++ unitOfWork.SettingsRepository.Remove(key); ++ unitOfWork.SettingsRepository.Remove(key2); ++ ++ await unitOfWork.CommitAsync(); ++ ++ logger.LogCritical("Running MigrateRemoveWebPSettingRows migration - Completed. This is not an error"); ++ } ++} +diff --git a/API/Startup.cs b/API/Startup.cs +index 21c4fa45..04f4a077 100644 +--- a/API/Startup.cs ++++ b/API/Startup.cs +@@ -232,11 +232,19 @@ public class Startup + Task.Run(async () => + { + // Apply all migrations on startup ++ var userManager = serviceProvider.GetRequiredService>(); + var dataContext = serviceProvider.GetRequiredService(); + + + logger.LogInformation("Running Migrations"); + ++ // v0.7.2 ++ await MigrateLoginRoles.Migrate(unitOfWork, userManager, logger); ++ // v0.7.3 ++ await MigrateRemoveWebPSettingRows.Migrate(unitOfWork, logger); ++ // v0.7.4 ++ await MigrateDisableScrobblingOnComicLibraries.Migrate(unitOfWork, dataContext, logger); ++ + // v0.7.9 + await MigrateUserLibrarySideNavStream.Migrate(unitOfWork, dataContext, logger); + From 3ce10797535119f1e84770a97395f8d0afe18950 Mon Sep 17 00:00:00 2001 From: ramboman Date: Fri, 26 Apr 2024 07:03:18 +0000 Subject: [PATCH 002/246] lib.fetchers: Add uppercase proxy environment variables The [Nix installer](https://github.com/NixOS/nix/blob/84e0c464f11b34fa7d5ca26dcf98a91c4d596d59/scripts/install-systemd-multi-user.sh#L38) and the [documentation](https://github.com/NixOS/nix/blob/84e0c464f11b34fa7d5ca26dcf98a91c4d596d59/doc/manual/src/installation/env-variables.md#L54-L56) state that they support uppercase proxy environment variables. [lib/fetchers.nix](https://github.com/NixOS/nixpkgs/blob/165090ed665fd56e1cabc4e2ac3b3b5524596a6a/lib/fetchers.nix#L10) only supports lowercase proxy environment variables. Fix: [nix#10491](https://github.com/NixOS/nix/issues/10491) --- lib/fetchers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/fetchers.nix b/lib/fetchers.nix index 1107353b51dd..e94c611299be 100644 --- a/lib/fetchers.nix +++ b/lib/fetchers.nix @@ -8,6 +8,7 @@ # derivation like fetchurl is allowed to do so since its result is # by definition pure. "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + "HTTP_PROXY" "HTTPS_PROXY" "FTP_PROXY" "ALL_PROXY" "NO_PROXY" ]; } From b509436a771c000303b3e5146f7c0ed4dd83d512 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 30 Apr 2024 13:07:13 +0200 Subject: [PATCH 003/246] python3Packages.ziafont: 0.7 -> 0.8 --- pkgs/development/python-modules/ziafont/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 788dda332941..1e454f2a3044 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ziafont"; - version = "0.7"; + version = "0.8"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-DQEVWYOgiGSP3WlmZzEweyRa0UY7fxjjpbued+5EH5I="; + hash = "sha256-C+dC+mNquDuj6RfJpiEbeuGZOIXcgSrTB4XM21reBPs="; }; nativeBuildInputs = [ From fc6d0644e08d0e72f4b71e4e25c363c2f944b41b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 30 Apr 2024 13:07:35 +0200 Subject: [PATCH 004/246] python3Packages.ziamath: 0.9 -> 0.10 --- pkgs/development/python-modules/ziamath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index c2d72a25f810..578cf6a32fdd 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ziamath"; - version = "0.9"; + version = "0.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-ISd+J7R8qZ0NXdlyHMj+torzr+541UAhNCSaUH8ytSQ="; + hash = "sha256-Drssi+YySh4OhVYAOvgIwzeeu5dQbUUXuhwTedhUUt8="; }; nativeBuildInputs = [ From 415b57a01076720b674867cbb9dd614906f0c5b8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 30 Apr 2024 13:07:51 +0200 Subject: [PATCH 005/246] python3Packages.schemdraw: 0.18 -> 0.19 --- pkgs/development/python-modules/schemdraw/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index 441e668f81fc..9a152fc701b3 100644 --- a/pkgs/development/python-modules/schemdraw/default.nix +++ b/pkgs/development/python-modules/schemdraw/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "schemdraw"; - version = "0.18"; + version = "0.19"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-JJc3LA+fqB+2g7pPIZ8YMV921EyYpLZrHSJCYyYThZg="; + hash = "sha256-vqEHcazE5DNHr0FceOWLqq+RZmMK5ovHDVjy/2wbTJU="; }; nativeBuildInputs = [ @@ -59,6 +59,8 @@ buildPythonPackage rec { substituteInPlace test/test_styles.ipynb --replace "font='Times', " "" ''; + preCheck = "rm test/test_pictorial.ipynb"; # Tries to download files + pytestFlagsArray = [ "--nbval-lax" ]; pythonImportsCheck = [ "schemdraw" ]; From 6633abfa6e06e8997479f21c6bb2ce02d6133551 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 30 Apr 2024 23:14:15 +0000 Subject: [PATCH 006/246] python311Packages.inform: 1.28 -> 1.29 --- pkgs/development/python-modules/inform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index a95e9e9cc8e8..1f57a9add043 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "inform"; - version = "1.28"; + version = "1.29"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "inform"; rev = "refs/tags/v${version}"; - hash = "sha256-RA8/or3HTS/rQmG4A/Eg5j24YElaTEpnHa1yksARVMQ="; + hash = "sha256-quJGgXMvVZGqZA6M/AjU/cjYeL0R2nuPDoL0Ji0Ow6I="; }; nativeBuildInputs = [ From 243da73491d23de980b1f30bbbc4dac2551b7903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 May 2024 01:18:47 +0000 Subject: [PATCH 007/246] libsForQt5.qtkeychain: 0.14.2 -> 0.14.3 --- pkgs/development/libraries/qtkeychain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 9d27d92c62f8..9007129cecf5 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "qtkeychain"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "frankosterfeld"; repo = "qtkeychain"; rev = version; - sha256 = "sha256-aRBhg4RwK2jUQWW/OmzNSMUScaFUPdbWbApD37CXPoI="; + sha256 = "sha256-+1WX3ARH+jWeDiaJnX+ZlRMj+l3qvgBwcGKjB9QEJNI="; }; dontWrapQtApps = true; From 526b8f683b2c8b33fbc7845ef65ede8dd93149b2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Sun, 5 May 2024 12:05:42 +0100 Subject: [PATCH 008/246] libretro.ppssspp: use bundled ffmpeg --- pkgs/applications/emulators/retroarch/cores.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index b42966f5a10c..d4fb8a4c3afb 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -9,7 +9,6 @@ , fetchFromGitHub , fetchpatch , ffmpeg -, ffmpeg_4 , fluidsynth , fmt , freetype @@ -890,11 +889,13 @@ in ppsspp = mkLibretroCore { core = "ppsspp"; extraNativeBuildInputs = [ cmake pkg-config python3 ]; - extraBuildInputs = [ libGLU libGL libzip ffmpeg_4 snappy xorg.libX11 ]; + extraBuildInputs = [ libGLU libGL libzip snappy xorg.libX11 ]; makefile = "Makefile"; cmakeFlags = [ "-DLIBRETRO=ON" - "-DUSE_SYSTEM_FFMPEG=ON" + # USE_SYSTEM_FFMPEG=ON causes several glitches during video playback + # See: https://github.com/NixOS/nixpkgs/issues/304616 + "-DUSE_SYSTEM_FFMPEG=OFF" "-DUSE_SYSTEM_SNAPPY=ON" "-DUSE_SYSTEM_LIBZIP=ON" "-DOpenGL_GL_PREFERENCE=GLVND" From 282f8b7be35c1e7ea576a27004a9df99bba4714e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sun, 31 Mar 2024 23:15:54 +0200 Subject: [PATCH 009/246] nixos/bcg: fix usage without environment files The preStart script should be used only if it is really needed. --- nixos/modules/services/misc/bcg.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/bcg.nix b/nixos/modules/services/misc/bcg.nix index 626a67f66d08..63c441833d95 100644 --- a/nixos/modules/services/misc/bcg.nix +++ b/nixos/modules/services/misc/bcg.nix @@ -149,20 +149,20 @@ in systemd.services.bcg = let envConfig = cfg.environmentFiles != []; finalConfig = if envConfig - then "$RUNTIME_DIRECTORY/bcg.config.yaml" + then "\${RUNTIME_DIRECTORY}/bcg.config.yaml" else configFile; in { description = "BigClown Gateway"; wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ] ++ lib.optional config.services.mosquitto.enable "mosquitto.service"; after = [ "network-online.target" ]; - preStart = '' + preStart = mkIf envConfig '' umask 077 ${pkgs.envsubst}/bin/envsubst -i "${configFile}" -o "${finalConfig}" ''; serviceConfig = { EnvironmentFile = cfg.environmentFiles; - ExecStart="${cfg.package}/bin/bcg -c ${finalConfig} -v ${cfg.verbose}"; + ExecStart = "${cfg.package}/bin/bcg -c ${finalConfig} -v ${cfg.verbose}"; RuntimeDirectory = "bcg"; }; }; From 15a1ff783b82cbd1a4c4ab250dfd5e937f518a14 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 May 2024 04:56:13 +0000 Subject: [PATCH 010/246] armadillo: 12.8.2 -> 12.8.3 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index f7e93699968f..4ee5baa38bed 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "12.8.2"; + version = "12.8.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - hash = "sha256-A7YvjAnk9ddGQ7R4UgdBuOJ7VefkUll4/K4vXXkaw78="; + hash = "sha256-KSJYn2OHeWUEs0Daa7lUvvPYdXTCmFFYkyie3S2JAVE="; }; nativeBuildInputs = [ cmake ]; From 23dedf27d2647b7a963c40e994121d1d5a4117b0 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 8 May 2024 13:38:08 +0200 Subject: [PATCH 011/246] python3Packages.ziafont: refactor --- pkgs/development/python-modules/ziafont/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 1e454f2a3044..d50e5fdefe17 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -10,8 +10,7 @@ buildPythonPackage rec { pname = "ziafont"; version = "0.8"; - - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-C+dC+mNquDuj6RfJpiEbeuGZOIXcgSrTB4XM21reBPs="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; From 35f095b712a40b16cf9fb70816c4f475c4c135f6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 8 May 2024 13:38:21 +0200 Subject: [PATCH 012/246] python3Packages.ziamath: refactor --- pkgs/development/python-modules/ziamath/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index 578cf6a32fdd..592e486edce1 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ziamath"; version = "0.10"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,11 +23,11 @@ buildPythonPackage rec { hash = "sha256-Drssi+YySh4OhVYAOvgIwzeeu5dQbUUXuhwTedhUUt8="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ ziafont ]; From edcbc9acf4bb1d740986c4af2bf5b9ddb91dca37 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 8 May 2024 13:38:31 +0200 Subject: [PATCH 013/246] python3Packages.schemdraw: refactor --- pkgs/development/python-modules/schemdraw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index 9a152fc701b3..08eecb1d8a2d 100644 --- a/pkgs/development/python-modules/schemdraw/default.nix +++ b/pkgs/development/python-modules/schemdraw/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "schemdraw"; version = "0.19"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -26,15 +26,15 @@ buildPythonPackage rec { hash = "sha256-vqEHcazE5DNHr0FceOWLqq+RZmMK5ovHDVjy/2wbTJU="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyparsing ]; - passthru.optional-dependencies = { + optional-dependencies = { matplotlib = [ matplotlib ]; From 0af6614fac80e8f2086ae232317bd81d9e8e3712 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:20:12 +0200 Subject: [PATCH 014/246] python312Packages.fakeredis: 2.21.3 -> 2.23.0 Diff: https://github.com/dsoftwareinc/fakeredis-py/compare/refs/tags/v2.21.3...v2.23.0 Changelog: https://github.com/cunla/fakeredis-py/releases/tag/v2.23.0 --- pkgs/development/python-modules/fakeredis/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 45a2a512d513..8f601e1bdc02 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "2.21.3"; + version = "2.23.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-GIg+a8G5S0dmbvMKqS/Vn+wzNM6iNIs3bKPqhecsQt4="; + hash = "sha256-qiqJO8uZ3vy9TpTHmExlUoQ78avPVqlKn0jgvDsKdP0="; }; nativeBuildInputs = [ @@ -67,6 +67,11 @@ buildPythonPackage rec { "fakeredis" ]; + disabledTests = [ + # AssertionError + "test_command" + ]; + meta = with lib; { description = "Fake implementation of Redis API"; homepage = "https://github.com/dsoftwareinc/fakeredis-py"; From 6bcc2e004b6adc24593e58d46b96676d827fa38c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:21:08 +0200 Subject: [PATCH 015/246] python312Packages.fakeredis: refactor --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 8f601e1bdc02..1f48eb7376e7 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { hash = "sha256-qiqJO8uZ3vy9TpTHmExlUoQ78avPVqlKn0jgvDsKdP0="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ redis sortedcontainers ]; From 93e545b271419e55f912f946dc426453ab1c075d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 May 2024 20:21:50 +0200 Subject: [PATCH 016/246] python312Packages.fakeredis: format with nixfmt --- .../python-modules/fakeredis/default.nix | 59 ++++++++----------- 1 file changed, 23 insertions(+), 36 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 1f48eb7376e7..d3ef95253add 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -1,18 +1,19 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, hypothesis -, jsonpath-ng -, lupa -, poetry-core -, pybloom-live -, pyprobables -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, pythonOlder -, redis -, sortedcontainers +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hypothesis, + jsonpath-ng, + lupa, + poetry-core, + pybloom-live, + pyprobables, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + pythonOlder, + redis, + sortedcontainers, }: buildPythonPackage rec { @@ -29,9 +30,7 @@ buildPythonPackage rec { hash = "sha256-qiqJO8uZ3vy9TpTHmExlUoQ78avPVqlKn0jgvDsKdP0="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ redis @@ -46,26 +45,14 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - lua = [ - lupa - ]; - json = [ - jsonpath-ng - ]; - bf = [ - pyprobables - ]; - cf = [ - pyprobables - ]; - probabilistic = [ - pyprobables - ]; + lua = [ lupa ]; + json = [ jsonpath-ng ]; + bf = [ pyprobables ]; + cf = [ pyprobables ]; + probabilistic = [ pyprobables ]; }; - pythonImportsCheck = [ - "fakeredis" - ]; + pythonImportsCheck = [ "fakeredis" ]; disabledTests = [ # AssertionError From 4ee96b38dc476508da6b11125ad5c3ed97026f63 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 9 May 2024 14:51:22 +0800 Subject: [PATCH 017/246] deepin.dtk6core: init at 6.0.15 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/library/dtk6core/default.nix | 84 +++++++++++++++++++ .../library/dtk6core/fix-pkgconfig-path.patch | 14 ++++ .../library/dtk6core/fix-pri-path.patch | 17 ++++ 4 files changed, 116 insertions(+) create mode 100644 pkgs/desktops/deepin/library/dtk6core/default.nix create mode 100644 pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch create mode 100644 pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 2edf1359bee9..2b4a78283478 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -7,6 +7,7 @@ let #### LIBRARIES dtkcommon = callPackage ./library/dtkcommon { }; dtkcore = callPackage ./library/dtkcore { }; + dtk6core = callPackage ./library/dtk6core { }; dtkgui = callPackage ./library/dtkgui { }; dtkwidget = callPackage ./library/dtkwidget { }; dtkdeclarative = callPackage ./library/dtkdeclarative { }; diff --git a/pkgs/desktops/deepin/library/dtk6core/default.nix b/pkgs/desktops/deepin/library/dtk6core/default.nix new file mode 100644 index 000000000000..d86bebdea1d8 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6core/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, doxygen +, qt6Packages +, lshw +, libuchardet +, spdlog +, dtkcommon +, systemd +, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dtk6core"; + version = "6.0.15"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dtk6core"; + rev = finalAttrs.version; + hash = "sha256-zUJFilafR0hNH/Owmuyh6BLBFPbBuFKcHv40fena0GM="; + }; + + patches = [ + ./fix-pkgconfig-path.patch + ./fix-pri-path.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + doxygen + qt6Packages.qttools + qt6Packages.wrapQtAppsHook + ]; + + dontWrapQtApps = true; + + buildInputs = [ + qt6Packages.qtbase + lshw + libuchardet + spdlog + ] + ++ lib.optional withSystemd systemd; + + propagatedBuildInputs = [ dtkcommon ]; + + cmakeFlags = [ + "-DDTK_VERSION=${finalAttrs.version}" + "-DBUILD_DOCS=ON" + "-DBUILD_EXAMPLES=OFF" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" + "-DDSG_PREFIX_PATH='/run/current-system/sw'" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DD_DSG_APP_DATA_FALLBACK=/var/dsg/appdata" + "-DBUILD_WITH_SYSTEMD=${if withSystemd then "ON" else "OFF"}" + ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} + ''; + + outputs = [ "out" "dev" "doc" ]; + + postFixup = '' + for binary in $out/libexec/dtk6/DCore/bin/*; do + wrapQtApp $binary + done + ''; + + meta = { + description = "Deepin tool kit core library"; + homepage = "https://github.com/linuxdeepin/dtk6core"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +}) diff --git a/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch new file mode 100644 index 000000000000..570e34c06147 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6core/fix-pkgconfig-path.patch @@ -0,0 +1,14 @@ +diff --git a/misc/dtkcore.pc.in b/misc/dtkcore.pc.in +index 83eecb7..da24ce8 100644 +--- a/misc/dtkcore.pc.in ++++ b/misc/dtkcore.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@LIBRARY_INSTALL_DIR@ +-includedir=${prefix}/@INCLUDE_INSTALL_DIR@ ++libdir=@LIBRARY_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ + + Name: dtk@DTK_VERSION_MAJOR@core + Description: Deepin Tool Kit dtkcore header files diff --git a/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch new file mode 100644 index 000000000000..19953ed1733d --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6core/fix-pri-path.patch @@ -0,0 +1,17 @@ +diff --git a/misc/qt_lib_dtkcore.pri.in b/misc/qt_lib_dtkcore.pri.in +index a331f52..ce01dc0 100644 +--- a/misc/qt_lib_dtkcore.pri.in ++++ b/misc/qt_lib_dtkcore.pri.in +@@ -4,9 +4,9 @@ QT.dtkcore.MINOR_VERSION = @PROJECT_VERSION_MINOR@ + QT.dtkcore.PATCH_VERSION = @PROJECT_VERSION_PATCH@ + QT.dtkcore.name = dtkcore + QT.dtkcore.module = dtk@DTK_VERSION_MAJOR@core +-QT.dtkcore.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ +-QT.dtkcore.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ +-QT.dtkcore.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ ++QT.dtkcore.tools = @TOOL_INSTALL_DIR@ ++QT.dtkcore.libs = @LIBRARY_INSTALL_DIR@ ++QT.dtkcore.includes = @INCLUDE_INSTALL_DIR@ + QT.dtkcore.frameworks = + QT.dtkcore.depends = core dbus xml + QT.dtkcore.module_config = v2 ltcg From bdc7fd3ca999ed697e19404f6ed4407d81f3f0e7 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 9 May 2024 15:49:47 +0800 Subject: [PATCH 018/246] deepin.dtk6gui: init at 6.0.15 --- pkgs/desktops/deepin/default.nix | 3 +- .../deepin/library/dtk6gui/default.nix | 74 +++++++++++++++++++ .../library/dtk6gui/fix-pkgconfig-path.patch | 16 ++++ .../deepin/library/dtk6gui/fix-pri-path.patch | 17 +++++ 4 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/deepin/library/dtk6gui/default.nix create mode 100644 pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch create mode 100644 pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 2b4a78283478..234cad9d4b6a 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -7,7 +7,6 @@ let #### LIBRARIES dtkcommon = callPackage ./library/dtkcommon { }; dtkcore = callPackage ./library/dtkcore { }; - dtk6core = callPackage ./library/dtk6core { }; dtkgui = callPackage ./library/dtkgui { }; dtkwidget = callPackage ./library/dtkwidget { }; dtkdeclarative = callPackage ./library/dtkdeclarative { }; @@ -24,6 +23,8 @@ let image-editor = callPackage ./library/image-editor { }; udisks2-qt5 = callPackage ./library/udisks2-qt5 { }; util-dfm = callPackage ./library/util-dfm { }; + dtk6core = callPackage ./library/dtk6core { }; + dtk6gui = callPackage ./library/dtk6gui { }; #### CORE deepin-kwin = callPackage ./core/deepin-kwin { }; diff --git a/pkgs/desktops/deepin/library/dtk6gui/default.nix b/pkgs/desktops/deepin/library/dtk6gui/default.nix new file mode 100644 index 000000000000..73638c39e62f --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6gui/default.nix @@ -0,0 +1,74 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, doxygen +, qt6Packages +, dtk6core +, librsvg +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dtk6gui"; + version = "6.0.15"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dtk6gui"; + rev = finalAttrs.version; + hash = "sha256-B/A3VXPCon+NIUhO+IVGoojACVjut2h0nH5pLdJYufw="; + }; + + patches = [ + ./fix-pkgconfig-path.patch + ./fix-pri-path.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + doxygen + qt6Packages.qttools + qt6Packages.wrapQtAppsHook + ]; + + buildInputs = [ + qt6Packages.qtbase + librsvg + ]; + + propagatedBuildInputs = [ + dtk6core + qt6Packages.qtimageformats + ]; + + cmakeFlags = [ + "-DDTK_VERSION=${finalAttrs.version}" + "-DBUILD_DOCS=ON" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" + ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} + ''; + + outputs = [ "out" "dev" "doc" ]; + + postFixup = '' + for binary in $out/libexec/dtk6/DGui/bin/*; do + wrapQtApp $binary + done + ''; + + meta = { + description = "Deepin Toolkit, gui module for DDE look and feel"; + homepage = "https://github.com/linuxdeepin/dtk6gui"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +}) diff --git a/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch new file mode 100644 index 000000000000..1485baccc204 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6gui/fix-pkgconfig-path.patch @@ -0,0 +1,16 @@ +diff --git a/misc/dtkgui.pc.in b/misc/dtkgui.pc.in +index 89fdbbf..ad817c4 100644 +--- a/misc/dtkgui.pc.in ++++ b/misc/dtkgui.pc.in +@@ -1,8 +1,8 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@LIBRARY_INSTALL_DIR@ +-includedir=${prefix}/@INCLUDE_INSTALL_DIR@ +-tooldir=${prefix}/@PACKAGE_TOOL_INSTALL_DIR@ ++libdir=@LIBRARY_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ ++tooldir=@PACKAGE_TOOL_INSTALL_DIR@ + + Name: dtk@DTK_VERSION_MAJOR@gui + Description: Deepin Tool Kit dtkgui header files diff --git a/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch new file mode 100644 index 000000000000..b746d34b1c79 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6gui/fix-pri-path.patch @@ -0,0 +1,17 @@ +diff --git a/misc/qt_lib_dtkgui.pri.in b/misc/qt_lib_dtkgui.pri.in +index 28308ee..9fb25e6 100644 +--- a/misc/qt_lib_dtkgui.pri.in ++++ b/misc/qt_lib_dtkgui.pri.in +@@ -4,9 +4,9 @@ QT.dtkgui.MINOR_VERSION = @PROJECT_VERSION_MINOR@ + QT.dtkgui.PATCH_VERSION = @PROJECT_VERSION_PATCH@ + QT.dtkgui.name = dtkgui + QT.dtkgui.module = dtk@DTK_VERSION_MAJOR@gui +-QT.dtkgui.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ +-QT.dtkgui.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ +-QT.dtkgui.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ ++QT.dtkgui.tools = @TOOL_INSTALL_DIR@ ++QT.dtkgui.libs = @LIBRARY_INSTALL_DIR@ ++QT.dtkgui.includes = @INCLUDE_INSTALL_DIR@ + QT.dtkgui.frameworks = + QT.dtkgui.depends = core gui dtkcore gui_private dbus network + QT.dtkgui.module_config = v2 internal_module ltcg From 703ccfb34aa3bdfc61399e53c72a671dc48958a8 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 9 May 2024 16:02:21 +0800 Subject: [PATCH 019/246] deepin.dtk6widget: init at 6.0.15 --- pkgs/desktops/deepin/default.nix | 1 + .../deepin/library/dtk6widget/default.nix | 83 +++++++++++++++++++ .../dtk6widget/fix-build-on-qt-6_7.patch | 20 +++++ .../dtk6widget/fix-pkgconfig-path.patch | 14 ++++ .../library/dtk6widget/fix-pri-path.patch | 17 ++++ 5 files changed, 135 insertions(+) create mode 100644 pkgs/desktops/deepin/library/dtk6widget/default.nix create mode 100644 pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch create mode 100644 pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch create mode 100644 pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 234cad9d4b6a..b0249c0f4625 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -25,6 +25,7 @@ let util-dfm = callPackage ./library/util-dfm { }; dtk6core = callPackage ./library/dtk6core { }; dtk6gui = callPackage ./library/dtk6gui { }; + dtk6widget = callPackage ./library/dtk6widget { }; #### CORE deepin-kwin = callPackage ./core/deepin-kwin { }; diff --git a/pkgs/desktops/deepin/library/dtk6widget/default.nix b/pkgs/desktops/deepin/library/dtk6widget/default.nix new file mode 100644 index 000000000000..3c1870581988 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6widget/default.nix @@ -0,0 +1,83 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, doxygen +, qt6Packages +, dtk6gui +, cups +, libstartup_notification +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dtk6widget"; + version = "6.0.15"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dtk6widget"; + rev = finalAttrs.version; + hash = "sha256-QCdRjkD4JTPecLeZK+Y5U/H9pBgKI4DHRuchz/GymWQ="; + }; + + patches = [ + ./fix-pkgconfig-path.patch + ./fix-pri-path.patch + ./fix-build-on-qt-6_7.patch + ]; + + postPatch = '' + substituteInPlace src/widgets/dapplication.cpp \ + --replace-fail "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);" \ + "auto dataDirs = DStandardPaths::standardLocations(QStandardPaths::GenericDataLocation) << \"$out/share\";" + ''; + + nativeBuildInputs = [ + cmake + doxygen + pkg-config + qt6Packages.qttools + qt6Packages.wrapQtAppsHook + ]; + + buildInputs = [ + cups + libstartup_notification + ] ++ (with qt6Packages; [ + qtbase + qtmultimedia + qtsvg + ]); + + propagatedBuildInputs = [ dtk6gui ]; + + cmakeFlags = [ + "-DDTK_VERSION=${finalAttrs.version}" + "-DBUILD_DOCS=ON" + "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" + ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} + ''; + + outputs = [ "out" "dev" "doc" ]; + + postFixup = '' + for binary in $out/lib/dtk6/DWidget/bin/*; do + wrapQtApp $binary + done + ''; + + meta = { + description = "Deepin graphical user interface library"; + homepage = "https://github.com/linuxdeepin/dtk6widget"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +}) diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch new file mode 100644 index 000000000000..16d2d2ec9b54 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6widget/fix-build-on-qt-6_7.patch @@ -0,0 +1,20 @@ +diff --git a/src/widgets/dkeysequenceedit.cpp b/src/widgets/dkeysequenceedit.cpp +index a99e17ae..0e1c57f6 100644 +--- a/src/widgets/dkeysequenceedit.cpp ++++ b/src/widgets/dkeysequenceedit.cpp +@@ -276,13 +276,13 @@ void DKeySequenceEdit::keyPressEvent(QKeyEvent *e) + } + + if (e->modifiers() & Qt::ShiftModifier) { +- QList possibleKeys = QKeyMapper::possibleKeys(e); ++ auto possibleKeys = QKeyMapper::possibleKeys(e); + int pkTotal = possibleKeys.count(); + if (!pkTotal) + return; + bool found = false; + for (int i = 0; i < possibleKeys.size(); ++i) { +- if (possibleKeys.at(i) - nextKey == int(e->modifiers()) ++ if (static_cast(possibleKeys.at(i)) - nextKey == static_cast(e->modifiers()) + || (possibleKeys.at(i) == nextKey && e->modifiers() == Qt::ShiftModifier)) { + nextKey = possibleKeys.at(i); + found = true; diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch new file mode 100644 index 000000000000..df4452259580 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6widget/fix-pkgconfig-path.patch @@ -0,0 +1,14 @@ +diff --git a/misc/DtkWidget.pc.in b/misc/DtkWidget.pc.in +index 3c610669..b6ed04ca 100644 +--- a/misc/DtkWidget.pc.in ++++ b/misc/DtkWidget.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@LIBRARY_INSTALL_DIR@ +-includedir=${prefix}/@INCLUDE_INSTALL_DIR@ ++libdir=@LIBRARY_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ + + Name: dtk@DTK_VERSION_MAJOR@widget + Description: Deepin Tool Kit dtkwidget header files diff --git a/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch new file mode 100644 index 000000000000..cf2faac94855 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6widget/fix-pri-path.patch @@ -0,0 +1,17 @@ +diff --git a/misc/qt_lib_DtkWidget.pri.in b/misc/qt_lib_DtkWidget.pri.in +index 623878d3..561f5186 100644 +--- a/misc/qt_lib_DtkWidget.pri.in ++++ b/misc/qt_lib_DtkWidget.pri.in +@@ -4,9 +4,9 @@ QT.dtkwidget.MINOR_VERSION = @PROJECT_VERSION_MINOR@ + QT.dtkwidget.PATCH_VERSION = @PROJECT_VERSION_PATCH@ + QT.dtkwidget.name = dtkwidget + QT.dtkwidget.module = dtk@DTK_VERSION_MAJOR@widget +-QT.dtkwidget.tools = @CMAKE_INSTALL_PREFIX@/@TOOL_INSTALL_DIR@ +-QT.dtkwidget.libs = @CMAKE_INSTALL_PREFIX@/@LIBRARY_INSTALL_DIR@ +-QT.dtkwidget.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ ++QT.dtkwidget.tools = @TOOL_INSTALL_DIR@ ++QT.dtkwidget.libs = @LIBRARY_INSTALL_DIR@ ++QT.dtkwidget.includes = @INCLUDE_INSTALL_DIR@ + QT.dtkwidget.frameworks = + QT.dtkwidget.depends = core gui dtkcore network concurrent dtkgui printsupport printsupport_private widgets widgets_private gui_private x11extras dbus + QT.dtkwidget.module_config = v2 internal_module ltcg From 6a52b0a1ec343e01b2d67368afb59d616113aeb9 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 9 May 2024 16:48:52 +0800 Subject: [PATCH 020/246] deepin.dtk6declarative: init at 6.0.15 --- pkgs/desktops/deepin/default.nix | 1 + .../library/dtk6declarative/default.nix | 70 +++++++++++++++++++ .../dtk6declarative/fix-pkgconfig-path.patch | 14 ++++ .../dtk6declarative/fix-pri-path.patch | 15 ++++ 4 files changed, 100 insertions(+) create mode 100644 pkgs/desktops/deepin/library/dtk6declarative/default.nix create mode 100644 pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch create mode 100644 pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index b0249c0f4625..0d33a1f74824 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -26,6 +26,7 @@ let dtk6core = callPackage ./library/dtk6core { }; dtk6gui = callPackage ./library/dtk6gui { }; dtk6widget = callPackage ./library/dtk6widget { }; + dtk6declarative = callPackage ./library/dtk6declarative { }; #### CORE deepin-kwin = callPackage ./core/deepin-kwin { }; diff --git a/pkgs/desktops/deepin/library/dtk6declarative/default.nix b/pkgs/desktops/deepin/library/dtk6declarative/default.nix new file mode 100644 index 000000000000..ecafebf66b71 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6declarative/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, doxygen +, qt6Packages +, dtk6gui +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dtk6declarative"; + version = "6.0.15"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = "dtk6declarative"; + rev = finalAttrs.version; + hash = "sha256-euHEfK2N2jtWMzeajgvTnHSl39zXwp7I0cQIqZRVGZ0="; + }; + + patches = [ + ./fix-pkgconfig-path.patch + ./fix-pri-path.patch + ]; + + nativeBuildInputs = [ + cmake + pkg-config + doxygen + qt6Packages.qttools + qt6Packages.wrapQtAppsHook + ]; + + propagatedBuildInputs = [ + dtk6gui + ] ++ (with qt6Packages ; [ + qtbase + qtdeclarative + qtshadertools + qt5compat + ]); + + cmakeFlags = [ + "-DDTK_VERSION=${finalAttrs.version}" + "-DBUILD_DOCS=ON" + "-DBUILD_EXAMPLES=ON" + "-DMKSPECS_INSTALL_DIR=${placeholder "dev"}/mkspecs/modules" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" + "-DQML_INSTALL_DIR=${placeholder "out"}/${qt6Packages.qtbase.qtQmlPrefix}" + ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} + export QML2_IMPORT_PATH=${lib.getBin qt6Packages.qtdeclarative}/${qt6Packages.qtbase.qtQmlPrefix} + ''; + + outputs = [ "out" "dev" "doc" ]; + + meta = { + description = "A widget development toolkit based on QtQuick/QtQml"; + mainProgram = "dtk-exhibition"; + homepage = "https://github.com/linuxdeepin/dtk6declarative"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +}) diff --git a/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch b/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch new file mode 100644 index 000000000000..e15ee2f7a0b8 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6declarative/fix-pkgconfig-path.patch @@ -0,0 +1,14 @@ +diff --git a/misc/dtkdeclarative.pc.in b/misc/dtkdeclarative.pc.in +index dc3827f..fd0949e 100644 +--- a/misc/dtkdeclarative.pc.in ++++ b/misc/dtkdeclarative.pc.in +@@ -1,7 +1,7 @@ + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@LIB_INSTALL_DIR@ +-includedir=${prefix}/@INCLUDE_INSTALL_DIR@ ++libdir=@LIB_INSTALL_DIR@ ++includedir=@INCLUDE_INSTALL_DIR@ + + Name: DtkDeclarative + Description: Deepin Tool Kit DtkDeclarative header files diff --git a/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch b/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch new file mode 100644 index 000000000000..e622809c3936 --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6declarative/fix-pri-path.patch @@ -0,0 +1,15 @@ +diff --git a/misc/qt_lib_dtkdeclarative.pri.in b/misc/qt_lib_dtkdeclarative.pri.in +index 8797802..44e32a3 100644 +--- a/misc/qt_lib_dtkdeclarative.pri.in ++++ b/misc/qt_lib_dtkdeclarative.pri.in +@@ -4,8 +4,8 @@ QT.dtkdeclarative.MINOR_VERSION = @PROJECT_VERSION_MINOR@ + QT.dtkdeclarative.PATCH_VERSION = @PROJECT_VERSION_PATCH@ + QT.dtkdeclarative.name = dtkdeclarative + QT.dtkdeclarative.module = dtk@DTK_VERSION_MAJOR@declarative +-QT.dtkdeclarative.libs = @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@ +-QT.dtkdeclarative.includes = @CMAKE_INSTALL_PREFIX@/@INCLUDE_INSTALL_DIR@ ++QT.dtkdeclarative.libs = @LIB_INSTALL_DIR@ ++QT.dtkdeclarative.includes = @INCLUDE_INSTALL_DIR@ + QT.dtkdeclarative.frameworks = + QT.dtkdeclarative.depends = core dbus xml gui dtkcore dtkgui quick quick_private + QT.dtkdeclarative.module_config = v2 ltcg From 1c0f273dbb64858dc694cdca8a104859cc524e61 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 9 May 2024 17:07:05 +0800 Subject: [PATCH 021/246] deepin.dtk6systemsettings: init at 6.0.2 --- pkgs/desktops/deepin/default.nix | 1 + .../library/dtk6systemsettings/default.nix | 63 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 pkgs/desktops/deepin/library/dtk6systemsettings/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 0d33a1f74824..4b2dc27c1100 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -27,6 +27,7 @@ let dtk6gui = callPackage ./library/dtk6gui { }; dtk6widget = callPackage ./library/dtk6widget { }; dtk6declarative = callPackage ./library/dtk6declarative { }; + dtk6systemsettings = callPackage ./library/dtk6systemsettings { }; #### CORE deepin-kwin = callPackage ./core/deepin-kwin { }; diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix new file mode 100644 index 000000000000..d9f400ce979f --- /dev/null +++ b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, doxygen +, qt6Packages +, dtk6core +, libxcrypt +}: + +stdenv.mkDerivation rec { + pname = "dtk6systemsettings"; + version = "6.0.2"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + hash = "sha256-b/iI2OKQQoFj3vWatfGdDP9z+SEsK5XBra9KqjlGzqs="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + doxygen + qt6Packages.qttools + ]; + + dontWrapQtApps = true; + + buildInputs = [ + qt6Packages.qtbase + dtk6core + libxcrypt + ]; + + cmakeFlags = [ + "-DDTK_VERSION=${version}" + "-DBUILD_DOCS=ON" + "-DBUILD_EXAMPLES=OFF" + "-DQCH_INSTALL_DESTINATION=${placeholder "doc"}/share/doc" + "-DMKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs/modules" + "-DDTK_INCLUDE_INSTALL_DIR=${placeholder "dev"}/include/dtk/DSystemSettings" + ]; + + preConfigure = '' + # qt.qpa.plugin: Could not find the Qt platform plugin "minimal" + # A workaround is to set QT_PLUGIN_PATH explicitly + export QT_PLUGIN_PATH=${lib.getBin qt6Packages.qtbase}/${qt6Packages.qtbase.qtPluginPrefix} + ''; + + outputs = [ "out" "dev" "doc" ]; + + meta = { + description = "Qt-based development library for system settings"; + homepage = "https://github.com/linuxdeepin/dtk6systemsettings"; + license = lib.licenses.lgpl3Plus; + platforms = lib.platforms.linux; + maintainers = lib.teams.deepin.members; + }; +} From 616dc50aad9860aa4c3baf17c39efc468c39d205 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 17:59:24 +0200 Subject: [PATCH 022/246] python312Packages.dbus-fast: 2.21.1 -> 2.21.2 Diff: https://github.com/Bluetooth-Devices/dbus-fast/compare/refs/tags/v2.21.1...v2.21.2 Changelog: https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v2.21.2 --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index d4db4490415b..9f7bfcc4cc03 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "2.21.1"; + version = "2.21.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-L3PZjxbcVfqWktWuN5l8JxfR1GyxuA+1ZtO/W2YqFZA="; + hash = "sha256-CLv8pNs6P2XRNK5wjo2SbRUuasJVXvd9LFABOwjDA9k="; }; # The project can build both an optimized cython version and an unoptimized From 5f0f2e5064a08ef5b90d4a46aa2b9184c689bcad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 18:01:14 +0200 Subject: [PATCH 023/246] python312Packages.dbus-fast: refactor --- pkgs/development/python-modules/dbus-fast/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 9f7bfcc4cc03..88eedd9f8d96 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "dbus-fast"; version = "2.21.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Bluetooth-Devices"; - repo = pname; + repo = "dbus-fast"; rev = "refs/tags/v${version}"; hash = "sha256-CLv8pNs6P2XRNK5wjo2SbRUuasJVXvd9LFABOwjDA9k="; }; @@ -29,14 +29,14 @@ buildPythonPackage rec { # python version. This ensures we fail if we build the wrong one. env.REQUIRE_CYTHON = 1; - nativeBuildInputs = [ + build-system = [ cython poetry-core setuptools wheel ]; - propagatedBuildInputs = [ + dependencies = [ async-timeout ]; From 378345e8ffd8ae47ca9b35e210eb9189d83f480d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 May 2024 18:01:30 +0200 Subject: [PATCH 024/246] python312Packages.dbus-fast: format with nixfmt --- .../python-modules/dbus-fast/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 88eedd9f8d96..736605ebece8 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -1,14 +1,15 @@ -{ lib -, async-timeout -, buildPythonPackage -, cython -, fetchFromGitHub -, poetry-core -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools -, wheel +{ + lib, + async-timeout, + buildPythonPackage, + cython, + fetchFromGitHub, + poetry-core, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, + wheel, }: buildPythonPackage rec { @@ -36,9 +37,7 @@ buildPythonPackage rec { wheel ]; - dependencies = [ - async-timeout - ]; + dependencies = [ async-timeout ]; nativeCheckInputs = [ pytest-asyncio From 00725d8642865503b39ccdb22fcd77a192349bc3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 10 May 2024 11:24:09 +0200 Subject: [PATCH 025/246] pcre2: fix build for loongarch64 The JIT has missing constants on this platform. Looks like it might be fixed in the upcoming release. --- pkgs/development/libraries/pcre2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 23234c40e3f8..c30a3c379d1d 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { "--enable-pcre2-16" "--enable-pcre2-32" # only enable jit on supported platforms which excludes Apple Silicon, see https://github.com/zherczeg/sljit/issues/51 - "--enable-jit=${if stdenv.hostPlatform.isS390x then "no" else "auto"}" + "--enable-jit=${if stdenv.hostPlatform.isS390x || stdenv.hostPlatform.isLoongArch64 then "no" else "auto"}" ] # fix pcre jit in systemd units that set MemoryDenyWriteExecute=true like gitea ++ lib.optional withJitSealloc "--enable-jit-sealloc"; From 3e1464aff56e5c26996e974a0a5702357a01a127 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 11 May 2024 07:26:13 +0000 Subject: [PATCH 026/246] tabby: 0.10.0 -> 0.11.0 --- pkgs/by-name/ta/tabby/Cargo.lock | 1900 ++++++++++++++++++----------- pkgs/by-name/ta/tabby/package.nix | 7 +- 2 files changed, 1188 insertions(+), 719 deletions(-) diff --git a/pkgs/by-name/ta/tabby/Cargo.lock b/pkgs/by-name/ta/tabby/Cargo.lock index 9a443d99f541..873b1d4d25ae 100644 --- a/pkgs/by-name/ta/tabby/Cargo.lock +++ b/pkgs/by-name/ta/tabby/Cargo.lock @@ -19,12 +19,12 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.7" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.11", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -41,7 +41,7 @@ dependencies = [ [[package]] name = "aim-downloader" -version = "0.10.0" +version = "0.11.0" dependencies = [ "async-stream", "clap", @@ -52,7 +52,7 @@ dependencies = [ "indicatif", "netrc", "regex", - "reqwest", + "reqwest 0.12.4", "serial_test 2.0.0", "sha2", "strfmt", @@ -145,6 +145,86 @@ version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +[[package]] +name = "apalis" +version = "0.5.1" +source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" +dependencies = [ + "apalis-core", + "apalis-cron", + "apalis-redis", + "apalis-sql", + "futures", + "pin-project-lite", + "serde", + "thiserror", + "tokio", + "tower", + "tracing", + "tracing-futures", +] + +[[package]] +name = "apalis-core" +version = "0.5.1" +source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" +dependencies = [ + "async-oneshot", + "futures", + "pin-project-lite", + "serde", + "serde_json", + "thiserror", + "tokio", + "tower", + "ulid", +] + +[[package]] +name = "apalis-cron" +version = "0.5.1" +source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" +dependencies = [ + "apalis-core", + "async-stream", + "chrono", + "cron", + "futures", + "tower", +] + +[[package]] +name = "apalis-redis" +version = "0.5.1" +source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" +dependencies = [ + "apalis-core", + "async-stream", + "async-trait", + "chrono", + "futures", + "log", + "redis", + "serde", + "tokio", +] + +[[package]] +name = "apalis-sql" +version = "0.5.1" +source = "git+https://github.com/wsxiaoys/apalis?rev=91526e8#91526e811607ec72ab83583547c0e8005c24d394" +dependencies = [ + "apalis-core", + "async-stream", + "futures", + "futures-lite", + "log", + "serde", + "serde_json", + "sqlx", + "tokio", +] + [[package]] name = "arc-swap" version = "1.6.0" @@ -195,20 +275,29 @@ dependencies = [ ] [[package]] -name = "async-openai" -version = "0.18.3" +name = "async-oneshot" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea5c9223f84965c603fd58c4c9ddcd1907efb2e54acf6fb47039358cd374df4" +checksum = "ae47de2a02d543205f3f5457a90b6ecbc9494db70557bd29590ec8f1ddff5463" +dependencies = [ + "futures-micro", +] + +[[package]] +name = "async-openai" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11e97f9c5e0ee3260caee9700ba1bb61a6fdc34d2b6786a31e018c5de5198491" dependencies = [ "async-convert", "backoff", - "base64 0.21.5", + "base64 0.22.0", "bytes", - "derive_builder", + "derive_builder 0.20.0", "futures", - "rand 0.8.5", - "reqwest", - "reqwest-eventsource 0.4.0", + "rand", + "reqwest 0.12.4", + "reqwest-eventsource", "secrecy", "serde", "serde_json", @@ -243,9 +332,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", @@ -262,13 +351,15 @@ dependencies = [ ] [[package]] -name = "atomic-write-file" -version = "0.1.2" +name = "auto_enums" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcdbedc2236483ab103a53415653d6b4442ea6141baf1ffa85df29635e88436" +checksum = "1899bfcfd9340ceea3533ea157360ba8fa864354eccbceab58e1006ecab35393" dependencies = [ - "nix", - "rand 0.8.5", + "derive_utils", + "proc-macro2", + "quote", + "syn 2.0.52", ] [[package]] @@ -279,20 +370,20 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.20" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" dependencies = [ "async-trait", "axum-core", "base64 0.21.5", - "bitflags 1.3.2", "bytes", "futures-util", - "headers", - "http", - "http-body", - "hyper", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "itoa", "matchit", "memchr", @@ -305,44 +396,71 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 1.0.1", "tokio", "tokio-tungstenite", "tower", "tower-layer", "tower-service", + "tracing", ] [[package]] name = "axum-core" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "mime", + "pin-project-lite", "rustversion", + "sync_wrapper 0.1.2", "tower-layer", "tower-service", + "tracing", ] [[package]] -name = "axum-prometheus" -version = "0.4.0" +name = "axum-extra" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97def327c5481791abb57ac295bfc70f2e1a0727675b7dbf74bd1b27a72b6fd8" +checksum = "0be6ea09c9b96cb5076af0de2e383bd2bc0c18f827cf1967bdd353e0b910d733" dependencies = [ "axum", "axum-core", "bytes", + "futures-util", + "headers", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "mime", + "pin-project-lite", + "serde", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "axum-prometheus" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b683cbc43010e9a3d72c2f31ca464155ff4f95819e88a32924b0f47a43898978" +dependencies = [ + "axum", + "bytes", "futures", "futures-core", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.0", "matchit", "metrics", "metrics-exporter-prometheus", @@ -350,23 +468,7 @@ dependencies = [ "pin-project", "tokio", "tower", - "tower-http 0.4.0", -] - -[[package]] -name = "axum-tracing-opentelemetry" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164b95427e83b79583c7699a72b4a6b485a12bbdef5b5c054ee5ff2296d82f52" -dependencies = [ - "axum", - "futures", - "http", - "opentelemetry", - "tower", - "tower-http 0.3.5", - "tracing", - "tracing-opentelemetry", + "tower-http", ] [[package]] @@ -376,10 +478,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom 0.2.11", + "getrandom", "instant", "pin-project-lite", - "rand 0.8.5", + "rand", "tokio", ] @@ -473,23 +575,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bson" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0aa578035b938855a710ba58d43cfb4d435f3619f99236fb35922a574d6cb1" -dependencies = [ - "base64 0.13.1", - "chrono", - "hex", - "lazy_static", - "linked-hash-map", - "rand 0.7.3", - "serde", - "serde_json", - "uuid 0.8.2", -] - [[package]] name = "bstr" version = "1.7.0" @@ -563,7 +648,7 @@ dependencies = [ "petgraph", "semver", "serde", - "toml", + "toml 0.7.4", "url", ] @@ -692,6 +777,20 @@ dependencies = [ "unreachable", ] +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "futures-core", + "memchr", + "pin-project-lite", + "tokio", + "tokio-util", +] + [[package]] name = "console" version = "0.15.7" @@ -762,9 +861,9 @@ dependencies = [ [[package]] name = "cron" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff76b51e4c068c52bfd2866e1567bee7c567ae8f24ada09fd4307019e25eab7" +checksum = "6f8c3e73077b4b4a6ab1ea5047c37c57aee77657bc8ecd6f29b0af082d0b0c07" dependencies = [ "chrono", "nom", @@ -906,6 +1005,16 @@ dependencies = [ "darling_macro 0.14.4", ] +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core 0.20.8", + "darling_macro 0.20.8", +] + [[package]] name = "darling_core" version = "0.10.2" @@ -934,6 +1043,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim 0.10.0", + "syn 2.0.52", +] + [[package]] name = "darling_macro" version = "0.10.2" @@ -956,6 +1079,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core 0.20.8", + "quote", + "syn 2.0.52", +] + [[package]] name = "dashmap" version = "5.5.3" @@ -966,7 +1100,7 @@ dependencies = [ "hashbrown 0.14.3", "lock_api", "once_cell", - "parking_lot_core", + "parking_lot_core 0.9.8", ] [[package]] @@ -988,20 +1122,51 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ + "powerfmt", "serde", ] +[[package]] +name = "derive_builder" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" +dependencies = [ + "derive_builder_macro 0.11.2", +] + [[package]] name = "derive_builder" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ - "derive_builder_macro", + "derive_builder_macro 0.12.0", +] + +[[package]] +name = "derive_builder" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +dependencies = [ + "derive_builder_macro 0.20.0", +] + +[[package]] +name = "derive_builder_core" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" +dependencies = [ + "darling 0.14.4", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -1016,25 +1181,57 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder_core" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +dependencies = [ + "darling 0.20.8", + "proc-macro2", + "quote", + "syn 2.0.52", +] + +[[package]] +name = "derive_builder_macro" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" +dependencies = [ + "derive_builder_core 0.11.2", + "syn 1.0.109", +] + [[package]] name = "derive_builder_macro" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "derive_builder_core", + "derive_builder_core 0.12.0", "syn 1.0.109", ] [[package]] -name = "derive_utils" -version = "0.11.2" +name = "derive_builder_macro" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532b4c15dccee12c7044f1fcad956e98410860b22231e44a3b827464797ca7bf" +checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +dependencies = [ + "derive_builder_core 0.20.0", + "syn 2.0.52", +] + +[[package]] +name = "derive_utils" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61bb5a1014ce6dfc2a378578509abe775a5aa06bff584a547555d9efdb81b926" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] @@ -1049,26 +1246,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - [[package]] name = "dotenvy" version = "0.15.7" @@ -1083,9 +1260,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "either" -version = "1.8.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2" dependencies = [ "serde", ] @@ -1279,6 +1456,16 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs2" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "fs4" version = "0.6.6" @@ -1289,6 +1476,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "fs_extra" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" + [[package]] name = "futures" version = "0.3.28" @@ -1320,17 +1513,6 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" -[[package]] -name = "futures-enum" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3422d14de7903a52e9dbc10ae05a7e14445ec61890100e098754e120b2bd7b1e" -dependencies = [ - "derive_utils", - "quote", - "syn 1.0.109", -] - [[package]] name = "futures-executor" version = "0.3.28" @@ -1350,7 +1532,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot", + "parking_lot 0.12.1", ] [[package]] @@ -1359,6 +1541,19 @@ version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +[[package]] +name = "futures-lite" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + [[package]] name = "futures-macro" version = "0.3.29" @@ -1370,6 +1565,15 @@ dependencies = [ "syn 2.0.52", ] +[[package]] +name = "futures-micro" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b460264b3593d68b16a7bc35f7bc226ddfebdf9a1c8db1ed95d5cc6b7168c826" +dependencies = [ + "pin-project-lite", +] + [[package]] name = "futures-sink" version = "0.3.29" @@ -1406,6 +1610,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generator" version = "0.7.4" @@ -1429,17 +1642,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - [[package]] name = "getrandom" version = "0.2.11" @@ -1447,8 +1649,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", + "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", + "wasm-bindgen", ] [[package]] @@ -1457,6 +1661,47 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +[[package]] +name = "git2" +version = "0.18.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" +dependencies = [ + "bitflags 2.4.0", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + +[[package]] +name = "gitlab" +version = "0.1610.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6c802fc7eb82ff5ba2e4447c5acd0f18ec1b7bb95dbe95b6d77639e25be7cbe" +dependencies = [ + "async-trait", + "base64 0.13.1", + "bytes", + "chrono", + "cron", + "derive_builder 0.11.2", + "futures-util", + "graphql_client", + "http 0.2.11", + "itertools 0.10.5", + "log", + "percent-encoding", + "reqwest 0.11.22", + "serde", + "serde_json", + "serde_urlencoded", + "thiserror", + "url", +] + [[package]] name = "glob" version = "0.3.1" @@ -1472,7 +1717,7 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -1487,15 +1732,63 @@ dependencies = [ ] [[package]] -name = "graphql-parser" -version = "0.3.0" +name = "graphql-introspection-query" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1abd4ce5247dfc04a03ccde70f87a048458c9356c7e41d21ad8c407b3dde6f2" +checksum = "7f2a4732cf5140bd6c082434494f785a19cfb566ab07d1382c3671f5812fed6d" dependencies = [ - "combine", + "serde", +] + +[[package]] +name = "graphql-parser" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474" +dependencies = [ + "combine 3.8.1", "thiserror", ] +[[package]] +name = "graphql_client" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fc16d75d169fddb720d8f1c7aed6413e329e1584079b9734ff07266a193f5bc" +dependencies = [ + "graphql_query_derive", + "serde", + "serde_json", +] + +[[package]] +name = "graphql_client_codegen" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f290ecfa3bea3e8a157899dc8a1d96ee7dd6405c18c8ddd213fc58939d18a0e9" +dependencies = [ + "graphql-introspection-query", + "graphql-parser", + "heck", + "lazy_static", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 1.0.109", +] + +[[package]] +name = "graphql_query_derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a755cc59cda2641ea3037b4f9f7ef40471c329f55c1fa2db6fa0bb7ae6c1f7ce" +dependencies = [ + "graphql_client_codegen", + "proc-macro2", + "syn 1.0.109", +] + [[package]] name = "h2" version = "0.3.19" @@ -1507,7 +1800,7 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.11", "indexmap 1.9.3", "slab", "tokio", @@ -1515,6 +1808,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.1.0", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hash-ids" version = "0.2.1" @@ -1527,15 +1839,6 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -[[package]] -name = "hashbrown" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" -dependencies = [ - "ahash", -] - [[package]] name = "hashbrown" version = "0.14.3" @@ -1557,15 +1860,14 @@ dependencies = [ [[package]] name = "headers" -version = "0.3.8" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.5", "bytes", "headers-core", - "http", + "http 1.1.0", "httpdate", "mime", "sha1", @@ -1573,11 +1875,11 @@ dependencies = [ [[package]] name = "headers-core" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" dependencies = [ - "http", + "http 1.1.0", ] [[package]] @@ -1665,15 +1967,29 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-api-bindings" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "async-openai", "async-stream", "async-trait", "futures", + "reqwest 0.12.4", + "reqwest-eventsource", + "serde", "serde_json", "tabby-common", "tabby-inference", @@ -1687,15 +2003,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.11", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +dependencies = [ + "bytes", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "3ce4ef31cda248bbdb6e6820603b82dfcd9e833db65a43e997a0ccec777d11fe" [[package]] name = "httparse" @@ -1725,9 +2064,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.19", + "http 0.2.11", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -1739,6 +2078,27 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "httparse", + "httpdate", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.24.2" @@ -1746,36 +2106,79 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", - "hyper", - "rustls", + "http 0.2.11", + "hyper 0.14.27", + "rustls 0.21.10", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", +] + +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "log", + "rustls 0.22.4", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", ] [[package]] name = "hyper-timeout" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" +checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" dependencies = [ - "hyper", + "hyper 1.3.1", + "hyper-util", "pin-project-lite", "tokio", - "tokio-io-timeout", + "tower-service", ] [[package]] name = "hyper-tls" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", - "hyper", + "http-body-util", + "hyper 1.3.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", +] + +[[package]] +name = "hyper-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "hyper 1.3.1", + "pin-project-lite", + "socket2 0.5.5", + "tokio", + "tower", + "tower-service", + "tracing", ] [[package]] @@ -1843,7 +2246,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "same-file", "walkdir", "winapi-util", @@ -1857,17 +2260,17 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] name = "indexmap" -version = "2.0.1" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown 0.14.3", + "serde", ] [[package]] @@ -1928,6 +2331,16 @@ version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" +[[package]] +name = "iri-string" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f5f6c2df22c009ac44f6f1499308e7a3ac7ba42cd2378475cc691510e1eef1b" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "itertools" version = "0.10.5" @@ -1948,9 +2361,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] @@ -1995,31 +2408,32 @@ dependencies = [ [[package]] name = "juniper" -version = "0.15.11" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52adf17d43d0b526eed31fac15d9312941c5c2558ffbfb105811690b96d6e2f1" +checksum = "943306315b1a7a03d27af9dfb0c288d9f4da8830c17df4bceb7d50a47da0982c" dependencies = [ "async-trait", - "bson", + "auto_enums", "chrono", "fnv", "futures", - "futures-enum", "graphql-parser", - "indexmap 1.9.3", + "indexmap 2.2.6", "juniper_codegen", "serde", "smartstring", "static_assertions", - "url", - "uuid 0.8.2", + "void", ] [[package]] -name = "juniper-axum" -version = "0.10.0" +name = "juniper_axum" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f81e883bc6ffb2e5a3cc7276bfe9519c49108bdc1330d5aab1b79cb088f2f26" dependencies = [ "axum", + "bytes", "juniper", "juniper_graphql_ws", "serde", @@ -2028,21 +2442,21 @@ dependencies = [ [[package]] name = "juniper_codegen" -version = "0.15.9" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee97671061ad50301ba077d054d295e01d31a1868fbd07902db651f987e71db" +checksum = "760dbe46660494d469023d661e8d268f413b2cb68c999975dcc237407096a693" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", + "url", ] [[package]] name = "juniper_graphql_ws" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5526c2f2a9c40f08841dc559971641fdd71c008a265745d18bb0c8b7e105b3" +checksum = "709eb11c716072f5c9fcbfa705dd684bd3c070943102f9fc56ccb812a36ba017" dependencies = [ "juniper", "juniper_subscriptions", @@ -2052,9 +2466,9 @@ dependencies = [ [[package]] name = "juniper_subscriptions" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2983b26a1e12b691c17432aee3881d8bec4a94d6c64bc933c0eaf6d9e3429f13" +checksum = "e6208a839bd4ca2131924a238311d088d6604ea267c0917903392bad7b70a92c" dependencies = [ "futures", "juniper", @@ -2070,6 +2484,20 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "kv" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "620727085ac39ee9650b373fe6d8073a0aee6f99e52a9c72b25f7671078039ab" +dependencies = [ + "pin-project-lite", + "serde", + "serde_json", + "sled", + "thiserror", + "toml 0.5.11", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -2118,6 +2546,20 @@ version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +[[package]] +name = "libgit2-sys" +version = "0.16.2+1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + [[package]] name = "libloading" version = "0.7.4" @@ -2145,6 +2587,32 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "libssh2-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" +dependencies = [ + "cc", + "libc", + "libz-sys", + "openssl-sys", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-sys" +version = "1.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + [[package]] name = "link-cplusplus" version = "1.0.8" @@ -2174,14 +2642,14 @@ checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "llama-cpp-bindings" -version = "0.10.0" +version = "0.11.0" dependencies = [ "async-stream", "async-trait", "cmake", "cxx", "cxx-build", - "derive_builder", + "derive_builder 0.12.0", "futures", "tabby-inference", "tokio", @@ -2242,15 +2710,6 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ea9b256699eda7b0387ffbc776dd625e28bde3918446381781245b7a50349d8" -[[package]] -name = "mach2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" -dependencies = [ - "libc", -] - [[package]] name = "match_cfg" version = "0.1.0" @@ -2333,53 +2792,40 @@ dependencies = [ [[package]] name = "metrics" -version = "0.21.1" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" +checksum = "2be3cbd384d4e955b231c895ce10685e3d8260c5ccffae898c96c723b0772835" dependencies = [ "ahash", - "metrics-macros", "portable-atomic", ] [[package]] name = "metrics-exporter-prometheus" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5" +checksum = "9bf4e7146e30ad172c42c39b3246864bd2d3c6396780711a1baf749cfe423e21" dependencies = [ "base64 0.21.5", - "hyper", - "indexmap 1.9.3", + "hyper 0.14.27", + "indexmap 2.2.6", "ipnet", "metrics", "metrics-util", "quanta", "thiserror", "tokio", - "tracing", -] - -[[package]] -name = "metrics-macros" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", ] [[package]] name = "metrics-util" -version = "0.15.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4de2ed6e491ed114b40b732e4d1659a9d53992ebd87490c44a6ffe23739d973e" +checksum = "8b07a5eb561b8cbc16be2d216faf7757f9baf3bfb94dbb0fae3df8387a5bb47f" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.13.1", + "hashbrown 0.14.3", "metrics", "num_cpus", "quanta", @@ -2444,16 +2890,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - [[package]] name = "murmurhash32" version = "0.3.0" @@ -2484,17 +2924,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9a91b326434fca226707ed8ec1fd22d4e1c96801abdf10c412afdc7d97116e0" -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.4.0", - "cfg-if", - "libc", -] - [[package]] name = "nom" version = "7.1.3" @@ -2542,7 +2971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5262af4c94921c2646c5ac6ff7900c2af9cbb08dc26a797e18130a7019c039d4" dependencies = [ "nucleo-matcher", - "parking_lot", + "parking_lot 0.12.1", "rayon", ] @@ -2579,11 +3008,17 @@ dependencies = [ "num-integer", "num-iter", "num-traits", - "rand 0.8.5", + "rand", "smallvec", "zeroize", ] +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + [[package]] name = "num-derive" version = "0.3.3" @@ -2684,10 +3119,49 @@ dependencies = [ ] [[package]] -name = "once_cell" -version = "1.18.0" +name = "octocrab" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "68a8a3df00728324ad654ecd1ed449a60157c55b7ff8c109af3a35989687c367" +dependencies = [ + "arc-swap", + "async-trait", + "base64 0.22.0", + "bytes", + "cfg-if", + "chrono", + "either", + "futures", + "futures-util", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-rustls 0.26.0", + "hyper-timeout", + "hyper-util", + "jsonwebtoken", + "once_cell", + "percent-encoding", + "pin-project", + "secrecy", + "serde", + "serde_json", + "serde_path_to_error", + "serde_urlencoded", + "snafu", + "tokio", + "tower", + "tower-http", + "tracing", + "url", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oneshot" @@ -2762,45 +3236,12 @@ dependencies = [ "opentelemetry_sdk", ] -[[package]] -name = "opentelemetry-otlp" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c928609d087790fc936a1067bdc310ae702bdf3b090c3f281b713622c8bbde" -dependencies = [ - "async-trait", - "futures", - "futures-util", - "http", - "opentelemetry", - "opentelemetry-proto", - "prost", - "thiserror", - "tokio", - "tonic", -] - -[[package]] -name = "opentelemetry-proto" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61a2f56df5574508dd86aaca016c917489e589ece4141df1b5e349af8d66c28" -dependencies = [ - "futures", - "futures-util", - "opentelemetry", - "prost", - "tonic", - "tonic-build", -] - [[package]] name = "opentelemetry_api" version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c24f96e21e7acc813c7a8394ee94978929db2bcc46cf6b5014fc612bf7760c22" dependencies = [ - "fnv", "futures-channel", "futures-util", "indexmap 1.9.3", @@ -2818,18 +3259,14 @@ checksum = "1ca41c4933371b61c2a2f214bf16931499af4ec90543604ec828f7a625c09113" dependencies = [ "async-trait", "crossbeam-channel", - "dashmap", - "fnv", "futures-channel", "futures-executor", "futures-util", "once_cell", "opentelemetry_api", "percent-encoding", - "rand 0.8.5", + "rand", "thiserror", - "tokio", - "tokio-stream", ] [[package]] @@ -2859,6 +3296,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -2866,7 +3320,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.8", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", ] [[package]] @@ -2899,7 +3367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -3054,22 +3522,18 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc59d1bcc64fc5d021d67521f818db868368028108d37f0e98d74e33f68297b5" +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "prettyplease" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" -dependencies = [ - "proc-macro2", - "syn 1.0.109", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3103,60 +3567,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "prost" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" -dependencies = [ - "bytes", - "prost-derive", -] - -[[package]] -name = "prost-build" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" -dependencies = [ - "bytes", - "heck", - "itertools 0.10.5", - "lazy_static", - "log", - "multimap", - "petgraph", - "prettyplease", - "prost", - "prost-types", - "regex", - "syn 1.0.109", - "tempfile", - "which", -] - -[[package]] -name = "prost-derive" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" -dependencies = [ - "anyhow", - "itertools 0.10.5", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-types" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" -dependencies = [ - "prost", -] - [[package]] name = "psm" version = "0.1.21" @@ -3168,16 +3578,15 @@ dependencies = [ [[package]] name = "quanta" -version = "0.11.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17e662a7a8291a865152364c20c7abc5e60486ab2001e8ec10b24862de0b9ab" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" dependencies = [ "crossbeam-utils", "libc", - "mach2", "once_cell", "raw-cpuid", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "web-sys", "winapi", ] @@ -3203,19 +3612,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79ec282e887b434b68c18fe5c121d38e72a5cf35119b59e54ec5b992ea9c8eb0" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", -] - [[package]] name = "rand" version = "0.8.5" @@ -3223,18 +3619,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -3244,16 +3630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -3262,25 +3639,16 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] name = "raw-cpuid" -version = "10.7.0" +version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", ] [[package]] @@ -3305,6 +3673,29 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "redis" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6472825949c09872e8f2c50bde59fcefc17748b6be5c90fd67cd8b4daca73bfd" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "combine 4.6.7", + "futures", + "futures-util", + "itoa", + "percent-encoding", + "pin-project-lite", + "ryu", + "sha1_smol", + "tokio", + "tokio-retry", + "tokio-util", + "url", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -3323,26 +3714,15 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.11", - "redox_syscall 0.2.16", - "thiserror", -] - [[package]] name = "regex" -version = "1.10.2" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -3357,9 +3737,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -3402,12 +3782,54 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", + "h2 0.3.19", + "http 0.2.11", + "http-body 0.4.5", + "hyper 0.14.27", + "hyper-rustls 0.24.2", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.10", + "rustls-pemfile 1.0.4", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio", + "tokio-rustls 0.24.1", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +dependencies = [ + "base64 0.22.0", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2 0.4.4", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", + "hyper 1.3.1", + "hyper-rustls 0.26.0", "hyper-tls", + "hyper-util", "ipnet", "js-sys", "log", @@ -3417,16 +3839,18 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.22.4", "rustls-native-certs", - "rustls-pemfile", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper 0.1.2", "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.25.0", "tokio-util", "tower-service", "url", @@ -3434,14 +3858,14 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg", + "winreg 0.52.0", ] [[package]] name = "reqwest-eventsource" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f03f570355882dd8d15acc3a313841e6e90eddbc76a93c748fd82cc13ba9f51" +checksum = "632c55746dbb44275691640e7b40c907c16a2dc1a5842aa98aaec90da6ec6bde" dependencies = [ "eventsource-stream", "futures-core", @@ -3449,23 +3873,7 @@ dependencies = [ "mime", "nom", "pin-project-lite", - "reqwest", - "thiserror", -] - -[[package]] -name = "reqwest-eventsource" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f529a5ff327743addc322af460761dff5b50e0c826b9e6ac44c3195c50bb2026" -dependencies = [ - "eventsource-stream", - "futures-core", - "futures-timer", - "mime", - "nom", - "pin-project-lite", - "reqwest", + "reqwest 0.12.4", "thiserror", ] @@ -3476,7 +3884,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom", "libc", "spin 0.9.8", "untrusted", @@ -3518,46 +3926,21 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8", - "rand_core 0.6.4", + "rand_core", "signature", "spki", "subtle", "zeroize", ] -[[package]] -name = "rust-embed" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b68543d5527e158213414a92832d2aab11a84d2571a5eb021ebe22c43aab066" -dependencies = [ - "rust-embed-impl 6.5.0", - "rust-embed-utils 7.5.0", - "walkdir", -] - [[package]] name = "rust-embed" version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" dependencies = [ - "rust-embed-impl 8.0.0", - "rust-embed-utils 8.0.0", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4e0f0ced47ded9a68374ac145edd65a6c1fa13a96447b873660b2a568a0fd7" -dependencies = [ - "proc-macro2", - "quote", - "rust-embed-utils 7.5.0", - "shellexpand", - "syn 1.0.109", + "rust-embed-impl", + "rust-embed-utils", "walkdir", ] @@ -3569,21 +3952,11 @@ checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" dependencies = [ "proc-macro2", "quote", - "rust-embed-utils 8.0.0", + "rust-embed-utils", "syn 2.0.52", "walkdir", ] -[[package]] -name = "rust-embed-utils" -version = "7.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731" -dependencies = [ - "sha2", - "walkdir", -] - [[package]] name = "rust-embed-utils" version = "8.0.0" @@ -3651,18 +4024,33 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", - "rustls-webpki", + "rustls-webpki 0.101.7", "sct", ] [[package]] -name = "rustls-native-certs" -version = "0.6.3" +name = "rustls" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +dependencies = [ + "log", + "ring", + "rustls-pki-types", + "rustls-webpki 0.102.3", + "subtle", + "zeroize", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fb85efa936c42c6d5fc28d2629bb51e4b2f4b8a5211e297d599cc5a093792" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "schannel", "security-framework", ] @@ -3676,6 +4064,22 @@ dependencies = [ "base64 0.21.5", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.0", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -3686,6 +4090,17 @@ dependencies = [ "untrusted", ] +[[package]] +name = "rustls-webpki" +version = "0.102.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +dependencies = [ + "ring", + "rustls-pki-types", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -3794,9 +4209,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.171" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" dependencies = [ "serde_derive", ] @@ -3823,9 +4238,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.171" +version = "1.0.199" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" dependencies = [ "proc-macro2", "quote", @@ -3834,11 +4249,10 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ - "indexmap 2.0.1", "itoa", "ryu", "serde", @@ -3883,7 +4297,7 @@ dependencies = [ "rmp-serde", "serde", "serde_json", - "toml", + "toml 0.7.4", "trackable", ] @@ -3897,7 +4311,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot", + "parking_lot 0.12.1", "serial_test_derive 2.0.0", ] @@ -3911,7 +4325,7 @@ dependencies = [ "futures", "lazy_static", "log", - "parking_lot", + "parking_lot 0.12.1", "serial_test_derive 3.0.0", ] @@ -3948,6 +4362,12 @@ dependencies = [ "digest", ] +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + [[package]] name = "sha2" version = "0.10.8" @@ -3981,15 +4401,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shellexpand" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" -dependencies = [ - "dirs", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -4006,7 +4417,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -4046,10 +4457,26 @@ dependencies = [ ] [[package]] -name = "smallvec" -version = "1.10.0" +name = "sled" +version = "0.34.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" +dependencies = [ + "crc32fast", + "crossbeam-epoch", + "crossbeam-utils", + "fs2", + "fxhash", + "libc", + "log", + "parking_lot 0.11.2", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smartstring" @@ -4062,6 +4489,27 @@ dependencies = [ "version_check", ] +[[package]] +name = "snafu" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75976f4748ab44f6e5332102be424e7c2dc18daeaf7e725f2040c3ebb133512e" +dependencies = [ + "snafu-derive", +] + +[[package]] +name = "snafu-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4b19911debfb8c2fb1107bc6cb2d61868aaf53a988449213959bb1b5b1ed95f" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.52", +] + [[package]] name = "socket2" version = "0.4.9" @@ -4119,16 +4567,16 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c" dependencies = [ - "itertools 0.12.0", + "itertools 0.12.1", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" +checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" dependencies = [ "sqlx-core", "sqlx-macros", @@ -4139,9 +4587,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" +checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" dependencies = [ "ahash", "atoi", @@ -4150,7 +4598,6 @@ dependencies = [ "chrono", "crc", "crossbeam-queue", - "dotenvy", "either", "event-listener", "futures-channel", @@ -4160,12 +4607,14 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.1", + "indexmap 2.2.6", "log", "memchr", "once_cell", "paste", "percent-encoding", + "rustls 0.21.10", + "rustls-pemfile 1.0.4", "serde", "serde_json", "sha2", @@ -4176,13 +4625,14 @@ dependencies = [ "tokio-stream", "tracing", "url", + "webpki-roots", ] [[package]] name = "sqlx-macros" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" +checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" dependencies = [ "proc-macro2", "quote", @@ -4193,11 +4643,10 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" +checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" dependencies = [ - "atomic-write-file", "dotenvy", "either", "heck", @@ -4220,9 +4669,9 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" +checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" dependencies = [ "atoi", "base64 0.21.5", @@ -4248,7 +4697,7 @@ dependencies = [ "memchr", "once_cell", "percent-encoding", - "rand 0.8.5", + "rand", "rsa", "serde", "sha1", @@ -4263,9 +4712,9 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" +checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" dependencies = [ "atoi", "base64 0.21.5", @@ -4288,10 +4737,9 @@ dependencies = [ "md-5", "memchr", "once_cell", - "rand 0.8.5", + "rand", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlx-core", @@ -4303,9 +4751,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" +checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" dependencies = [ "atoi", "chrono", @@ -4435,6 +4883,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "sysinfo" version = "0.29.8" @@ -4473,32 +4927,31 @@ dependencies = [ [[package]] name = "tabby" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "assert-json-diff", "async-stream", "async-trait", "axum", + "axum-extra", "axum-prometheus", - "axum-tracing-opentelemetry", + "cached", "chrono", "clap", "futures", "http-api-bindings", - "hyper", + "hyper 1.3.1", "insta", "lazy_static", "llama-cpp-bindings", "minijinja", "nvml-wrapper", "openssl", - "opentelemetry", - "opentelemetry-otlp", "parse-git-url", "regex", - "reqwest", - "reqwest-eventsource 0.5.0", + "reqwest 0.12.4", + "reqwest-eventsource", "serde", "serde-jsonlines 0.5.0", "serde_json", @@ -4516,41 +4969,41 @@ dependencies = [ "textdistance", "thiserror", "tokio", - "tower-http 0.4.0", + "tower-http", "tracing", - "tracing-opentelemetry", "tracing-subscriber 0.3.17", "utoipa", "utoipa-swagger-ui", - "uuid 1.6.1", + "uuid", "vergen", ] [[package]] name = "tabby-common" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "async-trait", "glob", "home", "lazy_static", - "regex", - "reqwest", + "reqwest 0.12.4", "serde", "serde-jsonlines 0.4.0", "serde_json", "serdeconv", "tantivy", + "temp_testdir", "thiserror", + "tokio", "url", "utoipa", - "uuid 1.6.1", + "uuid", ] [[package]] name = "tabby-db" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "assert_matches", @@ -4562,12 +5015,12 @@ dependencies = [ "sqlx", "tabby-db-macros", "tokio", - "uuid 1.6.1", + "uuid", ] [[package]] name = "tabby-db-macros" -version = "0.10.0" +version = "0.11.0" dependencies = [ "quote", "syn 2.0.52", @@ -4575,7 +5028,7 @@ dependencies = [ [[package]] name = "tabby-download" -version = "0.10.0" +version = "0.11.0" dependencies = [ "aim-downloader", "anyhow", @@ -4587,13 +5040,13 @@ dependencies = [ [[package]] name = "tabby-inference" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "async-stream", "async-trait", "dashmap", - "derive_builder", + "derive_builder 0.12.0", "futures", "tabby-common", "trie-rs", @@ -4601,7 +5054,7 @@ dependencies = [ [[package]] name = "tabby-scheduler" -version = "0.10.0" +version = "0.11.0" dependencies = [ "anyhow", "async-trait", @@ -4609,16 +5062,19 @@ dependencies = [ "file-rotate", "ignore", "kdam", + "kv", "lazy_static", "npm-package-json", "package-lock-json-parser", "requirements", + "serde", "serde-jsonlines 0.4.0", "serde_json", "serdeconv", "tabby-common", "tantivy", "temp_testdir", + "text-splitter", "tokio", "tokio-cron-scheduler", "tracing", @@ -4639,53 +5095,88 @@ dependencies = [ ] [[package]] -name = "tabby-webserver" -version = "0.10.0" +name = "tabby-schema" +version = "0.11.0" dependencies = [ "anyhow", + "async-trait", + "axum", + "base64 0.22.0", + "chrono", + "futures", + "hash-ids", + "juniper", + "lazy_static", + "regex", + "serde", + "strum", + "tabby-common", + "tabby-db", + "thiserror", + "tokio", + "tracing", + "validator", +] + +[[package]] +name = "tabby-search" +version = "0.11.0" +dependencies = [ + "anyhow", + "git2", + "nucleo", + "temp_testdir", +] + +[[package]] +name = "tabby-webserver" +version = "0.11.0" +dependencies = [ + "anyhow", + "apalis", "argon2", "assert_matches", "async-trait", "axum", - "base64 0.22.0", + "axum-extra", "bincode", - "cached", "chrono", + "fs_extra", "futures", - "hash-ids", - "hyper", - "ignore", + "gitlab", + "hyper 1.3.1", + "hyper-util", "jsonwebtoken", "juniper", - "juniper-axum", + "juniper_axum", + "juniper_graphql_ws", "lazy_static", "lettre", "mime_guess", - "nucleo", + "octocrab", "pin-project", "querystring", - "reqwest", - "rust-embed 8.0.0", + "reqwest 0.12.4", + "rust-embed", "serde", "serde_json", "serial_test 3.0.0", - "strum", "tabby-common", "tabby-db", + "tabby-schema", + "tabby-search", "tarpc", "temp_testdir", "thiserror", "tokio", - "tokio-cron-scheduler", "tokio-tungstenite", "tower", - "tower-http 0.4.0", + "tower-http", "tracing", "unicase", "url", "urlencoding", - "uuid 1.6.1", - "validator", + "uuid", ] [[package]] @@ -4736,7 +5227,7 @@ dependencies = [ "tempfile", "thiserror", "time", - "uuid 1.6.1", + "uuid", "winapi", ] @@ -4840,7 +5331,7 @@ dependencies = [ "humantime", "opentelemetry", "pin-project", - "rand 0.8.5", + "rand", "serde", "static_assertions", "tarpc-plugins", @@ -4901,6 +5392,21 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "text-splitter" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d5315f993b00372fd909fcf8587535e65f03ac5fd9400f49dd72ce1f6be23cf" +dependencies = [ + "ahash", + "auto_enums", + "either", + "itertools 0.12.1", + "once_cell", + "regex", + "unicode-segmentation", +] + [[package]] name = "textdistance" version = "1.0.2" @@ -4909,18 +5415,18 @@ checksum = "d321c8576c2b47e43953e9cce236550d4cd6af0a6ce518fe084340082ca6037b" [[package]] name = "thiserror" -version = "1.0.49" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.49" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ "proc-macro2", "quote", @@ -4939,14 +5445,16 @@ dependencies = [ [[package]] name = "time" -version = "0.3.26" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a79d09ac6b08c1ab3906a2f7cc2e81a0e27c7ae89c63812df75e52bef0751e07" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", "libc", + "num-conv", "num_threads", + "powerfmt", "serde", "time-core", "time-macros", @@ -4954,16 +5462,17 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.12" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75c65469ed6b3a4809d987a41eb1dc918e9bc1d92211cbad7ae82931846f7451" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ + "num-conv", "time-core", ] @@ -4993,7 +5502,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot", + "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2 0.5.5", @@ -5013,17 +5522,7 @@ dependencies = [ "num-traits", "tokio", "tracing", - "uuid 1.6.1", -] - -[[package]] -name = "tokio-io-timeout" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf" -dependencies = [ - "pin-project-lite", - "tokio", + "uuid", ] [[package]] @@ -5054,7 +5553,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" dependencies = [ "pin-project", - "rand 0.8.5", + "rand", "tokio", ] @@ -5064,7 +5563,18 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.10", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" +dependencies = [ + "rustls 0.22.4", + "rustls-pki-types", "tokio", ] @@ -5093,9 +5603,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" dependencies = [ "futures-util", "log", @@ -5121,6 +5631,15 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + [[package]] name = "toml" version = "0.7.4" @@ -5155,51 +5674,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tonic" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f219fad3b929bef19b1f86fbc0358d35daed8f2cac972037ac0dc10bbb8d5fb" -dependencies = [ - "async-stream", - "async-trait", - "axum", - "base64 0.13.1", - "bytes", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-timeout", - "percent-encoding", - "pin-project", - "prost", - "prost-derive", - "tokio", - "tokio-stream", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf5e9b9c0f7e0a7c027dcfaba7b2c60816c7049171f679d99ee2ff65d0de8c4" -dependencies = [ - "prettyplease", - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.109", -] - [[package]] name = "tower" version = "0.4.13" @@ -5208,11 +5682,8 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap 1.9.3", "pin-project", "pin-project-lite", - "rand 0.8.5", - "slab", "tokio", "tokio-util", "tower-layer", @@ -5222,43 +5693,26 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.3.5" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "bytes", - "futures-core", "futures-util", - "http", - "http-body", - "http-range-header", - "pin-project-lite", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" -dependencies = [ - "bitflags 1.3.2", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", + "http 1.1.0", + "http-body 1.0.0", + "http-body-util", "http-range-header", "httpdate", + "iri-string", "mime", "mime_guess", "percent-encoding", "pin-project-lite", "tokio", "tokio-util", + "tower", "tower-layer", "tower-service", "tracing", @@ -5316,7 +5770,6 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project", "tracing", ] @@ -5341,7 +5794,6 @@ dependencies = [ "opentelemetry", "tracing", "tracing-core", - "tracing-log", "tracing-subscriber 0.3.17", ] @@ -5583,17 +6035,17 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 1.1.0", "httparse", "log", - "rand 0.8.5", + "rand", "sha1", "thiserror", "url", @@ -5612,6 +6064,17 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" +[[package]] +name = "ulid" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" +dependencies = [ + "getrandom", + "rand", + "web-time", +] + [[package]] name = "unicase" version = "2.7.0" @@ -5644,9 +6107,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" @@ -5684,6 +6147,7 @@ dependencies = [ "form_urlencoded", "idna 0.5.0", "percent-encoding", + "serde", ] [[package]] @@ -5721,11 +6185,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utoipa" -version = "3.3.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ae74ef183fae36d650f063ae7bde1cacbe1cd7e72b617cbe1e985551878b98" +checksum = "272ebdfbc99111033031d2f10e018836056e4d2c8e2acda76450ec7974269fa7" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.2.6", "serde", "serde_json", "utoipa-gen", @@ -5733,46 +6197,41 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "3.3.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea8ac818da7e746a63285594cce8a96f5e00ee31994e655bd827569cb8b137b" +checksum = "d3c9f4d08338c1bfa70dde39412a040a884c6f318b3d09aaaf3437a1e52027fc" dependencies = [ "proc-macro-error", "proc-macro2", "quote", + "regex", "syn 2.0.52", ] [[package]] name = "utoipa-swagger-ui" -version = "3.1.3" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "062bba5a3568e126ac72049a63254f4cb1da2eb713db0c1ab2a4c76be191db8c" +checksum = "0b39868d43c011961e04b41623e050aedf2cc93652562ff7935ce0f819aaf2da" dependencies = [ "axum", "mime_guess", "regex", - "rust-embed 6.6.1", + "rust-embed", "serde", "serde_json", "utoipa", "zip", ] -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" - [[package]] name = "uuid" version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.11", - "rand 0.8.5", + "getrandom", + "rand", "serde", "uuid-macro-internal", ] @@ -5885,12 +6344,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -5965,9 +6418,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -5987,16 +6440,21 @@ dependencies = [ ] [[package]] -name = "which" -version = "4.4.0" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ - "either", - "libc", - "once_cell", + "js-sys", + "wasm-bindgen", ] +[[package]] +name = "webpki-roots" +version = "0.25.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" + [[package]] name = "whoami" version = "1.4.1" @@ -6209,6 +6667,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "wrapcenum-derive" version = "0.4.0" diff --git a/pkgs/by-name/ta/tabby/package.nix b/pkgs/by-name/ta/tabby/package.nix index 9c92625dc7b0..bfda935d4d8b 100644 --- a/pkgs/by-name/ta/tabby/package.nix +++ b/pkgs/by-name/ta/tabby/package.nix @@ -32,7 +32,7 @@ let # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix pname = "tabby"; - version = "0.10.0"; + version = "0.11.0"; availableAccelerations = flatten [ @@ -78,7 +78,7 @@ let # to use a specific device type as it is relying on llama-cpp only being # built to use one type of device. # - # See: https://github.com/TabbyML/tabby/blob/v0.10.0/crates/llama-cpp-bindings/include/engine.h#L20 + # See: https://github.com/TabbyML/tabby/blob/v0.11.0/crates/llama-cpp-bindings/include/engine.h#L20 # llamaccpPackage = llama-cpp.override { rocmSupport = enableRocm; @@ -108,13 +108,14 @@ rustPlatform.buildRustPackage { owner = "TabbyML"; repo = "tabby"; rev = "v${version}"; - hash = "sha256-Oi4KY2H6/dSBydjvPmycdinXUWCdbbhV32wKRvjjnuo="; + hash = "sha256-7PHCvI2/QSFVs6SAXrx8rohU5Wu8QRaqsI1CimnUGQY="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { + "apalis-0.5.1" = "sha256-hGvVuSy32lSTR5DJdiyf8q1sXbIeuLSGrtyq6m2QlUQ="; "tree-sitter-c-0.20.6" = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4="; "tree-sitter-cpp-0.20.3" = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA="; "tree-sitter-solidity-0.0.3" = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0="; From 2e48435cfe2b73fcbf5308c58605b47e23a1a609 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 7 May 2024 11:28:41 +0200 Subject: [PATCH 027/246] python312Packages.asdf: 2.13.0 -> 3.2.0, unbreak --- .../python-modules/asdf/default.nix | 65 ++++++------------- 1 file changed, 20 insertions(+), 45 deletions(-) diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index a6508229a3f0..43fa7ae2fdca 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -1,98 +1,73 @@ { lib , asdf-standard , asdf-transform-schemas -, astropy +, attrs , buildPythonPackage , fetchFromGitHub -, fetchpatch -, importlib-resources +, fsspec +, importlib-metadata , jmespath -, jsonschema , lz4 , numpy , packaging -, pytest-astropy +, psutil +, pytest-remotedata , pytestCheckHook , pythonOlder , pyyaml , semantic-version +, setuptools , setuptools-scm }: buildPythonPackage rec { pname = "asdf"; - version = "2.13.0"; - format = "pyproject"; + version = "3.2.0"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { - owner = "asdf-format/"; - repo = pname; + owner = "asdf-format"; + repo = "asdf"; rev = "refs/tags/${version}"; - hash = "sha256-u8e7ot5NDRqQFH0eLVnGinBQmQD73BlR5K9HVjA7SIg="; + hash = "sha256-r+cEv6g7fq3I/h2mlszzJRQcazy7qP9pg0hfYG/Sa9E="; }; - patches = [ - # Fix default validation, https://github.com/asdf-format/asdf/pull/1203 - (fetchpatch { - name = "default-validation.patch"; - url = "https://github.com/asdf-format/asdf/commit/6f79f620b4632e20178d9bd53528702605d3e976.patch"; - hash = "sha256-h/dYhXRCf5oIIC+u6+8C91mJnmEzuNmlEzqc0UEhLy0="; - excludes = [ - "CHANGES.rst" - ]; - }) - ]; - - postPatch = '' - # https://github.com/asdf-format/asdf/pull/1203 - substituteInPlace pyproject.toml \ - --replace "'jsonschema >=4.0.1, <4.10.0'," "'jsonschema >=4.0.1'," - ''; - - nativeBuildInputs = [ + build-system = [ + setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ asdf-standard asdf-transform-schemas + importlib-metadata jmespath - jsonschema numpy packaging pyyaml semantic-version - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources + attrs ]; nativeCheckInputs = [ - astropy + fsspec lz4 - pytest-astropy + psutil + pytest-remotedata pytestCheckHook ]; - preCheck = '' - export PY_IGNORE_IMPORTMISMATCH=1 - ''; pythonImportsCheck = [ "asdf" ]; - disabledTests = [ - "config.rst" - ]; - meta = with lib; { description = "Python tools to handle ASDF files"; homepage = "https://github.com/asdf-format/asdf"; license = licenses.bsd3; maintainers = with maintainers; [ ]; - # Many tests fail, according to Hydra - broken = true; }; } From 0b1f0db71793e91b5adaa5a5ad302138d7d7804e Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 10 May 2024 21:30:40 +0900 Subject: [PATCH 028/246] rmfakecloud: migrate to by-name --- .../default.nix => by-name/rm/rmfakecloud/package.nix} | 0 pkgs/{servers => by-name/rm}/rmfakecloud/webui.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{servers/rmfakecloud/default.nix => by-name/rm/rmfakecloud/package.nix} (100%) rename pkgs/{servers => by-name/rm}/rmfakecloud/webui.nix (100%) diff --git a/pkgs/servers/rmfakecloud/default.nix b/pkgs/by-name/rm/rmfakecloud/package.nix similarity index 100% rename from pkgs/servers/rmfakecloud/default.nix rename to pkgs/by-name/rm/rmfakecloud/package.nix diff --git a/pkgs/servers/rmfakecloud/webui.nix b/pkgs/by-name/rm/rmfakecloud/webui.nix similarity index 100% rename from pkgs/servers/rmfakecloud/webui.nix rename to pkgs/by-name/rm/rmfakecloud/webui.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f3dfddf3ead..60d6b8d6ee96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39998,8 +39998,6 @@ with pkgs; roadrunner = callPackage ../servers/roadrunner { }; - rmfakecloud = callPackage ../servers/rmfakecloud { }; - rmfuse = callPackage ../tools/filesystems/rmfuse { }; rmount = callPackage ../tools/filesystems/rmount { }; From 6cc30987ce014d0b0902e0a52f6b1ee51d96ed7c Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 10 May 2024 21:30:49 +0900 Subject: [PATCH 029/246] pahole: migrate to by-name --- .../misc/pahole/default.nix => by-name/pa/pahole/package.nix} | 0 .../misc => by-name/pa}/pahole/threading-reproducibility.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{development/tools/misc/pahole/default.nix => by-name/pa/pahole/package.nix} (100%) rename pkgs/{development/tools/misc => by-name/pa}/pahole/threading-reproducibility.patch (100%) diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/by-name/pa/pahole/package.nix similarity index 100% rename from pkgs/development/tools/misc/pahole/default.nix rename to pkgs/by-name/pa/pahole/package.nix diff --git a/pkgs/development/tools/misc/pahole/threading-reproducibility.patch b/pkgs/by-name/pa/pahole/threading-reproducibility.patch similarity index 100% rename from pkgs/development/tools/misc/pahole/threading-reproducibility.patch rename to pkgs/by-name/pa/pahole/threading-reproducibility.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60d6b8d6ee96..41f67258286d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19282,8 +19282,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pahole = callPackage ../development/tools/misc/pahole { }; - panopticon = callPackage ../development/tools/analysis/panopticon { }; parinfer-rust = callPackage ../development/tools/parinfer-rust { }; From e9531dec25324e179b04f5e763e64566e529a2e2 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 10 May 2024 21:30:53 +0900 Subject: [PATCH 030/246] bcc: migrate to by-name The package is left in all-packages to allow setting llvmPackages more easily --- .../linux => by-name/bc}/bcc/absolute-ausyscall.patch | 0 .../linux => by-name/bc}/bcc/fix-deadlock-detector-import.patch | 0 pkgs/{os-specific/linux => by-name/bc}/bcc/libbcc-path.patch | 0 .../linux/bcc/default.nix => by-name/bc/bcc/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{os-specific/linux => by-name/bc}/bcc/absolute-ausyscall.patch (100%) rename pkgs/{os-specific/linux => by-name/bc}/bcc/fix-deadlock-detector-import.patch (100%) rename pkgs/{os-specific/linux => by-name/bc}/bcc/libbcc-path.patch (100%) rename pkgs/{os-specific/linux/bcc/default.nix => by-name/bc/bcc/package.nix} (100%) diff --git a/pkgs/os-specific/linux/bcc/absolute-ausyscall.patch b/pkgs/by-name/bc/bcc/absolute-ausyscall.patch similarity index 100% rename from pkgs/os-specific/linux/bcc/absolute-ausyscall.patch rename to pkgs/by-name/bc/bcc/absolute-ausyscall.patch diff --git a/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch b/pkgs/by-name/bc/bcc/fix-deadlock-detector-import.patch similarity index 100% rename from pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch rename to pkgs/by-name/bc/bcc/fix-deadlock-detector-import.patch diff --git a/pkgs/os-specific/linux/bcc/libbcc-path.patch b/pkgs/by-name/bc/bcc/libbcc-path.patch similarity index 100% rename from pkgs/os-specific/linux/bcc/libbcc-path.patch rename to pkgs/by-name/bc/bcc/libbcc-path.patch diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/by-name/bc/bcc/package.nix similarity index 100% rename from pkgs/os-specific/linux/bcc/default.nix rename to pkgs/by-name/bc/bcc/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41f67258286d..9b38e2f0a1a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18318,7 +18318,7 @@ with pkgs; bpftools = callPackage ../os-specific/linux/bpftools { }; - bcc = callPackage ../os-specific/linux/bcc { + bcc = callPackage ../by-name/bc/bcc/package.nix { llvmPackages = llvmPackages_16; }; From dbe53bea959588cf51e92b0ca3df59ae904437a7 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 10 May 2024 21:30:56 +0900 Subject: [PATCH 031/246] bpftrace: migrate to by-name The package is left in all-packages to allow setting llvmPackages more easily --- .../bpftrace/default.nix => by-name/bp/bpftrace/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{os-specific/linux/bpftrace/default.nix => by-name/bp/bpftrace/package.nix} (100%) diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/by-name/bp/bpftrace/package.nix similarity index 100% rename from pkgs/os-specific/linux/bpftrace/default.nix rename to pkgs/by-name/bp/bpftrace/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b38e2f0a1a5..32ad40e71986 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18322,7 +18322,7 @@ with pkgs; llvmPackages = llvmPackages_16; }; - bpftrace = callPackage ../os-specific/linux/bpftrace { + bpftrace = callPackage ../by-name/bp/bpftrace/package.nix { llvmPackages = llvmPackages_16; }; From 4cd5eb84270717145103c3111db09499d614a7a7 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 12 May 2024 13:30:54 +0200 Subject: [PATCH 032/246] python311Packages.contexttimer: mark as unsopported on python 3.12 --- pkgs/development/python-modules/contexttimer/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/contexttimer/default.nix b/pkgs/development/python-modules/contexttimer/default.nix index f908783fb0b6..422ac17fb3de 100644 --- a/pkgs/development/python-modules/contexttimer/default.nix +++ b/pkgs/development/python-modules/contexttimer/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, pythonAtLeast , fetchFromGitHub , mock , fetchpatch @@ -11,6 +12,8 @@ buildPythonPackage rec { version = "unstable-2019-03-30"; format = "setuptools"; + disabled = pythonAtLeast "3.12"; + src = fetchFromGitHub { owner = "brouberol"; repo = "contexttimer"; From 316f9349887a796271913268e4ef1c1d68a9f211 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 11:32:07 +0000 Subject: [PATCH 033/246] gitlab-ci-local: 4.48.2 -> 4.49.0 --- pkgs/by-name/gi/gitlab-ci-local/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix index 2faa7d87d6b5..ae9e10033e92 100644 --- a/pkgs/by-name/gi/gitlab-ci-local/package.nix +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "gitlab-ci-local"; - version = "4.48.2"; + version = "4.49.0"; src = fetchFromGitHub { owner = "firecow"; repo = "gitlab-ci-local"; rev = version; - hash = "sha256-QdbVI6aby/UQCR3G25nvmvoXNMDndgLYz/hOTmj5dnc="; + hash = "sha256-hhzkC9wnPNwQwky2FegTMRIbcyCMzrZ/hoQlfZwk3sk="; }; - npmDepsHash = "sha256-ebrdMbSAsughHCuV86s6WA12a8hqA2yyC/rJUyViOrI="; + npmDepsHash = "sha256-mnnP1YvKSm/CgZYQWF8VU+cuQ0SUV5tW1dCRrGRBrmg="; postPatch = '' # remove cleanup which runs git commands From 0fd5388266182ba3682bb760a595720c1fbb6dbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 12:55:04 +0000 Subject: [PATCH 034/246] vivaldi: 6.7.3329.17 -> 6.7.3329.27 --- 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 7adcec104561..d1ade0a85b12 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.7.3329.17"; + version = "6.7.3329.27"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-G/KZ3BMn3nX+8hFmfZaYEo2hB/0GUxM3M4JwLzTglr0="; - x86_64-linux = "sha256-LH1/xalmKvZWKUWULWsJPz7YfPfISjiH+Tbx0Nj4VRY="; + aarch64-linux = "sha256-o+ociqdALNti/7VgcBOb7cQBlZLWmYnTQ68SW8NMDIs="; + x86_64-linux = "sha256-1ppDdLIpQMBX+W2dL6CumqUM6PsEZJpQrA3huj3V+Eg="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From be3dadb56318b1683d91e3759d208e3628b902e6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 12 May 2024 16:01:00 +0200 Subject: [PATCH 035/246] pypy: drop pycparser dependency to fix build --- pkgs/development/interpreters/python/pypy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 9b414944bba5..0380c29e9e75 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -42,7 +42,7 @@ let }; pname = passthru.executable; version = with sourceVersion; "${major}.${minor}.${patch}"; - pythonForPypy = python.withPackages (ppkgs: [ ppkgs.pycparser ]); + pythonForPypy = python.withPackages (ppkgs: [ ]); in with passthru; stdenv.mkDerivation rec { inherit pname version; From 228c11d09df9ad4bc968d7e5b0dc7d2972360e64 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 12 May 2024 21:08:33 +0200 Subject: [PATCH 036/246] odin: fix patches for darwin --- pkgs/development/compilers/odin/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 9168ad485e27..3cf9d568af03 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -30,13 +30,11 @@ in stdenv.mkDerivation rec { LLVM_CONFIG = "${llvmPackages.llvm.dev}/bin/llvm-config"; postPatch = lib.optionalString stdenv.isDarwin '' - sed -i src/main.cpp \ - -e 's|-syslibroot /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk|-syslibroot ${MacOSX-SDK}|' - '' + '' - sed -i build_odin.sh \ - -e 's/^GIT_SHA=.*$/GIT_SHA=/' \ - -e 's/LLVM-C/LLVM/' \ - -e 's/framework System/lSystem/' + substituteInPlace src/linker.cpp \ + --replace-fail '/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk' ${MacOSX-SDK} + '' + '' + substituteInPlace build_odin.sh \ + --replace-fail '-framework System' '-lSystem' patchShebangs build_odin.sh ''; From 11a75884338700ef39c243abfcb0654205e48d1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 May 2024 21:15:49 +0000 Subject: [PATCH 037/246] streamlink: 6.7.3 -> 6.7.4 --- pkgs/applications/video/streamlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index bef67278b3ad..e5f0cac20b52 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.7.3"; + version = "6.7.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Da+J+NOXW+n55LvaPQw6XiRhJJQ4Pc4Z1p21qMym/Xw="; + hash = "sha256-kzdTerEZ/ndSSl1mWq7Ou/sG4suN8o0SYNkodkJXUc4="; }; patches = [ From f0e4ac034a63b5b90c5857a03626009ba83441ab Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 27 Apr 2024 01:31:42 +0200 Subject: [PATCH 038/246] nodeinfo: init at 0.3.2 --- pkgs/by-name/no/nodeinfo/package.nix | 33 ++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/no/nodeinfo/package.nix diff --git a/pkgs/by-name/no/nodeinfo/package.nix b/pkgs/by-name/no/nodeinfo/package.nix new file mode 100644 index 000000000000..2027ce803510 --- /dev/null +++ b/pkgs/by-name/no/nodeinfo/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitea, + buildGoModule, +}: +buildGoModule rec { + pname = "nodeinfo"; + version = "0.3.2"; + vendorHash = "sha256-4nHdz/Js8xBUMiH+hH+hSYP25cB4yHbe+QVk0RMqLgc="; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "thefederationinfo"; + repo = "nodeinfo-go"; + rev = "refs/tags/v${version}"; + hash = "sha256-NNrMv4AS7ybuJfTgs+p61btSIxo+iMvzH7Y5ct46Dag="; + }; + + tags = "extension"; + + sourceRoot = "${src.name}/cli"; + + CGO_ENABLED = 0; + + meta = with lib; { + mainProgram = "nodeinfo"; + description = "A command line tool to query nodeinfo based on a given domain"; + homepage = "https://codeberg.org/thefederationinfo/nodeinfo-go"; + changelog = "https://codeberg.org/thefederationinfo/nodeinfo-go/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ _6543 ]; + }; +} From 05a032a728ced350e7aa93a7273fce4fc4493c2e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 08:55:13 +0000 Subject: [PATCH 039/246] komikku: 1.45.1 -> 1.46.0 --- pkgs/applications/graphics/komikku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index ac9d11b8a87b..bdc81a532fdc 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.45.1"; + version = "1.46.0"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-gTZ2LuCsYFIUASfjzLi4t0PbjyriU9FR7d2G+PcLDVc="; + hash = "sha256-0yobGclfZzv0S0HtqeTr4vzK5d6PTQNWMszP0B4k770="; }; nativeBuildInputs = [ From a28ee4912ccb722cfb44fb8c31cee4e7c52e7e13 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Mon, 13 May 2024 10:37:29 +0100 Subject: [PATCH 040/246] maintainers: update email for michaelpj --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 789da06a6adc..c93cfcef80e0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13154,7 +13154,7 @@ }]; }; michaelpj = { - email = "michaelpj@gmail.com"; + email = "me@michaelpj.com"; github = "michaelpj"; githubId = 1699466; name = "Michael Peyton Jones"; From c3c7c331348827f904e1f62db85c539fff2258e9 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Mon, 13 May 2024 10:37:53 +0100 Subject: [PATCH 041/246] throttled: remove michaelpj as maintainer --- pkgs/tools/system/throttled/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index 1fa67fb1c224..076cd1c020a7 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/erpalma/throttled"; license = licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ michaelpj ]; + maintainers = with maintainers; [ ]; }; } From bf5bec1538289c65d5722e38215f860aa4d44202 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Mon, 13 May 2024 10:38:10 +0100 Subject: [PATCH 042/246] arbtt: remove michaeplj as maintainer --- nixos/modules/services/monitoring/arbtt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix index 6dad6bdec328..cf9a236c079c 100644 --- a/nixos/modules/services/monitoring/arbtt.nix +++ b/nixos/modules/services/monitoring/arbtt.nix @@ -45,5 +45,5 @@ in { }; }; - meta.maintainers = [ maintainers.michaelpj ]; + meta.maintainers = [ ]; } From e8771cc3c74de4d06f60c09272a1c5c6b558c7d5 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Mon, 13 May 2024 10:38:20 +0100 Subject: [PATCH 043/246] heatseeker: remove michaelpj as maintainer --- pkgs/tools/misc/heatseeker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 24da793445cb..210e184e9d4a 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { description = "A general-purpose fuzzy selector"; homepage = "https://github.com/rschmitt/heatseeker"; license = licenses.mit; - maintainers = [ maintainers.michaelpj ]; + maintainers = [ ]; mainProgram = "hs"; platforms = platforms.unix; }; From cd981c1cc61b588a688e54879ee9ec0fd65945bc Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Mon, 13 May 2024 10:38:30 +0100 Subject: [PATCH 044/246] tzupdate: remove michaelpj as maintainer --- nixos/modules/services/misc/tzupdate.nix | 2 +- pkgs/applications/misc/tzupdate/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix index eac1e1112a5a..be63bb179e42 100644 --- a/nixos/modules/services/misc/tzupdate.nix +++ b/nixos/modules/services/misc/tzupdate.nix @@ -41,5 +41,5 @@ in { }; }; - meta.maintainers = [ maintainers.michaelpj ]; + meta.maintainers = [ ]; } diff --git a/pkgs/applications/misc/tzupdate/default.nix b/pkgs/applications/misc/tzupdate/default.nix index 7ca8c9f97345..1bd2eece184c 100644 --- a/pkgs/applications/misc/tzupdate/default.nix +++ b/pkgs/applications/misc/tzupdate/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { description = "Update timezone information based on geoip"; mainProgram = "tzupdate"; homepage = "https://github.com/cdown/tzupdate"; - maintainers = [ maintainers.michaelpj ]; + maintainers = [ ]; license = licenses.unlicense; }; } From b734aa61461b9a2f7b9c571a44d04ef3e73a5bef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 10:08:29 +0000 Subject: [PATCH 045/246] mise: 2024.5.2 -> 2024.5.9 --- pkgs/tools/misc/mise/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index 2803145b44cc..5c24e8314ce1 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.5.2"; + version = "2024.5.9"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-AFJjgNYZ4LDqK0qzYyg/bhqFJZJ9tybzlEaOOppOrdY="; + hash = "sha256-vmY+uI/NqMCLJwJaQU+aDppmn5OSLPUIbeqCSlN8Xb0="; # registry is not needed for compilation nor for tests. # contains files with the same name but different case, which cause problems with hash on darwin @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-p3rWrNrgIBgF70cwZB+ofDF8Px0t92Vk74exze7ANus="; + cargoHash = "sha256-7kcs1vOM68uKjMrRn8jGI6mgXd90TeMUeYWnAGl8sgE="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; From 7dd8246deed599995d89052c01debdb39adb9dd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 14:30:01 +0200 Subject: [PATCH 046/246] python312Packages.ical: 8.0.1 -> 8.0.2 Diff: https://github.com/allenporter/ical/compare/refs/tags/8.0.1...8.0.2 Changelog: https://github.com/allenporter/ical/releases/tag/8.0.2 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 826b2cee2235..8a58c7fd3807 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ical"; - version = "8.0.1"; + version = "8.0.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-GA2Kn6OednhQtNzmIq5npN2qXVaMHCzy02Jwx7g3GBA="; + hash = "sha256-NrnRId+bgRh31+ocWBjWE2Zo3gOvPJ2fYtOVWOWD5EY="; }; build-system = [ From 3cec89fc615d91ee28097e3e6a27be685f607dac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 14:32:04 +0200 Subject: [PATCH 047/246] python312Packages.ical: format with nixfmt --- .../python-modules/ical/default.nix | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 8a58c7fd3807..2d573dcaeafd 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -1,17 +1,18 @@ -{ lib -, buildPythonPackage -, emoji -, fetchFromGitHub -, freezegun -, tzdata -, pyparsing -, pydantic -, pytest-benchmark -, pytestCheckHook -, pythonOlder -, python-dateutil -, setuptools -, syrupy +{ + lib, + buildPythonPackage, + emoji, + fetchFromGitHub, + freezegun, + tzdata, + pyparsing, + pydantic, + pytest-benchmark, + pytestCheckHook, + pythonOlder, + python-dateutil, + setuptools, + syrupy, }: buildPythonPackage rec { @@ -28,9 +29,7 @@ buildPythonPackage rec { hash = "sha256-NrnRId+bgRh31+ocWBjWE2Zo3gOvPJ2fYtOVWOWD5EY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ python-dateutil @@ -47,9 +46,7 @@ buildPythonPackage rec { syrupy ]; - pythonImportsCheck = [ - "ical" - ]; + pythonImportsCheck = [ "ical" ]; meta = with lib; { description = "Library for handling iCalendar"; From f0c8fdcb9e59eac9a18af2d9aae03b1955b5513d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 13:21:43 +0000 Subject: [PATCH 048/246] kestrel: 1.0.0 -> 1.0.1 --- pkgs/tools/security/kestrel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kestrel/default.nix b/pkgs/tools/security/kestrel/default.nix index a94b412e67ee..329a31447daa 100644 --- a/pkgs/tools/security/kestrel/default.nix +++ b/pkgs/tools/security/kestrel/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "kestrel"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "finfet"; repo = pname; rev = "v${version}"; - hash = "sha256-n0XIFBCwpc6QTj3PjGp+fYtU4U+RAfA4PRcettFlxVA="; + hash = "sha256-aj8c4Hagdqoi7Q/AM0drjyrGOvqrT35sEjc2TC0ei6M="; }; - cargoHash = "sha256-GZK4IaAolU1up2bYd/2tBahcCP70hO5/shDODUD+aRE="; + cargoHash = "sha256-D3yGIZr6/jaySacdz0yOPQUpKsuYlgBGx0V/4lXuVuw="; nativeBuildInputs = [ installShellFiles From 4b12152de7e22c447299d77c999ad6facf475513 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 13:22:12 +0000 Subject: [PATCH 049/246] modprobed-db: 2.46 -> 2.47 --- pkgs/by-name/mo/modprobed-db/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/modprobed-db/package.nix b/pkgs/by-name/mo/modprobed-db/package.nix index 2a307aeb832c..84edaa3f6350 100644 --- a/pkgs/by-name/mo/modprobed-db/package.nix +++ b/pkgs/by-name/mo/modprobed-db/package.nix @@ -9,7 +9,7 @@ }: let pname = "modprobed-db"; - version = "2.46"; + version = "2.47"; in stdenv.mkDerivation { inherit pname version; @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "graysky2"; repo = "modprobed-db"; rev = "v${version}"; - hash = "sha256-GQME5CAZsGVHSPowKQMyUR7OjHeFZi/5YcWFUT9L/AQ="; + hash = "sha256-r/2ZENricRE03eyFnWDnfPNAz2863/9HKlF6a2xOkc0="; }; strictDeps = true; From aecc8aa7b827fba14b414558202093466e3ca8d2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 13 May 2024 14:07:42 +0200 Subject: [PATCH 050/246] symfony-cli: add build date Inspired from pkgs/applications/graphics/pdfcpu/default.nix --- pkgs/by-name/sy/symfony-cli/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix index 794bd2f0ea9b..20a30fd5d249 100644 --- a/pkgs/by-name/sy/symfony-cli/package.nix +++ b/pkgs/by-name/sy/symfony-cli/package.nix @@ -17,7 +17,12 @@ buildGoModule rec { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - hash = "sha256-IanaxFhD0nAabr9w6ARCVie+sYW9bvgHoahsuHQYeqE="; + hash = "sha256-UmGyIZk5s5A8ModafWMZqeJHdZ4fa+hAHi62pdlfJ8I="; + leaveDotGit = true; + postFetch = '' + git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE + rm -rf $out/.git + ''; }; ldflags = [ @@ -27,6 +32,10 @@ buildGoModule rec { "-X main.channel=stable" ]; + preBuild = '' + ldflags+=" -X main.buildDate=$(cat SOURCE_DATE)" + ''; + buildInputs = [ makeBinaryWrapper ]; postInstall = '' From 4b1e83e97c6bb8e5635c69ae92ecb889ba743cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 13 May 2024 15:59:28 +0200 Subject: [PATCH 051/246] nixos/display.managers: use cfg where possible --- nixos/modules/services/display-managers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix index 6fa8556e39be..feba4b163ccd 100644 --- a/nixos/modules/services/display-managers/default.nix +++ b/nixos/modules/services/display-managers/default.nix @@ -113,7 +113,7 @@ in type = lib.types.nullOr lib.types.str // { description = "session name"; check = d: - lib.assertMsg (d != null -> (lib.types.str.check d && lib.elem d config.services.displayManager.sessionData.sessionNames)) '' + lib.assertMsg (d != null -> (lib.types.str.check d && lib.elem d cfg.sessionData.sessionNames)) '' Default graphical session, '${d}', not found. Valid names for 'services.displayManager.defaultSession' are: ${lib.concatStringsSep "\n " cfg.sessionData.sessionNames} @@ -187,7 +187,7 @@ in services.displayManager.sessionData = { desktops = installedSessions; - sessionNames = lib.concatMap (p: p.providedSessions) config.services.displayManager.sessionPackages; + sessionNames = lib.concatMap (p: p.providedSessions) cfg.sessionPackages; # We do not want to force users to set defaultSession when they have only single DE. autologinSession = if cfg.defaultSession != null then From 9b2e62243919d17b76d7a708e691cf4086e78802 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Mon, 13 May 2024 10:39:13 -0400 Subject: [PATCH 052/246] vimPlugins.luasnip: add jsregexp dependency Without this, checkhealth reports warnings of missing functionality --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index c38f517d7369..c3711bd412fe 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -839,6 +839,10 @@ dependencies = with self; [ plenary-nvim ]; }; + luasnip = super.luasnip.overrideAttrs { + dependencies = with self; [ luaPackages.jsregexp ]; + }; + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-03-13"; From ffceed3b200a026e92526783c32774f362f83b25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 14:45:06 +0000 Subject: [PATCH 053/246] prometheus-cloudflare-exporter: 0.0.14 -> 0.0.15 --- pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix b/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix index 7abcfeb32887..ec4dae6cbcb5 100644 --- a/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/cloudflare-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloudflare-exporter"; - version = "0.0.14"; + version = "0.0.15"; src = fetchFromGitHub { rev = version; owner = "lablabs"; repo = pname; - sha256 = "sha256-A7JnHx9yipTwv63287BqmGrJ3yQ21NhB1z7rrHe6Ok8="; + sha256 = "sha256-cmA+OdPsG9JTiYGzXeK8dEhZJPHFKgKDaDMszIVyzg0="; }; - vendorHash = "sha256-B/+UTkoGAoJLMr+zdXXSC2CWGHx+Iu5E2qp4AA/nmHM="; + vendorHash = "sha256-c1drgbzoA5AlbB0K+E8kuJnyShgUg7spPQKAAwxCr6M="; meta = with lib; { description = "Prometheus Cloudflare Exporter"; From 8bfc54dc2c4b0e1a280200ae0a098324674d6cbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 14:49:07 +0000 Subject: [PATCH 054/246] ptyxis: 46.1 -> 46.2 --- pkgs/by-name/pt/ptyxis/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pt/ptyxis/package.nix b/pkgs/by-name/pt/ptyxis/package.nix index 95860ac1d224..3ff45bffb4db 100644 --- a/pkgs/by-name/pt/ptyxis/package.nix +++ b/pkgs/by-name/pt/ptyxis/package.nix @@ -15,14 +15,14 @@ }: let - version = "46.1"; + version = "46.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "chergert"; repo = "ptyxis"; rev = version; - hash = "sha256-4fdl6H0kxZwpEQp+sZJkO0auQDR327m7RDXf6tbB5x0="; + hash = "sha256-/n/S2ws6qsVwTXX96MPa+/ISozDDu8A1wkD1g3dmAtQ="; }; vte-gtk4-patched = vte-gtk4.overrideAttrs (prev: { From 2ece1844d8c8206c492958a471ea948900657077 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Mon, 13 May 2024 17:13:48 +0200 Subject: [PATCH 055/246] geos: fix build for darwin --- pkgs/development/libraries/geos/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index e24f519d1cc3..38de27740300 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -3,7 +3,7 @@ , callPackage , fetchurl , testers - +, ngspice , cmake }: @@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ ngspice ]; # https://github.com/libgeos/geos/issues/930 cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ From 0d63ba5abfe1dcd30f38d902c313b9138d9d16d4 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Mon, 13 May 2024 17:20:09 +0200 Subject: [PATCH 056/246] youtrack: 2024.1.28928 -> 2024.1.29548 --- pkgs/by-name/yo/youtrack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix index 61788d193b56..5dbe8b9710ba 100644 --- a/pkgs/by-name/yo/youtrack/package.nix +++ b/pkgs/by-name/yo/youtrack/package.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "youtrack"; - version = "2024.1.28928"; + version = "2024.1.29548"; src = fetchzip { url = "https://download.jetbrains.com/charisma/youtrack-${finalAttrs.version}.zip"; - hash = "sha256-8+dZ1YTpvOX0IEEbFzv4t8T/U/BZMeDCZL7Ju25WBpE="; + hash = "sha256-01av1leVJz+QbnFNYyxEeL1zd6I25VNt45YFgV25n+0="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From bd34831f5abb5d6e803b6ef0c373b4c63e88098c Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 8 May 2024 14:03:13 +0200 Subject: [PATCH 057/246] python3Packages.xmldiff: refactor --- pkgs/development/python-modules/xmldiff/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmldiff/default.nix b/pkgs/development/python-modules/xmldiff/default.nix index 6356b9bff352..2fc4a739e258 100644 --- a/pkgs/development/python-modules/xmldiff/default.nix +++ b/pkgs/development/python-modules/xmldiff/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xmldiff"; version = "2.6.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,11 @@ buildPythonPackage rec { hash = "sha256-GbAws/o30fC1xa2a2pBZiEw78sdRxd2PHrTtSc/j/GA="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ lxml setuptools ]; From 7773daec066628a0f50c5222079fd8c856ac6cc6 Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 13 May 2024 11:57:49 -0300 Subject: [PATCH 058/246] xrdp: add update script Signed-off-by: lucasew --- .../networking/remote/xrdp/default.nix | 45 ++++++++++++------- .../xrdp/pulseaudio-module-xrdp/default.nix | 4 +- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 3d6d1de3d964..5c0dd23a9e13 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -19,22 +19,11 @@ , lame , pixman , libjpeg_turbo +, _experimental-update-script-combinators +, gitUpdater }: let - version = "0.9.25.1"; - patchedXrdpSrc = applyPatches { - patches = [ ./dynamic_config.patch ]; - name = "xrdp-patched-${version}"; - src = fetchFromGitHub { - owner = "neutrinolabs"; - repo = "xrdp"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-oAs0oWkCyj3ObdJuHLfT25ZzkTrxNAXDiFU64OOP4Ow="; - }; - }; - xorgxrdp = stdenv.mkDerivation rec { pname = "xorgxrdp"; version = "0.9.20"; @@ -62,16 +51,29 @@ let preConfigure = "./bootstrap"; - configureFlags = [ "XRDP_CFLAGS=-I${patchedXrdpSrc}/common" ]; + configureFlags = [ "XRDP_CFLAGS=-I${xrdp.src}/common" ]; enableParallelBuilding = true; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; }; - xrdp = stdenv.mkDerivation { - inherit version; + xrdp = stdenv.mkDerivation rec { pname = "xrdp"; + version = "0.9.25.1"; - src = patchedXrdpSrc; + src = applyPatches { + inherit version; + patches = [ ./dynamic_config.patch ]; + name = "xrdp-patched-${version}"; + src = fetchFromGitHub { + owner = "neutrinolabs"; + repo = "xrdp"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-oAs0oWkCyj3ObdJuHLfT25ZzkTrxNAXDiFU64OOP4Ow="; + }; + }; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; @@ -150,6 +152,15 @@ let enableParallelBuilding = true; + passthru = { + inherit xorgxrdp; + updateScript = _experimental-update-script-combinators.sequence (map (item: item.command) [ + (gitUpdater { rev-prefix = "v"; attrPath = "xrdp.src"; ignoredVersions = [ "beta" ]; }) + { command = ["rm" "update-git-commits.txt"]; } + (gitUpdater { rev-prefix = "v"; attrPath = "xrdp.xorgxrdp"; }) + ]); + }; + meta = with lib; { description = "An open source RDP server"; homepage = "https://github.com/neutrinolabs/xrdp"; diff --git a/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix index 86dc913b91e3..c83d08fc828f 100644 --- a/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/pulseaudio-module-xrdp/default.nix @@ -1,11 +1,11 @@ { stdenv , fetchFromGitHub , lib -, nix-update-script , pulseaudio , autoreconfHook , pkg-config , nixosTests +, gitUpdater }: stdenv.mkDerivation rec { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { }; + updateScript = gitUpdater { rev-prefix = "v"; }; tests = { inherit (nixosTests) xrdp-with-audio-pulseaudio; }; From 41472a0e4590df71752caea52032b3bc8d284163 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 00:15:02 +0800 Subject: [PATCH 059/246] miniscript: nixfmt-rfc-style --- .../blockchains/miniscript/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix index acdcd108c607..e96d3732b7c4 100644 --- a/pkgs/applications/blockchains/miniscript/default.nix +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, fetchFromGitHub }: +{ + stdenv, + lib, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "miniscript"; @@ -19,12 +23,15 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Compiler and inspector for the miniscript Bitcoin policy language"; + description = "Compiler and inspector for the miniscript Bitcoin policy language"; longDescription = "Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way, enabling analysis, composition, generic signing and more."; - homepage = "https://bitcoin.sipa.be/miniscript/"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ RaghavSood jb55 ]; + homepage = "https://bitcoin.sipa.be/miniscript/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ + RaghavSood + jb55 + ]; mainProgram = "miniscript"; }; } From ba5d88f4ece1ff16b95b5ac623d2ba14e55a7111 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 00:16:18 +0800 Subject: [PATCH 060/246] miniscript: unstable-2022-07-19 -> unstable-2023-03-16 --- .../blockchains/miniscript/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/miniscript/default.nix b/pkgs/applications/blockchains/miniscript/default.nix index e96d3732b7c4..84b1b55f6618 100644 --- a/pkgs/applications/blockchains/miniscript/default.nix +++ b/pkgs/applications/blockchains/miniscript/default.nix @@ -6,15 +6,26 @@ stdenv.mkDerivation rec { pname = "miniscript"; - version = "unstable-2022-07-19"; + version = "unstable-2023-03-16"; src = fetchFromGitHub { owner = "sipa"; repo = pname; - rev = "ca675488c4aa9605f6ae70c0e68a148a6fb277b4"; - sha256 = "sha256-kzLIJ0os6UnC0RPEybfw6wGrZpgmRCgj3zifmZjieoU="; + rev = "6806dfb15a1fafabf7dd28aae3c9d2bc49db01f1"; + sha256 = "sha256-qkYDzsl2Y4WEDDXs9cE/jIXm01jclkYUQbDGe1S0wYs="; }; + postPatch = lib.optionalString stdenv.isDarwin '' + # Replace hardcoded g++ with c++ so clang can be used + # on darwin + # + # lto must be disabled on darwin as well due to + # https://github.com/NixOS/nixpkgs/issues/19098 + substituteInPlace Makefile \ + --replace-fail 'g++' 'c++' \ + --replace-fail '-flto' "" + ''; + installPhase = '' runHook preInstall mkdir -p $out/bin @@ -27,7 +38,6 @@ stdenv.mkDerivation rec { longDescription = "Miniscript is a language for writing (a subset of) Bitcoin Scripts in a structured way, enabling analysis, composition, generic signing and more."; homepage = "https://bitcoin.sipa.be/miniscript/"; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ RaghavSood jb55 From c3419d593ec65d45c401d10a9b93a4e44bc159a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 18:56:46 +0200 Subject: [PATCH 061/246] python312Packages.avwx-engine: init at 1.8.28 Aviation Weather parsing engine https://github.com/avwx-rest/avwx-engine --- .../python-modules/avwx-engine/default.nix | 84 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 86 insertions(+) create mode 100644 pkgs/development/python-modules/avwx-engine/default.nix diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix new file mode 100644 index 000000000000..ccaaa09e5b09 --- /dev/null +++ b/pkgs/development/python-modules/avwx-engine/default.nix @@ -0,0 +1,84 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + geopy, + httpx, + numpy, + poetry-core, + pytestCheckHook, + pytest-asyncio, + python-dateutil, + pythonOlder, + rapidfuzz, + scipy, + shapely, + time-machine, + xmltodict, +}: + +buildPythonPackage rec { + pname = "avwx-engine"; + version = "1.8.28"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "avwx-rest"; + repo = "avwx-engine"; + rev = "refs/tags/${version}"; + hash = "sha256-sxOLhcmTJg/dTrtemr9BcfcBoHTP1eGo8U1ab8iSvUM="; + }; + + postPatch = '' + sed -i -e "/--cov/d" -e "/--no-cov/d" pyproject.toml + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + geopy + httpx + python-dateutil + xmltodict + ]; + + passthru.optional-dependencies = { + all = [ + numpy + rapidfuzz + scipy + shapely + ]; + fuzz = [ rapidfuzz ]; + scipy = [ + numpy + scipy + ]; + shape = [ shapely ]; + }; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + time-machine + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ "avwx" ]; + + disabledTests = [ + # Tests require network access + "fetch" + "test_nbm_all" + "test_station_nearest_ip" + ]; + + meta = with lib; { + description = "Aviation Weather parsing engine"; + homepage = "https://github.com/avwx-rest/avwx-engine"; + changelog = "https://github.com/avwx-rest/avwx-engine/blob/${version}/changelog.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9375194ceb5d..b220e4e661d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1024,6 +1024,8 @@ self: super: with self; { avro-python3 = callPackage ../development/python-modules/avro-python3 { }; + avwx-engine = callPackage ../development/python-modules/avwx-engine { }; + aw-client = callPackage ../development/python-modules/aw-client { }; aw-core = callPackage ../development/python-modules/aw-core { }; From f4c64495c45df2df14e2b195e8e737d50a3462a2 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 11 May 2024 18:25:05 +0530 Subject: [PATCH 062/246] ananicy-rules-cachyos: add unstable update script --- pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 7a146013a6d0..89170338ee22 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + unstableGitUpdater, }: stdenvNoCC.mkDerivation { @@ -26,6 +27,10 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; + passthru.updateScript = unstableGitUpdater { + hardcodeZeroVersion = true; + }; + meta = { homepage = "https://github.com/CachyOS/ananicy-rules"; description = "CachyOS' ananicy-rules meant to be used with ananicy-cpp"; From 14676392cd863217a252fea3eadfad827e6b6154 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 11 May 2024 18:27:38 +0530 Subject: [PATCH 063/246] unstableGitUpdater: document actual use procedure --- pkgs/common-updater/unstable-updater.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/common-updater/unstable-updater.nix b/pkgs/common-updater/unstable-updater.nix index d982fc6110ba..d7a9c73fbc2d 100644 --- a/pkgs/common-updater/unstable-updater.nix +++ b/pkgs/common-updater/unstable-updater.nix @@ -8,6 +8,10 @@ # This is an updater for unstable packages that should always use the latest # commit. +# To use this updater, add the following to your package set: +# passthru.updateScript = unstableGitUpdater { }; +# relevant attributes can be passed as below: + { url ? null # The git url, if empty it will be set to src.gitRepoUrl , branch ? null , hardcodeZeroVersion ? false # Use a made-up version "0" instead of latest tag. Use when there is no previous release, or the project's tagging system is incompatible with what we expect from versions From 5e8ff032e876d8d8e00f0bc016bc0ea58f4d0aa9 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 11 May 2024 19:34:14 +0530 Subject: [PATCH 064/246] lightningcss: add update-script --- pkgs/by-name/li/lightningcss/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix index 598a6033c37f..7b9c58e087f3 100644 --- a/pkgs/by-name/li/lightningcss/package.nix +++ b/pkgs/by-name/li/lightningcss/package.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, nix-update-script }: rustPlatform.buildRustPackage rec { @@ -37,6 +38,8 @@ rustPlatform.buildRustPackage rec { "--lib" ]; + passthru.updateScript = nix-update-script {}; + meta = with lib; { description = "Extremely fast CSS parser, transformer, and minifier written in Rust"; homepage = "https://lightningcss.dev/"; From 0d2a613af759a8a2487de8d72c64791b2369b201 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 11 May 2024 19:37:47 +0530 Subject: [PATCH 065/246] pyprland: add update script --- pkgs/by-name/py/pyprland/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/py/pyprland/package.nix b/pkgs/by-name/py/pyprland/package.nix index b9821190cec2..2692b2c51b3a 100644 --- a/pkgs/by-name/py/pyprland/package.nix +++ b/pkgs/by-name/py/pyprland/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, python3Packages, + nix-update-script, }: python3Packages.buildPythonApplication rec { @@ -57,6 +58,8 @@ python3Packages.buildPythonApplication rec { "pyprland.plugins.workspaces_follow_focus" ]; + passthru.updateScript = nix-update-script {}; + meta = { mainProgram = "pypr"; description = "An hyperland plugin system"; From d49f993b39da2e745f0b0371c2c80367af76df3a Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Mon, 13 May 2024 22:42:03 +0530 Subject: [PATCH 066/246] bcachefs-tools: switch to nix-update-script --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index ec268aac3118..c49d1a856198 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -20,7 +20,7 @@ rustc, rustPlatform, makeWrapper, - writeScript, + nix-update-script, python3, fuseSupport ? false, }: @@ -104,15 +104,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti; }; - updateScript = writeScript "update-bcachefs-tools-and-cargo-lock.sh" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ - -sL "https://api.github.com/repos/${finalAttrs.src.owner}/${finalAttrs.src.repo}/tags?per_page=1")" - - version="$(echo $res | jq '.[0].name | split("v") | .[1]' --raw-output)" - update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash - ''; + updateScript = nix-update-script {}; }; enableParallelBuilding = true; From d95e9bf3a61395f00b18379d9fb6388d3e6645f9 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Sat, 11 May 2024 11:59:58 +0530 Subject: [PATCH 067/246] google-chrome: add update-script --- pkgs/by-name/go/google-chrome/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index d31d5bafe09b..ff54ecddd68e 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, patchelf, makeWrapper, fetchurl +{ lib, stdenv, patchelf, makeWrapper, fetchurl, writeScript # Linked dynamic libraries. , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr @@ -142,6 +142,17 @@ in stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + updateScript = writeScript "update-google-chrome.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + url="https://versionhistory.googleapis.com/v1/chrome/platforms/linux/channels/stable/versions/all/releases" + response=$(curl --silent $url) + version=$(jq ".releases[0].version" --raw-output <<< "$response") + update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash + ''; + }; + meta = { description = "A freeware web browser developed by Google"; homepage = "https://www.google.com/chrome/browser/"; From d4fd16d28e15bac3a7636543f53c331918f872b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 17:15:45 +0000 Subject: [PATCH 068/246] k6: 0.50.0 -> 0.51.0 --- pkgs/development/tools/k6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index 3d1dfbd2d0b9..246cccbf3b08 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.50.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-lR16M8TAP0ilvcrA9YjVoZMrsi+kwEFKx5Fd3birHHM="; + hash = "sha256-NlSb0UNe61AG/BQyUFqZEug3VnGTi0W0o0CblvV+oDg="; }; subPackages = [ "./" ]; From b0eeeff39c4882fa8cff6156aefbe163d0ea28be Mon Sep 17 00:00:00 2001 From: Robert Medeiros Date: Mon, 13 May 2024 13:24:39 -0400 Subject: [PATCH 069/246] iroh: 0.15.0 -> 0.16.0 --- pkgs/applications/networking/iroh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index 934d8f5dcef1..f80fc10e6425 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-ho/wlg6W0/LcJrVHPRVQ6zNjpwqa0+PThUP/RGIXVTA="; + hash = "sha256-NllGbYThhqqGzYOf1NnmMBpiu6JyQlThBKCzxPd6X5c="; }; - cargoHash = "sha256-1S6lFzoLxF6V94wXw/r5XDwbnt4/aaPOYdIIJA68Ya8="; + cargoHash = "sha256-Nw3JXoAH8dTUphV1S8rXFWjER6AFVvtCDvOPz3uNeXk="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ From 313491cf10058abe28939e9608aa4e8e1c4c5df7 Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Mon, 13 May 2024 19:38:09 +0200 Subject: [PATCH 070/246] appflowy: 0.5.6 -> 0.5.7 https://github.com/AppFlowy-IO/AppFlowy/releases/tag/0.5.7 --- pkgs/applications/office/appflowy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/appflowy/default.nix b/pkgs/applications/office/appflowy/default.nix index fa400eccc9d3..8db8b3fbb791 100644 --- a/pkgs/applications/office/appflowy/default.nix +++ b/pkgs/applications/office/appflowy/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.5.6"; + version = "0.5.7"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy-${version}-linux-x86_64.tar.gz"; - hash = "sha256-6eolLBWVpnEvjA+C6R5gpkxG/G59atrkwOP7CWhs7oI="; + hash = "sha256-SVtAx/yllHugBys506pT/5n6IDEZvPEeCHRjFHLMZ0A="; stripRoot = false; }; From db75a79fb74b2989a9b304137f8be9e25188ae4c Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Mon, 13 May 2024 19:53:14 +0200 Subject: [PATCH 071/246] glanceclient: unbreak and reformat Some test are just failing for some random reason. Should not be very problematic --- .../python-glanceclient/default.nix | 69 ++++++++++++------- 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/python-glanceclient/default.nix b/pkgs/development/python-modules/python-glanceclient/default.nix index 9fd1f21a083d..13ed448938d9 100644 --- a/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/pkgs/development/python-modules/python-glanceclient/default.nix @@ -1,27 +1,42 @@ -{ lib -, buildPythonPackage -, fetchPypi -, coreutils -, pbr -, prettytable -, keystoneauth1 -, requests -, warlock -, oslo-utils -, oslo-i18n -, wrapt -, pyopenssl -, pythonOlder -, stestr -, testscenarios -, ddt -, requests-mock +{ + lib, + buildPythonPackage, + fetchPypi, + coreutils, + setuptools, + pbr, + prettytable, + keystoneauth1, + requests, + warlock, + oslo-utils, + oslo-i18n, + wrapt, + pyopenssl, + pythonOlder, + stestr, + testscenarios, + ddt, + requests-mock, + writeText, }: - -buildPythonPackage rec { +let pname = "python-glanceclient"; version = "4.5.0"; - format = "setuptools"; + + disabledTests = [ + "test_http_chunked_response" + "test_v1_download_has_no_stray_output_to_stdout" + "test_v2_requests_valid_cert_verification" + "test_download_has_no_stray_output_to_stdout" + "test_v2_download_has_no_stray_output_to_stdout" + "test_v2_requests_valid_cert_verification_no_compression" + "test_log_request_id_once" + ]; +in +buildPythonPackage { + inherit pname version; + pyproject = true; disabled = pythonOlder "3.8"; @@ -32,9 +47,11 @@ buildPythonPackage rec { postPatch = '' substituteInPlace glanceclient/tests/unit/v1/test_shell.py \ - --replace "/bin/echo" "${coreutils}/bin/echo" + --replace-fail "/bin/echo" "${lib.getExe' coreutils "echo"}" ''; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ pbr prettytable @@ -55,12 +72,12 @@ buildPythonPackage rec { ]; checkPhase = '' - stestr run + runHook preCheck + stestr run -e ${writeText "disabled-tests" (lib.concatStringsSep "\n" disabledTests)} + runHook postCheck ''; - pythonImportsCheck = [ - "glanceclient" - ]; + pythonImportsCheck = [ "glanceclient" ]; meta = with lib; { description = "Python bindings for the OpenStack Images API"; From d8b1cfeebb1124efa5c9e01a9cc675a8a2568a25 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 20:15:10 +0200 Subject: [PATCH 072/246] python312Packages.youless-api: 1.0.1 -> 1.1.1 Diff: gjong/youless-python-bridge@refs/tags/1.0.1...1.1.1 Changelog: https://github.com/gjong/youless-python-bridge/releases/tag/1.1.1 --- .../python-modules/youless-api/default.nix | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index ff10359238b4..1dce1219c551 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -1,39 +1,36 @@ { lib , buildPythonPackage -, fetchFromBitbucket +, fetchFromGitHub +, pytestCheckHook , pythonOlder -, certifi -, chardet -, idna -, pynose , requests -, urllib3 +, setuptools }: buildPythonPackage rec { pname = "youless-api"; - version = "1.0.1"; - format = "setuptools"; + version = "1.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; - src = fetchFromBitbucket { - owner = "jongsoftdev"; + src = fetchFromGitHub { + owner = "gjong"; repo = "youless-python-bridge"; - rev = version; - hash = "sha256-49/HmkGr87aDhr8GEtARpXvr2RcgmLdAqhvMLI5x+vQ="; + rev = "refs/tags/${version}"; + hash = "sha256-J3YRRVcA4LYxuJMi//LJO8Qt8hapJruZGzONODE3SsQ="; }; - propagatedBuildInputs = [ - certifi - chardet - idna + build-system = [ + setuptools + ]; + + dependencies = [ requests - urllib3 ]; nativeCheckInputs = [ - pynose + pytestCheckHook ]; pythonImportsCheck = [ @@ -42,7 +39,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for YouLess sensors"; - homepage = "https://pypi.org/project/youless-api/"; + homepage = "https://github.com/gjong/youless-python-bridge"; + changelog = "https://github.com/gjong/youless-python-bridge/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From a284111fb89352a0e994f4cc7aaf0cf80a61df7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 20:15:46 +0200 Subject: [PATCH 073/246] python312Packages.youless-api: format with nixfmt --- .../python-modules/youless-api/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/youless-api/default.nix b/pkgs/development/python-modules/youless-api/default.nix index 1dce1219c551..5c923e0bb313 100644 --- a/pkgs/development/python-modules/youless-api/default.nix +++ b/pkgs/development/python-modules/youless-api/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, requests -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + setuptools, }: buildPythonPackage rec { @@ -21,21 +22,13 @@ buildPythonPackage rec { hash = "sha256-J3YRRVcA4LYxuJMi//LJO8Qt8hapJruZGzONODE3SsQ="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - requests - ]; + dependencies = [ requests ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "youless_api" - ]; + pythonImportsCheck = [ "youless_api" ]; meta = with lib; { description = "Python library for YouLess sensors"; From f8d6770b1fa710e5f6c69ff8ff83433a5eb1335d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 18:30:31 +0000 Subject: [PATCH 074/246] gotestwaf: 0.4.18 -> 0.4.19 --- pkgs/tools/security/gotestwaf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index a8a759dd1c77..b63b30519796 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.18"; + version = "0.4.19"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-+AM+x/jKkoXLeWOhrCALhCDuoGCl5jt0BiCit885K7I="; + hash = "sha256-ax2HPhdaqawpFe2AZg3SVsEJLG7gEgL7632iRADpaa8="; }; vendorHash = null; From 9076147ee8bc8c4dd4eee5d8946abf3720b4291b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 18:31:35 +0000 Subject: [PATCH 075/246] gitsign: 0.10.1 -> 0.10.2 --- pkgs/applications/version-management/gitsign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitsign/default.nix b/pkgs/applications/version-management/gitsign/default.nix index dffb905a6fd5..d2c7b20aef87 100644 --- a/pkgs/applications/version-management/gitsign/default.nix +++ b/pkgs/applications/version-management/gitsign/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "gitsign"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-WaiGkbjqty/MsTWPvx5DmmaNwWTJAEFKwVqArt2oZZc="; + hash = "sha256-JNCz5MVqn8PeTfYUVowIVZwtpfD+Gx9yBckter6PfXA="; }; - vendorHash = "sha256-p2E010k7uozpLvl9VpfG5/JyQR4mVUBKv2p78UdFlac="; + vendorHash = "sha256-QW+ZWYEXkhSQR4HvmPLENzY/VEfjEX43mBPhmhsEBMI="; subPackages = [ "." From bea50e5f6e90bd21619a16f8d1389969a9d4271d Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Wed, 24 Apr 2024 22:51:13 +0200 Subject: [PATCH 076/246] treewide: remove `multiArch=false` from `buildFHSEnv` usages Cleanup after the work of #240860. Also preventing new packages to copy from outdated ones. --- pkgs/applications/audio/plexamp/default.nix | 1 - pkgs/applications/blockchains/mycrypto/default.nix | 3 +-- pkgs/applications/misc/joplin-desktop/default.nix | 1 - pkgs/applications/misc/marktext/default.nix | 1 - pkgs/applications/misc/notable/default.nix | 1 - pkgs/applications/misc/notesnook/default.nix | 1 - pkgs/applications/misc/zettlr/generic.nix | 1 - pkgs/applications/networking/Sylk/default.nix | 1 - pkgs/applications/networking/browsers/polypane/default.nix | 1 - pkgs/applications/networking/station/default.nix | 1 - pkgs/applications/office/tusk/default.nix | 1 - pkgs/by-name/ch/chrysalis/package.nix | 1 - pkgs/development/embedded/arduino/arduino-core/chrootenv.nix | 1 - pkgs/development/web/bloomrpc/default.nix | 1 - pkgs/tools/misc/flexoptix-app/default.nix | 1 - 15 files changed, 1 insertion(+), 16 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 245760be5f70..790e8bedb11b 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -16,7 +16,6 @@ let in appimageTools.wrapType2 { inherit pname version src; - multiArch = false; # no 32bit needed extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraInstallCommands = '' diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index 607ecf23c362..1687e8c70ec3 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -24,10 +24,9 @@ let categories = [ "Finance" ]; }; -in appimageTools.wrapType2 rec { +in appimageTools.wrapType2 { inherit pname version src; - multiArch = false; # no p32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 55acb6ef0db2..27abcc7cc885 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -49,7 +49,6 @@ let export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' source "${makeWrapper}/nix-support/setup-hook" diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index 647e833e6960..9c90ff735bbd 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -20,7 +20,6 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.libsecret p.xorg.libxkbfile diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 45416035f7b3..784a52e1ab3f 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -24,7 +24,6 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 48f3e6e9cce8..8ac48f97912e 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -48,7 +48,6 @@ let export LC_ALL=C.UTF-8 ''; - multiPkgs = null; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index da45da749e2c..d38011195b8a 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -21,7 +21,6 @@ in appimageTools.wrapType2 rec { inherit pname version src; - multiArch = false; # no 32bit needed extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 41ff2de95cee..96f7d250bccb 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -17,7 +17,6 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; meta = with lib; { diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index ee28dcbabafc..e40ad508099e 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -16,7 +16,6 @@ let in appimageTools.wrapType2 { inherit pname src version; - multiArch = false; extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraInstallCommands = '' diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index 9712de8fbe4a..9caf0d23236d 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -19,7 +19,6 @@ in appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - multiArch = false; extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix index 73b896ff0cc5..5331160cd08c 100644 --- a/pkgs/applications/office/tusk/default.nix +++ b/pkgs/applications/office/tusk/default.nix @@ -31,7 +31,6 @@ in appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' mkdir "$out/share" diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix index dcd469b49681..8d16ca7e9a4f 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -14,7 +14,6 @@ let in appimageTools.wrapType2 rec { inherit name pname src; - multiArch = false; extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib ]; # Also expose the udev rules here, so it can be used as: diff --git a/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix b/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix index a97fa50aebf2..2efab1f1e2f5 100644 --- a/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix +++ b/pkgs/development/embedded/arduino/arduino-core/chrootenv.nix @@ -14,7 +14,6 @@ buildFHSEnv { pyserial ])) ]); - multiArch = false; extraInstallCommands = '' ${lib.optionalString withGui '' diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix index 87ef45ba981b..0af6ced2ee50 100644 --- a/pkgs/development/web/bloomrpc/default.nix +++ b/pkgs/development/web/bloomrpc/default.nix @@ -21,7 +21,6 @@ appimageTools.wrapType2 { export LC_ALL=C.UTF-8 ''; - multiArch = false; # no 32bit needed extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; extraInstallCommands = '' diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index 662193f35328..d54b0bf0949f 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -28,7 +28,6 @@ in appimageTools.wrapAppImage { inherit pname version; src = appimageContents; - multiArch = false; # no 32bit needed extraPkgs = { pkgs, ... }@args: [ pkgs.hidapi ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; From 1ee25e4d13221b9303bd66dafaa791f6759b24c2 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Wed, 1 May 2024 14:00:38 +0200 Subject: [PATCH 077/246] wrapAppImage: default `extraPkgs` to `pkgs: [ ]` Sane default in preparation for the next commit. --- pkgs/build-support/appimage/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 95dc7ffd1cd6..0d44a5ab23e9 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -40,7 +40,7 @@ rec { wrapAppImage = args@{ src, - extraPkgs, + extraPkgs ? pkgs: [ ], meta ? {}, ... }: buildFHSEnv From 7201f1cfaea8281342788584b0bbbf0e2b36df69 Mon Sep 17 00:00:00 2001 From: Robert Medeiros Date: Mon, 13 May 2024 14:33:45 -0400 Subject: [PATCH 078/246] iroh: 0.16.0 -> 0.16.2 --- pkgs/applications/networking/iroh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/iroh/default.nix b/pkgs/applications/networking/iroh/default.nix index f80fc10e6425..b08291cc1ff3 100644 --- a/pkgs/applications/networking/iroh/default.nix +++ b/pkgs/applications/networking/iroh/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "iroh"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-NllGbYThhqqGzYOf1NnmMBpiu6JyQlThBKCzxPd6X5c="; + hash = "sha256-W3G6jwSaYeCx3KNAAl/z1UEOHFKHhmp+exlNbpHZuNM="; }; - cargoHash = "sha256-Nw3JXoAH8dTUphV1S8rXFWjER6AFVvtCDvOPz3uNeXk="; + cargoHash = "sha256-AwTQjGRy2lCiJUhCWuyoXddEyLCQ2szbea/MJ/8SJQA="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ From 58cd78adb58f96f588bf258e54d2fa51b3723d54 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Mon, 6 May 2024 21:26:47 +0200 Subject: [PATCH 079/246] pythonPackages.bleak: 0.21.1 -> 0.22.1 - https://github.com/hbldh/bleak/releases/tag/v0.22.0 - https://github.com/hbldh/bleak/releases/tag/v0.22.1 --- pkgs/development/python-modules/bleak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index f53f614867ec..7fad7492d704 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.21.1"; + version = "0.22.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "hbldh"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-T0im8zKyNLbskAEDeUUFS/daJtvttlHlttjscqP8iSk="; + hash = "sha256-kBKNBVbEq1xHLu/gKUL2SwlA2WKjzqFVC5o4N+qnqLM="; }; postPatch = '' From 6e465f4550a54414cda068d6dca8c7820a660b6b Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Wed, 1 May 2024 14:42:20 +0200 Subject: [PATCH 080/246] treewide: fix use of `extraPkgs` in AppImages Mostly removes unnecessary use of `extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;` This caused some packages to be listed twice. Also, fix some styling, and accidental use of top-level packages (sometimes due to the `with;` keyword, e.g. on `beeper`). Remove inclusions of `bash`, since `bashInteractive` is already present by default. --- pkgs/applications/audio/plexamp/default.nix | 4 +--- pkgs/applications/blockchains/mycrypto/default.nix | 5 +---- pkgs/applications/graphics/upscayl/default.nix | 2 +- pkgs/applications/misc/bazecor/default.nix | 4 +--- pkgs/applications/misc/firefly-desktop/default.nix | 2 +- pkgs/applications/misc/golden-cheetah-bin/default.nix | 2 +- pkgs/applications/misc/joplin-desktop/default.nix | 1 - pkgs/applications/misc/marktext/default.nix | 5 +---- pkgs/applications/misc/mobilecoin-wallet/default.nix | 2 +- pkgs/applications/misc/neo4j-desktop/default.nix | 2 +- pkgs/applications/misc/notable/default.nix | 5 ++--- pkgs/applications/misc/notesnook/default.nix | 1 - pkgs/applications/misc/todoist-electron/default.nix | 4 +--- pkgs/applications/misc/zettlr/default.nix | 4 ++-- pkgs/applications/misc/zettlr/generic.nix | 5 ++--- pkgs/applications/networking/Sylk/default.nix | 2 -- .../applications/networking/browsers/polypane/default.nix | 2 +- pkgs/applications/networking/cluster/lens/linux.nix | 4 ++-- .../networking/instant-messengers/beeper/default.nix | 3 +-- .../caprine-bin/build-from-appimage.nix | 5 +---- .../networking/instant-messengers/rambox/default.nix | 2 +- pkgs/applications/networking/irc/irccloud/default.nix | 2 +- .../networking/mailreaders/electron-mail/default.nix | 8 ++++---- .../networking/mailreaders/tutanota-desktop/default.nix | 2 +- pkgs/applications/networking/station/default.nix | 1 - pkgs/applications/office/timeular/default.nix | 5 +---- pkgs/applications/office/tusk/default.nix | 1 - pkgs/applications/video/lbry/default.nix | 4 +--- .../video/losslesscut-bin/build-from-appimage.nix | 2 -- pkgs/by-name/an/anytype/package.nix | 3 +-- pkgs/by-name/ar/arduino-ide/package.nix | 2 +- pkgs/by-name/ca/caido/package.nix | 2 +- pkgs/by-name/ch/chrysalis/package.nix | 2 +- pkgs/by-name/ho/hoppscotch/package.nix | 3 --- pkgs/by-name/je/jetbrains-toolbox/package.nix | 1 - pkgs/by-name/lm/lmstudio/linux.nix | 2 +- pkgs/by-name/mq/mqttx/package.nix | 2 -- pkgs/by-name/no/nosql-workbench/package.nix | 4 ++-- pkgs/by-name/nr/nrfconnect/package.nix | 4 +--- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ---- pkgs/by-name/sp/spacedrive/package.nix | 3 +-- pkgs/development/web/bloomrpc/default.nix | 2 -- pkgs/tools/misc/flexoptix-app/default.nix | 4 +--- pkgs/tools/security/buttercup-desktop/default.nix | 2 +- 44 files changed, 41 insertions(+), 90 deletions(-) diff --git a/pkgs/applications/audio/plexamp/default.nix b/pkgs/applications/audio/plexamp/default.nix index 790e8bedb11b..29f8dd929bad 100644 --- a/pkgs/applications/audio/plexamp/default.nix +++ b/pkgs/applications/audio/plexamp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, pkgs }: +{ lib, fetchurl, appimageTools }: let pname = "plexamp"; @@ -16,8 +16,6 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; - extraInstallCommands = '' install -m 444 -D ${appimageContents}/plexamp.desktop $out/share/applications/plexamp.desktop install -m 444 -D ${appimageContents}/plexamp.png \ diff --git a/pkgs/applications/blockchains/mycrypto/default.nix b/pkgs/applications/blockchains/mycrypto/default.nix index 1687e8c70ec3..0e4de3af6ba7 100644 --- a/pkgs/applications/blockchains/mycrypto/default.nix +++ b/pkgs/applications/blockchains/mycrypto/default.nix @@ -1,5 +1,4 @@ -{ lib, appimageTools, fetchurl, makeDesktopItem -}: +{ lib, appimageTools, fetchurl, makeDesktopItem }: let pname = "MyCrypto"; @@ -27,8 +26,6 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - extraInstallCommands = '' mkdir -p $out/share cp -rt $out/share ${desktopItem}/share/applications ${appimageContents}/usr/share/icons diff --git a/pkgs/applications/graphics/upscayl/default.nix b/pkgs/applications/graphics/upscayl/default.nix index f7e1d41b5135..12518b6f40a2 100644 --- a/pkgs/applications/graphics/upscayl/default.nix +++ b/pkgs/applications/graphics/upscayl/default.nix @@ -18,7 +18,7 @@ in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: with pkgs; [vulkan-headers vulkan-loader]; + extraPkgs = pkgs: [ pkgs.vulkan-headers pkgs.vulkan-loader ]; extraInstallCommands = '' mkdir -p $out/share/{applications,pixmaps} diff --git a/pkgs/applications/misc/bazecor/default.nix b/pkgs/applications/misc/bazecor/default.nix index 7387bc212c64..ed1900836fcc 100644 --- a/pkgs/applications/misc/bazecor/default.nix +++ b/pkgs/applications/misc/bazecor/default.nix @@ -28,9 +28,7 @@ appimageTools.wrapAppImage rec { # taken from # https://github.com/Dygmalab/Bazecor/blob/v1.3.11/src/main/utils/udev.ts#L6 - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ - p.glib - ]; + extraPkgs = pkgs: [ pkgs.glib ]; # Also expose the udev rules here, so it can be used as: # services.udev.packages = [ pkgs.bazecor ]; diff --git a/pkgs/applications/misc/firefly-desktop/default.nix b/pkgs/applications/misc/firefly-desktop/default.nix index 41cd6c42a5b3..0db1a801c5da 100644 --- a/pkgs/applications/misc/firefly-desktop/default.nix +++ b/pkgs/applications/misc/firefly-desktop/default.nix @@ -12,7 +12,7 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' mkdir -p $out/share/applications $out/share/pixmaps diff --git a/pkgs/applications/misc/golden-cheetah-bin/default.nix b/pkgs/applications/misc/golden-cheetah-bin/default.nix index 308f43b7d463..3fcd77f8f4b7 100644 --- a/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -14,7 +14,7 @@ in appimageTools.wrapType2 { inherit pname src version; - extraPkgs = pkgs: with pkgs; [ R zlib libusb-compat-0_1 ]; + extraPkgs = pkgs: [ pkgs.R pkgs.zlib pkgs.libusb-compat-0_1 ]; extraInstallCommands = '' mv $out/bin/${pname} $out/bin/GoldenCheetah diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 27abcc7cc885..7127d83c6584 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -49,7 +49,6 @@ let export LC_ALL=C.UTF-8 ''; - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ diff --git a/pkgs/applications/misc/marktext/default.nix b/pkgs/applications/misc/marktext/default.nix index 9c90ff735bbd..1c6dc9657f21 100644 --- a/pkgs/applications/misc/marktext/default.nix +++ b/pkgs/applications/misc/marktext/default.nix @@ -20,10 +20,7 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ - p.libsecret - p.xorg.libxkbfile - ]; + extraPkgs = pkgs: [ pkgs.libsecret pkgs.xorg.libxkbfile ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/marktext.desktop $out/share/applications/marktext.desktop diff --git a/pkgs/applications/misc/mobilecoin-wallet/default.nix b/pkgs/applications/misc/mobilecoin-wallet/default.nix index 1bde970c1e15..2b891abc6473 100644 --- a/pkgs/applications/misc/mobilecoin-wallet/default.nix +++ b/pkgs/applications/misc/mobilecoin-wallet/default.nix @@ -13,7 +13,7 @@ let in appimageTools.wrapType2 { inherit name src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} diff --git a/pkgs/applications/misc/neo4j-desktop/default.nix b/pkgs/applications/misc/neo4j-desktop/default.nix index f01ef56e5d02..6c1ac1ede965 100644 --- a/pkgs/applications/misc/neo4j-desktop/default.nix +++ b/pkgs/applications/misc/neo4j-desktop/default.nix @@ -12,7 +12,7 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 784a52e1ab3f..c8958950db9d 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -13,8 +13,6 @@ let appimageContents = appimageTools.extract { inherit pname version src; }; - - nativeBuildInputs = [ makeWrapper ]; in appimageTools.wrapType2 rec { @@ -24,7 +22,8 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; + extraPkgs = pkgs: [ pkgs.at-spi2-atk pkgs.at-spi2-core ]; + extraInstallCommands = '' install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \ diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 8ac48f97912e..7742a54c6c0c 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -48,7 +48,6 @@ let export LC_ALL=C.UTF-8 ''; - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' install -Dm444 ${appimageContents}/notesnook.desktop -t $out/share/applications install -Dm444 ${appimageContents}/notesnook.png -t $out/share/pixmaps diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index c4fef60cff0c..16e266619ff4 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -22,9 +22,7 @@ in appimageTools.wrapAppImage { inherit pname version; src = appimageContents; - extraPkgs = { pkgs, ... }@args: [ - pkgs.hidapi - ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; + extraPkgs = pkgs: [ pkgs.hidapi ]; extraInstallCommands = '' # Add desktop convencience stuff diff --git a/pkgs/applications/misc/zettlr/default.nix b/pkgs/applications/misc/zettlr/default.nix index 75e310cdffec..593ca13f9fee 100644 --- a/pkgs/applications/misc/zettlr/default.nix +++ b/pkgs/applications/misc/zettlr/default.nix @@ -1,6 +1,6 @@ -{ callPackage, texliveMedium }: +{ callPackage }: -builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; inherit texliveMedium; })) { +builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { zettlr = { version = "3.0.2"; hash = "sha256-xwBq+kLmTth15uLiYWJOhi/YSPZVJNO6JTrKFojSDXA="; diff --git a/pkgs/applications/misc/zettlr/generic.nix b/pkgs/applications/misc/zettlr/generic.nix index d38011195b8a..847d11c4f24c 100644 --- a/pkgs/applications/misc/zettlr/generic.nix +++ b/pkgs/applications/misc/zettlr/generic.nix @@ -4,8 +4,6 @@ , appimageTools , lib , fetchurl -, texliveMedium -, pandoc }: # Based on https://gist.github.com/msteen/96cb7df66a359b827497c5269ccbbf94 and joplin-desktop nixpkgs. @@ -21,7 +19,8 @@ in appimageTools.wrapType2 rec { inherit pname version src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ texliveMedium pandoc ]; + extraPkgs = pkgs: [ pkgs.texliveMedium pkgs.pandoc ]; + extraInstallCommands = '' install -m 444 -D ${appimageContents}/Zettlr.desktop $out/share/applications/Zettlr.desktop install -m 444 -D ${appimageContents}/Zettlr.png $out/share/icons/hicolor/512x512/apps/Zettlr.png diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 96f7d250bccb..a83742cf937c 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -17,8 +17,6 @@ appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - meta = with lib; { description = "Sylk WebRTC client"; homepage = "https://sylkserver.com/"; diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index e40ad508099e..47d1cfe83bbf 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -16,7 +16,7 @@ let in appimageTools.wrapType2 { inherit pname src version; - extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; + extraPkgs = pkgs: [ pkgs.bash ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/applications/networking/cluster/lens/linux.nix index b54285fdafcc..c76a1607760d 100644 --- a/pkgs/applications/networking/cluster/lens/linux.nix +++ b/pkgs/applications/networking/cluster/lens/linux.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pname, version, src, meta, appimageTools, makeWrapper, nss_latest }: +{ pname, version, src, meta, appimageTools, makeWrapper }: let name = "${pname}-${version}"; @@ -25,5 +25,5 @@ appimageTools.wrapType2 { --replace 'Exec=AppRun' 'Exec=${pname}' ''; - extraPkgs = _: [ nss_latest ]; + extraPkgs = pkgs: [ pkgs.nss_latest ]; } diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 2d70e6a75ea7..3651408c8b7f 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -2,7 +2,6 @@ , stdenvNoCC , fetchurl , appimageTools -, libsecret , makeWrapper , writeShellApplication , curl @@ -19,7 +18,7 @@ let }; appimage = appimageTools.wrapType2 { inherit version pname src; - extraPkgs = pkgs: with pkgs; [ libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; }; appimageContents = appimageTools.extractType2 { inherit version pname src; diff --git a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix index cceea293adbd..ed0e978c1524 100644 --- a/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix +++ b/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix @@ -1,5 +1,4 @@ -{ lib -, fetchurl +{ fetchurl , appimageTools , xorg , pname @@ -27,8 +26,6 @@ in export LC_ALL=C.UTF-8 ''; - extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs; - extraInstallCommands = '' mkdir -p $out/share "${xorg.lndir}/bin/lndir" -silent "${extracted}/usr/share" "$out/share" diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index af5f6ca321c0..d9deab388d78 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -30,7 +30,7 @@ appimageTools.wrapType2 { install -Dm644 ${desktopItem}/share/applications/* $out/share/applications ''; - extraPkgs = pkgs: with pkgs; [ procps ]; + extraPkgs = pkgs: [ pkgs.procps ]; meta = with lib; { description = "Workspace Simplifier - a cross-platform application organizing web services into Workspaces similar to browser profiles"; diff --git a/pkgs/applications/networking/irc/irccloud/default.nix b/pkgs/applications/networking/irc/irccloud/default.nix index 47cd45bfdd5b..6823eaf01699 100644 --- a/pkgs/applications/networking/irc/irccloud/default.nix +++ b/pkgs/applications/networking/irc/irccloud/default.nix @@ -16,7 +16,7 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ at-spi2-core ]; + extraPkgs = pkgs: [ pkgs.at-spi2-core ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/irccloud.desktop $out/share/applications/irccloud.desktop diff --git a/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/pkgs/applications/networking/mailreaders/electron-mail/default.nix index acb7ebfbe61e..bf40dba20861 100644 --- a/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -1,4 +1,4 @@ -{ appimageTools, lib, fetchurl, libsecret }: +{ appimageTools, lib, fetchurl }: let pname = "electron-mail"; @@ -20,9 +20,9 @@ in appimageTools.wrapType2 { cp -r ${appimageContents}/usr/share/icons $out/share ''; - extraPkgs = pkgs: with pkgs; [ - libsecret - libappindicator-gtk3 + extraPkgs = pkgs: [ + pkgs.libsecret + pkgs.libappindicator-gtk3 ]; meta = with lib; { diff --git a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index d82fe6652afe..44597be716a7 100644 --- a/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -12,7 +12,7 @@ appimageTools.wrapType2 rec { hash = "sha256-D7qWwIFuCJmBvfdgf4Dsd2/jvi39tbAttaHOwLND4DY="; }; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = let appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/applications/networking/station/default.nix b/pkgs/applications/networking/station/default.nix index 9caf0d23236d..b3235ba5154f 100644 --- a/pkgs/applications/networking/station/default.nix +++ b/pkgs/applications/networking/station/default.nix @@ -19,7 +19,6 @@ in appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' install -m 444 -D ${appimageContents}/browserx.desktop $out/share/applications/browserx.desktop install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/browserx.png \ diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 8f2ef94072b8..247b9f7caea4 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -1,7 +1,6 @@ { lib , fetchurl , appimageTools -, libsecret }: let @@ -19,9 +18,7 @@ let in appimageTools.wrapType2 rec { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ - libsecret - ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/timeular.desktop $out/share/applications/timeular.desktop diff --git a/pkgs/applications/office/tusk/default.nix b/pkgs/applications/office/tusk/default.nix index 5331160cd08c..89a27a770e6f 100644 --- a/pkgs/applications/office/tusk/default.nix +++ b/pkgs/applications/office/tusk/default.nix @@ -31,7 +31,6 @@ in appimageTools.wrapType2 rec { export LC_ALL=C.UTF-8 ''; - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' mkdir "$out/share" ln -s "${desktopItem}/share/applications" "$out/share/" diff --git a/pkgs/applications/video/lbry/default.nix b/pkgs/applications/video/lbry/default.nix index c3eb942fed92..f978fd622606 100644 --- a/pkgs/applications/video/lbry/default.nix +++ b/pkgs/applications/video/lbry/default.nix @@ -15,9 +15,7 @@ appimageTools.wrapAppImage rec { }; # At runtime, Lbry likes to have access to Ffmpeg - extraPkgs = pkgs: with pkgs; [ - ffmpeg - ]; + extraPkgs = pkgs: [ pkgs.ffmpeg ]; # General fixup extraInstallCommands = '' diff --git a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix index 1317536f3cf5..14e4cf215e7b 100644 --- a/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/applications/video/losslesscut-bin/build-from-appimage.nix @@ -29,8 +29,6 @@ appimageTools.wrapType2 { export LC_ALL=C.UTF-8 ''; - extraPkgs = ps: appimageTools.defaultFhsEnvArgs.multiPkgs ps; - extraInstallCommands = '' ( mkdir -p $out/share diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 53c2996834f7..2ec353a1784f 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -13,8 +13,7 @@ let in appimageTools.wrapType2 { inherit name src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) - ++ [ pkgs.libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix index 7184705a178a..29268559c0ad 100644 --- a/pkgs/by-name/ar/arduino-ide/package.nix +++ b/pkgs/by-name/ar/arduino-ide/package.nix @@ -23,7 +23,7 @@ appimageTools.wrapType2 { substituteInPlace $out/share/applications/${pname}.desktop --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=${pname} %U' ''; - extraPkgs = pkgs: with pkgs; [ libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; meta = with lib; { description = "Open-source electronics prototyping platform"; diff --git a/pkgs/by-name/ca/caido/package.nix b/pkgs/by-name/ca/caido/package.nix index 13dacc99a413..44c4571b5606 100644 --- a/pkgs/by-name/ca/caido/package.nix +++ b/pkgs/by-name/ca/caido/package.nix @@ -16,7 +16,7 @@ let in appimageTools.wrapType2 { inherit pname src version; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; + extraPkgs = pkgs: [ pkgs.libthai ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/caido.desktop -t $out/share/applications diff --git a/pkgs/by-name/ch/chrysalis/package.nix b/pkgs/by-name/ch/chrysalis/package.nix index 8d16ca7e9a4f..e0b7a9da78ea 100644 --- a/pkgs/by-name/ch/chrysalis/package.nix +++ b/pkgs/by-name/ch/chrysalis/package.nix @@ -14,7 +14,7 @@ let in appimageTools.wrapType2 rec { inherit name pname src; - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib ]; + extraPkgs = pkgs: [ pkgs.glib ]; # Also expose the udev rules here, so it can be used as: # services.udev.packages = [ pkgs.chrysalis ]; diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index c076f484a84b..9e920d5aa7a9 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -54,9 +54,6 @@ if stdenv.isDarwin then stdenv.mkDerivation else appimageTools.wrapType2 { inherit pname version src meta; - extraPkgs = pkgs: - appimageTools.defaultFhsEnvArgs.multiPkgs pkgs; - extraInstallCommands = let appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 2d197e472d44..653bd8451757 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -35,7 +35,6 @@ let appimage = appimageTools.wrapAppImage { inherit pname version; src = appimageContents; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.targetPkgs pkgs); }; in stdenv.mkDerivation { diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix index 5c52228225c8..add6274d36d4 100644 --- a/pkgs/by-name/lm/lmstudio/linux.nix +++ b/pkgs/by-name/lm/lmstudio/linux.nix @@ -16,7 +16,7 @@ in appimageTools.wrapType2 { inherit meta pname version src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ]; + extraPkgs = pkgs: [ pkgs.ocl-icd ]; extraInstallCommands = '' mkdir -p $out/share/applications diff --git a/pkgs/by-name/mq/mqttx/package.nix b/pkgs/by-name/mq/mqttx/package.nix index 6ec192a6ab14..975db394ab18 100644 --- a/pkgs/by-name/mq/mqttx/package.nix +++ b/pkgs/by-name/mq/mqttx/package.nix @@ -31,8 +31,6 @@ in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: [ ]; - extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/1024x1024/apps/${pname}.png diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index c3efc29b55c0..e3d1890665a5 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -58,9 +58,9 @@ if stdenv.isDarwin then stdenv.mkDerivation { } else appimageTools.wrapType2 { inherit pname version src meta; - extraPkgs = ps: (appimageTools.defaultFhsEnvArgs.multiPkgs ps) ++ [ + extraPkgs = pkgs: [ # Required to run DynamoDB locally - ps.jdk21 + pkgs.jdk21 ]; extraInstallCommands = let diff --git a/pkgs/by-name/nr/nrfconnect/package.nix b/pkgs/by-name/nr/nrfconnect/package.nix index c3a6e0e7f3dd..92776f92cc2c 100644 --- a/pkgs/by-name/nr/nrfconnect/package.nix +++ b/pkgs/by-name/nr/nrfconnect/package.nix @@ -20,9 +20,7 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ - segger-jlink - ]; + extraPkgs = pkgs: [ pkgs.segger-jlink ]; extraInstallCommands = '' mv $out/bin/nrfconnect-* $out/bin/nrfconnect diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index d4a82a1982a5..c3e5c618a7ae 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -19,10 +19,6 @@ let in appimageTools.wrapType2 { inherit pname version src; - extraPkgs = pkgs: with pkgs; [ - makeWrapper - ]; - extraBwrapArgs = [ "--setenv _JAVA_AWT_WM_NONREPARENTING 1" ]; diff --git a/pkgs/by-name/sp/spacedrive/package.nix b/pkgs/by-name/sp/spacedrive/package.nix index 50a25a63c25a..80220ae4b941 100644 --- a/pkgs/by-name/sp/spacedrive/package.nix +++ b/pkgs/by-name/sp/spacedrive/package.nix @@ -57,8 +57,7 @@ if stdenv.isDarwin then stdenv.mkDerivation else appimageTools.wrapType2 { inherit pname version src meta passthru; - extraPkgs = pkgs: - (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libthai ]; + extraPkgs = pkgs: [ pkgs.libthai ]; extraInstallCommands = let diff --git a/pkgs/development/web/bloomrpc/default.nix b/pkgs/development/web/bloomrpc/default.nix index 0af6ced2ee50..b2f3dbae4a25 100644 --- a/pkgs/development/web/bloomrpc/default.nix +++ b/pkgs/development/web/bloomrpc/default.nix @@ -21,8 +21,6 @@ appimageTools.wrapType2 { export LC_ALL=C.UTF-8 ''; - extraPkgs = pkgs: appimageTools.defaultFhsEnvArgs.multiPkgs pkgs ++ [ pkgs.bash ]; - extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop install -m 444 -D ${appimageContents}/${pname}.png \ diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix index d54b0bf0949f..fa2004ce40ca 100644 --- a/pkgs/tools/misc/flexoptix-app/default.nix +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -28,9 +28,7 @@ in appimageTools.wrapAppImage { inherit pname version; src = appimageContents; - extraPkgs = { pkgs, ... }@args: [ - pkgs.hidapi - ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; + extraPkgs = pkgs: [ pkgs.hidapi ]; extraInstallCommands = '' # Add desktop convencience stuff diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index d17b1146466d..cbe5bbe1f8d0 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -12,7 +12,7 @@ let in appimageTools.wrapType2 { inherit pname src version; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; + extraPkgs = pkgs: [ pkgs.libsecret ]; extraInstallCommands = '' install -m 444 -D ${appimageContents}/buttercup.desktop -t $out/share/applications From b1ada7d9ccc106355441f8f5c4114b89c3362fd2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 20:37:27 +0200 Subject: [PATCH 081/246] python312Packages.pyfaidx: refactor --- .../python-modules/pyfaidx/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 4999b1dcddf9..c0a5dbd5589b 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -1,39 +1,38 @@ { lib , buildPythonPackage , fetchPypi +, glibcLocales , importlib-metadata -, nose , numpy +, pytestCheckHook +, pythonOlder , setuptools , setuptools-scm -, six -, glibcLocales -, pytestCheckHook }: buildPythonPackage rec { pname = "pyfaidx"; version = "0.8.1.1"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-bwSCNSYZ8sxWADyiIyG9sNB2S2VnlbweQGKx+psIaGs="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ importlib-metadata - six ]; nativeCheckInputs = [ glibcLocales - nose numpy pytestCheckHook ]; @@ -48,10 +47,11 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/mdshw5/pyfaidx"; description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index"; - mainProgram = "faidx"; + homepage = "https://github.com/mdshw5/pyfaidx"; + changelog = "https://github.com/mdshw5/pyfaidx/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ jbedo ]; + mainProgram = "faidx"; }; } From f500ab7ac2e68aeff14796eebba8c918e0440c4d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 13 May 2024 20:37:52 +0200 Subject: [PATCH 082/246] python312Packages.pyfaidx: format with nixfmt --- .../python-modules/pyfaidx/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index c0a5dbd5589b..551814d9fe81 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchPypi -, glibcLocales -, importlib-metadata -, numpy -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + fetchPypi, + glibcLocales, + importlib-metadata, + numpy, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -27,9 +28,7 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ - importlib-metadata - ]; + dependencies = [ importlib-metadata ]; nativeCheckInputs = [ glibcLocales @@ -42,9 +41,7 @@ buildPythonPackage rec { "tests/test_Fasta_bgzip.py" ]; - pythonImportsCheck = [ - "pyfaidx" - ]; + pythonImportsCheck = [ "pyfaidx" ]; meta = with lib; { description = "Python classes for indexing, retrieval, and in-place modification of FASTA files using a samtools compatible index"; From 8778446d94aad37f7178fe49669350007b4230f5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 10 May 2024 20:28:35 -0300 Subject: [PATCH 083/246] k3s_1_30: init 1.30.0+k3s1 Release: https://github.com/k3s-io/k3s/releases/tag/v1.30.0%2Bk3s1 --- .../networking/cluster/k3s/1_30/chart-versions.nix | 10 ++++++++++ .../networking/cluster/k3s/1_30/versions.nix | 14 ++++++++++++++ .../networking/cluster/k3s/default.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 4 files changed, 39 insertions(+) create mode 100644 pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix create mode 100644 pkgs/applications/networking/cluster/k3s/1_30/versions.nix diff --git a/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix new file mode 100644 index 000000000000..aaaa3d4c2970 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_30/chart-versions.nix @@ -0,0 +1,10 @@ +{ + traefik-crd = { + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz"; + sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw"; + }; + traefik = { + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz"; + sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if"; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/1_30/versions.nix b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix new file mode 100644 index 000000000000..bc7c2d99c62c --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/1_30/versions.nix @@ -0,0 +1,14 @@ +{ + k3sVersion = "1.30.0+k3s1"; + k3sCommit = "14549535f13c63fc239ba055d36d590e68b01503"; + k3sRepoSha256 = "1dph6clzzanlx7dbdzpamnw7gpw98j850my28lcb3zdzhvhsc74b"; + k3sVendorHash = "sha256-YBWiIf8F71ibR7sCiYtmsAcY1MsvkhTD/K45tOHQC5w="; + chartVersions = import ./chart-versions.nix; + k3sRootVersion = "0.13.0"; + k3sRootSha256 = "1jq5f0lm08abx5ikarf92z56fvx4kjpy2nmzaazblb34lajw87vj"; + k3sCNIVersion = "1.4.0-k3s2"; + k3sCNISha256 = "17dg6jgjx18nrlyfmkv14dhzxsljz4774zgwz5dchxcf38bvarqa"; + containerdVersion = "1.7.15-k3s1"; + containerdSha256 = "18hlj4ixjk7wvamfd66xyc0cax2hs9s7yjvlx52afxdc73194y0f"; + criCtlVersion = "1.29.0-k3s1"; +} diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index 8151e488a858..58984502d98f 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -54,4 +54,15 @@ in ]; } ) extraArgs; + + # 1_30 can be built with the same builder as 1_26 + k3s_1_30 = common ( + (import ./1_30/versions.nix) + // { + updateScript = [ + ./update-script.sh + "30" + ]; + } + ) extraArgs; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e202325ea50..6a0fde8363f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32079,6 +32079,10 @@ with pkgs; buildGoModule = buildGo121Module; go = go_1_21; }) k3s_1_26 k3s_1_27 k3s_1_28 k3s_1_29; + inherit (callPackage ../applications/networking/cluster/k3s { + buildGoModule = buildGo122Module; + go = go_1_22; + }) k3s_1_30; k3s = k3s_1_29; k3sup = callPackage ../applications/networking/cluster/k3sup { }; From 602a3062c479ef46c991a8e5cea19e36467dcff9 Mon Sep 17 00:00:00 2001 From: Michael Evans Date: Mon, 13 May 2024 21:22:53 +0200 Subject: [PATCH 084/246] clairvoyant: 3.1.3 -> 3.1.7 --- pkgs/by-name/cl/clairvoyant/package.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/cl/clairvoyant/package.nix b/pkgs/by-name/cl/clairvoyant/package.nix index 9889e1e43c3d..21db94bec6a9 100644 --- a/pkgs/by-name/cl/clairvoyant/package.nix +++ b/pkgs/by-name/cl/clairvoyant/package.nix @@ -2,25 +2,24 @@ , fetchFromGitHub , gtk4 , libadwaita +, libportal , meson , ninja , pkg-config , stdenv , vala , wrapGAppsHook4 -# Clairvoyant shows a non-dismissable banner recommending the use of the Flatpak version -, hideUnsupportedVersionBanner ? false }: stdenv.mkDerivation (finalAttrs: { pname = "clairvoyant"; - version = "3.1.3"; + version = "3.1.7"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "clairvoyant"; rev = finalAttrs.version; - hash = "sha256-eAcd8JJmcsz8dm049g5xsF6gPpNQ6ZvGGIhKAoMlPTU="; + hash = "sha256-p9Lgs5z5oRuMQYRKzWp+aQDi0FnxvbQGLZpBigolHUw="; }; nativeBuildInputs = [ @@ -34,17 +33,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk4 libadwaita + libportal ]; - preFixup = lib.optionalString hideUnsupportedVersionBanner '' - gappsWrapperArgs+=( - --set container true - ) - ''; - meta = with lib; { changelog = "https://github.com/cassidyjames/clairvoyant/releases/tag/${finalAttrs.version}"; - description = "Ask questions and get psychic answers"; + description = "Ask questions, get psychic answers"; homepage = "https://github.com/cassidyjames/clairvoyant"; license = licenses.gpl3Plus; mainProgram = "com.github.cassidyjames.clairvoyant"; From af817586a4f6a4c02fb763d1ed9e21a36877b8e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 19:47:14 +0000 Subject: [PATCH 085/246] wasabiwallet: 2.0.7.1 -> 2.0.7.2 --- pkgs/applications/blockchains/wasabiwallet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 81d8a5dac203..2d8b7b7c7385 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.7.1"; + version = "2.0.7.2"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-u/QDdGLdD5+8j3r8pZQwcG3iTToFJEvzzV7Rl4ggvtM="; + sha256 = "sha256-s/rzjlPsOylbuQx7gDnctvl1tms95RqErk0vVlzhouw="; }; dontBuild = true; From bc9967fba4d81507d9da82ffa9be77a5a0b76f1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 19:49:02 +0000 Subject: [PATCH 086/246] omnictl: 0.34.0 -> 0.35.0 --- pkgs/by-name/om/omnictl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix index ab74d54c2ea7..9fa32bb16998 100644 --- a/pkgs/by-name/om/omnictl/package.nix +++ b/pkgs/by-name/om/omnictl/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "omnictl"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "siderolabs"; repo = "omni"; rev = "v${version}"; - hash = "sha256-aYdJ1cfA2xov0JMGlKNTcLfpi3KX3jRRA6N+8WfQoi0="; + hash = "sha256-y4kWIj7DDeUs521csW26w1K6esZMgvI4MQtgZAeOtlk="; }; - vendorHash = "sha256-vJb9uUqLzQ38b4nJv0Q6/V8lIxw04fow16e2SSRCmuI="; + vendorHash = "sha256-BYKIAgWR+PDJbDJ72PS6TDvpZx7yRaDJzbq0/b/MIKs="; ldflags = [ "-s" "-w" ]; From 2bfa57ea2c046b1a92dc29c453e56680f7d72174 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 19:55:06 +0000 Subject: [PATCH 087/246] transifex-cli: 1.6.11 -> 1.6.12 --- pkgs/applications/misc/transifex-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/applications/misc/transifex-cli/default.nix index ceee30cd660b..50c838ed9b31 100644 --- a/pkgs/applications/misc/transifex-cli/default.nix +++ b/pkgs/applications/misc/transifex-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "transifex-cli"; - version = "1.6.11"; + version = "1.6.12"; src = fetchFromGitHub { owner = "transifex"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-1p7Si1av/8fhtqfAsgQoqes+u1RlhZI0AhGrTSuLDrI="; + sha256 = "sha256-k26z/eFXjNijoth/hWXPfCv4/z6row9DRc9SEtnnX1o="; }; vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU="; From 97f69cbe0956818c77d5872e4102efbc996e7eae Mon Sep 17 00:00:00 2001 From: Patka Date: Mon, 13 May 2024 21:55:22 +0200 Subject: [PATCH 088/246] phpPackages.phpinsights: fix build The old lock was generated with php82, so the php81Packages version was broken. The build errors with the old lock: https://hydra.nixos.org/build/259472196/nixlog/2 --- .../php-packages/phpinsights/composer.lock | 1100 ++++++++++++----- .../php-packages/phpinsights/default.nix | 2 +- 2 files changed, 796 insertions(+), 306 deletions(-) diff --git a/pkgs/development/php-packages/phpinsights/composer.lock b/pkgs/development/php-packages/phpinsights/composer.lock index 8fe99422b57f..a068e3a435a8 100644 --- a/pkgs/development/php-packages/phpinsights/composer.lock +++ b/pkgs/development/php-packages/phpinsights/composer.lock @@ -73,16 +73,16 @@ }, { "name": "composer/pcre", - "version": "3.1.2", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace" + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4775f35b2d70865807c89d32c8e7385b86eb0ace", - "reference": "4775f35b2d70865807c89d32c8e7385b86eb0ace", + "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", + "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8", "shasum": "" }, "require": { @@ -124,7 +124,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.2" + "source": "https://github.com/composer/pcre/tree/3.1.3" }, "funding": [ { @@ -140,7 +140,7 @@ "type": "tidelift" } ], - "time": "2024-03-07T15:38:35+00:00" + "time": "2024-03-19T10:26:25+00:00" }, { "name": "composer/semver", @@ -225,16 +225,16 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.3", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", "shasum": "" }, "require": { @@ -245,7 +245,7 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" }, "type": "library", "autoload": { @@ -269,9 +269,9 @@ "performance" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" }, "funding": [ { @@ -287,7 +287,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T21:32:43+00:00" + "time": "2024-05-06T16:37:16+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -369,16 +369,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.51.0", + "version": "v3.56.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "127fa74f010da99053e3f5b62672615b72dd6efd" + "reference": "69c6168ae8bc96dc656c7f6c7271120a68ae5903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/127fa74f010da99053e3f5b62672615b72dd6efd", - "reference": "127fa74f010da99053e3f5b62672615b72dd6efd", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/69c6168ae8bc96dc656c7f6c7271120a68ae5903", + "reference": "69c6168ae8bc96dc656c7f6c7271120a68ae5903", "shasum": "" }, "require": { @@ -402,6 +402,7 @@ }, "require-dev": { "facile-it/paraunit": "^1.3 || ^2.0", + "infection/infection": "^0.27.11", "justinrainbow/json-schema": "^5.2", "keradus/cli-executor": "^2.1", "mikey179/vfsstream": "^1.6.11", @@ -449,7 +450,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.51.0" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.56.1" }, "funding": [ { @@ -457,7 +458,7 @@ "type": "github" } ], - "time": "2024-02-28T19:50:06+00:00" + "time": "2024-05-10T11:31:15+00:00" }, { "name": "justinrainbow/json-schema", @@ -613,16 +614,16 @@ }, { "name": "php-parallel-lint/php-parallel-lint", - "version": "v1.3.2", + "version": "v1.4.0", "source": { "type": "git", "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git", - "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de" + "reference": "6db563514f27e19595a19f45a4bf757b6401194e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6483c9832e71973ed29cf71bd6b3f4fde438a9de", - "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de", + "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6db563514f27e19595a19f45a4bf757b6401194e", + "reference": "6db563514f27e19595a19f45a4bf757b6401194e", "shasum": "" }, "require": { @@ -660,26 +661,30 @@ "email": "ahoj@jakubonderka.cz" } ], - "description": "This tool check syntax of PHP files about 20x faster than serial check.", + "description": "This tool checks the syntax of PHP files about 20x faster than serial check.", "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint", + "keywords": [ + "lint", + "static analysis" + ], "support": { "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues", - "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.2" + "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.4.0" }, - "time": "2022-02-21T12:50:22+00:00" + "time": "2024-03-27T12:14:49+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.26.0", + "version": "1.29.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" + "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/536889f2b340489d328f5ffb7b02bb6b183ddedc", + "reference": "536889f2b340489d328f5ffb7b02bb6b183ddedc", "shasum": "" }, "require": { @@ -711,9 +716,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.0" }, - "time": "2024-02-23T16:05:55+00:00" + "time": "2024-05-06T12:04:23+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1220,16 +1225,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.0", + "version": "3.9.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480", + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480", "shasum": "" }, "require": { @@ -1296,35 +1301,35 @@ "type": "open_collective" } ], - "time": "2024-02-16T15:06:51+00:00" + "time": "2024-04-23T20:25:34+00:00" }, { "name": "symfony/cache", - "version": "v7.0.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "fc822951dd360a593224bb2cef90a087d0dff60f" + "reference": "b9e9b93c9817ec6c789c7943f5e54b57a041c16a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/fc822951dd360a593224bb2cef90a087d0dff60f", - "reference": "fc822951dd360a593224bb2cef90a087d0dff60f", + "url": "https://api.github.com/repos/symfony/cache/zipball/b9e9b93c9817ec6c789c7943f5e54b57a041c16a", + "reference": "b9e9b93c9817ec6c789c7943f5e54b57a041c16a", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "psr/cache": "^2.0|^3.0", "psr/log": "^1.1|^2|^3", "symfony/cache-contracts": "^2.5|^3", "symfony/service-contracts": "^2.5|^3", - "symfony/var-exporter": "^6.4|^7.0" + "symfony/var-exporter": "^6.3.6|^7.0" }, "conflict": { - "doctrine/dbal": "<3.6", - "symfony/dependency-injection": "<6.4", - "symfony/http-kernel": "<6.4", - "symfony/var-dumper": "<6.4" + "doctrine/dbal": "<2.13.1", + "symfony/dependency-injection": "<5.4", + "symfony/http-kernel": "<5.4", + "symfony/var-dumper": "<5.4" }, "provide": { "psr/cache-implementation": "2.0|3.0", @@ -1333,15 +1338,15 @@ }, "require-dev": { "cache/integration-tests": "dev-master", - "doctrine/dbal": "^3.6|^4", + "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0|^3.0", - "symfony/config": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/filesystem": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", - "symfony/var-dumper": "^6.4|^7.0" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -1376,7 +1381,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v7.0.4" + "source": "https://github.com/symfony/cache/tree/v6.4.7" }, "funding": [ { @@ -1392,20 +1397,20 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:20+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/cache-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "1d74b127da04ffa87aa940abe15446fa89653778" + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778", - "reference": "1d74b127da04ffa87aa940abe15446fa89653778", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197", + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197", "shasum": "" }, "require": { @@ -1415,7 +1420,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1452,7 +1457,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0" }, "funding": [ { @@ -1468,20 +1473,20 @@ "type": "tidelift" } ], - "time": "2023-09-25T12:52:38+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/console", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0d9e4eb5ad413075624378f474c4167ea202de78" + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0d9e4eb5ad413075624378f474c4167ea202de78", - "reference": "0d9e4eb5ad413075624378f474c4167ea202de78", + "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", + "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f", "shasum": "" }, "require": { @@ -1546,7 +1551,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.4" + "source": "https://github.com/symfony/console/tree/v6.4.7" }, "funding": [ { @@ -1562,20 +1567,20 @@ "type": "tidelift" } ], - "time": "2024-02-22T20:27:10+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { @@ -1584,7 +1589,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1613,7 +1618,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -1629,28 +1634,28 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v7.0.3", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e" + "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/834c28d533dd0636f910909d01b9ff45cc094b5e", - "reference": "834c28d533dd0636f910909d01b9ff45cc094b5e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d84384f3f67de3cb650db64d685d70395dacfc3f", + "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "symfony/event-dispatcher-contracts": "^2.5|^3" }, "conflict": { - "symfony/dependency-injection": "<6.4", + "symfony/dependency-injection": "<5.4", "symfony/service-contracts": "<2.5" }, "provide": { @@ -1659,13 +1664,13 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/error-handler": "^6.4|^7.0", - "symfony/expression-language": "^6.4|^7.0", - "symfony/http-foundation": "^6.4|^7.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", "symfony/service-contracts": "^2.5|^3", - "symfony/stopwatch": "^6.4|^7.0" + "symfony/stopwatch": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -1693,7 +1698,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.0.3" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.7" }, "funding": [ { @@ -1709,20 +1714,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "a76aed96a42d2b521153fb382d418e30d18b59df" + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df", - "reference": "a76aed96a42d2b521153fb382d418e30d18b59df", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", "shasum": "" }, "require": { @@ -1732,7 +1737,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1769,7 +1774,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" }, "funding": [ { @@ -1785,26 +1790,27 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/filesystem", - "version": "v7.0.3", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12" + "reference": "78dde75f8f6dbbca4ec436a4b0087f7af02076d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/2890e3a825bc0c0558526c04499c13f83e1b6b12", - "reference": "2890e3a825bc0c0558526c04499c13f83e1b6b12", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/78dde75f8f6dbbca4ec436a4b0087f7af02076d4", + "reference": "78dde75f8f6dbbca4ec436a4b0087f7af02076d4", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-mbstring": "~1.8" + "symfony/polyfill-mbstring": "~1.8", + "symfony/process": "^5.4|^6.4" }, "type": "library", "autoload": { @@ -1832,7 +1838,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.0.3" + "source": "https://github.com/symfony/filesystem/tree/v6.4.7" }, "funding": [ { @@ -1848,27 +1854,27 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/finder", - "version": "v7.0.0", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56" + "reference": "511c48990be17358c23bf45c5d71ab85d40fb764" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", - "reference": "6e5688d69f7cfc4ed4a511e96007e06c2d34ce56", + "url": "https://api.github.com/repos/symfony/finder/zipball/511c48990be17358c23bf45c5d71ab85d40fb764", + "reference": "511c48990be17358c23bf45c5d71ab85d40fb764", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.1" }, "require-dev": { - "symfony/filesystem": "^6.4|^7.0" + "symfony/filesystem": "^6.0|^7.0" }, "type": "library", "autoload": { @@ -1896,7 +1902,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.0.0" + "source": "https://github.com/symfony/finder/tree/v6.4.7" }, "funding": [ { @@ -1912,31 +1918,32 @@ "type": "tidelift" } ], - "time": "2023-10-31T17:59:56+00:00" + "time": "2024-04-23T10:36:43+00:00" }, { "name": "symfony/http-client", - "version": "v7.0.5", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "425f462a59d8030703ee04a9e1c666575ed5db3b" + "reference": "3683d8107cf1efdd24795cc5f7482be1eded34ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/425f462a59d8030703ee04a9e1c666575ed5db3b", - "reference": "425f462a59d8030703ee04a9e1c666575ed5db3b", + "url": "https://api.github.com/repos/symfony/http-client/zipball/3683d8107cf1efdd24795cc5f7482be1eded34ac", + "reference": "3683d8107cf1efdd24795cc5f7482be1eded34ac", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "psr/log": "^1|^2|^3", - "symfony/http-client-contracts": "^3", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-client-contracts": "^3.4.1", "symfony/service-contracts": "^2.5|^3" }, "conflict": { "php-http/discovery": "<1.15", - "symfony/http-foundation": "<6.4" + "symfony/http-foundation": "<6.3" }, "provide": { "php-http/async-client-implementation": "*", @@ -1949,15 +1956,15 @@ "amphp/http-client": "^4.2.1", "amphp/http-tunnel": "^1.0", "amphp/socket": "^1.1", - "guzzlehttp/promises": "^1.4", + "guzzlehttp/promises": "^1.4|^2.0", "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0", - "symfony/stopwatch": "^6.4|^7.0" + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -1988,7 +1995,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v7.0.5" + "source": "https://github.com/symfony/http-client/tree/v6.4.7" }, "funding": [ { @@ -2004,20 +2011,20 @@ "type": "tidelift" } ], - "time": "2024-03-02T12:46:12+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "1ee70e699b41909c209a0c930f11034b93578654" + "reference": "20414d96f391677bf80078aa55baece78b82647d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654", - "reference": "1ee70e699b41909c209a0c930f11034b93578654", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d", + "reference": "20414d96f391677bf80078aa55baece78b82647d", "shasum": "" }, "require": { @@ -2026,7 +2033,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -2066,7 +2073,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0" }, "funding": [ { @@ -2082,24 +2089,24 @@ "type": "tidelift" } ], - "time": "2023-07-30T20:28:31+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/options-resolver", - "version": "v7.0.0", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "700ff4096e346f54cb628ea650767c8130f1001f" + "reference": "9a3c92b490716ba6771f5beced13c6eda7183eed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/700ff4096e346f54cb628ea650767c8130f1001f", - "reference": "700ff4096e346f54cb628ea650767c8130f1001f", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/9a3c92b490716ba6771f5beced13c6eda7183eed", + "reference": "9a3c92b490716ba6771f5beced13c6eda7183eed", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "symfony/deprecation-contracts": "^2.5|^3" }, "type": "library", @@ -2133,7 +2140,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.0.0" + "source": "https://github.com/symfony/options-resolver/tree/v6.4.7" }, "funding": [ { @@ -2149,7 +2156,7 @@ "type": "tidelift" } ], - "time": "2023-08-08T10:20:21+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/polyfill-ctype", @@ -2627,16 +2634,16 @@ }, { "name": "symfony/process", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "710e27879e9be3395de2b98da3f52a946039f297" + "reference": "cdb1c81c145fd5aa9b0038bab694035020943381" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/710e27879e9be3395de2b98da3f52a946039f297", - "reference": "710e27879e9be3395de2b98da3f52a946039f297", + "url": "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381", + "reference": "cdb1c81c145fd5aa9b0038bab694035020943381", "shasum": "" }, "require": { @@ -2668,7 +2675,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.4" + "source": "https://github.com/symfony/process/tree/v6.4.7" }, "funding": [ { @@ -2684,25 +2691,26 @@ "type": "tidelift" } ], - "time": "2024-02-20T12:31:00+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.4.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^1.1|^2.0" + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -2710,7 +2718,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -2750,7 +2758,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" }, "funding": [ { @@ -2766,24 +2774,24 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/stopwatch", - "version": "v7.0.3", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112" + "reference": "ffec95ba269e541eb2232126c0c20f83086b5c68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/983900d6fddf2b0cbaacacbbad07610854bd8112", - "reference": "983900d6fddf2b0cbaacacbbad07610854bd8112", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/ffec95ba269e541eb2232126c0c20f83086b5c68", + "reference": "ffec95ba269e541eb2232126c0c20f83086b5c68", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "symfony/service-contracts": "^2.5|^3" }, "type": "library", @@ -2812,7 +2820,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v7.0.3" + "source": "https://github.com/symfony/stopwatch/tree/v6.4.7" }, "funding": [ { @@ -2828,24 +2836,24 @@ "type": "tidelift" } ], - "time": "2024-01-23T15:02:46+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/string", - "version": "v7.0.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b" + "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f5832521b998b0bec40bee688ad5de98d4cf111b", - "reference": "f5832521b998b0bec40bee688ad5de98d4cf111b", + "url": "https://api.github.com/repos/symfony/string/zipball/ffeb9591c61f65a68d47f77d12b83fa530227a69", + "reference": "ffeb9591c61f65a68d47f77d12b83fa530227a69", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", @@ -2855,11 +2863,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^6.4|^7.0", - "symfony/http-client": "^6.4|^7.0", - "symfony/intl": "^6.4|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^6.4|^7.0" + "symfony/var-exporter": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -2898,7 +2906,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.0.4" + "source": "https://github.com/symfony/string/tree/v6.4.7" }, "funding": [ { @@ -2914,27 +2922,30 @@ "type": "tidelift" } ], - "time": "2024-02-01T13:17:36+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/var-exporter", - "version": "v7.0.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41" + "reference": "825f9b00c37bbe1c1691cc1aff9b5451fc9b4405" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41", - "reference": "dfb0acb6803eb714f05d97dd4c5abe6d5fa9fe41", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/825f9b00c37bbe1c1691cc1aff9b5451fc9b4405", + "reference": "825f9b00c37bbe1c1691cc1aff9b5451fc9b4405", "shasum": "" }, "require": { - "php": ">=8.2" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" }, "require-dev": { - "symfony/var-dumper": "^6.4|^7.0" + "symfony/property-access": "^6.4|^7.0", + "symfony/serializer": "^6.4|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -2972,7 +2983,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.0.4" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.7" }, "funding": [ { @@ -2988,7 +2999,7 @@ "type": "tidelift" } ], - "time": "2024-02-26T10:35:24+00:00" + "time": "2024-04-18T09:22:46+00:00" } ], "packages-dev": [ @@ -3281,32 +3292,85 @@ "time": "2020-07-09T08:09:16+00:00" }, { - "name": "illuminate/collections", - "version": "v9.52.16", + "name": "illuminate/bus", + "version": "v10.48.10", "source": { "type": "git", - "url": "https://github.com/illuminate/collections.git", - "reference": "d3710b0b244bfc62c288c1a87eaa62dd28352d1f" + "url": "https://github.com/illuminate/bus.git", + "reference": "33993b8f54e91b03fb5000e55693e146e7370763" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/collections/zipball/d3710b0b244bfc62c288c1a87eaa62dd28352d1f", - "reference": "d3710b0b244bfc62c288c1a87eaa62dd28352d1f", + "url": "https://api.github.com/repos/illuminate/bus/zipball/33993b8f54e91b03fb5000e55693e146e7370763", + "reference": "33993b8f54e91b03fb5000e55693e146e7370763", "shasum": "" }, "require": { - "illuminate/conditionable": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "php": "^8.0.2" + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/pipeline": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1" }, "suggest": { - "symfony/var-dumper": "Required to use the dump method (^6.0)." + "illuminate/queue": "Required to use closures when chaining jobs (^7.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Bus\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Bus package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2024-02-23T15:38:25+00:00" + }, + { + "name": "illuminate/collections", + "version": "v10.48.10", + "source": { + "type": "git", + "url": "https://github.com/illuminate/collections.git", + "reference": "f9589f1063a449111dcaa1d68285b507d9483a95" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/collections/zipball/f9589f1063a449111dcaa1d68285b507d9483a95", + "reference": "f9589f1063a449111dcaa1d68285b507d9483a95", + "shasum": "" + }, + "require": { + "illuminate/conditionable": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "php": "^8.1" + }, + "suggest": { + "symfony/var-dumper": "Required to use the dump method (^6.2)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" } }, "autoload": { @@ -3333,20 +3397,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-06-11T21:17:10+00:00" + "time": "2024-03-20T20:09:13+00:00" }, { "name": "illuminate/conditionable", - "version": "v9.52.16", + "version": "v10.48.10", "source": { "type": "git", "url": "https://github.com/illuminate/conditionable.git", - "reference": "bea24daa0fa84b7e7b0d5b84f62c71b7e2dc3364" + "reference": "d0958e4741fc9d6f516a552060fd1b829a85e009" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/conditionable/zipball/bea24daa0fa84b7e7b0d5b84f62c71b7e2dc3364", - "reference": "bea24daa0fa84b7e7b0d5b84f62c71b7e2dc3364", + "url": "https://api.github.com/repos/illuminate/conditionable/zipball/d0958e4741fc9d6f516a552060fd1b829a85e009", + "reference": "d0958e4741fc9d6f516a552060fd1b829a85e009", "shasum": "" }, "require": { @@ -3355,7 +3419,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "autoload": { @@ -3379,43 +3443,48 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-02-01T21:42:32+00:00" + "time": "2023-02-03T08:06:17+00:00" }, { "name": "illuminate/console", - "version": "v9.20.0", + "version": "v10.48.10", "source": { "type": "git", "url": "https://github.com/illuminate/console.git", - "reference": "5eeadc4fecb6a23c31b705eddf0e7d65d2a8fa38" + "reference": "d001036218ea5fbb382ee5c845292b067ea8b46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/console/zipball/5eeadc4fecb6a23c31b705eddf0e7d65d2a8fa38", - "reference": "5eeadc4fecb6a23c31b705eddf0e7d65d2a8fa38", + "url": "https://api.github.com/repos/illuminate/console/zipball/d001036218ea5fbb382ee5c845292b067ea8b46f", + "reference": "d001036218ea5fbb382ee5c845292b067ea8b46f", "shasum": "" }, "require": { - "illuminate/collections": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "illuminate/support": "^9.0", - "php": "^8.0.2", - "symfony/console": "^6.0", - "symfony/process": "^6.0" + "ext-mbstring": "*", + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", + "illuminate/view": "^10.0", + "laravel/prompts": "^0.1.9", + "nunomaduro/termwind": "^1.13", + "php": "^8.1", + "symfony/console": "^6.2", + "symfony/process": "^6.2" }, "suggest": { - "dragonmantank/cron-expression": "Required to use scheduler (^3.1).", - "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^7.2).", - "illuminate/bus": "Required to use the scheduled job dispatcher (^9.0).", - "illuminate/container": "Required to use the scheduler (^9.0).", - "illuminate/filesystem": "Required to use the generator command (^9.0).", - "illuminate/queue": "Required to use closures for scheduled jobs (^9.0)." + "dragonmantank/cron-expression": "Required to use scheduler (^3.3.2).", + "ext-pcntl": "Required to use signal trapping.", + "guzzlehttp/guzzle": "Required to use the ping methods on schedules (^7.5).", + "illuminate/bus": "Required to use the scheduled job dispatcher (^10.0).", + "illuminate/container": "Required to use the scheduler (^10.0).", + "illuminate/filesystem": "Required to use the generator command (^10.0).", + "illuminate/queue": "Required to use closures for scheduled jobs (^10.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "autoload": { @@ -3439,31 +3508,82 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-07-12T13:39:25+00:00" + "time": "2024-03-21T13:10:17+00:00" }, { - "name": "illuminate/contracts", - "version": "v9.52.16", + "name": "illuminate/container", + "version": "v10.48.10", "source": { "type": "git", - "url": "https://github.com/illuminate/contracts.git", - "reference": "44f65d723b13823baa02ff69751a5948bde60c22" + "url": "https://github.com/illuminate/container.git", + "reference": "ddc26273085fad3c471b2602ad820e0097ff7939" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/44f65d723b13823baa02ff69751a5948bde60c22", - "reference": "44f65d723b13823baa02ff69751a5948bde60c22", + "url": "https://api.github.com/repos/illuminate/container/zipball/ddc26273085fad3c471b2602ad820e0097ff7939", + "reference": "ddc26273085fad3c471b2602ad820e0097ff7939", "shasum": "" }, "require": { - "php": "^8.0.2", + "illuminate/contracts": "^10.0", + "php": "^8.1", + "psr/container": "^1.1.1|^2.0.1" + }, + "provide": { + "psr/container-implementation": "1.1|2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Container\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Container package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2023-06-18T09:12:03+00:00" + }, + { + "name": "illuminate/contracts", + "version": "v10.48.10", + "source": { + "type": "git", + "url": "https://github.com/illuminate/contracts.git", + "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac", + "reference": "8d7152c4a1f5d9cf7da3e8b71f23e4556f6138ac", + "shasum": "" + }, + "require": { + "php": "^8.1", "psr/container": "^1.1.1|^2.0.1", "psr/simple-cache": "^1.0|^2.0|^3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "autoload": { @@ -3487,29 +3607,151 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-02-08T14:36:30+00:00" + "time": "2024-01-15T18:52:32+00:00" }, { - "name": "illuminate/macroable", - "version": "v9.52.16", + "name": "illuminate/events", + "version": "v10.48.10", "source": { "type": "git", - "url": "https://github.com/illuminate/macroable.git", - "reference": "e3bfaf6401742a9c6abca61b9b10e998e5b6449a" + "url": "https://github.com/illuminate/events.git", + "reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/macroable/zipball/e3bfaf6401742a9c6abca61b9b10e998e5b6449a", - "reference": "e3bfaf6401742a9c6abca61b9b10e998e5b6449a", + "url": "https://api.github.com/repos/illuminate/events/zipball/a931bfa88edc6ac52c9abbfd7b769343d321d3eb", + "reference": "a931bfa88edc6ac52c9abbfd7b769343d321d3eb", "shasum": "" }, "require": { - "php": "^8.0.2" + "illuminate/bus": "^10.0", + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" + } + }, + "autoload": { + "files": [ + "functions.php" + ], + "psr-4": { + "Illuminate\\Events\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Events package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2024-03-04T14:41:04+00:00" + }, + { + "name": "illuminate/filesystem", + "version": "v10.48.10", + "source": { + "type": "git", + "url": "https://github.com/illuminate/filesystem.git", + "reference": "592fb581a52fba43bf78c2e4b22db540c9f9f149" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/592fb581a52fba43bf78c2e4b22db540c9f9f149", + "reference": "592fb581a52fba43bf78c2e4b22db540c9f9f149", + "shasum": "" + }, + "require": { + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1", + "symfony/finder": "^6.2" + }, + "suggest": { + "ext-fileinfo": "Required to use the Filesystem class.", + "ext-ftp": "Required to use the Flysystem FTP driver.", + "ext-hash": "Required to use the Filesystem class.", + "illuminate/http": "Required for handling uploaded files (^7.0).", + "league/flysystem": "Required to use the Flysystem local driver (^3.0.16).", + "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).", + "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).", + "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).", + "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).", + "symfony/filesystem": "Required to enable support for relative symbolic links (^6.2).", + "symfony/mime": "Required to enable support for guessing extensions (^6.2)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "files": [ + "functions.php" + ], + "psr-4": { + "Illuminate\\Filesystem\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Filesystem package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2024-03-11T21:45:53+00:00" + }, + { + "name": "illuminate/macroable", + "version": "v10.48.10", + "source": { + "type": "git", + "url": "https://github.com/illuminate/macroable.git", + "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/macroable/zipball/dff667a46ac37b634dcf68909d9d41e94dc97c27", + "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" } }, "autoload": { @@ -3533,20 +3775,68 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-08-09T13:29:29+00:00" + "time": "2023-06-05T12:46:42+00:00" }, { - "name": "illuminate/support", - "version": "v9.52.16", + "name": "illuminate/pipeline", + "version": "v10.48.10", "source": { "type": "git", - "url": "https://github.com/illuminate/support.git", - "reference": "223c608dbca27232df6213f776bfe7bdeec24874" + "url": "https://github.com/illuminate/pipeline.git", + "reference": "f802187e917a171332cc90f8c1a102939c57405d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/223c608dbca27232df6213f776bfe7bdeec24874", - "reference": "223c608dbca27232df6213f776bfe7bdeec24874", + "url": "https://api.github.com/repos/illuminate/pipeline/zipball/f802187e917a171332cc90f8c1a102939c57405d", + "reference": "f802187e917a171332cc90f8c1a102939c57405d", + "shasum": "" + }, + "require": { + "illuminate/contracts": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Pipeline\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Pipeline package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2023-12-19T14:47:26+00:00" + }, + { + "name": "illuminate/support", + "version": "v10.48.10", + "source": { + "type": "git", + "url": "https://github.com/illuminate/support.git", + "reference": "ee3a1aaed36d916654ce0ae09dfbd38644a4f582" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/support/zipball/ee3a1aaed36d916654ce0ae09dfbd38644a4f582", + "reference": "ee3a1aaed36d916654ce0ae09dfbd38644a4f582", "shasum": "" }, "require": { @@ -3554,30 +3844,30 @@ "ext-ctype": "*", "ext-filter": "*", "ext-mbstring": "*", - "illuminate/collections": "^9.0", - "illuminate/conditionable": "^9.0", - "illuminate/contracts": "^9.0", - "illuminate/macroable": "^9.0", - "nesbot/carbon": "^2.62.1", - "php": "^8.0.2", + "illuminate/collections": "^10.0", + "illuminate/conditionable": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "nesbot/carbon": "^2.67", + "php": "^8.1", "voku/portable-ascii": "^2.0" }, "conflict": { "tightenco/collect": "<5.5.33" }, "suggest": { - "illuminate/filesystem": "Required to use the composer class (^9.0).", + "illuminate/filesystem": "Required to use the composer class (^10.0).", "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", "ramsey/uuid": "Required to use Str::uuid() (^4.7).", - "symfony/process": "Required to use the composer class (^6.0).", - "symfony/uid": "Required to use Str::ulid() (^6.0).", - "symfony/var-dumper": "Required to use the dd function (^6.0).", + "symfony/process": "Required to use the composer class (^6.2).", + "symfony/uid": "Required to use Str::ulid() (^6.2).", + "symfony/var-dumper": "Required to use the dd function (^6.2).", "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.4.1)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.x-dev" + "dev-master": "10.x-dev" } }, "autoload": { @@ -3604,20 +3894,132 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-06-11T21:11:53+00:00" + "time": "2024-04-07T17:47:33+00:00" }, { - "name": "mockery/mockery", - "version": "1.6.9", + "name": "illuminate/view", + "version": "v10.48.10", "source": { "type": "git", - "url": "https://github.com/mockery/mockery.git", - "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06" + "url": "https://github.com/illuminate/view.git", + "reference": "504d55e0f2d90c75588627e6a77a4d1228cf1a02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", - "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06", + "url": "https://api.github.com/repos/illuminate/view/zipball/504d55e0f2d90c75588627e6a77a4d1228cf1a02", + "reference": "504d55e0f2d90c75588627e6a77a4d1228cf1a02", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "illuminate/collections": "^10.0", + "illuminate/container": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/events": "^10.0", + "illuminate/filesystem": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\View\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate View package.", + "homepage": "https://laravel.com", + "support": { + "issues": "https://github.com/laravel/framework/issues", + "source": "https://github.com/laravel/framework" + }, + "time": "2024-03-12T16:33:42+00:00" + }, + { + "name": "laravel/prompts", + "version": "v0.1.21", + "source": { + "type": "git", + "url": "https://github.com/laravel/prompts.git", + "reference": "23ea808e8a145653e0ab29e30d4385e49f40a920" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/prompts/zipball/23ea808e8a145653e0ab29e30d4385e49f40a920", + "reference": "23ea808e8a145653e0ab29e30d4385e49f40a920", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "illuminate/collections": "^10.0|^11.0", + "php": "^8.1", + "symfony/console": "^6.2|^7.0" + }, + "conflict": { + "illuminate/console": ">=10.17.0 <10.25.0", + "laravel/framework": ">=10.17.0 <10.25.0" + }, + "require-dev": { + "mockery/mockery": "^1.5", + "pestphp/pest": "^2.3", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-mockery": "^1.1" + }, + "suggest": { + "ext-pcntl": "Required for the spinner to be animated." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "0.1.x-dev" + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Laravel\\Prompts\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Add beautiful and user-friendly forms to your command-line applications.", + "support": { + "issues": "https://github.com/laravel/prompts/issues", + "source": "https://github.com/laravel/prompts/tree/v0.1.21" + }, + "time": "2024-04-30T12:46:16+00:00" + }, + { + "name": "mockery/mockery", + "version": "1.6.11", + "source": { + "type": "git", + "url": "https://github.com/mockery/mockery.git", + "reference": "81a161d0b135df89951abd52296adf97deb0723d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d", + "reference": "81a161d0b135df89951abd52296adf97deb0723d", "shasum": "" }, "require": { @@ -3629,8 +4031,8 @@ "phpunit/phpunit": "<8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5 || ^9.6.10", - "symplify/easy-coding-standard": "^12.0.8" + "phpunit/phpunit": "^8.5 || ^9.6.17", + "symplify/easy-coding-standard": "^12.1.14" }, "type": "library", "autoload": { @@ -3687,7 +4089,7 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, - "time": "2023-12-10T02:24:34+00:00" + "time": "2024-03-21T18:34:15+00:00" }, { "name": "myclabs/deep-copy", @@ -3911,6 +4313,92 @@ }, "time": "2024-03-17T08:10:35+00:00" }, + { + "name": "nunomaduro/termwind", + "version": "v1.15.1", + "source": { + "type": "git", + "url": "https://github.com/nunomaduro/termwind.git", + "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/8ab0b32c8caa4a2e09700ea32925441385e4a5dc", + "reference": "8ab0b32c8caa4a2e09700ea32925441385e4a5dc", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": "^8.0", + "symfony/console": "^5.3.0|^6.0.0" + }, + "require-dev": { + "ergebnis/phpstan-rules": "^1.0.", + "illuminate/console": "^8.0|^9.0", + "illuminate/support": "^8.0|^9.0", + "laravel/pint": "^1.0.0", + "pestphp/pest": "^1.21.0", + "pestphp/pest-plugin-mock": "^1.0", + "phpstan/phpstan": "^1.4.6", + "phpstan/phpstan-strict-rules": "^1.1.0", + "symfony/var-dumper": "^5.2.7|^6.0.0", + "thecodingmachine/phpstan-strict-rules": "^1.0.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Termwind\\Laravel\\TermwindServiceProvider" + ] + } + }, + "autoload": { + "files": [ + "src/Functions.php" + ], + "psr-4": { + "Termwind\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" + } + ], + "description": "Its like Tailwind CSS, but for the console.", + "keywords": [ + "cli", + "console", + "css", + "package", + "php", + "style" + ], + "support": { + "issues": "https://github.com/nunomaduro/termwind/issues", + "source": "https://github.com/nunomaduro/termwind/tree/v1.15.1" + }, + "funding": [ + { + "url": "https://www.paypal.com/paypalme/enunomaduro", + "type": "custom" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + }, + { + "url": "https://github.com/xiCO2k", + "type": "github" + } + ], + "time": "2023-02-08T01:06:31+00:00" + }, { "name": "phar-io/manifest", "version": "2.0.4", @@ -4405,16 +4893,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.13", + "version": "10.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7" + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/20a63fc1c6db29b15da3bd02d4b6cf59900088a7", - "reference": "20a63fc1c6db29b15da3bd02d4b6cf59900088a7", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3", + "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3", "shasum": "" }, "require": { @@ -4486,7 +4974,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.13" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20" }, "funding": [ { @@ -4502,7 +4990,7 @@ "type": "tidelift" } ], - "time": "2024-03-12T15:37:41+00:00" + "time": "2024-04-24T06:32:35+00:00" }, { "name": "psr/clock", @@ -4859,16 +5347,16 @@ }, { "name": "sebastian/environment", - "version": "6.0.1", + "version": "6.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951" + "reference": "8074dbcd93529b357029f5cc5058fd3e43666984" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/43c751b41d74f96cbbd4e07b7aec9675651e2951", - "reference": "43c751b41d74f96cbbd4e07b7aec9675651e2951", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/8074dbcd93529b357029f5cc5058fd3e43666984", + "reference": "8074dbcd93529b357029f5cc5058fd3e43666984", "shasum": "" }, "require": { @@ -4883,7 +5371,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "6.0-dev" + "dev-main": "6.1-dev" } }, "autoload": { @@ -4911,7 +5399,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", "security": "https://github.com/sebastianbergmann/environment/security/policy", - "source": "https://github.com/sebastianbergmann/environment/tree/6.0.1" + "source": "https://github.com/sebastianbergmann/environment/tree/6.1.0" }, "funding": [ { @@ -4919,7 +5407,7 @@ "type": "github" } ], - "time": "2023-04-11T05:39:26+00:00" + "time": "2024-03-23T08:47:14+00:00" }, { "name": "sebastian/exporter", @@ -5405,16 +5893,16 @@ }, { "name": "symfony/translation", - "version": "v6.4.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e" + "reference": "7495687c58bfd88b7883823747b0656d90679123" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/bce6a5a78e94566641b2594d17e48b0da3184a8e", - "reference": "bce6a5a78e94566641b2594d17e48b0da3184a8e", + "url": "https://api.github.com/repos/symfony/translation/zipball/7495687c58bfd88b7883823747b0656d90679123", + "reference": "7495687c58bfd88b7883823747b0656d90679123", "shasum": "" }, "require": { @@ -5480,7 +5968,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.4" + "source": "https://github.com/symfony/translation/tree/v6.4.7" }, "funding": [ { @@ -5496,20 +5984,20 @@ "type": "tidelift" } ], - "time": "2024-02-20T13:16:58+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.4.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "06450585bf65e978026bda220cdebca3f867fde7" + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7", - "reference": "06450585bf65e978026bda220cdebca3f867fde7", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", "shasum": "" }, "require": { @@ -5518,7 +6006,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -5558,7 +6046,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" }, "funding": [ { @@ -5574,36 +6062,38 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.0.4", + "version": "v6.4.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e03ad7c1535e623edbb94c22cc42353e488c6670" + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e03ad7c1535e623edbb94c22cc42353e488c6670", - "reference": "e03ad7c1535e623edbb94c22cc42353e488c6670", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7a9cd977cd1c5fed3694bee52990866432af07d7", + "reference": "7a9cd977cd1c5fed3694bee52990866432af07d7", "shasum": "" }, "require": { - "php": ">=8.2", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/console": "<6.4" + "symfony/console": "<5.4" }, "require-dev": { "ext-iconv": "*", - "symfony/console": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0", - "symfony/uid": "^6.4|^7.0", - "twig/twig": "^3.0.4" + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "twig/twig": "^2.13|^3.0.4" }, "bin": [ "Resources/bin/var-dump-server" @@ -5641,7 +6131,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.0.4" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.7" }, "funding": [ { @@ -5657,7 +6147,7 @@ "type": "tidelift" } ], - "time": "2024-02-15T11:33:06+00:00" + "time": "2024-04-18T09:22:46+00:00" }, { "name": "thecodingmachine/phpstan-strict-rules", diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix index 21d258a85391..621ac9de0b29 100644 --- a/pkgs/development/php-packages/phpinsights/default.nix +++ b/pkgs/development/php-packages/phpinsights/default.nix @@ -15,7 +15,7 @@ php.buildComposerProject (finalAttrs: { hash = "sha256-7ATlfAlCFv78JSKg5cD/VcYoq/EAM/6/GjH3lkfVCJ8="; }; - vendorHash = "sha256-ykAv7laYMvzd+uD6raMRQiZmCEa0ELQj1hJPb8UvjCk="; + vendorHash = "sha256-MOq7xmX8wqDk9W3M2gkejyXXPTcVFFgU0ohmDpL0Tvg="; composerLock = ./composer.lock; From ffda459f2de6e56f8525f6c9eb9b9a410ed23e87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 19:56:54 +0000 Subject: [PATCH 089/246] werf: 2.0.3 -> 2.0.4 --- pkgs/applications/networking/cluster/werf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 5f06e15b1e50..b94e32022dcd 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "werf"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-CUz2LBba5elWWqMab6I/n1eGKRi8q9im/jEwZI3k7WU="; + hash = "sha256-htDa+4t6H2FWqHbsjrCkB7xpMCl/2zE1HIEoLONlklc="; }; vendorHash = "sha256-WMmL0jjzzaDtNmx+kvHFONqwhz7mjFCM4rT6YoL+XkA="; From b88607fa3d5e17739aa01c8c0449ad3b8dee7ab4 Mon Sep 17 00:00:00 2001 From: csyankovskyi Date: Mon, 13 May 2024 21:33:03 +0300 Subject: [PATCH 090/246] postman: 10.23.5 -> 11.1.0 --- pkgs/development/web/postman/darwin.nix | 4 ++-- pkgs/development/web/postman/default.nix | 2 +- pkgs/development/web/postman/linux.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/postman/darwin.nix b/pkgs/development/web/postman/darwin.nix index 4e47a153fab3..79458298dcc1 100644 --- a/pkgs/development/web/postman/darwin.nix +++ b/pkgs/development/web/postman/darwin.nix @@ -11,12 +11,12 @@ let dist = { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-P7x06KKH0e1Yro93SCEJyiWS/Uv25tWU8A85vxv85hI="; + sha256 = "sha256-V+JLXl12DnwZlPF0qNs2lQqRpWbSDiPXDTtl4FGcZcM="; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-/jlLU5NKF8sNZ49n90219b/oiVFT8EkFx2oYhIk8Tgw="; + sha256 = "sha256-l7J4Rrq+kUyk+0Chq5qo50K1VXC/7E3FC/hQ1DQ0PGA="; }; }.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 0765c711e4f8..f9684f64feeb 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -2,7 +2,7 @@ let pname = "postman"; - version = "10.23.5"; + version = "11.1.0"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; diff --git a/pkgs/development/web/postman/linux.nix b/pkgs/development/web/postman/linux.nix index 64f5deb1b48f..3784cca31ae5 100644 --- a/pkgs/development/web/postman/linux.nix +++ b/pkgs/development/web/postman/linux.nix @@ -54,12 +54,12 @@ let dist = { aarch64-linux = { arch = "arm64"; - sha256 = "sha256-esboLFqCziTlCFHyK6GxFq9Rik9jHiqX6ED0D53P1K4="; + sha256 = "sha256-yq2J5KRv/NJDaQG7e7RKyzbJqKWRolSU9X6khHxlrNo="; }; x86_64-linux = { arch = "64"; - sha256 = "sha256-NH5bfz74/WIXbNdYs6Hoh/FF54v2+b4Ci5T7Y095Akw="; + sha256 = "sha256-fAaxrLZSXGBYr4Vu0Cz2pZwXivSTkaIF5wL217cB9qM="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); From 508c65270d4c046a7c561fe1ae2025a5677b53be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 21:01:35 +0000 Subject: [PATCH 091/246] qpwgraph: 0.7.1 -> 0.7.2 --- pkgs/applications/audio/qpwgraph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/applications/audio/qpwgraph/default.nix index 60ac9cb81b79..97427b99e586 100644 --- a/pkgs/applications/audio/qpwgraph/default.nix +++ b/pkgs/applications/audio/qpwgraph/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "qpwgraph"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-mtW+dbjdp7as0N5+iacMSNrJ4jm8HWYqJP6G+lutucc="; + sha256 = "sha256-aXZsAOsdp0x7J0T9B9C1Qm2qDkhRNHRWUmPafdHRrOQ="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From fd6c372851459d90257b001bd349e2fbf82ea19e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 21:01:43 +0000 Subject: [PATCH 092/246] php81Packages.phpstan: 1.10.67 -> 1.11.0 --- 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 a1eb649a0b2e..da7d11a870ff 100644 --- a/pkgs/development/php-packages/phpstan/default.nix +++ b/pkgs/development/php-packages/phpstan/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "phpstan"; - version = "1.10.67"; + version = "1.11.0"; src = fetchFromGitHub { owner = "phpstan"; repo = "phpstan-src"; rev = finalAttrs.version; - hash = "sha256-fa/bPOwZoYmnFBBmQofsFb8VphAfcTUwroSGCdnpNq8="; + hash = "sha256-zf6u7fGMMx+DeXcS4SxyK3aQ53jnXzQ8YPrJ89vG65Y="; }; - vendorHash = "sha256-cTJWXfBjH6BiD/a2qQ60MFB/QuFaVm8vOLMQYPW+7TI="; + vendorHash = "sha256-Uv2BoE/hTK59uxHsdm4M5hfozDw4LwwZH4MHd+vN60Y="; composerStrictValidation = false; meta = { From fbc0d59d6bd80910537feeb1fe369a0b276a02b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 21:08:10 +0000 Subject: [PATCH 093/246] docfd: 6.0.0 -> 6.0.1 --- pkgs/by-name/do/docfd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index 656e32e8dbc4..c8c3e193c360 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -21,7 +21,7 @@ let in buildDunePackage' rec { pname = "docfd"; - version = "6.0.0"; + version = "6.0.1"; minimalOCamlVersion = "5.1"; @@ -29,7 +29,7 @@ buildDunePackage' rec { owner = "darrenldl"; repo = "docfd"; rev = version; - hash = "sha256-zG6x1ahBdLrKmiVh7uDGyHXJ1TG/8IvmjkPB1wbjJGQ="; + hash = "sha256-pNBWSPII+r9MMmyXBzxQ6hMNrN7nwcdhrpufzj00s2E="; }; nativeBuildInputs = [ From 985d8d9a36dd96d249311285f2fa5b189b64141e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 13 May 2024 23:10:29 +0200 Subject: [PATCH 094/246] python311Packages.numpyro: 0.14.0 -> 0.15.0 Changelog: https://github.com/pyro-ppl/numpyro/releases/tag/0.15.0 --- pkgs/development/python-modules/numpyro/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/numpyro/default.nix b/pkgs/development/python-modules/numpyro/default.nix index a38b43b2d8f9..857ce48b90f2 100644 --- a/pkgs/development/python-modules/numpyro/default.nix +++ b/pkgs/development/python-modules/numpyro/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi +, setuptools , jax , jaxlib , multipledispatch @@ -15,17 +16,21 @@ buildPythonPackage rec { pname = "numpyro"; - version = "0.14.0"; - format = "setuptools"; + version = "0.15.0"; + pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit version pname; - hash = "sha256-PkPqqchDRz166TnBg+ENsU4ju0KwrR3pCuFaRRF23kg="; + hash = "sha256-4WyfR8wx4qollYSgtslEMSCB0zypJAYCJjKtWEsOYA0="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ jax jaxlib multipledispatch From 157c6178e02c24b5bc0f2c877d7affd43b433b45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 21:46:31 +0000 Subject: [PATCH 095/246] python311Packages.clarifai: 10.3.2 -> 10.3.3 --- pkgs/development/python-modules/clarifai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index c3f60ae5103a..3130098a6cca 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.3.2"; + version = "10.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python"; rev = "refs/tags/${version}"; - hash = "sha256-8FF3hMiF8a1jtXtzpw7V03h4Npyvg+QYIjhER6NeB2U="; + hash = "sha256-M0OrBqjNjrpxVM/A7NVqarcP8S+VqunYGI4C+Wis6UI="; }; pythonRelaxDeps = [ "clarifai-grpc" ]; From 735048bce0da5f461db335a7ded1cae9b5702b1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 21:57:25 +0000 Subject: [PATCH 096/246] kraft: 0.8.5 -> 0.8.6 --- pkgs/applications/virtualization/kraft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index 43222fa6b19b..76e6614dc33c 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-31cgihmtBIB8U60ic5wKNyqB4a5sXZmIXxAjQI/43ro="; + hash = "sha256-lBvDKO2+MTSrmQM7szg5yulUi5OZKv7qKNQ75PIZgDo="; }; - vendorHash = "sha256-X2E0Sy4rJhrDgPSSOTqUeMEdgq5H3DF5xjh84qlH1Ug="; + vendorHash = "sha256-JSE4k/JgWvYCfTUuf2pj4XCcdJ9+j7fY9aAiCipapIk="; ldflags = [ "-s" From d07398c91da091021952e776c94cdc167d852533 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 14 May 2024 00:02:18 +0200 Subject: [PATCH 097/246] dibbler: remove, unmaintained Has not seen any updates for more than 10 years. Needs workarounds to compile cleanly. --- pkgs/tools/networking/dibbler/default.nix | 29 ----------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 pkgs/tools/networking/dibbler/default.nix diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix deleted file mode 100644 index 92254231bf7c..000000000000 --- a/pkgs/tools/networking/dibbler/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "dibbler"; - version = "1.0.1"; - - src = fetchurl { - url = "http://www.klub.com.pl/dhcpv6/dibbler/${pname}-${version}.tar.gz"; - sha256 = "18bnwkvax02scjdg5z8gvrkvy1lhssfnlpsaqb5kkh30w1vri1i7"; - }; - - configureFlags = [ - "--enable-resolvconf" - ]; - - # -fcommon: Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: ./Port-linux/libLowLevel.a(libLowLevel_a-interface.o):(.bss+0x4): multiple definition of `interface_auto_up'; - # ./Port-linux/libLowLevel.a(libLowLevel_a-lowlevel-linux-link-state.o):(.bss+0x74): first defined here - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-D__APPLE_USE_RFC_2292=1" + " -fcommon"; - - meta = with lib; { - description = "Portable DHCPv6 implementation"; - homepage = "https://klub.com.pl/dhcpv6/"; - license = licenses.gpl2Only; - platforms = platforms.all; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d05cab47461..72c54eed2e20 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -249,6 +249,7 @@ mapAliases ({ devserver = throw "'devserver' has been removed in favor of 'miniserve' or other alternatives"; # Added 2023-01-13 dfeet = throw "'dfeet' has been removed because it is archived upstream. Please use 'd-spy' instead"; # Added 2024-03-07 dhcp = throw "dhcp (ISC DHCP) has been removed from nixpkgs, because it reached its end of life"; # Added 2023-04-04 + dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14 dnnl = oneDNN; # Added 2020-04-22 docker-machine = throw "'docker-machine' has been removed, because the upstream project was archived"; # Added 2023-12-27 docker-machine-kvm = throw "'docker-machine-kvm' has been removed, because 'docker-machine' was archived upstream and removed"; # Added 2023-12-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5356f1ed4730..68515f858bcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4929,8 +4929,6 @@ with pkgs; dialogbox = libsForQt5.callPackage ../tools/misc/dialogbox { }; - dibbler = callPackage ../tools/networking/dibbler { }; - dieharder = callPackage ../tools/security/dieharder { }; diesel-cli = callPackage ../development/tools/diesel-cli { From d4cb8f434b33f24089d556f02c1a832e0521cea4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 22:11:52 +0000 Subject: [PATCH 098/246] codux: 15.25.1 -> 15.26.0 --- pkgs/by-name/co/codux/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix index bd95a9334d0b..9b38bf0f1235 100644 --- a/pkgs/by-name/co/codux/package.nix +++ b/pkgs/by-name/co/codux/package.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.25.1"; + version = "15.26.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-MdA/NAlIRyKJNiqYvoxACc+WgS0ZAt+tbqaQRzTT/Xc="; + sha256 = "sha256-jja9WYfirltjBdJNCQONowVjMTg0aj265Sjq57qSjbc="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From d1ec9d48832f0bd04d869befbe1e43e4e9814b47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 22:14:49 +0000 Subject: [PATCH 099/246] updatecli: 0.76.1 -> 0.77.0 --- pkgs/by-name/up/updatecli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index 38ff38d5e896..c3999383ba9e 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "updatecli"; - version = "0.76.1"; + version = "0.77.0"; src = fetchFromGitHub { owner = "updatecli"; repo = pname; rev = "v${version}"; - hash = "sha256-C+PWuFjTxmD+/qUsuJDueNrhFXKqu0PZnLPlQ3KJQlE="; + hash = "sha256-sBkTdr4/DqNrCxtaM1tVTx+rQ1dvJ1KwlFvAJHIZCuw="; }; - vendorHash = "sha256-STiVtzA78zeo5wywwzvA0dqmBW3REUvcpOXuWjpxReY="; + vendorHash = "sha256-xY2nNDMnUyV2sOMOJfSHbXaEU/gOKfZkA77d0lhDlgg="; # tests require network access doCheck = false; From c784a9f224957dc00646efd0f83383491955a4e6 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Tue, 14 May 2024 00:16:02 +0200 Subject: [PATCH 100/246] sysdig: 0.36.0 -> 0.37.0 --- pkgs/os-specific/linux/sysdig/default.nix | 40 ++++++++++------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 25b788104a4c..1bf1c10679e5 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,11 +3,11 @@ , protobuf, grpc, yaml-cpp, nlohmann_json, re2, zstd, uthash }: let - # Compare with https://github.com/draios/sysdig/blob/0.36.0/cmake/modules/falcosecurity-libs.cmake - libsRev = "0.15.1"; - libsHash = "sha256-CsKa5ybRj7Mjb71xNwd8FtDprOMfpJMrm3mvkeqZE3o="; + # Compare with https://github.com/draios/sysdig/blob/0.37.0/cmake/modules/falcosecurity-libs.cmake + libsRev = "0.16.0"; + libsHash = "sha256-aduO2pLj91tRdZ1dW1F1JFEg//SopialXWPd6Oav/u8="; - # Compare with https://github.com/falcosecurity/libs/blob/0.15.1/cmake/modules/valijson.cmake + # Compare with https://github.com/falcosecurity/libs/blob/0.16.0/cmake/modules/valijson.cmake valijson = fetchFromGitHub { owner = "tristanpenman"; repo = "valijson"; @@ -15,22 +15,24 @@ let hash = "sha256-wvFdjsDtKH7CpbEpQjzWtLC4RVOU9+D2rSK0Xo1cJqo="; }; - # https://github.com/draios/sysdig/blob/0.36.0/cmake/modules/driver.cmake + # https://github.com/draios/sysdig/blob/0.37.0/cmake/modules/driver.cmake driver = fetchFromGitHub { owner = "falcosecurity"; repo = "libs"; - rev = "7.0.0+driver"; - hash = "sha256-kXqvfM7HbGh2wEGaO4KBkFDW+m5gpOShJZKJLu9McKk="; + rev = "7.1.0+driver"; + hash = "sha256-FIlnJsNgofGo4HETEEpW28wpC3U9z5AZprwFR5AgFfA="; }; -in stdenv.mkDerivation rec { + + version = "0.37.0"; +in stdenv.mkDerivation { pname = "sysdig"; - version = "0.36.0"; + inherit version; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - hash = "sha256-EQnmtxByTsSawQPFmTe2pBMcv5rFaNtST+2KXZSFuoo="; + hash = "sha256-vEkwh+iSXlIraDzy9+ujr0ijNWX7oB7ZQi7H+jYi688="; }; nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; @@ -73,12 +75,6 @@ in stdenv.mkDerivation rec { cp -r ${driver} driver-src chmod -R +w driver-src - # Hacky but needed until https://github.com/draios/sysdig/issues/2077 is resolved for kernel >= 6.8 as strlcpy got removed and build fails - ${lib.optionalString - (kernel != null && lib.versionAtLeast kernel.version "6.8") '' - substituteInPlace libs/driver/ppm_events.c driver-src/driver/ppm_events.c --replace-fail "strlcpy" "strscpy" - ''} - cmakeFlagsArray+=( "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver" @@ -98,8 +94,6 @@ in stdenv.mkDerivation rec { ] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF"; env.NIX_CFLAGS_COMPILE = - # needed since luajit-2.1.0-beta3 - "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i)) " + # fix compiler warnings been treated as errors "-Wno-error"; @@ -138,13 +132,13 @@ in stdenv.mkDerivation rec { fi ''; - meta = with lib; { + meta = { description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; - license = with licenses; [ asl20 gpl2 mit ]; - maintainers = [ maintainers.raskin ]; - platforms = [ "x86_64-linux" ] ++ platforms.darwin; - broken = kernel != null && ((versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen); + license = with lib.licenses; [ asl20 gpl2 mit ]; + maintainers = with lib.maintainers; [ raskin ]; + platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin; + broken = kernel != null && ((lib.versionOlder kernel.version "4.14") || kernel.isHardened || kernel.isZen); homepage = "https://sysdig.com/opensource/"; downloadPage = "https://github.com/draios/sysdig/releases"; }; From 90abd0a1b28365f22bc86072e8dbeef4a3f2cf60 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 14 May 2024 00:12:13 +0200 Subject: [PATCH 101/246] python312Packages.truncnorm: init at 0.0.2 --- .../python-modules/truncnorm/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/truncnorm/default.nix diff --git a/pkgs/development/python-modules/truncnorm/default.nix b/pkgs/development/python-modules/truncnorm/default.nix new file mode 100644 index 000000000000..b9b9d77b22f6 --- /dev/null +++ b/pkgs/development/python-modules/truncnorm/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + setuptools-scm, + numpy, + scipy, +}: + +buildPythonPackage rec { + pname = "truncnorm"; + version = "0.0.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jluttine"; + repo = "truncnorm"; + rev = "refs/tags/${version}"; + hash = "sha256-F+RBXN/pjxmHf26/Vxptz1NbF58eqU018l3zmepSoJk="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + numpy + scipy + ]; + + # No checks + doCheck = false; + + pythonImportsCheck = [ "truncnorm" ]; + + meta = with lib; { + homepage = "https://pypi.org/project/truncnorm"; + description = "Moments for doubly truncated multivariate normal distributions"; + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 180c167c1f82..9348923b43f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15426,6 +15426,8 @@ self: super: with self; { trueskill = callPackage ../development/python-modules/trueskill { }; + truncnorm = callPackage ../development/python-modules/truncnorm { }; + trustme = callPackage ../development/python-modules/trustme { }; truststore = callPackage ../development/python-modules/truststore { }; From 428f208f4fc2131564c1ea34dd1756d1b48e580f Mon Sep 17 00:00:00 2001 From: xfnw Date: Mon, 13 May 2024 18:20:52 -0400 Subject: [PATCH 102/246] catgirl: 2.2 -> 2.2a https://git.causal.agency/catgirl/tag/?h=2.2a --- pkgs/applications/networking/irc/catgirl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index c3e4fa1b7a8a..393313da4106 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "catgirl"; - version = "2.2"; + version = "2.2a"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "sha256-+20EoJkwOvBdJ4xwXBVC5+5hZDwDDWoLaN7FNxCAo8c="; + hash = "sha256-xtdgqu4TTgUlht73qRA1Q/coH95lMfvLQQhkcHlCl8I="; }; # catgirl's configure script uses pkg-config --variable exec_prefix openssl From 3a69841da6b48c1f614c7a26d2fa09268a4c2418 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 14 May 2024 00:20:12 +0200 Subject: [PATCH 103/246] cpp-utilities: fix build on x86_64-darwin --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 599fa32022e1..9a240d084f92 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake , cppunit -, iconv +, libiconv }: stdenv.mkDerivation (finalAttrs: { @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; nativeCheckInputs = [ cppunit ]; buildInputs = lib.optionals stdenv.isDarwin [ - iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 + libiconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 ]; cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; From 19a6ebba3bffb0a2753dc1954c4662db6ae98cb3 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 21 Apr 2024 19:09:20 +0200 Subject: [PATCH 104/246] ustream-ssl: unstable-2023-11-11 -> 0-unstable-2024-03-26 --- pkgs/development/libraries/ustream-ssl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix index 638685434463..4bee9d4f3155 100644 --- a/pkgs/development/libraries/ustream-ssl/default.nix +++ b/pkgs/development/libraries/ustream-ssl/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { pname = "ustream-ssl"; - version = "unstable-2023-11-11"; + version = "0-unstable-2024-03-26"; src = fetchgit { url = "https://git.openwrt.org/project/ustream-ssl.git"; - rev = "263b9a97cf7e1e2467319c23832b705fc01190b5"; - hash = "sha256-RLHU6swNbS3DL3QbKnwU4BbD0EFGKCrHHp0hbnoSssw="; + rev = "7621339d7694abef5da5e5353ac440f2d39dcecb"; + hash = "sha256-No0Pk8KbkT7W4Rav7W3rMKEJISbp7RRoRx7t6LPMxlk="; }; preConfigure = '' From 4c17a9acc7e52767bdff5e05ce8e0fea539061a2 Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 29 Apr 2024 12:54:34 -0300 Subject: [PATCH 105/246] xarcan: unstable-2023-11-03 -> 0-unstable-2024-05-11 - also add update script Signed-off-by: lucasew --- pkgs/by-name/xa/xarcan/package.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/xa/xarcan/package.nix b/pkgs/by-name/xa/xarcan/package.nix index 2f10a984aa37..d2c06e36038a 100644 --- a/pkgs/by-name/xa/xarcan/package.nix +++ b/pkgs/by-name/xa/xarcan/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , arcan , audit , dbus @@ -30,21 +29,23 @@ , systemd , xcbutil , xcbutilwm +, xcbutilimage , xkbcomp , xkeyboard_config , xorgproto , xtrans +, unstableGitUpdater }: stdenv.mkDerivation (finalPackages: { pname = "xarcan"; - version = "unstable-2023-11-03"; + version = "0-unstable-2024-05-11"; src = fetchFromGitHub { owner = "letoram"; repo = "xarcan"; - rev = "380ea856307f593535dfc8b23799938db69e31b0"; - hash = "sha256-RdizezCbJylQDkOmUdqL0lBTNLsjyvo+lKAjfZXTXf4="; + rev = "ecc4d0a6408dfeb19934e3bfd4c382b0862c03b4"; + hash = "sha256-PmaoeemQpin5NN8I6JYOumP+PrzkyTYrqAyxxwBO9K0="; }; nativeBuildInputs = [ @@ -79,6 +80,7 @@ stdenv.mkDerivation (finalPackages: { systemd xcbutil xcbutilwm + xcbutilimage xkbcomp xkeyboard_config xorgproto @@ -104,6 +106,8 @@ stdenv.mkDerivation (finalPackages: { "--with-xkb-path=${xkeyboard_config}/share/X11/xkb" ]; + passthru.updateScript = unstableGitUpdater {}; + meta = { homepage = "https://github.com/letoram/letoram"; description = "Patched Xserver that bridges connections to Arcan"; From 8844fee2d14efef866e2695c385ed86f1929b5c6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 14 May 2024 00:30:52 +0200 Subject: [PATCH 106/246] uqmi: fix build with clang --- pkgs/tools/networking/uqmi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/uqmi/default.nix b/pkgs/tools/networking/uqmi/default.nix index 6fd830435aa1..37540cd45024 100644 --- a/pkgs/tools/networking/uqmi/default.nix +++ b/pkgs/tools/networking/uqmi/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation { # Needed with GCC 12 but breaks on darwin (with clang) or older gcc "-Wno-error=dangling-pointer" "-Wno-error=maybe-uninitialized" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=sometimes-uninitialized" ]); meta = with lib; { From bea584b44faa986727ce5d9bc75af1400ecf44ce Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 14 May 2024 00:31:03 +0200 Subject: [PATCH 107/246] uclient: mark as broken on darwin --- pkgs/development/libraries/uclient/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/uclient/default.nix b/pkgs/development/libraries/uclient/default.nix index 63a31c2bfbe9..7206b6ad98fc 100644 --- a/pkgs/development/libraries/uclient/default.nix +++ b/pkgs/development/libraries/uclient/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ mkg20001 ]; mainProgram = "uclient-fetch"; platforms = platforms.all; + broken = stdenv.isDarwin; }; } From 530f2dc446c04ebd1f46bc2d0fe8898ba4445062 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 13 May 2024 15:31:36 -0700 Subject: [PATCH 108/246] python3Packages.s3fs: unbreak on Darwin --- pkgs/development/python-modules/s3fs/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 46c7044759ed..c267f253102d 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , aiobotocore , aiohttp , buildPythonPackage @@ -45,7 +44,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A Pythonic file interface for S3"; homepage = "https://github.com/fsspec/s3fs"; changelog = "https://github.com/fsspec/s3fs/raw/${version}/docs/source/changelog.rst"; From e6d8df74a92836e7e0e833df3e81f125c2a3746c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 14 May 2024 00:33:39 +0200 Subject: [PATCH 109/246] libubox: fix build on x86_64-darwin --- pkgs/development/libraries/libubox/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 09837cd0c1d8..e48748308bb2 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -22,6 +22,10 @@ stdenv.mkDerivation { done ''; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + "-Wno-error=gnu-folding-constant" + ]); + meta = with lib; { description = "C utility functions for OpenWrt"; homepage = "https://git.openwrt.org/?p=project/libubox.git;a=summary"; From d288c747d058c65d629504f00318286660e3671c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 2 May 2024 22:16:28 +0200 Subject: [PATCH 110/246] opencflite: add alias in darwin-aliases.nix --- pkgs/top-level/darwin-aliases.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix index ae6cd5972278..78e29d9f1a59 100644 --- a/pkgs/top-level/darwin-aliases.nix +++ b/pkgs/top-level/darwin-aliases.nix @@ -51,11 +51,15 @@ mapAliases ({ builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06 + ### I ### + + insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 + ### L ### libiconv = pkgs.libiconv; # 2024-03-27 - ### I ### + ### O ### - insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04 + opencflite = pkgs.opencflite; # added 2024-05-02 }) From 3a7ecdac6210f2ceacbec720301b6b05478575bd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 14 May 2024 00:48:43 +0200 Subject: [PATCH 111/246] ogre: 14.2.4 -> 14.2.5 --- pkgs/development/libraries/ogre/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 890170c28808..fa0535ef8e9a 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -112,9 +112,9 @@ let in { ogre_14 = common { - version = "14.2.4"; - hash = "sha256-Gr72KNjxZPZtFrgsbevPYiVog/fQNvJHvQEH0WA2DW4="; - # https://github.com/OGRECave/ogre/blob/v14.2.2/Components/Overlay/CMakeLists.txt + version = "14.2.5"; + hash = "sha256-FldHoMU8akRF6/vjwley9nJOTioE5nQXnTdQqyNlI2M="; + # https://github.com/OGRECave/ogre/blob/v14.2.5/Components/Overlay/CMakeLists.txt imguiVersion = "1.90.4"; imguiHash = "sha256-7+Ay7H97tIO6CUsEyaQv4i9q2FCw98eQUq/KYZyfTAw="; }; From 2e312d3a5bc46f8b66cefbf77fdcf41c9759ae24 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 May 2024 01:06:17 +0200 Subject: [PATCH 112/246] firefox-unwrapped: 125.0.3 -> 126.0 https://www.mozilla.org/en-US/firefox/126.0/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4823ceab0eac..6e2642d4e0ea 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "125.0.3"; + version = "126.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "18e705a3093290311ccb5f27f01e43fe243ece94c1769a9ccc4fa53d370e32a1ec6a107cdeb531e9468b9aca1a1fe668161adb7acc1ec65fd383837882c7d484"; + sha512 = "56025b051d544ca294911a1d6a66f09945f71012131881b64313dafb579730810a4b091950c90a21d4fd3f393ba23670d8409086e1677d80d0bbbe347c303527"; }; extraPatches = [ From 70014d756730ba9b3566c60bc2bdfae4dc713891 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 23:07:57 +0000 Subject: [PATCH 113/246] melonDS: 0.9.5-unstable-2024-05-05 -> 0.9.5-unstable-2024-05-13 --- pkgs/by-name/me/melonDS/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index eb6a7d2c3b98..7fc24f718d84 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-05-05"; + version = "0.9.5-unstable-2024-05-13"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "10798c3464ca0e199087960fda918ed99acc2e21"; - hash = "sha256-5GbJKhICrbVfnfZt6Ni4uNbodH3rJY5lKoQRgiPXWCg="; + rev = "5df83c97c766bff3da8ba5a1504a6a5974467133"; + hash = "sha256-Fo+HtTvkfrHU361ccH9zPifRoR6tNcw9gKIaExKEQh4="; }; nativeBuildInputs = [ From bb01ae59f7975f059d08d994f09e49b60799dbd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 23:08:03 +0000 Subject: [PATCH 114/246] check-jsonschema: 0.28.2 -> 0.28.3 --- pkgs/development/tools/check-jsonschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index c75ca6e41b4b..c4cd5903ddeb 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -4,7 +4,7 @@ with python3.pkgs; buildPythonApplication rec { pname = "check-jsonschema"; - version = "0.28.2"; + version = "0.28.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "python-jsonschema"; repo = "check-jsonschema"; rev = "refs/tags/${version}"; - hash = "sha256-QHcpcpICYqQUUCkLAV4BpDYn7Te/TGbXFPgr8Emp0ew="; + hash = "sha256-1nbaaUr/3yX/ZTTXzlwLKCRsa58UFONQnDWmcvmdhsU="; }; propagatedBuildInputs = [ From a5616436c82616a2084f53ab393f9bbb5b841402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 23:08:25 +0000 Subject: [PATCH 115/246] proto: 0.35.0 -> 0.35.1 --- pkgs/by-name/pr/proto/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index c234921c9429..3383f6bb5e54 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-kUoiERpkAVxow6YWEIkmF2A9oRrdqMnZLsFJOLf5Ucc="; + hash = "sha256-ympqli1CHqS4iR76Rs9SFTVP4PxHsnFpZMDReg3+LhA="; }; - cargoHash = "sha256-3Jh5vPi/dNIVrxkibWe70eiZ54/wf6USTV+VV+H9mtk="; + cargoHash = "sha256-moabqZlj3vWkQo/yZEcwbvXuqrTswfSFaci/FEJzfnQ="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration From 1049739b6d2a3409e12cdf509c2a2ae21c416de9 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 13 May 2024 14:09:55 -0700 Subject: [PATCH 116/246] onnxruntime: fix `x86_64-darwin` build --- pkgs/development/libraries/onnxruntime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index 43a7f7950473..b3117364984e 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -15,7 +15,7 @@ , re2 , zlib , microsoft-gsl -, iconv +, libiconv , protobuf_21 , pythonSupport ? true , cudaSupport ? config.cudaSupport @@ -138,7 +138,7 @@ effectiveStdenv.mkDerivation rec { packaging ]) ++ lib.optionals effectiveStdenv.isDarwin [ Foundation - iconv + libiconv ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_cccl # cub/cub.cuh libcublas # cublas_v2.h From caf75cabaf99bea410e4136555047dbdc509c648 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 May 2024 01:11:40 +0200 Subject: [PATCH 117/246] firefox-bin-unwrapped: 125.0.3 -> 126.0 https://www.mozilla.org/en-US/firefox/126.0/releasenotes/ --- .../browsers/firefox-bin/release_sources.nix | 818 +++++++++--------- 1 file changed, 409 insertions(+), 409 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 3f5392389757..c07a93fb16c6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1025 +1,1025 @@ { - version = "125.0.3"; + version = "126.0"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ach/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ach/firefox-126.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "1811a9f5618f725b80dbda41568985c051b987dca7c2e207a039668a0d48d42d"; + sha256 = "dda46876fc45b17419fb3c06d09c3b36d0f7fc3ef8cb9dcdff7870ddc72a57e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/af/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/af/firefox-126.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "5cca7823582d1be336a25278d02bad75d77f37111b43b56e4168b61edab8986a"; + sha256 = "b1821ce2bb2ce8cde7b688069a174e1fc857e79db03066301d39ee42d6791fe8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/an/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/an/firefox-126.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "d38de568b16d3553402dac58f11c494b0e093523d74c20fcaad172fd87d41ad3"; + sha256 = "7600270871a1d5bcf5a255998a8c785dad2ca62cfcce2e2c808059b687825b4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ar/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ar/firefox-126.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "9c643e7791c50c99a8e983e972ff721955af638c2d24a6421e82b0a7dd66f68d"; + sha256 = "b1d3afe019fbe6a29a199a52cbfd727aa6d89a824a050d268d475e7357da65cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ast/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ast/firefox-126.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "7cb20ed5898279ef7f96aa33ff931438b553f964d12d94ffaee1925b9523c8cc"; + sha256 = "78495567e03154559d4d92cd655a5214d84cf5f3621c825fe54d83379d3f68b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/az/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/az/firefox-126.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "1ae2d85a6bb4dbcefd0cd518af75614cce6af43c641c49dbfe7c4bacef6691d7"; + sha256 = "085e8f9cad96ffcad9a2c1e25bbbf7f2388ed4a7e0210f3057ea240b99a4d7bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/be/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/be/firefox-126.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "84d7aed6ac1f46390b378ce432ecc00723a70caf5b34e33adac9449fb704ebf9"; + sha256 = "e58272a5f5b0afa919780d32061e593e22d7be9c7cf9e42b7361569d1ed60b3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/bg/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/bg/firefox-126.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "9071fc64447f3772c88469385eef3fcc1f36188628c18b929ba1320b4bc01d1f"; + sha256 = "1bec5b56518f07abf5f2b56b50e70bfa210a1a34075d65bfc089e37fd9f0023a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/bn/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/bn/firefox-126.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c8ccaf292b17f5d89b9c7af28b79a5a9d5edc53d3a7cff92be8cfb5166481ba4"; + sha256 = "09533d6cc055b802c3612b3a1c975e5f968f512b3d64e3dd13fbcf4b0ea2e1da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/br/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/br/firefox-126.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4cae7d705d2161603b35dcdfb2cd92c3a80922bba95bdc3f5945a59a1b19a011"; + sha256 = "bfbd169cf9bd0f5ae7a070f8341beef5a03216a71e1bd75179057f2090ce1124"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/bs/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/bs/firefox-126.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "cb74e00873abd0466c97f500ff5de4ab914beb7e0714f8f07ad7f72eeb300013"; + sha256 = "1bab87a8f437cb4e3aafe1b7c6ed9e18d01bedf6f4004faa6c40689c0280fd9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ca-valencia/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ca-valencia/firefox-126.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "2995878a5d1b127fa68fdc196f74c4173b14d48e13bfeb28252515ace585ceb4"; + sha256 = "cfe1a015695e451b423b1d2897a4a31780ae5e8ad9cef8f6f5c1d90fe1094447"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ca/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ca/firefox-126.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "47180f3814da29da56848baf7f050184face647f42f2e0b6dac9d9979979028d"; + sha256 = "b2aa6766fc820cb43e4c885885c4f246aaa40db5b6b290801f318381e1a82f10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/cak/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/cak/firefox-126.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ab400636a09114d9b79a42a375aa2eefeef0e191aa69aa0ee12ee2caaf5e72f1"; + sha256 = "26ab9b3720ad0f84a19619768a17637e9297731f3824a3f5c2662cdf0c8a62ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/cs/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/cs/firefox-126.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "5506a162fbde8afa5e255a657b87c840202d5d02784e6a78ac68c02a1affdbfd"; + sha256 = "bf7d2029945d76e96aa173e2b3768cb7f744e003299858459f95df2b033f780d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/cy/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/cy/firefox-126.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5dc8e2177e509c4f5d971b89c6b95b89a2d33d2bfdcc70533bc226d41d2b28cc"; + sha256 = "b93d29f9bf112d4f9fd5522724aad6b9a2cd30c41da77d4a2eb3a0559f003a34"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/da/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/da/firefox-126.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d8ca13cba46ddb0ba0f10d99ebac9f75da7e9ee5b3858b50315d0f3212d86ef0"; + sha256 = "9f17d40911a779f6e5285d7afba95fe7072e5372929430e728aaf2714ff7004a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/de/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/de/firefox-126.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "74aec53ca8eccfa25fa1925a1d26323d481c7b0457fbde0be32eb4210e8daea9"; + sha256 = "b15f91694b64048ee631d95ee90514cee174fb31cd1d3b3ac769294de933c250"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/dsb/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/dsb/firefox-126.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "f6725093e244d296bcb048998ed9bcb70dd58a9864e45f28bfa5cd833e265c1d"; + sha256 = "5a1b033bd3166d61433af4026942e435a43c0443abb2b400a0a2f7e1b13063b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/el/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/el/firefox-126.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "9cadc42340a199d5f5744d55dcd403584cf06e7853be6d6a030767ca5590a872"; + sha256 = "18b897662c121c14fef38a5922cd8046a07b5755ccd6001d7ebe6c28a4383515"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/en-CA/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/en-CA/firefox-126.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "02e518fb52863d60edeb31e5b21e77eb15a153e7058d23757eb4c8902edc10e1"; + sha256 = "20194008264b80bb71ccb30e983f3fd128a59f7653540414074e79e14e29d72a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/en-GB/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/en-GB/firefox-126.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "ea6539089c86b53df22c02179a8988a0ca66b854ceca5d2aa8ff6885d9bbc7b7"; + sha256 = "16abfc46286ec9d376dba40551e48816aad8617fd8fd70a618cfe023b23f50fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/en-US/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/en-US/firefox-126.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "2fb91b8dd196a8ee47238d82d6b7afef3dd1bb3212b29122ab1c3897052d8a49"; + sha256 = "f029b9dd18e1955fa1391cfaac2fdbe338343ddff59eeb1f4b2f509cc01b4584"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/eo/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/eo/firefox-126.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "3ffa103c2a31f729d7e38637762a8e8e9885fadd819afbe2448db795519ae239"; + sha256 = "3f5f0e4af585b255749f991d6189d8b0f9b8a6c96df914966ed5b0ad9cce499e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/es-AR/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/es-AR/firefox-126.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "6f03108c3500c4328f074477bb6dbf303d9ec4c654afa7acc109407fe1682787"; + sha256 = "37ce7d900ba92d66f0ea78e4cda3e43c577b6d2269eeaaafc91c458554455be2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/es-CL/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/es-CL/firefox-126.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "630476e38a0f9119f794933dea000c591687f13be94693917e457f8dfa8dca52"; + sha256 = "8308744a0150013cb040a45b1de18199b9cb03eb3e69c81d85578ecd6a2d61fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/es-ES/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/es-ES/firefox-126.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "87603bce7aac62d12725b922b74d6376365074c110dfaf01706dc0b31c05a9ff"; + sha256 = "fc7045b3b5ad6a15164b6e9dba56ec89099d41faab870a9d6d40ccbb08ca1be8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/es-MX/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/es-MX/firefox-126.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "ddfa1aa04be68932659439d93bb61de2ab0542f04677808eaa91f12e6e72714a"; + sha256 = "ddf2c17e4da881c8ed4e128911f0b02ac5bb95e8cc2d43ec02bb3c3a4451432f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/et/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/et/firefox-126.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "817596c186d4f8aaf51434b7abbe63b06256987b9187fc28cada01977574baa3"; + sha256 = "92d94afe650e4d39c1a02f51b8bb9b2f0c796ab4bc75af7292f2605fd83f638b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/eu/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/eu/firefox-126.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "f49aa967f260c08f8af7da05d57580e4c0e0804cc36bf6f702bca849cf8754c2"; + sha256 = "e7d6fd2e7eddb60691a3bf51986e9349f55d38aecc4470fefa3c9d98daa63c77"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/fa/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/fa/firefox-126.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "d770af123d38d3dec2d5a35537b0f4bed9d980be810f12e5036cf665e93dac56"; + sha256 = "75a2a7736c10999ef86d7a42281aececd484291914cc7b1d41bdd1715514cc32"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ff/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ff/firefox-126.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "70f1e5026f00ecea44209a88239ba3ea68d5f10cccc8ed20cd4de2bd0194c7f2"; + sha256 = "dbdf9ee4fd80778751bb8218ffcecc02dc2a38d0286e6f48e2435973f06b1bf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/fi/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/fi/firefox-126.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "9ecc9c29c701d3b2e298e191cec6f1764168e6831c9fa9472a82d15b2b29a169"; + sha256 = "538454759802c6ee105235234544b87a6380c846e96069f9d593b9cb8190afed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/fr/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/fr/firefox-126.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "07d5f4dbba19bc643a995dc6cd06456cab9342ab2563c0274ac742d02c7aa674"; + sha256 = "64d840787bd70d8bedae1c61a12ea0b577d4ae9f00d2e6e9ae1ee23e23433856"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/fur/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/fur/firefox-126.0.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "707d814ea0ea3a7c5c5455f678e496e4b0b14fcdd6872e81b5fc82241cb2b12f"; + sha256 = "624cc6275197390b6d8f8ce95b4db83a7ead03c03e41148492adf83079458af3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/fy-NL/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/fy-NL/firefox-126.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3fea1cf498eb47c4038b6a76a61e37d5d354f2457fc5a9198e5943df227aaa09"; + sha256 = "22d4598ce65a777243cade386ba9507b34968b115cb308635392b08f6ac88330"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ga-IE/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ga-IE/firefox-126.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "8790df138ec92eb83891a7f5ae575c63e181041cb06a24789ec347411c948c40"; + sha256 = "4c97fef0b3d97e663d6c55f81152c781616bf8e5842ae894800f8a1a0aab2147"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/gd/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/gd/firefox-126.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "b2de6dfb77b655befa785938da00cb71da490ca88fe01d568e86bd037faeabef"; + sha256 = "49635b4d34bbb79980a63a47872006be8bc9d1f7e9b96e2bd8423b9b1e70752c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/gl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/gl/firefox-126.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "15ac0bb2b9d61dcbb81243954123d79a0025d480fd66e1703ad1906c3ca09c28"; + sha256 = "539323f69d7f5a54948553e532a749e4b1d2802dff8dbbc52dfa51d4a314ba27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/gn/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/gn/firefox-126.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "5c6e43ab908a99692b9702531b8639d8f503d3396c51e4c3f8a12f5e143bed26"; + sha256 = "123a34d0bc07276b2aabdc5a91dafdd422bfdc3f839a2b5d225e52f484a11193"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/gu-IN/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/gu-IN/firefox-126.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0a140f0beb0112b88c058bd8d4d4fc8990c6146c60def24f4c15bb85daadd164"; + sha256 = "50b578df5cc60410f2bda81ac95f67b4f507e03336a4c324e84d63ab68034326"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/he/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/he/firefox-126.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "ce9251aee641a5a4c1cd2a55ac8c7f8d33ea444a746ec5eb783b6d7a5ab4735a"; + sha256 = "5d6e95ba7c93d723c8db7590ee14f8e0f6a97af151ee60264a9358bac980857d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/hi-IN/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/hi-IN/firefox-126.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "35a9d216fed5fddd71f1801b0a2a1178c8c646a4d879502d0f56daa2675deea4"; + sha256 = "b8a6c4fe3e2b853cceabaae133194b807a55feb5c8dcb01b54d82691ae4af18e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/hr/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/hr/firefox-126.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b7d62b7ba3261f76e1f6a8c9df79dbbb7a2e2c9efb56a4d30f6be1b37a6f1f1f"; + sha256 = "e98d20183bbd3a361f7b182fdf823b4cd7b87a43ad0c4781aad4dd7bd47dc021"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/hsb/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/hsb/firefox-126.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "b6e5031ea996de5449c362d476afacbd7a7310f22cfc108dbab0e745897459c8"; + sha256 = "e0f62a403877da98f6731f19024810285bcd11066f52b38db0d7150b8bd127e5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/hu/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/hu/firefox-126.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "fbc3cdadb14dd5755ad6e64dda7350df60f43c576dcba09ed082fabda2a5a130"; + sha256 = "3d3adecc44d456dfee04a5bad74c84493267c91ae7526f8852c80b8db541b249"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/hy-AM/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/hy-AM/firefox-126.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "d37f52f64d3a56cf043ce1f198485228877419c4231a8b1816af7d2efb7c9156"; + sha256 = "47aace044667c4c5341a871f2729192a0ebc1af50d84395e3363d235c53f0cf0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ia/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ia/firefox-126.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "1abb3b691d218da98df54b08228181d201ebcdd397b23bd438761c26e91d70b0"; + sha256 = "dfe76f863d8d73eccefb29159796652314a1ede465b56e52f0da2cc5079effe4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/id/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/id/firefox-126.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "e003f96e908abb817efaa518ad4d4da3724077b0e478eec311b065f5a1ef6a26"; + sha256 = "6b875b88e075db1f354365ff3523db837b0f25bc079bbae6aff4831dd694fd1a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/is/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/is/firefox-126.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "09ea5c1828d9bb6d9eb89cce854892ff5300641e3eec69bec251937d442caea6"; + sha256 = "05ac5378b326dad5a2e37c52835a08061b83f204e0030e9ed00149d0fbf6b52f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/it/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/it/firefox-126.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ab3e1df035e7198a70a6ad5dbcbf13915a5a98a554497438980a56adb550b45c"; + sha256 = "c840cedbbfb49b54aae0e446a723e69a886adc36f6c6c251dc4039ace345af2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ja/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ja/firefox-126.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1d9cac5e97b86c76b908fef1c8f981476a054cfd6d365cf7d9d3a7cd2800d56f"; + sha256 = "b8672862d851e4dac374a89d98a6e259786e4c6e00a292401b94e8d44891f6d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ka/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ka/firefox-126.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "518b72d8e5188f01e0ea0eb90d4760b98b0dd7f1e74a0cde8e9809e25117d9f9"; + sha256 = "1898dc72d9361c7d93cc86919d4b3c882853539535523f226d906b4a9268470d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/kab/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/kab/firefox-126.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "eac92cceaae9348cfae57ad891fae6827f25ec03df649e2d7a3c7186fcbab01d"; + sha256 = "07a1f0630c4c1ecae65133523157cf1e38f5ea7db2cee73e11c846c21ac907d6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/kk/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/kk/firefox-126.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "c2dfc1d48cc5386c9925de7a33cf368b2040accea7dfcc67038d2394d828b3e4"; + sha256 = "94f2b8c0ed553b85625dafd01b65b08eb0f306b7da07951ec008dea623ed55b3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/km/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/km/firefox-126.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "f032f51e6c6b655ac6ab7ed1605f701c99f71bc316d76f06c2fa6fb111c61276"; + sha256 = "300b63d65dfadb49e4b4e5323a60156ea0da30fd09ad868ed8bab76b7ec66e9a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/kn/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/kn/firefox-126.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "8d47dd21f7968cd1151d25609fa2276cf3e9b8bc7cbfab307a2efa84f541e5ba"; + sha256 = "663669b5480878205fbd7770734a25bc8370776238be318043731ee925c55da3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ko/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ko/firefox-126.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "de7b527a436ba0f27175ee7f8e6ed9238bbcb716ebb26f9b0c9cc5b30a3240eb"; + sha256 = "2d3c1fb5925e719db9879c97017ba950c9d81f3131e2cbed468b092de51d23ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/lij/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/lij/firefox-126.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "809675ae60d9885fe20e4053d0d0686cc6d22cb6fc6fbcbb76c76579e47d97f2"; + sha256 = "0f63a277d9eb4a29113944e63cd666504b03f798b6bf9c41dc93e0a9d7450ec9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/lt/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/lt/firefox-126.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "cb512ed0fef4a1d544c4a74d81e6872091ccee8a2356c5c5f18d6edd1a601c06"; + sha256 = "582d209cbc97a77c913dffe48ab927f5a1f743505ca68d0821db70ab64178ac2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/lv/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/lv/firefox-126.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "5d693ca8c453c37baa6a1c284041a380815e48f6e728b4ead06f6afcb27f0558"; + sha256 = "94d7da74b9f2c8e236e312e97edc34a86ae77d83aa1f9eae311aba17c7af5156"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/mk/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/mk/firefox-126.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "352daa1a8995c40803bf34f1e00afa6ed95a2b98582992d1a34b0d6331e1c893"; + sha256 = "ff7ace9f394694e83a76cb722fb75e210249ecdafc2ee237d86ccc7a99331c03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/mr/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/mr/firefox-126.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "a5bb5ea7fc2a3f5f0f71f14cba8b594bff15da10a3a879fb14311ea25b12ccb3"; + sha256 = "ff9d005ae4ac745b0affe51cadd040213579a1561970605e14b7e97c713b7a1e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ms/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ms/firefox-126.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "c544e324549f84337d9a7e0e863c1b0be6f3435d9cf890a6a73fff62ce9ab8ae"; + sha256 = "a64e318bffab978f41d99320184edc406214a64d0ce3e43ab5ca79a9a803b8e2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/my/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/my/firefox-126.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "9de9d7f95e75f733666599de2b57b487ac3ca545487101ab3d097e85dd9f2daf"; + sha256 = "3be1543f24f4a23a163524ff30b757741a6387bb807955f943d1b8cccddeb6ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/nb-NO/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/nb-NO/firefox-126.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c1a5ce764dbb1f090c01330991af161745d4df945d51346a571f24dae6dc0353"; + sha256 = "d1af51acaf3c8f0b7328ff3e62c31bbbd0951d1a3a82f74f2f81da4c30cb173f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ne-NP/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ne-NP/firefox-126.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "7c04f1b49e4d301533e1e15c08a88a768c536677a55f1d2cc9f4fa7d3bd1f26a"; + sha256 = "1f1c957660b705293fbbfa824156710c8f90347ea042885053ec9a2060834f7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/nl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/nl/firefox-126.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "a81916a67375d43a2883111474858ca8aed787a12cee1d503fae5ec2413cc778"; + sha256 = "2b6f54aeca9a689b7f405f66e267f21bbe195f7ed13185201020d529aae97fcc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/nn-NO/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/nn-NO/firefox-126.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "282e7e2dcd7d01c1bb8c3861511aaa989a1e23e79c7ad5958956a3725c595650"; + sha256 = "1a3535a184ddadc86863848f9f603216c0401fafb939921acb865eb00631af19"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/oc/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/oc/firefox-126.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "aad97d4a4bb4229017ef8e84ce79597e5ffe0108c1898c4188ffc1baf2368bf6"; + sha256 = "5845b3b682a780aeca38b03cad6c02a353de6b032baba5af3da7e514c41cefef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/pa-IN/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/pa-IN/firefox-126.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1ae4b77596984e0daf341ee562d78aa653914b8e20627dc568d86ec2bc87a7bb"; + sha256 = "2568a37dc1cfe1e42d5c9dfae2dbe74cae1185abd35f9ee3977390eb80661bb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/pl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/pl/firefox-126.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "979b3892b3f7056ea173946e5950f71e0ea8a740f4016ae9aeb4a58edb0fb679"; + sha256 = "c69112cdedc150908a0cac8a7f003bfc44dab14a8d32a31ace22748c391b7a84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/pt-BR/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/pt-BR/firefox-126.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "7aa3b0e46f6c0c36443c61b43b15db420e509d6793f6ff63759ee0e9eed3d6c2"; + sha256 = "b7369e99da8a96aed5018f5f4bd1acaa252d50629179b79a2b61929d71c1750d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/pt-PT/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/pt-PT/firefox-126.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ecbeb1dc3292eeecdad0cd302b70445e9fa4fa6a6f9c83a698e5193f2f4c543e"; + sha256 = "a2ddd2dc66e8dd6e8d7a628e090ec987a2060ccfe14015c91be2988244990b6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/rm/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/rm/firefox-126.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "17dfd6e52f056481d4c5ef45ffae76a8005034fdcfdca046d12966b316852b91"; + sha256 = "1edab3ce5b47dc44e2c83a7a2b0b0cee771e36018c98be540e20bd7cd5123b1d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ro/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ro/firefox-126.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "03e3bb8b8d6f6752aee13b445f79cbcb5999224359165deb565c00e79505aee7"; + sha256 = "36abb93c19c2e629e37b73e807d1b6858a42877a035bb526eb2329bc6784fb39"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ru/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ru/firefox-126.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "b3f3bc5db58106f7ce085aa13422974ec2a77fc1289e6ccecce66731194b1885"; + sha256 = "3aa49a597b80fff5fa963ac16f881aab2290ae938f721412dd42202947ad77f9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sat/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sat/firefox-126.0.tar.bz2"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "de73c27a3eddba12687edcc6cb18cd1e7d055eb0f19e13b019901a8e21ade74c"; + sha256 = "828efcc83d23bcf9c31225155eaa65a6248448c21e57c9b2a71f54d75fd4a037"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sc/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sc/firefox-126.0.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "a5444d59372a88fc3fa7eef03d8ed5840b07b3cb5845ac96b2cbcab404cff35b"; + sha256 = "255c7b998f797605daf9fb4bd4f6d29ac64ef40f270c7d615c695452d0d5f20b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sco/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sco/firefox-126.0.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "a4cab5bb51709ae5f3a6ac1b4c113dd9adcc973aee3bc480b763d89677b4b75c"; + sha256 = "4892e68434fb5494d8f4e7eaa95f10ffd39f75e05bf4015ffb7c0ed0e895c8b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/si/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/si/firefox-126.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "8d4b2d9d5de196db515c4852fe6bc0b866c7bdaae7f734053fd6f0fabaab8054"; + sha256 = "28440c8658377ab98cb93de1db073d264fba046e390c433148abe11459a91652"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sk/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sk/firefox-126.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "58b4b780317ad6e88b824fc31fd1777425abc673ce76a578dbfbae3db1247599"; + sha256 = "9029db81a8258fb7e352a29de9bd20ed793b579a569e8ed5fd06d0f25b122297"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sl/firefox-126.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "c6663467611b7b9bed4d3bb0bf70465ed7812038067a6d034f70ec59af3c937f"; + sha256 = "9f6f60a27ea5c478ce0c1af7de426d0d55178c506c4abf9301b50534396e453d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/son/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/son/firefox-126.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "066b5c9ffd986a56460bba1021272a42b66e1c93f601664f8f6a0e939314f22f"; + sha256 = "1e255b7fc86c5ef4d5b7b9871cc70cea6f93fe4ad74575e48786c57256f6dde8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sq/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sq/firefox-126.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "d9d696c0748b1cc3238c39cc3f7b69e6ef2970402d68494084e6897f947d1493"; + sha256 = "dd918a5d4c1404b159698c8c0128ba6155a26addf52ab72372a523ec05d55354"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sr/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sr/firefox-126.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "73411b25f8abebd15a4e716c2ee3a861670df257d7b1497ccfbc92aa055b8af2"; + sha256 = "fc58ba9e476b69db4a7500e599b4933379f0ae7ef2b494e4b2df8327a6fb39d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/sv-SE/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/sv-SE/firefox-126.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "a877cf095668f7492a762d4fcebfe9ce154d0594e3a4a105d5c9046e1f9ee26c"; + sha256 = "3c6d7d83a3d45eff199221157e0f91c2ad483ea281ce51e738603bea4d050713"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/szl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/szl/firefox-126.0.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "45477dba947128e7e4902715ee1ac7898422c34551c308f6f2388df8bc3f8982"; + sha256 = "42d650ee5043556620c34a4aafabd1075e4ccedcf044e059d382fa4e21708718"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ta/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ta/firefox-126.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "acb5eefe0aafcd146946ce390a9df077c477c029f0cfda6da3da00a3a6e844cd"; + sha256 = "b095636c31b9d760713e04969abc45223ef79b255bbd1a27cdfdd20b5d2fd9ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/te/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/te/firefox-126.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "98e43739bbe0117a5b875d5e66863e76a45d45f8a9b7b7afdfcd9d858402c075"; + sha256 = "55b14dcb7db3f3604d197de83cb87895c8a58d12db0f23e2023bae7a9f596a74"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/tg/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/tg/firefox-126.0.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "8c6f9dce430b7207665cdfd442cbd1bdaa1978651e745eec3b77c8eb52963aa1"; + sha256 = "b35e457267437963018eae1ed56f4c20af928c0a24053cd7c66e6e155c8f5e2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/th/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/th/firefox-126.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2a18d85e28fb7d415ab71f9a966b6799dd6c2fdeeff5f4b0e65dbea449a77fa2"; + sha256 = "02d72cae8815ea2f9f0a01358ec131e28fb1cfb6568370f2151e64e8d919b4b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/tl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/tl/firefox-126.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "4517393fdbcba061dd7a667b92ba7b44e69ee73036ab36624e5681195a372a6b"; + sha256 = "2004e3a1b985f73151e00f81d3d2700d7d8f6c6a8a25ef47f842a386309b9c20"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/tr/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/tr/firefox-126.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "5bff1a8d3044d5ce9195d5cd9aba3e02b21d4e23bf84870ac3b288777c5001c4"; + sha256 = "d2fe1ea72bb321dc3e0bd3d5b6f2a44592f5286cb420d1707293f1210a3bb7c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/trs/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/trs/firefox-126.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "8c75284765e4e4778a8dcba326369f7f8d62627bcf95f4384ab68b2339f245b9"; + sha256 = "37cb52d3abaab1c1e6d285553c4a7dbd0c99c08713f88b6b693c5d0ddd63205a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/uk/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/uk/firefox-126.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6ad348a509db7651e96ad6a4015dad3b7e4073d02a6936eac0b15aab9216feef"; + sha256 = "9ba4b7ca7c3f545abde9ae835def611aaaf644257f7036d97c7945e6d1294bf3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/ur/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/ur/firefox-126.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "71714780ef8d0d7bd072744dc450f4d3db43e8eaca8df76ebf0471debe8fdbb6"; + sha256 = "963abf5bc134585d9df57085da5d0b32b5e7e3437ddd31581d5ba86c9ae5d077"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/uz/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/uz/firefox-126.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "c8e095e7259f14c6b98a32fba83154c6f83b2dbe8e19f7876434b22d3529fe4e"; + sha256 = "b52aac7d993ef57c055a48fb7658e86a120cd2f4edbc734f4c3d89e24a5beb4b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/vi/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/vi/firefox-126.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "82b8321d1e5d321f65ca1977a24d67b5663866c883fecae1553dc2d6a2b70304"; + sha256 = "337cecc697dc0fdadede5a41a0c3c0fd259281ffdda6bd1903f1061f96e58a93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/xh/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/xh/firefox-126.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "06a67bbcedf238921f3211b2d36ebe02ee123cac3cb90820fd06eba7316fdaab"; + sha256 = "a41f854be36ef9d9cf0d8a229e1b088bf855b3d5ef417cb20cd9801631505403"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/zh-CN/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/zh-CN/firefox-126.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "074fadec864960fafa5aafb41f05e638a97b37c00a26e8f9e838357f484c523b"; + sha256 = "0e1e754315f0919d78b0ad29e4374287ea3d397dc3ccee6bf835a027776fcdca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-x86_64/zh-TW/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-x86_64/zh-TW/firefox-126.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "01cf02595225f172ab77ad12c3c7d61456703f3e80d88e38e4fbd5d047f2c0f3"; + sha256 = "90d723ea118e1dbcf2dc6345131843df48059e90ca7e99061b91095a2e21b727"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ach/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ach/firefox-126.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "051c3f7ed00fd372275aea30306469f732aa7ec59fc08f98e04606d2cca1ae6d"; + sha256 = "24da13a3aed6ffc2dc8c75e4e3d349cb419a2dadd6c689349a136d9ebda37a04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/af/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/af/firefox-126.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "6d1ee2379de68187991326d0d89e13edd733424adab5a7d6cf5e9aaf3368feb1"; + sha256 = "348bf05b0613ee0741318a27b2810c666a6525757846755f5296e1f69dc06131"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/an/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/an/firefox-126.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "0ecfa115508f05a7066be1927159faf3e02fe338df61d9c823a1936a56aabe95"; + sha256 = "64d8665b8b2c2e9d9f475e546520c3a735fd647cdbf69fe605284f77e2e93b9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ar/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ar/firefox-126.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "af4cb6ee6c7215be5e199d9ca64867484de7e693a013d9a33eb410e8d9feaa0a"; + sha256 = "0e94cd589ae11ccfd2e575d420bbef5e451959beeee2118c2a205920d74b890a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ast/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ast/firefox-126.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "04647b722d70f11d32f6a49dc4fda2f57560c96c3a098680b8e1964324cd9a18"; + sha256 = "d325eebe6c40cf958e5a4f40ae55b429536e4ecf4e00e7df2c16674b125067a6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/az/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/az/firefox-126.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "499cd8960c5e21956372fcdcdbba8ce59929fdf3c199c94b604be235834fec9d"; + sha256 = "b8645cadd3b2b8dd790634ec8f16cc1ac478081dac234fa96eb83a7030ece589"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/be/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/be/firefox-126.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "215c1fda1f502d87c8685a8dfeb23d2b34b51c569de96cf52ba6a8179cdca4d5"; + sha256 = "e36e2243c833441b614ce90fff63762572e98aeedb10b8bfad1dc5268c7c0448"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/bg/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/bg/firefox-126.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "d24acc50c74d070c9c3fcea8030914e08ec98f77a373f0c640f5c5644b52868e"; + sha256 = "66c0ce40beb176ae4b167411708ed3a381408e04cf34b88010b7bd0b13950e95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/bn/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/bn/firefox-126.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "c0f5570e5f05996e105485fa73580da3c4d3b7a0eb5db8cd1c6dd316b770d4f7"; + sha256 = "1f6702ca2d492708a89450404a162a5b8131087552b539ee19e275336a556510"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/br/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/br/firefox-126.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7adc8a1c0397bc7e3390a598bb064d6abb318a2689be7e99a90f31c3346f557e"; + sha256 = "b0599dae8e8b9fcffea5afc113c954d46a78a81b2f6f9076256922a57b840df1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/bs/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/bs/firefox-126.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "43d74f20af450faa633216821af7c1d37bb1a1c6a6ceeb75a0474adbf9b015ce"; + sha256 = "b893fd06193a43799959037b257d0079a58c7d823384d6f73668571655e7c5a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ca-valencia/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ca-valencia/firefox-126.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "1416a98df2841c0e9d3a783fd236f8e8c7f3dc4e17fe027e4cf04b8b0bde187b"; + sha256 = "3f8d3a6566b616ef7766bfe7a342b0a138bb4b5cffedaa65e0da03ae113c1bc7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ca/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ca/firefox-126.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "1c09a6d5ed0dfcae1d25fb9876c08663218f8a83bdc9f15ad52e39cd22428c5b"; + sha256 = "4e4ab9b73d5f939f8bd824453e197e2e668518c99f41309970c5c7e4f582cb9e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/cak/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/cak/firefox-126.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "6fbec6115cccaca619389d68cb917c331faeb19ca165f5b9e5425b78ffabf0d9"; + sha256 = "ef1b8a1f318fe3a49ec99f050d4417c5ecb2018788309d2bafe0582e9f0f67b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/cs/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/cs/firefox-126.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "d1da5d44dd511d94341837c578eaa9d5aed5e2d63afc502b2b76b049d6110ece"; + sha256 = "a87b9f9b3b028c15c1e1b37a15e6909f01e52f53f880c874d98ff762d8ff6dcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/cy/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/cy/firefox-126.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "eddafcccca339deee2cd0e67885692217f7c49141ffc64ca1a998bb935d45636"; + sha256 = "ff30ceff65bbca5abbbba22d7ec9723a368b3db62f7dac08f4ac9dd2c6505ce2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/da/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/da/firefox-126.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "d5a3a9ee1927f26b18ccf696aee7ebde30dd3ba439c9a376b4a6072d04756ca2"; + sha256 = "426a00ba520924c5ed011b0f046f5e21a9abeb8db1f1015d5efecc47708c39d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/de/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/de/firefox-126.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "2d61def83c8a52b94828b14c2c8697c1b77106a4c16a7df1e9e258212d23b583"; + sha256 = "c7db7cad161da5c28ed40f4aeb37f786712516cc2697dd8cb505cb2be14ebbcf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/dsb/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/dsb/firefox-126.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "09f25336d1a46ec5cae5301d35e0573b205ccb3e1482c79b2f76db02045a9d18"; + sha256 = "ab530f570d5cb46ea1cd451365fa60b4a1872e14754363bd22f95daf85a479c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/el/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/el/firefox-126.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "4e055eda0cbc2d8c71ce472982b26ef0c0ebc20f72dbd0a1d6b4f0d50a4966df"; + sha256 = "89f0429e7a8985e65ba320094e1b2e9b1ed5cb38df609aa23cca7c900a0b671c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/en-CA/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/en-CA/firefox-126.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "5ab7b3ac4d84e949c47da2d3a77708847fe73214bd641562017359f71e254dc3"; + sha256 = "d0c8d0cfe91f897bba6502bc7fbe385880db6e0af6fc93db8702aeb0eb09660a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/en-GB/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/en-GB/firefox-126.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "dc793c9a3161974ed1120572d6b65d3ca5a5d8947e53cf1d31da33d4bba6ca82"; + sha256 = "7a560bc7591e436bac570a287c4a18b8e8978eb48b022c2e21e74957e85ecc6a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/en-US/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/en-US/firefox-126.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "1a7a16c2e75bfbd0e318095c259ab63fa0c097005b872d93885539c9f186ef80"; + sha256 = "3d49a8a3655d8502f7538f67973a6d7099bf4f2579f4519a48177ced50795ccc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/eo/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/eo/firefox-126.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "bc78e75ccaa66dea4f2b8585dd2ec8217ac065058defcb991dc6628acb16c3cb"; + sha256 = "67c107f8a0d98a932e25de900f934c2e377dd3edbf1b8cc5554f13271d89a8aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/es-AR/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/es-AR/firefox-126.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "da954c777d0441c30c6b292ebf8fe316e7b52d75a76602bf6502ba4677c1cb64"; + sha256 = "6c8e6be51abf98ea214983232077947a7ae80dce47c92aa651664c43fc2b6e71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/es-CL/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/es-CL/firefox-126.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "c4282cba4b588da12708921ed5c3998f24d4d81790a677090c38529c297867bb"; + sha256 = "2296eb97d6990dbb9ac1a4a2a66e8398ad2f36d54cc7bcb5b686f72cf7ebcf83"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/es-ES/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/es-ES/firefox-126.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "15a1fed207e2c14e962c4e2eb8abe3cbc62d0621656b254675befe3d974d3cb5"; + sha256 = "7122c71207f430b0a4a4f802220ce569f820f0461e2f92dd14b9b868cfa4bf56"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/es-MX/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/es-MX/firefox-126.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "a962e53d6902ec7017ca3a8521c6b5730e7a7ae5244356c4d6d9117e50b37ebd"; + sha256 = "ee3bf12d3230c287f934db6e5368d90651c976a4c8177dc1e8dd134f587e42a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/et/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/et/firefox-126.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "9e58939f49650dcf0f0267d586919a3144eeec53ae58ef548613311bde905eb5"; + sha256 = "4297a9954af8145e8f938dd236dd8ebec126edda142a6dd73e94f70a0375de3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/eu/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/eu/firefox-126.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "b5427601b225370def60f93e2f8cefe9600898183f0c184487bd95f8f86d2894"; + sha256 = "41a02f5f530e9e625524a1f370856621c9cc0e04324ef301f889454c251824c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/fa/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/fa/firefox-126.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "38fb2703b0e7fa9788aaa42dd1a89eadf616924c116f1b67b07f3d5df0963962"; + sha256 = "36d5a5d3d616e184b29227403e333d0f3dcf6ff226bdc1c022ccdcb432fcac2a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ff/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ff/firefox-126.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "a7b764758d16c901511062065eaa6e16414d777d8eea315424f19eecf54ef5e0"; + sha256 = "4dc033065adaa117a44366f9ea31c657d2f236e553fa925e0b4fb9622e092b0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/fi/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/fi/firefox-126.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "153ce3d7f4ced7a280bbb5bd539913a55f6c0790fe756e8b5335539ac651f7e0"; + sha256 = "03adea0ca2fe7e8408d81fa9105226d113bd66bb75be5b18c3eb640f71807c82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/fr/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/fr/firefox-126.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "b5aa0cff2a5493bbb816ae12f43ff79354a4946c1649173de767b1cf543a427e"; + sha256 = "bea2e88d69f51ade377594ae02ad9751db7d1d886bce28b218715299e210dc5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/fur/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/fur/firefox-126.0.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "d4884765fa3c28e7236a6624aaff5f874c4a155b26d0b70d481109fea5159c84"; + sha256 = "7eaff23205978990eea395299d1fc9609b8bd6ac15c87a13df83abd14d76f88a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/fy-NL/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/fy-NL/firefox-126.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "49ebbe560e1960d34a2ab3258c05913ccc1d5bb60b3644dce6f4370733d7a59b"; + sha256 = "baf7d3fe44f6d0b3e334365b44327b2c8225d94010f2238477ce2db66a31dceb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ga-IE/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ga-IE/firefox-126.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "13d06ed7c8c73ecdeeb071a02d7aab98796927812127527be5f3b5fbcd9ea487"; + sha256 = "bdf605c386888ea39e244501e885ac5f51513093e33c3038c5d87ec2f742c49d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/gd/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/gd/firefox-126.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2435d0910e347581e1ff60217fd517b78e0464adc0d2b35b803bf8f83bf6d993"; + sha256 = "662eae8fb0d725472d3de3b00a95b26210a0b66de584184bbf2475f85d54332c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/gl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/gl/firefox-126.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "cac5e02326f5ccdfb88e9cc1bdecc1060585b3274028f9050422834ea5559ede"; + sha256 = "2e33e5f0e6d6e7224b85dfa1d55cb648ee35d85b5a12bb06a8a442a4e71fac8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/gn/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/gn/firefox-126.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "addcb8beed0a341c6eafc4894d11a6b3e8ff9c69c60442d674cac5dfa4552eb4"; + sha256 = "e306c867a303068a203df7f157426f376db22e40bdef19913e460c5ddfb6016a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/gu-IN/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/gu-IN/firefox-126.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "2342dc7b3996019edf66375533e5dd46e94db1cb7e37635002f3f7826c7b35cf"; + sha256 = "22fac69fc82f18b5927460c8fd438c9d964329a39538cce9c3cc944022873808"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/he/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/he/firefox-126.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "a6026c597c8f917006893da69998586b704b5ea89687a5a4f57f4fd1c6060c22"; + sha256 = "d448d9d47536b765193aa9e0132a0a2dd6cda3a5812cce11a7538abd4fdfdd07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/hi-IN/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/hi-IN/firefox-126.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "12d8bc4072ce6118f50aea48f1d0cf19ac2cde7a43b169dce92088058ee135c8"; + sha256 = "c668f9bf4e3901d7d6eafbb29d6971d8f28dca0b327d7ae6d31eb337446edb15"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/hr/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/hr/firefox-126.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "fa93237908e0a30fd911a2208cb1734d0480e9514877625fc7bb8a0a4f5eda89"; + sha256 = "d7834cb0075cef6545dc8e4894e734e83e4c258ae34ecdec570959a11d121b95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/hsb/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/hsb/firefox-126.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4936df4e7258830565e0718fe89375c8876d5318d65e92995a104498a0353846"; + sha256 = "edc6ab5329bf6242ed178d4a8cf908f83c34036b7a44d223a2389ce1b94f75b9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/hu/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/hu/firefox-126.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "2e87fc4c2965f25a0826348b1bb8296bb037c9213cfa4a7d86e65421b36c4527"; + sha256 = "3552897a8e67dbca66ad8fab1da93111b74e97d2e073b901f89e040458b6a1e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/hy-AM/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/hy-AM/firefox-126.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "8a7660e5a5f5755daab77fe4bea805bef9124b3d7e1ede72f3f2b3ca0094b5db"; + sha256 = "e9280a2dbafea3ffd999d06640800c8be1d4d49bb417c4c22c98df62efaaaa27"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ia/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ia/firefox-126.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "883a6bae7c4e2f72cb4bb1bee676058e9093d7069bccad29fab329d873d68075"; + sha256 = "ae4f4754f9a839359cd9ddd1103e5f6c13b836b8d605f87c7c9ec50195397958"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/id/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/id/firefox-126.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "0a2de5d0a841481f351d2f4e26fb4cf56592d580075b5ff08054b661e17bbacf"; + sha256 = "6b620340c38277530507c3c163bcd194d3984fc42bce73a20118acf9e1d24104"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/is/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/is/firefox-126.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "33376b28936467ff5c3fff5898ae1eeee882dd15d34d8d42b9010981cd27d53b"; + sha256 = "72e4a73a842f03d8487907a8af71e4f40c6655dd78c38600e80b90857aa1c01c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/it/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/it/firefox-126.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "37cc5b95d46d637633d7c368350683ab2e63871e7b8f574bb50cadec80adc558"; + sha256 = "316f3475bec0daee2646af4bbc73b7bb1122644a3165b7f0a332af16369b6c6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ja/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ja/firefox-126.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "4feb22e07f2a536bf18c5cd9dd82a1b60e9d846f81d08326b119b19212088ba9"; + sha256 = "ce4db4762e09619353bcb80f1281fe75faa216a6995f8d0ecc369c2e988340ec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ka/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ka/firefox-126.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "e786417de882825c05b8385855eee0580cad0f64a14eec53966d90108c42d524"; + sha256 = "47e20bd8415b81a47788aa224e2eaf7086a96d6d586eef9b21c0c1a8e59dc172"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/kab/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/kab/firefox-126.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b58f6d29cb6ebac1407cf46bce238f80f56c60e4b400fc6beb9fefdaff19aede"; + sha256 = "81036648ee991ddc851a70a9242b567159324b13809d04735f11c81e1dc8f3ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/kk/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/kk/firefox-126.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "8d868c1553a1c8708f166d6b99cf0fede333366994c46d490014cf15330046e4"; + sha256 = "86d928d9e42569fbc2862d6e14150da4ef35243016753b3d982fbba5bb6baa2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/km/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/km/firefox-126.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "deafa1829c27ed270718effd342cd9bc26453e5e6f64cdd7c83f0a86dec3533a"; + sha256 = "16b24d02899cd2bd1a7958b8b0f56bdd231ceb4c3c0c987e19d219d93af29435"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/kn/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/kn/firefox-126.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "9a19b06844c60e9d4d6348c6b207273378228a59f1a831c9eb99e1073eba2a16"; + sha256 = "4cc091be288f7704f4c270bf982ac9f2f309979c92c435afe36fac6af1951d03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ko/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ko/firefox-126.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "bf79f74b659344291a745fa62aa726401f8c84369a96c0a13eb66be9bff2368d"; + sha256 = "bc81fbde00f8f47e58bd1ca871ec9dee8bc6763df67f5f32b70af31007369a79"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/lij/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/lij/firefox-126.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "41c8b57d4426251b33c7d528cb23e635b22d3b81c4188c6844a39e87800fb9bf"; + sha256 = "9d3aa0c4fc3e14b0fe5180d372b374a83fb375d859ffd55d1be369ed0b5bffdb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/lt/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/lt/firefox-126.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "34c57fa25ef83b9f6747e61eaeb4a98b312ffda9bcfdfb761392c94565e41348"; + sha256 = "07318635215f2c399e5cc9178f181b36a0884e6e96e2059e4a5b88bf0b6c2051"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/lv/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/lv/firefox-126.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "173afd7c09962de9af491917b7c14d245e02e6c109f69b9b7330466515dd1549"; + sha256 = "a2467dce574e6bb646d0531c59fe22f49178994b3b204f11c607c6ce709c6cf4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/mk/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/mk/firefox-126.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "b2ace494099bffc7d70d074197d1e4b0a9a387e553e4fffb31efce7d5f89053d"; + sha256 = "3f13386ac308a6f2572931501cf6322592ead6705ee8a420249f0030e284404d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/mr/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/mr/firefox-126.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1d4075ee01d742d9d846a9cce63847baf5ad749d260e7d2018391719e3478200"; + sha256 = "b57bd92eabd3820d5be7d660eb774c210781a89f20d9e48a5739ad16af723cca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ms/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ms/firefox-126.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "aa9012aa1dab8a1da2b4d21743fb01e2cae1322873cd67113f0d3298cc7b62e6"; + sha256 = "704232123025b3ad2cedb0eadb8edaace22c01d3c62fbd3b27e5c9d2495c9530"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/my/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/my/firefox-126.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "a52f0bddf09a9381616ee91246a2bbf02112bbe7d8e651a75bf71bb4ff0a55ff"; + sha256 = "c07bbe85128366dd95ecae97ab00821b5be4c39442428e483c3cb434e536e790"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/nb-NO/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/nb-NO/firefox-126.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9c221603c7cbe51e53e03bceb2bfa64b51bda3935f8d59f995270297dfe435b5"; + sha256 = "c079d995c6bc2e5be20ebb4ed1ca76179bce17c4eaa4e47c39ba67ec50db0268"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ne-NP/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ne-NP/firefox-126.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "026fa9b87a1fb8cfc347aee7edd09cf07433d2febb6bc7284c90942aeea886cb"; + sha256 = "a8f3ae15f481e2a2faa41330571a30464e38e070ef27ee18bffd27628f5c05a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/nl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/nl/firefox-126.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "5454546bf2eea2e8785ec994302e9d8d9f3468a89cc5be1eaf491132f8449deb"; + sha256 = "d0a70bd54c185f6edc93a6dd1c93b28fceb6c9a1af3e91cb78b131fb69d05023"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/nn-NO/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/nn-NO/firefox-126.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a71e340f55985cf76a5e768ee63c5d9fe5f5a68334642f34062324211cc48b2d"; + sha256 = "05eeb23cc7154dc3dfbf99493bab95739f36eb52e2129b70a0cc32b4c2d67f7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/oc/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/oc/firefox-126.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "441a44314d02b9e54e86b0fa1b8049ceaad7bab7b66e54c0a841f8d624ce76aa"; + sha256 = "80e59358349d1aea78f12b67674faf8f5fb6d23bba27cf9eb49ed55bf57e331b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/pa-IN/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/pa-IN/firefox-126.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "b72d31b37d4f6d7798e96c6685512814c991a987253767aad79cf515012b057f"; + sha256 = "f3e2b5c2c044f74910b14e2a6594c5c0a91b1b0e19b8d18e557ba9b1643c906b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/pl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/pl/firefox-126.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "1ae017de12a7faf49b06c9c4bab7e20e776e5fad1430fb0e7f9af519739659cc"; + sha256 = "8730e394f6362c9f2118f90c8f32a490e4c2b7fc4da55db0c5901e4e31a17a9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/pt-BR/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/pt-BR/firefox-126.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6a5f5afb1b3e4f71dffa20ed5ebd3037b63bf127cf9daf09291bf62d9e8a093d"; + sha256 = "82aae4a9eecba2ac0c2860019f80b44a70b53290476113ce66a595f4d58f767c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/pt-PT/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/pt-PT/firefox-126.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "64763768287dd897705be573e01a61c06c916bd413f8d6a1fd47a64f0d918c09"; + sha256 = "92eefc83ed6c748bdec86441423bd33061278a98b764d5ef28c4eaf7a9256efb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/rm/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/rm/firefox-126.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "4ef4a5c3180e3432f7b9380deb84df9f816eaf4ca333c93cfce8e0a52a1cd39b"; + sha256 = "71cda80240bd2ba45b7d66ac7a31a06e5a2132285cd3148aeaed39953feb2721"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ro/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ro/firefox-126.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a89a97ae37721ea57f0e087c430dea88ffdb43b1a4b823cd9fff6e40faa46d81"; + sha256 = "8e9268fa43b051519eab3212d90feabe74f50b4f3536fba436f4fc0824df6be5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ru/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ru/firefox-126.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "93dfb081232b4af62d9cd4826501832dcd90f1a91dbafa9efa5be2a094eb2df7"; + sha256 = "10e846b452a32a9e14568dbd9f0d00471a09045eee5b0fc265752ac52ee52681"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sat/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sat/firefox-126.0.tar.bz2"; locale = "sat"; arch = "linux-i686"; - sha256 = "33292fec9a1ac64f7e0b18758de38af19a19d9dbc437e8fce7f8fa20bf58da98"; + sha256 = "fa83bd09a708f8a2aee2e22260fb79606a1d045d8330af3eecc69cb33475f17d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sc/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sc/firefox-126.0.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "368600cf67e645dc9eed1835ead1eeebda974b1fc2ff5ca8ce3a65047da402f5"; + sha256 = "59d1738d837c612f9738dae172197052817890d9640dddbcacb732cff837f88c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sco/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sco/firefox-126.0.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "20db2d38c151893b43727af5016b7f48684aeac4e66386a99cdb7f640678970f"; + sha256 = "615cb45683769a02a78cc5158b423e5449977aa325ae0553ae3c1b91097643b4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/si/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/si/firefox-126.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "56f3baecb795a6f99f52ac4749d9b7e69222f43a847fa5e26363a656fdfad8e0"; + sha256 = "978b8a33535d159848db81e8d67ea96bcc804917be437c123cd7d72eef644436"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sk/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sk/firefox-126.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "7c7c25a7426b1f3b98d5aa86433237bb4e7d9f4d4c74d3302966783985a6a067"; + sha256 = "09c76c363fed0b85c603cb6a038863aecc6ec8bd9b6536c5fe46178e94148c82"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sl/firefox-126.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "43d59e1d98e772336eafd0a2d9eeb5ddb17ffe2e21b41ec8501d5f92d01e33bf"; + sha256 = "9c7e786634ae4de0d1745f302dc8b1bb7f02d25cbdbe0aefd07cd4e387042b03"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/son/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/son/firefox-126.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "561fb6ac615a92d24229f33be1bec0c40c593eb46bdd8c5b0f916ce72c7ae0c7"; + sha256 = "9049588a9910c85767e4c501d0361be434f678b7390395dd7ed89b3d6127da04"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sq/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sq/firefox-126.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "b58d25f1a89ffda900b77bda85b8a0b4013009d07756f1e80c2f464b4f00e9dc"; + sha256 = "73637bf2473d33658fb2650129cfd321e07912ab4396e4fe3b2b96f1c5a2f7d3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sr/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sr/firefox-126.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "6efb25e0762457b7738ce878830a236543d8ac3e27eb26fd92038f83031980ad"; + sha256 = "6ef94639d56fe3542c0df18b0fcd54284b102aaf769949f252f09471c7c5b9cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/sv-SE/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/sv-SE/firefox-126.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "01e408103e812278d0c81b3acef7045636d64999237dfeb74024e63f640084aa"; + sha256 = "cb6e649a40b53ecaf7460ab1527f37ea69250c7cbae4441aa839b857a858608d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/szl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/szl/firefox-126.0.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "940138fe1ec2f707f153147db6b6e5eca9dce191ae8765a52662cc89d9e18fe1"; + sha256 = "2fccc546c7fdaa965902618eed57a2a18cea2091130950c483f1b982f972d438"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ta/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ta/firefox-126.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "d90039aef7fc7e56e948d4af079f3edef5b65588ad5fd650cb70f59188c758fd"; + sha256 = "52bc70dd238c6b099549b5e704ef12e7655cee23ac577671d27685c479c4045f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/te/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/te/firefox-126.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "1ad8d8e42c691566cf1d082464f5c32e8ecef628182ff4dbebb4482e2eb33465"; + sha256 = "f819512f4f0428f732115c1587aa876a7374564b606e9581c3d405c9273a8d16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/tg/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/tg/firefox-126.0.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "4c6974fcdc6d55662073b259b4891472eae22f79aa718ba6f13e73e54f97ca42"; + sha256 = "278142e32bd078092e69dac8ce8b1d5d88d1d7adc13abf681d6d53c5d97a8784"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/th/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/th/firefox-126.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6725c41f5465bf1a1731154654bd6e0a8aa9b5175e1e7f64ae719e8b1fed0057"; + sha256 = "8443f0793f817568b002aeb436423793108594e2cc43da929ec48079e0fcfd5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/tl/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/tl/firefox-126.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "6e7dee9256a30aec0c7fa67cff5d3b295bd45f417a0d02f34cdafd2fabffa6b1"; + sha256 = "d03a4714b86f5f0dfffb1b4780b09862653266eb3736a7b0630784bd3a6c739f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/tr/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/tr/firefox-126.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "fc1f91da8f5b30301a0f3238b6dde5e0accd314f6fe43d18715b786a2917d8e6"; + sha256 = "1f87ae9443c4fa9a8d4616e2de1fb799c0fa1b95b37070e669db475f5de9be28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/trs/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/trs/firefox-126.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "ab8cf88696df73b802f6dd6f42c33172c35685af462e92e2fd161ed3307c5fae"; + sha256 = "b9f8c5a2ecd83b4bdd6f5e26037f8aff0d9b2ba7abcae08b7868c15ddcc38def"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/uk/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/uk/firefox-126.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "40fd34bcbef5937190065db1769227ae05fe29d7df65cab96b4b47b68acfd0f2"; + sha256 = "566d6daca65e49cb8280dd64716e7ba3b9f00baa995ddfe31f847166ef70eb2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/ur/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/ur/firefox-126.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "360c8abcfc50fa78f1115973f152785ee52f1ab9a8e512183df7e7f6f9099ae9"; + sha256 = "530b7cd6338c09f1c92cf7eb8f0e5fa150d4477913f14257a18567e325d8c64e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/uz/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/uz/firefox-126.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ac301677aa02e5e8f4ebbf382b511b9a7ee07036e7f74726ec23dfae2b82614f"; + sha256 = "b525c6a6ec58ded4b637299832b3f1542d1f17958bc2f9074e05d1e96303d4cd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/vi/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/vi/firefox-126.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "78964ade29f3d8c3d664be9a634ab6f2e7c33100d08936de4b813b7718946d39"; + sha256 = "dbeebc029258ffc4678ae05aeca5cf43e634413862deb2b10d21fcd96039ca7a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/xh/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/xh/firefox-126.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "3692b2d980105d1d1640c0dfaec52df29cc5c5b3868250aee6c011d9e3a95963"; + sha256 = "05029e34aa21b1b1ee1a02ca13afdc2764cb0757fdaa533a8fdbc633d6bd11ba"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/zh-CN/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/zh-CN/firefox-126.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b9c137726f279abef9f86e8f2889465d1f9f2bfd34cb7008471a5c7e5222fd78"; + sha256 = "c528f20f5ff5ac5353997f474ff88fb17834e6c913b1e2bf2af9fdaf837bc031"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/125.0.3/linux-i686/zh-TW/firefox-125.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/126.0/linux-i686/zh-TW/firefox-126.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "a7cd7f510e92be7608a405ee7048becf1e2866dc0153434e465fa3f381921ad1"; + sha256 = "03edbb562a60417320469ae06a632ec6c302d420a6565f2a25acb3e3b4e7e61d"; } ]; } From 3e484010523af154820015fafdd207f75774469b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 May 2024 01:13:13 +0200 Subject: [PATCH 118/246] firefox-esr-115-unwrapped: 115.10.0esr -> 115.11.0esr https://www.mozilla.org/en-US/firefox/115.11.0/releasenotes/ --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 6e2642d4e0ea..cce98c4a6853 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -94,11 +94,11 @@ firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.10.0esr"; + version = "115.11.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0626e2c68ce43f24dfc2b9216e2565537ad8781daf4195d53420e1b78d57d0f6360fbe56b0ddbedae3818546c72472c85c1ff2b208c123d32a0543e666f42b65"; + sha512 = "0f3a87c99fb008088afd509d9259f893fdd44ea6bf6a5e69806fefb8d355415e81b9e8832a392acb9d0c1c50e4add7f1362a4aaadc35e1d9c2e55baf7136aed8"; }; meta = { From 476a299a2b8815d1c139ec2b27090a823758050f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 May 2024 23:37:49 +0000 Subject: [PATCH 119/246] moon: 1.24.2 -> 1.24.4 --- pkgs/development/tools/build-managers/moon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 08beabc6f74a..5fa78bee1dad 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.24.2"; + version = "1.24.4"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-G1SblnbT0goOsefEy1QbCkp32JKs0usfKMWDsn3k7/M="; + hash = "sha256-LOUACki6uG8jDBI2eOO0C/tQrJ7L3aehwo+4pe9ONgo="; }; - cargoHash = "sha256-z2Kgo8i6fk3sfX6bCBmyqIfFSw75v4NhnUFSBKJQwXs="; + cargoHash = "sha256-kTLWWtAqoSTmVBHYJKMUsV8jtSYzgERkSErLRMmZI7Y="; env = { RUSTFLAGS = "-C strip=symbols"; From d4162cbef22becad8aeba27ef40cf99bdc2bd534 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Tue, 14 May 2024 07:46:53 +0800 Subject: [PATCH 120/246] tenki: 1.9.0 -> 1.10.0 Changelog: https://github.com/ckaznable/tenki/releases/tag/v1.10.0 Diff: https://github.com/ckaznable/tenki/compare/v1.9.0...v1.10.0 --- pkgs/by-name/te/tenki/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/tenki/package.nix b/pkgs/by-name/te/tenki/package.nix index 097c5823a220..b4a1d22a7240 100644 --- a/pkgs/by-name/te/tenki/package.nix +++ b/pkgs/by-name/te/tenki/package.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "tenki"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ckaznable"; repo = "tenki"; rev = "v${version}"; - hash = "sha256-b9tByEuZ7mdPJVGgyvCnf+pyBKhO7I/B/Ak8MtM5qhU="; + hash = "sha256-+04rQt+hQQan85k1AxnVaQN2xfWWrJII+GdLMSn+cck="; }; - cargoHash = "sha256-WvxO5muh0IGHoZr/ahE9rHs+MiXLGnQq3dgz63TwFRc="; + cargoHash = "sha256-/ygw6bCJEeTmrG8XXMhoMl25NHK4E6mmML/V+E8e6UE="; meta = with lib; { description = "tty-clock with weather effect"; From fcf2ec5d1a3681dccf2a81811d4d9fed62e73edb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:00:08 +0000 Subject: [PATCH 121/246] poetryPlugins.poetry-plugin-export: 1.7.1 -> 1.8.0 --- .../poetry/plugins/poetry-plugin-export.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix index 67cbae28e843..08b94a0fd227 100644 --- a/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix +++ b/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "poetry-plugin-export"; - version = "1.7.1"; + version = "1.8.0"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HXzlfiZYDkrQRFXF1up52KrwGhrIctd3CtjQTNz8xH4="; + hash = "sha256-ZXhj9FwCCNFMzyoAtQTD8bddOvVM4KzNtd+3sBn9i+w="; }; postPatch = '' From 84340406eb2c0f00caf708b7cf5d6b34e45f0c2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:29:04 +0000 Subject: [PATCH 122/246] go-swagger: 0.30.5 -> 0.31.0 --- pkgs/development/tools/go-swagger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index 5a536db51c22..9319bd499758 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go-swagger"; - version = "0.30.5"; + version = "0.31.0"; src = fetchFromGitHub { owner = "go-swagger"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-38Ytv/mQVi0xTydFTPNizJIjYPL+lOws6jHsRjxSC4o="; + hash = "sha256-PeH9bkRObsw4+ttuWhaPfPQQTOAw8pwlgTEtPoUBiIQ="; }; - vendorHash = "sha256-TqoTzxPGF0BBUfLtYWkljRcmr08m4zo5iroWMklxL7U="; + vendorHash = "sha256-PBzJMXPZ2gVdrW3ZeerhR1BeT9vWIIS1vCTjz3UFHes="; doCheck = false; From 6a78f9e95eee4fc0e013e9d3614edd2164bc9169 Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 14 May 2024 02:33:16 +0200 Subject: [PATCH 123/246] chromedriver: 124.0.6367.201 -> 124.0.6367.207 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index d3f4d9c14ca0..b67f9d49bf98 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-jnWmH6MzqZzzIAblvJFv5jKFJ2LILyGy+eOqb6sWmWc="; + hash_darwin = "sha256-00582jnlAkVkqFsylZnTWfHh5TJkz+m9W8QCXYKerfo="; hash_darwin_aarch64 = - "sha256-FO0kncAPj/cBwlGN2RdFGR7Bn5pKzTRlf2IQ422mm5c="; - hash_linux = "sha256-3khPV+WPcYHrlGNFXhmRrja2+wWsr77BVgHLbSe0IF8="; - version = "124.0.6367.201"; + "sha256-EV45I6lav93uMzgZkjypq1RazqtP1W8w8/c4dVZ5hjI="; + hash_linux = "sha256-xCizRpHgcent3D/tMBK+CtXiwtTdH61fja1u8QyECCA="; + version = "124.0.6367.207"; }; deps = { gn = { From 331571e31391985d826d3b0856576b7e400026e7 Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 14 May 2024 02:33:47 +0200 Subject: [PATCH 124/246] chromium: 124.0.6367.201 -> 124.0.6367.207 https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_13.html This update includes 1 security fix. Google is aware that an exploit for CVE-2024-4761 exists in the wild. CVEs: CVE-2024-4761 --- .../networking/browsers/chromium/upstream-info.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index b67f9d49bf98..b3758b5abf82 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,8 +15,8 @@ version = "2024-03-14"; }; }; - hash = "sha256-nSI+tkJxOedMtYgtiqW37v0ZjgxxU5o/0sH9bPAchBg="; - version = "124.0.6367.201"; + hash = "sha256-IeIWk4y1dufEnhxqvZbQlFVD8dsoceysiEHqJ2G4Oz8="; + version = "124.0.6367.207"; }; ungoogled-chromium = { deps = { From 4ac880061a691b9a43412fae9f6c539f0a0bc20d Mon Sep 17 00:00:00 2001 From: networkException Date: Tue, 14 May 2024 02:34:14 +0200 Subject: [PATCH 125/246] ungoogled-chromium: 124.0.6367.201-1 -> 124.0.6367.207-1 https://chromereleases.googleblog.com/2024/05/stable-channel-update-for-desktop_13.html This update includes 1 security fix. Google is aware that an exploit for CVE-2024-4761 exists in the wild. CVEs: CVE-2024-4761 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index b3758b5abf82..1c0daf237292 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-03-14"; }; ungoogled-patches = { - hash = "sha256-fy4SydGRRyDhJZ7IADG54+rGWh2i+2SrSkuCglphhm8="; - rev = "124.0.6367.201-1"; + hash = "sha256-7Z9j+meVRZYLmreCzHlJe71E9kj5YJ4rrfpQ/deNTpM="; + rev = "124.0.6367.207-1"; }; }; - hash = "sha256-nSI+tkJxOedMtYgtiqW37v0ZjgxxU5o/0sH9bPAchBg="; - version = "124.0.6367.201"; + hash = "sha256-IeIWk4y1dufEnhxqvZbQlFVD8dsoceysiEHqJ2G4Oz8="; + version = "124.0.6367.207"; }; } From ca83033baffb66647a717036074c14aa851baa5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:36:38 +0000 Subject: [PATCH 126/246] homebank: 5.7.4 -> 5.8 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 116909d9842c..0e9531b61d28 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.7.4"; + version = "5.8"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${version}.tar.gz"; - hash = "sha256-Qs5xRsh16gyjyTORtqm/RxTbRiHGP0oJTcxviYW7VOQ="; + hash = "sha256-tgjcz4znnw++5lBoJDWtHKpRFENfM0xBpyhGf8nAACw="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook3 intltool ]; From 3e989adfbefcf83b6e90fc3b9e03022e4e955162 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:42:44 +0000 Subject: [PATCH 127/246] rambox: 2.3.1 -> 2.3.2 --- .../networking/instant-messengers/rambox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index af5f6ca321c0..3d08f29984a3 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - hash = "sha256-fSj/AX1uCUAC3Vg5+rtGF3IDPFTHRAgJ8CPVL8BYc+E="; + hash = "sha256-9AGzhj4UL2rEe67qvkX5VYhQEMETGYSDWv5XOgABSEE="; }; desktopItem = (makeDesktopItem { From 18c696cc6e7b6f8e4374668d601fd011705a86cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:50:44 +0000 Subject: [PATCH 128/246] i2pd: 2.51.0 -> 2.52.0 --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 6ee9bafb6125..19c14a7c7ab0 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.51.0"; + version = "2.52.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-qMdlB7SyiYZcZL1DBDKXNUXlPnHcAxkAxUFpFrLs1go="; + sha256 = "sha256-0n3cPF3KBuzNOagrn88HeTvFAu1sYTkijpiGr77X5GI="; }; buildInputs = [ boost zlib openssl ] From 22092f3ee6908776d4ed8533e2802d6e7f2511c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:51:33 +0000 Subject: [PATCH 129/246] stripe-cli: 1.19.4 -> 1.19.5 --- pkgs/tools/admin/stripe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index d8e2251bb13b..90824795c040 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.19.4"; + version = "1.19.5"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - hash = "sha256-pcDlZQCVy1xy8LZ+S5JcGNoiw1Px7C4U6Pn1pe31DoI="; + hash = "sha256-gunLbZOT0cnWGxc6714XcPdHJVK4LbDBwC2zt03WrUM="; }; - vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew="; + vendorHash = "sha256-xFWU+OazwLTb5qdFeYth1MlPJ76nEK4qSCNGVhC/PxE="; nativeBuildInputs = [ installShellFiles ]; From b1b6e6113e283ff505c194690926c5fbc5b2c687 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:57:33 +0000 Subject: [PATCH 130/246] flycast: 2.3 -> 2.3.2 --- pkgs/applications/emulators/flycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index efe091087927..6c598c5f5128 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "flycast"; - version = "2.3"; + version = "2.3.2"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; rev = "v${version}"; - sha256 = "sha256-o1Xnyts2+A3ZkzVN0o8E5nGPo2c2vYltMlHF4LZMppU="; + sha256 = "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU="; fetchSubmodules = true; }; From 4a35c38b873bc3ef4c9d61a0e98fe5ad6b11cf6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:58:06 +0000 Subject: [PATCH 131/246] bearer: 1.43.2 -> 1.43.3 --- pkgs/development/tools/bearer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index e735df312029..ce448845d3e3 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.43.2"; + version = "1.43.3"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-F7BToROR8mcINmIVz7J6xRSyLDKQyUyp7o1yQVVHdp0="; + hash = "sha256-imSXfub1dn1Q0C777uMDAVoCP7glmvhMBvQ0HC/9CRE="; }; - vendorHash = "sha256-g0AnL6r3dUfCIAytTknAD5aCPBsohDUMNfMAYKBebi4="; + vendorHash = "sha256-rRlOWQ5M+aNMsnt7zHphm/SQyvPBZUCWpZH1J7TZe28="; subPackages = [ "cmd/bearer" ]; From d371f364e1ded55fd90484707295450616ca178f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 01:06:33 +0000 Subject: [PATCH 132/246] gnmic: 0.36.2 -> 0.37.0 --- pkgs/applications/networking/gnmic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index 223c5c4beb02..4ecc4b044055 100644 --- a/pkgs/applications/networking/gnmic/default.nix +++ b/pkgs/applications/networking/gnmic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.36.2"; + version = "0.37.0"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-PUOIKPkzM6riiXR8R1Io0QI/qr6HaexfFgbp2Hx2SOo="; + hash = "sha256-PktDdwtdCHLgLVpCRLi+Rna7dO2JeAAT6myFesIhpYc="; }; - vendorHash = "sha256-zrG/rNoYtfVNN50g41txLQIcBAKi1yE5p1TODrDiXzU="; + vendorHash = "sha256-gxtVvh39VqJgS5VetnLpUyKJE8DcUZgn4MA8zdD/ccU="; ldflags = [ "-s" "-w" From d925bc899a4c14af7aac59f6e5e3b24915d8cc6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 01:09:12 +0000 Subject: [PATCH 133/246] aichat: 0.16.0 -> 0.17.0 --- pkgs/tools/misc/aichat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/aichat/default.nix b/pkgs/tools/misc/aichat/default.nix index 9b97546a2c47..a3b7307290ee 100644 --- a/pkgs/tools/misc/aichat/default.nix +++ b/pkgs/tools/misc/aichat/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-XNNiIjJfPsfoyG3RbxlcoUxsOUkWZ+3H3SlYenuNOIQ="; + hash = "sha256-muRUBBmhXtIbKvMzBISjoHFSOtYci6x9nQI/bUiEHrs="; }; - cargoHash = "sha256-JOkcqqmfat+PAn7mRHq+iQCF60weDOBWP2+0DL0s3X0="; + cargoHash = "sha256-RKyZOfjweSE83hAjBIve38CT9R2DomwW3qA8ezw6dCI="; nativeBuildInputs = [ pkg-config From cb5758a778cc1fc7b0ea569b6e5f7ff5a515b7ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 01:13:16 +0000 Subject: [PATCH 134/246] hubble: 0.13.3 -> 0.13.4 --- pkgs/applications/networking/cluster/hubble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index 76b53453dac9..10c10ec12ddb 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hubble"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tHkLUoccOUcUjODecy1QyeuDb/aXv67sK8JHJ1IspC8="; + sha256 = "sha256-YordxRIZtlYQprAYnH9Qn5ha6y7D52sjEOaRTcd0Z8g="; }; vendorHash = null; From 39a61da255cc954d1e5760d5e907001d997f0fc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 01:30:20 +0000 Subject: [PATCH 135/246] minikube: 1.33.0 -> 1.33.1 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 17ceb2e49288..9f13b3799bc5 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.33.0"; + version = "1.33.1"; - vendorHash = "sha256-eFIo9C9AEZksQolMlWKPJR2WWpU7Yu4eJb1OBwdqGhI="; + vendorHash = "sha256-VHl6CKPWqahX70GHbZE6SVa8XPfiC912DvsOteH2B0w="; doCheck = false; @@ -25,7 +25,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-4OSChPgUD1oYnChAi7r2jgZpplR9ZaHpHPiTS6jSpME="; + sha256 = "sha256-z0wNngEzddxpeeLyQVA2yRC5SfYvU5G66V95sVmW6bA="; }; postPatch = ( From 0b0653abaf59b728359bdf65b75c9cf4fa859a2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 01:30:26 +0000 Subject: [PATCH 136/246] istioctl: 1.21.2 -> 1.22.0 --- pkgs/applications/networking/cluster/istioctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index cd27e74a7ca3..8c80896d6251 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.21.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - hash = "sha256-U0SCjozy968pcXMGyUgM47VGYYNwPq8wOzTnKp49ZY4="; + hash = "sha256-xiIuCwzERvy7HFx9CZHen1tz1nwsTMryq5hB0om2dyo="; }; - vendorHash = "sha256-23t1xJPRip0ojXmUl1qlk6QJsYHT+9EAS080m6c0d6U="; + vendorHash = "sha256-de9cPm2MuflsOhFZfZmvZpLYiwt3UBgW+MO1Z2QB4F4="; nativeBuildInputs = [ installShellFiles ]; From 0d1ef1a839ce0f3282bf24bea2788b9ad659be83 Mon Sep 17 00:00:00 2001 From: aprilthepink Date: Tue, 14 May 2024 03:28:03 +0200 Subject: [PATCH 137/246] bun: 1.1.7 -> 1.1.8 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 03ae98ff52e7..38f926c22eca 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.7"; + version = "1.1.8"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-VDS01LVpTMl033tyUDk+efi0ShUyAXnZGrt33Nx2Qfg="; + hash = "sha256-n5ElTDuD0fap+llzrXN7de937jYaAG8dpJlKUB0npT4="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-lvm3jmlY6QkLJVFtWea3h7hARU1DEkunBQniPw563H4="; + hash = "sha256-4/kEyaF2kmu8MAjlrPgBqKFDId8bBibu3Zll3b0w8Ro="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip"; - hash = "sha256-3Kn4U0iX0RfNY/j919QjzRasmvF6A3elkmvrg9mMe7A="; + hash = "sha256-btyslaKqdk86whAnQV0on7NWTBTRTegFvMsOl0YyloY="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-J6eVZ6SVOj/9ZU3e2kEKZAnU63RKTLf7ef3V7nJqopA="; + hash = "sha256-JuDT+8FHbamdMVCDeSTGPYOvhPY2EZ9XeD2zjHEj36Y="; }; }; updateScript = writeShellScript "update-bun" '' From 75efe411e5e7db07fe316693cd9f2e270a93352b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 01:35:34 +0000 Subject: [PATCH 138/246] dumbpipe: 0.7.0 -> 0.8.0 --- pkgs/by-name/du/dumbpipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index 6f3074266947..1f19ed302610 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "dumbpipe"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-pvAB3kvnyNZ6N7bC8NIaSNUxcn9AfpEozYcczA+5zmc="; + hash = "sha256-NaN3r4Vk4SCdgfFgtyCgeMOyOCfxj15vLrXRmUKTAWM="; }; - cargoHash = "sha256-aHuRG1mLb18bra/iTddU3B4XjS5shheBqW1Hs+QMcJs="; + cargoHash = "sha256-Efuif2fIP20tXCq7bpa/n1lthvi0jcyYCpWM//qEHCY="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ From 9c21151cf0631ef92dd42b05271058c3aa49a265 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 01:38:09 +0000 Subject: [PATCH 139/246] pgmodeler: 1.1.2 -> 1.1.3 --- pkgs/applications/misc/pgmodeler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 05c641731c13..9293a732323c 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pgmodeler"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "pgmodeler"; repo = "pgmodeler"; rev = "v${version}"; - sha256 = "sha256-urKAsuYmK8dsXhP+I7p27PXXYRapPtkI8FqARfLwnEw="; + sha256 = "sha256-LDgRv7Todyy2pnE21Z0O5JQ6mE4ZO3THv6rfEWU66Cc="; }; nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; From 65b6f34941a43ebdbffc4d5b1968b238919b33bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 01:46:24 +0000 Subject: [PATCH 140/246] php82Extensions.mongodb: 1.18.1 -> 1.19.0 --- pkgs/development/php-packages/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index f74153ca28f7..8a1b224627d0 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -16,13 +16,13 @@ buildPecl rec { pname = "mongodb"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-php-driver"; rev = version; - hash = "sha256-GstDJShuwzXZqlzhLWMEkvrNgCdmORAkGncpmPe879Q="; + hash = "sha256-hog6bOKAhLwZMjrUD5yOJ607B1MLYaZJjq6CXIYPlH4="; fetchSubmodules = true; }; From b9940a4cf0957055733a0103f1ebef3f7161c671 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 01:49:07 +0000 Subject: [PATCH 141/246] protoc-gen-connect-go: 1.16.1 -> 1.16.2 --- pkgs/development/tools/protoc-gen-connect-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix index b5a0e80f0b3e..516aa5927b97 100644 --- a/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.16.1"; + version = "1.16.2"; src = fetchFromGitHub { owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-gYaOxUJzGcMKMrDdMou7mb66RVqChzSA1mc69O1zQv0="; + hash = "sha256-Ej8ya2sKtRVRQdMr63YpPbqzwtV0ZsqO+7xiif3gFr0="; }; - vendorHash = "sha256-+bWw4/ZqMeqnkXnV+vwq2mxgvew0KmLwNcu/xA2l4HI="; + vendorHash = "sha256-OKTRxExgJ2V3736fIVvQX3FEa44jGngwCi2D/uk0F58="; subPackages = [ "cmd/protoc-gen-connect-go" From cab14b52af731f6ce8f55d500d35878141976984 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 02:07:01 +0000 Subject: [PATCH 142/246] mympd: 15.0.1 -> 15.0.2 --- pkgs/applications/audio/mympd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mympd/default.nix b/pkgs/applications/audio/mympd/default.nix index d0273e1c6950..5d60783e0171 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "15.0.1"; + version = "15.0.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-rZfpGvxDV8KWGfQJ+mXsxLI8DIMSM0D9A3yrEZ+Zc38="; + sha256 = "sha256-Yz6gL87Vc8iFTRgKhyUgLL1ool+oinvwq2W9OjFl/OQ="; }; nativeBuildInputs = [ From 9f940170277ebb5a905be8d9028dcb7742f2d40c Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 13 May 2024 22:18:34 +0200 Subject: [PATCH 143/246] fzf: 0.52.0 -> 0.52.1 --- 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 ca415b5794d6..68c939d9d958 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.52.0"; + version = "0.52.1"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf"; rev = version; - hash = "sha256-RchZ798pUwQy8reHeJYrk4P09KVUwhVaDArvtpGV/1Q="; + hash = "sha256-cnLPn1AKq1BaWwXsWwQfC/lnejdyd1WdH1qIJRcfdks="; }; vendorHash = "sha256-Kc/bYzakx9c/bF42LYyE1t8JCUqBsJQFtczrFocx/Ps="; From 4b91ebb882dea23a05875d13bca163f502c3b9ee Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 13 May 2024 22:23:08 +0200 Subject: [PATCH 144/246] gh: 2.49.1 -> 2.49.2 --- pkgs/applications/version-management/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index c1f8a299dbcd..721038bef27f 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.49.1"; + version = "2.49.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-9Qr1goFmHV4rNEB849dF9+qEEMOWanCyAcNpXwuQxOo="; + hash = "sha256-RevdHBF/7etEstUhsTO9KVK45KTiJnhAhAZAamuEUwk="; }; - vendorHash = "sha256-FztCYs6db6f3niAru/vPpcze84nqwzspoJsdqmdkJmk="; + vendorHash = "sha256-9Rv1zPrtaxd00lbA3WrPIzIZ9IiKqZa/ppn37jqMP4M="; nativeBuildInputs = [ installShellFiles ]; From 0724597c70e3977f33a931df48b84feab72c9c4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 02:27:13 +0000 Subject: [PATCH 145/246] phel: 0.12.0 -> 0.13.0 --- pkgs/by-name/ph/phel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phel/package.nix b/pkgs/by-name/ph/phel/package.nix index 209f7bd8bbd4..a03d99147897 100644 --- a/pkgs/by-name/ph/phel/package.nix +++ b/pkgs/by-name/ph/phel/package.nix @@ -5,16 +5,16 @@ php.buildComposerProject (finalAttrs: { pname = "phel"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "phel-lang"; repo = "phel-lang"; rev = "v${finalAttrs.version}"; - hash = "sha256-5PMd87Xp7i3Q1ryKQWJBmNbU5TGo2LQ6uvIFP3T36vk="; + hash = "sha256-EITeApaQ1nmQb53/DrSidcmWUACapjTUuUYuJQDML0Y="; }; - vendorHash = "sha256-83GX/dxHa6w1E34wnJshg7yxlVyRkDT5jmAPCCqPdtA="; + vendorHash = "sha256-IWFOpsPcrPg2/QWemRJ8tP6k0sIc2OogETdiBFAQ5BI="; doInstallCheck = true; postInstallCheck = '' From 8161b0a31dca09a5d36ecf705ab92f974517737e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 02:29:21 +0000 Subject: [PATCH 146/246] python311Packages.jupyter-collaboration: 2.1.0 -> 2.1.1 --- .../python-modules/jupyter-collaboration/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index fb7ee63b8e16..c4ba4a6f051b 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-rqZT4ag7W/YtbD909MfknboDzHa2Z6OOHhN/cdww4gw="; + hash = "sha256-T1DCXG2BEmwW3q+S0r14o5svy4ZpDc5pa0AGt0DXHB8="; }; postPatch = '' From ce42fcd4fa88f1b0d37bb733dd003359e58103e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 02:41:04 +0000 Subject: [PATCH 147/246] rke: 1.5.8 -> 1.5.9 --- pkgs/applications/networking/cluster/rke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/rke/default.nix b/pkgs/applications/networking/cluster/rke/default.nix index 6c9cd4d9b0aa..ebf37e05e5f2 100644 --- a/pkgs/applications/networking/cluster/rke/default.nix +++ b/pkgs/applications/networking/cluster/rke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke"; - version = "1.5.8"; + version = "1.5.9"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-f1Ilf2HSsp0Ygp0fItJVd8iJq12Z1jw2WKmLR4NgUKA="; + hash = "sha256-JLP2fZALPJmfj8fCsEPT0S2xsZ1HNQlhORNNrGxxgVg="; }; - vendorHash = "sha256-/HsZAMPGCaM5Em6doC8qffoSEveX/yDNwAGog3I0+c4="; + vendorHash = "sha256-5SxRh9y8I0v3+lU4V9xGtbwWv6JmrvLmPX8TFKjvvD4="; subPackages = [ "." ]; From 1fe8866947cefa00b9205c341e6eac7d27a8a908 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 02:45:53 +0000 Subject: [PATCH 148/246] sendme: 0.6.0 -> 0.7.0 --- pkgs/by-name/se/sendme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index e73983bb0078..08b7c8d232b1 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-zUI9o3UWufl8NadwMeWsnoSuW8++tFw8NvzA6OdlkMI="; + hash = "sha256-x4RN/C/XMvpfsbWJTX5wDj1K+ADz2YIb/esAIEpFVcs="; }; - cargoHash = "sha256-NuPBoMSB4Dr26O9IspFLPBzoUJljDjGZCXRyUIxa3IU="; + cargoHash = "sha256-yeexP6wfhg2Ir1oJzaxMwRMen9M409MB4cNZ8fd6cHc="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; [ From f9cb16590a0a65359e2201dce5fdbff634b77619 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 00:43:25 +0000 Subject: [PATCH 149/246] alt-ergo: 2.5.3 -> 2.5.4 --- pkgs/applications/science/logic/alt-ergo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 9d151b947b40..03787a3a084b 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,11 +2,11 @@ let pname = "alt-ergo"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; - hash = "sha256-tmWLZBLfdmfYlCQq+zcUneeueDAE6AJeZMy8kfNCC04="; + hash = "sha256-AsHok5i62vqJ5hK8XRiD8hM6JQaFv3dMxZAcVYEim6w="; }; in From 696eb3a3307cd6b583200e1db0acaaac34b75d0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 03:15:28 +0000 Subject: [PATCH 150/246] home-manager: 0-unstable-2024-05-05 -> 0-unstable-2024-05-12 --- pkgs/by-name/ho/home-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index ea2057a39831..c2a9cd7fd6ee 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-05-05"; + version = "0-unstable-2024-05-12"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "3dfe05aa9b5646995ace887931fa60269a039777"; - hash = "sha256-QXpLmgmisNK2Zgpnu9DiO9ScrKJuJ4zmiMTNpObVIuk="; + rev = "44677a1c96810a8e8c4ffaeaad10c842402647c1"; + hash = "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4="; }; nativeBuildInputs = [ From ea710f5ea5cc6fd837a072462e4a12e994a39570 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 03:16:44 +0000 Subject: [PATCH 151/246] python311Packages.asyncwhois: 1.1.0 -> 1.1.2 --- pkgs/development/python-modules/asyncwhois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 084c9ee8d306..351e6b001506 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.1.0"; + version = "1.1.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = "asyncwhois"; rev = "refs/tags/v${version}"; - hash = "sha256-rJwJhSOFrZZ3WXEZmPMfdosBBW/R5/PMqs0QLnsPMoI="; + hash = "sha256-ESVgK4Z26OAamdHPEVxysnlJ0rEUlr8KNd24fawHuEg="; }; nativeBuildInputs = [ From ebbe2b868f010465c6e92237e139532d38123e79 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 11:22:29 +0800 Subject: [PATCH 152/246] gmime3: nixfmt-rfc-style --- pkgs/development/libraries/gmime/3.nix | 64 ++++++++++++++++++-------- 1 file changed, 45 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 8f20d756c1f9..9d45499f9101 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,18 +1,38 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection -, vala }: +{ + lib, + stdenv, + fetchurl, + pkg-config, + glib, + zlib, + gnupg, + gpgme, + libidn2, + libunistring, + gobject-introspection, + vala, +}: stdenv.mkDerivation rec { version = "3.2.14"; pname = "gmime"; - src = fetchurl { # https://github.com/jstedfast/gmime/releases + src = fetchurl { + # https://github.com/jstedfast/gmime/releases url = "https://github.com/jstedfast/gmime/releases/download/${version}/gmime-${version}.tar.xz"; sha256 = "sha256-pes91nX3LlRci8HNEhB+Sq0ursGQXre0ATzbH75eIxc="; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; - nativeBuildInputs = [ pkg-config gobject-introspection vala ]; + nativeBuildInputs = [ + pkg-config + gobject-introspection + vala + ]; buildInputs = [ zlib gpgme @@ -21,22 +41,28 @@ stdenv.mkDerivation rec { vala # for share/vala/Makefile.vapigen ]; propagatedBuildInputs = [ glib ]; - configureFlags = [ - "--enable-introspection=yes" - "--enable-vala=yes" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ]; + configureFlags = + [ + "--enable-introspection=yes" + "--enable-vala=yes" + ] + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ]; postPatch = '' substituteInPlace tests/testsuite.c \ --replace /bin/rm rm ''; - preConfigure = '' - PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" - export PKG_CONFIG_VAPIGEN_VAPIGEN - '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' - cp ${if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h} ./iconv-detect.h - ''; + preConfigure = + '' + PKG_CONFIG_VAPIGEN_VAPIGEN="$(type -p vapigen)" + export PKG_CONFIG_VAPIGEN_VAPIGEN + '' + + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp ${ + if stdenv.hostPlatform.isMusl then ./musl-iconv-detect.h else ./iconv-detect.h + } ./iconv-detect.h + ''; nativeCheckInputs = [ gnupg ]; @@ -44,11 +70,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/jstedfast/gmime/"; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; - platforms = platforms.unix; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ ]; + platforms = lib.platforms.unix; }; } From f2a46c429b67fcc45dec545cc37cce9b71018ce0 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 11:28:48 +0800 Subject: [PATCH 153/246] gmime3: disable failing test on darwin --- pkgs/development/libraries/gmime/3.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 9d45499f9101..b7cca3b156b9 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -48,10 +48,16 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_have_iconv_detect_h=yes" ]; - postPatch = '' - substituteInPlace tests/testsuite.c \ - --replace /bin/rm rm - ''; + postPatch = + '' + substituteInPlace tests/testsuite.c \ + --replace /bin/rm rm + '' + + lib.optionalString stdenv.isDarwin '' + # This specific test fails on darwin for some unknown reason + substituteInPlace tests/test-filters.c \ + --replace-fail 'test_charset_conversion (datadir, "japanese", "utf-8", "iso-2022-jp");' "" + ''; preConfigure = '' From bc4eacca8c7e764251c7640d065f60b300a742a8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 7 May 2024 08:17:43 +0200 Subject: [PATCH 154/246] =?UTF-8?q?ocamlPackages.ocp-index:=201.3.5=20?= =?UTF-8?q?=E2=86=92=201.3.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/ocp-index/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index 98e8b06e795b..1c8897cb3dbc 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "ocp-index"; - version = "1.3.5"; + version = "1.3.6"; minimalOCamlVersion = "4.08"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - hash = "sha256-Zn3BPaMB68V363OljFFdmLyYf+S0wFJK44L8t1TSG1Q="; + hash = "sha256-EgRpC58NBVFO1w0xx11CnonatU2H7bECsEk6Y4c/odY="; }; nativeBuildInputs = [ cppo ]; From 646c7f3be4b945500c20edb77e264c9ba75e073a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 May 2024 05:47:19 +0200 Subject: [PATCH 155/246] =?UTF-8?q?ocamlPackges.ppx=5Ftools:=20fix=20evalu?= =?UTF-8?q?ation=20for=20OCaml=20=E2=89=A5=205.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ppx_tools/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 7a07daf8ddcd..41db9313fe7f 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,5 +1,9 @@ { lib, stdenv, fetchFromGitHub, buildDunePackage, ocaml, findlib, cppo }: +if lib.versionAtLeast ocaml.version "5.2" +then throw "ppx_tools is not available for OCaml ${ocaml.version}" +else + let param = let v6_6 = { version = "6.6"; @@ -58,7 +62,6 @@ then buildDunePackage { inherit pname src meta; inherit (param) version buildInputs nativeBuildInputs; - duneVersion = "3"; } else stdenv.mkDerivation { From 2b9f51e102bea483b7fb80cdc07f14729d2bae72 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 May 2024 05:47:35 +0200 Subject: [PATCH 156/246] ocamlPackages.alcotest: fix tests with OCaml 5.2 --- pkgs/development/ocaml-modules/alcotest/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 0e459315fa88..d8310ce23eea 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchurl +{ lib, buildDunePackage, fetchurl, fetchpatch , astring, cmdliner, fmt, re, stdlib-shims, uutf, ocaml-syntax-shims }: @@ -6,13 +6,17 @@ buildDunePackage rec { pname = "alcotest"; version = "1.7.0"; - duneVersion = "3"; - src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz"; hash = "sha256-gSus2zS0XoiZXgfXMGvasvckee8ZlmN/HV0fQWZ5At8="; }; + # Fix tests with OCaml 5.2 + patches = fetchpatch { + url = "https://github.com/mirage/alcotest/commit/aa437168b258db97680021116af176c55e1bd53b.patch"; + hash = "sha256-cytuJFg4Mft47LsAEcz2zvzyy1wNzMdeLK+cjaFANpo="; + }; + nativeBuildInputs = [ ocaml-syntax-shims ]; propagatedBuildInputs = [ astring cmdliner fmt re stdlib-shims uutf ]; From 4b103239d743f36bb0c5fb9dec891a088a42a056 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 11:58:50 +0800 Subject: [PATCH 157/246] bicpl: unstable-2023-01-19 -> unstable-2024-05-14 --- .../libraries/science/biology/bicpl/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/science/biology/bicpl/default.nix b/pkgs/development/libraries/science/biology/bicpl/default.nix index 45d1b159d074..fd9e4f4003e0 100644 --- a/pkgs/development/libraries/science/biology/bicpl/default.nix +++ b/pkgs/development/libraries/science/biology/bicpl/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, libminc, netpbm, @@ -10,24 +9,16 @@ stdenv.mkDerivation rec { pname = "bicpl"; - version = "unstable-2023-01-19"; + version = "unstable-2024-05-14"; # master is not actively maintained, using develop and develop-apple branches src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "884b3ac8db945a17df51a325d29f49b825a61c3e"; - hash = "sha256-zAA+hPwjMawQ1rJuv8W30EqKO+AI0aq9ybquBnKlzC0="; + rev = "7e1e791483cf135fe29b8eecd7a360aa892823ae"; + hash = "sha256-SvbtPUfEYp3IGivG+5yFdJF904miyMk+s15zwW7e7b4="; }; - patches = [ - # fixes build by including missing time.h header - (fetchpatch { - url = "https://github.com/RaghavSood/bicpl/commit/3def4acd6bae61ff7a930ef8422ad920690382a6.patch"; - hash = "sha256-VdAKuLWTZY7JriK1rexIiuj8y5ToaSEJ5Y+BbnfdYnI="; - }) - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ libminc From c60a303e554d1d433df28c37015a254e344b88db Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Tue, 14 May 2024 07:56:05 +0800 Subject: [PATCH 158/246] python311Packages.webdataset: 0.2.88 -> 0.2.90 Diff: https://github.com/webdataset/webdataset/compare/refs/tags/0.2.88...0.2.90 Changelog: https://github.com/webdataset/webdataset/releases/tag/0.2.90 --- pkgs/development/python-modules/webdataset/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix index 3c6708300d88..1215d5a1c8c4 100644 --- a/pkgs/development/python-modules/webdataset/default.nix +++ b/pkgs/development/python-modules/webdataset/default.nix @@ -16,14 +16,14 @@ }: buildPythonPackage rec { pname = "webdataset"; - version = "0.2.88"; + version = "0.2.90"; pyproject = true; src = fetchFromGitHub { owner = "webdataset"; repo = "webdataset"; rev = "refs/tags/${version}"; - hash = "sha256-wsBOBUK4VIGMQXYdgbgsuSH4XYvxDsUv3rh0S5rvA6c="; + hash = "sha256-selj7XD7NS831lbPnx/4o46bNpsxuFdSEIIb4S2b7S0="; }; nativeBuildInputs = [ @@ -67,6 +67,10 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ # pickling error "test_background_download" + ] ++ lib.optionals (stdenv.isx86_64 && stdenv.isDarwin) [ + "test_concurrent_access" + # fails to patch 'init_process_group' from torch.distributed + "TestDistributedChunkedSampler" ] ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [ # segfaults on aarch64-linux "test_webloader" From 30c6e15c2b8af47bc6d845d0145ebc8ecd522c75 Mon Sep 17 00:00:00 2001 From: Zenithal Date: Mon, 6 May 2024 16:52:34 +0800 Subject: [PATCH 159/246] proxychains-ng: 4.16 -> 4.17 https://github.com/rofl0r/proxychains-ng/compare/v4.16...v4.17 --- .../networking/proxychains-ng/default.nix | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/networking/proxychains-ng/default.nix b/pkgs/tools/networking/proxychains-ng/default.nix index b94dcaf9518c..bdc5622f2d50 100644 --- a/pkgs/tools/networking/proxychains-ng/default.nix +++ b/pkgs/tools/networking/proxychains-ng/default.nix @@ -1,44 +1,29 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch }: stdenv.mkDerivation rec { pname = "proxychains-ng"; - version = "4.16"; + version = "4.17"; src = fetchFromGitHub { owner = "rofl0r"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uu/zN6W0ue526/3a9QeYg6J4HLaovZJVOYXksjouYok="; + sha256 = "sha256-cHRWPQm6aXsror0z+S2Ddm7w14c1OvEruDublWsvnXs="; }; patches = [ - # zsh completion - (fetchpatch { - url = "https://github.com/rofl0r/proxychains-ng/commit/04023d3811d8ee34b498b429bac7a871045de59c.patch"; - sha256 = "sha256-Xcg2kmAhj/OJn/RKJAxb9MOJNJQY7FXmxEIzQ5dvabo="; - }) - (fetchpatch { - url = "https://github.com/rofl0r/proxychains-ng/commit/9b42da71f4df7b783cf07a58ffa095e293c43380.patch"; - sha256 = "sha256-tYv9XP51WtsjaoklwQk3D/MQceoOvtdMwBraECt6AXQ="; - }) # https://github.com/NixOS/nixpkgs/issues/136093 ./swap-priority-4-and-5-in-get_config_path.patch ]; installFlags = [ "install-config" - # TODO: check on next update if that works and remove postInstall - # "install-zsh-completion" + "install-zsh-completion" ]; - postInstall = '' - ./tools/install.sh -D -m 644 completions/_proxychains $out/share/zsh/site_functions/_proxychains4 - ''; - meta = with lib; { description = "A preloader which hooks calls to sockets in dynamically linked programs and redirects it through one or more socks/http proxies"; homepage = "https://github.com/rofl0r/proxychains-ng"; From 31e42c8bf07e917a30de415e9793eecb54b15333 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 04:12:26 +0000 Subject: [PATCH 160/246] python311Packages.oelint-parser: 3.5.1 -> 3.5.2 --- pkgs/development/python-modules/oelint-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index 30c4aa4eb271..b4df20c9da78 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.5.1"; + version = "3.5.2"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-i/fVihl+XnY3grHG2OXJ2ZQB43o/aNOGV/buh2zUMOQ="; + hash = "sha256-ep3kU6Rdbev5SKnqQq9t4tC7RWp4b+uaWBWfE2Pydqc="; }; buildInputs = [ pip ]; From 5e196550aae594166ac732a56edd5ddfe56c539c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 04:19:06 +0000 Subject: [PATCH 161/246] python311Packages.frozendict: 2.4.3 -> 2.4.4 --- pkgs/development/python-modules/frozendict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 1cc374e63926..c3f5d2a5600b 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "frozendict"; - version = "2.4.3"; + version = "2.4.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Marco-Sulla"; repo = "python-frozendict"; rev = "refs/tags/v${version}"; - hash = "sha256-DGSHQbVfqkaHgxL2bBXSxKqshTdWqp1z2F+YA9lu20E="; + hash = "sha256-TgXhffUvx74fU2SgDV04R1yS9xGbiP/ksQ+3KGT5bdQ="; }; # build C version if it exists From 5474d3961908655930678a7eef35846a80142b0f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 04:56:22 +0000 Subject: [PATCH 162/246] python311Packages.pvlib: 0.10.4 -> 0.10.5 --- pkgs/development/python-modules/pvlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 986fd4ed8b4d..624d369c1cf2 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pvlib"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi{ inherit pname version; - hash = "sha256-DF+ov+ixSjmjC/7+WmzwFksuvYKikSbbPZBqhNk5+HI="; + hash = "sha256-I+y59o4L+wLOF+hARLUh+341NYHlOKMfnq0ETs0ZUL0="; }; nativeBuildInputs = [ From efca92c5f473257b768587f4e87e90962a243055 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 04:58:28 +0000 Subject: [PATCH 163/246] python311Packages.sagemaker: 2.218.1 -> 2.219.0 --- pkgs/development/python-modules/sagemaker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index 213f23bf006a..49156ec55306 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.218.1"; + version = "2.219.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-VDwD52mbOSNrZgUHM1fieYWW41V6Gf+paoP5nYg2cDI="; + hash = "sha256-TZpRRkoAlXU+Ccgxq49t+Cz0JOIUvYp7ok3x3sphncE="; }; patches = [ From 50396b74cbf730c041474dd1f2247c46c302d35e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 05:05:52 +0000 Subject: [PATCH 164/246] python311Packages.lsassy: 3.1.10 -> 3.1.11 --- pkgs/development/python-modules/lsassy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix index a36a70f11bbd..8123a9967e22 100644 --- a/pkgs/development/python-modules/lsassy/default.nix +++ b/pkgs/development/python-modules/lsassy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "lsassy"; - version = "3.1.10"; + version = "3.1.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Hackndo"; repo = "lsassy"; rev = "refs/tags/v${version}"; - hash = "sha256-Eqparqj1O0gK0MvR4BBkGVNji2WXEnMsdWvKiR6XHFk="; + hash = "sha256-boPFrmPqaHpezxXM3VM50i+n+n+gXkuwP4ErpMpN/AI="; }; pythonRelaxDeps = [ From 907b79c3af1c5b09834666cadd3c69112cf2930e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 05:12:26 +0000 Subject: [PATCH 165/246] python311Packages.pytapo: 3.3.20 -> 3.3.21 --- pkgs/development/python-modules/pytapo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 50e4fe4a7d59..2b5d64660b19 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pytapo"; - version = "3.3.20"; + version = "3.3.21"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lJ3+wGzbgvaB20KOGg3ncKb2XlcraFMk8oEK6newX/A="; + hash = "sha256-rc9XhV99vzgoUF5ERFmJHHB9GMwq5Y44CJKg+g5tjOo="; }; propagatedBuildInputs = [ From 50b11536db8f238bc1bedff0c44720202eb5751e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 05:28:27 +0000 Subject: [PATCH 166/246] workout-tracker: 0.14.2 -> 0.14.3 --- pkgs/by-name/wo/workout-tracker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix index d22ebbe3aba6..ab15fced522c 100644 --- a/pkgs/by-name/wo/workout-tracker/package.nix +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "workout-tracker"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "jovandeginste"; repo = "workout-tracker"; rev = "refs/tags/v${version}"; - hash = "sha256-hQPBptpsxksfILZXXAVIcFf+W7Eea3pcgnndHY4mO9c="; + hash = "sha256-NGj3W6SYZauaAhMinPzsSXM8Dqy+B+am985JJjh6xTs="; }; vendorHash = null; From 042a1d250e16ed008e2d5834beafa26c8982b19f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 05:35:47 +0000 Subject: [PATCH 167/246] vunnel: 0.22.2 -> 0.23.0 --- pkgs/by-name/vu/vunnel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 4a5522aab773..df8787c52b81 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "vunnel"; - version = "0.22.2"; + version = "0.23.0"; pyproject = true; src = fetchFromGitHub { owner = "anchore"; repo = "vunnel"; rev = "refs/tags/v${version}"; - hash = "sha256-g/dlo2M7TJRYAbk3HtGQlMUZhORxt+OsDgP8W7rf+NE="; + hash = "sha256-pfR3LxC1sSvLKIwq0P/9DcNkGVIIDfwMiSOpwJ7km9Y="; }; pythonRelaxDeps = [ From 1f49aad7b86ab1323c49ca4993fd041a429ba570 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 13 May 2024 16:35:25 +0200 Subject: [PATCH 168/246] python311Packages.pymc: 5.14.0 -> 5.15.0 Diff: https://github.com/pymc-devs/pymc/compare/refs/tags/v5.14.0...v5.15.0 Changelog: https://github.com/pymc-devs/pymc/releases/tag/v5.15.0 --- pkgs/development/python-modules/pymc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index 947aaa424186..3e991423cf6d 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.14.0"; + version = "5.15.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-ZVGMzkStKSPLgBoyzA8SOvsof7QRR7TLmLhh5NmD/F8="; + hash = "sha256-KJXQz7LES3AqLkq5FPnaECraYSM4vfuDyfRJSclz1RQ="; }; postPatch = '' From 1015d9f69f6f21554083db1df1b65b6329fdf556 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:19:09 +0200 Subject: [PATCH 169/246] python311Packages.pyzufall: remove pyzufall was removed, because it is no longer maintained --- .../python-modules/pyzufall/default.nix | 30 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/pyzufall/default.nix diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix deleted file mode 100644 index 71418c1607d0..000000000000 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, fetchPypi, python, buildPythonPackage, nose, future, coverage }: - -buildPythonPackage rec { - pname = "pyzufall"; - version = "0.13.2"; - - src = fetchPypi { - pname = "PyZufall"; - inherit version; - sha256 = "1jffhi20m82fdf78bjhncbdxkfzcskrlipxlrqq9741xdvrn14b5"; - }; - - # disable tests due to problem with nose - # https://github.com/nose-devs/nose/issues/1037 - doCheck = false; - - nativeCheckInputs = [ nose coverage ]; - propagatedBuildInputs = [ future ]; - - checkPhase = '' - ${python.interpreter} setup.py nosetests - ''; - - meta = with lib; { - homepage = "https://pyzufall.readthedocs.io/de/latest/"; - description = "Library for generating random data and sentences in german language"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ davidak ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 71dafa9a9c43..7f26b8607e4c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -428,6 +428,7 @@ mapAliases ({ PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19 pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01 pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05 + pyzufall = throw "pyzufall was removed, because it is no longer maintained"; # added 2024-05-14 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 qds_sdk = qds-sdk; # added 2023-10-21 Quandl = quandl; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9375194ceb5d..52a4a4b4c5b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12834,8 +12834,6 @@ self: super: with self; { pyzmq = callPackage ../development/python-modules/pyzmq { }; - pyzufall = callPackage ../development/python-modules/pyzufall { }; - qbittorrent-api = callPackage ../development/python-modules/qbittorrent-api { }; qasync = callPackage ../development/python-modules/qasync { }; From b8b18a25178c605444dc51b1d2e0f9d769230713 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 14:26:29 +0800 Subject: [PATCH 170/246] conglomerate: nixfmt-rfc-style and modernization --- .../science/biology/conglomerate/default.nix | 60 ++++++++++++++----- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index d9092b9eeb11..eed541b881f3 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -1,20 +1,47 @@ -{ lib, stdenv, fetchFromGitHub, cmake, coreutils, perlPackages, bicpl, libminc, zlib, minc_tools, - makeWrapper }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + coreutils, + perlPackages, + bicpl, + libminc, + zlib, + minc_tools, + makeWrapper, +}: stdenv.mkDerivation rec { pname = "conglomerate"; version = "unstable-2017-09-10"; src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "7343238bc6215942c7ecc885a224f24433a291b0"; - sha256 = "1mlqgmy3jc13bv7d01rjwldxq0p4ayqic85xcl222hhifi3w2prr"; + owner = "BIC-MNI"; + repo = pname; + rev = "7343238bc6215942c7ecc885a224f24433a291b0"; + hash = "sha256-OV/BR3QRQiEEZb0gFrFX5ALcG+UyB9DOXiMwOXx9mNY="; }; - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ libminc zlib bicpl ]; - propagatedBuildInputs = [ coreutils minc_tools ] ++ (with perlPackages; [ perl GetoptTabular MNI-Perllib ]); + nativeBuildInputs = [ + cmake + makeWrapper + ]; + buildInputs = [ + libminc + zlib + bicpl + ]; + propagatedBuildInputs = + [ + coreutils + minc_tools + ] + ++ (with perlPackages; [ + perl + GetoptTabular + MNI-Perllib + ]); cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/cmake" @@ -23,15 +50,20 @@ stdenv.mkDerivation rec { postFixup = '' for p in $out/bin/*; do - wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${lib.makeBinPath [ coreutils minc_tools ]}"; + wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${ + lib.makeBinPath [ + coreutils + minc_tools + ] + }"; done ''; - meta = with lib; { + meta = { homepage = "https://github.com/BIC-MNI/conglomerate"; description = "More command-line utilities for working with MINC files"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.hpndUc; + maintainers = with lib.maintainers; [ bcdarwin ]; + platforms = lib.platforms.unix; + license = lib.licenses.hpndUc; }; } From a55e1a28c1e9e3e471e77cb36df0dc93a7e8f9ff Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Tue, 14 May 2024 14:28:10 +0800 Subject: [PATCH 171/246] conglomerate: unstable-2017-09-10 -> unstable-2023-01-19 --- pkgs/applications/science/biology/conglomerate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index eed541b881f3..0d140914638e 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "conglomerate"; - version = "unstable-2017-09-10"; + version = "unstable-2023-01-19"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "7343238bc6215942c7ecc885a224f24433a291b0"; - hash = "sha256-OV/BR3QRQiEEZb0gFrFX5ALcG+UyB9DOXiMwOXx9mNY="; + rev = "6fb26084f2871a85044e2e4afc868982702b40ed"; + hash = "sha256-Inr4b2bxguzkcRQBURObsQQ0Rb3H/Zz6hEzNRd+IX3w="; }; nativeBuildInputs = [ From 601c840b9d1ce19eb1c22be37906531e683029d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:29:06 +0200 Subject: [PATCH 172/246] python312Packages.asyncwhois: refactor --- .../python-modules/asyncwhois/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 351e6b001506..0a6371b8f3d9 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -25,11 +25,16 @@ buildPythonPackage rec { hash = "sha256-ESVgK4Z26OAamdHPEVxysnlJ0rEUlr8KNd24fawHuEg="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "python-socks[asyncio]" "python-socks" + ''; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ python-socks tldextract whodap @@ -41,11 +46,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace-fail "python-socks[asyncio]" "python-socks" - ''; - disabledTests = [ # Tests require network access "test_pywhois_aio_get_hostname_from_ip" From 5e1e2d1f3f56f3b4c8a4ddaf36b42b3998730979 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:29:30 +0200 Subject: [PATCH 173/246] python3121Packages.asyncwhois: format with nixfmt --- .../python-modules/asyncwhois/default.nix | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix index 0a6371b8f3d9..938ff02ce7e8 100644 --- a/pkgs/development/python-modules/asyncwhois/default.nix +++ b/pkgs/development/python-modules/asyncwhois/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytest-asyncio -, pytest-mock -, pytestCheckHook -, python-socks -, pythonOlder -, setuptools -, tldextract -, whodap +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytest-asyncio, + pytest-mock, + pytestCheckHook, + python-socks, + pythonOlder, + setuptools, + tldextract, + whodap, }: buildPythonPackage rec { @@ -30,9 +31,7 @@ buildPythonPackage rec { --replace-fail "python-socks[asyncio]" "python-socks" ''; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ python-socks @@ -63,9 +62,7 @@ buildPythonPackage rec { "test__get_top_level_domain" ]; - pythonImportsCheck = [ - "asyncwhois" - ]; + pythonImportsCheck = [ "asyncwhois" ]; meta = with lib; { description = "Python module for retrieving WHOIS information"; From 160810c856c4d9320d24606a84d9e2671d54e77e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:31:21 +0200 Subject: [PATCH 174/246] python312Packages.pvlib: refactor --- pkgs/development/python-modules/pvlib/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 624d369c1cf2..287f4c587ded 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -16,7 +16,6 @@ , scipy , setuptools , setuptools-scm -, wheel }: buildPythonPackage rec { @@ -31,13 +30,12 @@ buildPythonPackage rec { hash = "sha256-I+y59o4L+wLOF+hARLUh+341NYHlOKMfnq0ETs0ZUL0="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ h5py numpy pandas @@ -47,11 +45,11 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook pytest-mock pytest-remotedata pytest-rerunfailures pytest-timeout + pytestCheckHook requests-mock ]; @@ -60,8 +58,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://pvlib-python.readthedocs.io"; description = "Simulate the performance of photovoltaic energy systems"; + homepage = "https://pvlib-python.readthedocs.io"; changelog = "https://pvlib-python.readthedocs.io/en/v${version}/whatsnew.html"; license = licenses.bsd3; maintainers = with maintainers; [ jluttine ]; From bd1b3a4f7a4b1b6bc86e8dba9b505e80a400f81d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:31:40 +0200 Subject: [PATCH 175/246] python312Packages.pvlib: format with nixfmt --- .../python-modules/pvlib/default.nix | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index 287f4c587ded..4abf6f287497 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -1,21 +1,22 @@ -{ lib -, buildPythonPackage -, fetchPypi -, h5py -, numpy -, pandas -, pytestCheckHook -, pytest-mock -, pytest-remotedata -, pytest-rerunfailures -, pytest-timeout -, pythonOlder -, pytz -, requests -, requests-mock -, scipy -, setuptools -, setuptools-scm +{ + lib, + buildPythonPackage, + fetchPypi, + h5py, + numpy, + pandas, + pytestCheckHook, + pytest-mock, + pytest-remotedata, + pytest-rerunfailures, + pytest-timeout, + pythonOlder, + pytz, + requests, + requests-mock, + scipy, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -25,7 +26,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; - src = fetchPypi{ + src = fetchPypi { inherit pname version; hash = "sha256-I+y59o4L+wLOF+hARLUh+341NYHlOKMfnq0ETs0ZUL0="; }; @@ -53,9 +54,7 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ - "pvlib" - ]; + pythonImportsCheck = [ "pvlib" ]; meta = with lib; { description = "Simulate the performance of photovoltaic energy systems"; From 244a8de7ffd408082c9891c055d9c038899754d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:35:32 +0200 Subject: [PATCH 176/246] python312Packages.pytapo: refactor --- pkgs/development/python-modules/pytapo/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 2b5d64660b19..9de41fe5112b 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -2,18 +2,17 @@ , buildPythonPackage , fetchPypi , pythonOlder - -# propagates , pycryptodome , requests , rtp , urllib3 +, setuptools }: buildPythonPackage rec { pname = "pytapo"; version = "3.3.21"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +21,11 @@ buildPythonPackage rec { hash = "sha256-rc9XhV99vzgoUF5ERFmJHHB9GMwq5Y44CJKg+g5tjOo="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ pycryptodome requests rtp From 2ff878b4bed51bc0c9cc211c937c9b7fcefd09ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:35:48 +0200 Subject: [PATCH 177/246] python312Packages.pytapo: format with nixfmt --- .../python-modules/pytapo/default.nix | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix index 9de41fe5112b..f61e7089f2d2 100644 --- a/pkgs/development/python-modules/pytapo/default.nix +++ b/pkgs/development/python-modules/pytapo/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, pycryptodome -, requests -, rtp -, urllib3 -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + pycryptodome, + requests, + rtp, + urllib3, + setuptools, }: buildPythonPackage rec { @@ -21,9 +22,7 @@ buildPythonPackage rec { hash = "sha256-rc9XhV99vzgoUF5ERFmJHHB9GMwq5Y44CJKg+g5tjOo="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ pycryptodome @@ -32,9 +31,7 @@ buildPythonPackage rec { urllib3 ]; - pythonImportsCheck = [ - "pytapo" - ]; + pythonImportsCheck = [ "pytapo" ]; # Tests require actual hardware doCheck = false; From 0f00b30adab856d70d8d64a7f44ba7ac9a5eac35 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:44:49 +0200 Subject: [PATCH 178/246] python312Packages.boto3-stubs: 1.34.103 -> 1.34.104 --- 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 6019b702efd5..1ef9b59acd01 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.103"; + version = "1.34.104"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-MxMTEnOQKpgEYyL4wZkl7NUykk66ZOm/wFKNBGrrbYw="; + hash = "sha256-GsQmm7pLMdSCQfAtLwa0WB+75hdC3O44MV4BQgwQMVs="; }; build-system = [ setuptools ]; From ec53d50e1d96af81fe29b804f01f81001238a48a Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 14 May 2024 00:12:32 +0200 Subject: [PATCH 179/246] python312Packages.bayespy: add missing dependency, clean up --- .../python-modules/bayespy/default.nix | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index ef82df7dfb95..6c4d629e0843 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -1,30 +1,49 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pythonOlder -, pytestCheckHook, nose, glibcLocales, fetchpatch -, numpy, scipy, matplotlib, h5py }: +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + numpy, + scipy, + h5py, + truncnorm, + pytestCheckHook, +}: buildPythonPackage rec { pname = "bayespy"; version = "0.6.1"; - format = "setuptools"; + pyproject = true; # Python 2 not supported and not some old Python 3 because MPL doesn't support # them properly. disabled = pythonOlder "3.4"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-3N8w/LiTLsDZbHp3z26FvDg3vStB2l3XkIWx+Mma1G0="; + src = fetchFromGitHub { + owner = "bayespy"; + repo = "bayespy"; + rev = "refs/tags/${version}"; + hash = "sha256-X7CwJBrKHlU1jqMkt/7XEzaiwul1Yzkb/V64lXG4Aqo="; }; - nativeCheckInputs = [ pytestCheckHook nose glibcLocales ]; + postPatch = '' + substituteInPlace versioneer.py \ + --replace-fail SafeConfigParser ConfigParser \ + --replace-fail readfp read_file + ''; - propagatedBuildInputs = [ numpy scipy matplotlib h5py ]; + build-system = [ setuptools ]; - disabledTests = [ - # Assertion error - "test_message_to_parents" + dependencies = [ + numpy + scipy + h5py + truncnorm ]; + nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "bayespy" ]; meta = with lib; { From 5f2c8838e7876ed842cb5687e60a74b948452ca7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 08:46:06 +0200 Subject: [PATCH 180/246] python312Packages.google-generativeai: 0.5.2 -> 0.5.3 Diff: https://github.com/google/generative-ai-python/compare/refs/tags/v0.5.2...v0.5.3 Changelog: https://github.com/google/generative-ai-python/releases/tag/v0.5.3 --- .../python-modules/google-generativeai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index 4425966a0063..55248f8704b1 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.5.2"; + version = "0.5.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-R1ndVzGKXWRNkWvvuP4HFBXbuk54bCZZvMJY+yalJGU="; + hash = "sha256-tJ04E69xNhDqxZ/0YVCIDFqWdA73rs57usyh3fDv8Ls="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; From cb82462b3d250edc7e07fba978d924f89227abf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 06:53:49 +0000 Subject: [PATCH 181/246] php81Packages.box: 4.6.1 -> 4.6.2 --- pkgs/development/php-packages/box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix index 0f13c2a09ab8..1407064044dc 100644 --- a/pkgs/development/php-packages/box/default.nix +++ b/pkgs/development/php-packages/box/default.nix @@ -6,16 +6,16 @@ php82.buildComposerProject (finalAttrs: { pname = "box"; - version = "4.6.1"; + version = "4.6.2"; src = fetchFromGitHub { owner = "box-project"; repo = "box"; rev = finalAttrs.version; - hash = "sha256-58L0eWIuUleb90ICBrmeHEQDVYySX0TdSaJBnBtmBXc="; + hash = "sha256-gYIAP9pTjahNkpNNXx0c8sQm+9Kaq6/IAo/xI5bNy7Y="; }; - vendorHash = "sha256-9kTqU+1i6ICLOlCZe+JCyKn8VN/67Uk9vmn8ng8+HdI="; + vendorHash = "sha256-HCbjW4HdyQNWDEHXj9U1t3S3EKcrPV1z/9I1ClFsMsc="; meta = { changelog = "https://github.com/box-project/box/releases/tag/${finalAttrs.version}"; From 11ee1a9353d0c5f9fb286fd5f8745a884525b35b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 06:59:26 +0000 Subject: [PATCH 182/246] git-mit: 5.12.199 -> 5.12.200 --- pkgs/applications/version-management/git-mit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-mit/default.nix b/pkgs/applications/version-management/git-mit/default.nix index e77fdd48eeb6..34cda787ce3b 100644 --- a/pkgs/applications/version-management/git-mit/default.nix +++ b/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.199"; + version = "5.12.200"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-UyUOzxlTz+yT+Ch1Q+RuxBHDBeW0S5Kl/ynk0s2nNTc="; + hash = "sha256-xrmxpbNBe+EjQsnpgQtKZlziK+jOw5johFDH2kfxf44="; }; - cargoHash = "sha256-hJzCuHq+9fT5etdgV+PxeeaLHv8WGhm8QH0Rp+WOXgs="; + cargoHash = "sha256-1JN3TaX37DCoYuWJskFoP5vRPqJG8JEMGRAEsU/PI48="; nativeBuildInputs = [ pkg-config ]; From f8cd42ed05fb0eb9e5969080c72337623f60669e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 07:11:39 +0000 Subject: [PATCH 183/246] python311Packages.llama-index-multi-modal-llms-openai: 0.1.5 -> 0.1.6 --- .../llama-index-multi-modal-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix index 389f2c6fe763..76fa73298cd4 100644 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-multi-modal-llms-openai"; - version = "0.1.5"; + version = "0.1.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_multi_modal_llms_openai"; inherit version; - hash = "sha256-miN/T4htHiDCfpST6As+H4dThZSB/xtY/iW3qjmxmKI="; + hash = "sha256-EN51qHekRK81MGOF+q2bnwYkOR5VMJlwVkEUoICgV4w="; }; build-system = [ poetry-core ]; From f5e92523f829de5ed1bdc3b169da927d731d26a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 07:11:44 +0000 Subject: [PATCH 184/246] python311Packages.llama-index-llms-openai: 0.1.18 -> 0.1.19 --- .../python-modules/llama-index-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index d827bde24d0c..a6987b224fc5 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.1.18"; + version = "0.1.19"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-jLdUahiFulWP9YCxFNY4VpoK7YGiZJYRFOcZvEKzcQA="; + hash = "sha256-9htkqZeJLkJPs81UcJDSecWyEO8VthT8Od6FTTzKp+c="; }; build-system = [ poetry-core ]; From c312a6cf723bbdd455abd1c72a2b3e7700213882 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Mon, 13 May 2024 21:00:29 +0200 Subject: [PATCH 185/246] speedtest-go: 1.70 -> 1.7.5 --- pkgs/tools/networking/speedtest-go/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/speedtest-go/default.nix b/pkgs/tools/networking/speedtest-go/default.nix index cd99a297b944..56764fb5f198 100644 --- a/pkgs/tools/networking/speedtest-go/default.nix +++ b/pkgs/tools/networking/speedtest-go/default.nix @@ -1,17 +1,17 @@ -{ lib -, buildGoModule -, fetchFromGitHub +{ + lib, + buildGoModule, + fetchFromGitHub, }: - buildGoModule rec { pname = "speedtest-go"; - version = "1.7.0"; + version = "1.7.5"; src = fetchFromGitHub { owner = "showwin"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-G/ovJk/4pDSDlOUSP9/d0vzTg5IaMPMMPhAN+VGxi/c="; + hash = "sha256-8YN7k7sP0S3MIArUfwDYMQvcCKNTxauQjevyOoisAuc="; }; vendorHash = "sha256-wQqAX7YuxxTiMWmV9LRoXunGMMzs12UyHbf4VvbQF1E="; @@ -26,7 +26,10 @@ buildGoModule rec { homepage = "https://github.com/showwin/speedtest-go"; changelog = "https://github.com/showwin/speedtest-go/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ aleksana ]; + maintainers = with maintainers; [ + aleksana + luftmensch-luftmensch + ]; mainProgram = "speedtest-go"; }; } From 7350baf00ffa7b8d21013560de004a4addd89c14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Tue, 14 May 2024 09:20:37 +0200 Subject: [PATCH 186/246] just: 1.25.2 -> 1.26.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/ju/just/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index c613853ef3d9..d635d1271a2e 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.25.2"; + version = "1.26.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-w7tHLjIFnlvyuTw5yG6zxJtQ7oDNdKRXHIRKY638vTo="; + hash = "sha256-jPVvKxTHTOFkjpTsnjy9/IxQtHLgv1fInKA6knKUmu8="; }; - cargoHash = "sha256-VL2uNbEtqOv3xmLukhdCmo3lrfx5yFwOAMGwgBlgAVw="; + cargoHash = "sha256-ssZ5JxOd0XVs4hsvnSz1IvtKE7ftEKX3nN2B8SsMesw="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 36134e9ea56683db01c41e6b6a389e17522a4b9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 04:33:28 +0000 Subject: [PATCH 187/246] python311Packages.pyathena: 3.8.1 -> 3.8.2 --- pkgs/development/python-modules/pyathena/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix index 0b3cf7f890a3..036ec8c5e2d7 100644 --- a/pkgs/development/python-modules/pyathena/default.nix +++ b/pkgs/development/python-modules/pyathena/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pyathena"; - version = "3.8.1"; + version = "3.8.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-CbZ+LwTTCkiak2rd9XksksrE5Zokndi/z2kZL87Tly8="; + hash = "sha256-uVYnhxQJy6BvSZ/7JbKZPtE+uJkOtEZrd3uTokfZ3f8="; }; nativeBuildInputs = [ From 69b038c8e84a8630ad10919c30b6adab7de8f283 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 07:27:06 +0000 Subject: [PATCH 188/246] python311Packages.ufo2ft: 3.1.0 -> 3.2.2 --- pkgs/development/python-modules/ufo2ft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index c4c47948948a..d167d66b3529 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.1.0"; + version = "3.2.2"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5EUrML1Yd88tVEP+Kd9TmXm+5Ejk/XIH/USYBakK/wQ="; + hash = "sha256-5HWhRxKs4KQdC1v0LaLgndgMwtcGKLVz9tYtesdJ8Oo="; }; nativeBuildInputs = [ From f7cfebad6940dea237dc36b86d6c00287440017e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 14 May 2024 09:27:18 +0200 Subject: [PATCH 189/246] ustream-ssl-mbedtls: fix build on x86_64-darwin --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5356f1ed4730..4ad3f612460c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20434,7 +20434,10 @@ with pkgs; ustream-ssl-wolfssl = callPackage ../development/libraries/ustream-ssl { ssl_implementation = wolfssl; additional_buildInputs = [ openssl ]; }; - ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { ssl_implementation = mbedtls_2; }; + ustream-ssl-mbedtls = callPackage ../development/libraries/ustream-ssl { + ssl_implementation = mbedtls_2; + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; uri = callPackage ../development/libraries/uri { }; From 0400fc25311788bfac494062076f0c17c13a8008 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 14 May 2024 09:27:25 +0200 Subject: [PATCH 190/246] ubus: fix build on x86_64-darwin --- pkgs/development/libraries/ubus/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index 2150ed7b0e82..662ec1c7b035 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -14,6 +14,10 @@ stdenv.mkDerivation { buildInputs = [ libubox libjson ]; nativeBuildInputs = [ cmake ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ + "-Wno-error=gnu-folding-constant" + ]); + meta = with lib; { description = "OpenWrt system message/RPC bus"; homepage = "https://git.openwrt.org/?p=project/ubus.git;a=summary"; From 64543f839ab36d1993755f22fb7ea6a5c95e3e83 Mon Sep 17 00:00:00 2001 From: Patka Date: Tue, 14 May 2024 09:34:14 +0200 Subject: [PATCH 191/246] maintainers/teamlist: add patka to php team --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 8b609bce4f26..ec1c9e8c4b3e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -811,6 +811,7 @@ with lib.maintainers; { aanderse drupol ma27 + patka talyz ]; githubTeams = [ From 9f6b8c239858b8c411dd03876aca2658873abf17 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Tue, 14 May 2024 09:37:36 +0200 Subject: [PATCH 192/246] ntfy-sh: 2.10.0 -> 2.11.0 --- pkgs/tools/misc/ntfy-sh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ntfy-sh/default.nix b/pkgs/tools/misc/ntfy-sh/default.nix index cf429da9cad0..439707e5b014 100644 --- a/pkgs/tools/misc/ntfy-sh/default.nix +++ b/pkgs/tools/misc/ntfy-sh/default.nix @@ -5,21 +5,21 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - hash = "sha256-Ns73kZ7XJKj93fhTDQ3L5hk4NZVEcKysJVEZk6jX7KE="; + hash = "sha256-lSj4LfS4nBC1xtTE/ee2Nhx9TmlU+138miwC0nEfVRY="; }; - vendorHash = "sha256-c7fOSI+BPF3lwAJEftZHk9o/97T9kntgSsXoko3AYtQ="; + vendorHash = "sha256-V8LgbprUsr+8Ub4xeTPrE4Bp9qOP/R35/qPj0Udgod0="; ui = buildNpmPackage { inherit src version; pname = "ntfy-sh-ui"; - npmDepsHash = "sha256-nU5atvqyt5U7z8XB0+25uF+7tWPW2yYnkV/124fKoPE="; + npmDepsHash = "sha256-PCkRULHfC3ktShO+3wIQFLG24l5LBSB1niWcIrCT9Bo="; prePatch = '' cd web/ From 8b23193e53dd5f53eec1d5b4e817919e4cc2a77f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 07:44:08 +0000 Subject: [PATCH 193/246] python311Packages.superqt: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/superqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index 7012efc0e906..a54f3df4a7f5 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "superqt"; - version = "0.6.5"; + version = "0.6.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "superqt"; rev = "refs/tags/v${version}"; - hash = "sha256-zEMG2zscGDlRxtLn/lUTEjZBPabcwzMcj/kMcy3yOs8="; + hash = "sha256-AJXX460sm0rrimizkiBIjYFRtWbscEjlwo5ZLcgjzcA="; }; build-system = [ From 6da8f9e6fa91a07b00f65576245f09f1bd2b213d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 07:46:38 +0000 Subject: [PATCH 194/246] python311Packages.rtsp-to-webrtc: 0.5.1 -> 0.6.1 --- pkgs/development/python-modules/rtsp-to-webrtc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index 812a4fc1ba1f..c8be9832d63f 100644 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rtsp-to-webrtc"; - version = "0.5.1"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "allenporter"; repo = "rtsp-to-webrtc-client"; - rev = version; - hash = "sha256-miMBN/8IO4v03mMoclCa3GFl6HCS3Sh6z2HOQ39MRZY="; + rev = "refs/tags/${version}"; + hash = "sha256-D022d2CDKtHTuvEGo8GkOGWHi5sV4g6UwNB9xS2xxIs="; }; propagatedBuildInputs = [ From 65de1052af0661c77905e6ec1cd6f003983f1f5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 10:22:37 +0200 Subject: [PATCH 195/246] python312Packages.uptime: refactor --- .../python-modules/uptime/default.nix | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix index 7dd3710b81d3..cd9511e82a62 100644 --- a/pkgs/development/python-modules/uptime/default.nix +++ b/pkgs/development/python-modules/uptime/default.nix @@ -1,23 +1,37 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "uptime"; version = "3.0.1"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0wr9jkixprlywz0plyn5p42a5fd31aiwvjrxdvj7r02vfxa04c3w"; + hash = "sha256-fDACVHdbgHzkbj3LzaMKo7miBLnFenrB557m2+OUKXM="; }; + build-system = [ + setuptools + ]; + + # Tests are not shipped + doCheck = false; + + pythonImportsCheck = [ + "uptime" + ]; + meta = with lib; { - homepage = "https://github.com/Cairnarvon/uptime"; description = "Cross-platform way to retrieve system uptime and boot time"; + homepage = "https://github.com/Cairnarvon/uptime"; license = licenses.bsd2; maintainers = with maintainers; [ rob ]; }; - } From 81c837e44818480db147006775baa41d4384f39c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 10:23:43 +0200 Subject: [PATCH 196/246] python312Packages.uptime: format with nixfmt --- .../python-modules/uptime/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix index cd9511e82a62..d20bd4dc5506 100644 --- a/pkgs/development/python-modules/uptime/default.nix +++ b/pkgs/development/python-modules/uptime/default.nix @@ -1,8 +1,9 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -17,16 +18,12 @@ buildPythonPackage rec { hash = "sha256-fDACVHdbgHzkbj3LzaMKo7miBLnFenrB557m2+OUKXM="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; # Tests are not shipped doCheck = false; - pythonImportsCheck = [ - "uptime" - ]; + pythonImportsCheck = [ "uptime" ]; meta = with lib; { description = "Cross-platform way to retrieve system uptime and boot time"; From 2ca681cdee1ff91f30226e23bbd6aa4aa85d84b3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 10:29:17 +0200 Subject: [PATCH 197/246] python312Packages.rtsp-to-webrtc: refactor --- .../python-modules/rtsp-to-webrtc/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index c8be9832d63f..79f0e327c5e5 100644 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -5,14 +5,15 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "rtsp-to-webrtc"; version = "0.6.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; @@ -21,7 +22,11 @@ buildPythonPackage rec { hash = "sha256-D022d2CDKtHTuvEGo8GkOGWHi5sV4g6UwNB9xS2xxIs="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp ]; @@ -37,6 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for RTSPtoWeb and RTSPtoWebRTC"; homepage = "https://github.com/allenporter/rtsp-to-webrtc-client"; + changelog = "https://github.com/allenporter/rtsp-to-webrtc-client/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From 023334724b98974e66525a90017a4cf253ceb7f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 10:29:35 +0200 Subject: [PATCH 198/246] python312Packages.rtsp-to-webrtc: format with nixfmt --- .../python-modules/rtsp-to-webrtc/default.nix | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix index 79f0e327c5e5..5686b12f4492 100644 --- a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -1,11 +1,12 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pytest-aiohttp -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytest-aiohttp, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -22,22 +23,16 @@ buildPythonPackage rec { hash = "sha256-D022d2CDKtHTuvEGo8GkOGWHi5sV4g6UwNB9xS2xxIs="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - aiohttp - ]; + dependencies = [ aiohttp ]; nativeCheckInputs = [ pytest-aiohttp pytestCheckHook ]; - pythonImportsCheck = [ - "rtsp_to_webrtc" - ]; + pythonImportsCheck = [ "rtsp_to_webrtc" ]; meta = with lib; { description = "Module for RTSPtoWeb and RTSPtoWebRTC"; From 0ba179286ed0883ef1fb779ffc4f9c78dbd56a28 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Tue, 14 May 2024 10:32:19 +0200 Subject: [PATCH 199/246] google-cloud-sdk: 467.0.0 -> 475.0.0 --- .../admin/google-cloud-sdk/components.json | 993 +++++++++++------- pkgs/tools/admin/google-cloud-sdk/data.nix | 22 +- 2 files changed, 641 insertions(+), 374 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json index 88908d304608..25154deed587 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-20240229170130.tar.gz", + "source": "components/google-cloud-sdk-alpha-20240503145345.tar.gz", "type": "tar" }, "dependencies": [ @@ -22,8 +22,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "2024.02.29" + "build_number": 20240503145345, + "version_string": "2024.05.03" } }, { @@ -56,15 +56,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.5.0" + "version_string": "1.5.1" } }, { "data": { - "checksum": "e644f1dfa8a4c25029b33fcf04f4c3c6e01c4c7ed2d572e550890c71d3e8105f", - "contents_checksum": "1f789abe50e6cc5423d39c2530995849bda198e866abbd61904ffb964688e3b3", - "size": 21674635, - "source": "components/google-cloud-sdk-anthos-auth-darwin-arm-20231201141418.tar.gz", + "checksum": "37a7174a1716a9f4d84ee904940428ac424b4e20b1c4df7fe2e79704e554a8ce", + "contents_checksum": "21f1533ec191871a6677551d0d72687b03f1f2708fa900652875afa948a26df4", + "size": 21872436, + "source": "components/google-cloud-sdk-anthos-auth-darwin-arm-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -88,16 +88,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.5.0" + "build_number": 20240426154730, + "version_string": "1.5.1" } }, { "data": { - "checksum": "72a93a9df0d0647ac5587be7dc0f423c9700d191d21e870d7f8218195e8b7c67", - "contents_checksum": "80a810795133e6ed5d17b963606a980c85e059011c9eeffc4b23fdecbbc95736", - "size": 22732157, - "source": "components/google-cloud-sdk-anthos-auth-darwin-x86_64-20231201141418.tar.gz", + "checksum": "6f82815ca309a9f5a19bef98aad0a4f70393a66ce57383a4f6e4b0a8d6193a56", + "contents_checksum": "81a661e522f5c3b7fe610bad06a49e0a3a20fc9da69e0232150c4aa4fcaf962b", + "size": 22957602, + "source": "components/google-cloud-sdk-anthos-auth-darwin-x86_64-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -121,16 +121,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.5.0" + "build_number": 20240426154730, + "version_string": "1.5.1" } }, { "data": { - "checksum": "c6201122eb946238b632d68c944880a172759e7c6e60086d878c8f65017d4614", - "contents_checksum": "def3aaea624bd24a35d2cd8321562cb5ef5f4b659415c552e439c47ea80be22b", - "size": 21172533, - "source": "components/google-cloud-sdk-anthos-auth-linux-arm-20231201141418.tar.gz", + "checksum": "d9ad352bdfd50fef92ab1b917bb60be6b2e49bb8a4b49269bd2286570e02681f", + "contents_checksum": "c98b7c781c86e14e0dbb2a5f5a6ab9504013d005046fb52956ffb213a7d6f51a", + "size": 21399471, + "source": "components/google-cloud-sdk-anthos-auth-linux-arm-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -154,16 +154,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.5.0" + "build_number": 20240426154730, + "version_string": "1.5.1" } }, { "data": { - "checksum": "1a674e3872d702e59c8ef9b275f7e6dfb3a2e428fbaaa177442341f46c62b92d", - "contents_checksum": "ce215c3c67f2445ff1e1bd7d3c897ed5e83b169edb6004ce0898da08a3dc5066", - "size": 22854830, - "source": "components/google-cloud-sdk-anthos-auth-linux-x86_64-20231201141418.tar.gz", + "checksum": "c148f4a473afa336390f034d735283d6a4556c06e8e8b5bd0ecfa2f25dcfd184", + "contents_checksum": "4dbc4132c3126b53058c12c9113186436ac223018cf6d5e636dc0cf6b38ab1e3", + "size": 23109537, + "source": "components/google-cloud-sdk-anthos-auth-linux-x86_64-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -187,16 +187,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.5.0" + "build_number": 20240426154730, + "version_string": "1.5.1" } }, { "data": { - "checksum": "340aff9659764a4b82358dc1face81ca6fccb6cdba0a4b176305d984706f136c", - "contents_checksum": "603ea38b094e85e9a4836061bd057c086b37778a8cc2c7134d1d9bbd43b68639", - "size": 23111838, - "source": "components/google-cloud-sdk-anthos-auth-windows-x86_64-20231201141418.tar.gz", + "checksum": "7802808d020056ba132dc1aecda164d4979f057feff4a61071a6da850ef3e6bf", + "contents_checksum": "7b8a92cd15dfafa0969273ad9eca138d5f7c69fd5b54079bfd5dadf2141b103b", + "size": 23361404, + "source": "components/google-cloud-sdk-anthos-auth-windows-x86_64-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -220,8 +220,8 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.5.0" + "build_number": 20240426154730, + "version_string": "1.5.1" } }, { @@ -1020,10 +1020,10 @@ }, { "data": { - "checksum": "ae39996160cebbed748ed12a6ef89ff73e93848b4b1a22f153c371c8ec2153ad", - "contents_checksum": "66509cd7d0ee0046439e2bc0e70eed9afecb637d578e518d6771925267693055", - "size": 132057381, - "source": "components/google-cloud-sdk-app-engine-java-20240106004423.tar.gz", + "checksum": "8d48814998e693aad877ddac4e1cc9c16b107898eda5e1e8fde6f677968a121c", + "contents_checksum": "b6d38276b7131e073deaff71ecdb3b994fd4a4bdfc4a9a2b2e64cff35884ad49", + "size": 132375338, + "source": "components/google-cloud-sdk-app-engine-java-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -1041,8 +1041,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "2.0.24" + "build_number": 20240329151455, + "version_string": "2.0.26" } }, { @@ -1142,10 +1142,10 @@ }, { "data": { - "checksum": "893d741c65d65cfc20f3820fdf62cb71f111e814083c942fee4ced13b10944a2", - "contents_checksum": "a97004f0aedeff49894c2cce7b5f634762900f64f38f65c1676e7897f3fb2c53", - "size": 8780608, - "source": "components/google-cloud-sdk-app-engine-python-20240216153112.tar.gz", + "checksum": "64171e6c3e1fae05666a7288020b321a0ffad92f8ae6ed7ba93d764c3b0e4369", + "contents_checksum": "f7fbbf70cc88e037e8e2d762d8bcd6dc1546a327a259b98f779f734a66be86a5", + "size": 5246358, + "source": "components/google-cloud-sdk-app-engine-python-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -1164,16 +1164,16 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240216153112, - "version_string": "1.9.109" + "build_number": 20240412130805, + "version_string": "1.9.113" } }, { "data": { - "checksum": "44a183b079e30fc932dbd7ca5b497baa6fa7d080ad78c500da99de6ef9e1a132", - "contents_checksum": "49a80207105a59c3948dd43fda0e28a6f9621265df127c7a3aa9707862ab7bfe", - "size": 33004574, - "source": "components/google-cloud-sdk-app-engine-python-extras-20231002150006.tar.gz", + "checksum": "e91aacbb794987ea2c24efe524a1204a94e9d46b3ff810740b3a8edd36b320ca", + "contents_checksum": "a2243f6ab1398d9caf08f4edcf55de35765698ec756b9f5ed58da87c0f37842e", + "size": 2122, + "source": "components/google-cloud-sdk-app-engine-python-extras-20240308155052.tar.gz", "type": "tar" }, "dependencies": [ @@ -1191,8 +1191,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20231002150006, - "version_string": "1.9.102" + "build_number": 20240308155052, + "version_string": "1.9.106" } }, { @@ -1432,7 +1432,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20240229170130.tar.gz", + "source": "components/google-cloud-sdk-beta-20240503145345.tar.gz", "type": "tar" }, "dependencies": [ @@ -1449,8 +1449,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "2024.02.29" + "build_number": 20240503145345, + "version_string": "2024.05.03" } }, { @@ -1493,10 +1493,10 @@ }, { "data": { - "checksum": "663eb2bb5e083b366f739b81bc95ce7853187a823890c34e07a8bacdfce35244", - "contents_checksum": "20101432339e657f9f272c5898dbdffd89dad2e08dcfccfa26c6609343f39f4c", - "size": 7149239, - "source": "components/google-cloud-sdk-bigtable-darwin-arm-20240112150613.tar.gz", + "checksum": "61389b1bb5534dc7386d30df5ab3a1050cbe3a8c9deda0edb40a1d5985439049", + "contents_checksum": "3a7f40f835b1b713a96f5b6c404eae20c7c90d794aae8a92713fd5b59a3c778e", + "size": 7344145, + "source": "components/google-cloud-sdk-bigtable-darwin-arm-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -1521,7 +1521,7 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, + "build_number": 20240329151455, "version_string": "" } }, @@ -1561,10 +1561,10 @@ }, { "data": { - "checksum": "c00519ab786c673527f79f72770d1f4b5bf599c16f9c5d4b42a3f6658414ac22", - "contents_checksum": "55675241aba0458e9e7e272511ed469bc30949464d23cf672b2e8549e16559a5", - "size": 7384031, - "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20240112150613.tar.gz", + "checksum": "1d719de1aa61fb4837d221502e4113b2f786671e1139852275d69dc77d02e494", + "contents_checksum": "747c8a308249abd684ad2bc8bb9c3b34ed5092da0825b2887188c7f65385c81a", + "size": 7656241, + "source": "components/google-cloud-sdk-bigtable-darwin-x86_64-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -1589,16 +1589,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, + "build_number": 20240329151455, "version_string": "" } }, { "data": { - "checksum": "bb6a7e3068ba643e11505e2cbf2fb7418662045566105c711ccda37bbce2f235", - "contents_checksum": "a2613adc36a34833bf1e11c7f725688389a330d89e3719e5f4e00387dfa20fb8", - "size": 7032893, - "source": "components/google-cloud-sdk-bigtable-linux-arm-20240112150613.tar.gz", + "checksum": "573c369501c73a684744007a9fc23ca29d8a81fa6c1dd18bed18c659ed406711", + "contents_checksum": "5abcfae3e7a061c532d3b4acbb6659d98cc4a7077e21ae4859e4d83d9c07e84f", + "size": 7210539, + "source": "components/google-cloud-sdk-bigtable-linux-arm-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -1623,16 +1623,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, + "build_number": 20240329151455, "version_string": "" } }, { "data": { - "checksum": "5e762be2009986b3a9594cefc861d186eb3130c0f1b0dbf08bef6534ce868761", - "contents_checksum": "2adb488dd36830e794eb141ec5243b0bc5f24206a6bd0ae5a731a31346f08078", - "size": 7287874, - "source": "components/google-cloud-sdk-bigtable-linux-x86-20240112150613.tar.gz", + "checksum": "987ee97fb43e647db218c80cb9c3381477072aa494292db4d108e23f298e8926", + "contents_checksum": "da67b3b932497c895d74221dd3f670374abeda9b18ea32e225b733e69dc87cdc", + "size": 7374147, + "source": "components/google-cloud-sdk-bigtable-linux-x86-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -1657,16 +1657,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, + "build_number": 20240329151455, "version_string": "" } }, { "data": { - "checksum": "b3c54cb77875fddf48a0ff41a8870cb55891bf49ae81e23adeb72c1280fc1fd0", - "contents_checksum": "711fd9de39fbf4583dbb22c52e7b3fa801ad81dee1e2a4d65d98992738f2aa34", - "size": 7488736, - "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20240112150613.tar.gz", + "checksum": "a21817f2aae3ea9580a34f3f169a81baf289cbbd0a3b93455252c326654fe8b2", + "contents_checksum": "3ac22e1972afab99190324f7b9363fe9454ae845beba9eb3750d6240f40f5ee4", + "size": 7668508, + "source": "components/google-cloud-sdk-bigtable-linux-x86_64-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -1691,16 +1691,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, + "build_number": 20240329151455, "version_string": "" } }, { "data": { - "checksum": "7ae926f8aad9bb48247a2468da737b1cd239764aca4ef31b02aebe14437bc5f9", - "contents_checksum": "a4409d3c0f7bce7ab0aeaf66adb80ea96a2f8c3854aa0570f3badf21b8b7d430", - "size": 7317721, - "source": "components/google-cloud-sdk-bigtable-windows-x86-20240112150613.tar.gz", + "checksum": "44b0bfe67b3e19db8acf4bb144f465509afe1fc25ad9c8dfee18a70c1202d3a3", + "contents_checksum": "2fdcda84a5bdb706895ffc4333597c2dbf48cf4fd52048174ece638e2d63348a", + "size": 7568622, + "source": "components/google-cloud-sdk-bigtable-windows-x86-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -1725,16 +1725,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, + "build_number": 20240329151455, "version_string": "" } }, { "data": { - "checksum": "96eac561a6b2efe89e840ff2c6fa22e50f368a536a5db6c168ce9072f6142271", - "contents_checksum": "7d9e07ff31df84f57a66a4f9b0d3d0d666c70c7a17174cb2c69feea2db8a194e", - "size": 7479168, - "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20240112150613.tar.gz", + "checksum": "36f5c9f98188e968cd53fe4545b3f8cb01dc2dfe2bda5c1f607ac384f358f329", + "contents_checksum": "cae59bae355fc9b8ff8fc37296d3885a9944d85b0ba84a4c2e9985380db488e6", + "size": 7841324, + "source": "components/google-cloud-sdk-bigtable-windows-x86_64-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -1759,16 +1759,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, + "build_number": 20240329151455, "version_string": "" } }, { "data": { - "checksum": "8918c7fd033de8f13f331152e59dc16a33f0f7007a6be615b7b53337197be33f", - "contents_checksum": "f516a7a4d24280d59d67bf908d80d0a560b8d680e8c2699efc1071b1c0039c1f", - "size": 1679148, - "source": "components/google-cloud-sdk-bq-20240112150613.tar.gz", + "checksum": "a99ddbb8738b92fb9e899fdcd81b8f6ff10499ae301d4c5660de756d5c689046", + "contents_checksum": "c2012e29e4fe8f14dacb252272e0953ea0618df9f9182bb6405eb7bcbab5af96", + "size": 1746678, + "source": "components/google-cloud-sdk-bq-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -1787,8 +1787,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240112150613, - "version_string": "2.0.101" + "build_number": 20240412130805, + "version_string": "2.1.4" } }, { @@ -1827,10 +1827,10 @@ }, { "data": { - "checksum": "5d3fdd2bd23beba4e15e60d8e2befdb3d68ae9faed8a19b14526ffacb247546e", - "contents_checksum": "aa61d0c34c3b3d6509e7a529b28446faaa645f15abb56a27be3b425ed6404fac", - "size": 2683, - "source": "components/google-cloud-sdk-bq-win-20240226203415.tar.gz", + "checksum": "3bfb69819bbca110fa33474612db6ec6bfb20d2c2334ff41ac21b6f7179441f7", + "contents_checksum": "543b11ef740e32b7013fdecdc0ea02fa076e16972dec18155647fb3f0682d743", + "size": 4104, + "source": "components/google-cloud-sdk-bq-win-20240503145345.tar.gz", "type": "tar" }, "dependencies": [ @@ -1852,8 +1852,8 @@ }, "platform_required": false, "version": { - "build_number": 20240226203415, - "version_string": "2.0.101" + "build_number": 20240503145345, + "version_string": "2.1.4" } }, { @@ -1982,7 +1982,7 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "3.11.6" + "version_string": "3.11.8" } }, { @@ -2048,10 +2048,10 @@ }, { "data": { - "checksum": "78b090d3d133b622c8fa591e55d97dec41ebeceda117f1fc4c87a3a3053710fc", - "contents_checksum": "b18344f58a872b7fd500946a8ca7c7929608a4bf5257570e7c60c2f5b9208ad4", - "size": 20426074, - "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20231110155547.tar.gz", + "checksum": "6b42a2592dc79efb45b3848f58de62866d9fba0d033a8e91aa919be047ee3cb6", + "contents_checksum": "6cce2af1b3947deeff09b5adce78ef1c6b39716ce2ef27c58b48c14408b2e3a0", + "size": 20457544, + "source": "components/google-cloud-sdk-bundled-python3-windows-x86-20240315155000.tar.gz", "type": "tar" }, "dependencies": [ @@ -2076,16 +2076,16 @@ }, "platform_required": false, "version": { - "build_number": 20231110155547, - "version_string": "3.11.6" + "build_number": 20240315155000, + "version_string": "3.11.8" } }, { "data": { - "checksum": "f80970b12053a77afb5888982362396c379392462806837c47c4ed3271c19aaf", - "contents_checksum": "3207aea9e98dcf0cf0ee6ad339235fda213dbf8ac997bfa823698c52d68b7f65", - "size": 22512051, - "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20231110155547.tar.gz", + "checksum": "22a2f8a7370780239ed00ef8771729318b3301e498afba74ef27f300d3b29ec1", + "contents_checksum": "9b781d6ff139270cd317f233e448c88d2b54ef3d05970b2c765540485acf1451", + "size": 22664923, + "source": "components/google-cloud-sdk-bundled-python3-windows-x86_64-20240315155000.tar.gz", "type": "tar" }, "dependencies": [ @@ -2110,8 +2110,8 @@ }, "platform_required": false, "version": { - "build_number": 20231110155547, - "version_string": "3.11.6" + "build_number": 20240315155000, + "version_string": "3.11.8" } }, { @@ -2148,15 +2148,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.17.2" + "version_string": "1.19.0" } }, { "data": { - "checksum": "538df81550df3242dd9047437ceea867abb38125df24154ffafb5298dee1a2b8", - "contents_checksum": "02563cdae195531dc844381cd1cfed92ec8217adc475b9dac73898f1a25c0a45", - "size": 16720666, - "source": "components/google-cloud-sdk-cbt-darwin-arm-20240112150613.tar.gz", + "checksum": "afa1887247d8c5eb0ab71127767c289267f5742702e07827d4c856249efc3753", + "contents_checksum": "c2239a7e4967b5c0ab0a3bf09328d269a444b06dfab5617879f29ec94bbde352", + "size": 17509814, + "source": "components/google-cloud-sdk-cbt-darwin-arm-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -2180,8 +2180,8 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, - "version_string": "1.17.2" + "build_number": 20240329151455, + "version_string": "1.19.0" } }, { @@ -2219,10 +2219,10 @@ }, { "data": { - "checksum": "b9194d1a8371dea7c63147767a6f9e3f8c6f4b03fa30ca3bc5ea901d97acd011", - "contents_checksum": "c359de592aa1b957326c205b8723a59520cac0f142bf278b84eed03399b56b59", - "size": 17196541, - "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20240112150613.tar.gz", + "checksum": "1fc383dfab3e4c99969d05b939620349fadd115124cfcfd7e6d5c8853718f7cf", + "contents_checksum": "76b3bc91860334a7263fbad820ac8ac2db54ca773568aafb86e9221e717e24d3", + "size": 18273086, + "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -2246,16 +2246,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, - "version_string": "1.17.2" + "build_number": 20240329151455, + "version_string": "1.19.0" } }, { "data": { - "checksum": "eb0c6f7e7f9c3bfecbfd733ea018c09fb8ba61b78b1cf8c1c9263c7109ad8671", - "contents_checksum": "5c1a36f98fd4654ee47fccea2a9a50ce8b22cd70e013b83bb051fe357122638d", - "size": 16297518, - "source": "components/google-cloud-sdk-cbt-linux-arm-20240112150613.tar.gz", + "checksum": "2ea8a9dfff13f06b8498622b7b4a13488749dc4ac1560728f3df9fe63537df88", + "contents_checksum": "f70c2888bdb2efec1afe421edc65bef9c356fec3b09a5cc0c4650409dca303f2", + "size": 17062983, + "source": "components/google-cloud-sdk-cbt-linux-arm-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -2279,16 +2279,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, - "version_string": "1.17.2" + "build_number": 20240329151455, + "version_string": "1.19.0" } }, { "data": { - "checksum": "39ca479add8bc11ad11a3b2965e562e62858901c96d79aa1aa2c938a7f40993c", - "contents_checksum": "fc6133d7e68b1ad303d87cb9e712bc94fd40511f3818979b4e20d7f5f2074df7", - "size": 16492482, - "source": "components/google-cloud-sdk-cbt-linux-x86-20240112150613.tar.gz", + "checksum": "25ffea5b8d4a13120cbff9cdeee10759f0149f522efa3b090de7e49fcfe44ca4", + "contents_checksum": "73be18b59b731a6c2aca12e254c0248039ee0b4d3f460198f84842a9753286c9", + "size": 16860591, + "source": "components/google-cloud-sdk-cbt-linux-x86-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -2312,16 +2312,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, - "version_string": "1.17.2" + "build_number": 20240329151455, + "version_string": "1.19.0" } }, { "data": { - "checksum": "23df574487ba9ddb32ffc8c387a0d428ef27be297d5769800710974266d4932c", - "contents_checksum": "8134edf246fa051787bf993034e8f1800bb1f04620bbd13cc1f40e965bf32599", - "size": 17340658, - "source": "components/google-cloud-sdk-cbt-linux-x86_64-20240112150613.tar.gz", + "checksum": "0e5a55bd053d76d9f22223728241e1a0ca89b36661a7e886250de942da8afd76", + "contents_checksum": "fb9e07d468b2d3043632c4b1ace676cc503e5e5efa5b8c3a757f1725cb142dbc", + "size": 18166629, + "source": "components/google-cloud-sdk-cbt-linux-x86_64-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -2345,16 +2345,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, - "version_string": "1.17.2" + "build_number": 20240329151455, + "version_string": "1.19.0" } }, { "data": { - "checksum": "ae60d8116338562cc98ba1ad852842760d2ab78016377ec827701c80dc7b7b41", - "contents_checksum": "61f3390cc8c868a77e378f9d4aa37502d4e04357d8ab33735f1e5418a3a225e7", - "size": 16750394, - "source": "components/google-cloud-sdk-cbt-windows-x86-20240112150613.tar.gz", + "checksum": "b6b9ad0a151bcddc67829349ed03f18b21598b6ced116eb721947acabe4cae10", + "contents_checksum": "13b82fdff12b1385cdf3fc71da26f449c2668cf45fff1d0fb76d3c9b9992a64c", + "size": 17268775, + "source": "components/google-cloud-sdk-cbt-windows-x86-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -2378,16 +2378,16 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, - "version_string": "1.17.2" + "build_number": 20240329151455, + "version_string": "1.19.0" } }, { "data": { - "checksum": "ce201b8cb3e4e10d4ae1cbec9ff253474dff5931eaff9c1d260b117ac03781e3", - "contents_checksum": "d28a7a0d5156bff526e51932172d63a6bc8fc6258138551e81ffc241e20faeb3", - "size": 17415844, - "source": "components/google-cloud-sdk-cbt-windows-x86_64-20240112150613.tar.gz", + "checksum": "ba26da1afb70320e7faeecd5f0378b3d9e16dd7e51091c373c79a53d1fb0fde4", + "contents_checksum": "492d56556efb6c662c8702d66dc4b48e837de0112fc1e949ea7e24671eee5840", + "size": 18413114, + "source": "components/google-cloud-sdk-cbt-windows-x86_64-20240329151455.tar.gz", "type": "tar" }, "dependencies": [ @@ -2411,8 +2411,8 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, - "version_string": "1.17.2" + "build_number": 20240329151455, + "version_string": "1.19.0" } }, { @@ -2572,10 +2572,10 @@ }, { "data": { - "checksum": "412203bd80a2ce63b6893f2fc7af0c9c86a4725bd9cf4aeca6a6905269f267b8", - "contents_checksum": "f43be764e885bb2206a1b7fdacabd0fca828cd76d95e5006c9509645dfd27b0e", - "size": 46597550, - "source": "components/google-cloud-sdk-cloud-firestore-emulator-20240229170130.tar.gz", + "checksum": "93285cbe088cafc8d3761476b276be1c19a3718ac4545692ece4e6cc147deed8", + "contents_checksum": "fe301599250d79f91f06cfdf570fa5815c82414d322d085b1fa47a364bf7ae12", + "size": 47265060, + "source": "components/google-cloud-sdk-cloud-firestore-emulator-20240503145345.tar.gz", "type": "tar" }, "dependencies": [ @@ -2592,8 +2592,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "1.19.2" + "build_number": 20240503145345, + "version_string": "1.19.6" } }, { @@ -2818,15 +2818,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.5.13" + "version_string": "1.5.16" } }, { "data": { - "checksum": "7c8f4db773fae956a385c746203ef7d2784d992fd674cdbacf59720c4d3e0ca6", - "contents_checksum": "d3df9908458ec5b1115dd1c439b256fcc7ba00533f0c7363ac09685f5bc95790", - "size": 37731211, - "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20240106004423.tar.gz", + "checksum": "555c0b4202082b7e94bc9d910460b4f28d2ea6ebf4d51a58825d244331961f84", + "contents_checksum": "e0ad5cac6f972f24e4390fd7d9d54420bc7432ecdcb9c21a299a07ecb893d8cd", + "size": 38255843, + "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -2851,8 +2851,275 @@ }, "platform_required": false, "version": { - "build_number": 20240106004423, - "version_string": "1.5.13" + "build_number": 20240426154730, + "version_string": "1.5.16" + } + }, + { + "dependencies": [ + "cloud-sql-proxy-darwin-arm", + "cloud-sql-proxy-darwin-x86_64", + "cloud-sql-proxy-linux-arm", + "cloud-sql-proxy-linux-x86", + "cloud-sql-proxy-linux-x86_64", + "cloud-sql-proxy-windows-x86", + "cloud-sql-proxy-windows-x86_64" + ], + "details": { + "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", + "display_name": "Cloud SQL Proxy v2" + }, + "id": "cloud-sql-proxy", + "is_configuration": false, + "is_hidden": false, + "is_required": false, + "platform": { + "architectures": [ + "arm", + "x86", + "x86_64" + ], + "operating_systems": [ + "LINUX", + "MACOSX", + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 0, + "version_string": "2.10.0" + } + }, + { + "data": { + "checksum": "12ab4fc64c3c2972e51fd18144b9633e3dcd6a2190dd8484d63f25f4346f46f7", + "contents_checksum": "7739e095d51e0ad78c0c801e61ce178700cb5b8490ec65f5fa7bf4322897783e", + "size": 13848476, + "source": "components/google-cloud-sdk-cloud-sql-proxy-darwin-arm-20240412130805.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-sql-proxy" + ], + "details": { + "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", + "display_name": "Cloud SQL Proxy v2" + }, + "id": "cloud-sql-proxy-darwin-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20240412130805, + "version_string": "2.10.0" + } + }, + { + "data": { + "checksum": "fdc1ed4057693e802e480353479a553694423b61a23cbafb3ea1a2237e82bb68", + "contents_checksum": "87f96d979d238df85b2c2cde4c40d4a5f7869d36b86a0966c38a7c5df6e34d3a", + "size": 14482528, + "source": "components/google-cloud-sdk-cloud-sql-proxy-darwin-x86_64-20240412130805.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-sql-proxy" + ], + "details": { + "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", + "display_name": "Cloud SQL Proxy v2" + }, + "id": "cloud-sql-proxy-darwin-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "MACOSX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20240412130805, + "version_string": "2.10.0" + } + }, + { + "data": { + "checksum": "6ec1b56eae8b797f488e02e01f390a7da2136e812cd78e26b31770f6f4f33005", + "contents_checksum": "afc9d080ec70126505ccfc1afd385ba3f3d2c81a9a9f7481cd8865439d384117", + "size": 13586220, + "source": "components/google-cloud-sdk-cloud-sql-proxy-linux-arm-20240412130805.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-sql-proxy" + ], + "details": { + "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", + "display_name": "Cloud SQL Proxy v2" + }, + "id": "cloud-sql-proxy-linux-arm", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "arm" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20240412130805, + "version_string": "2.10.0" + } + }, + { + "data": { + "checksum": "c876aa706464616c5a2f612f1860b4a6098079a54fe3f579d93b60d0c7c0ce00", + "contents_checksum": "d0b6a430d200d210847762ab7b84160aa5196273112d837d97123a45c6864eae", + "size": 13629073, + "source": "components/google-cloud-sdk-cloud-sql-proxy-linux-x86-20240412130805.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-sql-proxy" + ], + "details": { + "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", + "display_name": "Cloud SQL Proxy v2" + }, + "id": "cloud-sql-proxy-linux-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20240412130805, + "version_string": "2.10.0" + } + }, + { + "data": { + "checksum": "8738b48da32f96d08859045c0dd75f03c7e455fe5cab22278ccb717de4c99270", + "contents_checksum": "351c1514a9c63b9d0e730c465c724a84400d91ad45658213f763a51eae6f04bf", + "size": 14521265, + "source": "components/google-cloud-sdk-cloud-sql-proxy-linux-x86_64-20240412130805.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-sql-proxy" + ], + "details": { + "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", + "display_name": "Cloud SQL Proxy v2" + }, + "id": "cloud-sql-proxy-linux-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "LINUX" + ] + }, + "platform_required": false, + "version": { + "build_number": 20240412130805, + "version_string": "2.10.0" + } + }, + { + "data": { + "checksum": "83628225ad611dabac12a473c532f876992ea5cdcb822183812a6e21003506af", + "contents_checksum": "c58a80989336d672aca1b9ea393998fb5bd01339cf561197f14c497a91b84062", + "size": 13662947, + "source": "components/google-cloud-sdk-cloud-sql-proxy-windows-x86-20240412130805.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-sql-proxy" + ], + "details": { + "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", + "display_name": "Cloud SQL Proxy v2" + }, + "id": "cloud-sql-proxy-windows-x86", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20240412130805, + "version_string": "2.10.0" + } + }, + { + "data": { + "checksum": "5f9775a84500409f09cf4dc02d279e306414c4a555356ae7097c785349b9462a", + "contents_checksum": "45f653110069a220eec0f70bf65e54470ae1c682ea7a6f5f369fe6a2610192d2", + "size": 14417645, + "source": "components/google-cloud-sdk-cloud-sql-proxy-windows-x86_64-20240412130805.tar.gz", + "type": "tar" + }, + "dependencies": [ + "cloud-sql-proxy" + ], + "details": { + "description": "Provides cloud-sql-proxy executable. See https://github.com/GoogleCloudPlatform/cloud-sql-proxy", + "display_name": "Cloud SQL Proxy v2" + }, + "id": "cloud-sql-proxy-windows-x86_64", + "is_configuration": false, + "is_hidden": true, + "is_required": false, + "platform": { + "architectures": [ + "x86_64" + ], + "operating_systems": [ + "WINDOWS" + ] + }, + "platform_required": false, + "version": { + "build_number": 20240412130805, + "version_string": "2.10.0" } }, { @@ -2871,7 +3138,7 @@ }, "id": "cloud_sql_proxy", "is_configuration": false, - "is_hidden": false, + "is_hidden": true, "is_required": false, "platform": { "architectures": [ @@ -3322,10 +3589,10 @@ }, { "data": { - "checksum": "394b9a3441b3a88962ee3fe01e2b816671466ca55c244826adc1093395a08117", - "contents_checksum": "b22a86659b93e65751c75128448d23b9d935b9a85c46301498bc4054256aff86", - "size": 23893614, - "source": "components/google-cloud-sdk-core-20240229170130.tar.gz", + "checksum": "e8e87ff80c3f46ff4bce660c584ebe7bae8679366c9d2bf5ec5f98c06e450aa5", + "contents_checksum": "56ce80562703967dc39b2b05e6dd814e07cfe07a078706d9f0ad6ce0716495c8", + "size": 19446060, + "source": "components/google-cloud-sdk-core-20240503145345.tar.gz", "type": "tar" }, "dependencies": [ @@ -3346,8 +3613,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "2024.02.29" + "build_number": 20240503145345, + "version_string": "2024.05.03" } }, { @@ -4138,10 +4405,10 @@ }, { "data": { - "checksum": "199a922d9427440154dbd427650aac513dde9dcf5fb904f696011e208af16436", - "contents_checksum": "bd1cee79ccb1075e6174ce72da21507e22c9309c7d453ec4c0365c38184dbf72", - "size": 17398946, - "source": "components/google-cloud-sdk-gcloud-deps-20240229170130.tar.gz", + "checksum": "2678d4b85b8247cb896f38bb6741e6e30c9e5f2c65e495e85795131493ef5acc", + "contents_checksum": "91de55f1ec585b9e8326f529655b1c550739f8f864059b47e2d7554c4fc170a6", + "size": 17408040, + "source": "components/google-cloud-sdk-gcloud-deps-20240503145345.tar.gz", "type": "tar" }, "dependencies": [ @@ -4164,8 +4431,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "2024.02.29" + "build_number": 20240503145345, + "version_string": "2024.05.03" } }, { @@ -4401,10 +4668,10 @@ }, { "data": { - "checksum": "5002cd1d0b639317a879d8c6eaf1c8b65ae30d908be20168b3d1126a7a9931fb", - "contents_checksum": "be1175193dbcc96732f074ee8916e2d01bae057865ca4cc9af4fce96669a2e82", - "size": 6729281, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240229170130.tar.gz", + "checksum": "19aaaf05ce45d6a62dac77e167d4315563dcadddfa9838da2ac9bc9df4ccac62", + "contents_checksum": "b2c128b9a1602e364e4801df1f6ec76004cd84fa2ab25c9df1b309eec73377b3", + "size": 6857693, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240503145345.tar.gz", "type": "tar" }, "dependencies": [ @@ -4429,7 +4696,7 @@ }, "platform_required": false, "version": { - "build_number": 20240229170130, + "build_number": 20240503145345, "version_string": "" } }, @@ -4865,7 +5132,7 @@ }, "id": "istioctl", "is_configuration": false, - "is_hidden": true, + "is_hidden": false, "is_required": false, "platform": { "architectures": [ @@ -4880,15 +5147,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.20.311" + "version_string": "1.20.47" } }, { "data": { - "checksum": "e21e0b1b1a143e74b1b0ba7392ed4fdd1cf28323bd74ef59f116e218f49824fb", - "contents_checksum": "ea25e0ffad0fcd5877d24e86ef5b96be2e86446f432926385ebfc08590a9be36", - "size": 26043155, - "source": "components/google-cloud-sdk-istioctl-darwin-arm-20240229170130.tar.gz", + "checksum": "c5b61b4e3b0d5434e4610d706270b5701ef085fd35e1e53541876bb4e03d678a", + "contents_checksum": "a2bd9195d75037b1c96b9378109e6a2313d52476c19f5ca3e3d17767c70310ed", + "size": 26052154, + "source": "components/google-cloud-sdk-istioctl-darwin-arm-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -4912,16 +5179,16 @@ }, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "1.20.311" + "build_number": 20240412130805, + "version_string": "1.20.47" } }, { "data": { - "checksum": "e26416a75034738c5decb4e88b69f060849db045eb1a416dbe5def38ca036051", - "contents_checksum": "9ed26dc784a70ed4f98d845dac4ba8b298a90dcdfb169e665e1756cbbfadbfc7", - "size": 26886694, - "source": "components/google-cloud-sdk-istioctl-darwin-x86_64-20240229170130.tar.gz", + "checksum": "2f1b4a1df42ae31d4cd0b301c47d30f998497a701e301ff1a4f81902318b93a7", + "contents_checksum": "a41f542d1cb16bf4118643ded861c94ba3cd9dc378d601fd572042360f38e3dc", + "size": 26898803, + "source": "components/google-cloud-sdk-istioctl-darwin-x86_64-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -4945,16 +5212,16 @@ }, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "1.20.311" + "build_number": 20240412130805, + "version_string": "1.20.47" } }, { "data": { - "checksum": "5fbeafb59962e1f5e42b874caf897a151ce05f2082063e04edddd054be1b9b78", - "contents_checksum": "62e413e41af9e75ae3523f45e5e60063ce9363d9b73e7b5b427e6e451bbc6816", - "size": 22993370, - "source": "components/google-cloud-sdk-istioctl-linux-arm-20240229170130.tar.gz", + "checksum": "311368b6b4812b945dbe77c3921d89477bbc7a8dbbd90bc871a927621f4f564c", + "contents_checksum": "4fbd1efcce42b8e2ab3edff729239cb27ccdc0f4b005fe18f65062abd9ec9e70", + "size": 23005079, + "source": "components/google-cloud-sdk-istioctl-linux-arm-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -4978,16 +5245,16 @@ }, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "1.20.311" + "build_number": 20240412130805, + "version_string": "1.20.47" } }, { "data": { - "checksum": "167b9dc19cb7b64b5eca9e0efecf609a621eb18ce7ece2288a36038e1124658e", - "contents_checksum": "1d3a6f9870ab2b0b693927d32154cd44b4686079a9c117590cdc2b385b040869", - "size": 25190186, - "source": "components/google-cloud-sdk-istioctl-linux-x86_64-20240229170130.tar.gz", + "checksum": "5f9f4d0aee5adc83960591c9413e523e914c86538a08895958fba3d6610e2e92", + "contents_checksum": "4523dd63d1fd52a26170cb366da1bb492a631d36765bdb9b6037af42b70ef3b2", + "size": 25206798, + "source": "components/google-cloud-sdk-istioctl-linux-x86_64-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -5011,8 +5278,8 @@ }, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "1.20.311" + "build_number": 20240412130805, + "version_string": "1.20.47" } }, { @@ -5180,10 +5447,10 @@ }, { "data": { - "checksum": "e06b2f2bd331421fa8f8c5776b7370b793101232a8316c61420ebad9622e2709", - "contents_checksum": "d7c1385f3b9bedea994733230851e6d3548ea4be8f5014b1feadbf4ca2c6ca46", + "checksum": "8ce711be6e55790700edd6d6f7c03a2fa5a1c5b8cea7571aab75300e976b924c", + "contents_checksum": "90557d61aa4010c4cf40966c482a9560a6ebab9f66fe3858db13134d1a3766fc", "size": 35936, - "source": "components/google-cloud-sdk-kubectl-20240209195330.tar.gz", + "source": "components/google-cloud-sdk-kubectl-20240322135349.tar.gz", "type": "tar" }, "dependencies": [ @@ -5207,16 +5474,16 @@ "platform": {}, "platform_required": true, "version": { - "build_number": 20240209195330, - "version_string": "1.26.13" + "build_number": 20240322135349, + "version_string": "1.26.15" } }, { "data": { - "checksum": "ad4230981ddba174dc301d5ed31704c86819b99de90fc0a391d379197b221ff0", - "contents_checksum": "8208474ff6408f57a030648f9e0409eb66f854f95eb1cc8fc28897e3dae882b7", - "size": 76487537, - "source": "components/google-cloud-sdk-kubectl-darwin-arm-20240209195330.tar.gz", + "checksum": "893498f06440eac7fe42bd0c42e83ab1e2fd30a0bd1d53ddd8ebfebc27d8ca8a", + "contents_checksum": "71c9869732c57c7c66cec80e59ab20bcc2e94b1cc79dce1c8093b2f0862b1383", + "size": 91161627, + "source": "components/google-cloud-sdk-kubectl-darwin-arm-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5241,16 +5508,16 @@ }, "platform_required": true, "version": { - "build_number": 20240209195330, - "version_string": "1.26.13" + "build_number": 20240426154730, + "version_string": "1.26.15" } }, { "data": { - "checksum": "7154fc7e724a41ba9109fc4d3211fdfb24bb9c706f82175a0543158a74ea64f4", - "contents_checksum": "1db2fb77158d4aeb37b895ca7beb34d2380b6d7bda97e18189c03a235473a26f", - "size": 80131408, - "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20240209195330.tar.gz", + "checksum": "ddf25a006aeedb5e717d474dc695882caf35a4befaace22f28d9a4d0fee28bae", + "contents_checksum": "ac249c8eca65960152719c9440c197a0be335fa1d2e724a32e77418dacd6dd12", + "size": 96033579, + "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5275,16 +5542,16 @@ }, "platform_required": true, "version": { - "build_number": 20240209195330, - "version_string": "1.26.13" + "build_number": 20240426154730, + "version_string": "1.26.15" } }, { "data": { - "checksum": "655be0e96cc23f6e04c4ec176ef19d6ac4164f0093de7e6a5ab882128bacf3cc", - "contents_checksum": "69a8d347c6cc78a42b8ec340794632e449b2ceac8f7a8cf3e677f97743fa6e66", - "size": 72277260, - "source": "components/google-cloud-sdk-kubectl-linux-arm-20240209195330.tar.gz", + "checksum": "25279f7ff336d39f312dd6f363100b8329ad19e402c378230bfb2a8c4181325e", + "contents_checksum": "255cb5b298d9ddb4f81aa7571d452e3adab7c464e1c2b4686d1bfd5eec7e5abd", + "size": 86862918, + "source": "components/google-cloud-sdk-kubectl-linux-arm-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5309,16 +5576,16 @@ }, "platform_required": true, "version": { - "build_number": 20240209195330, - "version_string": "1.26.13" + "build_number": 20240426154730, + "version_string": "1.26.15" } }, { "data": { - "checksum": "37931d1405a46bac8833f106c35734512445fc218cc9f1e007604bb48cdee55b", - "contents_checksum": "8222dd939577e50f8ffc0f667d6a2ccbd88c8a0813925f4889a58d27b180ff98", - "size": 71637401, - "source": "components/google-cloud-sdk-kubectl-linux-x86-20240209195330.tar.gz", + "checksum": "6e8d0ea5ba1b88b82c902d869e54cb42d69cab4544e9b87190e8a9751b8e7510", + "contents_checksum": "5ef6f72d98198ce6ec9a380fab8925259fca9aef9e5afc22bef4f1d8d01c3cf4", + "size": 85033644, + "source": "components/google-cloud-sdk-kubectl-linux-x86-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5343,16 +5610,16 @@ }, "platform_required": true, "version": { - "build_number": 20240209195330, - "version_string": "1.26.13" + "build_number": 20240426154730, + "version_string": "1.26.15" } }, { "data": { - "checksum": "479be7e5c55b77eacb26a86afb8063ee0c22664eca0af154c6725c6d413f4631", - "contents_checksum": "0d9e46f2a36f34ac1d485901b2243bbedc5f66e54cb3d8e42172cbc6484075ea", - "size": 76232083, - "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20240209195330.tar.gz", + "checksum": "2463ae5fa3cdb8952183845b4b1d5a335edfb22716f38525441121a8233177f0", + "contents_checksum": "41dc3fa15a64ab76478e164cb48bfaf6e93bceaec8edc32772a20deec1a592ea", + "size": 91798182, + "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5377,8 +5644,8 @@ }, "platform_required": true, "version": { - "build_number": 20240209195330, - "version_string": "1.26.13" + "build_number": 20240426154730, + "version_string": "1.26.15" } }, { @@ -5411,15 +5678,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.5.0" + "version_string": "1.5.1" } }, { "data": { - "checksum": "ca1e67289f1d377b6fc300777cdd8853a4ebc7eb11c00db85a3e7394c8daea30", - "contents_checksum": "3d35d8343042427849f27fe09652e94dbb563ebb6026ded792641beb1c536ebd", - "size": 21674622, - "source": "components/google-cloud-sdk-kubectl-oidc-darwin-arm-20231201141418.tar.gz", + "checksum": "668657665d86db6d1c2ca53116f022799e9b6202d7e6e0080acd9a89f2e69667", + "contents_checksum": "55b5c287ac965c8cb331fcfa27cf8a7a346ceb103eef9e7ff603067a3b8d2217", + "size": 21872424, + "source": "components/google-cloud-sdk-kubectl-oidc-darwin-arm-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5443,16 +5710,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.5.0" + "build_number": 20240426154730, + "version_string": "1.5.1" } }, { "data": { - "checksum": "d8b175936d29c11412e099627cbc9d4bc4574e7201a48bd045714aa4d5039d97", - "contents_checksum": "b4c5609dd10b63e9946c1afaf9a6e242fe3b09cb0d5c0c453e4ead4fb173c4e2", - "size": 22732154, - "source": "components/google-cloud-sdk-kubectl-oidc-darwin-x86_64-20231201141418.tar.gz", + "checksum": "efee37ae3fd4c68bd04b7d851a3a737d4730d1d2c1ea1d1ae0ff1c4b9b415e2e", + "contents_checksum": "d5caa4ebe32784b39af30c044d1526cd2c9cfc468912f151c50591818f86981f", + "size": 22957587, + "source": "components/google-cloud-sdk-kubectl-oidc-darwin-x86_64-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5476,16 +5743,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.5.0" + "build_number": 20240426154730, + "version_string": "1.5.1" } }, { "data": { - "checksum": "da25e182095d25746563ded62b84c614f6ba87514e751e1f445b8ef9ddbcf239", - "contents_checksum": "f1bd3477dd4ad77ed8c02631cfd0b7e102000e6bac495dcd3fb69daf6b21ba93", - "size": 21172499, - "source": "components/google-cloud-sdk-kubectl-oidc-linux-arm-20231201141418.tar.gz", + "checksum": "c1bffc495c0f18b7a8b7231815d03ad050d8f7da54e3ae8fb252f30bd9774553", + "contents_checksum": "ac25a44fb809f2b4c158abccb88b1a2e66433be79bf46092522f07b02d72ab68", + "size": 21399468, + "source": "components/google-cloud-sdk-kubectl-oidc-linux-arm-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5509,16 +5776,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.5.0" + "build_number": 20240426154730, + "version_string": "1.5.1" } }, { "data": { - "checksum": "94eb2344e8f1a5cff5b2f1db0c35e3cfc378336f148a701ac94e4111f17069f1", - "contents_checksum": "9ddfa977b16e32f97c5d5ad574ff09ae06f67b87f218f45a178cfae5f88d4355", - "size": 22854824, - "source": "components/google-cloud-sdk-kubectl-oidc-linux-x86_64-20231201141418.tar.gz", + "checksum": "314b8b36331fc2b67fee555fcfb7c0aa1c4c742dcb995164f9822fc513f269de", + "contents_checksum": "a7e6a84feb050b265084ae1ea6d8bd0898258b76e7f6226c01d9d8e65fceeb5d", + "size": 23109484, + "source": "components/google-cloud-sdk-kubectl-oidc-linux-x86_64-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5542,16 +5809,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.5.0" + "build_number": 20240426154730, + "version_string": "1.5.1" } }, { "data": { - "checksum": "386b201a127ea6723ba4f4ac943c596310d03aa0568d947f23980577fc0c5685", - "contents_checksum": "72ccfee0b039eaf5d4bd5445044806c84a1af5d55318de032a372af0fdf779c4", - "size": 23111830, - "source": "components/google-cloud-sdk-kubectl-oidc-windows-x86_64-20231201141418.tar.gz", + "checksum": "b72cb005890e61307350e45fed931c783f9954a18249210059f780b42ae0c6fc", + "contents_checksum": "cabcb7396bd79cf1e80baeb1a53da5e56497ce49a97fbd9e33127da81999e0d7", + "size": 23361379, + "source": "components/google-cloud-sdk-kubectl-oidc-windows-x86_64-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5575,16 +5842,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.5.0" + "build_number": 20240426154730, + "version_string": "1.5.1" } }, { "data": { - "checksum": "80b067c1eed2401d32b2078e9296322ceecad8de4903105c8627a182bc626f89", - "contents_checksum": "008b98a6902a2d260427a6067f7b26278c947c3da0f65a135bea6806906de7cc", - "size": 75077053, - "source": "components/google-cloud-sdk-kubectl-windows-x86-20240209195330.tar.gz", + "checksum": "ea209e06d08eed40e21b67d72464b125a44c0bff85e846d44aef998ddfe5fc1f", + "contents_checksum": "b4a4f3ff7f7b3c687cf47a38813226385f7e893fdcd9a7a5d60b1dbdf99ae2a3", + "size": 89369395, + "source": "components/google-cloud-sdk-kubectl-windows-x86-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5611,16 +5878,16 @@ }, "platform_required": true, "version": { - "build_number": 20240209195330, - "version_string": "1.26.13" + "build_number": 20240426154730, + "version_string": "1.26.15" } }, { "data": { - "checksum": "a632645797fb65db3f112548543ce4f7b1e048963f264bf5bc9e318f9f85cda2", - "contents_checksum": "bcdf97a387126e7b831c903b905bc96af608ff2fc5d2013482280535f077c21c", - "size": 77301897, - "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20240209195330.tar.gz", + "checksum": "0841109ca38d58e3dde3b54854b52ca1a0ac3405cbd7c76ea23cad5c31bdad2b", + "contents_checksum": "d024e22580bf9c9e3e35a5952241cae4681411e9b33c76f19b1b4b623b7269b1", + "size": 94204602, + "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20240426154730.tar.gz", "type": "tar" }, "dependencies": [ @@ -5647,8 +5914,8 @@ }, "platform_required": true, "version": { - "build_number": 20240209195330, - "version_string": "1.26.13" + "build_number": 20240426154730, + "version_string": "1.26.15" } }, { @@ -6398,15 +6665,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.17.2-rc.1" + "version_string": "1.17.3-rc.2" } }, { "data": { - "checksum": "3fd0c679ed6a308edc3460a04e939ef67152e9717ebac4c18b38e98edac51cea", - "contents_checksum": "bc7d9a0ef3f3a61d1d4d59a500ec650acae2425ab17b723bc4c2ad5d05a0837a", - "size": 29981784, - "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20240229170130.tar.gz", + "checksum": "d419aaa0a419d8a01b025d5b79372e92d0b08def255e7a8bfb0361c8332267f6", + "contents_checksum": "d3f8f98cdba8da0aadf0a19d8503955023f70a2d8045838b893eb3e0b0e345ce", + "size": 29981660, + "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20240322135349.tar.gz", "type": "tar" }, "dependencies": [ @@ -6430,16 +6697,16 @@ }, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "1.17.2-rc.1" + "build_number": 20240322135349, + "version_string": "1.17.3-rc.2" } }, { "data": { - "checksum": "93d532890f146415a74734c921ded0e8bdd408d3d9424beb6bbb7113530ec5fe", - "contents_checksum": "b429ab3ef37405bc06cbd594edc0730dd162f37a933fa854597a1bd5e59c761d", - "size": 30144691, - "source": "components/google-cloud-sdk-nomos-linux-x86_64-20240229170130.tar.gz", + "checksum": "d744e544fc05b996439c39e36454ec902f2998bcc9bf9d32337aaeb34bbb604e", + "contents_checksum": "d0458512f4a0047c7ba2504246d8428fc0f8de3fec56b37b69b43e62ceb2af75", + "size": 30144536, + "source": "components/google-cloud-sdk-nomos-linux-x86_64-20240322135349.tar.gz", "type": "tar" }, "dependencies": [ @@ -6463,8 +6730,8 @@ }, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "1.17.2-rc.1" + "build_number": 20240322135349, + "version_string": "1.17.3-rc.2" } }, { @@ -6744,10 +7011,10 @@ }, { "data": { - "checksum": "a080b9775844f83bcce039e5c9dff7f4c87d69ae7cf6f0cc85a3c9212b8361ed", - "contents_checksum": "bcc50b05f18aabe3fd90857ec8933e7580ee9212d764d3efb9ac6ef26b01a9fa", - "size": 66384213, - "source": "components/google-cloud-sdk-pubsub-emulator-20240229170130.tar.gz", + "checksum": "3bafcd5a4ec4e65c540640a97737e4a5e596795e73ead6f4fd75591879c9e529", + "contents_checksum": "956782b7d4b6b2057f339a7978728426fef50f7a99c888e1b1342eaf2f9ee8d9", + "size": 66777134, + "source": "components/google-cloud-sdk-pubsub-emulator-20240419141706.tar.gz", "type": "tar" }, "dependencies": [ @@ -6764,8 +7031,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "0.8.12" + "build_number": 20240419141706, + "version_string": "0.8.14" } }, { @@ -6799,15 +7066,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "2.9.0" + "version_string": "2.11.1" } }, { "data": { - "checksum": "badd2854a9b5a3b4d3b8b55c163656776778c572eba854262bfd637c803ca3b7", - "contents_checksum": "45e2f3eb2703f29f735cbc820e9d4004f1e95bea1ab96e698ded74f2a5de857d", - "size": 24426195, - "source": "components/google-cloud-sdk-skaffold-darwin-arm-20231110155547.tar.gz", + "checksum": "53c4ab91c11e5cbd68568f8599906e6e5192f3b4019e9761fddfdc45f9af7845", + "contents_checksum": "d24345e52dde87a54de371fe79441dd90afe4fe3079bebce79c4f7043f8ac506", + "size": 23881902, + "source": "components/google-cloud-sdk-skaffold-darwin-arm-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -6832,16 +7099,16 @@ }, "platform_required": false, "version": { - "build_number": 20231110155547, - "version_string": "2.9.0" + "build_number": 20240412130805, + "version_string": "2.11.1" } }, { "data": { - "checksum": "cba0d4046df4764747f9a15ebe061fec60f9f768d1079041feea2321c5cd5e76", - "contents_checksum": "941bc43d4633be69ed64eadf7ad3ba477929bd6dcb519dc668b77f29b5115a57", - "size": 26530698, - "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20231110155547.tar.gz", + "checksum": "b7dcae5f81e8a66ecf964d9a7e6c009be0be26770daa64470c344a0824a70d6c", + "contents_checksum": "a1845e050a4fc99ce6bd24c4c8e30e9c7fe0baa7ca6d89ade4a9ac945a1335fd", + "size": 26019391, + "source": "components/google-cloud-sdk-skaffold-darwin-x86_64-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -6866,16 +7133,16 @@ }, "platform_required": false, "version": { - "build_number": 20231110155547, - "version_string": "2.9.0" + "build_number": 20240412130805, + "version_string": "2.11.1" } }, { "data": { - "checksum": "45cb0e94d47b3b28db5d8dda5fbd1dd7fbfad96936ce3bbbdce3f2f8be63a093", - "contents_checksum": "2f36d4b1b0eab170b21fe0df2964aa31d79694a8860070c32b7eb7bc471a74aa", - "size": 22439050, - "source": "components/google-cloud-sdk-skaffold-linux-arm-20231110155547.tar.gz", + "checksum": "0f285235cc2840a8e62d5e8591015c709287ebf01bd8f95b204a5b4d4b019b2a", + "contents_checksum": "061859c0ad969a5cb9a3bcd0b34760963c8c842b9902f9b22e97df4e94ff7a65", + "size": 23133354, + "source": "components/google-cloud-sdk-skaffold-linux-arm-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -6900,16 +7167,16 @@ }, "platform_required": false, "version": { - "build_number": 20231110155547, - "version_string": "2.9.0" + "build_number": 20240412130805, + "version_string": "2.11.1" } }, { "data": { - "checksum": "6add62f50ef3b9d77259177118ee30251c2f07074fc4555d516a3ae5dfbbb3b6", - "contents_checksum": "065a00f4d25312efad8a854d21809862d9f0e41588511a1c1930ed5c34e7e57b", - "size": 24544699, - "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20231110155547.tar.gz", + "checksum": "3e7164c21840917c2f565998cdbd20be3972ba5cc09ddad31f01cbd0233c34f6", + "contents_checksum": "99c37298757f59403dc8b7b080419ccb62bdb23fb88f559bd31b603cb9a2b4d6", + "size": 25252692, + "source": "components/google-cloud-sdk-skaffold-linux-x86_64-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -6934,16 +7201,16 @@ }, "platform_required": false, "version": { - "build_number": 20231110155547, - "version_string": "2.9.0" + "build_number": 20240412130805, + "version_string": "2.11.1" } }, { "data": { - "checksum": "577504b2686302f74a7e00bebe9a561b0caa15d3294dc0c9e15dba2d9d745f32", - "contents_checksum": "940d470dd53773d3e907de4d80ef70df247824167fcb95a05494e66e6bb28c9a", - "size": 25035980, - "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20231110155547.tar.gz", + "checksum": "8f864d4189e19ce50bcb52ba61802d70e4e83bb18b13ff32ded5086a7c867fe5", + "contents_checksum": "c340681db503b83f07f4ac5ea4f00c4c8db288eaaf6e19ddf6e4b52c29d13e48", + "size": 25741614, + "source": "components/google-cloud-sdk-skaffold-windows-x86_64-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -6968,8 +7235,8 @@ }, "platform_required": false, "version": { - "build_number": 20231110155547, - "version_string": "2.9.0" + "build_number": 20240412130805, + "version_string": "2.11.1" } }, { @@ -6995,15 +7262,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "3.2.2" + "version_string": "3.2.4" } }, { "data": { - "checksum": "6f55289b6cdb9206c110e5e1f3e040e4c9a69aa129c5c0caae71bc668b17bca9", - "contents_checksum": "2284e73fc19acea54651526b45fd808530a9272fd56b0c553386bbfaac02f729", - "size": 24615874, - "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20240112150613.tar.gz", + "checksum": "3772182f6246ce7ee4a24d4af5f07a0b0ce718d563c80439baabd8cf13318505", + "contents_checksum": "49868f973b97b24f2f042d5a3b05105ef0c4ba8974c9268ecaa1a232a735d902", + "size": 24679221, + "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20240412130805.tar.gz", "type": "tar" }, "dependencies": [ @@ -7027,8 +7294,8 @@ }, "platform_required": false, "version": { - "build_number": 20240112150613, - "version_string": "3.2.2" + "build_number": 20240412130805, + "version_string": "3.2.4" } }, { @@ -7056,10 +7323,10 @@ }, { "data": { - "checksum": "d1e1fda36ce35e058bf23f8cf114acd776c2891227f23cf3b9d78fb35f89b523", - "contents_checksum": "8a106316d2efe6baaa483a8677c9f0f807b43189ad3cbe1cefa8055e7500a318", - "size": 3485676, - "source": "components/google-cloud-sdk-ssh-tools-windows-20211112160846.tar.gz", + "checksum": "120bd981566b18fae7041191f60980d99bb654e8fc846cc0eabf5de1719981e9", + "contents_checksum": "1fa1d0fcc0a4fa9fc465722a33fd5f89a0ad09e014840594557461409535ca81", + "size": 3783443, + "source": "components/google-cloud-sdk-ssh-tools-windows-20240419141706.tar.gz", "type": "tar" }, "dependencies": [ @@ -7080,7 +7347,7 @@ }, "platform_required": false, "version": { - "build_number": 20211112160846, + "build_number": 20240419141706, "version_string": "" } }, @@ -7284,10 +7551,10 @@ }, { "data": { - "checksum": "274f5f8fa50423d400d3df880f06bab3a10fadf9ce9a4b65bbb00d5ef84afe3a", - "contents_checksum": "d3d35039158b47815d55b4cf508dccc25076c4250104e4277e3555782fc81317", - "size": 51453272, - "source": "components/google-cloud-sdk-tests-20240229170130.tar.gz", + "checksum": "f90e47ac6bbf129c724555e5f7ad3dc105de5059d1cc9ab77c99f52a92fae0cb", + "contents_checksum": "b515c8b801cde8a8696832a5dbf16d8f1e9adcc4f4651db36fda76e41b008809", + "size": 56934482, + "source": "components/google-cloud-sdk-tests-20240503145345.tar.gz", "type": "tar" }, "dependencies": [ @@ -7304,8 +7571,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240229170130, - "version_string": "2024.02.29" + "build_number": 20240503145345, + "version_string": "2024.05.03" } } ], @@ -7324,11 +7591,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20240229170130, + "revision": 20240503145345, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "467.0.0" + "version": "475.0.0" } diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index 09f56aa4a77d..6150137ea218 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "467.0.0"; + version = "475.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-467.0.0-linux-x86_64.tar.gz"; - sha256 = "09qkz9zw23rza5siz77m52nzfyikdzszrqsl200z2zs2cm69g50w"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-475.0.0-linux-x86_64.tar.gz"; + sha256 = "0yqa2c91n948yj8gxjm91ccdb99dzppimf1npckplzhc2bp7shiw"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-467.0.0-darwin-x86_64.tar.gz"; - sha256 = "0il26ivqym4n94kjb22pcizgmy6j1p70l2yxjfrsj8i6vhwi3qbq"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-475.0.0-darwin-x86_64.tar.gz"; + sha256 = "078wwvjhpc9a56v03y6433zpwaj3cg3y9xrbg9ww5fdqvcc82q1z"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-467.0.0-linux-arm.tar.gz"; - sha256 = "1d72l35jcxg7r2r8ajhyigadj8ydp2k1g25kw6rkwvlg4whv8d7b"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-475.0.0-linux-arm.tar.gz"; + sha256 = "1wfr6lz62y232wzp7nn3mr18qd4wmw47b3p3sjff0f39jfmcyq30"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-467.0.0-darwin-arm.tar.gz"; - sha256 = "0yd9hjn8pgaih7hj3hhbl70apcmg5b3gkx758r8m9823vhqkk5wm"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-475.0.0-darwin-arm.tar.gz"; + sha256 = "1cjhbq0qsy35nwl5h1f8xp4d67a6hwmfjzdk349g1npf5dhhdd94"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-467.0.0-linux-x86.tar.gz"; - sha256 = "0wag0qjzh0m6kmpzvmzvr7sy74w20xzgysljwjfravqr1xmw9m48"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-475.0.0-linux-x86.tar.gz"; + sha256 = "1cj5321lj3dbb48h35qlxllrzzg90lwq92n71c2y4s2mqk33543h"; }; }; } From 5637da9a06795d561e5a6dbcd66ff748b7e57b25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 May 2024 10:47:13 +0200 Subject: [PATCH 200/246] home-assistant: pin homematicip at 1.1.0 --- pkgs/servers/home-assistant/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 00b1a4de90bb..721ce0e19e01 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -179,6 +179,16 @@ let }; }); + homematicip = super.homematicip.overridePythonAttrs rec { + version = "1.1.0"; + src = fetchFromGitHub { + owner = "hahn-th"; + repo = "homematicip-rest-api"; + rev = "refs/tags/${version}"; + hash = "sha256-tx7/amXG3rLdUFgRPQcuf57qkBLAPxPWjLGSO7MrcWU="; + }; + }; + intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec { version = "2.2.2"; src = fetchFromGitHub { From 414c15a78653c124ffd98f174ce1f1af10289e2f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 14 May 2024 10:50:44 +0200 Subject: [PATCH 201/246] schleuder: mark broken on darwin Various gems have failed to build since 2023-11, and it is unlikely that we maintain schleuder on darwin. --- pkgs/tools/security/schleuder/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/schleuder/default.nix b/pkgs/tools/security/schleuder/default.nix index 97173fdc3e19..95b54d3de724 100644 --- a/pkgs/tools/security/schleuder/default.nix +++ b/pkgs/tools/security/schleuder/default.nix @@ -1,6 +1,7 @@ { lib , bundlerApp , ruby +, stdenv , bundlerUpdateScript , nixosTests }: @@ -23,6 +24,7 @@ bundlerApp { }; meta = with lib; { + broken = stdenv.isDarwin; description = "Schleuder is an encrypting mailing list manager with remailing-capabilities"; longDescription = '' Schleuder is a group's email-gateway: subscribers can exchange From dca8af7ebfaa953302523d94d77f91e30598361e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 14 May 2024 11:13:57 +0200 Subject: [PATCH 202/246] python311Packages.testcontainers: 4.4.0 -> 4.4.1 Changelog: https://github.com/testcontainers/testcontainers-python/releases/tag/testcontainers-v4.4.1 --- pkgs/development/python-modules/testcontainers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/testcontainers/default.nix b/pkgs/development/python-modules/testcontainers/default.nix index 66607ed06fff..975537d1fc88 100644 --- a/pkgs/development/python-modules/testcontainers/default.nix +++ b/pkgs/development/python-modules/testcontainers/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "testcontainers"; - version = "4.4.0"; + version = "4.4.1"; disabled = pythonOlder "3.9"; pyproject = true; @@ -20,14 +20,14 @@ buildPythonPackage rec { owner = "testcontainers"; repo = "testcontainers-python"; rev = "refs/tags/testcontainers-v${version}"; - hash = "sha256-1iwbfArEjYxpEpMlmJ8rzVLXA8OSNT7ozkpTVTIL91U="; + hash = "sha256-osWppbptWpBSHcrHlAqNpn6j2n/qQ7iCobH3TVqB2bc="; }; postPatch = '' echo "${version}" > VERSION ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; From 52679174d38f69f428380d61ab8dd84deb492c26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 11:14:50 +0200 Subject: [PATCH 203/246] gotestwaf: format with nixfmt --- pkgs/tools/security/gotestwaf/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index b63b30519796..28305ceb4e8e 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -1,8 +1,9 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, gotestwaf -, testers +{ + lib, + buildGoModule, + fetchFromGitHub, + gotestwaf, + testers, }: buildGoModule rec { From 6420d9b698186a2d08de07075f558e501816b825 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 11:26:50 +0200 Subject: [PATCH 204/246] python312Packages.linknlink: 0.2.3 -> 0.2.4 Diff: https://github.com/xuanxuan000/python-linknlink/compare/refs/tags/0.2.3...0.2.4 Changelog: https://github.com/xuanxuan000/python-linknlink/releases/tag/0.2.4 --- pkgs/development/python-modules/linknlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/linknlink/default.nix b/pkgs/development/python-modules/linknlink/default.nix index a224f81ac596..2fd6c15d6b00 100644 --- a/pkgs/development/python-modules/linknlink/default.nix +++ b/pkgs/development/python-modules/linknlink/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "linknlink"; - version = "0.2.3"; + version = "0.2.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "xuanxuan000"; repo = "python-linknlink"; rev = "refs/tags/${version}"; - hash = "sha256-kV9NCe0u3Z0J9bg1kko5D9fQvyqWTN7v3cVcNQvO0g0="; + hash = "sha256-ObPEcdDHi+SPFjuVKBtu7/5/IgHcam+IWblxxS3+mmI="; }; build-system = [ setuptools ]; From 54ba3732f13a553a58f15c86220b93c618b2ba0f Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sat, 4 May 2024 22:18:33 +1000 Subject: [PATCH 205/246] hostapd: add "wpa2-sha1" to authentication.mode enum This is required for some Kindles (e.g. Kindle Paperwhite 7th Gen), and printers (e.g. Brother MFC-J4440DW). OpenWRT typically adds "wpa_key_mgmt = WPA-PSK", per https://github.com/openwrt/openwrt/blob/3f28c422ba7ca06efd41686fd2f9e664f7e8a12e/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh#L44-L71 --- nixos/modules/services/networking/hostapd.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 1bef5a1f0a9e..b678656f2e04 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -687,7 +687,7 @@ in { authentication = { mode = mkOption { default = "wpa3-sae"; - type = types.enum ["none" "wpa2-sha256" "wpa3-sae-transition" "wpa3-sae"]; + type = types.enum ["none" "wpa2-sha1" "wpa2-sha256" "wpa3-sae-transition" "wpa3-sae"]; description = '' Selects the authentication mode for this AP. @@ -695,7 +695,9 @@ in { and create an open AP. Use {option}`settings` together with this option if you want to configure the authentication manually. Any password options will still be effective, if set. - - {var}`"wpa2-sha256"`: WPA2-Personal using SHA256 (IEEE 802.11i/RSN). Passwords are set + - {var}`"wpa2-sha1"`: Not recommended. WPA2-Personal using HMAC-SHA1. Passwords are set + using {option}`wpaPassword` or preferably by {option}`wpaPasswordFile` or {option}`wpaPskFile`. + - {var}`"wpa2-sha256"`: WPA2-Personal using HMAC-SHA256 (IEEE 802.11i/RSN). Passwords are set using {option}`wpaPassword` or preferably by {option}`wpaPasswordFile` or {option}`wpaPskFile`. - {var}`"wpa3-sae-transition"`: Use WPA3-Personal (SAE) if possible, otherwise fallback to WPA2-SHA256. Only use if necessary and switch to the newer WPA3-SAE when possible. @@ -812,7 +814,7 @@ in { Warning: These entries will get put into a world-readable file in the Nix store! Using {option}`saePasswordFile` instead is recommended. - Not used when {option}`mode` is {var}`"wpa2-sha256"`. + Not used when {option}`mode` is {var}`"wpa2-sha1"` or {var}`"wpa2-sha256"`. ''; type = types.listOf (types.submodule { options = { @@ -884,7 +886,7 @@ in { parameters doesn't matter: `[|mac=][|vlanid=][|pk=][|id=]` - Not used when {option}`mode` is {var}`"wpa2-sha256"`. + Not used when {option}`mode` is {var}`"wpa2-sha1"` or {var}`"wpa2-sha256"`. ''; }; @@ -959,6 +961,9 @@ in { } // optionalAttrs (bssCfg.authentication.mode == "wpa3-sae-transition") { wpa = 2; wpa_key_mgmt = "WPA-PSK-SHA256 SAE"; + } // optionalAttrs (bssCfg.authentication.mode == "wpa2-sha1") { + wpa = 2; + wpa_key_mgmt = "WPA-PSK"; } // optionalAttrs (bssCfg.authentication.mode == "wpa2-sha256") { wpa = 2; wpa_key_mgmt = "WPA-PSK-SHA256"; @@ -1186,8 +1191,8 @@ in { message = ''hostapd radio ${radio} bss ${bss}: uses WPA3-SAE in transition mode requires defining both a wpa password option and a sae password option''; } { - assertion = auth.mode == "wpa2-sha256" -> countWpaPasswordDefinitions == 1; - message = ''hostapd radio ${radio} bss ${bss}: uses WPA2-SHA256 which requires defining a wpa password option''; + assertion = (auth.mode == "wpa2-sha1" || auth.mode == "wpa2-sha256") -> countWpaPasswordDefinitions == 1; + message = ''hostapd radio ${radio} bss ${bss}: uses WPA2-PSK which requires defining a wpa password option''; } ]) radioCfg.networks)) From 9c999054b875d9032a34e7c912168cc9dedc96bd Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 14 May 2024 11:50:49 +0200 Subject: [PATCH 206/246] Revert "pkgsMusl.libeatmydata: fix build" This reverts commit c988fcc9b0cffbd2684e996d77a871f32741b3b8. The patch is no longer necessary since upstream commit 1d06f46 ("Fix compile error with musl libc"). --- pkgs/development/libraries/libeatmydata/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 7be484538ab1..2a76731829a7 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , autoreconfHook , strace , which @@ -18,14 +17,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-0lrYDW51/KSr809whGwg9FYhzcLRfmoxipIgrK1zFCc="; }; - patches = [ - # Fixes "error: redefinition of 'open'" on musl - (fetchpatch2 { - url = "https://raw.githubusercontent.com/void-linux/void-packages/861ac185a6b60134292ff93d40e40b5391d0aa8e/srcpkgs/libeatmydata/patches/musl.patch"; - hash = "sha256-MZfTgf2Qn94UpPlYNRM2zK99iKQorKQrlbU5/1WJhJM="; - }) - ]; - postPatch = '' patchShebangs . ''; From 6dd36412f26cdccbf74b3ccfcb8cb1613d418e37 Mon Sep 17 00:00:00 2001 From: Leah Amelia Chen Date: Mon, 13 May 2024 20:58:02 +0200 Subject: [PATCH 207/246] tartan: 0.3.0-unstable-2021-12-13 -> 0.3.0-unstable-2023-10-11 Also reformatted with `nixfmt-rfc-style` and moved to `by-name` --- .../ta/tartan/package.nix} | 31 ++++++++++--------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 16 insertions(+), 17 deletions(-) rename pkgs/{development/tools/analysis/tartan/default.nix => by-name/ta/tartan/package.nix} (67%) diff --git a/pkgs/development/tools/analysis/tartan/default.nix b/pkgs/by-name/ta/tartan/package.nix similarity index 67% rename from pkgs/development/tools/analysis/tartan/default.nix rename to pkgs/by-name/ta/tartan/package.nix index f56a6260e7f1..d7d4d4a6f745 100644 --- a/pkgs/development/tools/analysis/tartan/default.nix +++ b/pkgs/by-name/ta/tartan/package.nix @@ -1,25 +1,26 @@ -{ stdenv -, lib -, fetchFromGitLab -, meson -, ninja -, pkg-config -, llvmPackages -, gobject-introspection -, glib -, unstableGitUpdater +{ + stdenv, + lib, + fetchFromGitLab, + meson, + ninja, + pkg-config, + llvmPackages, + gobject-introspection, + glib, + unstableGitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "tartan"; - version = "0.3.0-unstable-2021-12-23"; + version = "0.3.0-unstable-2023-10-11"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "tartan"; repo = "tartan"; - rev = "bd4ea95d8b3ce1258491e9fac7fcc37d2b241a16"; - sha256 = "l3duPt8Kh/JljzOV+Dm26XbS7gZ+mmFfYUYofWSJRyo="; + rev = "4a7c945535d746d3d874ebebc0217715d674a862"; + hash = "sha256-DYvbBGgytf1JOYKejZB+ReehD8iKm1n4BhMmLQURay0="; }; nativeBuildInputs = [ @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "Tools and Clang plugins for developing code with GLib"; - homepage = "https://freedesktop.org/wiki/Software/tartan"; + homepage = "https://gitlab.freedesktop.org/tartan/tartan"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6aab5726b385..a49bfccbf7e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13471,8 +13471,6 @@ with pkgs; tarssh = callPackage ../servers/tarssh { }; - tartan = callPackage ../development/tools/analysis/tartan { }; - tartube = callPackage ../applications/video/tartube { }; tartube-yt-dlp = callPackage ../applications/video/tartube { From 9ae49e368a6cb4a163e2852f3a0183ba1b3ff105 Mon Sep 17 00:00:00 2001 From: Jakob Beckmann Date: Sat, 4 May 2024 14:31:59 +0200 Subject: [PATCH 208/246] chore: add luajitPackages.luatext, lua51Packages.luatext, lua52Packages.luatext, lua53Packages.luatext, lua54Packages.luatext --- maintainers/scripts/luarocks-packages.csv | 1 + .../lua-modules/generated-packages.nix | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 08cc75b346ee..b3d958ef7d36 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -85,6 +85,7 @@ luasocket,,,,,, luasql-sqlite3,,,,,,vyp luassert,,,,,, luasystem,,,,,, +luatext,https://github.com/f4z3r/luatext,,,,, luaunbound,,,,,, luaunit,,,,,,lockejan luautf8,,,,,,pstn diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index bccfd1d99e70..46f0d5310cfa 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2108,6 +2108,30 @@ buildLuarocksPackage { }; }) {}; +luatext = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }: +buildLuarocksPackage { + pname = "luatext"; + version = "1.2.1-0"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luatext-1.2.1-0.rockspec"; + sha256 = "12ia4ibihd537mjmvdasnwgkinaygqwk03bsj3s0qrfhy6yz84ka"; + }).outPath; + src = fetchFromGitHub { + owner = "f4z3r"; + repo = "luatext"; + rev = "v1.2.1"; + hash = "sha256-StxCmjSSy3ok0hNkKTQyq4yS1LfX980R5pULCUjLPek="; + }; + + disabled = luaOlder "5.1"; + + meta = { + homepage = "https://github.com/f4z3r/luatext/tree/main"; + description = "A small library to print colored text"; + license.fullName = "MIT"; + }; +}) {}; + luaunbound = callPackage({ buildLuarocksPackage, fetchurl, luaAtLeast, luaOlder }: buildLuarocksPackage { pname = "luaunbound"; From 88369ef55bd6cd77a6aaf68a2ed3071bac272257 Mon Sep 17 00:00:00 2001 From: Jakob Beckmann Date: Tue, 14 May 2024 12:35:34 +0200 Subject: [PATCH 209/246] fix: remove link to git repo on luatext luarock --- maintainers/scripts/luarocks-packages.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index b3d958ef7d36..0091e93b7d58 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -85,7 +85,7 @@ luasocket,,,,,, luasql-sqlite3,,,,,,vyp luassert,,,,,, luasystem,,,,,, -luatext,https://github.com/f4z3r/luatext,,,,, +luatext,,,,,, luaunbound,,,,,, luaunit,,,,,,lockejan luautf8,,,,,,pstn From bc5e4137c56b0b7c83742f3766c30ecb599b500c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 10:53:35 +0000 Subject: [PATCH 210/246] fastfetch: 2.11.5 -> 2.12.0 --- pkgs/by-name/fa/fastfetch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index ad72772d2d9c..b4a56bb6cad3 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -47,13 +47,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.11.5"; + version = "2.12.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-5Chyw4+U2n935YP/Msw8PJ+5iLMES71O+uABn6nVtiI="; + hash = "sha256-4/9LRXDUVd/8cAxfbyAj9so13bvKe/A9uu0mEYehlj4="; }; outputs = [ "out" "man" ]; From aeb5d660485cb574140f503da6d68e27cc13bcd8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 10:58:22 +0000 Subject: [PATCH 211/246] scala-cli: 1.3.0 -> 1.3.1 --- .../tools/build-managers/scala-cli/sources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index e07a11c40d74..aa8a580f45ac 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.3.0", + "version": "1.3.1", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "140klmqcv8cjnznsn35vba7mgmifrp9p776n39m689hkprzz474w" + "sha256": "04piwgd7jy7m4mx263lmlxfwh839q02b9jzycrr9bydqgfx7i0sk" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1vxq4j2slrdvxzq0chm8nggdrrj3fdb7q1qqbhf83vlirgrf9da1" + "sha256": "0f01ilxr7zc0p6jcmn034j16ynjv1r2miik25pqlhcafjhv9sp20" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "0df8jilv5hzka9xhwhhgq7imw4xik2ybdzh318ka77rwd58wy5yy" + "sha256": "1yj49fskajf1fffkxh5hyg3vcrxyhjgcha1hj61dw0iblazfa440" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0rw40xqchw3s07acyn2n35z0nlf7fyrvyixhl41wf28q999kbxwn" + "sha256": "1kr035l4vwv76041yy82347f01kvbl8n676jd3dayzw48xg6j5l2" } } } From 7314d335b32f0264e580bf79ae5a3a169160cfa7 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Tue, 14 May 2024 13:03:45 +0200 Subject: [PATCH 212/246] wgnord: add platforms.linux to meta --- pkgs/applications/networking/wgnord/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/wgnord/default.nix b/pkgs/applications/networking/wgnord/default.nix index 0e73d07616a7..e7a34522a10d 100644 --- a/pkgs/applications/networking/wgnord/default.nix +++ b/pkgs/applications/networking/wgnord/default.nix @@ -62,5 +62,6 @@ resholve.mkDerivation rec { maintainers = with lib.maintainers; [ urandom ]; license = licenses.mit; mainProgram = "wgnord"; + platforms = platforms.linux; }; } From f89a44100717d8a2aa9c2ee9cae70e3b3f9b484e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 11:16:55 +0000 Subject: [PATCH 213/246] jfrog-cli: 2.56.0 -> 2.56.1 --- pkgs/tools/misc/jfrog-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/jfrog-cli/default.nix b/pkgs/tools/misc/jfrog-cli/default.nix index cc778b6f6692..ac6696bbb7fe 100644 --- a/pkgs/tools/misc/jfrog-cli/default.nix +++ b/pkgs/tools/misc/jfrog-cli/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.56.0"; + version = "2.56.1"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-a7zCPyKV9kZ34XxVBYotcMvXUVrieunFpKGBK1Jhvo4="; + hash = "sha256-oUICnpVHRNCauWEplz7xH6AdP6CbbYX/Uy/QUPjwGHc="; }; - vendorHash = "sha256-q0PXbLTS5Po3xTK+CkU7BtZ6tk1PfH3zVAVK1IbmitY="; + vendorHash = "sha256-zQjOOUlqL0Mj2DKHiG9rOfu41SKMO7C99JBJDycXAs4="; # Upgrade the Go version during the vendoring FOD build because it fails otherwise. overrideModAttrs = _: { From b03b5dcd8efa961b2bf2e5c148edfa811c5c8fbe Mon Sep 17 00:00:00 2001 From: Patka Date: Tue, 14 May 2024 12:32:54 +0200 Subject: [PATCH 214/246] trayscale: restrict to linux platform --- pkgs/applications/networking/trayscale/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index 72b204e11f8e..e6960e298713 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -52,5 +52,6 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ patka ]; mainProgram = "trayscale"; + platforms = platforms.linux; }; } From 29fe096e2030dd8741bb97dc1c06547816ac957f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 11:53:19 +0000 Subject: [PATCH 215/246] proton-ge-bin: GE-Proton9-4 -> GE-Proton9-5 --- pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 3537d60cbbfe..a281607d5024 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-4"; + version = "GE-Proton9-5"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-OR4SUqm5Xsycv/KVBW2Ug/lz4Xr6IQBp8gXacorRe3U="; + hash = "sha256-bUlV533M5BL5UEOB0ED8VIMmquvVAvIm+E/ZJNjftRU="; }; outputs = [ "out" "steamcompattool" ]; From b6e725fe6fa3a1c13a468a8a56bdf0ec3f731e37 Mon Sep 17 00:00:00 2001 From: oluceps Date: Tue, 14 May 2024 12:23:12 +0000 Subject: [PATCH 216/246] juicity: 0.4.2 -> 0.4.3 Diff: https://github.com/juicity/juicity/compare/v0.4.2...v0.4.3 --- pkgs/tools/networking/juicity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/juicity/default.nix b/pkgs/tools/networking/juicity/default.nix index 5ced17c74824..0bcf6a5d30dc 100644 --- a/pkgs/tools/networking/juicity/default.nix +++ b/pkgs/tools/networking/juicity/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "juicity"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "juicity"; repo = pname; rev = "v${version}"; - hash = "sha256-JC4VGM7aY+fYo0F9yAkgTbZA56ztyeoIx9PARlBjkh4="; + hash = "sha256-4sej/nb7d58+hSCaD6KIfDsqiGmgECPIbRKR65TbMBM="; }; vendorHash = "sha256-SM5ZrTtuqenPsGjphkCM9JHzucw0/qBmevD+3/kyF6k="; From d8bedb1e062205ebf8f5ec5cd402196a72cf862f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 12:23:21 +0000 Subject: [PATCH 217/246] ananicy-rules-cachyos: unstable-2024-05-04 -> 0-unstable-2024-05-10 --- pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index 89170338ee22..2cca8544c9f6 100644 --- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix +++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "ananicy-rules-cachyos"; - version = "unstable-2024-05-04"; + version = "0-unstable-2024-05-10"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "5276c6dd11966dcf6f9588c6148949837abb8200"; - hash = "sha256-we2kdQb5rSJldP0HxBLAR5czTc3aayWElp5vAfmQ4ag="; + rev = "1826cf45201770e20fea2e7bebfc2a5001074703"; + hash = "sha256-9Uth0OvV5NXHZxOCQDMmb0VdXpi8dSMdN9StnJa8n90="; }; dontConfigure = true; From 5788c29ef0263ae282e42740a6ca8f74116841e4 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 13 May 2024 19:44:10 -0500 Subject: [PATCH 218/246] diffedit3: init at 0.4.0 Signed-off-by: Austin Seipp --- pkgs/by-name/di/diffedit3/package.nix | 30 +++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/di/diffedit3/package.nix diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix new file mode 100644 index 000000000000..6e1edaf882fa --- /dev/null +++ b/pkgs/by-name/di/diffedit3/package.nix @@ -0,0 +1,30 @@ +{ lib, rustPlatform, fetchCrate +, testers, nix-update-script, diffedit3 +}: + +rustPlatform.buildRustPackage rec { + pname = "diffedit3"; + version = "0.4.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-qw5Wos2u/H6ccJ3qkrVOCisMFDTNwxp/YeOTE1x5lcU="; + }; + + cargoHash = "sha256-e5bm8GLubA9BzH9oKKSC/Ysh+O+GJA8x6W576vKIIUA="; + + passthru = { + updateScript = nix-update-script { }; + tests = testers.testVersion { + package = diffedit3; + }; + }; + + meta = with lib; { + homepage = "https://github.com/ilyagr/diffedit3"; + description = "3-pane diff editor"; + license = with licenses; [ asl20 ]; + mainProgram = "diffedit3"; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} From 2f6890ed5d9d128d82e120bc5b54f2f876cf5a84 Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Tue, 14 May 2024 08:47:48 -0400 Subject: [PATCH 219/246] sparrow: 1.9.0 -> 1.9.1 --- pkgs/applications/blockchains/sparrow/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/sparrow/default.nix b/pkgs/applications/blockchains/sparrow/default.nix index d1d78d50c922..ab58899889de 100644 --- a/pkgs/applications/blockchains/sparrow/default.nix +++ b/pkgs/applications/blockchains/sparrow/default.nix @@ -23,11 +23,11 @@ let pname = "sparrow"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "sha256-UbFijiPOfVuJP9q6S5odkrhLJ2BUResbJK09Dn9PyCw="; + sha256 = "sha256-b1OIizSMTOtLM3/RFiBJPSbkj/C0d0s5ggcUwjCdBBo="; # nativeBuildInputs, downloadToTemp, and postFetch are used to verify the signed upstream package. # The signature is not a self-contained file. Instead the SHA256 of the package is added to a manifest file. @@ -56,12 +56,12 @@ let manifest = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt"; - sha256 = "sha256-x50wkQKlh7r4PM5YwhQaz6tnJpByQDMAmYsp1HafX2c="; + sha256 = "sha256-2IGhP9Xsli9d0zTzPliJH/tE5TXei1vjVngtjL9vA48="; }; manifestSignature = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-manifest.txt.asc"; - sha256 = "sha256-Nb5tQogQFMObd+nR/eUpEFUoCh1AnTX3s/jICJbvqqo="; + sha256 = "sha256-FSR9Z+27J/u1MYIR+LrL+pqCP6q4GfVYtRZ0WA9AaKM="; }; publicKey = ./publickey.asc; From 91a5828179a14d3a9054be72b00809585688f432 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 12:57:28 +0000 Subject: [PATCH 220/246] flix: 0.46.0 -> 0.47.0 --- pkgs/development/compilers/flix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/flix/default.nix b/pkgs/development/compilers/flix/default.nix index 926c98d68043..3499b7390f69 100644 --- a/pkgs/development/compilers/flix/default.nix +++ b/pkgs/development/compilers/flix/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.46.0"; + version = "0.47.0"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-jj8h30QsIF5HlunrqUktHY6bCUq9gMNVlAVsAH0F0U0="; + sha256 = "sha256-HlVJR8SPwhOFn3yuxJzUWSS+xascf4pGsoKCqzBDG6Y="; }; dontUnpack = true; From f96fef87c3d40d00c32bec062e0fd8c0b967f354 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 12:58:56 +0000 Subject: [PATCH 221/246] frankenphp: 1.1.4 -> 1.1.5 --- pkgs/by-name/fr/frankenphp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index 366a115793e6..45b0fed97129 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -27,13 +27,13 @@ let pieBuild = stdenv.hostPlatform.isMusl; in buildGoModule rec { pname = "frankenphp"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "dunglas"; repo = "frankenphp"; rev = "v${version}"; - hash = "sha256-I1O5ZujFRIgbe+6k1FmCedywYwN1zA+owU+tLBtN7nU="; + hash = "sha256-W+9p/9qT7v1jq6m/gRgfw4AmnPRZVY3UixXaypUVn4E="; }; sourceRoot = "${src.name}/caddy"; @@ -41,7 +41,7 @@ in buildGoModule rec { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-u+7pUt6SmNI/smE3l3CQl+e/ZsVRSeVJgprR0aslrMI="; + vendorHash = "sha256-eNW03oBaON2X5X2ZbM3Ly5T+bJzSDhEYajY5LaZhwdQ="; buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs; nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ]; From db92da43db73448627115d1f9a52af2be57ab9f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 13:12:10 +0000 Subject: [PATCH 222/246] kaniko: 1.22.0 -> 1.23.0 --- pkgs/applications/networking/cluster/kaniko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kaniko/default.nix b/pkgs/applications/networking/cluster/kaniko/default.nix index 4bf3357f31f8..63fa87034e82 100644 --- a/pkgs/applications/networking/cluster/kaniko/default.nix +++ b/pkgs/applications/networking/cluster/kaniko/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "kaniko"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "kaniko"; rev = "v${version}"; - hash = "sha256-EL54lr5i6F4F9sdjQJZ3X+mmj4tWXVX2db8CkRe8WzI="; + hash = "sha256-HHnPO2ItQKtodTxdZzxVU9GS45cd6fnlY8PLTTfqCVg="; }; vendorHash = null; From bf45796f72332ba4c7fb59b602e3e819d0e79d3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 13:12:39 +0000 Subject: [PATCH 223/246] kind: 0.22.0 -> 0.23.0 --- pkgs/development/tools/kind/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 6896e953abde..0d87b23022f0 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kind"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "kubernetes-sigs"; repo = "kind"; - hash = "sha256-DJTsyGEQA36MSmW5eWYTV1Tk6JOBIVJrEARA/x70S0U="; + hash = "sha256-S+kk3g/A1bio1v7zoXmvaTAYd0LBq5uip/9DvhkzZnM="; }; patches = [ @@ -16,7 +16,7 @@ buildGoModule rec { ./kernel-module-path.patch ]; - vendorHash = "sha256-J/sJd2LLMBr53Z3sGrWgnWA8Ry+XqqfCEObqFyUD96g="; + vendorHash = "sha256-YB2/MudoIVtTHU6FtvZOEhhxg5ss6OvENXOykPlQ12Y="; nativeBuildInputs = [ installShellFiles ]; From cb1a12794968412afc2a2855f11c469db78b8113 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 13:14:40 +0000 Subject: [PATCH 224/246] kube-router: 2.1.1 -> 2.1.2 --- .../applications/networking/cluster/kube-router/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 56e14d7a1531..551240dfcc07 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-router"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-0Aq4/4b98A7ChbYDwnaXWJvZxrNyWKIFgyXde2deLXg="; + hash = "sha256-BjL91c+yfpscb0q62eWfiqg1aLkXztXowTj4k8jdTQs="; }; - vendorHash = "sha256-oo/vQ6kAcEiKvy/eJ3kobdMyFxysfiArvy8aQDMmdo0="; + vendorHash = "sha256-BrpjG9DhDQSsbeJ+1MRAwXyKVULK3KHjvLydduTb024="; CGO_ENABLED = 0; From 0d540c419c4480c760cdd74d17b9c933fcbf1ddd Mon Sep 17 00:00:00 2001 From: Nicolas Mattia Date: Tue, 14 May 2024 13:38:16 +0200 Subject: [PATCH 225/246] kitty: wrap correct executable on macOS This fixes the kitty wrapProgram step to wrap the actual `kitty` executable, which on macOS is inside the App bundle. On macOS, `$out/bin/kitty` is just a symlink, and wrapping this symlink (instead of the executable in the App bundle) means that the wrapper is not used when starting the application itself (and the wrapper is only used when the `bin/kitty` executable is used, e.g. from terminal). --- pkgs/applications/terminal-emulators/kitty/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 675e47e5f57a..5e31ac572cab 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -210,7 +210,10 @@ buildPythonApplication rec { cp -r linux-package/{bin,share,lib} "$out" cp linux-package/bin/kitten "$kitten/bin/kitten" ''} - wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" + + # dereference the `kitty` symlink to make sure the actual executable + # is wrapped on macOS as well (and not just the symlink) + wrapProgram $(realpath "$out/bin/kitty") --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" installShellCompletion --cmd kitty \ --bash <("$out/bin/kitty" +complete setup bash) \ From 5822fbf779284bb76cec4ca92af48a0cabdaa364 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 15:36:43 +0200 Subject: [PATCH 226/246] python312Packages.losant-rest: 1.19.5 -> 1.19.6 Diff: https://github.com/Losant/losant-rest-python/compare/refs/tags/v1.19.5...v1.19.6 --- .../python-modules/losant-rest/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 3d14dbf313e0..1d027bd31772 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -5,23 +5,28 @@ , pythonOlder , requests , requests-mock +, setuptools }: buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.5"; - format = "setuptools"; + version = "1.19.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Losant"; repo = "losant-rest-python"; - rev = "v${version}"; - hash = "sha256-oYwbCpX2mD1RMk/0ymxaA8NF9kaJ+pGQdUKk3l5Jmrs="; + rev = "refs/tags/v${version}"; + hash = "sha256-sbNR95FhcRhgHh/ulLC8lL6EHal0BBK3wP6i29VElmY="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ requests ]; @@ -31,11 +36,11 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ - "tests/losantrest_tests.py" + "tests/platformrest_tests.py" ]; pythonImportsCheck = [ - "losantrest" + "platformrest" ]; meta = with lib; { From d0b66542a231486549035d849f950a1b0328dc85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 May 2024 15:40:23 +0200 Subject: [PATCH 227/246] python312Packages.losant-rest: format with nixfmt --- .../python-modules/losant-rest/default.nix | 33 ++++++++----------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 1d027bd31772..21a285711976 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -1,11 +1,12 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, requests -, requests-mock -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + requests, + requests-mock, + setuptools, }: buildPythonPackage rec { @@ -22,26 +23,18 @@ buildPythonPackage rec { hash = "sha256-sbNR95FhcRhgHh/ulLC8lL6EHal0BBK3wP6i29VElmY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - requests - ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook requests-mock ]; - pytestFlagsArray = [ - "tests/platformrest_tests.py" - ]; + pytestFlagsArray = [ "tests/platformrest_tests.py" ]; - pythonImportsCheck = [ - "platformrest" - ]; + pythonImportsCheck = [ "platformrest" ]; meta = with lib; { description = "Python module for consuming the Losant IoT Platform API"; From 7594481365a984c8b51ea39dc459f50bac4ac1d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 13:53:54 +0000 Subject: [PATCH 228/246] cargo-tauri: 1.6.3 -> 1.6.5 --- pkgs/development/tools/rust/cargo-tauri/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index fda5a49191d2..b90dca46c77d 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.6.3"; + version = "1.6.5"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-TJUE+H2bFuMc6GZHomBC2D89i+SOzIkALlws1sIe3jc="; + hash = "sha256-5Hz6vJaClZ6/6KVN11dSinb4xerf/3Qiq230H8+j5q8="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-fOXYE0MJfL1r4DDauuELJkCG4tEOCXscyn9kgaMkidY="; + cargoHash = "sha256-eb33aBG3qcMqBVY9/gzEvodS2w5rqioPAmiEKBEJIEw="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; From 806ced0d679024f2acf732c801918cbd998cc476 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 13:58:39 +0000 Subject: [PATCH 229/246] i3bar-river: 0.1.8 -> 0.1.9 --- pkgs/by-name/i3/i3bar-river/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/i3/i3bar-river/package.nix b/pkgs/by-name/i3/i3bar-river/package.nix index fce32de9c162..f94b8628f603 100644 --- a/pkgs/by-name/i3/i3bar-river/package.nix +++ b/pkgs/by-name/i3/i3bar-river/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "i3bar-river"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "MaxVerevkin"; repo = "i3bar-river"; rev = "v${version}"; - hash = "sha256-Rw4jildX3t853hIwEem/KzTBUyO3a/kour3dvSw8DVA="; + hash = "sha256-tG23bdEKp8+9RMS1fpW8EVe+bAdjQp7nVW0eHl3eYSQ="; }; - cargoHash = "sha256-uGzXEeQ2yzk8HEdgY/gTxqaCoMO25kbiD1XrpJwmVp4="; + cargoHash = "sha256-nSzGWpnyGRus9qCTPAd+BM4KsujSNyRmFUCc4Lg4D5k="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango ]; From afbc01990c07fbf3e076e91a09fe60606fc49826 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 14 May 2024 16:02:43 +0200 Subject: [PATCH 230/246] outline: 0.76.0 -> 0.76.1 --- pkgs/servers/web-apps/outline/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 1e7d6c864085..391aebf6c26c 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.76.0"; + version = "0.76.1"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-pTu1/7hEYvo/6MuN0yC+nrPCwUYqvcc2hZuiPtVFlwU="; + hash = "sha256-i+1Bd9equlYxxdmvoUim31SM5ymJjnauvqGOmnPmTWA="; }; nativeBuildInputs = [ makeWrapper prefetch-yarn-deps fixup-yarn-lock ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-10kqC4A9OFrpZzTBJIZ6I5TCOVgpX+h+hwfOWhXdhHs="; + hash = "sha256-xR6W9Kclgt7YZvkqNg7hOtY39mMNZvtDR/a1aOgD2Ko="; }; configurePhase = '' From 9ec2486208b0d28898e45d7f5769c91d7efc6768 Mon Sep 17 00:00:00 2001 From: Frank Doepper Date: Tue, 14 May 2024 16:22:44 +0200 Subject: [PATCH 231/246] recoll: wrap rcljoplin.py rcljoplin.py uses module "recoll", so PYTHONPATH has to be set. fixes #311619 --- pkgs/applications/search/recoll/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 36c9f7a7160a..707a29307e76 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -158,6 +158,8 @@ mkDerivation rec { done wrapProgram $out/share/recoll/filters/rclaudio.py \ --prefix PYTHONPATH : $PYTHONPATH + wrapProgram $out/share/recoll/filters/rcljoplin.py \ + --prefix PYTHONPATH : $out/${python3Packages.python.sitePackages} wrapProgram $out/share/recoll/filters/rclimg \ --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ ImageExifTool ]}" '' + lib.optionalString stdenv.isLinux '' From 90b56b0b892841cf9afc362a36661358e8b19059 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 14:35:27 +0000 Subject: [PATCH 232/246] limine: 7.5.0 -> 7.5.1 --- pkgs/by-name/li/limine/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index ed94c8db68d1..1a004b42f210 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -12,7 +12,7 @@ }: let - version = "7.5.0"; + version = "7.5.1"; in # The output of the derivation is a tool to create bootable images using Limine # as bootloader for various platforms and corresponding binary and helper files. @@ -24,7 +24,7 @@ stdenv.mkDerivation { # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz"; - sha256 = "sha256-4mUoBl+MG+rkRd/fBJuTTGGdPcncuhnumfi5s2yh7yI="; + sha256 = "sha256-aWzhUwW4799v0qZDpzzztb2LnfRYwjPXWM2dgpqwYIo="; }; nativeBuildInputs = [ From bdfbe9f9d099c27d8a50a6ef816229f8e2d34956 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 14:35:41 +0000 Subject: [PATCH 233/246] moar: 1.23.12 -> 1.23.14 --- pkgs/tools/misc/moar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index dc6b66eae7f3..919609a2cb3e 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.12"; + version = "1.23.14"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-Ck3AhPUm8cC38LsTtud0kkRWsWiC8W2Sw6+cE17+Nso="; + hash = "sha256-Ss4xblv7F3fco1qUXkzhUWEDnyE/bdXv6Gs8cN9HWZw="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; From 2be62737abeab75de00c7d363e50a1c57e5b72b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 14:36:15 +0000 Subject: [PATCH 234/246] openvas-scanner: 23.2.0 -> 23.2.1 --- pkgs/by-name/op/openvas-scanner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 87b6caa3325b..f20eaafd2f63 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.2.0"; + version = "23.2.1"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-jk7wjI+pruwYAuqlMVq+M68CM1y10a7DzmFkQrOIUkg="; + hash = "sha256-fP21F9SGT20sGPsQI5BxwQUCgZdLCBt+fsXutZu463k="; }; nativeBuildInputs = [ From 9a2258930a8f71adba6f512b8a041c489c26c919 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 26 Apr 2024 11:42:29 -0700 Subject: [PATCH 235/246] moneydance: 2023.3_5064 -> 2024.1_5118 --- pkgs/by-name/mo/moneydance/package.nix | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mo/moneydance/package.nix b/pkgs/by-name/mo/moneydance/package.nix index 5222684f706b..0c86365380f4 100644 --- a/pkgs/by-name/mo/moneydance/package.nix +++ b/pkgs/by-name/mo/moneydance/package.nix @@ -1,16 +1,22 @@ -{ lib, stdenv, fetchzip, makeWrapper, openjdk21, openjfx21, jvmFlags ? [ ] }: -let jdk = openjdk21.override { enableJavaFX = true; }; -in stdenv.mkDerivation (finalAttrs: { +{ lib, stdenv, fetchzip, makeWrapper, openjdk22, openjfx22, jvmFlags ? [ ] }: +let + openjfx = openjfx22; + jdk = openjdk22.override { + enableJavaFX = true; + inherit openjfx; + }; +in +stdenv.mkDerivation (finalAttrs: { pname = "moneydance"; - version = "2023.3_5064"; + version = "2024.1_5118"; src = fetchzip { - url = "https://infinitekind.com/stabledl/${finalAttrs.version}/moneydance-linux.tar.gz"; - hash = "sha256-jHr1V/gV1seenw2Q0/G405lTiabEYEsOS8p/XyByrtM="; + url = "https://infinitekind.com/stabledl/2024_5118/moneydance-linux.tar.gz"; + hash = "sha256-wwSb3CuhuXB4I9jq+TpLPbd1k9UzqQbAaZkGKgi+nns="; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jdk openjfx21 ]; + buildInputs = [ jdk openjfx ]; # Note the double escaping in the call to makeWrapper. The escapeShellArgs # call quotes each element of the flags list as a word[1] and returns a @@ -43,6 +49,7 @@ in stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://infinitekind.com/moneydance"; + changelog = "https://infinitekind.com/stabledl/2024_5118/changelog.txt"; description = "An easy to use and full-featured personal finance app that doesn't compromise your privacy"; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.unfree; From 6fc3ccd95ada9aa6a86459f5dae638f55c9ea964 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 26 Apr 2024 22:59:58 +0200 Subject: [PATCH 236/246] workflows/check-by-name: Skip instead of canceling on conflicts This avoids sending emails when there's merge conflicts. The check will appear to be green, but it doesn't matter since the PR can't be merged anyways. Unfortunately there's no better way to do this right now: https://github.com/actions/runner/issues/662 --- .github/workflows/check-by-name.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/.github/workflows/check-by-name.yml b/.github/workflows/check-by-name.yml index 7482179899c0..e857c88f746d 100644 --- a/.github/workflows/check-by-name.yml +++ b/.github/workflows/check-by-name.yml @@ -16,9 +16,7 @@ on: # so it shouldn't be a problem types: [opened, synchronize, reopened, edited] -permissions: - # We need this permission to cancel the workflow run if there's a merge conflict - actions: write +permissions: {} # Create a check-by-name concurrency group based on the pull request number. if # an event triggers a run on the same PR while a previous run is still in @@ -79,31 +77,27 @@ jobs: if [[ "$mergeable" == "true" ]]; then echo "The PR can be merged, checking the merge commit $mergedSha" + echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" else - echo "The PR cannot be merged, it has a merge conflict, cancelling the workflow.." - gh api \ - --method POST \ - -H "Accept: application/vnd.github+json" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - /repos/"$GITHUB_REPOSITORY"/actions/runs/"$GITHUB_RUN_ID"/cancel - sleep 60 - # If it's still not canceled after a minute, something probably went wrong, just exit - exit 1 + echo "The PR cannot be merged, it has a merge conflict, skipping the rest.." fi - echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 + if: env.mergedSha with: # pull_request_target checks out the base branch by default ref: ${{ env.mergedSha }} # Fetches the merge commit and its parents fetch-depth: 2 - name: Checking out base branch + if: env.mergedSha run: | base=$(mktemp -d) git worktree add "$base" "$(git rev-parse HEAD^1)" echo "base=$base" >> "$GITHUB_ENV" - uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 + if: env.mergedSha - name: Fetching the pinned tool + if: env.mergedSha # Update the pinned version using pkgs/test/check-by-name/update-pinned-tool.sh run: | # The pinned version of the tooling to use @@ -114,6 +108,7 @@ jobs: # Adds a result symlink as a GC root nix-store --realise "$toolPath" --add-root result - name: Running nixpkgs-check-by-name + if: env.mergedSha env: # Force terminal colors to be enabled. The library that # nixpkgs-check-by-name uses respects: https://bixense.com/clicolors/ From a96fbdc763bf46f2f10503ec0ebceec08c818587 Mon Sep 17 00:00:00 2001 From: Gregor Grigorjan Date: Wed, 24 Apr 2024 17:26:13 +0300 Subject: [PATCH 237/246] python3Packages.django-allauth: compile `.mo` files --- pkgs/development/python-modules/django-allauth/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 8a1f6dc8ac06..51ca1ea02de5 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -6,6 +6,9 @@ # build-system , setuptools +# build-time dependencies +, gettext + # dependencies , django , python3-openid @@ -41,6 +44,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ + gettext setuptools ]; @@ -52,6 +56,8 @@ buildPythonPackage rec { requests-oauthlib ] ++ pyjwt.optional-dependencies.crypto; + preBuild = "python -m django compilemessages"; + passthru.optional-dependencies = { saml = [ python3-saml From d0b707950b7fe5a0c868ab5468890d17379317fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 16:12:55 +0000 Subject: [PATCH 238/246] surrealdb: 1.4.2 -> 1.5.0 --- pkgs/by-name/su/surrealdb/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 625d9f802d54..0e881eeb7dac 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -16,16 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-LC/T+TkHdZ0uWaVQpR2Q9l0fShPL871rOfxxsXyJnvw="; + hash = "sha256-MX7XE+1YCP6zSc207GAaFgr0QJLMX0dbFqGjLMf/KOI="; }; - cargoHash = "sha256-1/l++iXiPCIwAVE8VQCSS++/9i3Kh1RNq3WnUjRy2fU="; + cargoHash = "sha256-skPCmQVH76qdmBVd4IVCnKn1uHP7mEgJ8YXprycpQ5I="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From 836a8bbeb98e150031477d89811ec8b9da97e58d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 16:31:36 +0000 Subject: [PATCH 239/246] snipe-it: 6.3.4 -> 6.4.1 --- pkgs/by-name/sn/snipe-it/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix index 32d0778e423f..db68a36a4d17 100644 --- a/pkgs/by-name/sn/snipe-it/package.nix +++ b/pkgs/by-name/sn/snipe-it/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject (finalAttrs: { pname = "snipe-it"; - version = "6.3.4"; + version = "6.4.1"; src = fetchFromGitHub { owner = "snipe"; repo = "snipe-it"; rev = "v${finalAttrs.version}"; - hash = "sha256-xjVrf8RgHzVHSyPK+fqLOCS2pjPvUMFUHZtwkrQWHWM="; + hash = "sha256-7IK5KLdWYcdzsJwzXfHsYvxWiR/R4407gGAGiY9+czY="; }; - vendorHash = "sha256-HNMn50gTYtRHH9bKcvrM7fnCMQsf6lBOqr825kgEsvE="; + vendorHash = "sha256-KkFoc/fqYVgA5Vv6oEk+1/Rcj9VA52ZnH5O5qmLhmE4="; postInstall = '' snipe_it_out="$out/share/php/snipe-it" From 22666a6cbfe50d7e1cef9615544b4477d2e833a7 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 14 May 2024 22:18:11 +0530 Subject: [PATCH 240/246] nushell: 0.92.1 -> 0.93.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 6a76b5e5d329..dd64a4775a57 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -24,7 +24,7 @@ }: let - version = "0.92.1"; + version = "0.93.0"; in rustPlatform.buildRustPackage { @@ -35,10 +35,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-itr/n8fodi9EvED6j4UMGFUaF42UVhgkGws8A5JqBA8="; + hash = "sha256-s/aJVk+45Ietegb9Cn19/U3NlNMHQh2GezHkoIRxRrk="; }; - cargoHash = "sha256-s2O/6g3+fAkiqZwq3PUDpaFtG+uj/3pSs3eZbCbAcuQ="; + cargoHash = "sha256-0xwo3M5uog6v0VcT9IhNZ22/xIhUShVNt6Vkp3GpsNI="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] From b39a6cb3dedeb9ca177c04f4b3b930a71c0271e3 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 13 May 2024 16:49:34 -0700 Subject: [PATCH 241/246] python311Packages.openai-whisper: fix Darwin build --- pkgs/development/python-modules/openai-whisper/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai-whisper/default.nix b/pkgs/development/python-modules/openai-whisper/default.nix index 0038098e586a..88f0ffab5dc7 100644 --- a/pkgs/development/python-modules/openai-whisper/default.nix +++ b/pkgs/development/python-modules/openai-whisper/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , buildPythonPackage , substituteAll @@ -44,17 +45,17 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - scipy ]; propagatedBuildInputs = [ more-itertools numba numpy - openai-triton tiktoken torch tqdm + ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform openai-triton) [ + openai-triton ]; preCheck = '' @@ -63,6 +64,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook + scipy ]; disabledTests = [ From 69b9b662a33c569e4e5020bd8a6dae40efe4714c Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 14 May 2024 10:15:33 -0700 Subject: [PATCH 242/246] python311Packages.openai-triton: fix `meta.platform` --- pkgs/development/python-modules/openai-triton/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/openai-triton/default.nix index 2bdb8d918af3..e4679a7bbdee 100644 --- a/pkgs/development/python-modules/openai-triton/default.nix +++ b/pkgs/development/python-modules/openai-triton/default.nix @@ -189,7 +189,7 @@ buildPythonPackage rec { meta = with lib; { description = "Language and compiler for writing highly efficient custom Deep-Learning primitives"; homepage = "https://github.com/openai/triton"; - platforms = lib.platforms.unix; + platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ SomeoneSerge Madouura ]; }; From 9f3fff8353f49ffd4779b9cf3efd49fbd4bc8a06 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 18:27:12 +0000 Subject: [PATCH 243/246] whatsapp-emoji-font: 2.24.2.76-1 -> 2.24.8.85-1 --- pkgs/by-name/wh/whatsapp-emoji-font/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix index cb10bfe4d2eb..bf70c0271c93 100644 --- a/pkgs/by-name/wh/whatsapp-emoji-font/package.nix +++ b/pkgs/by-name/wh/whatsapp-emoji-font/package.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation rec { pname = "whatsapp-emoji-linux"; - version = "2.24.2.76-1"; + version = "2.24.8.85-1"; src = fetchFromGitHub { rev = "refs/tags/${version}"; owner = "dmlls"; repo = "whatsapp-emoji-linux"; - hash = "sha256-BviYvhH/iu5N0+YtL4d6andbWL87LFU98pxUgt4NcsM="; + hash = "sha256-6bei+kR+5UF4GQ140sUXy8TDXZKNFmM+XgvMKf+8s2Y="; }; makeFlags = [ From 9307cdbbeb1f55c37cc97dadfffa0a6c748d123b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 May 2024 20:36:19 +0000 Subject: [PATCH 244/246] flexget: 3.11.31 -> 3.11.33 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 089a1e6e71b2..b2349dff44cf 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.31"; + version = "3.11.33"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-lTAC33mw2iHY9Xj4WRgO+Fh+xfjs5vRw6xAZcEaJKhM="; + hash = "sha256-kgTlz3cUztIUKKqmUpUpEwu5qyjE0fCarG/EKJ1PoPc="; }; postPatch = '' From d1414f543e40172dfd20e5a42ccd8c9108219693 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 May 2024 08:43:12 +1000 Subject: [PATCH 245/246] python311Packages.snakemake: 8.11.3 -> 8.11.4 (#311726) --- pkgs/applications/science/misc/snakemake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index bc69b0947e08..1a171f2c7db5 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.11.3"; + version = "8.11.4"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-wNs5OW8bM5LU0Ik77VU47dEq2PlrsfNNtl6Zedocnm4="; + hash = "sha256-nfPA2sQCeRc12A4rrlo17UPpiB8plKYbiumZjS7Yhz8="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' From e5d9b197e9f13b29ca797e6a0aab21840eab64d4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 14 May 2024 13:35:59 +1000 Subject: [PATCH 246/246] darwin.openwith: unbreak on x86_64-darwin --- pkgs/os-specific/darwin/openwith/default.nix | 6 +++--- pkgs/top-level/darwin-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/darwin/openwith/default.nix b/pkgs/os-specific/darwin/openwith/default.nix index eb78f7a1344c..d28ed4942821 100644 --- a/pkgs/os-specific/darwin/openwith/default.nix +++ b/pkgs/os-specific/darwin/openwith/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, swift, AppKit, Foundation, UniformTypeIdentifiers }: +{ lib, swiftPackages, fetchFromGitHub }: let + inherit (swiftPackages) apple_sdk stdenv swift; arch = if stdenv.isAarch64 then "arm64" else "x86_64"; in stdenv.mkDerivation rec { @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ swift ]; - buildInputs = [ AppKit Foundation UniformTypeIdentifiers ]; + buildInputs = with apple_sdk.frameworks; [ AppKit Foundation UniformTypeIdentifiers ]; makeFlags = [ "openwith_${arch}" ]; @@ -32,6 +33,5 @@ stdenv.mkDerivation rec { license = licenses.unlicense; maintainers = with maintainers; [ zowoq ]; platforms = [ "aarch64-darwin" "x86_64-darwin" ]; - broken = stdenv.isx86_64; # https://hydra.nixos.org/build/219354133/nixlog/3 }; } diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index eef19ac6ef72..cca74e047dbd 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -172,9 +172,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { inherit (apple_sdk_11_0.libs) simd; }; - openwith = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/openwith { - inherit (apple_sdk_11_0.frameworks) AppKit Foundation UniformTypeIdentifiers; - }; + openwith = callPackage ../os-specific/darwin/openwith { }; stubs = pkgs.callPackages ../os-specific/darwin/stubs { };