From eda01063e7173446b0fa4baf5c9fb2ee4063a612 Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Thu, 22 Jun 2023 14:34:51 +0200 Subject: [PATCH 001/369] r128gain: 1.0.3 -> 1.0.7 --- pkgs/applications/audio/r128gain/default.nix | 4 +- .../audio/r128gain/ffmpeg-location.patch | 58 ++++++++++--------- 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix index 8cf6871a76b4..698ddcb82af7 100644 --- a/pkgs/applications/audio/r128gain/default.nix +++ b/pkgs/applications/audio/r128gain/default.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonApplication rec { pname = "r128gain"; - version = "1.0.3"; + version = "1.0.7"; src = fetchFromGitHub { owner = "desbma"; repo = "r128gain"; rev = version; - sha256 = "0w2i2szajv1vcmc96w0fczdr8xc28ijcf1gdg180f21gi6yh96sc"; + sha256 = "sha256-JyKacDqjIKTNl2GjbJPkgbakF8HR4Jd4czAtOaemDH8="; }; patches = [ diff --git a/pkgs/applications/audio/r128gain/ffmpeg-location.patch b/pkgs/applications/audio/r128gain/ffmpeg-location.patch index c01f115c1d6d..53d755cdae41 100644 --- a/pkgs/applications/audio/r128gain/ffmpeg-location.patch +++ b/pkgs/applications/audio/r128gain/ffmpeg-location.patch @@ -1,29 +1,31 @@ ---- i/r128gain/__init__.py -+++ w/r128gain/__init__.py -@@ -78,7 +78,7 @@ def get_ffmpeg_lib_versions(ffmpeg_path=None): - Example: 0x3040100 for FFmpeg 3.4.1 - """ - r = collections.OrderedDict() -- cmd = (ffmpeg_path or "ffmpeg", "-version") -+ cmd = (ffmpeg_path or "@ffmpeg@/bin/ffmpeg", "-version") - output = subprocess.run(cmd, - check=True, - stdout=subprocess.PIPE, -@@ -156,7 +156,7 @@ def get_r128_loudness(audio_filepaths, *, calc_peak=True, enable_ffmpeg_threadin - os.devnull, - **additional_ffmpeg_args, - f="null").global_args("-hide_banner", "-nostats"), -- cmd=ffmpeg_path or "ffmpeg") -+ cmd=ffmpeg_path or "@ffmpeg@/bin/ffmpeg") +diff --git a/r128gain/__init__.py b/r128gain/__init__.py +index 79a5cbd..d8f13ba 100755 +--- a/r128gain/__init__.py ++++ b/r128gain/__init__.py +@@ -86,7 +86,7 @@ def get_ffmpeg_lib_versions(ffmpeg_path: Optional[str] = None) -> Dict[str, int] + Example: 0x3040100 for FFmpeg 3.4.1 + """ + r = collections.OrderedDict() +- cmd = (ffmpeg_path or "ffmpeg", "-version") ++ cmd = (ffmpeg_path or "@ffmpeg@/bin/ffmpeg", "-version") + output_str = subprocess.run(cmd, check=True, stdout=subprocess.PIPE, universal_newlines=True).stdout + output_lines = output_str.splitlines() + lib_version_regex = re.compile(r"^\s*(lib[a-z]+)\s+([0-9]+).\s*([0-9]+).\s*([0-9]+)\s+") +@@ -194,7 +194,7 @@ def get_r128_loudness( # noqa: C901 + ffmpeg.output(*output_streams, os.devnull, **additional_ffmpeg_args, f="null").global_args( + "-hide_banner", "-nostats" + ), +- cmd=ffmpeg_path or "ffmpeg", ++ cmd=ffmpeg_path or "@ffmpeg@/bin/ffmpeg", + ) - # run - logger().debug(cmd_to_string(cmd)) -@@ -740,7 +740,7 @@ def cl_main(): - help="Maximum number of tracks to scan in parallel. If not specified, autodetect CPU count") - arg_parser.add_argument("-f", - "--ffmpeg-path", -- default=shutil.which("ffmpeg"), -+ default="@ffmpeg@/bin/ffmpeg", - help="""Full file path of ffmpeg executable (only needed if not in PATH). - If not specified, autodetect""") - arg_parser.add_argument("-d", + # run +@@ -885,7 +885,7 @@ def cl_main() -> None: + arg_parser.add_argument( + "-f", + "--ffmpeg-path", +- default=shutil.which("ffmpeg"), ++ default="@ffmpeg@/bin/ffmpeg", + help="""Full file path of ffmpeg executable (only needed if not in PATH). + If not specified, autodetect""", + ) From 165c6e3067f0d3114823f15058182c7da75a510c Mon Sep 17 00:00:00 2001 From: Caleb Chase Date: Thu, 25 Jan 2024 09:01:00 -0600 Subject: [PATCH 002/369] sauce-connect: use update script Previously wrote an update script for this package but overlooked configuring passthru.updateScript in order for it to be used. --- pkgs/development/tools/sauce-connect/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index ef47a2e318cd..0cdec6a477c2 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { }; aarch64-darwin = passthru.sources.x86_64-darwin; }; + updateScript = ./update.sh; }; src = passthru.sources.${stdenv.hostPlatform.system} From e608384d5330440876e3860e6ffc0c6808263dc5 Mon Sep 17 00:00:00 2001 From: Manuel Frischknecht Date: Fri, 19 Apr 2024 14:57:37 +0200 Subject: [PATCH 003/369] vendor-reset: unstable-2021-02-16 -> unstable-2024-04-16 The `vendor-reset` Linux kernel module stopped building as of kernel versions 6.8.1 because `strlcopy` has been removed. An upstream patch fixed this by replacing the only callsite with `strscpy` [^1]. As the patch has already been merged into `master`, I updated the nix package to the latest trunk commit and labeled the version as `unstable-2024-04-16`. Since the only patch specified in the package has already been merged in late 2022 [^2], we can remove that one as well. [^1]: https://github.com/gnif/vendor-reset/pull/79 [^2]: https://github.com/gnif/vendor-reset/pull/58 --- pkgs/os-specific/linux/vendor-reset/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/vendor-reset/default.nix b/pkgs/os-specific/linux/vendor-reset/default.nix index f4430f3224ae..73a76a8aded0 100644 --- a/pkgs/os-specific/linux/vendor-reset/default.nix +++ b/pkgs/os-specific/linux/vendor-reset/default.nix @@ -2,24 +2,15 @@ stdenv.mkDerivation rec { pname = "vendor-reset"; - version = "unstable-2021-02-16-${kernel.version}"; + version = "unstable-2024-04-16-${kernel.version}"; src = fetchFromGitHub { owner = "gnif"; repo = "vendor-reset"; - rev = "225a49a40941e350899e456366265cf82b87ad25"; - sha256 = "sha256-xa7P7+mRk4FVgi+YYCcsFLfyNqPmXvy3xhGoTDVqPxw="; + rev = "084881c6e9e11bdadaf05798e669568848e698a3"; + hash = "sha256-Klu2uysbF5tH7SqVl815DwR7W+Vx6PyVDDLwoMZiqBI="; }; - patches = [ - # Fix build with Linux 5.18. - # https://github.com/gnif/vendor-reset/pull/58 - (fetchpatch { - url = "https://github.com/gnif/vendor-reset/commit/5bbffcd6fee5348e8808bdbfcb5b21d455b02f55.patch"; - sha256 = "sha256-L1QxVpcZAVYiaMFCBfL2EJgeMyOR8sDa1UqF1QB3bns="; - }) - ]; - nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; From 700ebb76d82940b508e6477e9b0a7711d328177f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 21 Jun 2024 21:31:18 +0000 Subject: [PATCH 004/369] minizip-ng: 4.0.3 -> 4.0.7 --- pkgs/development/libraries/minizip-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/minizip-ng/default.nix b/pkgs/development/libraries/minizip-ng/default.nix index baf6a4f687a4..2a4ceeaa48cf 100644 --- a/pkgs/development/libraries/minizip-ng/default.nix +++ b/pkgs/development/libraries/minizip-ng/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng"; - version = "4.0.3"; + version = "4.0.7"; src = fetchFromGitHub { owner = "zlib-ng"; repo = finalAttrs.pname; rev = finalAttrs.version; - hash = "sha256-rP3WficGQZ2sSYnU9Tj0lVl36ShwV76fn/1lv+TrK2c="; + hash = "sha256-scoEqymRMBTZZVr1fxtKOyBj4VLCgI8jQpanUKrJhiQ="; }; nativeBuildInputs = [ cmake pkg-config ]; From dea1d488da5d3dca83e1f1ca6780cb22e45ba4f9 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Fri, 24 May 2024 17:35:57 -0700 Subject: [PATCH 005/369] comodoro: update homepage - https://pimalaya.org/comodoro/ returns 404 Not Found - https://github.com/soywod/comodoro indicates homepage is https://pimalaya.org/comodoro/cli/latest/ but it doesn't work either --- pkgs/applications/misc/comodoro/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/comodoro/default.nix b/pkgs/applications/misc/comodoro/default.nix index 01836f583066..79022f724005 100644 --- a/pkgs/applications/misc/comodoro/default.nix +++ b/pkgs/applications/misc/comodoro/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "CLI to manage your time"; - homepage = "https://pimalaya.org/comodoro/"; + homepage = "https://github.com/pimalaya/comodoro"; changelog = "https://github.com/soywod/comodoro/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ soywod ]; From 602a8585576f1506790d28b9e6466b4032739f5f Mon Sep 17 00:00:00 2001 From: Joshua Trees Date: Sun, 15 Sep 2024 23:13:07 +0200 Subject: [PATCH 006/369] peertube-viewer: clean up package a bit - remove unnecessary youtube-dl arg - remove unnecessary rec keyword - add meta.mainProgram to make "nix run" work --- pkgs/by-name/pe/peertube-viewer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/peertube-viewer/package.nix b/pkgs/by-name/pe/peertube-viewer/package.nix index 5d3583c2f73c..749948f2ccf2 100644 --- a/pkgs/by-name/pe/peertube-viewer/package.nix +++ b/pkgs/by-name/pe/peertube-viewer/package.nix @@ -2,10 +2,9 @@ lib, fetchFromGitLab, rustPlatform, - youtube-dl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "peertube-viewer"; version = "1.8.6"; @@ -23,5 +22,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://gitlab.com/peertube-viewer/peertube-viewer-rs"; license = licenses.agpl3Only; maintainers = with maintainers; [ haruki7049 ]; + mainProgram = "peertube-viewer-rs"; }; } From 354871626361e04796b68eb9fb6b100f1e2a6a37 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Sep 2024 12:02:03 +0000 Subject: [PATCH 007/369] optifine: 1.20.4_HD_U_I7 -> 1.21.1_HD_U_J1 --- pkgs/tools/games/minecraft/optifine/versions.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/minecraft/optifine/versions.json b/pkgs/tools/games/minecraft/optifine/versions.json index f3df15597952..f5b02d748ba4 100644 --- a/pkgs/tools/games/minecraft/optifine/versions.json +++ b/pkgs/tools/games/minecraft/optifine/versions.json @@ -1,4 +1,8 @@ { + "optifine_1_21_1": { + "version": "1.21.1_HD_U_J1", + "sha256": "10lhnxang1zpvc30brg8ansm5b2snmf8x14g5pmbs280vca2svfv" + }, "optifine_1_20_4": { "version": "1.20.4_HD_U_I7", "sha256": "1zgz5cd2v299hayk5qx639nknd3mcz58y59rpik8srx48da8jw14" @@ -152,7 +156,7 @@ "sha256": "18lzyh639mi7r2hzwnmxv0a6v1ay7dk9bzasvwff82dxq0y9zi7m" }, "optifine-latest": { - "version": "1.20.4_HD_U_I7", - "sha256": "1zgz5cd2v299hayk5qx639nknd3mcz58y59rpik8srx48da8jw14" + "version": "1.21.1_HD_U_J1", + "sha256": "10lhnxang1zpvc30brg8ansm5b2snmf8x14g5pmbs280vca2svfv" } } From 2e588d4ecfe222567507bf1d59812e56b68efba6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Sep 2024 19:17:39 +0000 Subject: [PATCH 008/369] ansel: 0-unstable-2024-08-13 -> 0-unstable-2024-09-29 --- pkgs/by-name/an/ansel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index a7e19dec98a1..67ee8d878706 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -77,13 +77,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2024-08-13"; + version = "0-unstable-2024-09-29"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "85f2b8b15fe2081634c6f2c3f96b5d430e045bf0"; - hash = "sha256-w2DziVBoCy1NpH4AoIFmKdjqufopqUeYjAwqkOhxHBc="; + rev = "0e942648c4f9b1fd89fee8ca91d6e9bd5e06344c"; + hash = "sha256-gzIZwbTdGE0+uLScV/JfGW0ZxXIbnnSrYO1OxPS5Xz0="; fetchSubmodules = true; }; From 2ebffcc4c7e7b807d4e92c44f4037c4f3b4bee81 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 27 Sep 2024 19:24:59 +0200 Subject: [PATCH 009/369] nixos/postgresql: set up sandboxing Reduces the general exposure of the postgresql.service through systemd hardening options. --- .../modules/services/databases/postgresql.nix | 39 +++++++++++++++++++ nixos/tests/postgresql.nix | 2 + 2 files changed, 41 insertions(+) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index ceaccde813a0..19537b8ea3c9 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -623,7 +623,46 @@ in TimeoutSec = 120; ExecStart = "${postgresql}/bin/postgres"; + + # Hardening + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + PrivateTmp = false; #breaks wal-receiver test + ProtectHome = true; + ProtectSystem = "strict"; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + LockPersonality = true; + PrivateDevices = true; + PrivateMounts = false; # breaks wal-receiver test + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" # used for network interface enumeration + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged @resources" + ]; + UMask = if groupAccessAvailable then "0027" else "0077"; } + (mkIf (cfg.dataDir != "/var/lib/postgresql") { + ReadWritePaths = [ cfg.dataDir ]; + }) (mkIf (cfg.dataDir == "/var/lib/postgresql/${cfg.package.psqlSchema}") { StateDirectory = "postgresql postgresql/${cfg.package.psqlSchema}"; StateDirectoryMode = if groupAccessAvailable then "0750" else "0700"; diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix index c0dd24cf6ad2..ce16e54edf66 100644 --- a/nixos/tests/postgresql.nix +++ b/nixos/tests/postgresql.nix @@ -126,6 +126,8 @@ let with subtest("Initdb works"): machine.succeed("sudo -u postgres initdb -D /tmp/testpostgres2") + machine.log(machine.execute("systemd-analyze security postgresql.service | grep -v ✓")[1]) + machine.shutdown() ''; From f800d8e42b974b1a1e9408da4e96accfd6f26acf Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 30 Sep 2024 17:23:10 +0200 Subject: [PATCH 010/369] nixos/postgresql: enable private /tmp & private mounts; fix wal-receiver test The issue was that the old test-case used `/tmp` to share data. Using `JoinsNamespaceOf=` wasn't a real workaround since the private `/tmp` is recreated when a service gets stopped/started which is the case here, so the wals were still lost. To keep the test building with `PrivateTmp=yes`, create a dedicated directory in `/var/cache` with tmpfiles and allow the hardened `postgresql.service` to access it via `ReadWritePaths`. --- nixos/modules/services/databases/postgresql.nix | 4 ++-- nixos/tests/postgresql-wal-receiver.nix | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 19537b8ea3c9..63a981fded03 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -627,14 +627,14 @@ in # Hardening CapabilityBoundingSet = [ "" ]; DevicePolicy = "closed"; - PrivateTmp = false; #breaks wal-receiver test + PrivateTmp = true; ProtectHome = true; ProtectSystem = "strict"; MemoryDenyWriteExecute = true; NoNewPrivileges = true; LockPersonality = true; PrivateDevices = true; - PrivateMounts = false; # breaks wal-receiver test + PrivateMounts = true; ProcSubset = "pid"; ProtectClock = true; ProtectControlGroups = true; diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix index ab2ab4ad0d4f..a984f73c2be5 100644 --- a/nixos/tests/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql-wal-receiver.nix @@ -22,8 +22,8 @@ let replicationUser = "wal_receiver_user"; replicationSlot = "wal_receiver_slot"; replicationConn = "postgresql://${replicationUser}@localhost"; - baseBackupDir = "/tmp/pg_basebackup"; - walBackupDir = "/tmp/pg_wal"; + baseBackupDir = "/var/cache/wals/pg_basebackup"; + walBackupDir = "/var/cache/wals/pg_wal"; recoveryFile = pkgs.writeTextDir "recovery.signal" ""; @@ -32,6 +32,10 @@ let meta.maintainers = with lib.maintainers; [ pacien ]; nodes.machine = { ... }: { + systemd.tmpfiles.rules = [ + "d /var/cache/wals 0750 postgres postgres - -" + ]; + services.postgresql = { package = pkg; enable = true; @@ -60,6 +64,7 @@ let # This is only to speedup test, it isn't time racing. Service is set to autorestart always, # default 60sec is fine for real system, but is too much for a test systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5; + systemd.services.postgresql.serviceConfig.ReadWritePaths = [ "/var/cache/wals" ]; }; testScript = '' From 42df4680dea29d0c6a1dafa8f1b2271eeabac4ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 04:03:05 +0000 Subject: [PATCH 011/369] berglas: 2.0.2 -> 2.0.6 --- pkgs/tools/admin/berglas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index 363663af4133..1d86649c2ff1 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -27,16 +27,16 @@ in buildGoModule rec { pname = "berglas"; - version = "2.0.2"; + version = "2.0.6"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+fpxklkcjGiBMyW+L9nNdzXwhGcE2yIbZ/wPbpj9bV0="; + sha256 = "sha256-aTUMEn/QkPzvAyUvMxyqLl6KWFHs+dQK0VDqYv36AGM="; }; - vendorHash = "sha256-BDQJFrFbJGuoDpjGn0T9xWk6huUmDpOTO/JSDIYUKYg="; + vendorHash = "sha256-n/NOAmOOoZMFZGreUGNgrZ3XGbhmI52KtgakcJ/SJIc="; ldflags = [ "-s" From a9bc8ede3453e4fdcecf10a601e5660c4bd580b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 08:28:31 +0000 Subject: [PATCH 012/369] ocamlPackages.ocaml-version: 3.6.8 -> 3.6.9 --- pkgs/development/ocaml-modules/ocaml-version/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index c475cc7a97d0..a8a998299a95 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.8"; + version = "3.6.9"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-mCIeXsvpea/iFuJkvearu6wr804qFPCcH4WOaUKYC9k="; + hash = "sha256-NcelYCcDPooOP7GfWr2m27GDikKiMqezcvRfFmBzlYY="; }; checkInputs = [ alcotest ]; From c4b80b75429053d1929c45708ea40ecfb53cca2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 09:30:08 +0000 Subject: [PATCH 013/369] openimageio: 2.5.15.0 -> 2.5.16.0 --- pkgs/development/libraries/openimageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index 51c1f255c326..4decdf16d38b 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.5.15.0"; + version = "2.5.16.0"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenImageIO"; rev = "v${version}"; - hash = "sha256-jtX6IDR/yFn10hf+FxM0s4St9XYxhQ1UlMAsNzOxuio="; + hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo="; }; # Workaround broken zlib version detecion in CMake < 3.37. From e40c8a0d7d958a11751e1ee5ced16ace2540c271 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 16:23:02 +0000 Subject: [PATCH 014/369] python312Packages.ropgadget: 7.4 -> 7.5 --- pkgs/development/python-modules/ropgadget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index 53908cb4db73..898db65c03e2 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ropgadget"; - version = "7.4"; + version = "7.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "JonathanSalwan"; repo = "ROPgadget"; rev = "refs/tags/v${version}"; - hash = "sha256-6m8opcTM4vrK+VCPXxNhZttUq6YmS8swLUDhjyfinWE="; + hash = "sha256-n7nVtR2HMAZeeSX/hNtDzmpEsnHbgDNO5gdzmPrgSuk="; }; propagatedBuildInputs = [ capstone ]; From c88016eec80963d98761790173dd5a2f4b565a85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 23:52:30 +0000 Subject: [PATCH 015/369] rmg-wayland: 0.6.5 -> 0.6.6 --- pkgs/by-name/rm/rmg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rm/rmg/package.nix b/pkgs/by-name/rm/rmg/package.nix index 50c6e4306ffe..8dcd685da4dd 100644 --- a/pkgs/by-name/rm/rmg/package.nix +++ b/pkgs/by-name/rm/rmg/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation rec { pname = "rmg"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "Rosalie241"; repo = "RMG"; rev = "v${version}"; - hash = "sha256-mgb9Ed11fBQVnhhU5w1958a19dbTOL0ADczUOxKAnqA="; + hash = "sha256-3Bl9SEHWQbi58VPpCT4H8TC1E5J5j4lRXS1QF+udPdg="; }; nativeBuildInputs = [ From 68307063be1b2fce2ac5fbd41cae21d60d889599 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 4 Oct 2024 22:01:55 +0900 Subject: [PATCH 016/369] python312Packages.ropgadget: switch to pypa builder --- pkgs/development/python-modules/ropgadget/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ropgadget/default.nix b/pkgs/development/python-modules/ropgadget/default.nix index 898db65c03e2..eba60378a796 100644 --- a/pkgs/development/python-modules/ropgadget/default.nix +++ b/pkgs/development/python-modules/ropgadget/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, capstone, pythonOlder, }: @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "ropgadget"; version = "7.5"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +21,9 @@ buildPythonPackage rec { hash = "sha256-n7nVtR2HMAZeeSX/hNtDzmpEsnHbgDNO5gdzmPrgSuk="; }; - propagatedBuildInputs = [ capstone ]; + build-system = [ setuptools ]; + + dependencies = [ capstone ]; # Test suite is working with binaries doCheck = false; From aaa845a24abb03dc6955295c0712d840ab14d801 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Oct 2024 00:49:59 +0000 Subject: [PATCH 017/369] yourkit-java: 2024.3-b161 -> 2024.9-b158 --- pkgs/by-name/yo/yourkit-java/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix index c51bdf5ee787..9f8329fdc3be 100644 --- a/pkgs/by-name/yo/yourkit-java/package.nix +++ b/pkgs/by-name/yo/yourkit-java/package.nix @@ -9,7 +9,7 @@ let vPath = v: lib.elemAt (lib.splitString "-" v) 0; - version = "2024.3-b161"; + version = "2024.9-b158"; arches = { aarch64-linux = "arm64"; @@ -20,8 +20,8 @@ let arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system"); hashes = { - arm64 = "sha256-Qm/+KQ4nZr1IIyo+i8Gp8K2PEU844tuigiopWEibaAE="; - x64 = "sha256-yxbPS5UrYq6FgPlqfWjO9tPI/rjA/400JnS3kKHgMV0="; + arm64 = "sha256-juRU7rLek1vT4hRglMoyw2SyLoBh4mhg45AroMq+TE0="; + x64 = "sha256-3qO3l+L9fBFIumFKS9noA+c0Gu5GlMrxQaCyhW5Wark="; }; desktopItem = makeDesktopItem { From 1e59c44a7b545092da69d669d1ea7b2fde553a80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Oct 2024 11:32:00 +0000 Subject: [PATCH 018/369] kaldi: 0-unstable-2024-09-16 -> 0-unstable-2024-10-04 --- pkgs/tools/audio/kaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index b1daf3aa13e6..9a2eb15fee14 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "0-unstable-2024-09-16"; + version = "0-unstable-2024-10-04"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "d9ab0465aa2849ff645c027110c48899d5ec6ca8"; - sha256 = "sha256-usrHtVGkp++mU9rWI3u3vXJ8aAycujw9+5VQd0X0idY="; + rev = "4a8b7f673275597fef8a15b160124bd0985b59bd"; + sha256 = "sha256-CY40zkVP0ZTjOBjnmVyFdqaHdAxuGGH82GzudoA5MyM="; }; cmakeFlags = [ From 5dec8acb8caa15777f8b3ab7ece592838070e78c Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 10 Oct 2024 18:03:34 +0200 Subject: [PATCH 019/369] gepetto-viewer: 5.2.0 -> 5.2.0 Diff: https://github.com/gepetto/gepetto-viewer/compare/v5.2.0...v5.2.0 --- pkgs/by-name/ge/gepetto-viewer/package.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/ge/gepetto-viewer/package.nix b/pkgs/by-name/ge/gepetto-viewer/package.nix index 8e87bb3b1891..9abddf1ac581 100644 --- a/pkgs/by-name/ge/gepetto-viewer/package.nix +++ b/pkgs/by-name/ge/gepetto-viewer/package.nix @@ -4,7 +4,6 @@ darwin, doxygen, fetchFromGitHub, - fetchpatch, fontconfig, lib, jrl-cmakemodules, @@ -21,28 +20,15 @@ let gepetto-viewer = stdenv.mkDerivation (finalAttrs: { pname = "gepetto-viewer"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "gepetto"; repo = "gepetto-viewer"; rev = "v${finalAttrs.version}"; - hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8="; + hash = "sha256-kAQPi7bO48H0CZKz1bxfkvMiNy8RsXvRvpDK0KF7XLM="; }; - patches = [ - # fix use of CMAKE_INSTALL_BINDIR for $bin output - (fetchpatch { - url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch"; - hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs="; - }) - # fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output - (fetchpatch { - url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch"; - hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc="; - }) - ]; - cmakeFlags = [ (lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.hostPlatform.isDarwin)) (lib.cmakeBool "BUILD_PY_QGV" (!stdenv.hostPlatform.isDarwin)) From 73e2bf788b5a863f45a1ac0b2e5390a58794d4fd Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Thu, 10 Oct 2024 18:05:29 +0200 Subject: [PATCH 020/369] gepetto-viewer-corba: 5.8.1 -> 5.8.1 Diff: https://github.com/gepetto/gepetto-viewer-corba/compare/v5.8.1...v5.8.1 --- pkgs/by-name/ge/gepetto-viewer-corba/package.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ge/gepetto-viewer-corba/package.nix b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix index 1760bea79abb..258762c2ad5d 100644 --- a/pkgs/by-name/ge/gepetto-viewer-corba/package.nix +++ b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix @@ -14,14 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gepetto-viewer-corba"; - version = "5.8.0"; - pyproject = false; # CMake + version = "5.8.1"; src = fetchFromGitHub { owner = "gepetto"; repo = "gepetto-viewer-corba"; rev = "v${finalAttrs.version}"; - hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w="; + hash = "sha256-C7xrODoKCcyLPZr0+zZSZ/o5i5EeNsxCPXp2WrP28A4="; }; outputs = [ @@ -29,12 +28,6 @@ stdenv.mkDerivation (finalAttrs: { "doc" ]; - postPatch = '' - substituteInPlace src/CMakeLists.txt \ - --replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \ - --replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES} - ''; - buildInputs = [ libsForQt5.qtbase ]; nativeBuildInputs = [ From 660db870eb8fdf2f1c68581e013c337a35bcdb23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Oct 2024 13:57:32 +0000 Subject: [PATCH 021/369] ocamlPackages.lwt: 5.7.0 -> 5.8.0 --- pkgs/development/ocaml-modules/lwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 773b0ea81eba..e8cf9e4f85ba 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "lwt"; - version = "5.7.0"; + version = "5.8.0"; minimalOCamlVersion = "4.08"; @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "ocsigen"; repo = "lwt"; rev = version; - hash = "sha256-o0wPK6dPdnsr/LzwcSwbIGcL85wkDjdFuEcAxuS/UEs="; + hash = "sha256-GX5CSJuTajvZJ0TgG95aHeOCBi2B9Aw2URLZRCdp91A="; }; nativeBuildInputs = [ cppo ]; From 1c0b8740561aa8e37c3b85039632df6b68706069 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 12 Oct 2024 23:55:30 +0000 Subject: [PATCH 022/369] ocamlPackages.mtime: 2.0.0 -> 2.1.0 --- pkgs/development/ocaml-modules/mtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index ff53efb9d9a4..902a1dbeefc7 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -5,11 +5,11 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-mtime"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz"; - sha256 = "Pz2g6gBts0RlsDCE3npYqxWg8W9HgoxQC+U63fHgROs="; + sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; From 2d683b38849cbee3b5cdee569846d9c2d70867b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 10:34:03 +0000 Subject: [PATCH 023/369] clp: 1.17.9 -> 1.17.10 --- pkgs/applications/science/math/clp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index f1c2c53638ad..c01337b8d969 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pkg-config, coin-utils, zlib, osi }: stdenv.mkDerivation rec { - version = "1.17.9"; + version = "1.17.10"; pname = "clp"; src = fetchFromGitHub { owner = "coin-or"; repo = "Clp"; rev = "releases/${version}"; - hash = "sha256-kHCDji+yIf5mCoxKB2b/HaATGmwwIAPEV74tthIMeMY="; + hash = "sha256-9IlBT6o1aHAaYw2/39XrUis72P9fesmG3B6i/e+v3mM="; }; nativeBuildInputs = [ pkg-config ]; From 3dc84bdd7c62cbbaa3a71008a0aa09ef1b4b040b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 10:34:38 +0000 Subject: [PATCH 024/369] gp2c: 0.0.13 -> 0.0.14 --- pkgs/applications/science/math/pari/gp2c.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pari/gp2c.nix b/pkgs/applications/science/math/pari/gp2c.nix index c99c2fed2bd1..37a671e75cd5 100644 --- a/pkgs/applications/science/math/pari/gp2c.nix +++ b/pkgs/applications/science/math/pari/gp2c.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gp2c"; - version = "0.0.13"; + version = "0.0.14"; src = fetchurl { url = "https://pari.math.u-bordeaux.fr/pub/pari/GP2C/${pname}-${version}.tar.gz"; - hash = "sha256-JhN07Kc+vXbBEqlZPcootkgSqnYlYf2lpLLCzXmmnTY="; + hash = "sha256-r2ESzAKUBFfiOdpEM9Gg2Npg7u8p98xyL2TNSsALezA="; }; buildInputs = [ From d542445f657cea3205b978639296ab19640ab770 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 12:57:12 +0000 Subject: [PATCH 025/369] i2c-tools: 4.3 -> 4.4 --- pkgs/os-specific/linux/i2c-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index e682bb398f91..de94d317a55b 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "i2c-tools"; - version = "4.3"; + version = "4.4"; src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/snapshot/i2c-tools-v${version}.tar.gz"; - sha256 = "sha256-HlmIocum+HZEKNiS5BUwEIswRfTMUhD1vCPibAuAK0Q="; + sha256 = "sha256-Zm83gxdZH2XQCc/Dihp7vumF9WAvKgt6OORns5Mua7M="; }; buildInputs = [ perl ]; From 14af09c55d4b2be2dcbe1b8665ef3baa46a0c931 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 13 Oct 2024 16:50:56 +0000 Subject: [PATCH 026/369] ocamlPackages.tsdl: 1.0.0 -> 1.1.0 --- pkgs/development/ocaml-modules/tsdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 1395a37c69d3..0e4b1cf83e2c 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -7,7 +7,7 @@ else let pname = "tsdl"; - version = "1.0.0"; + version = "1.1.0"; webpage = "https://erratique.ch/software/${pname}"; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - hash = "sha256-XdgzCj9Uqplt/8Jk8rSFaQf8zu+9SZa8b9ZIlW/gjyE="; + hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs="; }; strictDeps = true; From 38566e7ed6ae145c8ba46a42abb627b1c26484a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 03:01:29 +0000 Subject: [PATCH 027/369] ocamlPackages.ptime: 1.1.0 -> 1.2.0 --- pkgs/development/ocaml-modules/ptime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index 1f23194582a0..7110a66c8f60 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -11,12 +11,12 @@ lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08") "ptime is not available for OCaml ${ocaml.version}" stdenv.mkDerivation (finalAttrs: { - version = "1.1.0"; + version = "1.2.0"; pname = "ocaml${ocaml.version}-ptime"; src = fetchurl { url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz"; - hash = "sha256-y/WxVFT7JxBeLDNAI+HhHY+TnXF4hw9cvo7SbfcBPrE="; + hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA="; }; nativeBuildInputs = [ From 068af09dcecf1d44e112fb299685295f2d7072ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 03:01:37 +0000 Subject: [PATCH 028/369] libwpe-fdo: 1.14.2 -> 1.14.3 --- pkgs/development/libraries/libwpe/fdo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwpe/fdo.nix b/pkgs/development/libraries/libwpe/fdo.nix index 3d2df9259a54..d4e743ee2855 100644 --- a/pkgs/development/libraries/libwpe/fdo.nix +++ b/pkgs/development/libraries/libwpe/fdo.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { url = "https://wpewebkit.org/releases/wpebackend-fdo-${version}.tar.xz"; - sha256 = "k8l2aumGTurq7isKdPIsvKCN9CwaG9tVsIbyUo44DTg="; + sha256 = "sha256-EBIYQllahQKR2z6C89sLmYTfB5Ai04bOQsK4UIFZ3Gw="; }; depsBuildBuild = [ From d1c6baf1955ddba047466a339ae4202e86f34c35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 06:40:09 +0000 Subject: [PATCH 029/369] graphicsmagick: 1.3.43 -> 1.3.45 --- pkgs/by-name/gr/graphicsmagick/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index 5a449d959f75..e0da1257fe14 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "graphicsmagick"; - version = "1.3.43"; + version = "1.3.45"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${finalAttrs.version}.tar.xz"; - hash = "sha256-K4hYBzLNfkCdniLGEWI4vvSuBvzaEUUb8z0ln5y/OZ8="; + hash = "sha256-3OpRZ0FPfIBVV94tekepsxR7y/YXuR9fD0r+XmVDAms="; }; outputs = [ "out" "man" ]; From 13353dd66d298353360309ab4fabd0827bd84930 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 09:43:48 +0000 Subject: [PATCH 030/369] osi: 0.108.10 -> 0.108.11 --- pkgs/development/libraries/science/math/osi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 45d5fc5b1f9b..cb83b2141819 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "osi"; - version = "0.108.10"; + version = "0.108.11"; src = fetchFromGitHub { owner = "coin-or"; repo = "Osi"; rev = "releases/${version}"; - hash = "sha256-rHNGnnDFU9UrszjjkZQkgWCfjjBIQba6vVbK/HLpRsQ="; + hash = "sha256-3aTO7JGEOP/RCOZ1X9b68rrtv6T78euf1TYGTjyXSRE="; }; buildInputs = From 0f1e2a1cd804ff1351324cc4cc40ef57423a8250 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 1 Oct 2024 09:20:15 +0200 Subject: [PATCH 031/369] nixos/postgresql: MemoryDenyWriteExecute must be off when doing JIT The test breaks like this otherwise: machine # WARNING: error during JITing: Permission denied machine # [ 14.012280] postgres[913]: [913] WARNING: error during JITing: Permission denied machine # ERROR: failed to look up symbol "evalexpr_0_1": Failed to materialize symbols: { (main, { evalexpr_0_1, evalexpr_0_0 }) } --- nixos/modules/services/databases/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 63a981fded03..876969ef9bb5 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -630,7 +630,7 @@ in PrivateTmp = true; ProtectHome = true; ProtectSystem = "strict"; - MemoryDenyWriteExecute = true; + MemoryDenyWriteExecute = lib.mkDefault (cfg.settings.jit == "off"); NoNewPrivileges = true; LockPersonality = true; PrivateDevices = true; From c2d058e719c0c591667a798610771727c2f8fd8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Oct 2024 10:24:54 +0000 Subject: [PATCH 032/369] python312Packages.pyside2: 5.15.14 -> 5.15.15 --- pkgs/development/python-modules/pyside2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index 2a3ff3c5ad34..41da67e108e2 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.15.14"; + version = "5.15.15"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - hash = "sha256-MmURlPamt7zkLwTmixQBrSCH5HiaTI8/uGSehhicY3I="; + hash = "sha256-IdaBiwZINLCFARgOSIkOX9h98vs3afgMWBQ0V/VIxAg="; }; patches = [ From dfaf6b31a71af10fb96f5a46c3e7729e9821e7c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Oct 2024 18:10:56 +0000 Subject: [PATCH 033/369] freetds: 1.4.22 -> 1.4.23 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index fa86bc4a18c9..c1d8fd62497f 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.4.22"; + version = "1.4.23"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - hash = "sha256-qafyTwp6hxYX526MxuZVaueIBC8cAGGVZlUFSZsjNLE="; + hash = "sha256-k6PxhrgsYEKmahlwvUeNeRTtscVmm2QtgLTqrPKi0X4="; }; buildInputs = [ From a465c24acd81a06604cddbadbf6a6a49a26caea9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Oct 2024 11:27:15 +0000 Subject: [PATCH 034/369] lyx: 2.4.1 -> 2.4.2.1 --- pkgs/applications/misc/lyx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index bf3c3b06dc83..0a6d4549498f 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -13,12 +13,12 @@ }: mkDerivation rec { - version = "2.4.1"; + version = "2.4.2.1"; pname = "lyx"; src = fetchurl { url = "ftp://ftp.lyx.org/pub/lyx/stable/2.4.x/${pname}-${version}.tar.xz"; - hash = "sha256-dN4ooH7zeqlHG8mWLbGCFSolMQx9H0f2drubxj2XE8U="; + hash = "sha256-HSscer45Hi+0kQneLI4Tp9/mBfJ99o9om/lH36/HpNk="; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs From 7215a57006dbab83a85a02f6c29e9e42f88e738a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 17 Oct 2024 12:56:20 +0000 Subject: [PATCH 035/369] fwts: 24.07.00 -> 24.09.00 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 8d7cf3313ff6..c4a4d3ece8c1 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "24.07.00"; + version = "24.09.00"; src = fetchzip { url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "sha256-h+KDXa5wQsT0HMgd0WDfsZM4Tg3Un+CWKa0slZ5cVbA="; + sha256 = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc="; stripRoot = false; }; From ee546cfe11c6909f4c92753be336f692f26c83e5 Mon Sep 17 00:00:00 2001 From: Rhys Davies Date: Mon, 21 Oct 2024 21:31:32 +1300 Subject: [PATCH 036/369] microsoft-edge: Remove beta and dev versions --- .../browsers/microsoft-edge/browser.nix | 197 ---------------- .../browsers/microsoft-edge/default.nix | 211 ++++++++++++++++-- .../browsers/microsoft-edge/update.py | 36 +-- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 200 insertions(+), 248 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/microsoft-edge/browser.nix diff --git a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/pkgs/applications/networking/browsers/microsoft-edge/browser.nix deleted file mode 100644 index 71791ac71180..000000000000 --- a/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ /dev/null @@ -1,197 +0,0 @@ -{ channel, version, revision, hash }: - -{ stdenv -, fetchurl -, lib -, makeWrapper - -, binutils-unwrapped -, xz -, gnutar -, file - -, glibc -, glib -, nss -, nspr -, atk -, at-spi2-atk -, xorg -, cups -, dbus -, expat -, libdrm -, libxkbcommon -, pipewire -, gtk3 -, pango -, cairo -, gdk-pixbuf -, mesa -, alsa-lib -, at-spi2-core -, libuuid -, systemd -, wayland -, libGL - -# command line arguments which are always set e.g "--disable-gpu" -, commandLineArgs ? "" -}: - -let - - baseName = "microsoft-edge"; - - shortName = if channel == "stable" - then "msedge" - else "msedge-" + channel; - - longName = if channel == "stable" - then baseName - else baseName + "-" + channel; - - iconSuffix = lib.optionalString (channel != "stable") "_${channel}"; - - desktopSuffix = lib.optionalString (channel != "stable") "-${channel}"; -in - -stdenv.mkDerivation rec { - pname="${baseName}-${channel}"; - inherit version; - - src = fetchurl { - url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb"; - inherit hash; - }; - - nativeBuildInputs = [ - makeWrapper - ]; - - unpackCmd = "${binutils-unwrapped}/bin/ar p $src data.tar.xz | ${xz}/bin/xz -dc | ${gnutar}/bin/tar -xf -"; - sourceRoot = "."; - - dontPatch = true; - dontConfigure = true; - dontPatchELF = true; - - buildPhase = let - libPath = { - msedge = lib.makeLibraryPath [ - glibc glib nss nspr atk at-spi2-atk xorg.libX11 - xorg.libxcb cups.lib dbus.lib expat libdrm - xorg.libXcomposite xorg.libXdamage xorg.libXext - xorg.libXfixes xorg.libXrandr libxkbcommon - pipewire gtk3 pango cairo gdk-pixbuf mesa - alsa-lib at-spi2-core xorg.libxshmfence systemd wayland - ]; - naclHelper = lib.makeLibraryPath [ - glib nspr atk libdrm xorg.libxcb mesa xorg.libX11 - xorg.libXext dbus.lib libxkbcommon - ]; - libwidevinecdm = lib.makeLibraryPath [ - glib nss nspr - ]; - libGLESv2 = lib.makeLibraryPath [ - xorg.libX11 xorg.libXext xorg.libxcb wayland libGL - ]; - liboneauth = lib.makeLibraryPath [ - libuuid xorg.libX11 - ]; - }; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath.msedge}" \ - opt/microsoft/${shortName}/msedge - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - opt/microsoft/${shortName}/msedge-sandbox - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - opt/microsoft/${shortName}/msedge_crashpad_handler - - patchelf \ - --set-rpath "${libPath.libwidevinecdm}" \ - opt/microsoft/${shortName}/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so - - patchelf \ - --set-rpath "${libPath.libGLESv2}" \ - opt/microsoft/${shortName}/libGLESv2.so - - patchelf \ - --set-rpath "${libPath.liboneauth}" \ - opt/microsoft/${shortName}/liboneauth.so - '' + lib.optionalString (lib.versionOlder version "121") '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath.naclHelper}" \ - opt/microsoft/${shortName}/nacl_helper - ''; - - installPhase = '' - mkdir -p $out - cp -R opt usr/bin usr/share $out - - ${if channel == "stable" - then "ln -sf $out/bin/${longName} $out/bin/${baseName}-${channel}" - else "ln -sf $out/opt/microsoft/${shortName}/${baseName}-${channel} $out/opt/microsoft/${shortName}/${baseName}"} - - ln -sf $out/opt/microsoft/${shortName}/${longName} $out/bin/${longName} - - rm -rf $out/share/doc - rm -rf $out/opt/microsoft/${shortName}/cron - - for icon in '16' '24' '32' '48' '64' '128' '256' - do - ${ "icon_source=$out/opt/microsoft/${shortName}/product_logo_\${icon}${iconSuffix}.png" } - ${ "icon_target=$out/share/icons/hicolor/\${icon}x\${icon}/apps" } - mkdir -p $icon_target - cp $icon_source $icon_target/microsoft-edge${desktopSuffix}.png - done - - substituteInPlace $out/share/applications/${longName}.desktop \ - --replace /usr/bin/${baseName}-${channel} $out/bin/${longName} - - substituteInPlace $out/share/gnome-control-center/default-apps/${longName}.xml \ - --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} - - substituteInPlace $out/share/menu/${longName}.menu \ - --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} - - substituteInPlace $out/opt/microsoft/${shortName}/xdg-mime \ - --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ - --replace "xdg_system_dirs=/usr/local/share/:/usr/share/" "xdg_system_dirs=/run/current-system/sw/share/" \ - --replace /usr/bin/file ${file}/bin/file - - substituteInPlace $out/opt/microsoft/${shortName}/default-app-block \ - --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} - - substituteInPlace $out/opt/microsoft/${shortName}/xdg-settings \ - --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ - --replace "\''${XDG_CONFIG_DIRS:-/etc/xdg}" "\''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}" - ''; - - postFixup = '' - wrapProgram "$out/bin/${longName}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --add-flags ${lib.escapeShellArg commandLineArgs} - ''; - - # We only want automatic updates for stable, beta and dev will get updated by the same script - # and are only used for testing. - passthru = lib.optionalAttrs (channel == "stable") { updateScript = ./update.py; }; - - meta = with lib; { - homepage = "https://www.microsoft.com/en-us/edge"; - description = "Web browser from Microsoft"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zanculmarktum kuwii rhysmdnz ]; - }; -} diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 5721c6e616b9..a4ed52e16cff 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,197 @@ -{ - beta = import ./browser.nix { - channel = "beta"; - version = "130.0.2849.5"; - revision = "1"; - hash = "sha256-chvB84+zu6/xgRHyUk33aicc44QJLxxdOOu0ngqmsFM="; - }; - dev = import ./browser.nix { - channel = "dev"; - version = "130.0.2849.1"; - revision = "1"; - hash = "sha256-JObqtaaUR6J4rZ90WWw7Ku5Ntl/QBWHo23T7Ohu5p1s="; - }; - stable = import ./browser.nix { - channel = "stable"; - version = "129.0.2792.65"; - revision = "1"; +{ stdenv +, fetchurl +, lib +, makeWrapper + +, binutils-unwrapped +, xz +, gnutar +, file + +, glibc +, glib +, nss +, nspr +, atk +, at-spi2-atk +, xorg +, cups +, dbus +, expat +, libdrm +, libxkbcommon +, pipewire +, gtk3 +, pango +, cairo +, gdk-pixbuf +, mesa +, alsa-lib +, at-spi2-core +, libuuid +, systemd +, wayland +, libGL + +# command line arguments which are always set e.g "--disable-gpu" +, commandLineArgs ? "" +}: + +let + + baseName = "microsoft-edge"; + + channel = "stable"; + + shortName = if channel == "stable" + then "msedge" + else "msedge-" + channel; + + longName = if channel == "stable" + then baseName + else baseName + "-" + channel; + + iconSuffix = lib.optionalString (channel != "stable") "_${channel}"; + + desktopSuffix = lib.optionalString (channel != "stable") "-${channel}"; +in + +stdenv.mkDerivation rec { + pname="${baseName}-${channel}"; + version = "129.0.2792.65"; + + src = fetchurl { + url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-1_amd64.deb"; hash = "sha256-xuCtHptE2CG4aiY7gu2sWW3Km4qfB0E/L/PBACIaKOc="; }; + + nativeBuildInputs = [ + makeWrapper + ]; + + unpackCmd = "${binutils-unwrapped}/bin/ar p $src data.tar.xz | ${xz}/bin/xz -dc | ${gnutar}/bin/tar -xf -"; + sourceRoot = "."; + + dontPatch = true; + dontConfigure = true; + dontPatchELF = true; + + buildPhase = let + libPath = { + msedge = lib.makeLibraryPath [ + glibc glib nss nspr atk at-spi2-atk xorg.libX11 + xorg.libxcb cups.lib dbus.lib expat libdrm + xorg.libXcomposite xorg.libXdamage xorg.libXext + xorg.libXfixes xorg.libXrandr libxkbcommon + pipewire gtk3 pango cairo gdk-pixbuf mesa + alsa-lib at-spi2-core xorg.libxshmfence systemd wayland + ]; + naclHelper = lib.makeLibraryPath [ + glib nspr atk libdrm xorg.libxcb mesa xorg.libX11 + xorg.libXext dbus.lib libxkbcommon + ]; + libwidevinecdm = lib.makeLibraryPath [ + glib nss nspr + ]; + libGLESv2 = lib.makeLibraryPath [ + xorg.libX11 xorg.libXext xorg.libxcb wayland libGL + ]; + liboneauth = lib.makeLibraryPath [ + libuuid xorg.libX11 + ]; + }; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath.msedge}" \ + opt/microsoft/${shortName}/msedge + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + opt/microsoft/${shortName}/msedge-sandbox + + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + opt/microsoft/${shortName}/msedge_crashpad_handler + + patchelf \ + --set-rpath "${libPath.libwidevinecdm}" \ + opt/microsoft/${shortName}/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so + + patchelf \ + --set-rpath "${libPath.libGLESv2}" \ + opt/microsoft/${shortName}/libGLESv2.so + + patchelf \ + --set-rpath "${libPath.liboneauth}" \ + opt/microsoft/${shortName}/liboneauth.so + '' + lib.optionalString (lib.versionOlder version "121") '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath.naclHelper}" \ + opt/microsoft/${shortName}/nacl_helper + ''; + + installPhase = '' + mkdir -p $out + cp -R opt usr/bin usr/share $out + + ${if channel == "stable" + then "ln -sf $out/bin/${longName} $out/bin/${baseName}-${channel}" + else "ln -sf $out/opt/microsoft/${shortName}/${baseName}-${channel} $out/opt/microsoft/${shortName}/${baseName}"} + + ln -sf $out/opt/microsoft/${shortName}/${longName} $out/bin/${longName} + + rm -rf $out/share/doc + rm -rf $out/opt/microsoft/${shortName}/cron + + for icon in '16' '24' '32' '48' '64' '128' '256' + do + ${ "icon_source=$out/opt/microsoft/${shortName}/product_logo_\${icon}${iconSuffix}.png" } + ${ "icon_target=$out/share/icons/hicolor/\${icon}x\${icon}/apps" } + mkdir -p $icon_target + cp $icon_source $icon_target/microsoft-edge${desktopSuffix}.png + done + + substituteInPlace $out/share/applications/${longName}.desktop \ + --replace /usr/bin/${baseName}-${channel} $out/bin/${longName} + + substituteInPlace $out/share/gnome-control-center/default-apps/${longName}.xml \ + --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} + + substituteInPlace $out/share/menu/${longName}.menu \ + --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} + + substituteInPlace $out/opt/microsoft/${shortName}/xdg-mime \ + --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ + --replace "xdg_system_dirs=/usr/local/share/:/usr/share/" "xdg_system_dirs=/run/current-system/sw/share/" \ + --replace /usr/bin/file ${file}/bin/file + + substituteInPlace $out/opt/microsoft/${shortName}/default-app-block \ + --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} + + substituteInPlace $out/opt/microsoft/${shortName}/xdg-settings \ + --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ + --replace "\''${XDG_CONFIG_DIRS:-/etc/xdg}" "\''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}" + ''; + + postFixup = '' + wrapProgram "$out/bin/${longName}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + ''; + + # We only want automatic updates for stable, beta and dev will get updated by the same script + # and are only used for testing. + passthru = lib.optionalAttrs (channel == "stable") { updateScript = ./update.py; }; + + meta = with lib; { + homepage = "https://www.microsoft.com/en-us/edge"; + description = "Web browser from Microsoft"; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ zanculmarktum kuwii rhysmdnz ]; + }; } diff --git a/pkgs/applications/networking/browsers/microsoft-edge/update.py b/pkgs/applications/networking/browsers/microsoft-edge/update.py index 724a83d09d54..c9a048d504c8 100755 --- a/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ b/pkgs/applications/networking/browsers/microsoft-edge/update.py @@ -1,8 +1,9 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian +#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian common-updater-scripts import base64 import textwrap +import os from urllib import request from collections import OrderedDict @@ -22,7 +23,7 @@ def latest_packages(packages: bytes): latest_packages: OrderedDict[str, Packages] = {} for package in Packages.iter_paragraphs(packages, use_apt_pkg=False): name: str = package['Package'] - if not name.startswith('microsoft-edge-'): + if not name.startswith('microsoft-edge-stable'): continue channel = name.replace('microsoft-edge-', '') if channel not in latest_packages: @@ -34,37 +35,10 @@ def latest_packages(packages: bytes): return OrderedDict(sorted(latest_packages.items(), key=lambda x:x[0])) -def nix_expressions(latest: dict[str, Packages]): - channel_strs: list[str] = [] - for channel, package in latest.items(): - print(f"Processing {channel} {package['Version']}") - match = Version.re_valid_version.match(package['Version']) - assert match is not None - - version = match.group('upstream_version') - revision = match.group('debian_revision') - sri = 'sha256-' + \ - base64.b64encode(bytes.fromhex(package['SHA256'])).decode('ascii') - - channel_str = textwrap.dedent( - f'''\ - {channel} = import ./browser.nix {{ - channel = "{channel}"; - version = "{version}"; - revision = "{revision}"; - hash = "{sri}"; - }};''' - ) - channel_strs.append(channel_str) - return channel_strs - - def write_expression(): latest = latest_packages(packages()) - channel_strs = nix_expressions(latest) - nix_expr = '{\n' + textwrap.indent('\n'.join(channel_strs), ' ') + '\n}\n' - with open(PIN_PATH, 'w') as f: - f.write(nix_expr) + version = Version.re_valid_version.match(latest['stable']['Version']).group('upstream_version') + os.system(f'update-source-version microsoft-edge "{version}"') write_expression() diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e0f332c6b79..0fb368cc55cf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21993,9 +21993,7 @@ with pkgs; microsoft-gsl = callPackage ../development/libraries/microsoft-gsl { }; - microsoft-edge = callPackage (import ../applications/networking/browsers/microsoft-edge).stable { }; - microsoft-edge-beta = callPackage (import ../applications/networking/browsers/microsoft-edge).beta { }; - microsoft-edge-dev = callPackage (import ../applications/networking/browsers/microsoft-edge).dev { }; + microsoft-edge = callPackage ../applications/networking/browsers/microsoft-edge { }; micronucleus = callPackage ../development/tools/misc/micronucleus { }; From 5954aeeacaf77714487d412470748f7edb638024 Mon Sep 17 00:00:00 2001 From: Rhys Davies Date: Mon, 21 Oct 2024 21:34:45 +1300 Subject: [PATCH 037/369] microsoft-edge: move to by-name --- .../default.nix => by-name/mi/microsoft-edge/package.nix} | 0 .../networking/browsers => by-name/mi}/microsoft-edge/update.py | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/networking/browsers/microsoft-edge/default.nix => by-name/mi/microsoft-edge/package.nix} (100%) rename pkgs/{applications/networking/browsers => by-name/mi}/microsoft-edge/update.py (100%) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/by-name/mi/microsoft-edge/package.nix similarity index 100% rename from pkgs/applications/networking/browsers/microsoft-edge/default.nix rename to pkgs/by-name/mi/microsoft-edge/package.nix diff --git a/pkgs/applications/networking/browsers/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py similarity index 100% rename from pkgs/applications/networking/browsers/microsoft-edge/update.py rename to pkgs/by-name/mi/microsoft-edge/update.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fb368cc55cf..a533b203d0f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21993,8 +21993,6 @@ with pkgs; microsoft-gsl = callPackage ../development/libraries/microsoft-gsl { }; - microsoft-edge = callPackage ../applications/networking/browsers/microsoft-edge { }; - micronucleus = callPackage ../development/tools/misc/micronucleus { }; markdown-anki-decks = callPackage ../tools/misc/markdown-anki-decks { }; From a84b92950926874954e6026b22927d23a4d59a80 Mon Sep 17 00:00:00 2001 From: Rhys Davies Date: Fri, 11 Oct 2024 16:31:21 +1300 Subject: [PATCH 038/369] microsoft-edge: Mirror google-chrome derivation --- pkgs/by-name/mi/microsoft-edge/package.nix | 408 +++++++++++++-------- 1 file changed, 249 insertions(+), 159 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index a4ed52e16cff..ba4d26c18b8c 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -1,197 +1,287 @@ -{ stdenv -, fetchurl -, lib -, makeWrapper +{ + fetchurl, + lib, + makeWrapper, + patchelf, + stdenv, -, binutils-unwrapped -, xz -, gnutar -, file + # Linked dynamic libraries. + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + dbus, + expat, + fontconfig, + freetype, + gcc-unwrapped, + gdk-pixbuf, + glib, + gtk3, + gtk4, + libdrm, + libglvnd, + libkrb5, + libX11, + libxcb, + libXcomposite, + libXcursor, + libXdamage, + libXext, + libXfixes, + libXi, + libxkbcommon, + libXrandr, + libXrender, + libXScrnSaver, + libxshmfence, + libXtst, + mesa, + nspr, + nss, + pango, + pipewire, + vulkan-loader, + wayland, # ozone/wayland -, glibc -, glib -, nss -, nspr -, atk -, at-spi2-atk -, xorg -, cups -, dbus -, expat -, libdrm -, libxkbcommon -, pipewire -, gtk3 -, pango -, cairo -, gdk-pixbuf -, mesa -, alsa-lib -, at-spi2-core -, libuuid -, systemd -, wayland -, libGL + # Command line programs + coreutils, -# command line arguments which are always set e.g "--disable-gpu" -, commandLineArgs ? "" + # command line arguments which are always set e.g "--disable-gpu" + commandLineArgs ? "", + + # Will crash without. + systemd, + + # Loaded at runtime. + libexif, + pciutils, + + # Additional dependencies according to other distros. + ## Ubuntu + curl, + liberation_ttf, + util-linux, + wget, + xdg-utils, + ## Arch Linux. + flac, + harfbuzz, + icu, + libopus, + libpng, + snappy, + speechd-minimal, + ## Gentoo + bzip2, + libcap, + + # Necessary for USB audio devices. + libpulseaudio, + pulseSupport ? true, + + adwaita-icon-theme, + gsettings-desktop-schemas, + + # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) + libva, + libvaSupport ? true, + + # For Vulkan support (--enable-features=Vulkan) + addDriverRunpath, + + # Edge Specific + libuuid, }: let - baseName = "microsoft-edge"; + opusWithCustomModes = libopus.override { withCustomModes = true; }; - channel = "stable"; - - shortName = if channel == "stable" - then "msedge" - else "msedge-" + channel; - - longName = if channel == "stable" - then baseName - else baseName + "-" + channel; - - iconSuffix = lib.optionalString (channel != "stable") "_${channel}"; - - desktopSuffix = lib.optionalString (channel != "stable") "-${channel}"; + deps = + [ + alsa-lib + at-spi2-atk + at-spi2-core + atk + bzip2 + cairo + coreutils + cups + curl + dbus + expat + flac + fontconfig + freetype + gcc-unwrapped.lib + gdk-pixbuf + glib + harfbuzz + icu + libcap + libdrm + liberation_ttf + libexif + libglvnd + libkrb5 + libpng + libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libxkbcommon + libXrandr + libXrender + libXScrnSaver + libxshmfence + libXtst + mesa + nspr + nss + opusWithCustomModes + pango + pciutils + pipewire + snappy + speechd-minimal + systemd + util-linux + vulkan-loader + wayland + wget + libuuid + ] + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional libvaSupport libva + ++ [ + gtk3 + gtk4 + ]; in -stdenv.mkDerivation rec { - pname="${baseName}-${channel}"; +stdenv.mkDerivation (finalAttrs: { + pname = "microsoft-edge"; version = "129.0.2792.65"; src = fetchurl { - url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-1_amd64.deb"; + url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; hash = "sha256-xuCtHptE2CG4aiY7gu2sWW3Km4qfB0E/L/PBACIaKOc="; }; + # With strictDeps on, some shebangs were not being patched correctly + # ie, $out/share/microsoft/msedge/microsoft-edge + strictDeps = false; + nativeBuildInputs = [ makeWrapper + patchelf ]; - unpackCmd = "${binutils-unwrapped}/bin/ar p $src data.tar.xz | ${xz}/bin/xz -dc | ${gnutar}/bin/tar -xf -"; - sourceRoot = "."; + buildInputs = [ + # needed for XDG_ICON_DIRS + adwaita-icon-theme + glib + gtk3 + gtk4 + # needed for GSETTINGS_SCHEMAS_PATH + gsettings-desktop-schemas + ]; - dontPatch = true; - dontConfigure = true; - dontPatchELF = true; - - buildPhase = let - libPath = { - msedge = lib.makeLibraryPath [ - glibc glib nss nspr atk at-spi2-atk xorg.libX11 - xorg.libxcb cups.lib dbus.lib expat libdrm - xorg.libXcomposite xorg.libXdamage xorg.libXext - xorg.libXfixes xorg.libXrandr libxkbcommon - pipewire gtk3 pango cairo gdk-pixbuf mesa - alsa-lib at-spi2-core xorg.libxshmfence systemd wayland - ]; - naclHelper = lib.makeLibraryPath [ - glib nspr atk libdrm xorg.libxcb mesa xorg.libX11 - xorg.libXext dbus.lib libxkbcommon - ]; - libwidevinecdm = lib.makeLibraryPath [ - glib nss nspr - ]; - libGLESv2 = lib.makeLibraryPath [ - xorg.libX11 xorg.libXext xorg.libxcb wayland libGL - ]; - liboneauth = lib.makeLibraryPath [ - libuuid xorg.libX11 - ]; - }; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath.msedge}" \ - opt/microsoft/${shortName}/msedge - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - opt/microsoft/${shortName}/msedge-sandbox - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - opt/microsoft/${shortName}/msedge_crashpad_handler - - patchelf \ - --set-rpath "${libPath.libwidevinecdm}" \ - opt/microsoft/${shortName}/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so - - patchelf \ - --set-rpath "${libPath.libGLESv2}" \ - opt/microsoft/${shortName}/libGLESv2.so - - patchelf \ - --set-rpath "${libPath.liboneauth}" \ - opt/microsoft/${shortName}/liboneauth.so - '' + lib.optionalString (lib.versionOlder version "121") '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath.naclHelper}" \ - opt/microsoft/${shortName}/nacl_helper + unpackPhase = '' + runHook preUnpack + ar x $src + tar xf data.tar.xz + runHook postUnpack ''; + rpath = lib.makeLibraryPath deps + ":" + lib.makeSearchPathOutput "lib" "lib64" deps; + binpath = lib.makeBinPath deps; + installPhase = '' - mkdir -p $out - cp -R opt usr/bin usr/share $out + runHook preInstall - ${if channel == "stable" - then "ln -sf $out/bin/${longName} $out/bin/${baseName}-${channel}" - else "ln -sf $out/opt/microsoft/${shortName}/${baseName}-${channel} $out/opt/microsoft/${shortName}/${baseName}"} + appname=msedge + dist=stable - ln -sf $out/opt/microsoft/${shortName}/${longName} $out/bin/${longName} + exe=$out/bin/microsoft-edge - rm -rf $out/share/doc - rm -rf $out/opt/microsoft/${shortName}/cron + mkdir -p $out/bin $out/share + cp -v -a opt/* $out/share + cp -v -a usr/share/* $out/share - for icon in '16' '24' '32' '48' '64' '128' '256' - do - ${ "icon_source=$out/opt/microsoft/${shortName}/product_logo_\${icon}${iconSuffix}.png" } - ${ "icon_target=$out/share/icons/hicolor/\${icon}x\${icon}/apps" } - mkdir -p $icon_target - cp $icon_source $icon_target/microsoft-edge${desktopSuffix}.png + # replace bundled vulkan-loader + rm -v $out/share/microsoft/$appname/libvulkan.so.1 + ln -v -s -t "$out/share/microsoft/$appname" "${lib.getLib vulkan-loader}/lib/libvulkan.so.1" + + substituteInPlace $out/share/microsoft/$appname/microsoft-edge \ + --replace-fail 'CHROME_WRAPPER' 'WRAPPER' + substituteInPlace $out/share/applications/microsoft-edge.desktop \ + --replace-fail /usr/bin/microsoft-edge-$dist $exe + substituteInPlace $out/share/gnome-control-center/default-apps/microsoft-edge.xml \ + --replace-fail /opt/microsoft/msedge $exe + substituteInPlace $out/share/menu/microsoft-edge.menu \ + --replace-fail /opt $out/share \ + --replace-fail $out/share/microsoft/$appname/microsoft-edge $exe + + for icon_file in $out/share/microsoft/msedge/product_logo_[0-9]*.png; do + num_and_suffix="''${icon_file##*logo_}" + if [ $dist = "stable" ]; then + icon_size="''${num_and_suffix%.*}" + else + icon_size="''${num_and_suffix%_*}" + fi + logo_output_prefix="$out/share/icons/hicolor" + logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" + mkdir -p "$logo_output_path" + mv "$icon_file" "$logo_output_path/microsoft-edge.png" done - substituteInPlace $out/share/applications/${longName}.desktop \ - --replace /usr/bin/${baseName}-${channel} $out/bin/${longName} - - substituteInPlace $out/share/gnome-control-center/default-apps/${longName}.xml \ - --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} - - substituteInPlace $out/share/menu/${longName}.menu \ - --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} - - substituteInPlace $out/opt/microsoft/${shortName}/xdg-mime \ - --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ - --replace "xdg_system_dirs=/usr/local/share/:/usr/share/" "xdg_system_dirs=/run/current-system/sw/share/" \ - --replace /usr/bin/file ${file}/bin/file - - substituteInPlace $out/opt/microsoft/${shortName}/default-app-block \ - --replace /opt/microsoft/${shortName} $out/opt/microsoft/${shortName} - - substituteInPlace $out/opt/microsoft/${shortName}/xdg-settings \ - --replace "\''${XDG_DATA_DIRS:-/usr/local/share:/usr/share}" "\''${XDG_DATA_DIRS:-/run/current-system/sw/share}" \ - --replace "\''${XDG_CONFIG_DIRS:-/etc/xdg}" "\''${XDG_CONFIG_DIRS:-/run/current-system/sw/etc/xdg}" - ''; - - postFixup = '' - wrapProgram "$out/bin/${longName}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" \ + # "--simulate-outdated-no-au" disables auto updates and browser outdated popup + makeWrapper "$out/share/microsoft/$appname/microsoft-edge" "$exe" \ + --prefix LD_LIBRARY_PATH : "$rpath" \ + --prefix PATH : "$binpath" \ + --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \ + --set CHROME_WRAPPER "microsoft-edge-$dist" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags "--simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'" \ --add-flags ${lib.escapeShellArg commandLineArgs} + + # Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so + patchelf --set-rpath $rpath $out/share/microsoft/$appname/lib*GL* + + # Edge specific set liboneauth + patchelf --set-rpath $rpath $out/share/microsoft/$appname/liboneauth.so + + for elf in $out/share/microsoft/$appname/{msedge,msedge-sandbox,msedge_crashpad_handler}; do + patchelf --set-rpath $rpath $elf + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf + done + + runHook postInstall ''; - # We only want automatic updates for stable, beta and dev will get updated by the same script - # and are only used for testing. - passthru = lib.optionalAttrs (channel == "stable") { updateScript = ./update.py; }; + passthru.updateScript = ./update.py; - meta = with lib; { - homepage = "https://www.microsoft.com/en-us/edge"; + meta = { + changelog = "https://learn.microsoft.com/en-us/deployedge/microsoft-edge-relnote-stable-channel"; description = "Web browser from Microsoft"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + homepage = "https://www.microsoft.com/en-us/edge"; + license = lib.licenses.unfree; + mainProgram = "microsoft-edge"; + maintainers = with lib.maintainers; [ + zanculmarktum + kuwii + rhysmdnz + ]; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zanculmarktum kuwii rhysmdnz ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +}) From a0dfcc7f116747665ee8529c3c352473cb5956a6 Mon Sep 17 00:00:00 2001 From: Rhys Davies Date: Mon, 21 Oct 2024 21:24:07 +1300 Subject: [PATCH 039/369] microsoft-edge: 129.0.2792.65 -> 130.0.2849.46 --- pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index ba4d26c18b8c..dff0183db0ab 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -168,11 +168,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "129.0.2792.65"; + version = "130.0.2849.46"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-xuCtHptE2CG4aiY7gu2sWW3Km4qfB0E/L/PBACIaKOc="; + hash = "sha256-QschcHSDoYakjf4oYXIc40SyniCufNmjHJPuvRazdSw="; }; # With strictDeps on, some shebangs were not being patched correctly From 94331378f8e4f73e5226fca129b68de280e40f60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 22 Oct 2024 03:23:16 +0000 Subject: [PATCH 040/369] ocamlPackages.reason: 3.12.0 -> 3.13.0 --- pkgs/development/compilers/reason/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 19eec9d5db40..99c0b6a99a25 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.12.0"; + version = "3.13.0"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-Y9lQr/viA3AaPUwHaidQtWIRuucBfNj1naUI77CaGv4="; + hash = "sha256-3yVEYGvIJKZwguIBGCbnoc3nrwzLW6RX6Tf+AYw85+Q="; }; strictDeps = true; From 13202afc5ba567d0d8a0d7bb1421399cc07b1eec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 23 Oct 2024 05:35:59 +0000 Subject: [PATCH 041/369] djhtml: 3.0.6 -> 3.0.7 --- pkgs/development/tools/djhtml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix index 0d30fc4f3800..1c5895466555 100644 --- a/pkgs/development/tools/djhtml/default.nix +++ b/pkgs/development/tools/djhtml/default.nix @@ -5,7 +5,7 @@ }: buildPythonApplication rec { pname = "djhtml"; - version = "3.0.6"; + version = "3.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -14,7 +14,7 @@ buildPythonApplication rec { owner = "rtts"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3bviLyTLpHcAUWAaAmNZukWBDwFs8yFOAxl2bSk9GNY="; + hash = "sha256-W93J3UFUrCqT718zoGcu96ORYFt0NLyYP7iVWbr8FYo="; }; pythonImportsCheck = [ "djhtml" ]; From feff9ac4b434b8d6bbc47deb79c5fd1204f64157 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Oct 2024 03:32:00 +0000 Subject: [PATCH 042/369] geoserver: 2.25.3 -> 2.26.0 --- pkgs/by-name/ge/geoserver/extensions.nix | 204 +++++++++++------------ pkgs/by-name/ge/geoserver/package.nix | 4 +- 2 files changed, 104 insertions(+), 104 deletions(-) diff --git a/pkgs/by-name/ge/geoserver/extensions.nix b/pkgs/by-name/ge/geoserver/extensions.nix index 5fbecd9da070..1cc81f0f137c 100644 --- a/pkgs/by-name/ge/geoserver/extensions.nix +++ b/pkgs/by-name/ge/geoserver/extensions.nix @@ -29,325 +29,325 @@ in { app-schema = mkGeoserverExtension { name = "app-schema"; - version = "2.25.3"; # app-schema - hash = "sha256-IvcJAu62wXAh5OQkG3cTUB/X7dc/2q6Le7GSwfJL/sA="; # app-schema + version = "2.26.0"; # app-schema + hash = "sha256-HOjhM9WI7lsqUNrozLB2oI6szqm+Cb7VqC0Hy9NlNMU="; # app-schema }; authkey = mkGeoserverExtension { name = "authkey"; - version = "2.25.3"; # authkey - hash = "sha256-4tEu9JOomMN/ntDHLqEwrn9lPrJ4LjTM/VuMsjARbF0="; # authkey + version = "2.26.0"; # authkey + hash = "sha256-34U3zq/SKm21fZV80+04N/0ygqShdYVMeQNuqtMSXgQ="; # authkey }; cas = mkGeoserverExtension { name = "cas"; - version = "2.25.3"; # cas - hash = "sha256-Am8tgF5APKuTa7XI7aI9Oq9jAiDPfJhGCXErtyPpDS8="; # cas + version = "2.26.0"; # cas + hash = "sha256-mosawsZkCKOm03CFg9poJ+XwbbGhvNt8AsxnegW59H4="; # cas }; charts = mkGeoserverExtension { name = "charts"; - version = "2.25.3"; # charts - hash = "sha256-0Vu9ldBYWe4vFQ6ftEO/WsmNz3Sf3W8iPS7t9W/+5fY="; # charts + version = "2.26.0"; # charts + hash = "sha256-rPnY9zYgdRoud2I2hcxnODDE/2gsBTMgTPrGAwDdrbM="; # charts }; control-flow = mkGeoserverExtension { name = "control-flow"; - version = "2.25.3"; # control-flow - hash = "sha256-zH+Hz7SySKRdrrmMBukXkaCziszIwOqzSmGYXWZGxs4="; # control-flow + version = "2.26.0"; # control-flow + hash = "sha256-4Kl0SgKW8MifMVY1+Aa9Ve0WufjHFQejobhQfnwGwbw="; # control-flow }; css = mkGeoserverExtension { name = "css"; - version = "2.25.3"; # css - hash = "sha256-c3VDxTGZebGCPfYhwUyENoGiDmVa1zttJEi/879RPsc="; # css + version = "2.26.0"; # css + hash = "sha256-CUG5cBxW/PyP/M2I5/1wC1UndzWSIg8aKeETtUnrH5A="; # css }; csw = mkGeoserverExtension { name = "csw"; - version = "2.25.3"; # csw - hash = "sha256-8G7GY5n0bV/xvwUkTijHLnsXBD4MczIastdeGmFcfSc="; # csw + version = "2.26.0"; # csw + hash = "sha256-ABNFf6grpU97nd81H/s8Gfd1G9mxMwVdUduubLWrsRE="; # csw }; csw-iso = mkGeoserverExtension { name = "csw-iso"; - version = "2.25.3"; # csw-iso - hash = "sha256-cSY981K9QiY3YJJR1zBCQArJESZO+80oIa/uj+qTsTM="; # csw-iso + version = "2.26.0"; # csw-iso + hash = "sha256-dKyVP5FuJ0Tl2z4veMeIJO66dBucfZo6qH+WvSBQ1Es="; # csw-iso }; db2 = mkGeoserverExtension { name = "db2"; - version = "2.25.3"; # db2 - hash = "sha256-0eRiLoPIWv5Bddi9RxRkxAVMSolZCpv1kKEK7FkQrXs="; # db2 + version = "2.26.0"; # db2 + hash = "sha256-L0Xrc0MuSiezKk7l4P4lm3phRou79neQds4Yu2VG5DY="; # db2 }; # Needs wps extension. dxf = mkGeoserverExtension { name = "dxf"; - version = "2.25.3"; # dxf - hash = "sha256-0i2F9343IhN6LZMdTj/dSP5k5QXd7Si/8ZWbxmkcdD4="; # dxf + version = "2.26.0"; # dxf + hash = "sha256-OtpYej/MxqeoMBw17Ltr9l5iOGUa91L30hgBz6ZbD+Y="; # dxf }; excel = mkGeoserverExtension { name = "excel"; - version = "2.25.3"; # excel - hash = "sha256-N7OCXq1HRwV1poPImct7T9ZWdbWWYprSBMarGXx33OI="; # excel + version = "2.26.0"; # excel + hash = "sha256-UHIVJnUJnzPDJWsrQw9YasUedpLujKr9s3VJtSgESHY="; # excel }; feature-pregeneralized = mkGeoserverExtension { name = "feature-pregeneralized"; - version = "2.25.3"; # feature-pregeneralized - hash = "sha256-R1jv7GPT3f7D18gQoWcLXqhtULtUvA3wEeXC2Q0+eQg="; # feature-pregeneralized + version = "2.26.0"; # feature-pregeneralized + hash = "sha256-WT1TsHcYoxJK0LWsF4h8VdUGxIecx9SuIqWoA9JjZfA="; # feature-pregeneralized }; # Note: The extension name ("gdal") clashes with pkgs.gdal. gdal = mkGeoserverExtension { name = "gdal"; - version = "2.25.3"; # gdal + version = "2.26.0"; # gdal buildInputs = [ pkgs.gdal ]; - hash = "sha256-n6B/FHpul29MTYuBsg0XNfTTANBXw/cSEolzIabhHA8="; # gdal + hash = "sha256-lGyBxRCz5DvDQUNQmsk1+DfArwx3kcMoSgQq+O/DqZc="; # gdal }; # Throws "java.io.FileNotFoundException: URL [jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties] cannot be resolved to absolute file path because it does not reside in the file system: jar:file:/nix/store/.../WEB-INF/lib/gs-geofence-server-2.24.1.jar!/geofence-default-override.properties" but seems to work out of the box. #geofence = mkGeoserverExtension { # name = "geofence"; - # version = "2.25.3"; # geofence - # hash = "sha256-298rEz0JmFhXxfv0tpdsDOrFLyS7GcuFwp/tX/m+SyI="; # geofence + # version = "2.26.0"; # geofence + # hash = "sha256-Io71mNpUu15klMWFHCaFfRmxPUGGTASZE7MZWyv2TDQ="; # geofence #}; #geofence-server = mkGeoserverExtension { # name = "geofence-server"; - # version = "2.25.3"; # geofence-server - # hash = "sha256-PHP6OmulBbUJ1Q7qliYXX6fAA2C8q4h4i7qCXJpVUCQ="; # geofence-server + # version = "2.26.0"; # geofence-server + # hash = "sha256-UPRupgj9La/JWAneGeM+UdCvnkcW3ZTe7c1bYZRURGI="; # geofence-server #}; #geofence-wps = mkGeoserverExtension { # name = "geofence-wps"; - # version = "2.25.3"; # geofence-wps - # hash = "sha256-vH7gQsjfAEcpcM+JVRfbw5sH4eJz+051FBrmoS7MyYo="; # geofence-wps + # version = "2.26.0"; # geofence-wps + # hash = "sha256-SA7nWTyawzDZVsOATRLW/MQQfyXWhHQif3/4MdVogBM="; # geofence-wps #}; geopkg-output = mkGeoserverExtension { name = "geopkg-output"; - version = "2.25.3"; # geopkg-output - hash = "sha256-frcNjS+phsyuRo4PlmcSUu2Ylp3kHA8OYm+WCBAU/UI="; # geopkg-output + version = "2.26.0"; # geopkg-output + hash = "sha256-SKIInEC9TI2FBtduGHi3apZip5ubA4/ip58+w0O1a38="; # geopkg-output }; grib = mkGeoserverExtension { name = "grib"; - version = "2.25.3"; # grib - hash = "sha256-uQ7xe3sokrE89QTfTLynHSHE0W6LmiICO3XKkWKEJBU="; # grib + version = "2.26.0"; # grib + hash = "sha256-5Hn6LUxsCP5YvVsMgh6m/oMBJuIo2Y9XdbSRQAJm+vI="; # grib buildInputs = [ netcdf ]; }; gwc-s3 = mkGeoserverExtension { name = "gwc-s3"; - version = "2.25.3"; # gwc-s3 - hash = "sha256-1cc3JywXaCCQUojnTVYmkq9Gz5Y1atBJmd0GDhyGAIE="; # gwc-s3 + version = "2.26.0"; # gwc-s3 + hash = "sha256-www+MTFlkmJ6GeGd3v8uGTYV7PYVg5pIS9/2s1D6YeU="; # gwc-s3 }; h2 = mkGeoserverExtension { name = "h2"; - version = "2.25.3"; # h2 - hash = "sha256-Cp/3qrjNSKztAaMrxPoZo2YfGBEezLQp6/ZGOehkixM="; # h2 + version = "2.26.0"; # h2 + hash = "sha256-+Y7pILmnz51c5eO+OdqHGLD05fEqaM3vkFU7s0UiA2g="; # h2 }; iau = mkGeoserverExtension { name = "iau"; - version = "2.25.3"; # iau - hash = "sha256-MV/XYF61rQjuOJSU6n0ADauFYJGF0cZk4lMSoHs9drg="; # iau + version = "2.26.0"; # iau + hash = "sha256-5oM3JxD6HKVhq1/IxXWck1MtQ8KwsLtf+LQACpvdKMA="; # iau }; importer = mkGeoserverExtension { name = "importer"; - version = "2.25.3"; # importer - hash = "sha256-T6PGv3zfiwA8DE2XZ2CusaQ0vRGZ75mO4nxONsCQU+g="; # importer + version = "2.26.0"; # importer + hash = "sha256-HFBIEB8pgVaCMF34Z0Clp3+nk2h4Va0xV2ptSZUSx9I="; # importer }; inspire = mkGeoserverExtension { name = "inspire"; - version = "2.25.3"; # inspire - hash = "sha256-A4BBd0Q8NVjPLI6e8HTCg5zd4QOLQ6Ho3/2hnRXCeTM="; # inspire + version = "2.26.0"; # inspire + hash = "sha256-uIryr4WQbWdAMjqATGf0txp1sZWWABSMv8o2xiKaWiI="; # inspire }; # Needs Kakadu plugin from # https://github.com/geosolutions-it/imageio-ext #jp2k = mkGeoserverExtension { # name = "jp2k"; - # version = "2.25.3"; # jp2k - # hash = "sha256-0df5vPLYqxPAxqINwdWZ5RRJQVm/79sUcj8fB4RwMKY="; # jp2k + # version = "2.26.0"; # jp2k + # hash = "sha256-gPipm6hnkIyEU3a8NbSCm5QUSF+IKNHgt5DNFsvC++c="; # jp2k #}; libjpeg-turbo = mkGeoserverExtension { name = "libjpeg-turbo"; - version = "2.25.3"; # libjpeg-turbo - hash = "sha256-vQjeYuB6JY+bMlxRXZ7HqgS2hEtmEJJvowfwhWmYkY4="; # libjpeg-turbo + version = "2.26.0"; # libjpeg-turbo + hash = "sha256-I1Ojsgd+gRjSJJkx9wSfzJfVq5z3vgxA4zynZvVd4jU="; # libjpeg-turbo buildInputs = [ libjpeg.out ]; }; mapml = mkGeoserverExtension { name = "mapml"; - version = "2.25.3"; # mapml - hash = "sha256-3BMCWeAFn52Uiob53eer5OqBLOgQaMTmHPFTLs51mEg="; # mapml + version = "2.26.0"; # mapml + hash = "sha256-VGg/3cB+KUwZtbKQUoU4NURDjcANzQpPv4ZWeCzwkq0="; # mapml }; mbstyle = mkGeoserverExtension { name = "mbstyle"; - version = "2.25.3"; # mbstyle - hash = "sha256-SJAI4ssMZZL75gx1h7gwf+4YwXP/CNEm9BTtA/JNRW4="; # mbstyle + version = "2.26.0"; # mbstyle + hash = "sha256-Z5CNKP2fqMcw6prP/b84tOAPYwlLiFsbV26VdVnqFns="; # mbstyle }; metadata = mkGeoserverExtension { name = "metadata"; - version = "2.25.3"; # metadata - hash = "sha256-Gst1cctv/oKTS+jD0y8fHFrEBJyn77fEafV+QzspQVc="; # metadata + version = "2.26.0"; # metadata + hash = "sha256-6E9Z6WqCQxlDL3w1FiI+gOzjQ4ZyS5oucj1/02W4k4Y="; # metadata }; mongodb = mkGeoserverExtension { name = "mongodb"; - version = "2.25.3"; # mongodb - hash = "sha256-LVejtipIRZy3g5GKs8RkOqKHNRskf8YSD11fiFvBF3w="; # mongodb + version = "2.26.0"; # mongodb + hash = "sha256-thfgMeDrDb2rPh9h9R2AgYYWPBHcEG/sI4UhNBb/DfQ="; # mongodb }; monitor = mkGeoserverExtension { name = "monitor"; - version = "2.25.3"; # monitor - hash = "sha256-+FlKgoESE0j6JXM0yozYMyz6U2TshYNd6WHsKg9frAs="; # monitor + version = "2.26.0"; # monitor + hash = "sha256-vgeqZXzb8nz7daAeur1JMLS0Rospgyx+v9n687000EE="; # monitor }; mysql = mkGeoserverExtension { name = "mysql"; - version = "2.25.3"; # mysql - hash = "sha256-gfU67lID2YSNbi1aB8m1b+zGqtVnChi56HrtcBE6Aqw="; # mysql + version = "2.26.0"; # mysql + hash = "sha256-PCNCyqJwOK6P6sDWVMdV6gGXgHJOPw97cqkjaixZxwQ="; # mysql }; netcdf = mkGeoserverExtension { name = "netcdf"; - version = "2.25.3"; # netcdf - hash = "sha256-aMykYIBMwH46apDudKnApNba454Yep5HZeYPqEXoqcI="; # netcdf + version = "2.26.0"; # netcdf + hash = "sha256-0i/zmiIE+xjec6dOd237MdIBrCspZEL+8h1c/g0h7oU="; # netcdf buildInputs = [ netcdf ]; }; netcdf-out = mkGeoserverExtension { name = "netcdf-out"; - version = "2.25.3"; # netcdf-out - hash = "sha256-3gGzgC7IbwpettwSf4+b8HeJRuvkUfDu0xre9wyVap4="; # netcdf-out + version = "2.26.0"; # netcdf-out + hash = "sha256-xl2mY9QYSVeC2k43H2GFz2D56rajCT9FlpP47Q8aOe8="; # netcdf-out buildInputs = [ netcdf ]; }; ogr-wfs = mkGeoserverExtension { name = "ogr-wfs"; - version = "2.25.3"; # ogr-wfs + version = "2.26.0"; # ogr-wfs buildInputs = [ pkgs.gdal ]; - hash = "sha256-4rcUvN1py62JMQy51rxvNfV2AQIptXuRen7tvbrno6s="; # ogr-wfs + hash = "sha256-LiB+BE2Q3a2US7HJkBWT0Z9AMZ3A3M584qbEV1uhhEM="; # ogr-wfs }; # Needs ogr-wfs extension. ogr-wps = mkGeoserverExtension { name = "ogr-wps"; - version = "2.25.3"; # ogr-wps + version = "2.26.0"; # ogr-wps # buildInputs = [ pkgs.gdal ]; - hash = "sha256-RA1dxzjhOt7lQCu6SVSM8HiXYwtFbUfj0hdk831QE5g="; # ogr-wps + hash = "sha256-0o4cD8wv1Km5pljxAlokVRVEfMbklXgkYhxFZqPdROk="; # ogr-wps }; oracle = mkGeoserverExtension { name = "oracle"; - version = "2.25.3"; # oracle - hash = "sha256-fKJwLh4T445da1AWPzFpp++LGWiiKhN339VWt1N0s5Q="; # oracle + version = "2.26.0"; # oracle + hash = "sha256-mxc46ctIh7imjQgTI2zZ9gwtgDF6GkE/b5IogUktF9Y="; # oracle }; params-extractor = mkGeoserverExtension { name = "params-extractor"; - version = "2.25.3"; # params-extractor - hash = "sha256-zO9OwH7NCUILnxRqz1z/QJdfgsx9gfpf2R7rIsgTIr8="; # params-extractor + version = "2.26.0"; # params-extractor + hash = "sha256-dLzEdnNy+Nrxkc4aBCGTESuReW6mkgXEpXDo9rDzsBU="; # params-extractor }; printing = mkGeoserverExtension { name = "printing"; - version = "2.25.3"; # printing - hash = "sha256-QAy53/p+/mjCTXreKsVSRcpYgfAs7W9f+ZwE4Z6Gnx8="; # printing + version = "2.26.0"; # printing + hash = "sha256-31T/tizxkmzYbxR1eLiY3DanwlFVdeZvFOESgBnuG1A="; # printing }; pyramid = mkGeoserverExtension { name = "pyramid"; - version = "2.25.3"; # pyramid - hash = "sha256-kFTNQrxibatVZzPSC6Rv/SzU3FUJYQJ3dHZ5AfR3kD8="; # pyramid + version = "2.26.0"; # pyramid + hash = "sha256-lpDexw5nd1jm9cDFsQ/qXdwbX5vTD0RXKIAOg6dKQqE="; # pyramid }; querylayer = mkGeoserverExtension { name = "querylayer"; - version = "2.25.3"; # querylayer - hash = "sha256-TgQiroYcnVCe5QVIcEa8gsgYELqM2jS7RveGyetWokU="; # querylayer + version = "2.26.0"; # querylayer + hash = "sha256-ajrNJ0eG0pp+v/f4N5kxcUzYOyXuLhMRzvdfdiJh0Vk="; # querylayer }; sldservice = mkGeoserverExtension { name = "sldservice"; - version = "2.25.3"; # sldservice - hash = "sha256-5E410iNaZVEBKzRGSBcW3JNISap2NrcFtXAuP1+cVt0="; # sldservice + version = "2.26.0"; # sldservice + hash = "sha256-xxpKSDghK+Xz8buPU5lzEa7eiG5A0rPgzCaIO9GKCMY="; # sldservice }; sqlserver = mkGeoserverExtension { name = "sqlserver"; - version = "2.25.3"; # sqlserver - hash = "sha256-TNeyegWOz/a7uFsn1hBhOgpV0vnFncwQ+U9VqyY62+g="; # sqlserver + version = "2.26.0"; # sqlserver + hash = "sha256-UwZ4ho+HG+ocwri+N4ebTATGcT4tukAxwvx84rP0VWk="; # sqlserver }; vectortiles = mkGeoserverExtension { name = "vectortiles"; - version = "2.25.3"; # vectortiles - hash = "sha256-RQGeGhfixKrwRuzgmkZ/JDWaPZyDy8fAfGe0iXZfKdY="; # vectortiles + version = "2.26.0"; # vectortiles + hash = "sha256-rlQcWLEPvaKDT6JZ0RuZtaHz1bgtsblFOybKOVqDSVM="; # vectortiles }; wcs2_0-eo = mkGeoserverExtension { name = "wcs2_0-eo"; - version = "2.25.3"; # wcs2_0-eo - hash = "sha256-+li0zBzyHaq0an7qHAdSXKDpvpOZProHnCoHXjyVY7Y="; # wcs2_0-eo + version = "2.26.0"; # wcs2_0-eo + hash = "sha256-Ky+unKH+WBMvo/rlNPv2Uca3X610yXZvCy0/5KEN6wk="; # wcs2_0-eo }; web-resource = mkGeoserverExtension { name = "web-resource"; - version = "2.25.3"; # web-resource - hash = "sha256-m9+t3Q2yD+xqvuBvkc5jYWwtGqJit00xiHyDSLX8euE="; # web-resource + version = "2.26.0"; # web-resource + hash = "sha256-S7Wu4wGo2j8PcBC8VS7EECBlr7NN1hALC1VOM5b6Wk0="; # web-resource }; wmts-multi-dimensional = mkGeoserverExtension { name = "wmts-multi-dimensional"; - version = "2.25.3"; # wmts-multi-dimensional - hash = "sha256-b/16463iotuADA/bIwTutYCiRZYusMf/yB1xEMPZe9U="; # wmts-multi-dimensional + version = "2.26.0"; # wmts-multi-dimensional + hash = "sha256-BNigZB16d1BKRTl/UJs1oWYFKn/cFk5WX1fBwvC046I="; # wmts-multi-dimensional }; wps = mkGeoserverExtension { name = "wps"; - version = "2.25.3"; # wps - hash = "sha256-4WqZqfc80Qy3AACOb3MhDjocM02vKUEk9x8YfX5onyg="; # wps + version = "2.26.0"; # wps + hash = "sha256-HVTDMqG23Ign7qottKRo1PtQNr6606nV34SRopAMO1Q="; # wps }; # Needs hazelcast (https://github.com/hazelcast/hazelcast (?)) which is not # available in nixpgs as of 2024/01. #wps-cluster-hazelcast = mkGeoserverExtension { # name = "wps-cluster-hazelcast"; - # version = "2.25.3"; # wps-cluster-hazelcast - # hash = "sha256-EDSSNVCZdcmv8ZfB3Gj80xm/ghlWNZwpTYhEwIoegM0="; # wps-cluster-hazelcast + # version = "2.26.0"; # wps-cluster-hazelcast + # hash = "sha256-R0Btbf6BNwGKC2TQ6BmSte612Sel7NspOX9KU+zsHBc="; # wps-cluster-hazelcast #}; wps-download = mkGeoserverExtension { name = "wps-download"; - version = "2.25.3"; # wps-download - hash = "sha256-70vw5PHh1hLLAocFKlzPKDZWMjQmwUbv/L4yCJGrDQ4="; # wps-download + version = "2.26.0"; # wps-download + hash = "sha256-sVbAi0y8n2shox6TX0Y4Hg5GhYakv5+tgloMix6Wbfg="; # wps-download }; # Needs Postrgres configuration or similar. # See https://docs.geoserver.org/main/en/user/extensions/wps-jdbc/index.html wps-jdbc = mkGeoserverExtension { name = "wps-jdbc"; - version = "2.25.3"; # wps-jdbc - hash = "sha256-5d+txy1gw36G7hXfOf5qH+bSPIRw3XeLeMCTw6yHp/M="; # wps-jdbc + version = "2.26.0"; # wps-jdbc + hash = "sha256-iJk24m4UDwK1PrU0PiCDPGj0eK7EEQajUFyl+9aIGpE="; # wps-jdbc }; ysld = mkGeoserverExtension { name = "ysld"; - version = "2.25.3"; # ysld - hash = "sha256-lbjfJPv9v4HUV31Hp5ZAEOe7IceRCxN7xtUxvOi2CYU="; # ysld + version = "2.26.0"; # ysld + hash = "sha256-/qbtfaIE/4haGeS6U+FML1JI/AyXWFyKOd8tGaYFCmw="; # ysld }; } diff --git a/pkgs/by-name/ge/geoserver/package.nix b/pkgs/by-name/ge/geoserver/package.nix index 76a68eea8c3a..15567ea5ca4e 100644 --- a/pkgs/by-name/ge/geoserver/package.nix +++ b/pkgs/by-name/ge/geoserver/package.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "geoserver"; - version = "2.25.3"; + version = "2.26.0"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - hash = "sha256-EmW3i0qi7P48AftCz7tqI2Wtvdy3cpyR57+s42dYwt8="; + hash = "sha256-WeItL0j50xWYXIFmH4EFhHjxv9Xr6rG0YO8re1jUnNM="; }; patches = [ From 78e174d1bc50a49cf662d804719a23d5b978dd54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 10:16:19 +0000 Subject: [PATCH 043/369] sby: 0.45 -> 0.46 --- pkgs/by-name/sb/sby/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix index 0390df3e0519..225a5dfb1b8f 100644 --- a/pkgs/by-name/sb/sby/package.nix +++ b/pkgs/by-name/sb/sby/package.nix @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { pname = "sby"; - version = "0.45"; + version = "0.46"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "sby"; rev = "yosys-${version}"; - hash = "sha256-HRQ5ZL0w3GLUySTFekE/T/VlxJLFIQQr0bW8l7rp/zs="; + hash = "sha256-LVfHSVMrAKImD1y6icQSSfOSt9khZfOKK+lXhxdvRb4="; }; nativeBuildInputs = [ bash ]; From c610499e979f173026a770150e03dbfa5230e64a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 12:55:20 +0000 Subject: [PATCH 044/369] pipenv: 2024.1.0 -> 2024.2.0 --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 3265936c4377..0843e6162227 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -26,14 +26,14 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2024.1.0"; + version = "2024.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "pypa"; repo = "pipenv"; rev = "refs/tags/v${version}"; - hash = "sha256-rfQIDGYBA2dc01AgW+qMBFQ+ETrOysNkgyKqeQeD/3A="; + hash = "sha256-5gq1kXVNAMH/AeovpUStcZffXN4GfXj3wJ7lW4qebRM="; }; env.LC_ALL = "en_US.UTF-8"; From 5d72a99cfff3b4194414f1f63c095fa4f816a81d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 18:33:24 +0000 Subject: [PATCH 045/369] matrix-synapse-plugins.matrix-synapse-mjolnir-antispam: 1.6.5 -> 1.8.3 --- pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index 364abdb95196..0f7b3d7e4dd9 100644 --- a/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "matrix-synapse-mjolnir-antispam"; - version = "1.6.5"; + version = "1.8.3"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "refs/tags/v${version}"; - sha256 = "sha256-xejFKz2MmdjMFU0X0SdI+qXTBRAwIvkcfZPQqXB9LV0="; + sha256 = "sha256-yD7QGsS2Em8Z95po9pGRUDmHgHe4z0j0Jnvy3IG7xKY="; }; sourceRoot = "${src.name}/synapse_antispam"; From 9e212d6d29792253b0059f18f4929e90dcfbb72f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 21:09:43 +0000 Subject: [PATCH 046/369] glances: 4.1.2.1 -> 4.2.0 --- pkgs/applications/system/glances/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index ff8b4c310662..de72bc7c728f 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -26,14 +26,14 @@ buildPythonApplication rec { pname = "glances"; - version = "4.1.2.1"; + version = "4.2.0"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - hash = "sha256-SlKt+wjzI9QRmMVvbIERuhQuCCaOh7L89WuNUXNhkuI="; + hash = "sha256-liyrMaqBgK7UZjWIKIgIFbskTGaWfyrK8L74DKmaDmY="; }; # On Darwin this package segfaults due to mismatch of pure and impure From 5ca22e6232777811d9176a6a5e3b3a43009a4ec2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 04:36:44 +0000 Subject: [PATCH 047/369] prometheus-influxdb-exporter: 0.11.7 -> 0.12.0 --- pkgs/servers/monitoring/prometheus/influxdb-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 640c09a7c00c..1dd3422f76ef 100644 --- a/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "influxdb_exporter"; - version = "0.11.7"; + version = "0.12.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "influxdb_exporter"; - hash = "sha256-gaUBRDGbHvHH+Ll1fmOaYEVRAqy2q5HoTyty2PGTwBE="; + hash = "sha256-O3cH7fX29tr/rhsovoYnmTL6CE+sZQKGNj4mq1IV/5U="; }; - vendorHash = "sha256-47ru0rzLl4/O0UOGqCojH+vqd4TS1S2Hk6zmSzrXriw="; + vendorHash = "sha256-RCf52lHpF4alljH/CNhCg+zgfvlYbO5WT2rFX63fyyo="; ldflags = [ "-s" From dccd62a88ceebf39f4203f8858abacaad31beebf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 08:22:35 +0000 Subject: [PATCH 048/369] zoekt: 3.7.2-2-unstable-2024-10-01 -> 3.7.2-2-unstable-2024-10-24 --- pkgs/by-name/zo/zoekt/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index 4af89fc2f468..81182b2d9d6c 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -7,16 +7,16 @@ buildGoModule { pname = "zoekt"; - version = "3.7.2-2-unstable-2024-10-01"; + version = "3.7.2-2-unstable-2024-10-24"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "650136078a98ef99acf4159310a2c12fd25075d7"; - hash = "sha256-MtN/x5o0iHZeDqIQCuio8y5pmZXq5qFIE6FySgIY2CY="; + rev = "bfd8ee868c4c3fe509fa0fd4f2b8c68d84805ff9"; + hash = "sha256-hoKMD/nTX0r2PEM0qRhAQFXM45UhDztwK0epL2EIMY8="; }; - vendorHash = "sha256-+ayixWCD2e+7Nh9WJmDAloSzp63v9hQYQd8UMuo8qxQ="; + vendorHash = "sha256-QZysaEBZ1/ISPRkUPr6UIEUlWv/aHEwk8B/wxaYe7zU="; nativeCheckInputs = [ git From ff7d9a3e054ce0cf48919f6c6e0ad1a969ff91d0 Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 26 Oct 2024 13:45:35 +0000 Subject: [PATCH 049/369] python312Packages.magic-wormhole-transit-relay: 0.2.1 -> 0.3.1 https://github.com/magic-wormhole/magic-wormhole-transit-relay/compare/refs/tags/0.2.1...refs/tags/0.3.1 --- .../magic-wormhole-transit-relay/default.nix | 21 +++++++---- .../python-modules/magic-wormhole/default.nix | 36 ++++++++++++++++--- 2 files changed, 46 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index bf8b990fe0d9..89366bc43f1d 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -6,21 +6,27 @@ autobahn, mock, twisted, - pythonOlder, - pythonAtLeast, + python, pytestCheckHook, }: buildPythonPackage rec { pname = "magic-wormhole-transit-relay"; - version = "0.2.1"; + version = "0.3.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-y0gBtGiQ6v+XKG4OP+xi0dUv/jF9FACDtjNqH7To+l4="; + hash = "sha256-LvLvvk008OYkhw+EIln9czuncVLtMQr0NJd0piiEkA4="; }; + postPatch = '' + # Passing the environment to twistd is necessary to preserve Python's site path. + substituteInPlace src/wormhole_transit_relay/test/test_backpressure.py --replace-fail \ + 'reactor.spawnProcess(proto, exe, args)' \ + 'reactor.spawnProcess(proto, exe, args, None)' + ''; + build-system = [ setuptools ]; dependencies = [ @@ -39,13 +45,16 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; + postCheck = '' + # Avoid collision with twisted's plugin cache (#164775). + rm "$out/${python.sitePackages}/twisted/plugins/dropin.cache" + ''; + meta = { description = "Transit Relay server for Magic-Wormhole"; homepage = "https://github.com/magic-wormhole/magic-wormhole-transit-relay"; changelog = "https://github.com/magic-wormhole/magic-wormhole-transit-relay/blob/${version}/NEWS.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mjoerg ]; - # Python 3.12 support: https://github.com/magic-wormhole/magic-wormhole-transit-relay/issues/35 - broken = pythonOlder "3.7" || pythonAtLeast "3.12"; }; } diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 5abdff45c6d1..6d64ee1a4c4e 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchPypi, + pythonAtLeast, # build-system setuptools, @@ -34,6 +35,27 @@ pytestCheckHook, }: +let + # magic-wormhole relies on the internal API of + # magic-wormhole-transit-relay < 0.3.0 for testing. + magic-wormhole-transit-relay_0_2_1 = + magic-wormhole-transit-relay.overridePythonAttrs + (oldAttrs: rec { + version = "0.2.1"; + + src = fetchPypi { + pname = "magic-wormhole-transit-relay"; + inherit version; + hash = "sha256-y0gBtGiQ6v+XKG4OP+xi0dUv/jF9FACDtjNqH7To+l4="; + }; + + postPatch = ""; + + postCheck = ""; + + meta.broken = pythonAtLeast "3.12"; + }); +in buildPythonPackage rec { pname = "magic-wormhole"; version = "0.16.0"; @@ -81,8 +103,12 @@ buildPythonPackage rec { nativeCheckInputs = # For Python 3.12, remove magic-wormhole-mailbox-server and magic-wormhole-transit-relay from test dependencies, # which are not yet supported with this version. - lib.optionals (!magic-wormhole-mailbox-server.meta.broken) [ magic-wormhole-mailbox-server ] - ++ lib.optionals (!magic-wormhole-transit-relay.meta.broken) [ magic-wormhole-transit-relay ] + lib.optionals + (!magic-wormhole-mailbox-server.meta.broken && !magic-wormhole-transit-relay_0_2_1.meta.broken) + [ + magic-wormhole-mailbox-server + magic-wormhole-transit-relay_0_2_1 + ] ++ [ mock pytestCheckHook @@ -96,15 +122,15 @@ buildPythonPackage rec { # For Python 3.12, remove the tests depending on magic-wormhole-mailbox-server and magic-wormhole-transit-relay, # which are not yet supported with this version. lib.optionals - (magic-wormhole-mailbox-server.meta.broken || magic-wormhole-transit-relay.meta.broken) + (magic-wormhole-mailbox-server.meta.broken || magic-wormhole-transit-relay_0_2_1.meta.broken) [ "src/wormhole/test/dilate/test_full.py" "src/wormhole/test/test_args.py" "src/wormhole/test/test_cli.py" + "src/wormhole/test/test_transit.py" "src/wormhole/test/test_wormhole.py" "src/wormhole/test/test_xfer_util.py" - ] - ++ lib.optionals magic-wormhole-transit-relay.meta.broken [ "src/wormhole/test/test_transit.py" ]; + ]; postInstall = '' install -Dm644 docs/wormhole.1 $out/share/man/man1/wormhole.1 From 254e934ead21842c2964bd5ba310ae1fcae952fe Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Sat, 26 Oct 2024 13:45:35 +0000 Subject: [PATCH 050/369] python312Packages.magic-wormhole: 0.16.0 -> 0.17.0 https://github.com/magic-wormhole/magic-wormhole/compare/refs/tags/0.16.0...refs/tags/0.17.0 --- .../python-modules/magic-wormhole/default.nix | 40 +++++-------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 6d64ee1a4c4e..87404ab5b21e 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -2,8 +2,7 @@ lib, stdenv, buildPythonPackage, - fetchPypi, - pythonAtLeast, + fetchFromGitHub, # build-system setuptools, @@ -35,35 +34,16 @@ pytestCheckHook, }: -let - # magic-wormhole relies on the internal API of - # magic-wormhole-transit-relay < 0.3.0 for testing. - magic-wormhole-transit-relay_0_2_1 = - magic-wormhole-transit-relay.overridePythonAttrs - (oldAttrs: rec { - version = "0.2.1"; - - src = fetchPypi { - pname = "magic-wormhole-transit-relay"; - inherit version; - hash = "sha256-y0gBtGiQ6v+XKG4OP+xi0dUv/jF9FACDtjNqH7To+l4="; - }; - - postPatch = ""; - - postCheck = ""; - - meta.broken = pythonAtLeast "3.12"; - }); -in buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.16.0"; + version = "0.17.0"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-FObBRomNvaem0ZAmJiOmlBmVU2Pn5DTWSq0tIz1tlMk="; + src = fetchFromGitHub { + owner = "magic-wormhole"; + repo = "magic-wormhole"; + rev = "refs/tags/${version}"; + hash = "sha256-BxPF4iQ91wLBagdvQ/Y89VIZBkMxFiEHnK+BU55Bwr4="; }; postPatch = @@ -104,10 +84,10 @@ buildPythonPackage rec { # For Python 3.12, remove magic-wormhole-mailbox-server and magic-wormhole-transit-relay from test dependencies, # which are not yet supported with this version. lib.optionals - (!magic-wormhole-mailbox-server.meta.broken && !magic-wormhole-transit-relay_0_2_1.meta.broken) + (!magic-wormhole-mailbox-server.meta.broken && !magic-wormhole-transit-relay.meta.broken) [ magic-wormhole-mailbox-server - magic-wormhole-transit-relay_0_2_1 + magic-wormhole-transit-relay ] ++ [ mock @@ -122,7 +102,7 @@ buildPythonPackage rec { # For Python 3.12, remove the tests depending on magic-wormhole-mailbox-server and magic-wormhole-transit-relay, # which are not yet supported with this version. lib.optionals - (magic-wormhole-mailbox-server.meta.broken || magic-wormhole-transit-relay_0_2_1.meta.broken) + (magic-wormhole-mailbox-server.meta.broken || magic-wormhole-transit-relay.meta.broken) [ "src/wormhole/test/dilate/test_full.py" "src/wormhole/test/test_args.py" From 6b6b6c3837b2481ea7f76442cf6371cd76ea929d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:31:22 +0200 Subject: [PATCH 051/369] mpiCheckPhaseHook: disable openmpi's ssh plugin openmpi requires SSH to run. Set flags to run off SSH usage. --- .../setup-hooks/mpi-check-hook/mpi-check-hook.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh index d7275b62244d..d576df6489d6 100644 --- a/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh +++ b/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh @@ -6,7 +6,6 @@ setupMpiCheck() { # Find out which MPI implementation we are using # and set safe defaults that are guaranteed to run # on any build machine - mpiType="NONE" # OpenMPI signature @@ -41,6 +40,10 @@ setupMpiCheck() { export OMPI_MCA_rmaps_base_oversubscribe=1 export PRTE_MCA_rmaps_default_mapping_policy=node:oversubscribe + # Make sure we do not need openssh in the checkPhase + export OMPI_MCA_plm_ssh_agent=false + export PRRTE_MCA_plm_ssh_agent=false + # Disable CPU pinning export OMPI_MCA_hwloc_base_binding_policy=none export PRTE_MCA_hwloc_default_binding_policy=none From 45aac60b24f1735340e9c776ba8559616510ad9b Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:41:20 +0200 Subject: [PATCH 052/369] scalapack: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/development/libraries/science/math/scalapack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index f7b4ba6738d1..3efd66dff395 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake -, openssh, mpiCheckPhaseHook, mpi, blas, lapack +, mpiCheckPhaseHook, mpi, blas, lapack } : assert blas.isILP64 == lapack.isILP64; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; - nativeCheckInputs = [ openssh mpiCheckPhaseHook ]; + nativeCheckInputs = [ mpiCheckPhaseHook ]; buildInputs = [ blas lapack ]; propagatedBuildInputs = [ mpi ]; hardeningDisable = lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isDarwin) [ "stackprotector" ]; From de5f7b922b92bb8188e44a387e5e244ba25baad4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:43:55 +0200 Subject: [PATCH 053/369] sirius: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/by-name/si/sirius/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index d437eece8b21..58c6e6a6dd2e 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -5,7 +5,6 @@ , pkg-config , mpi , mpiCheckPhaseHook -, openssh , gfortran , blas , lapack @@ -139,7 +138,6 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ mpiCheckPhaseHook - openssh ]; meta = with lib; { From ddd6f3fb1fddc34e058578547299ecc2cbad4e5d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:44:44 +0200 Subject: [PATCH 054/369] cp2k: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/by-name/cp/cp2k/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix index 95c7f0461032..646e9d5aba78 100644 --- a/pkgs/by-name/cp/cp2k/package.nix +++ b/pkgs/by-name/cp/cp2k/package.nix @@ -18,7 +18,6 @@ mpi, gsl, scalapack, - openssh, makeWrapper, libxsmm, spglib, @@ -83,7 +82,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 which - openssh makeWrapper pkg-config ] ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc; @@ -225,7 +223,6 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ mpiCheckPhaseHook - openssh ]; checkPhase = '' From 3e59f77a4f2bc77ad53e2d2db84f222f1a74a513 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:45:33 +0200 Subject: [PATCH 055/369] dbcsr: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/development/libraries/science/math/dbcsr/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/dbcsr/default.nix b/pkgs/development/libraries/science/math/dbcsr/default.nix index 34f9c4db39cc..e758e1c8fcc2 100644 --- a/pkgs/development/libraries/science/math/dbcsr/default.nix +++ b/pkgs/development/libraries/science/math/dbcsr/default.nix @@ -11,7 +11,6 @@ , python3 , libxsmm , mpi -, openssh }: stdenv.mkDerivation rec { @@ -62,7 +61,6 @@ stdenv.mkDerivation rec { ]; checkInputs = [ - openssh mpiCheckPhaseHook ]; From ce65b23d16bc248428eec484054c4f953f53d55e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:47:44 +0200 Subject: [PATCH 056/369] elpa: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHoook --- pkgs/development/libraries/elpa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/elpa/default.nix b/pkgs/development/libraries/elpa/default.nix index f13b1a167e23..03e6595d1239 100644 --- a/pkgs/development/libraries/elpa/default.nix +++ b/pkgs/development/libraries/elpa/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, autoreconfHook, mpiCheckPhaseHook -, perl, mpi, blas, lapack, scalapack, openssh +, perl, mpi, blas, lapack, scalapack # CPU optimizations , avxSupport ? stdenv.hostPlatform.avxSupport , avx2Support ? stdenv.hostPlatform.avx2Support @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { doCheck = !enableCuda; - nativeCheckInputs = [ mpiCheckPhaseHook openssh ]; + nativeCheckInputs = [ mpiCheckPhaseHook ]; preCheck = '' #patchShebangs ./ From a746d6a411980f1b8fa18ee58a8ce91ab67cc45d Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:48:08 +0200 Subject: [PATCH 057/369] pythonPackages.mpi4py: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/development/python-modules/mpi4py/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 1aba82440888..17d3a46a6fae 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -5,7 +5,6 @@ cython, setuptools, mpi, - openssh, pytestCheckHook, mpiCheckPhaseHook, }: @@ -37,7 +36,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - openssh mpiCheckPhaseHook ]; # Most tests pass, (besides `test_spawn.py`), but when reaching ~80% tests From fb9bbbf9f05051ff133743910abd287ec162ca27 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:49:27 +0200 Subject: [PATCH 058/369] petsc: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/by-name/pe/petsc/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix index 8d0db4a768db..ebe5564441ca 100644 --- a/pkgs/by-name/pe/petsc/package.nix +++ b/pkgs/by-name/pe/petsc/package.nix @@ -10,7 +10,6 @@ mpiSupport ? true, mpi, # generic mpi dependency mpiCheckPhaseHook, - openssh, # required for openmpi tests petsc-withp4est ? false, hdf5-support ? false, hdf5, @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { python3 gfortran pkg-config - ] ++ lib.optional mpiSupport mpi ++ lib.optional (mpiSupport && mpi.pname == "openmpi") openssh; + ] ++ lib.optional mpiSupport mpi; buildInputs = [ blas lapack From b8b2c84dda8499acd16fdd8010ebcf5173247238 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:49:49 +0200 Subject: [PATCH 059/369] pythonPackages.meep: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- pkgs/development/python-modules/meep/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index d034595d03e4..8a64d2276c17 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -18,7 +18,6 @@ harminv, libctl, libGDSII, - openssh, guile, python, numpy, @@ -125,7 +124,6 @@ buildPythonPackage rec { doCheck = true; nativeCheckInputs = [ mpiCheckPhaseHook - openssh ]; checkPhase = '' runHook preCheck From 17277615a77ee1a7e6ee9f228e5ec3935c8cd1b6 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 26 Oct 2024 17:50:19 +0200 Subject: [PATCH 060/369] p4est-sc: remove openssh from checkInputs Is taken care of by mpiCheckPhaseHook --- .../libraries/science/math/p4est-sc/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index 39b5660494d2..3ac61e5c2b36 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -1,14 +1,13 @@ { lib, stdenv, fetchFromGitHub, mpiCheckPhaseHook , autoreconfHook, pkg-config , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true -, mpi, openssh, zlib +, mpi, zlib }: let dbg = lib.optionalString debugEnable "-dbg"; debugEnable = p4est-sc-debugEnable; mpiSupport = p4est-sc-mpiSupport; - isOpenmpi = mpiSupport && mpi.pname == "openmpi"; in stdenv.mkDerivation { pname = "p4est-sc${dbg}"; @@ -24,9 +23,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ autoreconfHook pkg-config ]; - propagatedNativeBuildInputs = lib.optional mpiSupport mpi - ++ lib.optional isOpenmpi openssh - ; + propagatedNativeBuildInputs = lib.optional mpiSupport mpi ; propagatedBuildInputs = [ zlib ]; inherit debugEnable mpiSupport; @@ -49,7 +46,6 @@ stdenv.mkDerivation { nativeCheckInputs = lib.optionals mpiSupport [ mpiCheckPhaseHook - openssh ]; # disallow Darwin checks due to prototype incompatibility of qsort_r From 7ef4cb60320de3fc1b78b42189f557c2d0fe017a Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 26 Oct 2024 20:11:52 +0200 Subject: [PATCH 061/369] vips: migrate to pkgs/by-name, format with nixfmt-rfc-style --- pkgs/by-name/vi/vips/package.nix | 169 +++++++++++++++++++++++++++ pkgs/tools/graphics/vips/default.nix | 139 ---------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 170 insertions(+), 140 deletions(-) create mode 100644 pkgs/by-name/vi/vips/package.nix delete mode 100644 pkgs/tools/graphics/vips/default.nix diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix new file mode 100644 index 000000000000..c179ca22ff92 --- /dev/null +++ b/pkgs/by-name/vi/vips/package.nix @@ -0,0 +1,169 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # Native build inputs + docbook-xsl-nons, + gobject-introspection, + gtk-doc, + meson, + ninja, + pkg-config, + + # Build inputs + ApplicationServices, + expat, + Foundation, + glib, + libxml2, + python3, + + # Optional dependencies + cfitsio, + cgif, + fftw, + imagemagick, + lcms2, + libarchive, + libexif, + libheif, + libhwy, + libimagequant, + libjpeg, + libjxl, + librsvg, + libspng, + libtiff, + libwebp, + matio, + openexr, + openjpeg, + openslide, + pango, + poppler, + + # passthru + testers, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vips"; + version = "8.15.3"; + + outputs = [ + "bin" + "out" + "man" + "dev" + ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "devdoc" ]; + + src = fetchFromGitHub { + owner = "libvips"; + repo = "libvips"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-VQtHHitEpxv63wC41TtRWLLCKHDAK7fbrS+cByeWxT0="; + # Remove unicode file names which leads to different checksums on HFS+ + # vs. other filesystems because of unicode normalisation. + postFetch = '' + rm -r $out/test/test-suite/images/ + ''; + }; + + nativeBuildInputs = + [ + docbook-xsl-nons + gobject-introspection + meson + ninja + pkg-config + ] + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + gtk-doc + ]; + + buildInputs = + [ + glib + libxml2 + expat + (python3.withPackages (p: [ p.pycairo ])) + + # Optional dependencies + cfitsio + cgif + fftw + imagemagick + lcms2 + libarchive + libexif + libheif + libhwy + libimagequant + libjpeg + libjxl + librsvg + libspng + libtiff + libwebp + matio + openexr + openjpeg + openslide + pango + poppler + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ApplicationServices + Foundation + ]; + + # Required by .pc file + propagatedBuildInputs = [ + glib + ]; + + mesonFlags = + [ + (lib.mesonEnable "pdfium" false) + (lib.mesonEnable "nifti" false) + ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) (lib.mesonBool "gtk_doc" true) + ++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false); + + passthru = { + tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "vips --version"; + }; + }; + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "v([0-9.]+)" + ]; + }; + }; + + meta = with lib; { + changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog"; + homepage = "https://www.libvips.org/"; + description = "Image processing system for large images"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ + kovirobi + anthonyroussel + ]; + pkgConfigModules = [ + "vips" + "vips-cpp" + ]; + platforms = platforms.unix; + mainProgram = "vips"; + }; +}) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix deleted file mode 100644 index c8f41167f865..000000000000 --- a/pkgs/tools/graphics/vips/default.nix +++ /dev/null @@ -1,139 +0,0 @@ -{ lib -, stdenv -, pkg-config -, glib -, libxml2 -, expat -, ApplicationServices -, Foundation -, python3 -, fetchFromGitHub -, meson -, ninja -, gtk-doc -, docbook-xsl-nons -, gobject-introspection - # Optional dependencies -, libjpeg -, libexif -, librsvg -, poppler -, libtiff -, fftw -, lcms2 -, libspng -, libimagequant -, imagemagick -, pango -, matio -, cfitsio -, libwebp -, openexr -, openjpeg -, libjxl -, openslide -, libheif -, cgif -, libarchive -, libhwy -, testers -, nix-update-script -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "vips"; - version = "8.15.3"; - - outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ "devdoc" ]; - - src = fetchFromGitHub { - owner = "libvips"; - repo = "libvips"; - rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-VQtHHitEpxv63wC41TtRWLLCKHDAK7fbrS+cByeWxT0="; - # Remove unicode file names which leads to different checksums on HFS+ - # vs. other filesystems because of unicode normalisation. - postFetch = '' - rm -r $out/test/test-suite/images/ - ''; - }; - - nativeBuildInputs = [ - pkg-config - meson - ninja - docbook-xsl-nons - gobject-introspection - ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - gtk-doc - ]; - - buildInputs = [ - glib - libxml2 - expat - (python3.withPackages (p: [ p.pycairo ])) - # Optional dependencies - libjpeg - libexif - librsvg - poppler - libtiff - fftw - lcms2 - libspng - libimagequant - imagemagick - pango - matio - cfitsio - libwebp - openexr - openjpeg - libjxl - openslide - libheif - cgif - libarchive - libhwy - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ApplicationServices Foundation ]; - - # Required by .pc file - propagatedBuildInputs = [ - glib - ]; - - mesonFlags = [ - "-Dpdfium=disabled" - "-Dnifti=disabled" - ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-Dgtk_doc=true" - ++ lib.optional (imagemagick == null) "-Dmagick=disabled" - ; - - passthru = { - tests = { - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; - version = testers.testVersion { - package = finalAttrs.finalPackage; - command = "vips --version"; - }; - }; - updateScript = nix-update-script { - extraArgs = [ "--version-regex" "v([0-9.]+)" ]; - }; - }; - - meta = with lib; { - changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog"; - homepage = "https://www.libvips.org/"; - description = "Image processing system for large images"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ kovirobi anthonyroussel ]; - pkgConfigModules = [ "vips" "vips-cpp" ]; - platforms = platforms.unix; - mainProgram = "vips"; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65d48fc5f467..c7ddbcaeb5b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37901,7 +37901,7 @@ with pkgs; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { }; vimb = wrapFirefox vimb-unwrapped { }; - vips = callPackage ../tools/graphics/vips { + vips = callPackage ../by-name/vi/vips/package.nix { inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation; }; From 60f3c0325f247a6b776efe9de3c260b5fe339ec3 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 26 Oct 2024 20:24:23 +0200 Subject: [PATCH 062/369] vips: 8.15.3 -> 8.15.5 https://github.com/libvips/libvips/compare/v8.15.3...v8.15.5 --- pkgs/by-name/vi/vips/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index c179ca22ff92..ca866f148441 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.15.3"; + version = "8.15.5"; outputs = [ "bin" @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libvips"; repo = "libvips"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-VQtHHitEpxv63wC41TtRWLLCKHDAK7fbrS+cByeWxT0="; + hash = "sha256-Lwe4lu3kS1WxgbM0eRfrMf/UIpDebvooHKvyVv7lq24="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' From cf5ffc828c279fe434ee6531773f36c1e21437ef Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sat, 26 Oct 2024 20:31:25 +0200 Subject: [PATCH 063/369] python312Packages.pyvips: 2.2.1 -> 2.2.3 https://github.com/libvips/pyvips/compare/v2.2.1...v2.2.3 --- .../python-modules/pyvips/default.nix | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 7fc07f20a61a..8a428bce2e09 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -1,33 +1,33 @@ { + lib, stdenv, buildPythonPackage, - pythonOlder, - fetchFromGitHub, - pytestCheckHook, - glib, - vips, cffi, - pkgconfig, # from pythonPackages + fetchFromGitHub, + glib, pkg-config, # from pkgs - lib, + pkgconfig, # from pythonPackages + pytestCheckHook, + pythonOlder, + setuptools, + vips, }: buildPythonPackage rec { pname = "pyvips"; - version = "2.2.1"; - format = "setuptools"; + version = "2.2.3"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "libvips"; repo = "pyvips"; - rev = "v${version}"; - hash = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc="; + rev = "refs/tags/v${version}"; + hash = "sha256-EGB1cOR1pVCXGjRj1NLj4Mk3kIy8luRqk3gGJqVNs7U="; }; nativeBuildInputs = [ - pkgconfig pkg-config ]; @@ -36,7 +36,12 @@ buildPythonPackage rec { vips ]; - propagatedBuildInputs = [ cffi ]; + build-system = [ + pkgconfig + setuptools + ]; + + dependencies = [ cffi ]; env = lib.optionalAttrs stdenv.cc.isClang { NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-function-pointer-types"; From 6b0afccdadd0afde02e9c4762f8b3f3571e6797c Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sun, 27 Oct 2024 00:11:24 +0000 Subject: [PATCH 064/369] waveterm: 0.8.12 -> 0.8.13 --- pkgs/by-name/wa/waveterm/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index 7f762178a93c..d74d839596a1 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -33,7 +33,7 @@ let pname = "waveterm"; - version = "0.8.12"; + version = "0.8.13"; src = let @@ -46,10 +46,10 @@ let aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; }; hash = selectSystem { - x86_64-linux = "sha256-lk+YBlsgS2kOsaesKJ0XMCnbxq5iza/0xG6qWjHLZA8="; - aarch64-linux = "sha256-57j5qp/1jGiqJP6Qmfw5XkoyXkNpnaTepfhSzlISExM="; - x86_64-darwin = "sha256-jBFkBC4PcWSQNw8A2w+2iUnSLoRvXQ3A0CVqkqfx4dI="; - aarch64-darwin = "sha256-pQ3TXKhiCI164qmmDkDFb3WUjd/lX1MnAOWqsQICHR4="; + x86_64-linux = "sha256-Poh1p+XWbWKByGLbKN7Xg5eOPHsDe18MT/W9JcdiCYk="; + aarch64-linux = "sha256-TQKexiW2NptreCen51lM88YoKcgSo7mdj7GsNcHxvZ4="; + x86_64-darwin = "sha256-iMm9PvtiNFRSnJ5oXiRnlq1FpkF/siswtS0HET4uSYU="; + aarch64-darwin = "sha256-n16vZuUqds4JLJthvLt8vlv3eiTdSv8z58wFhCdPmnI="; }; in fetchurl { From a816db906e233b1c8a48008105b88fb3e1875725 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 14:57:26 +0000 Subject: [PATCH 065/369] ocamlPackages.res: 5.0.1 -> 5.0.2 --- pkgs/development/ocaml-modules/res/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/res/default.nix b/pkgs/development/ocaml-modules/res/default.nix index 779a3c3d8a5f..b7a4edd69f8e 100644 --- a/pkgs/development/ocaml-modules/res/default.nix +++ b/pkgs/development/ocaml-modules/res/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "res"; - version = "5.0.1"; + version = "5.0.2"; minimalOCamlVersion = "4.08"; src = fetchurl { url = "https://github.com/mmottl/res/releases/download/${version}/res-${version}.tbz"; - hash = "sha256-rSrDMQBfnbWAr2LuajP3fveOtOwLyRbKPkaTKsnocQ4="; + hash = "sha256-hQxRETCYxy7ZHah5cg+XHtH3wCj/ofq1VHxsPHu91FU="; }; doCheck = true; From 100b42f1a53a536e16034da1b16b9a2738019866 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Oct 2024 22:42:51 +0000 Subject: [PATCH 066/369] radarr: 5.11.0.9244 -> 5.14.0.9383 --- pkgs/servers/radarr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index f85fd1117279..e814567f01ec 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -10,15 +10,15 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-ZI4ALGEdc9ZBUp8TnvzzbejxVBy61WAIxlbp0VYyc7M="; - arm64-linux_hash = "sha256-qN8CNV10q5JP+f1XdfsgCqnpbhzFlCPbM3TIAnGh9U8="; - x64-osx_hash = "sha256-u7Ny3ppD/mdIKk+I/ywsk1bS7EjEt63mbvzaM8MpoCE="; - arm64-osx_hash = "sha256-k5iOzyicXpoCWotGvC/J8euh0OQOuKLxU6OTWiWmWc8="; + x64-linux_hash = "sha256-RvzAWVm2rUSL296H0FNsvGp1aCGu2xSoiQEJJM3hLRI="; + arm64-linux_hash = "sha256-/j7yyiUBFJHDQ+14sQYrZDeWuBqNQ6Ipo2MOVWuYYlc="; + x64-osx_hash = "sha256-Q5M2t7fEVYxvtTuP8C7kqe/yMTlus3pDUmbDBw14u3Q="; + arm64-osx_hash = "sha256-Lgdlxwb5szkz2qRDs0eup3J4M/GQ4sYHzvhIJP+0ow0="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "radarr"; - version = "5.11.0.9244"; + version = "5.14.0.9383"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz"; From 232cd738aa73516c8e0e938014f1e7a22463fd12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Oct 2024 04:25:58 +0000 Subject: [PATCH 067/369] python312Packages.atom: 0.10.5 -> 0.11.0 --- pkgs/development/python-modules/atom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index f858eb07be9a..6bb934508214 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "atom"; - version = "0.10.5"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "nucleic"; repo = "atom"; rev = "refs/tags/${version}"; - hash = "sha256-wRVmCyqMwDs1thnRXYH6z1a/qCubw8CVUhaEMqLtiSM="; + hash = "sha256-3Xk4CM8Cnkc0lIdjJUYs/6UTqqpPALrUa3DpKD40og8="; }; nativeBuildInputs = [ setuptools-scm ]; From 7770fb82b9037d4a20a47f7e2046adaf76485f9f Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sun, 27 Oct 2024 03:27:39 +0100 Subject: [PATCH 068/369] =?UTF-8?q?rabbitmq-server:=203.13.7=20=E2=86=92?= =?UTF-8?q?=204.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set myself as maintainer since there is none. --- pkgs/servers/amqp/rabbitmq-server/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index f741858b011a..b7c47f1d4b76 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -23,6 +23,7 @@ , Carbon , Cocoa , nixosTests +, which }: let @@ -38,15 +39,15 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.13.7"; + version = "4.0.2"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-GDUyYudwhQSLrFXO21W3fwmH2tl2STF9gSuZsb3GZh0="; + hash = "sha256-mSwjQTLkEWBBbbMDLZ+qldS2YDcUvp8BB+J0+RLQvZE="; }; - nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; + nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 which ]; buildInputs = [ erlang elixir libxml2 libxslt glibcLocales ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa ]; @@ -91,6 +92,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${version}"; license = lib.licenses.mpl20; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ samueltardieu ]; }; } From 52cef79ecf9ba806a62626aab0904fa5018f5179 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Mon, 28 Oct 2024 12:16:57 +0100 Subject: [PATCH 069/369] rabbitmq-server: reformat --- pkgs/servers/amqp/rabbitmq-server/default.nix | 109 +++++++++++------- 1 file changed, 70 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index b7c47f1d4b76..383ab5af129f 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -1,40 +1,44 @@ -{ lib -, stdenv -, fetchurl -, erlang -, elixir -, python3 -, libxml2 -, libxslt -, xmlto -, docbook_xml_dtd_45 -, docbook_xsl -, zip -, unzip -, rsync -, getconf -, socat -, procps -, coreutils -, gnused -, systemd -, glibcLocales -, AppKit -, Carbon -, Cocoa -, nixosTests -, which +{ + lib, + stdenv, + fetchurl, + erlang, + elixir, + python3, + libxml2, + libxslt, + xmlto, + docbook_xml_dtd_45, + docbook_xsl, + zip, + unzip, + rsync, + getconf, + socat, + procps, + coreutils, + gnused, + systemd, + glibcLocales, + AppKit, + Carbon, + Cocoa, + nixosTests, + which, }: let - runtimePath = lib.makeBinPath ([ - erlang - getconf # for getting memory limits - socat - procps - gnused - coreutils # used by helper scripts - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ]); # for systemd unit activation check + runtimePath = lib.makeBinPath ( + [ + erlang + getconf # for getting memory limits + socat + procps + gnused + coreutils # used by helper scripts + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ systemd ] + ); # for systemd unit activation check in stdenv.mkDerivation rec { @@ -47,19 +51,46 @@ stdenv.mkDerivation rec { hash = "sha256-mSwjQTLkEWBBbbMDLZ+qldS2YDcUvp8BB+J0+RLQvZE="; }; - nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 which ]; + nativeBuildInputs = [ + unzip + xmlto + docbook_xml_dtd_45 + docbook_xsl + zip + rsync + python3 + which + ]; - buildInputs = [ erlang elixir libxml2 libxslt glibcLocales ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit Carbon Cocoa ]; + buildInputs = + [ + erlang + elixir + libxml2 + libxslt + glibcLocales + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + AppKit + Carbon + Cocoa + ]; - outputs = [ "out" "man" "doc" ]; + outputs = [ + "out" + "man" + "doc" + ]; installFlags = [ "PREFIX=${placeholder "out"}" "RMQ_ERLAPP_DIR=${placeholder "out"}" ]; - installTargets = [ "install" "install-man" ]; + installTargets = [ + "install" + "install-man" + ]; preBuild = '' export LANG=C.UTF-8 # fix elixir locale warning From da2a5cfa9403fb79daf48e341904486c521429e8 Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Mon, 28 Oct 2024 17:20:58 +0000 Subject: [PATCH 070/369] sqlint: update deps to eliminate vulnerable dependency See #351833 Gemfile: ./pkgs/development/tools/sqlint/Gemfile.lock Name: google-protobuf Version: 3.25.0 CVE: CVE-2024-7254 GHSA: GHSA-735f-pc8j-v9w8 Criticality: High URL: https://github.com/protocolbuffers/protobuf/security/advisories/GHSA-735f-pc8j-v9w8 Title: protobuf-java has potential Denial of Service issue Solution: upgrade to '~> 3.25.5', '~> 4.27.5', '>= 4.28.2' --- pkgs/development/tools/sqlint/Gemfile.lock | 2 +- pkgs/development/tools/sqlint/gemset.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock index dab324f352f1..9359528117d1 100644 --- a/pkgs/development/tools/sqlint/Gemfile.lock +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - google-protobuf (3.25.0) + google-protobuf (3.25.5) pg_query (4.2.3) google-protobuf (>= 3.22.3) sqlint (0.3.0) diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix index 05925a45e69e..4ad8655564e9 100644 --- a/pkgs/development/tools/sqlint/gemset.nix +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18d1w5j7vjaza3v1ig9j7zyis04kxqdkb1272vbgncxn03ck45mm"; + sha256 = "0fanhdf3vzghma51w1hqpp8s585mwzxgqkwvxj5is4q9j0pgwcs3"; type = "gem"; }; - version = "3.25.0"; + version = "3.25.5"; }; pg_query = { dependencies = ["google-protobuf"]; From 3204c98b95405135953da4d44c5a77934405c667 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Tue, 29 Oct 2024 16:16:18 +0200 Subject: [PATCH 071/369] signing-party: Add missing Perl dep for caff Fixes 352117 --- pkgs/tools/security/signing-party/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index d0c50ddad087..5780fca0250e 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -124,7 +124,7 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/caff --set PERL5LIB \ ${with perlPackages; makePerlPath ([ - TextTemplate MIMETools MailTools TimeDate NetIDNEncode ] + TextTemplate MIMETools MailTools TimeDate NetIDNEncode SubHandlesVia ] ++ GnuPGInterfaceRuntimeDependencies)} \ --prefix PATH ":" \ "${lib.makeBinPath [ nettools gnupg ]}" From 7e35ac30ea1d236419653182559367ecd8a30675 Mon Sep 17 00:00:00 2001 From: Greaka Date: Tue, 29 Oct 2024 16:28:51 +0100 Subject: [PATCH 072/369] factorio: 2.0.11 -> 2.0.12 --- pkgs/by-name/fa/factorio/versions.json | 64 +++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 182570993845..515cd3d66f00 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,25 +3,25 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.11.tar.xz" + "factorio_linux_2.0.12.tar.xz" ], - "name": "factorio_alpha_x64-2.0.11.tar.xz", + "name": "factorio_alpha_x64-2.0.12.tar.xz", "needsAuth": true, - "sha256": "84cc76d9197c274ee73f05f1ceb1895c7c2423ccc3452ac0bdf73cdbfcd4f44e", + "sha256": "e7307263990274f673e45df9d839c7754a49e389e80a01a79217dfec5532b104", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/alpha/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.12/alpha/linux64", + "version": "2.0.12" }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.11.tar.xz" + "factorio_linux_2.0.12.tar.xz" ], - "name": "factorio_alpha_x64-2.0.11.tar.xz", + "name": "factorio_alpha_x64-2.0.12.tar.xz", "needsAuth": true, - "sha256": "84cc76d9197c274ee73f05f1ceb1895c7c2423ccc3452ac0bdf73cdbfcd4f44e", + "sha256": "e7307263990274f673e45df9d839c7754a49e389e80a01a79217dfec5532b104", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/alpha/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.12/alpha/linux64", + "version": "2.0.12" } }, "demo": { @@ -51,51 +51,51 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.11.tar.xz" + "factorio-space-age_linux_2.0.12.tar.xz" ], - "name": "factorio_expansion_x64-2.0.11.tar.xz", + "name": "factorio_expansion_x64-2.0.12.tar.xz", "needsAuth": true, - "sha256": "6d7754718bd980b27469e2298655abfe3d6ad7d6bd22b765f75bbf23770ab179", + "sha256": "6a8a776bc67713bf394c100059ce66e718e46d6bebae0bbc63fd6b3356f461ee", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/expansion/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.12/expansion/linux64", + "version": "2.0.12" }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.11.tar.xz" + "factorio-space-age_linux_2.0.12.tar.xz" ], - "name": "factorio_expansion_x64-2.0.11.tar.xz", + "name": "factorio_expansion_x64-2.0.12.tar.xz", "needsAuth": true, - "sha256": "6d7754718bd980b27469e2298655abfe3d6ad7d6bd22b765f75bbf23770ab179", + "sha256": "6a8a776bc67713bf394c100059ce66e718e46d6bebae0bbc63fd6b3356f461ee", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/expansion/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.12/expansion/linux64", + "version": "2.0.12" } }, "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.11.tar.xz", - "factorio_headless_x64_2.0.11.tar.xz" + "factorio-headless_linux_2.0.12.tar.xz", + "factorio_headless_x64_2.0.12.tar.xz" ], - "name": "factorio_headless_x64-2.0.11.tar.xz", + "name": "factorio_headless_x64-2.0.12.tar.xz", "needsAuth": false, - "sha256": "7848f2d8b2b32a0efeb8a401657459486eda9b8072c221d0f9c0b450290da0d6", + "sha256": "d2f820e5e27a64414ed13522c4db01c82b3c6323c6380ae0aa75db4f94488d31", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/headless/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.12/headless/linux64", + "version": "2.0.12" }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.11.tar.xz", - "factorio_headless_x64_2.0.11.tar.xz" + "factorio-headless_linux_2.0.12.tar.xz", + "factorio_headless_x64_2.0.12.tar.xz" ], - "name": "factorio_headless_x64-2.0.11.tar.xz", + "name": "factorio_headless_x64-2.0.12.tar.xz", "needsAuth": false, - "sha256": "7848f2d8b2b32a0efeb8a401657459486eda9b8072c221d0f9c0b450290da0d6", + "sha256": "d2f820e5e27a64414ed13522c4db01c82b3c6323c6380ae0aa75db4f94488d31", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.11/headless/linux64", - "version": "2.0.11" + "url": "https://factorio.com/get-download/2.0.12/headless/linux64", + "version": "2.0.12" } } } From 50d025342c0cb4a75b3dfd0f5ea5b3cf0dd6ad43 Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:59:33 +0000 Subject: [PATCH 073/369] python312Packages.medallion: init at 3.0.0 --- .../python-modules/medallion/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/medallion/default.nix diff --git a/pkgs/development/python-modules/medallion/default.nix b/pkgs/development/python-modules/medallion/default.nix new file mode 100644 index 000000000000..04972dc1eb06 --- /dev/null +++ b/pkgs/development/python-modules/medallion/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + flask, + flask-httpauth, + pytz, + six, + pymongo, +}: + +buildPythonPackage rec { + pname = "medallion"; + version = "3.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oasis-open"; + repo = "cti-taxii-server"; + rev = "refs/tags/v${version}"; + hash = "sha256-+fWifWi/XR6MSOLhWXn2CFpItVdkOpzQItlrZkjapAk="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + flask + flask-httpauth + pymongo + pytz + six + ]; + + pythonImportsCheck = [ "medallion" ]; + + meta = with lib; { + description = "Minimal implementation of a TAXII 2.1 Server in Python"; + homepage = "https://medallion.readthedocs.io/en/latest/"; + changelog = "https://github.com/oasis-open/cti-taxii-server/blob/v${version}/CHANGES.txt"; + license = licenses.bsd3; + maintainers = with maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e386f2980ce1..0c6f17b0ba1a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7823,6 +7823,8 @@ self: super: with self; { mechanize = callPackage ../development/python-modules/mechanize { }; + medallion = callPackage ../development/python-modules/medallion { }; + mediafile = callPackage ../development/python-modules/mediafile { }; mediafire-dl = callPackage ../development/python-modules/mediafire-dl { }; From 6c1a6cd67b6bfed87b64921584811e40c1370332 Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Tue, 29 Oct 2024 15:03:08 +0000 Subject: [PATCH 074/369] python312Packages.stix2: init at 3.0.1 --- .../python-modules/stix2/default.nix | 62 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/python-modules/stix2/default.nix diff --git a/pkgs/development/python-modules/stix2/default.nix b/pkgs/development/python-modules/stix2/default.nix new file mode 100644 index 000000000000..26622eea45b5 --- /dev/null +++ b/pkgs/development/python-modules/stix2/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + haversine, + medallion, + pytz, + rapidfuzz, + requests, + simplejson, + stix2-patterns, + taxii2-client, +}: + +buildPythonPackage rec { + pname = "stix2"; + version = "3.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "oasis-open"; + repo = "cti-python-stix2"; + rev = "refs/tags/v${version}"; + hash = "sha256-1bILZUZgPOWmFWRu4p/fmgi4QPEE1lFQH9mxoWd/saI="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pytz + requests + simplejson + stix2-patterns + ]; + + nativeCheckInputs = [ + pytestCheckHook + haversine + medallion + rapidfuzz + taxii2-client + ]; + + disabledTests = [ + # flaky tests + "test_graph_equivalence_with_filesystem_source" + "test_graph_similarity_with_filesystem_source" + "test_object_similarity_prop_scores" + ]; + + pythonImportsCheck = [ "stix2" ]; + + meta = with lib; { + description = "Produce and consume STIX 2 JSON content"; + homepage = "https://stix2.readthedocs.io/en/latest/"; + changelog = "https://github.com/oasis-open/cti-python-stix2/blob/v${version}/CHANGELOG"; + license = licenses.bsd3; + maintainers = with maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c6f17b0ba1a..a482dda86745 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15109,6 +15109,8 @@ self: super: with self; { stim = callPackage ../development/python-modules/stim { }; + stix2 = callPackage ../development/python-modules/stix2 { }; + stix2-patterns = callPackage ../development/python-modules/stix2-patterns { }; stix2-validator = callPackage ../development/python-modules/stix2-validator { }; From 9735bd84e91757993eb987bb6da387727a31d6cd Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Sun, 20 Oct 2024 18:18:50 +0000 Subject: [PATCH 075/369] python312Packages.nskeyedunarchiver: init at 1.2 --- .../nskeyedunarchiver/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/nskeyedunarchiver/default.nix diff --git a/pkgs/development/python-modules/nskeyedunarchiver/default.nix b/pkgs/development/python-modules/nskeyedunarchiver/default.nix new file mode 100644 index 000000000000..ed4e5ac35f5c --- /dev/null +++ b/pkgs/development/python-modules/nskeyedunarchiver/default.nix @@ -0,0 +1,29 @@ +{ + buildPythonPackage, + fetchPypi, + lib, + setuptools, +}: + +buildPythonPackage rec { + pname = "nskeyedunarchiver"; + version = "1.2"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "NSKeyedUnArchiver"; + hash = "sha256-OZWPGH8ggYYKxeg6CGyft6ZM9Yx/43z7YylzXlQcTVg="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "NSKeyedUnArchiver" ]; + + meta = { + description = "Unserializes plist data into a usable Python dict"; + homepage = "https://github.com/avibrazil/NSKeyedUnArchiver"; + license = lib.licenses.bsdOriginal; + maintainers = with lib.maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a482dda86745..cb586ac247a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9105,6 +9105,8 @@ self: super: with self; { nsapi = callPackage ../development/python-modules/nsapi { }; + nskeyedunarchiver = callPackage ../development/python-modules/nskeyedunarchiver { }; + ntc-templates = callPackage ../development/python-modules/ntc-templates { }; ntplib = callPackage ../development/python-modules/ntplib { }; From 8e442098b578f94b10b7b82601783656f5b76300 Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Sun, 20 Oct 2024 18:25:02 +0000 Subject: [PATCH 076/369] python312Packages.iosbackup: init at 0.9.925 --- .../python-modules/iosbackup/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/iosbackup/default.nix diff --git a/pkgs/development/python-modules/iosbackup/default.nix b/pkgs/development/python-modules/iosbackup/default.nix new file mode 100644 index 000000000000..41904c36336c --- /dev/null +++ b/pkgs/development/python-modules/iosbackup/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + nskeyedunarchiver, + pycrypto, +}: + +buildPythonPackage rec { + pname = "iosbackup"; + version = "0.9.925"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "iOSbackup"; + hash = "sha256-M1Rakknls/qq3x7ngv5r3823D64N77oazuM2pl+T0co="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + pycrypto + nskeyedunarchiver + ]; + + pythonImportsCheck = [ "iOSbackup" ]; + + meta = { + description = "Reads and extracts files from password-encrypted iOS backups"; + homepage = "https://github.com/avibrazil/iOSbackup"; + license = lib.licenses.lgpl2Only; + maintainers = with lib.maintainers; [ PapayaJackal ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb586ac247a0..53f9f3a773ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6225,6 +6225,8 @@ self: super: with self; { iopath = callPackage ../development/python-modules/iopath { }; + iosbackup = callPackage ../development/python-modules/iosbackup { }; + iotawattpy = callPackage ../development/python-modules/iotawattpy { }; iottycloud = callPackage ../development/python-modules/iottycloud { }; From a88db7d6c9b1c169ecf28a685f44b3c1c6e6acf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 05:42:54 +0000 Subject: [PATCH 077/369] python312Packages.pylance: 0.17.0 -> 0.18.2 --- .../python-modules/pylance/Cargo.lock | 530 +++++++++--------- .../python-modules/pylance/default.nix | 4 +- 2 files changed, 276 insertions(+), 258 deletions(-) diff --git a/pkgs/development/python-modules/pylance/Cargo.lock b/pkgs/development/python-modules/pylance/Cargo.lock index 781104da1ac5..b0871f8c68c4 100644 --- a/pkgs/development/python-modules/pylance/Cargo.lock +++ b/pkgs/development/python-modules/pylance/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arc-swap" @@ -90,9 +90,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arrayref" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" @@ -150,7 +150,7 @@ dependencies = [ "chrono", "chrono-tz", "half", - "hashbrown", + "hashbrown 0.14.5", "num", ] @@ -347,9 +347,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "bzip2", "flate2", @@ -467,7 +467,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -504,13 +504,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -536,15 +536,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.6" +version = "1.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc" +checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6" dependencies = [ "aws-credential-types", "aws-runtime", @@ -609,9 +609,9 @@ dependencies = [ [[package]] name = "aws-sdk-dynamodb" -version = "1.45.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f3d9e807092149e3df266e3f4d9760dac439b90f82d8438e5b2c0bbe62007f" +checksum = "ab0ade000608877169533a54326badd6b5a707d2faf876cfc3976a7f9d7e5329" dependencies = [ "aws-credential-types", "aws-runtime", @@ -632,9 +632,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27bf24cd0d389daa923e974b0e7c38daf308fc21e963c049f57980235017175e" +checksum = "e33ae899566f3d395cbf42858e433930682cc9c1889fa89318896082fef45efb" dependencies = [ "aws-credential-types", "aws-runtime", @@ -654,9 +654,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.43.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43b3220f1c46ac0e9dcc0a97d94b93305dacb36d1dd393996300c6b9b74364" +checksum = "f39c09e199ebd96b9f860b0fce4b6625f211e064ad7c8693b72ecf7ef03881e0" dependencies = [ "aws-credential-types", "aws-runtime", @@ -676,9 +676,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c46924fb1add65bba55636e12812cae2febf68c0f37361766f627ddcca91ce" +checksum = "3d95f93a98130389eb6233b9d615249e543f6c24a68ca1f109af9ca5164a8765" dependencies = [ "aws-credential-types", "aws-runtime", @@ -816,9 +816,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" +checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" dependencies = [ "base64-simd", "bytes", @@ -1024,9 +1024,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytes-utils" @@ -1092,9 +1092,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "jobserver", "libc", @@ -1332,7 +1332,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -1340,9 +1354,9 @@ dependencies = [ [[package]] name = "datafusion" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9d55a9cd2634818953809f75ebe5248b00dd43c3227efb2a51a2d5feaad54e" +checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb" dependencies = [ "ahash", "arrow", @@ -1354,24 +1368,26 @@ dependencies = [ "bytes", "bzip2", "chrono", - "dashmap", + "dashmap 6.1.0", + "datafusion-catalog", "datafusion-common", "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", "datafusion-functions", "datafusion-functions-aggregate", - "datafusion-functions-array", + "datafusion-functions-nested", "datafusion-optimizer", "datafusion-physical-expr", "datafusion-physical-expr-common", + "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-sql", "flate2", "futures", "glob", "half", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "itertools 0.12.1", "log", @@ -1393,10 +1409,24 @@ dependencies = [ ] [[package]] -name = "datafusion-common" -version = "40.0.0" +name = "datafusion-catalog" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def66b642959e7f96f5d2da22e1f43d3bd35598f821e5ce351a0553e0f1b7367" +checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529" +dependencies = [ + "arrow-schema", + "async-trait", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-plan", +] + +[[package]] +name = "datafusion-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" dependencies = [ "ahash", "arrow", @@ -1405,7 +1435,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "hashbrown", + "hashbrown 0.14.5", "instant", "libc", "num_cpus", @@ -1416,26 +1446,26 @@ dependencies = [ [[package]] name = "datafusion-common-runtime" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f104bb9cb44c06c9badf8a0d7e0855e5f7fa5e395b887d7f835e8a9457dc1352" +checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1" dependencies = [ "tokio", ] [[package]] name = "datafusion-execution" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e" +checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" dependencies = [ "arrow", "chrono", - "dashmap", + "dashmap 6.1.0", "datafusion-common", "datafusion-expr", "futures", - "hashbrown", + "hashbrown 0.14.5", "log", "object_store", "parking_lot", @@ -1446,9 +1476,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2103d2cc16fb11ef1fa993a6cac57ed5cb028601db4b97566c90e5fa77aa1e68" +checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" dependencies = [ "ahash", "arrow", @@ -1465,11 +1495,12 @@ dependencies = [ [[package]] name = "datafusion-functions" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f" +checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" dependencies = [ "arrow", + "arrow-buffer", "base64 0.22.1", "blake2", "blake3", @@ -1477,7 +1508,7 @@ dependencies = [ "datafusion-common", "datafusion-execution", "datafusion-expr", - "hashbrown", + "hashbrown 0.14.5", "hex", "itertools 0.12.1", "log", @@ -1491,9 +1522,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77" +checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb" dependencies = [ "ahash", "arrow", @@ -1508,10 +1539,10 @@ dependencies = [ ] [[package]] -name = "datafusion-functions-array" -version = "40.0.0" +name = "datafusion-functions-nested" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831" +checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d" dependencies = [ "arrow", "arrow-array", @@ -1526,13 +1557,14 @@ dependencies = [ "itertools 0.12.1", "log", "paste", + "rand", ] [[package]] name = "datafusion-optimizer" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f34692011bec4fdd6fc18c264bf8037b8625d801e6dd8f5111af15cb6d71d3" +checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" dependencies = [ "arrow", "async-trait", @@ -1540,7 +1572,7 @@ dependencies = [ "datafusion-common", "datafusion-expr", "datafusion-physical-expr", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "itertools 0.12.1", "log", @@ -1550,9 +1582,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45538630defedb553771434a437f7ca8f04b9b3e834344aafacecb27dc65d5e5" +checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4" dependencies = [ "ahash", "arrow", @@ -1568,7 +1600,7 @@ dependencies = [ "datafusion-expr", "datafusion-physical-expr-common", "half", - "hashbrown", + "hashbrown 0.14.5", "hex", "indexmap", "itertools 0.12.1", @@ -1580,23 +1612,35 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536" +checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" dependencies = [ "ahash", "arrow", "datafusion-common", "datafusion-expr", - "hashbrown", + "hashbrown 0.14.5", "rand", ] [[package]] -name = "datafusion-physical-plan" -version = "40.0.0" +name = "datafusion-physical-optimizer" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b504eae6107a342775e22e323e9103f7f42db593ec6103b28605b7b7b1405c4a" +checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" +dependencies = [ + "datafusion-common", + "datafusion-execution", + "datafusion-physical-expr", + "datafusion-physical-plan", +] + +[[package]] +name = "datafusion-physical-plan" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe" dependencies = [ "ahash", "arrow", @@ -1615,7 +1659,7 @@ dependencies = [ "datafusion-physical-expr-common", "futures", "half", - "hashbrown", + "hashbrown 0.14.5", "indexmap", "itertools 0.12.1", "log", @@ -1628,9 +1672,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5db33f323f41b95ae201318ba654a9bf11113e58a51a1dff977b1a836d3d889" +checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0" dependencies = [ "arrow", "arrow-array", @@ -1645,9 +1689,9 @@ dependencies = [ [[package]] name = "datafusion-substrait" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434e52fbff22e6e04e6c787f603a6aba4961a7e249a29c743c5d4f609ec2dcef" +checksum = "bf0a0055aa98246c79f98f0d03df11f16cb7adc87818d02d4413e3f3cdadbbee" dependencies = [ "arrow-buffer", "async-recursion", @@ -1874,9 +1918,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -1909,7 +1953,7 @@ dependencies = [ [[package]] name = "fsst" -version = "0.17.0" +version = "0.18.2" dependencies = [ "rand", ] @@ -1922,9 +1966,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -1937,9 +1981,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -1947,15 +1991,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -1964,9 +2008,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -1998,32 +2042,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2062,9 +2106,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -2143,6 +2187,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "heck" version = "0.4.1" @@ -2266,9 +2316,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2352,7 +2402,7 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", @@ -2362,9 +2412,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -2375,7 +2425,6 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing", ] @@ -2391,9 +2440,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2424,12 +2473,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.0", ] [[package]] @@ -2475,9 +2524,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -2561,7 +2610,7 @@ dependencies = [ [[package]] name = "lance" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-arith", @@ -2579,7 +2628,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "dashmap", + "dashmap 5.5.3", "datafusion", "datafusion-functions", "datafusion-physical-expr", @@ -2619,7 +2668,7 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-array", "arrow-buffer", @@ -2635,7 +2684,7 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-array", "arrow-buffer", @@ -2671,7 +2720,7 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -2697,7 +2746,7 @@ dependencies = [ [[package]] name = "lance-datagen" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -2712,8 +2761,9 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "0.17.0" +version = "0.18.2" dependencies = [ + "arrayref", "arrow", "arrow-arith", "arrow-array", @@ -2722,6 +2772,7 @@ dependencies = [ "arrow-data", "arrow-schema", "arrow-select", + "bytemuck", "bytes", "fsst", "futures", @@ -2732,10 +2783,12 @@ dependencies = [ "lance-core", "log", "num-traits", + "paste", "prost 0.12.6", "prost-build 0.12.6", "prost-types 0.12.6", "rand", + "seq-macro", "snafu", "tokio", "tracing", @@ -2744,7 +2797,7 @@ dependencies = [ [[package]] name = "lance-file" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-arith", "arrow-array", @@ -2778,7 +2831,7 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -2829,7 +2882,7 @@ dependencies = [ [[package]] name = "lance-io" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-arith", @@ -2868,7 +2921,7 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow-array", "arrow-ord", @@ -2891,7 +2944,7 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -3006,9 +3059,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libm" @@ -3064,7 +3117,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", ] [[package]] @@ -3130,9 +3183,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -3352,9 +3405,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -3380,7 +3433,7 @@ dependencies = [ "rand", "reqwest", "ring", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "serde", "serde_json", "snafu", @@ -3392,9 +3445,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oneshot" @@ -3494,7 +3547,7 @@ dependencies = [ "flate2", "futures", "half", - "hashbrown", + "hashbrown 0.14.5", "lz4_flex", "num", "num-bigint", @@ -3629,22 +3682,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3672,9 +3725,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "polling" @@ -3709,9 +3762,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -3745,7 +3798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3816,7 +3869,7 @@ dependencies = [ "prost 0.12.6", "prost-types 0.12.6", "regex", - "syn 2.0.77", + "syn 2.0.79", "tempfile", ] @@ -3843,7 +3896,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3877,7 +3930,7 @@ dependencies = [ [[package]] name = "pylance" -version = "0.17.0" +version = "0.18.2" dependencies = [ "arrow", "arrow-array", @@ -3964,7 +4017,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3977,7 +4030,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3998,9 +4051,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", @@ -4017,7 +4070,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "socket2 0.5.7", "thiserror", "tokio", @@ -4034,7 +4087,7 @@ dependencies = [ "rand", "ring", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "slab", "thiserror", "tinyvec", @@ -4155,9 +4208,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -4175,9 +4228,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -4187,9 +4240,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -4204,9 +4257,9 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "regress" @@ -4214,15 +4267,15 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eae2a1ebfecc58aff952ef8ccd364329abe627762f5bf09ff42eb9d98522479" dependencies = [ - "hashbrown", + "hashbrown 0.14.5", "memchr", ] [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", @@ -4243,9 +4296,9 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.13", - "rustls-native-certs 0.7.3", - "rustls-pemfile 2.1.3", + "rustls 0.23.14", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", @@ -4366,9 +4419,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "log", "once_cell", @@ -4391,19 +4444,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.3", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-native-certs" version = "0.8.0" @@ -4411,7 +4451,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", "security-framework", @@ -4428,19 +4468,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -4486,9 +4525,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -4523,7 +4562,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4557,9 +4596,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -4597,7 +4636,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4608,7 +4647,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4632,7 +4671,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4805,9 +4844,9 @@ checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "sqlparser" -version = "0.47.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" dependencies = [ "log", "sqlparser_derive", @@ -4821,7 +4860,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4867,7 +4906,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4889,7 +4928,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "syn 2.0.77", + "syn 2.0.79", "typify", "walkdir", ] @@ -4913,9 +4952,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -5086,9 +5125,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -5103,9 +5142,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", @@ -5154,22 +5193,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5273,7 +5312,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5292,7 +5331,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "tokio", ] @@ -5321,27 +5360,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -5367,7 +5385,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5418,9 +5436,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" [[package]] name = "try-lock" @@ -5469,7 +5487,7 @@ dependencies = [ "semver", "serde", "serde_json", - "syn 2.0.77", + "syn 2.0.79", "thiserror", "unicode-ident", ] @@ -5487,7 +5505,7 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.77", + "syn 2.0.79", "typify-impl", ] @@ -5502,9 +5520,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -5514,24 +5532,24 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unindent" @@ -5561,7 +5579,7 @@ dependencies = [ "flate2", "log", "once_cell", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "url", "webpki-roots", @@ -5677,7 +5695,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -5711,7 +5729,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5724,9 +5742,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -5747,9 +5765,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -6037,7 +6055,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix index d3c81344d2b9..1fba795132bf 100644 --- a/pkgs/development/python-modules/pylance/default.nix +++ b/pkgs/development/python-modules/pylance/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "pylance"; - version = "0.17.0"; + version = "0.18.2"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lance"; rev = "refs/tags/v${version}"; - hash = "sha256-E+29CbVNbzmrQnBZt0860IvL4xYZqzE+uzSuKDwgxzg="; + hash = "sha256-CIIZbeRrraTqWronkspDpBVP/Z4JVoaiS5iBIXfsZGg="; }; buildAndTestSubdir = "python"; From ab1717cbcf20e2551f115f1cbd0b80a842a31bc9 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Tue, 29 Oct 2024 20:12:45 +0000 Subject: [PATCH 078/369] waveterm: 0.8.13 -> 0.9.0 --- pkgs/by-name/wa/waveterm/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index d74d839596a1..de86b9a5b46f 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -33,7 +33,7 @@ let pname = "waveterm"; - version = "0.8.13"; + version = "0.9.0"; src = let @@ -46,10 +46,10 @@ let aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; }; hash = selectSystem { - x86_64-linux = "sha256-Poh1p+XWbWKByGLbKN7Xg5eOPHsDe18MT/W9JcdiCYk="; - aarch64-linux = "sha256-TQKexiW2NptreCen51lM88YoKcgSo7mdj7GsNcHxvZ4="; - x86_64-darwin = "sha256-iMm9PvtiNFRSnJ5oXiRnlq1FpkF/siswtS0HET4uSYU="; - aarch64-darwin = "sha256-n16vZuUqds4JLJthvLt8vlv3eiTdSv8z58wFhCdPmnI="; + x86_64-linux = "sha256-BYGWXieBYrkaN/8VrDDZ9f67xjOD9EkrJKz1S4uc+u8="; + aarch64-linux = "sha256-e4YHKNbzK/Eyn8oHs2iJUI5mgpYBfWjQ36dO2l3cmo4="; + x86_64-darwin = "sha256-QaFpeXPdrLuVrUTvxJN7MwqOYoBOxlDDYoKgkgcEX94="; + aarch64-darwin = "sha256-WiJ+2WSxh4wWXIK4Egu5YKiH4JYam6FgvZ8ZGdSZaqY="; }; in fetchurl { From ee66b71779b21743b502385481d65acbab151a43 Mon Sep 17 00:00:00 2001 From: Perry Thompson Date: Tue, 24 Sep 2024 15:05:17 -0500 Subject: [PATCH 079/369] libreoffice: add zh-TW locale --- pkgs/applications/office/libreoffice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index f0ffec6d9275..2a72a5060300 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -99,7 +99,7 @@ , libetonyek , liborcus , libpng -, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" ] +, langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fi" "fr" "hu" "it" "ja" "ko" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sk" "sl" "tr" "uk" "zh-CN" "zh-TW" ] , withFonts ? false , withHelp ? true , kdeIntegration ? false From 597ce7aacd1ac759490941724e74ab5b9c04a48c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Wed, 30 Oct 2024 07:39:59 +0100 Subject: [PATCH 080/369] python3Packages.django-parler: Disable failing tests --- .../python-modules/django-parler/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-parler/default.nix b/pkgs/development/python-modules/django-parler/default.nix index b963f709a4d3..73e52c187cca 100644 --- a/pkgs/development/python-modules/django-parler/default.nix +++ b/pkgs/development/python-modules/django-parler/default.nix @@ -5,12 +5,13 @@ fetchFromGitHub, pythonOlder, python, + setuptools, }: buildPythonPackage rec { pname = "django-parler"; version = "2.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +22,16 @@ buildPythonPackage rec { hash = "sha256-tRGifFPCXF3aa3PQWKw3tl1H1TY+lgcChUP1VdwG1cE="; }; - propagatedBuildInputs = [ django ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; + + # Disable failing test: article.tests.AdminArticleTestCase.test_admin_add + # AssertionError: '

Ajout de Article (Hollandais)

' not found in ... + # https://github.com/django-parler/django-parler/issues/358 + preCheck = lib.optionalString (lib.versionAtLeast django.version "5.0") '' + rm example/article/tests.py + ''; checkPhase = '' runHook preCheck @@ -29,11 +39,11 @@ buildPythonPackage rec { runHook postCheck ''; - meta = with lib; { + meta = { description = "Simple Django model translations without nasty hacks"; homepage = "https://github.com/django-parler/django-parler"; changelog = "https://github.com/django-parler/django-parler/releases/tag/v${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ derdennisop ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ derdennisop ]; }; } From b515f80a162549a963b299cd7364064fb95b33ee Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Wed, 30 Oct 2024 14:43:54 +0100 Subject: [PATCH 081/369] ngspice: enable OSDI support --- pkgs/development/libraries/libngspice/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index 0270050cd001..1a31f88a6e9e 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { ] ++ [ "--enable-xspice" "--enable-cider" + "--enable-osdi" ]; enableParallelBuilding = true; From 79c93fb0f22473e4103524ec054ffc8c061ebeac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 17:31:53 +0000 Subject: [PATCH 082/369] python312Packages.aioconsole: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/aioconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioconsole/default.nix b/pkgs/development/python-modules/aioconsole/default.nix index b374d2e51930..7b8bc059e731 100644 --- a/pkgs/development/python-modules/aioconsole/default.nix +++ b/pkgs/development/python-modules/aioconsole/default.nix @@ -18,7 +18,7 @@ # wrapped to be able to find aioconsole and any other packages. buildPythonPackage rec { pname = "aioconsole"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "vxgmichel"; repo = "aioconsole"; rev = "refs/tags/v${version}"; - hash = "sha256-gexVeMlDRxZXcBi/iIYPip0DZIKvxCxKmTd+9jm0ud8="; + hash = "sha256-gFkRhewuRScEhXy0lv2R0kHfaHT1gSp3TVrqL36cRVs="; }; postPatch = '' From 486288a59263d7c61e6a7d95d9ed4ebf9b4c615f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Wed, 30 Oct 2024 14:33:52 -0300 Subject: [PATCH 083/369] whitesur-gtk-theme: 2024-05-01 -> 2024.09.02 --- pkgs/data/themes/whitesur/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 6909db147de3..82b30082d1e1 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -2,8 +2,8 @@ , stdenv , fetchFromGitHub , gitUpdater +, dialog , glib -, gnome-shell , gnome-themes-extra , jdupes , libxml2 @@ -32,7 +32,7 @@ lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariant lib.checkListOfEnum "${pname}: color variants" [ "Light" "Dark" ] colorVariants lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants -lib.checkListOfEnum "${pname}: Activities icon variants" [ "standard" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant) +lib.checkListOfEnum "${pname}: activities icon variants" [ "standard" "apple" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant) lib.checkListOfEnum "${pname}: nautilus style" [ "stable" "normal" "mojave" "glassy" ] (single nautilusStyle) lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize) lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity) @@ -40,18 +40,18 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2024-05-01"; + version = "2024.09.02"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-NgmFQtgVJvVXJjZUXt/BIx1hdzjHfVmmwXUCDZZD7+g="; + hash = "sha256-a32iHPcbMYuBy65FWm/fkjwJQE3aVScR3WJJzKTVx9k="; }; nativeBuildInputs = [ + dialog glib - gnome-shell jdupes libxml2 sassc @@ -68,10 +68,10 @@ stdenv.mkDerivation rec { done # Do not provide `sudo`, as it is not needed in our use case of the install script - substituteInPlace shell/lib-core.sh --replace '$(which sudo)' false + substituteInPlace shell/lib-core.sh --replace-fail '$(which sudo)' false # Provides a dummy home directory - substituteInPlace shell/lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' + substituteInPlace shell/lib-core.sh --replace-fail 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp' ''; dontBuild = true; @@ -81,19 +81,19 @@ stdenv.mkDerivation rec { mkdir -p $out/share/themes - ./install.sh \ + ./install.sh \ ${toString (map (x: "--alt " + x) altVariants)} \ ${toString (map (x: "--color " + x) colorVariants)} \ ${toString (map (x: "--opacity " + x) opacityVariants)} \ ${toString (map (x: "--theme " + x) themeVariants)} \ - ${lib.optionalString (iconVariant != null) ("--icon " + iconVariant)} \ - ${lib.optionalString (nautilusStyle != null) ("--nautilus-style " + nautilusStyle)} \ + ${lib.optionalString (nautilusStyle != null) ("--nautilus " + nautilusStyle)} \ ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \ - ${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \ - ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \ ${lib.optionalString roundedMaxWindow "--roundedmaxwindow"} \ ${lib.optionalString nordColor "--nordcolor"} \ ${lib.optionalString darkerColor "--darkercolor"} \ + ${lib.optionalString (iconVariant != null) ("--gnome-shell -i " + iconVariant)} \ + ${lib.optionalString (panelSize != null) ("--gnome-shell -height " + panelSize)} \ + ${lib.optionalString (panelOpacity != null) ("--gnome-shell -panelopacity " + panelOpacity)} \ --dest $out/share/themes jdupes --quiet --link-soft --recurse $out/share From 471da28884dabb8d3f6c2cd8eb3ca677743d9204 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 17:42:04 +0000 Subject: [PATCH 084/369] templ: 0.2.778 -> 0.2.793 --- pkgs/by-name/te/templ/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix index 8e90a4823ffc..727ddff217e5 100644 --- a/pkgs/by-name/te/templ/package.nix +++ b/pkgs/by-name/te/templ/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "templ"; - version = "0.2.778"; + version = "0.2.793"; src = fetchFromGitHub { owner = "a-h"; repo = "templ"; rev = "v${version}"; - hash = "sha256-lU8aVTw73HX0lNGPyD8Xnvtnr2VFTXv/S6xCVn6Lg74="; + hash = "sha256-0KGht5IMbJV8KkXgT5qJxA9bcmWevzXXAVPMQTm0ccw="; }; vendorHash = "sha256-ZWY19f11+UI18jeHYIEZjdb9Ii74mD6w+dYRLPkdfBU="; From 5f2bf7c56f307e430c983bf970b529039f5b95f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 30 Oct 2024 18:59:55 +0000 Subject: [PATCH 085/369] python312Packages.sagemaker: 2.232.2 -> 2.232.3 --- 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 582ddd93f0f2..6903f1261079 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -38,14 +38,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.232.2"; + version = "2.232.3"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-q0JxQi1kUnp5L/hexxpGhR4t0v53l8iVuc9H6N0K6Y4="; + hash = "sha256-6kGxmgkR/1ih2V49C9aEUBBCJS6s1Jbev80FDnJtHFg="; }; build-system = [ From 5f25b8a11ef14f0e12243591a4aadf64722a1525 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 30 Oct 2024 23:44:31 +0100 Subject: [PATCH 086/369] miniflux: 2.2.1 -> 2.2.2 https://github.com/miniflux/v2/releases/tag/2.2.2 diff: https://github.com/miniflux/v2/compare/2.2.1...2.2.2 --- pkgs/by-name/mi/miniflux/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index c3e590e80fd4..457c22e7d243 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "miniflux"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; rev = "refs/tags/${version}"; - hash = "sha256-b4slACQl+3vDsioULVKscBhS8LvTxCUPDnO7GlT46CM="; + hash = "sha256-FAeUhB05mDcdlHzJRLJR9mSKeqpKWed4Kxa89j/pjOQ="; }; - vendorHash = "sha256-PL5tc6MQRHloc3Dfw+FpWdqrXErFPjEb8RNPmHr7jSk="; + vendorHash = "sha256-FVm6kTZFp6qSUUuB2R4owzSxk+zfBWW1o7kOFadSS38="; nativeBuildInputs = [ installShellFiles ]; From 64f48f8912f06ba9171b103c008414ae3e64f06f Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Wed, 30 Oct 2024 18:35:11 -0400 Subject: [PATCH 087/369] geoclue2: 2.7.0 -> 2.7.2 https://gitlab.freedesktop.org/geoclue/geoclue/-/blob/2.7.2/NEWS The Mozilla API key option was removed since the Mozilla location service is now defunct, see #321121 Fixes #327464 --- ...d-option-for-installation-sysconfdir.patch | 75 +++++++------------ .../development/libraries/geoclue/default.nix | 18 +++-- 2 files changed, 38 insertions(+), 55 deletions(-) diff --git a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch index 832ae945aa2c..11bd6f561c8b 100644 --- a/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch +++ b/pkgs/development/libraries/geoclue/add-option-for-installation-sysconfdir.patch @@ -1,7 +1,7 @@ -diff --git i/data/meson.build w/data/meson.build -index 6ac2a11..73f433b 100644 ---- i/data/meson.build -+++ w/data/meson.build +diff --git a/data/meson.build b/data/meson.build +index b22ff55..01c5910 100644 +--- a/data/meson.build ++++ b/data/meson.build @@ -1,6 +1,6 @@ if get_option('enable-backend') conf = configuration_data() @@ -10,8 +10,8 @@ index 6ac2a11..73f433b 100644 if get_option('demo-agent') conf.set('demo_agent', 'geoclue-demo-agent;') -@@ -8,7 +8,7 @@ if get_option('enable-backend') - conf.set('demo_agent', '') +@@ -14,7 +14,7 @@ if get_option('enable-backend') + conf.set('default_wifi_enable', 'false') endif - conf_dir = join_paths(sysconfdir, 'geoclue') @@ -19,7 +19,7 @@ index 6ac2a11..73f433b 100644 configure_file(output: 'geoclue.conf', input: 'geoclue.conf.in', configuration: conf, -@@ -17,7 +17,7 @@ if get_option('enable-backend') +@@ -23,7 +23,7 @@ if get_option('enable-backend') conf = configuration_data() conf.set('libexecdir', libexecdir) conf.set('dbus_srv_user', get_option('dbus-srv-user')) @@ -28,19 +28,10 @@ index 6ac2a11..73f433b 100644 confd_dir = join_paths(conf_dir, 'conf.d') install_emptydir(confd_dir) -@@ -37,7 +37,7 @@ if get_option('enable-backend') - # DBus Service policy file - dbus_service_dir = get_option('dbus-sys-dir') - if dbus_service_dir == '' -- dbus_service_dir = join_paths(sysconfdir, 'dbus-1', 'system.d') -+ dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d') - endif - configure_file(output: 'org.freedesktop.GeoClue2.conf', - input: 'org.freedesktop.GeoClue2.conf.in', -diff --git i/demo/meson.build w/demo/meson.build +diff --git a/demo/meson.build b/demo/meson.build index 1427fbe..2623f16 100644 ---- i/demo/meson.build -+++ w/demo/meson.build +--- a/demo/meson.build ++++ b/demo/meson.build @@ -54,7 +54,7 @@ if get_option('demo-agent') install_dir: desktop_dir) @@ -50,43 +41,33 @@ index 1427fbe..2623f16 100644 meson.add_install_script('install-file.py', desktop_file.full_path(), autostart_dir) -diff --git i/meson.build w/meson.build -index 220ae2b..dbf6458 100644 ---- i/meson.build -+++ w/meson.build -@@ -12,7 +12,11 @@ gclue_api_version='2.0' - datadir = join_paths(get_option('prefix'), get_option('datadir')) +diff --git a/meson.build b/meson.build +index c561572..bca0cb3 100644 +--- a/meson.build ++++ b/meson.build +@@ -13,6 +13,11 @@ datadir = join_paths(get_option('prefix'), get_option('datadir')) includedir = join_paths(get_option('prefix'), get_option('includedir')) libexecdir = join_paths(get_option('prefix'), get_option('libexecdir')) --sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) + sysconfdir = join_paths(get_option('prefix'), get_option('sysconfdir')) +if get_option('sysconfdir_install') != '' + sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install')) +else -+ sysconfdir_install = get_option('sysconfdir') ++ sysconfdir_install = sysconfdir +endif localedir = join_paths(datadir, 'locale') header_dir = 'libgeoclue-' + gclue_api_version -@@ -29,7 +33,7 @@ conf.set_quoted('PACKAGE_URL', 'https://gitlab.freedesktop.org/geoclue/geoclue/w - conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.freedesktop.org/geoclue/geoclue/issues/new') - conf.set_quoted('TEST_SRCDIR', meson.project_source_root() + '/data/') - conf.set_quoted('LOCALEDIR', localedir) --conf.set_quoted('SYSCONFDIR', sysconfdir) -+conf.set_quoted('SYSCONFDIR', get_option('sysconfdir')) - conf.set_quoted('MOZILLA_API_KEY', get_option('mozilla-api-key')) - conf.set10('GCLUE_USE_3G_SOURCE', get_option('3g-source')) - conf.set10('GCLUE_USE_CDMA_SOURCE', get_option('cdma-source')) -diff --git i/meson_options.txt w/meson_options.txt -index 5b8c42d..945dfd5 100644 ---- i/meson_options.txt -+++ w/meson_options.txt -@@ -40,6 +40,9 @@ option('systemd-system-unit-dir', - option('dbus-srv-user', - type: 'string', value: 'root', - description: 'The user (existing) as which the service will run') +diff --git a/meson_options.txt b/meson_options.txt +index 4d55a63..682b39c 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -31,6 +31,9 @@ option('enable-backend', + option('demo-agent', + type: 'boolean', value: true, + description: 'Build demo agent') +option('sysconfdir_install', + type: 'string', value: '', + description: 'sysconfdir to use during installation') - option('mozilla-api-key', - type: 'string', value: 'geoclue', - description: 'Your API key for Mozilla Location Service') + option('dbus-sys-dir', + type: 'string', + description: 'where D-BUS system.d directory is') diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 84fa20f8efad..d30c0b411796 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -22,11 +22,12 @@ , gobject-introspection , vala , withDemoAgent ? false +, nix-update-script }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "geoclue"; - version = "2.7.0"; + version = "2.7.2"; outputs = [ "out" "dev" "devdoc" ]; @@ -34,8 +35,8 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "geoclue"; repo = "geoclue"; - rev = version; - hash = "sha256-vzarUg4lBEXYkH+n9SY8SYr0gHUX94PSTDmKd957gyc="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-LwL1WtCdHb/NwPr3/OLISwaAwplhJwiZT9vUdX29Bbs="; }; patches = [ @@ -76,13 +77,11 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system" + "-Dsystemd-system-unit-dir=${placeholder "out"}/lib/systemd/system" "-Ddemo-agent=${lib.boolToString withDemoAgent}" "--sysconfdir=/etc" "-Dsysconfdir_install=${placeholder "out"}/etc" - "-Dmozilla-api-key=5c28d1f4-9511-47ff-b11a-2bef80fc177c" "-Ddbus-srv-user=geoclue" - "-Ddbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-D3g-source=false" "-Dcdma-source=false" @@ -95,12 +94,15 @@ stdenv.mkDerivation rec { patchShebangs demo/install-file.py ''; + updateScript = nix-update-script {}; + meta = with lib; { broken = stdenv.hostPlatform.isDarwin && withDemoAgent; description = "Geolocation framework and some data providers"; homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; + changelog = "https://gitlab.freedesktop.org/geoclue/geoclue/-/blob/${finalAttrs.version}/NEWS"; maintainers = with maintainers; [ raskin mimame ]; platforms = with platforms; linux ++ darwin; license = licenses.lgpl2Plus; }; -} +}) From f358b4d0e528adefb270ef73fb129c519a31be75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 31 Oct 2024 00:20:56 +0000 Subject: [PATCH 088/369] authelia: 4.38.15 -> 4.38.17 --- pkgs/servers/authelia/sources.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/authelia/sources.nix b/pkgs/servers/authelia/sources.nix index c9a677b41dfc..dabe13b12621 100644 --- a/pkgs/servers/authelia/sources.nix +++ b/pkgs/servers/authelia/sources.nix @@ -1,14 +1,14 @@ { fetchFromGitHub }: rec { pname = "authelia"; - version = "4.38.15"; + version = "4.38.17"; src = fetchFromGitHub { owner = "authelia"; repo = "authelia"; rev = "v${version}"; - hash = "sha256-brgA485sst/jXjdhKrhQilreCYBhESro9j/63g8qQg4="; + hash = "sha256-JymfNe7Xoa2Hh219GtBjlyaGK+Jn8XWqrTnkY8377Ro="; }; - vendorHash = "sha256-kSuIyL+6ue8voTzHTfnAYr9q4hUzIv/lkRopGSFaLv8="; - pnpmDepsHash = "sha256-fufxoAL0z6bhRnBI4Gu61hBeUnyFYROmfResHJforfE="; + vendorHash = "sha256-q38jSX7jZO3Y4gn7dxq4NYLEfCUWVcUwmNfqT52AU/M="; + pnpmDepsHash = "sha256-jih+mFZKKOBUH0f2zzKN49VV6iUbMhVImFDWFYaZWWI="; } From 7e81b14bd0b80dd815b45d4217b31f65c74760ee Mon Sep 17 00:00:00 2001 From: Tomo Date: Thu, 31 Oct 2024 02:12:32 +0000 Subject: [PATCH 089/369] mucommander: format with nixfmt-rfc-style --- .../file-managers/mucommander/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix index 0a6ca746caee..978d295bfde3 100644 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ b/pkgs/applications/file-managers/mucommander/default.nix @@ -1,10 +1,11 @@ -{ lib -, stdenv -, fetchFromGitHub -, gradle_7 -, makeWrapper -, jdk -, gsettings-desktop-schemas +{ + lib, + stdenv, + fetchFromGitHub, + gradle_7, + makeWrapper, + jdk, + gsettings-desktop-schemas, }: let @@ -28,7 +29,10 @@ stdenv.mkDerivation (finalAttrs: { --replace "revision = git.head().id" "revision = '${finalAttrs.version}'" ''; - nativeBuildInputs = [ gradle makeWrapper ]; + nativeBuildInputs = [ + gradle + makeWrapper + ]; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; From 1e14e1bce19f6a7977bbb43c5de7bde8af799a38 Mon Sep 17 00:00:00 2001 From: Tomo Date: Thu, 31 Oct 2024 02:14:00 +0000 Subject: [PATCH 090/369] mucommander: migrate to by-name --- .../file-managers => by-name/mu}/mucommander/deps.json | 0 .../default.nix => by-name/mu/mucommander/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/file-managers => by-name/mu}/mucommander/deps.json (100%) rename pkgs/{applications/file-managers/mucommander/default.nix => by-name/mu/mucommander/package.nix} (100%) diff --git a/pkgs/applications/file-managers/mucommander/deps.json b/pkgs/by-name/mu/mucommander/deps.json similarity index 100% rename from pkgs/applications/file-managers/mucommander/deps.json rename to pkgs/by-name/mu/mucommander/deps.json diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/by-name/mu/mucommander/package.nix similarity index 100% rename from pkgs/applications/file-managers/mucommander/default.nix rename to pkgs/by-name/mu/mucommander/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64683554da9b..60cdbe8619cd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2761,8 +2761,6 @@ with pkgs; boost = boost185; }; - mucommander = callPackage ../applications/file-managers/mucommander { }; - nnn = callPackage ../applications/file-managers/nnn { }; noice = callPackage ../applications/file-managers/noice { }; From 55ae976b8ee871cd9d64583b555b59d9a28ee140 Mon Sep 17 00:00:00 2001 From: Tomo Date: Thu, 31 Oct 2024 03:43:44 +0000 Subject: [PATCH 091/369] mucommander: 1.3.0-1 -> 1.5.2-1 Changelogs: * https://github.com/mucommander/mucommander/releases/tag/1.4.0-1 * https://github.com/mucommander/mucommander/releases/tag/1.4.1-1 * https://github.com/mucommander/mucommander/releases/tag/1.5.0-1 * https://github.com/mucommander/mucommander/releases/tag/1.5.1-1 * https://github.com/mucommander/mucommander/releases/tag/1.5.2-1 Upstream also now uses Gradle 8, as of https://github.com/mucommander/mucommander/pull/944 --- pkgs/by-name/mu/mucommander/deps.json | 1189 ++++++++++++++++++----- pkgs/by-name/mu/mucommander/package.nix | 9 +- 2 files changed, 975 insertions(+), 223 deletions(-) diff --git a/pkgs/by-name/mu/mucommander/deps.json b/pkgs/by-name/mu/mucommander/deps.json index 264328bca01d..0e59cecc9375 100644 --- a/pkgs/by-name/mu/mucommander/deps.json +++ b/pkgs/by-name/mu/mucommander/deps.json @@ -2,13 +2,15 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains": { - "jediterm#jediterm-core/3.17": { - "jar": "sha256-H+W44u9O07KMjsN6RQeX4X/XrD55JPlo7x1It5dvja8=", - "pom": "sha256-Q90WihOSMfQwY4TrVl5a6t9m23kKyvs8ZdF/clKpcug=" + "jediterm#jediterm-core/3.44": { + "jar": "sha256-Q/2Dc3iZNA/xep98U1lyHbJStLNihN8n9s4LqmzmAaM=", + "module": "sha256-67xQBnyqqFEYVDLmEyEBPI1Ytp23Sg+v7UB4cgmrObc=", + "pom": "sha256-U5/B6iPpNAxjy8RhgGbDAu76qqTQfWpKPYHrO7eyb4Y=" }, - "jediterm#jediterm-ui/3.17": { - "jar": "sha256-7NUda5rQJjnDi+xq60mXwZKHj3i2/DCoBzzQSFT2Vhw=", - "pom": "sha256-Cc/AVJs6u5eNfJiBkAk4+/reuzup4Xl1LjvOtLXf3cg=" + "jediterm#jediterm-ui/3.44": { + "jar": "sha256-ytRKdiuw4QmysGYckbDXfCLR1YTYRc/aEc0TgOz9miQ=", + "module": "sha256-1Sm+X5gRtwUTawDUZ0gT2ZkMh8L/UhF7A/B/2NaP7rM=", + "pom": "sha256-OqwtXLhLqTLfJ2nh2eUdXqSQMLt0+usdlDiltgbBnpQ=" }, "pty4j#purejavacomm/0.0.11.1": { "jar": "sha256-McBIqGBX4HJyQpqibpBxPtvelq+XRzYvJ0cNjoajmKM=", @@ -40,9 +42,13 @@ "jar": "sha256-8GpgHHGKfJJi10t+w7qtFMglhOiSNQibT4IdakTZ4eQ=", "pom": "sha256-b83RPYGzLw7byJCBHS9z1HU7ZebkKe3QByxBYP4Hd0A=" }, - "avalon-framework#avalon-framework/4.1.5": { - "jar": "sha256-gz8eUN+mKPE9SkIGs+xtj0LpYoSjXXbActiAgEt0egQ=", - "pom": "sha256-WsHHwtsp/rJWj1xxlZpsCKbEHgZZsSa/owisdCHyysg=" + "avalon-framework#avalon-framework-api/4.3": { + "jar": "sha256-/tYc754BBkWve1K2lMlYmv5TLKF/SOl3+xysa8A5UL4=", + "pom": "sha256-rIWI73kN92pgZnpBEagAqhv6c9iFiYu/q4htrwyOtwY=" + }, + "avalon-logkit#avalon-logkit/2.1": { + "jar": "sha256-XxE+SyULTHwh3T3aG7nkKgGwoBRTLjP8mnxzKr3Erpo=", + "pom": "sha256-7EPVfBpfHAORFIJgN67WhfuRZ17q7IXZ6h3MVgSJG6Y=" }, "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/6.4.0": { "jar": "sha256-G9LIOa4YEoDsBrXCBRuE+sf1mZagUZQOGk24RtvG828=", @@ -76,9 +82,33 @@ "jar": "sha256-WUbYN/5vlgwCpT7aemkm7MPHWLvdaapFPuQp+FghfyI=", "pom": "sha256-301xgexRZVuqqrBnlxGA12gWQ93SdBOfDDB426FOl+A=" }, + "ch/qos/logback#logback-core/1.4.0": { + "jar": "sha256-FOCaeJa+5u8uAFtI/FVg/iKZpXqCa8TB8cbUMALwUSw=", + "pom": "sha256-OQogrYWjQk0RPwyNj2ZNenc15gXEUwyuaxs/qz3EdQU=" + }, + "ch/qos/logback#logback-core/1.5.12": { + "pom": "sha256-q9tuWJh422jJrYYSyt8KIQm3hYd8ZGZnBafxaiTlouA=" + }, "ch/qos/logback#logback-parent/1.2.3": { "pom": "sha256-ec0CHa/HsCVdPN0/1wy6pjjfc5lXSaNI7oLEVjXqsmo=" }, + "ch/qos/logback#logback-parent/1.4.0": { + "pom": "sha256-ybgE3cIX34pXkK2CP+5lVTGWzxnpVnn9Jc91LexG5Jo=" + }, + "ch/qos/logback#logback-parent/1.5.12": { + "pom": "sha256-5mDh8HDVA4UK4HUhcOBVzgLrb4KVb0wq816AFMPuWtU=" + }, + "ch/qos/logback/logback-core/maven-metadata": { + "xml": { + "groupId": "ch.qos.logback", + "lastUpdated": "20241025204506", + "release": "1.5.12" + } + }, + "ch/randelshofer#fastdoubleparser/0.8.0": { + "jar": "sha256-EP4oj9eiza9RdTMrc1Kfmr+P1U3P/zF9aWfAw1/7Ezs=", + "pom": "sha256-VWPl3UuwVHWfD4OFFgbZnSQm11wnNygUAnAF6S0cKqo=" + }, "com/athaydes/osgiaas#osgiaas-cli-api/0.7": { "jar": "sha256-/5g6U3a4GDCkAx8njhnvjSVd9MvFWDeaMUk/p0EGMMI=", "pom": "sha256-LniyokqUSW72hNIUFWrGA0dLheNWLd1nW78X3PiJpLE=" @@ -91,74 +121,158 @@ "jar": "sha256-IAZKBz8SHtQkqOCKDUdjquTTQLK+alIGhjGz3Q4/uGw=", "pom": "sha256-aN9UOc4DQls8eDzZ4qQTt96gJmIes2WReU5kgJXArK8=" }, - "com/beust#jcommander/1.64": { - "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=", - "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg=" + "com/azure#azure-client-sdk-parent/1.7.0": { + "pom": "sha256-wefnVlRCMD/1TD6GNXTreh9pIR2EX6Q1/thCgxNL0Uo=" + }, + "com/azure#azure-core-http-netty/1.13.5": { + "jar": "sha256-t8qc2g5Ss9dIeypT++pyzPELBRbjz/LKC70WH7w587M=", + "pom": "sha256-8k0M8GyebhbrjdKrTP+jwtO5Tej/WbrhHagWvbX2omU=" + }, + "com/azure#azure-core/1.41.0": { + "jar": "sha256-4l36WpY+E1F+Y04xZmdkPI1V/JZxsgQs0P9EBVKPOfI=", + "pom": "sha256-NcSELoMrARfIV/GJksubh5zt4oeBG83gV383XCJhyMI=" + }, + "com/azure#azure-identity/1.9.2": { + "jar": "sha256-qjfuKsjQbS3LYHPxH1M5FmEcGRBmXOZDdxs2EKUers4=", + "pom": "sha256-EXBgdxY+sQ+NROkC3Z5b5BwefKRLtBoubvP8x9QeTwk=" + }, + "com/azure#azure-json/1.0.1": { + "jar": "sha256-KDw4/URqHRYk23N1VF2HVr/gavjMY3+FUYRkmfLsgow=", + "pom": "sha256-FTgCj66/3EghKzboi7i9edraT4Uv2MjM4BsoQFmwMRw=" + }, + "com/azure#azure-sdk-parent/1.6.0": { + "pom": "sha256-mDP57zl7whd1s4m+gWtWpomRiCIKJa0qQ4mwk2UDnJY=" + }, + "com/azure#azure-xml/1.0.0-beta.2": { + "jar": "sha256-1ZE+sclWldJBWR4FDxbcCyMugdS0AfpvnFZvRXe4roM=", + "pom": "sha256-G+9ukkm5tECQ6mczfm0mtgikmngJLGvgCVxSL64fg0k=" }, "com/beust#jcommander/1.82": { "jar": "sha256-3urBV8jeaCKHjYXQx7yEZ6GcyEhNN3iPeATwOd3igLE=", "module": "sha256-k2oti84PhNoYUA9OEZSIuTEG26qDuEYv6Za80OHDixY=", "pom": "sha256-JGNEFwtRO4Acz4EiNNThMkoPbtKoHpCqYYkTtmucwXM=" }, - "com/dropbox/core#dropbox-core-sdk/5.2.0": { - "jar": "sha256-uo+xxTATiLSzM6JgT4hlVLJ/ATFdRsRhMfoSifMMfYA=", - "module": "sha256-U7JRv2oYUiiMl7Qzr2BdyIjmOf/EgK4jkrdhMAHaA1A=", - "pom": "sha256-MirGoEbZW6GKmqjZidQ74DYgM1JPVz+b5wiQ6oop4Bc=" - }, - "com/fasterxml#oss-parent/25": { - "pom": "sha256-3EFgl7m8Tv6JbcJWewbKuGqTZ4bSNuyyhM4t2GBymkA=" - }, - "com/fasterxml#oss-parent/33": { - "pom": "sha256-xUNwlkz8ziMZvZqF9eFPUAyFGJia5WsbR13xs0i3MQg=" + "com/dropbox/core#dropbox-core-sdk/7.0.0": { + "jar": "sha256-L6LLasLzL1lO/ffHn6hVOf6d8fCvyvnwP1cKlMmZE4c=", + "module": "sha256-si4Dd4nD+0ukio8ctHk/86ftF4FFnQ/CxZmMmSpZfqo=", + "pom": "sha256-IrYUPdZNJ/9S41KMkmXYsUeMhGEZE2lvBgK4n3E3DvE=" }, "com/fasterxml#oss-parent/38": { "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" }, + "com/fasterxml#oss-parent/43": { + "pom": "sha256-5VhcwcNwebLjgXqJl5RXNvFYgxhE1Z0OTTpFsnYR+SY=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, "com/fasterxml/jackson#jackson-base/2.10.0": { "pom": "sha256-r5dC9EUhQ/GySYSfgioZ84drb40wyufDVeu0oopIPQ4=" }, - "com/fasterxml/jackson#jackson-base/2.9.6": { - "pom": "sha256-+81gnH4GPoOzDc5YVVsj3uPlGdwAqqx0ceUrQUCRcyk=" + "com/fasterxml/jackson#jackson-base/2.13.5": { + "pom": "sha256-8uQSGN1QuSzkmDxdLAQgndYc0eAPwSXjYAqp6vRQHeo=" + }, + "com/fasterxml/jackson#jackson-base/2.15.0": { + "pom": "sha256-UkKWvt4yGFrBEBLwfZJG44wZJTwrUT8c8oeZEho053A=" }, "com/fasterxml/jackson#jackson-bom/2.10.0": { "pom": "sha256-LDGTpqe7yfycHmh8jwWtuWM7q8qAd6puqu4ZDYbhTVk=" }, - "com/fasterxml/jackson#jackson-bom/2.9.6": { - "pom": "sha256-9BOCmOts2HKgOORiRoAxqGA6p4SC6aIjnJFy81ci8Pg=" + "com/fasterxml/jackson#jackson-bom/2.13.5": { + "pom": "sha256-Cia280q5P5z6gBeYiMa/Ql8cF9zZwR22VhOTkw/bdGo=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.2": { + "pom": "sha256-mqIJuzI5HL9fG9Pn+hGQFnYWms0ZDZiWtcHod8mZ/rw=" + }, + "com/fasterxml/jackson#jackson-bom/2.15.0": { + "pom": "sha256-4AwuhiKc2Wh5RpGukO7hWwjE1PV0jJs0u0ItcTRG3ZU=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.0": { + "pom": "sha256-Wqooh0QFvwT7qOLFcVkieCRGG6b31VKr246NOgum+L8=" }, "com/fasterxml/jackson#jackson-parent/2.10": { "pom": "sha256-pQ24CCnE+JfG0OfpVHLLtDsOvs4TWmjjnCe4pv4z5IE=" }, - "com/fasterxml/jackson#jackson-parent/2.7": { - "pom": "sha256-OJQmHGTKZDJFHjNRM9UCFgwRtXwqaVqyEgmg7113+Hs=" + "com/fasterxml/jackson#jackson-parent/2.13": { + "pom": "sha256-K7qJl4Fyrx7/y00UPQmSGj8wgspNzxIrHe2Yv1WyrVc=" }, - "com/fasterxml/jackson#jackson-parent/2.9.1.1": { - "pom": "sha256-IlykrxyJWrSEXPLSn9WsUOU4s1OAXnW7K3Shs7nYa8U=" + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson#jackson-parent/2.15": { + "pom": "sha256-bN+XvGbzifY+NoUNL1UtEhZoj45aWHJ9P2qY7fhnXN4=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" }, "com/fasterxml/jackson/core#jackson-annotations/2.10.0": { "jar": "sha256-d6CEYhl3SoJpvBs4zAApSQjTTnf4qdo02XZzmC91hT0=", "pom": "sha256-FLGqxIj74H7Oqug/X8ppId8ETUX8hejG7DsW5zQ42tg=" }, + "com/fasterxml/jackson/core#jackson-annotations/2.13.5": { + "jar": "sha256-gK6o7XIy21BAztSz+YLynalbs9gCND2/b9gszZjCHE8=", + "module": "sha256-V1RHbNv+Hc5wH/QUQ7FHQSL+5TEHgMnRbEoK/vlzvZQ=", + "pom": "sha256-RtVrd+RUf6R9Iq5EvJXgww76KFW56qsZ9TSfv+TAZMo=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.15.0": { + "jar": "sha256-ka3NPc9f2aFkmZNOdTaiPUVmkqAJPj1P1S8TjDk2NIw=", + "module": "sha256-vxVVouS7PyPbOR/EyN/GFX7GTow3ZYgUSiYPVBst4a4=", + "pom": "sha256-L4FZtEIZb6qg4TdOLSI0tX/uwysnYX+h1/XZqOC+Nyg=" + }, "com/fasterxml/jackson/core#jackson-core/2.10.0": { "jar": "sha256-aedpWx5Ag0+hJC/DKKQBBgeRHO03Bqt5q8dp1FEZdRM=", "pom": "sha256-rZo5sYeQgaVlVuUCd2742RD5BHMfhlXFJoH/882kr54=" }, - "com/fasterxml/jackson/core#jackson-core/2.7.9": { - "jar": "sha256-vZByFCC7iZqXTtCaEH/vQsqMx8jgVXYvbIFXYTLlu8U=", - "pom": "sha256-Y5RpKyntD9jelAX/5gr0cCz0JLMkcSXqyxUxv6olHWw=" + "com/fasterxml/jackson/core#jackson-core/2.13.5": { + "jar": "sha256-SPNqAlMR0EZK2N2kUSogx54nmpVQ9j8xedcx2USCR0s=", + "module": "sha256-YmbmBIr3l7vrRuWx8bmjgyONWSjUD/ExgZkEUgGsMtk=", + "pom": "sha256-rZGrYCXrSK4yYigMQu/rtXtw0lwAqwppxaPHyjqAeO4=" }, - "com/fasterxml/jackson/core#jackson-core/2.9.6": { - "jar": "sha256-+rh0au3WQneI7jkOoE1DjsFBv/frNHb4vdXZEQ+ycYo=", - "pom": "sha256-fd0tyP0KY04n4wapqoVJWczEckV5dijFC8g3F3WkLjI=" + "com/fasterxml/jackson/core#jackson-core/2.15.0": { + "jar": "sha256-W0g/aPqd1qo32jfR953VxLlGQjj08GYKJCy2tccklQw=", + "module": "sha256-7h0Go46NRNgaLmpvVLfYZK5LL/cQ3fWKK9+4kfJxc4E=", + "pom": "sha256-Cjr13zbx8n4XZEgXpiQJuqJYZKNJOj0ogK1wCbDnA64=" }, "com/fasterxml/jackson/core#jackson-databind/2.10.0": { "jar": "sha256-jmxWbGf8YalsXfxKcdQw8lZXZXeOyabvIWxUYKmRG2A=", "pom": "sha256-kAdHbEZ6U59DnFEiWw9s1MTiNNZ93pKaICEYZhAmkic=" }, - "com/fifesoft#rsyntaxtextarea/3.3.3": { - "jar": "sha256-BtzbujMTN/g1cBWAYe9JdFMTG6yAyFbscRQs1d1WSfo=", - "module": "sha256-gyR4XKxJ1K0GLZU5wpS+WGeWO9uhkazgLqsFGiuSEQU=", - "pom": "sha256-vPdSvzOppTP6qTd0XtOOdhbbVWWV7Doqsbeny0P5e8I=" + "com/fasterxml/jackson/core#jackson-databind/2.13.5": { + "jar": "sha256-X+2ySyNWSRgV0YJn9l2poh3WdBM0Wtd5XyIa+iXHiYQ=", + "module": "sha256-HQzgnWo05MaImApbbjp/xKrhFFid9Eqa7Jf2ERrYXfI=", + "pom": "sha256-rhoE1XeQ6usGKh+iIGOraM7JCgMLc94tiasFIfJGVr4=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.15.0": { + "jar": "sha256-AMWl1a5xrI6NW42mBoQeIlHIBjVZOctdUcTNxrZEoNw=", + "module": "sha256-oahCNG/envxI3bk4tE8e7r1EaGj1zXAxMmZToTLAb4M=", + "pom": "sha256-jDgNP+PcwpjQKHmKH5Lfwxgk/aBBFEryNi8fzzDueI8=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.13.5": { + "jar": "sha256-7xXO3d3FjfvWhra3/QhT7TKP8Ixii9SjlXNL7CDKhXs=", + "module": "sha256-xO6k314TZO0p8BDUoDffcWWydfDAIdkfb1q9isD5IKc=", + "pom": "sha256-niBiIkjdUnZ/9vd4Z5BdfmVSNEPm4ALmuAvDmoVHE54=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.15.0": { + "jar": "sha256-1d65LVlmio3grI2oGNXZwP37Tbay8dZqd5/jV/MQ1kg=", + "module": "sha256-nkeKUELDePkAYsbObhljySaYhK7DhLfz1xbspH1ZIME=", + "pom": "sha256-sakbDIxFfs4JpHeRkyoKlBxQNz5frahmiIESH4J75jA=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.13.5": { + "pom": "sha256-hg2LWRRPDSDOqtPIBztQbEKkrkjrpPu7El6fc+dj4fs=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.15.0": { + "pom": "sha256-GMM7hIDiDXY2SpvZyxoV/XUXVJDJ4NyxKitCIymmqCc=" + }, + "com/fifesoft#rsyntaxtextarea/3.5.0": { + "jar": "sha256-pCYtsfsa3RuRLnEg44RFKCbWTrdxQn2Pd0Jqp6ReGoU=", + "module": "sha256-GwhM5SvwzNTjv7dCWsD9byRym/DEskhJq44N0tJczFg=", + "pom": "sha256-vlhVxdk8V/ViDaP4tljkeaN8kCWasK5t4Wag/6R5tVc=" }, "com/formdev#flatlaf/1.0": { "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=", @@ -175,33 +289,169 @@ "module": "sha256-bI6NyWonUOIHu1jOAV6LV4fEZiOxCves4Hg1zz6c8uA=", "pom": "sha256-LyBWRSdf3po/+KaqsTgf29k7T67QfiDqkCujsUaVSuQ=" }, - "com/github/junrar#junrar/7.5.4": { - "jar": "sha256-xZRJh80HDROp+9UVJi9LomPHLm3T+Yak1/EOrhtusM4=", - "module": "sha256-dl/GX7jryzhbcCG3J95RAAypDNMKcQm9Ed8QYv94lGk=", - "pom": "sha256-puop94MBMKrQQOMFjwNC4UBybts1QtXoDn1qZcmbAc8=" + "com/github/junrar#junrar/7.5.5": { + "jar": "sha256-4BuUlofipbTGgBHBcCql0syObEWGVqwskWWLac67G7M=", + "module": "sha256-MN6tDcEK8MzjOqrkn/l21sIvsbOImoZdOoXjfHKbogo=", + "pom": "sha256-eLkOtUPiaTa9zzpOq5cAazwdVk2b+9660FyMbAj4GYY=" }, - "com/github/mwiede#jsch/0.2.8": { - "jar": "sha256-0vgM9unIlvl/6UgT03ofW0zcGOF9oDFGxuFGMasb6bs=", - "pom": "sha256-CyRCnDntCWozUfpmflRNcg+M559/cRcRmTqzGHsQQGA=" + "com/github/mwiede#jsch/0.2.10": { + "jar": "sha256-cX/gOLA7YG4J5nS60qw6e2qmQTEpHRzBxIn5nBqlY8o=", + "pom": "sha256-3TLAFA6lM8J5cp34jMLfYQQwLDT0e7M+yrLv0G3hU8E=" }, - "com/github/pcorless/icepdf#icepdf-core/7.0.1": { - "jar": "sha256-RBAMICxzxmPzHJ7TgHg/0G0mr9HdJAX7YL49R3r7f9g=", - "pom": "sha256-MwixlyFAVBbfn1xS+cyBUywXnlaZRaMpoleRHyxSc/o=" + "com/github/pcorless/icepdf#icepdf-core/7.1.3": { + "jar": "sha256-XhWwX2/GNUqHLpXvcU9VbHlZZArXU+thAWwMDpZevEU=", + "pom": "sha256-xchpL8QmzK2SxF6xBShAEe/K7VSVtiaSM3x/NN2ov/g=" }, - "com/github/pcorless/icepdf#icepdf-viewer/7.0.1": { - "jar": "sha256-cUQ/NKc4sbq51CwZnZGFZQetc+Fp2UuF8Hw5HKF27Hc=", - "pom": "sha256-ZRY98Xd643d1jG63i6nddkac8zxWBjU1vnhTvXx5Ahc=" + "com/github/pcorless/icepdf#icepdf-viewer/7.1.3": { + "jar": "sha256-6kQABjXgnLQouNwIe2hWWgHA1nFxDajcdWcT5Kbtbrs=", + "pom": "sha256-G4hXWQ5g8pl8qQfPIXA9RYi1jZYUzJEfcBDd9cl60aY=" }, - "com/google/api-client#google-api-client-parent/1.25.0": { - "pom": "sha256-NElJWTWT7Wp7YMFmdQcr4lO3PMOAxyC5yWiT/KVhzUc=" + "com/github/spotbugs#spotbugs-annotations/4.7.3": { + "jar": "sha256-wP0awuIqzdRpE6L/dFUbcfEkRXGZaIaYIEr0vz1DFl0=", + "module": "sha256-C85puO9wOJqNWr30ddFzAXe1CeQYZGP/2x1emmrVz/4=", + "pom": "sha256-NpAQoZC5Xi2aJi2OxRfexrZIeqGhuUaKKBY5SvS6J7Q=" }, - "com/google/api-client#google-api-client/1.25.0": { - "jar": "sha256-JOGmnWwE5ucuPhZ1fUbTLap91DyzLDiV+DLyU1i+FAI=", - "pom": "sha256-xyaAUSeQpZObOW/XaPC2GXWGQj4QW4962fsetrNYTZg=" + "com/github/stephenc/jcip#jcip-annotations/1.0-1": { + "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", + "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" }, - "com/google/apis#google-api-services-drive/v3-rev197-1.25.0": { - "jar": "sha256-lvAOQzAcToTxHvGJZyrOxVegIUhtcoSHvakWXqPs1L8=", - "pom": "sha256-g9+53Y56ucZWRyJcIuo3eGxFPcMTvn5Kp27ZWqRw3Ak=" + "com/google/android#annotations/4.1.1.4": { + "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", + "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" + }, + "com/google/api#api-common/2.12.0": { + "jar": "sha256-PRcoPEEmEnuZBnEhi+4KLnl8GrH+cQKRbCx8WNIJJZY=", + "pom": "sha256-CXwru4X0wVxbfF3HZwn28d8vp9mJnRFn/ImXJsrFss0=" + }, + "com/google/api#gapic-generator-java-bom/2.21.0": { + "pom": "sha256-yat2y3B7cpvKEcG2csC8Rm3+HNn8whVwNNkzLxdo7bo=" + }, + "com/google/api#gapic-generator-java-pom-parent/2.21.0": { + "pom": "sha256-VnHy90HoxMfV4JTQ2xy+0uZbY33KsFQmSJ268BImLLE=" + }, + "com/google/api#gax-bom/2.29.0": { + "pom": "sha256-XBa6jaP2ASSK5KhccDGy97o5e06qatdoZlSGaP9hn2E=" + }, + "com/google/api#gax-grpc/2.29.0": { + "jar": "sha256-fw2Bn/ll3cbzmmEe9LHyMENBAYkm33eFFe0EvfRHcTg=", + "pom": "sha256-YpEUH7lWvCzCRfQoK/oEJ7kIViWeL+VzD12y4x/6IqE=" + }, + "com/google/api#gax-httpjson/0.114.0": { + "jar": "sha256-pwanjb2VZAw1NbMy8nHUcVMnxqhnH4aqvhgwb1T/0ho=", + "pom": "sha256-FffanA4jix09ir3uV+EyYAxc2QwWoR7Ch2YJS07t/ww=" + }, + "com/google/api#gax-parent/2.29.0": { + "pom": "sha256-uu1P0cGgGcLmCPZoq5pd8JzoMlZG8I+FUA0CGt8fmwc=" + }, + "com/google/api#gax/2.29.0": { + "jar": "sha256-nzyCG2KvlkO5EMGxv2kGUGh0mRJ+4Lh60EQJ8beShe0=", + "pom": "sha256-dXjTQWNUZ4AciLYrP6fUyaAwcg9MlffP4khVNxLI128=" + }, + "com/google/api-client#google-api-client-bom/2.2.0": { + "pom": "sha256-8RtgZOZIf6TI7TEBOXsHnXbGrQB5r2+nDjoFglBfBYs=" + }, + "com/google/api-client#google-api-client-parent/2.0.0": { + "pom": "sha256-+RC/VDdkToiqHNYwkToFI1gvx5RK2bW9rP8sFYlk61o=" + }, + "com/google/api-client#google-api-client-parent/2.2.0": { + "pom": "sha256-kOYt+D6q2B1PW6yK8RF5wKrtsgO8xkiKKaD3XXccov8=" + }, + "com/google/api-client#google-api-client/2.0.0": { + "jar": "sha256-+vAvQHDE9ZHn0aWRFh2jvuLQjiu5xFeGRVWej1XPa3s=", + "pom": "sha256-jP8IwUzUQqvT/+GzJxgwSENWe/ef3dYshP9mhM9eNyQ=" + }, + "com/google/api-client#google-api-client/2.2.0": { + "jar": "sha256-WOyp+wqGk5Fon/yCizvQsZrHYEL/n6tIge3ff952kD8=", + "pom": "sha256-TRf5M7m2Wf0JAtun+CDhvmcsC1IVNjSpUMwf+7XSI/w=" + }, + "com/google/api/grpc#gapic-google-cloud-storage-v2/2.23.0-alpha": { + "jar": "sha256-mzZwsaFQ1Wf5BMm1rxfPuZd8W7HYzEwoDHx3F7H3hIQ=", + "pom": "sha256-uwToIdnCzIEngO0oGmQD7tW5R55ijY1iWTrU/TnOOuk=" + }, + "com/google/api/grpc#grpc-google-cloud-storage-v2/2.23.0-alpha": { + "jar": "sha256-4KnnWn+lrokVZnuKemtm1RPmTeFKruW2kshtB32hFcU=", + "pom": "sha256-u70CMNpfoXxwe1Vzs1A0SNw/sIpS+DAbuoXAwYVxBDc=" + }, + "com/google/api/grpc#proto-google-cloud-storage-v2/2.23.0-alpha": { + "jar": "sha256-jU+n4PaXjdCScbITDqH5WmVUSYtvTxV1JGQa+6eE/Sk=", + "pom": "sha256-LJrDR5T7r+Zg7m1x71Gkrn1pQ1NF4DGj1a0JkCAlsy0=" + }, + "com/google/api/grpc#proto-google-common-protos/2.20.0": { + "jar": "sha256-77Yg0RCbzf8/LJvy1SChjws5v9F9WF859ul+wnVpkxg=", + "pom": "sha256-0xsEHk8osgs3ZOkPDqbypb/TdqWAH35DSC4ueXXCXI4=" + }, + "com/google/api/grpc#proto-google-iam-v1/1.15.0": { + "jar": "sha256-Jq3Pe1NdWL4F9yFFQyHVPnCH/hGMZr+zyHrPajAYUpU=", + "pom": "sha256-5X4mSbLY0jGpxWxSSsDKtgxqBU2rVcnZFWCi2KOhx8E=" + }, + "com/google/apis#google-api-services-drive/v3-rev20220815-2.0.0": { + "jar": "sha256-W8MsCZfaoq2Q0Zj64ZAQAORn7z4q1HBZvhFliPs1ZjY=", + "pom": "sha256-Pg9xPufuHatcYGsxuC4ZPjt/5NW2nqp/onS9h8qEre8=" + }, + "com/google/apis#google-api-services-storage/v1-rev20230617-2.0.0": { + "jar": "sha256-Q0hLMrQQsrj/MqyasbicA5xyfC43Rl43XOKEbVqARkU=", + "pom": "sha256-OdEbFG/3/0hU4dRRUUUljwFgIIJyUeP4yt0TtYeHYYI=" + }, + "com/google/auth#google-auth-library-bom/1.17.0": { + "pom": "sha256-q189O6vBm1c/g8TmeZ44b9lzKDqbkNIn8rgrBl+9xY4=" + }, + "com/google/auth#google-auth-library-credentials/1.17.0": { + "jar": "sha256-XeNk7nqc6V2HFb8SS9sNlJ03ZJkU24RsxwBVhPunzk0=", + "pom": "sha256-eykzIvpbe9T74FQQzf4udTpy8hjjhgz8ppBh4DchaqE=" + }, + "com/google/auth#google-auth-library-oauth2-http/1.17.0": { + "jar": "sha256-uBSOGvDEGXrqcH0BZrTtcKdbju5yRr5+sCKKSDQJXnA=", + "pom": "sha256-t+/XqUPWEOCTfmQtuEir4tF+y6Kf+1AX0NZXko6BmNQ=" + }, + "com/google/auth#google-auth-library-parent/1.17.0": { + "pom": "sha256-1NeR/QXmN0n4NRQkqaXa6YuigG1ckiKMDA/ETcCfV+8=" + }, + "com/google/auto/value#auto-value-annotations/1.10.1": { + "jar": "sha256-pP4KIRkl6TioUQ10F2PuEXGhG/kx9Yke9NTuhPynK+I=", + "pom": "sha256-n7rMhpTRkE37TVrx5KVGD9ZMHKnQBJ0YFFQs0q0osEc=" + }, + "com/google/auto/value#auto-value-parent/1.10.1": { + "pom": "sha256-9y2jrhi84YuHRM1yM6qDSjLTvR4LRTsV9tujP3lzz+k=" + }, + "com/google/cloud#first-party-dependencies/3.11.0": { + "pom": "sha256-nN2Y625KV+jC1GnjnONRPbJQGaWNmY2X3es2OC4g+ig=" + }, + "com/google/cloud#google-cloud-core-bom/2.19.0": { + "pom": "sha256-R1d+AUcHWXUpQCzuCXVyw3B59osRrBhqURnVc8uroEE=" + }, + "com/google/cloud#google-cloud-core-grpc/2.19.0": { + "jar": "sha256-yDpYgn2A468XXxJVK+guLLbzo+A/1+RYlKYU0TzzQrU=", + "pom": "sha256-HJqvT/ynaiy/+YGgzdseKA9WaEkVv1z8vrK/yIv5YX8=" + }, + "com/google/cloud#google-cloud-core-http/2.19.0": { + "jar": "sha256-BAynBQHjPez+2d9+44HCc8btxSj07Zyz549vUFYKEMI=", + "pom": "sha256-gidJQIiur3uJzlCT2xgQfDjBzTzJJ4z43vQrmzM4M5I=" + }, + "com/google/cloud#google-cloud-core-parent/2.19.0": { + "pom": "sha256-ds6+05V6Z5s+YI9p/+oehGXyStNjDlmwd1zdJywhrP0=" + }, + "com/google/cloud#google-cloud-core/2.19.0": { + "jar": "sha256-1HR8ZJtsfgb/SfdfMByNsXu/SnK/lhk+Tkplwzu25jk=", + "pom": "sha256-3CToTf0yRgp35WVVOc5a53emz/2eHaod3bE0K1JKTZ4=" + }, + "com/google/cloud#google-cloud-shared-config/1.5.5": { + "pom": "sha256-mLz9fSHahIoeXpTp4VJG+eHoe1bJ54zxfJsSOG4jrnM=" + }, + "com/google/cloud#google-cloud-shared-config/1.5.6": { + "pom": "sha256-XtWUwTSjPrMih22HFNOiXb4kYV3kFa6HUkkNzZya7DM=" + }, + "com/google/cloud#google-cloud-shared-dependencies/3.11.0": { + "pom": "sha256-2zF4EnZoKP90h/U/sLxkVI9MSu2ppNj1jf7VBf64TVM=" + }, + "com/google/cloud#google-cloud-storage-parent/2.23.0": { + "pom": "sha256-03f/JUOdq3jk6q9gYh3wmr7usbBbS2r1PtSPn0pBDYs=" + }, + "com/google/cloud#google-cloud-storage/2.23.0": { + "jar": "sha256-lwD8xMevx+i+CbpHsooKzVsH79wqD9NVfpoDmBlrfc0=", + "pom": "sha256-9dLU2nyhmy3AhN8UUvcCUkHBRXj8567NCRGMkjpDpPw=" + }, + "com/google/cloud#third-party-dependencies/3.11.0": { + "pom": "sha256-GdHtxT8CJZACmw7UQK80zkx+CU0N4csD87ofw+JkeGs=" }, "com/google/code/findbugs#jsr305/1.3.9": { "jar": "sha256-kFchoO6pCoFTSrt+5u9OouXmRfod7wpc2IQC3xtGye0=", @@ -211,9 +461,16 @@ "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, "com/google/code/gson#gson-parent/2.9.0": { "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, "com/google/code/gson#gson/2.9.0": { "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" @@ -222,79 +479,134 @@ "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=", "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" }, + "com/google/errorprone#error_prone_annotations/2.18.0": { + "jar": "sha256-nmgUy3GBaYik/RsHqZOo8hu3BY1SLBYrHehJ4ZvqVK4=", + "pom": "sha256-kgE1eX3MpZF7WlwBdkKljTQKTNG80S9W+JKlZjvXvdw=" + }, "com/google/errorprone#error_prone_parent/2.11.0": { "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" }, + "com/google/errorprone#error_prone_parent/2.18.0": { + "pom": "sha256-R/Iumce/RmOR3vFvg3eYXl07pvW7z2WFNkSAVRPhX60=" + }, "com/google/guava#failureaccess/1.0.1": { "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" }, + "com/google/guava#guava-bom/31.1-jre": { + "pom": "sha256-oRnYiA5WquiLFvM8gFLk1uZJoi4Xjzkd7zsvsfShKeY=" + }, "com/google/guava#guava-parent/26.0-android": { "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" }, - "com/google/guava#guava-parent/30.1.1-android": { - "pom": "sha256-2Oaw8PpL9r4hc03FMPdNhpbp0Kw60n+8eSi6PY9k12E=" - }, - "com/google/guava#guava-parent/31.1-android": { - "pom": "sha256-chYh8BUxLnop8NtXDQi7NjJ/vUpTo+6T3zIUNjzlOXE=" - }, "com/google/guava#guava-parent/31.1-jre": { "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" }, - "com/google/guava#guava/30.1.1-android": { - "pom": "sha256-shjebjRaeYP+/OSaBLrxn2rONZytHISXMZDNbE2gWEY=" - }, - "com/google/guava#guava/31.1-android": { - "jar": "sha256-Mqwu1wnZbSeLXS4+XOoXj6STmTnFJftkdTLwEzCNswk=", - "pom": "sha256-ZikplWROlVN+6XqJ6JkBcdjzwmrPmEgwp3kZlwc9RR0=" + "com/google/guava#guava-parent/32.1.2-jre": { + "pom": "sha256-iOnLAHM1q1/bMUpuPJh3NOwjCMmgY/90fHRpGJ0Kkr8=" }, "com/google/guava#guava/31.1-jre": { "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" }, + "com/google/guava#guava/32.1.2-jre": { + "jar": "sha256-vGXep8/Z5NrPhBnYrw50FlWFfSeIW7NdlD1xh/w6j84=", + "module": "sha256-5Azwhc7QWrGPnJTnx7wZfhzbaVvJOa/DRKskwUFNbH4=", + "pom": "sha256-PyCFltceCDmyU6SQr0mjbvf9tFG+kKQqsd+els/TFmA=" + }, "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" }, - "com/google/http-client#google-http-client-bom/1.41.8": { - "pom": "sha256-yVh1SDQDTW6bV19FDYAINuQYkW1vNIOXqwpMmzfLhKA=" + "com/google/http-client#google-http-client-apache-v2/1.42.1": { + "jar": "sha256-i0lVds+VmtJvz90DzfeC+iF0EgxIxRX+cbcBSKlRwgo=", + "pom": "sha256-M0NK1qFkN7xZazUcAsMKU3vrK4v7+j6qcN8IDaJZfsY=" }, - "com/google/http-client#google-http-client-gson/1.41.8": { - "jar": "sha256-FRKmpkILWW8UJXXvBFDQK7XQbo9Y4RRAT1Tfg1NfO1g=", - "pom": "sha256-MytVQtfeavHdJZ4UvOGcpfVpX18apBVC/KvtqGtYRRk=" + "com/google/http-client#google-http-client-apache-v2/1.43.1": { + "jar": "sha256-GLJai+1jCnuQIEtwIPciGf3aZDk1/KZAXm45N66Ss2E=", + "pom": "sha256-RNoyc7bYyQk4TpwvayCtTsToyVmYGgjCConScF/X1G0=" }, - "com/google/http-client#google-http-client-jackson2/1.25.0": { - "jar": "sha256-+efg0xiGCiCS1wtWMxl2KAxOk0igZe3juZySqgMv2FM=", - "pom": "sha256-kJ9uCYAW/9nOnr83IN+2YbxKF6qTLLTCIYNpl9whWF8=" + "com/google/http-client#google-http-client-appengine/1.43.1": { + "jar": "sha256-k3YkhKkyT4JEVbJNoMtpin40Z+Lkli7lQaFP8ZIsOog=", + "pom": "sha256-A/hib01jYL8WzTfzfTyiqXWT7xfSkisP/pTpgTPfPUo=" }, - "com/google/http-client#google-http-client-parent/1.25.0": { - "pom": "sha256-BinHEZjqaXXv6PEi72pbyqcvvtbPMMO4PMPLtkcI/as=" + "com/google/http-client#google-http-client-bom/1.42.0": { + "pom": "sha256-mP9hZSXmP9BhMiFZAVOOI/9nrtuJNM0l3FkkjwzAU4w=" }, - "com/google/http-client#google-http-client-parent/1.41.8": { - "pom": "sha256-HKVBMLDXTBxWaWEdPp9+XCXtxsSKMJCcMjDi4Jld7Vw=" + "com/google/http-client#google-http-client-bom/1.42.1": { + "pom": "sha256-5t0Lk5ba4pFnRDOT7p58BP0v0Q5W0PdLYa4lZoqNq4o=" }, - "com/google/http-client#google-http-client/1.41.8": { - "jar": "sha256-mfps8okNuo1yUIo/1wEhHlXaZsgSBZGXcibkTVf18Bc=", - "pom": "sha256-3tTlt+Us2xmGB+rfh6huKKmSbEC/fKao9UZ5kWyfdvI=" + "com/google/http-client#google-http-client-bom/1.42.3": { + "pom": "sha256-SllPSmi+keMqV7keI9plQGixLtIveYBfvNYiYfULR+w=" + }, + "com/google/http-client#google-http-client-bom/1.43.1": { + "pom": "sha256-eSc6FEsB1GX+f+tvJLN7Gfbv0mCOXvEviOY1sf3toEg=" + }, + "com/google/http-client#google-http-client-gson/1.42.1": { + "jar": "sha256-QJ6ODMsAY9H9oEQC7hfqWSmPHZL88/aWv+EpD5EJ2wE=", + "pom": "sha256-uXkojNI6XO2QQ7YDlF+wZywNciXelr/izn3TLBBtb/c=" + }, + "com/google/http-client#google-http-client-gson/1.43.1": { + "jar": "sha256-AXQG5RBaMxR6sTuve0kf9T2Z5UpeK2G3zNZR4WQilpg=", + "pom": "sha256-EqhE8wvEQ29kCX2xTYNt7vxshmldPFpetmi76P8OaUE=" + }, + "com/google/http-client#google-http-client-jackson2/1.43.1": { + "jar": "sha256-HUH6ED2kMtxJtBoyHv/D4v2nIqPciWqJ3Nw6TV/oIlU=", + "pom": "sha256-HuIU+V8PJoHgZMZU8Nd7UHvQ3aFt2IkISe1NVU6/trg=" + }, + "com/google/http-client#google-http-client-parent/1.42.1": { + "pom": "sha256-6xc8NOLKP7hwvV5pCJ8oPn0ifISs4UxPVko+cpYqUlA=" + }, + "com/google/http-client#google-http-client-parent/1.43.1": { + "pom": "sha256-fOZP1l2/NuZ5y+SUhU79JODdC/xXe1umLNCV5q8u6xM=" + }, + "com/google/http-client#google-http-client/1.42.1": { + "jar": "sha256-5cdHPnrTpa6KtEs4+9yygtdoQRS3RLuWiUGNYbewEQU=", + "pom": "sha256-HDyBoqVijXGQWl4TBRlz1OqxX1CIzxZXN1bBWRNySW0=" + }, + "com/google/http-client#google-http-client/1.43.1": { + "jar": "sha256-g043sK8s/oCyl75NalyP0MyrHQsT6bjXrJIejdLyUew=", + "pom": "sha256-21zBH3o7xj6nYyIPc6n1GO173MhAZ2Mt5VXeWQPtmPI=" }, "com/google/j2objc#j2objc-annotations/1.3": { "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" }, - "com/google/oauth-client#google-oauth-client-java6/1.34.0": { - "jar": "sha256-zWbH9vnIzmFFPRL05/iComFqAyOeqTf9D86G7bUWKMU=", - "pom": "sha256-+WIvkogQedMf7W2DjC4eyR3DmOqKots9y60o6JDxYk8=" + "com/google/oauth-client#google-oauth-client-bom/1.34.1": { + "pom": "sha256-6WOBq0Zz9W3gDWxbRwwnsjFuZ4wr/8IK6ozfMqcuIT4=" }, - "com/google/oauth-client#google-oauth-client-jetty/1.34.0": { - "jar": "sha256-p97u4NDKLERAyRI95uV6jznV4ZglyYrscgSatE7EIs4=", - "pom": "sha256-hz/FGUgZeoSiBbUpQ/KoWYiJdJV/awRxaJYrlpobZqA=" + "com/google/oauth-client#google-oauth-client-java6/1.34.1": { + "jar": "sha256-lwRiwuzGRVK0s4SFTTwPLP7rrANOchDhhz7m6AHpP1o=", + "pom": "sha256-zJKBseI64bHI6SBycx1ZVAy3AMY/ybZo1YcsOVrLjYM=" }, - "com/google/oauth-client#google-oauth-client-parent/1.34.0": { - "pom": "sha256-Pq1EPY3oIipV15kAq6aeIhnL7GhRmlelqmOzdMS4FqA=" + "com/google/oauth-client#google-oauth-client-jetty/1.34.1": { + "jar": "sha256-/wnm1DwYITDXGG8eLJMqpF+tK8Lkvd2OgXAtQYUqsV4=", + "pom": "sha256-0o5G3OUJmDmnNoQXPZ7sEPLxUdrbEOiYnbd514ZfgVE=" }, - "com/google/oauth-client#google-oauth-client/1.34.0": { - "jar": "sha256-QCDi9jQvFR55cYfoQzuS0ZpAs6SAHyKrg4nXBhXRcNI=", - "pom": "sha256-DJ03VEuUcRXdzOoUiV0ZpgmEEKcrDD1FGy2KWzkDGDg=" + "com/google/oauth-client#google-oauth-client-parent/1.34.1": { + "pom": "sha256-N4sHWGVenWD93gjaiF0Vg4BAvL34ivrXrtEK8Ve0QD8=" + }, + "com/google/oauth-client#google-oauth-client/1.34.1": { + "jar": "sha256-GT7fl676KLk8WJK9xZi6w0+kw5ZYgDAITykLFEDouYo=", + "pom": "sha256-yF9HUepssOHsTxEwM89Odhw6vabX9BDJ1qQmpUWrgps=" + }, + "com/google/protobuf#protobuf-bom/3.23.2": { + "pom": "sha256-loU/+3OF4oU3+uLBegaGRT2H38ixPJ3P3QqS0e7yPxw=" + }, + "com/google/protobuf#protobuf-java-util/3.23.2": { + "jar": "sha256-ZEl1t4DX6N5ULdoW1M6xV7QKUqi+VkUiHp/QJu8gSxM=", + "pom": "sha256-jXBQCvaL7cGh95eLuwX3swQ2ePVHa1ZZmcv7pHOISlI=" + }, + "com/google/protobuf#protobuf-java/3.23.2": { + "jar": "sha256-GKBX9eD4KNqpK3HBnfkfa8wqrQZ8os3WtWmAVcp7zs4=", + "pom": "sha256-tQSdHWWfBDzwspcNOVJwjoEU9HuikwQkZan68m1LE3k=" + }, + "com/google/protobuf#protobuf-parent/3.23.2": { + "pom": "sha256-kjOkIPNJLyzaTArVYRiN6VxSTs5pKSK1T+xQZ1JLbn4=" + }, + "com/google/re2j#re2j/1.7": { + "jar": "sha256-T2V69Rq4uwkJvMPrQIYtJhJa+MvPkqqrpZX+13+Ue8A=", + "pom": "sha256-i7C3rpQfVyzEnH0DFdpHf89wHFkZPJalqP4tWcCVepo=" }, "com/googlecode/javaewah#JavaEWAH/1.1.13": { "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", @@ -316,6 +628,54 @@ "jar": "sha256-Ulf963GblQOfxs81ASUnk5hWsvLJ12PVk8wMtk6IqyQ=", "pom": "sha256-CPvh/9g2Z7fusWo3U/WqwQ1aUqwt3Dvu/aqA9q3oSt4=" }, + "com/microsoft/azure#msal4j-persistence-extension/1.2.0": { + "jar": "sha256-aNg3QZ702HCO07jIgdb8Isnt+BZ/TnAYtiG8od/XUyo=", + "pom": "sha256-gvbJWI44ai2Iq3QatIydFTlAVvgAkDyLdS3KLhmXkSU=" + }, + "com/microsoft/azure#msal4j/1.13.8": { + "jar": "sha256-LvoCWte4PkqqjaTAiFtg1NvoL5iwD1IE+AEsWz1IGQM=", + "pom": "sha256-+AIib1yfOX8KT1HF7z2GxVjwYgk34ajU6KMxP3Kw3ic=" + }, + "com/microsoft/graph#microsoft-graph-core/2.0.19": { + "jar": "sha256-9F69ueIXfOOw+3Tv/ECWE7KMbpCZEvrKpmiyOuY64Tw=", + "module": "sha256-7mGJwLNuXS1h8UN234DS+SPICLtgpPRN49fV400ksa0=", + "pom": "sha256-/bosQFOC5is3UmFaohhIF07ibVSc4tWxHhZRehWZsJQ=" + }, + "com/microsoft/graph#microsoft-graph/5.67.0": { + "jar": "sha256-XAlLePWp3FRZS+eQWN8iyufT7hEr1fItcDwOivnabAE=", + "module": "sha256-tQBfduI1BftIRwqowjWO8NfK8trpavzKQUdxhCjyU80=", + "pom": "sha256-hJHorlQ6aDgitjtwCaOGSdbHR3KwveDNe2bVliCYJOE=" + }, + "com/nimbusds#content-type/2.2": { + "jar": "sha256-cw8YFhlhReiCdQk8FH8ubaPD5UEges01A6GwYSm5vqk=", + "pom": "sha256-iznCFjD7tvBIqAflfjy/c17zDaPxHnAZ5muqa5fa8Gs=" + }, + "com/nimbusds#lang-tag/1.7": { + "jar": "sha256-6MHFlOJCW9vqLYYN5Vxptp/F1ZRURSRJoPCRPCpbijE=", + "pom": "sha256-gksNfeeCer/GpH5u+UsP+qE4/vOK8IxWon9dOhUiEZ4=" + }, + "com/nimbusds#nimbus-jose-jwt/9.30.2": { + "jar": "sha256-HF89lM09d9YXb4VPHHjrZYz7g++APw2lT7R59WFJce8=", + "pom": "sha256-wI/3srHtdUZS3KQqwWyaPGqG8bj2gKY92nDx636/2fQ=" + }, + "com/nimbusds#oauth2-oidc-sdk/10.7.1": { + "jar": "sha256-8DsrqKUBzIfhuQcQbbsuU7wrfP+DUtC6gmi2NvhVXdo=", + "pom": "sha256-uUig3Af6U7rd3OrxtihjiWzIpihNLBAh/AJ8/3mmMI8=" + }, + "com/squareup/okhttp3#okhttp/4.11.0": { + "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", + "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", + "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" + }, + "com/squareup/okio#okio-jvm/3.5.0": { + "jar": "sha256-qheG6VYytxb1qFokMm3NUWwkqSlIkwjRTZIvGP44TTg=", + "module": "sha256-pz6DPrY/7Q4Y8j+WtjQdsyiaMY/eznVjsGeBVigOE5I=", + "pom": "sha256-BxH2z8tQUo9Jmf1NlzVFiAwSq5kMzprY3mSZmCmtRss=" + }, + "com/squareup/okio#okio/3.2.0": { + "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", + "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + }, "com/sun/activation#all/1.2.0": { "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" }, @@ -330,40 +690,58 @@ "jar": "sha256-yayTUnlCGJron8kSBnY1jxHqj3E8Y1qfLHAGP+ZxZjQ=", "pom": "sha256-7odNIUDKTox3TojfZW7svJZT9bjLmAapq4UFwmm3s34=" }, + "com/twelvemonkeys#twelvemonkeys/3.11.0": { + "pom": "sha256-ELLAgOMiZw7tfeBiRNhMx8WVOSfuWvPdjESGVaOAW78=" + }, "com/twelvemonkeys#twelvemonkeys/3.9.4": { "pom": "sha256-gOzTBd8tVuolgm89azuQc6gopH6WUu8FZKOPHzt3VSc=" }, - "com/twelvemonkeys/common#common-image/3.9.4": { - "jar": "sha256-pfQZkdJJLyjOTwS4Kr//uJ9f+p38h/TljxDVJuW6SoM=", - "pom": "sha256-8e4RuOVYMAMujk1Zi2EoHjXnZ0+N2adwFGpxOaDOPkE=" + "com/twelvemonkeys/common#common-image/3.11.0": { + "jar": "sha256-Eh98YraQ0tUk6rzx8xrExnfBSPbDLXQpzMA6ZFFqr5M=", + "pom": "sha256-hY/Ng2sxCdCvls0v0+kjnlqrTneeS/o7VPgORp8q89U=" }, - "com/twelvemonkeys/common#common-io/3.9.4": { - "jar": "sha256-zHwnlHvyGnX7w9YT55vdhhmQjme4jMfXMJGlWHbk/Tg=", - "pom": "sha256-CsHg6dQkTPzshRxVmIXUi4RZGGEQh63lSc3V1e6rsWI=" + "com/twelvemonkeys/common#common-io/3.11.0": { + "jar": "sha256-mdLCffXUw84CSaPaoq1Jw5ZDo99lPAfL4igpiIklWMo=", + "pom": "sha256-5AuxgXc7Nc23kjFV8TbM2yg9+HZdRH+TQlFbNwlGfHE=" }, - "com/twelvemonkeys/common#common-lang/3.9.4": { - "jar": "sha256-pSG3l9WPZbgPqMo2XZWRFiJAjKsiD9XYUhaYBfZArL0=", - "pom": "sha256-mS8V1Ni9Bv+g5GYY7FV5wqvSizgmDLPljY3wGJ4YjJM=" + "com/twelvemonkeys/common#common-lang/3.11.0": { + "jar": "sha256-F7hKpUp7POYjD2FWfua6OTLL49AWRbBTh+0wcV07evo=", + "pom": "sha256-gkGjHq7rObaHS0h2amKKDOwrfzY8DvbCH7afao4JTvw=" }, - "com/twelvemonkeys/common#common/3.9.4": { - "pom": "sha256-eMLMiO9JfTKBbZrtHWZ0YYWwk4ANvICJDFJqweuwWQE=" + "com/twelvemonkeys/common#common/3.11.0": { + "pom": "sha256-HjI1GeG/W9NRqeBIInSmPZ+SqtTGT8mRhl+3GGedUBQ=" }, - "com/twelvemonkeys/imageio#imageio-core/3.9.4": { - "jar": "sha256-JEhDp7yOz277IKpfgX6Xet2vs/awznA5Oz5tEQlZH64=", - "pom": "sha256-bkmhULWKTlKRmufie0l2KCI1JF44gdqMTuPipOj7eBc=" + "com/twelvemonkeys/imageio#imageio-core/3.11.0": { + "jar": "sha256-qlGUZvr/VPXhKXNxhWerSrPD0UxcW+1/wO7tQjmkjrk=", + "pom": "sha256-d8uK45DuE/xJIu4NYsJiZHaHQteb9ecMqA64gWAhNyM=" }, - "com/twelvemonkeys/imageio#imageio-metadata/3.9.4": { - "jar": "sha256-WAozT44gyZ/5En+psAIrDwKpgbRuazjg3zkwUjKaYyQ=", - "pom": "sha256-VmIGSg5hQybZFjeDeRi/kdT9MiDN7yN5N/xQojyZLtU=" + "com/twelvemonkeys/imageio#imageio-jpeg/3.11.0": { + "jar": "sha256-QpHkgCWdoU8AUTiSgRL2s1rO/HKpVF6pjZl+hDxV2z4=", + "pom": "sha256-1zL4MhQY/ADaI1fEDNXlIL3evP+UAdd8+I+Bp2xjxhQ=" }, - "com/twelvemonkeys/imageio#imageio-psd/3.9.4": { - "jar": "sha256-LB+jMxlkYUDbQw/PNohyRIO+0Asd4Ze3ZGs29aFu1ok=", - "pom": "sha256-smU8jX25W0PnzV94pCx18xJTGHNMsofkXDMHztIu3IU=" + "com/twelvemonkeys/imageio#imageio-metadata/3.11.0": { + "jar": "sha256-3j07qmCDbvYGmKf5vP2z4YAugUCh1TQtZmFS5qmR5ZY=", + "pom": "sha256-5FipFdep0DcdTYgyq90rP8Q2GKWj9/BFcRrL0FKMBK8=" + }, + "com/twelvemonkeys/imageio#imageio-psd/3.11.0": { + "jar": "sha256-akCfOParHTd/fFcU+OvAN+CVex8IjZwb1j7lPQWjoVo=", + "pom": "sha256-FQzNSOegAc61jrZg3FqGszM3dA+NhKa57QJaSoQxaaE=" + }, + "com/twelvemonkeys/imageio#imageio-tiff/3.11.0": { + "jar": "sha256-xEq8bYNS4rdXfquWKpS/CT+rftg3G9/dnJVd4y7NpRU=", + "pom": "sha256-/qrWPU1vaHuXMsWyRZ26lFtRnzSEloZypigWNX7ASW8=" }, "com/twelvemonkeys/imageio#imageio-tiff/3.9.4": { "jar": "sha256-RfOfSeOnDS2yzlSTtpp4nYACwSKqTk5gTZv6LfQmyDw=", "pom": "sha256-yS09aeR3Rl6A44DDllbGypQmFyD3Xdxd/HYl9KVaGFo=" }, + "com/twelvemonkeys/imageio#imageio-webp/3.11.0": { + "jar": "sha256-dgoMoYgzlI/TCvs0UlxW9b/xk+d4PUhSILaODVQ8QUA=", + "pom": "sha256-E/tHQxNVJpNOwb3iLbn6kqQtxOWBX/SCEZs5knu3STU=" + }, + "com/twelvemonkeys/imageio#imageio/3.11.0": { + "pom": "sha256-VyQzrPzkVWEQr8x2N5AOyamDYJTMjtobIMDDuR/x24Q=" + }, "com/twelvemonkeys/imageio#imageio/3.9.4": { "pom": "sha256-q24dY2m5UtPiKwv8mmZYbKRhYX3oMEjDVQBp398INyo=" }, @@ -379,8 +757,12 @@ "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" }, - "commons-codec#commons-codec/1.17.0": { - "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw=" + "commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-codec#commons-codec/1.17.1": { + "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" }, "commons-codec#commons-codec/1.3": { "jar": "sha256-G6/S7OLojbTN+DWn+PDeZfq1sRR5d6XcxZt8G4xvUIA=", @@ -393,14 +775,10 @@ "commons-codec/commons-codec/maven-metadata": { "xml": { "groupId": "commons-codec", - "lastUpdated": "20240427124755", - "release": "1.17.0" + "lastUpdated": "20240715222428", + "release": "1.17.1" } }, - "commons-collections#commons-collections/3.2.2": { - "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", - "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" - }, "commons-el#commons-el/1.0": { "jar": "sha256-DWdVDsACK2U0U8dZ8GOmQ8L+ZLxI+qiyX5WiIOKiguI=", "pom": "sha256-CvMQHgSH7l4LJ/6GusL2gvoSo6KSuzvRm58n1e2ArsQ=" @@ -416,6 +794,10 @@ "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" }, + "commons-logging#commons-logging/1.3.2": { + "jar": "sha256-a4WEJPUYAV8yv80Rg6Nz9Kgn1y0Ca2Ax2gyRzw6PNIk=", + "pom": "sha256-ZMFGqsSRjMPiHhMij1/kF4VZM7GBN0zML4me8eFWsm0=" + }, "commons-net#commons-net/1.4.1": { "jar": "sha256-BaNhHe35DQqz6O2D3sTuSSABSMCUJUN+uTSFYv3n2Dw=", "pom": "sha256-1REvVdum8eRbaz00zlvhox9BBFkwbbksME/spDBP7Ko=" @@ -428,34 +810,249 @@ "jar": "sha256-6mlza+XKjx9l8dputipQaz/iX/SY/0uO2eWdpFBGqRU=", "pom": "sha256-QWCb9JaBLTeupRJrjd65GD0tRWCMZr6h0FvIDLpe7ZI=" }, + "geronimo-spec#geronimo-spec-javamail/1.3.1-rc3": { + "jar": "sha256-2csVzW2TcROVzGxA9I3/XLhVvH93PC4LMLDg/U41zZE=", + "pom": "sha256-Dh0EUnPLYh/wfMrN03zjHThvUpKD+9rQQqzbKvH78X4=" + }, + "geronimo-spec#geronimo-spec-jms/1.1-rc4": { + "jar": "sha256-g66m8pdo+3frakJkwH/onqxYZfIC34jsvJQGl5AfGP8=", + "pom": "sha256-D00st0zeuSzp+/tOaC1AP6Uq0D7d/b9FTLdmyAN8Bl8=" + }, "hsqldb#hsqldb/1.8.0.10": { "jar": "sha256-sEs7OsKV1JfIcjDutPiIMnpaFbnDwVZ9sgKlHYOsnkE=", "pom": "sha256-2QDYa4u/4/bugeqfIgbwd5Myu8pYjmo1/Rh4agoRkzE=" }, + "io/fabric8#kubernetes-client-bom/5.12.4": { + "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A=" + }, "io/github/x-stream#mxparser/1.2.2": { "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" }, + "io/grpc#grpc-alts/1.56.0": { + "jar": "sha256-2frCakS4d6qyLe5LiwvDW6R6XrLRQ+NQ22a+Kwpv8wM=", + "pom": "sha256-msck0sjXjroiqFx3/F9Jebpww28gN+iOWm1xD8xAAc8=" + }, + "io/grpc#grpc-api/1.56.0": { + "jar": "sha256-+4MTRD1jQD2aZbcc/nGeDnF7Gr7w7ejF6OV77/4gIJM=", + "pom": "sha256-2kzQ9pL7nZwvuf00R4PLE5YLfWFupP9ZXf9O32g3kmw=" + }, + "io/grpc#grpc-auth/1.56.0": { + "jar": "sha256-Ce/udpLt0bI6IgCgzQhe8AMrxE5TrkJRhu5fZYAL+hg=", + "pom": "sha256-OrPE/5vl3bTW7g4k05eV7sejojGRw7DqgRCGHMacm+I=" + }, + "io/grpc#grpc-bom/1.55.1": { + "pom": "sha256-THNVmhbNzTol3h69FQRCaVKMh2oKn4nEAnF6ZJObXIY=" + }, + "io/grpc#grpc-bom/1.56.0": { + "pom": "sha256-fJq5/Zx2/5V14lXyBUsmWbK9d5SawR77BGft9b1gtP4=" + }, "io/grpc#grpc-context/1.27.2": { "jar": "sha256-vL+QVd/0U/1lCL18yioKotXwWanJS+7R9f2h3AFWB7g=", "pom": "sha256-DyErFOvYNMvtm9iGml1snBeY7OtRLH/MKNqJ9vik7dg=" }, - "io/opencensus#opencensus-api/0.31.0": { - "jar": "sha256-cCulXXjznVUZXc8EH9+qt6dJCprEUBNUJIftnk06TSM=", - "pom": "sha256-m0eVkefD4KtFOB+gQ6kWV4Fb3Yw1k68BDHrDb0yQWRk=" + "io/grpc#grpc-context/1.56.0": { + "jar": "sha256-EZaZPyGQJMClH0XyvS9EjltmRikr63bo+2quSY5vOTs=", + "pom": "sha256-wU9Et0BIJNEftNJSVevEO3sTNwMGG0WzQ4FMmDC0xUA=" }, - "io/opencensus#opencensus-contrib-http-util/0.31.0": { - "jar": "sha256-vMbNebAMLCqln8KgLUCUEIMAWFDrtS2X1jkI0253r9M=", - "pom": "sha256-fvy/lNXcYnWCw/4LjEgz5N08vF0vEvpx7yko9MOoWgg=" + "io/grpc#grpc-core/1.56.0": { + "jar": "sha256-DxrDvDeEFtCw+Av5ApgI+Xj681/SAirS2L3WJ25upT4=", + "pom": "sha256-EZscdu7zInRKUpERfqBzJR4sHievipUtDDrBYyAIFmI=" + }, + "io/grpc#grpc-googleapis/1.56.0": { + "jar": "sha256-q3zxR05lSvARXJQM/X/1DiRPk/9HQYndd0YrnALNaSM=", + "pom": "sha256-OMe8XqZekM7U2XLK665eY05U47bijuYYXMqN1h67X4o=" + }, + "io/grpc#grpc-grpclb/1.56.0": { + "jar": "sha256-VwetRGMWIiiiZ6YXQrZgRHRBc2hQQ+xuHRl0yezqi6A=", + "pom": "sha256-l7UrJWBtEas1aqNFwNcbrHbZOyYobKNB/Nu5RjtNeAk=" + }, + "io/grpc#grpc-netty-shaded/1.56.0": { + "jar": "sha256-Wt41OEO2E79jZDEjvZzf61mjgykqz8eEyQxHBK0ZZtw=", + "pom": "sha256-I8R5eCgAITGKbc9KMM76HqMhIo/rdT88F77PMAk2Ce0=" + }, + "io/grpc#grpc-protobuf-lite/1.56.0": { + "jar": "sha256-81Rk7c3mpKB7WbXH3p4UIlNmUtgAL2yy0OznEXORF20=", + "pom": "sha256-iQJUlZ3EznqzScyixUFMS4CwAedlM3JA00+MQQFIkoE=" + }, + "io/grpc#grpc-protobuf/1.56.0": { + "jar": "sha256-1fLjM0WxmnSBWFixvYZ5lDodTF+u2I6f95LnSHXiOWY=", + "pom": "sha256-UVoukg3Hx0tQ6vghHswPloOKw8BAZ5yEpN7mTHrNyjg=" + }, + "io/grpc#grpc-rls/1.56.0": { + "jar": "sha256-Se3VvNgZ7GNZLC3Q69KH4SYaUI0RoxH/oJrOWcJsRH8=", + "pom": "sha256-+pYHQPzab+csBYmuaD3UgOTAWk1gIEMJVF9YDMZcgaw=" + }, + "io/grpc#grpc-services/1.56.0": { + "jar": "sha256-S024+5eC1i58a1idmaSlIpkKdA/1fl7/IKYM1ebv3H4=", + "pom": "sha256-4JyEX9qx7HwfXfn/EXHnl8YGx9yOkbZsw+QlbtZm8kE=" + }, + "io/grpc#grpc-stub/1.56.0": { + "jar": "sha256-SAjF9jIzst8sL9LOFLg4TOmwo2f3hC6TseW5uzQs2ww=", + "pom": "sha256-+vuE8JYro/SbifqRu3cBAnjqrw3lK0IdTqzIvwEQmkg=" + }, + "io/grpc#grpc-xds/1.56.0": { + "jar": "sha256-SZIL81LNp5o+9n9i/lJmV1IwkZtMRjZuvypJG6hernE=", + "pom": "sha256-MzyGTZ2587ZofESBFEKfl0vDXYRP4N1KMQx3y2FPecM=" + }, + "io/netty#netty-bom/4.1.104.Final": { + "pom": "sha256-WmXgahWdINO0gAYkpXDGRtvucQsrU5s0SaJoVYwonpw=" + }, + "io/netty#netty-buffer/4.1.94.Final": { + "jar": "sha256-gGbufEn58p2pbuYvfLE77gIstLaOUUN7M9o7bQE5jxM=", + "pom": "sha256-wEfWyvzJXBniBS2nvifsWk9xsgKqQE3whQGTrZjw9Nw=" + }, + "io/netty#netty-codec-dns/4.1.93.Final": { + "jar": "sha256-EKJ4sZ1jk9Vjf3RQB8sm1H3RbUaImNzEpD4m05xs3Sk=", + "pom": "sha256-PxHNLCB0FVhNxGzw0H3qEb12cqgEZyA+AlxanLj/ST8=" + }, + "io/netty#netty-codec-http/4.1.94.Final": { + "jar": "sha256-GtpFgPaM0XpTT7PAM3CHBzIjp2y3cwTb5aGxnfPVPC8=", + "pom": "sha256-Yr5AyhOzsJs3mAv93Ia/bzBzLZlSMb9FSdo2K/8Jy2Q=" + }, + "io/netty#netty-codec-http2/4.1.94.Final": { + "jar": "sha256-j70ulavsYVW2DtPJwWAO1OF//j8FPNWkBnfYecCvlh8=", + "pom": "sha256-SNwm8n9RUgpei2uZEZAWNP70JQWbdFBVVdSVhKzpuAk=" + }, + "io/netty#netty-codec-socks/4.1.94.Final": { + "jar": "sha256-HAtO4LYjQC3Vu3j9Smm/gI2iUQUk9ImiSw88xY3tBG4=", + "pom": "sha256-M0YjOPOtd9Y1CklWvzSnBXunDYGe0pMy3kU8iMc6Uhc=" + }, + "io/netty#netty-codec/4.1.94.Final": { + "jar": "sha256-kSQ3dq1otNjjnq+57BFeG4+prs0UexLvFbtpFjlJgyg=", + "pom": "sha256-A5MvNUvFsGjvSHAmD0GMmwsKdtlYDDt7TrKm5iKyV0c=" + }, + "io/netty#netty-common/4.1.94.Final": { + "jar": "sha256-y42Eo+Y66pDQ16MzoC5QrHUdKwXbVXRdmBte/4k/ZHs=", + "pom": "sha256-rXG08enZZBfYFjTluaNyaZHNn0jVnbutI2/tWchYjSM=" + }, + "io/netty#netty-handler-proxy/4.1.94.Final": { + "jar": "sha256-N4c4v+uEyBIorl3iCflkyoeEn5pyDJFsd/fLpklLsew=", + "pom": "sha256-NgLruOowisrwT/IrXBzqYKNIGCVcp+lmBHR50eAhDbQ=" + }, + "io/netty#netty-handler/4.1.94.Final": { + "jar": "sha256-jlBxmpq4njPvhcXzbXgODXBWs/dosH0mHYe67XCU6zw=", + "pom": "sha256-Yq7ozQXp4OQdvbIqgtJWmvHuE3l4Unof/vU5SpEUxuM=" + }, + "io/netty#netty-parent/4.1.93.Final": { + "pom": "sha256-sQnLdvN1/tuKnvdaxYBjFw3rfqLd0CT0Zv723GXN/O4=" + }, + "io/netty#netty-parent/4.1.94.Final": { + "pom": "sha256-LZcCadTW8qkWJJc6UCzA6+qDVgvA0RFquNyqlF6DTc0=" + }, + "io/netty#netty-resolver-dns-classes-macos/4.1.93.Final": { + "jar": "sha256-+6jtDTlTjr80APk5V8DqinRnVQGcThUHawRZH7XYU3M=", + "pom": "sha256-abZMe18dLWPw+5hh1Ti1vyjEwm4VlfeIVFFI2jk5Yeg=" + }, + "io/netty#netty-resolver-dns-native-macos/4.1.93.Final": { + "pom": "sha256-kDD8h0sfi1ru11HdajbiUjwujvFh3PVx0wIce9Etyno=" + }, + "io/netty#netty-resolver-dns-native-macos/4.1.93.Final/osx-x86_64": { + "jar": "sha256-JpRFG7jjDxsZt4GULrZ+oP1ACv77kFg3MNuZaqzBuUg=" + }, + "io/netty#netty-resolver-dns/4.1.93.Final": { + "jar": "sha256-J0TMwbvWU8n2X1dkqyEfUcrlaqbC4iiIUKmt2cgFvlY=", + "pom": "sha256-36WAR5mCVjNf+gW3hgERMcRhX1f7HhqQ2FxChvP2BVE=" + }, + "io/netty#netty-resolver/4.1.94.Final": { + "jar": "sha256-vSbpvF6U4tOXSpP9+SFljv9PAzv9TFIIYHdgq1Qphhc=", + "pom": "sha256-4yzEsSRK3sAhxaa1K82+c0QXab8PYNFUkgs8A2BLhV0=" + }, + "io/netty#netty-tcnative-boringssl-static/2.0.61.Final": { + "jar": "sha256-tvl0lyxEzW+c7KvCVSkChvqsQLY5PGbDw8Dbf0Icwo4=", + "pom": "sha256-+AUaYg8cSH5pOuWHeS9udTOu6EZUzo7tklRJqme5h4M=" + }, + "io/netty#netty-tcnative-classes/2.0.61.Final": { + "jar": "sha256-m5cOzNhEv64XWly797+UiRiUrdBtbMvhq/IlDNZAgPY=", + "pom": "sha256-/OkkBPUJgHzfuaEih/Zlw+yJAiIMJwl7vcUvznUql20=" + }, + "io/netty#netty-tcnative-parent/2.0.61.Final": { + "pom": "sha256-flj/oEOq1khZmvTUONGwTghCycZRENP5a42WkJ7CDKo=" + }, + "io/netty#netty-transport-classes-epoll/4.1.94.Final": { + "jar": "sha256-nV1R60IIHW/BP03KaFXNMNCYpbHQsG1WRKE0K9HlCkQ=", + "pom": "sha256-mY8rEt2tSQS/GdWXHQSJcPMbfXdL4GRJygRCj9SXX64=" + }, + "io/netty#netty-transport-classes-kqueue/4.1.94.Final": { + "jar": "sha256-M5oGbpiOdw4DiTNIREbtam6sfDQdnvR26VSKFvlPyIY=", + "pom": "sha256-OAkgyGQEJb7eENPmpm1uheIUCd/0U4CherVt440wBjI=" + }, + "io/netty#netty-transport-native-epoll/4.1.94.Final": { + "pom": "sha256-C5NMNOLBwkW5YSxZfq4LiNWs8jhh1Z26EogU4tzhmIc=" + }, + "io/netty#netty-transport-native-epoll/4.1.94.Final/linux-x86_64": { + "jar": "sha256-4l4O80f3hQ5vPYpgMdZLDtsGug51Uzw27bNQ1N795fM=" + }, + "io/netty#netty-transport-native-kqueue/4.1.94.Final": { + "pom": "sha256-PnZdVS07cYHBEEkreO2yooN/FdDKLhGO1LUv2Xvf6PY=" + }, + "io/netty#netty-transport-native-kqueue/4.1.94.Final/osx-x86_64": { + "jar": "sha256-71vV+vjCqIRv/8Jq08qbq0Fi4Y8Z6P1fd9/GrSHtFpk=" + }, + "io/netty#netty-transport-native-unix-common/4.1.94.Final": { + "jar": "sha256-J9Df8c10MZAnm+ys+zcv5NRbJm7a+tnxxsAbBNACgOs=", + "pom": "sha256-Es2Go+zkcrOyy4ErZhZHPk3gT8nZzs3dZtLVtqNOhg0=" + }, + "io/netty#netty-transport/4.1.94.Final": { + "jar": "sha256-p1r6hMo1pQIlmRs55rYngYbmEveioMDpgd5SOqrFFqQ=", + "pom": "sha256-K2RhsxPlaRhBancyBv99ZM8QGmYssDoUKPBfnavkseo=" + }, + "io/opencensus#opencensus-api/0.31.1": { + "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=", + "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y=" + }, + "io/opencensus#opencensus-contrib-http-util/0.31.1": { + "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=", + "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s=" + }, + "io/opencensus#opencensus-proto/0.2.0": { + "jar": "sha256-DBktRR6d106Ychsn0C8OK2vKRLUVY7Xavy4hH3o+vxM=", + "pom": "sha256-twh5B5IPyKgVNGhrLxorMxEnr5fwFau9s3hqUfP6HlI=" + }, + "io/perfmark#perfmark-api/0.26.0": { + "jar": "sha256-t9I+k6NFN84zJwgmmg0UBHiKW14ZSegvVTX85Rs+qVs=", + "module": "sha256-MdgyMyR0zkgVD1uuADNDMZE28zav0QdqKJApMZ4+qXo=", + "pom": "sha256-ft7khhbhe2Epfq46gutIOoXlbSVnkpN4qkbzCpUDIto=" + }, + "io/projectreactor#reactor-core/3.4.30": { + "jar": "sha256-L4/TaePZZZMQCfDFvsY/HQFw7hEdJuCmdvW5QFC4q+o=", + "module": "sha256-xLtiq9sMJmiXV9THXFhVgGQumeTPFmDAaqt53DhSbq4=", + "pom": "sha256-HLISL4vG+ON0L4Xpm3xBFwifV4hzdJMIK0bZBCQguPE=" + }, + "io/projectreactor/netty#reactor-netty-core/1.0.33": { + "jar": "sha256-iFZCHPtcgfsR2Xo+9D/meJXVsGQceq/j5ddItL5tilk=", + "pom": "sha256-tazBTpaD1V30BWDe8/CDG9q21QhBZ/b1h6ooaRWeSuE=" + }, + "io/projectreactor/netty#reactor-netty-http/1.0.33": { + "jar": "sha256-7JB8UimBFZ5Fqjij1fEYPo5XJd7j/llOjyGzuP5b6is=", + "pom": "sha256-5frkQ0rlFQDP6PoFHuf425bf/oM05EhFmrQcX4mkOBQ=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/servlet#jakarta.servlet-api/6.1.0": { + "jar": "sha256-ijH0ZfNZO/I1FTGlyVIBTrg52pamBbWCW5PdVHFMSMQ=", + "pom": "sha256-G6+Lb6bQIYAwINCXDqQ/sH32beZskNKZohZ3Dwsz5K4=" }, "javax/activation#activation/1.1.1": { "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A=" }, + "javax/annotation#javax.annotation-api/1.3.2": { + "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", + "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" + }, "javax/jws#javax.jws-api/1.1": { "jar": "sha256-nyCrH+o/lXHtUqnZjjxlHMfATIpwmt3yODErYJh8byw=", "pom": "sha256-2MBdp0oEuZfbN+I8xFBokVMZkJXfvn5eR9HMRJT1zXM=" }, + "javax/servlet#servlet-api/2.3": { + "jar": "sha256-hHi5AtCBXtBm24YPsUzF1ARUjUtjSKuTC0YnD83eumg=", + "pom": "sha256-q7KUqPBkAY6iJqWtIXbqqdvxzeAppHgV/UpASdE3QWA=" + }, "javax/xml#jaxrpc-api/1.1": { "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", "pom": "sha256-7l6D/wZZh4dIA7uRJ5r8zC8dP526odNX2f1X6Ls7xUY=" @@ -480,17 +1077,17 @@ "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=", "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU=" }, - "junit#junit/4.12": { - "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", - "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" }, "junit#junit/4.5": { "jar": "sha256-kjurxR22dfOSN3fDn/fYaOenbmmkU0C6Ts84zlMa3w4=", "pom": "sha256-dS6JNTrcfSfLat1xKija1YKK5zDhAuusLTSa9uLvda4=" }, - "log4j#log4j/1.2.17": { - "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", - "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" + "log4j#log4j/1.2.11": { + "jar": "sha256-imvHhajlKpfqdtfiHlkVJiImacQmLte5Haqccvz2zQc=", + "pom": "sha256-aaVvjRwzjc+J7p7XWzm52qqVZCxbbRMxMZ2HxNZJblw=" }, "net/iharder#base64/2.3.8": { "jar": "sha256-u/Qf2iKHelOPa8LVrQqjcqfd9KdWrzOGqgnT1O6oT38=", @@ -516,30 +1113,41 @@ "jar": "sha256-oD8NJegQ7P8wE34NMUjRv5r9z2I1fr0bGvM49/YRW7s=", "pom": "sha256-nqFHD161gt9fJa+pteIFPCy2GPJjlqG/IQ3m6T2XZGI=" }, - "net/java/dev/jna#jna-platform/5.10.0": { - "jar": "sha256-H3Gv2XcFG/AQnvXjdn1OKv13e+iU2JeIzA84rWj2oW8=", - "pom": "sha256-5Kho919p2VQvw5nczcs5mxDB/8hJUlUJvoJOM7IbApU=" - }, "net/java/dev/jna#jna-platform/5.12.1": { "jar": "sha256-jOlpEWyslb1hsHqNXgcXSzUuYzAUc8qscsOV48CEiNI=", "pom": "sha256-wnn/o7UWjiIDCHIxxjiRmnzsdFgAaxzaZpWXR4YPtFc=" }, + "net/java/dev/jna#jna-platform/5.13.0": { + "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", + "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + }, "net/java/dev/jna#jna-platform/5.5.0": { "jar": "sha256-JNgWIfgqwp/N2adBFgMfWQeiNDFY5hb0Vzu/okNK4NU=", "pom": "sha256-EFaeNiLpdNPmYlW6hZI8El2E+iV+8lQ9isHGWNnrzRA=" }, - "net/java/dev/jna#jna/5.10.0": { - "jar": "sha256-4zXBBnn3QyB9gixfeUjpMDGYNUkldanbprlPijuW/Mg=", - "pom": "sha256-B3PdO7r1MF5MDIL+NFzF1Mjp+tYjAqVVEYAj9ePq4xY=" + "net/java/dev/jna#jna-platform/5.6.0": { + "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig=" }, "net/java/dev/jna#jna/5.12.1": { "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=", "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y=" }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, "net/java/dev/jna#jna/5.5.0": { "jar": "sha256-swj66/5O1AnehBDgpjLRZLISawNfbqz/lo05CMr7TZ4=", "pom": "sha256-pRrZTj90+Fo8362XU5KCkxZFJmn1iCA8e0nl+Beb5Tk=" }, + "net/minidev#accessors-smart/2.4.9": { + "jar": "sha256-rM3Vx6xMSbFViQquof/KKpzNWCa1Yt2VqZ/BiHAD4DE=", + "pom": "sha256-/sBelw8jmtqEcfTqPwYRwDb7zHxD886qnl575vMhe7E=" + }, + "net/minidev#json-smart/2.4.10": { + "jar": "sha256-cMq16UiGMNxjGx/G5/pVDZXN3Rm6FNs5zsp8q/vU5a4=", + "pom": "sha256-qVnWK1dC8NmRu3zF15fvmHgT6U3pORcAzw2N9v0hOSs=" + }, "net/sf/kosmosfs#kfs/0.3": { "jar": "sha256-GAfL/7bIh2z0QLj310j/9JzqQN3S0EK7tiuuPIe6iEI=", "pom": "sha256-vh1i+xebfsSFJ1HqBmd9ZgUt9fwBwur8eUUudaXBZfg=" @@ -553,10 +1161,6 @@ "net/sf/launch4j#launch4j/3.14/workdir-linux64": { "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY=" }, - "net/sf/sevenzipjbinding#sevenzipjbinding-all-platforms/16.02-2.01": { - "jar": "sha256-cvq1Op0x4W1lP+H0AAEdAqf2vGqR6GNLXPrVzhXUZ7s=", - "pom": "sha256-u3FCxepITF/phCbcFezhuYu/3UZTRWqI2idCHXJnAmU=" - }, "net/sf/sevenzipjbinding#sevenzipjbinding/16.02-2.01": { "jar": "sha256-Ezyj9pyMc12Jl8CUd1BPSKny5h6ntwSzcUqQZrHvuI4=", "pom": "sha256-pdF4WGwNvc4V3cKlKBaE04ek8jW10bklWzls7TaWhcE=" @@ -577,9 +1181,6 @@ "org/apache#apache/13": { "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" }, - "org/apache#apache/16": { - "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" - }, "org/apache#apache/17": { "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8=" }, @@ -595,22 +1196,32 @@ "org/apache#apache/23": { "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, "org/apache#apache/31": { "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, "org/apache#apache/4": { "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" }, "org/apache#apache/9": { "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, "org/apache/commons#commons-compress/1.20": { "jar": "sha256-CutiXJSMaX6nsgUVbhEjY7We1eJVEhLNTkYL23LHwG4=", "pom": "sha256-2VZ4469WsXx9ts/5ZF761etZvp88HKqvXwFG7fBGkdc=" }, - "org/apache/commons#commons-lang3/3.12.0": { - "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", - "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + "org/apache/commons#commons-lang3/3.14.0": { + "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" }, "org/apache/commons#commons-parent/11": { "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" @@ -621,9 +1232,6 @@ "org/apache/commons#commons-parent/34": { "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" }, - "org/apache/commons#commons-parent/39": { - "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" - }, "org/apache/commons#commons-parent/42": { "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" }, @@ -636,9 +1244,15 @@ "org/apache/commons#commons-parent/52": { "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, "org/apache/commons#commons-parent/69": { "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" }, + "org/apache/commons#commons-parent/71": { + "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" + }, "org/apache/commons#commons-vfs2-project/2.3": { "pom": "sha256-esuoQCmKFoMHNgZkPcGX0+XwIoOrIMuUyLbjB18pU7E=" }, @@ -709,6 +1323,27 @@ "org/apache/httpcomponents#project/7": { "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM=" }, + "org/apache/logging#logging-parent/10.5.0": { + "pom": "sha256-ngk5zAKXfp/1KOdmBj4PMiTTbok7pMkh8JINtI86xqk=" + }, + "org/apache/logging/log4j#log4j-1.2-api/2.22.1": { + "jar": "sha256-mgJbJNffQl57IlkCdFRt+OsLBAzLOv84VvmiZvp4f9g=", + "pom": "sha256-W1sfYKOspQc8xMBTwEQlexBENzEaXGHgGCynDiZ2DUE=" + }, + "org/apache/logging/log4j#log4j-api/2.22.1": { + "jar": "sha256-XXvq5/8V2FFtZRcSHX8Sp5pqwYDfZLX87FXVviEFblM=", + "pom": "sha256-bVdUd3E5Sz7hj57T7/ohWXGeLzY0Ynhj0FAjup/Y4Ys=" + }, + "org/apache/logging/log4j#log4j-bom/2.22.1": { + "pom": "sha256-nxUjceNriy6m6yyb0YgnYAafNhgKbygXfmpIwoFMDyM=" + }, + "org/apache/logging/log4j#log4j-core/2.22.1": { + "jar": "sha256-RtzOysVWYj2OLOhkhJaCSoKVHROQYqTmEUiv8aJe0Y0=", + "pom": "sha256-HPf2SP7UPwv6wzKNk/yCPHSZB4/XkE4YtlSbsQeKnFI=" + }, + "org/apache/logging/log4j#log4j/2.22.1": { + "pom": "sha256-7Zibb7CaJW69TP3MIZaIuhw9beS087UUVC0WVj3CkJc=" + }, "org/apache/pdfbox#fontbox/2.0.27": { "jar": "sha256-3HQphoqvPTE8Ukuaq4RqQF6Jykkn81diyk0aYLzh1/Q=", "pom": "sha256-q/mNDGhURYJaBs5q6wDrs1qRkgrhnO1GEl1afhAoMQY=" @@ -720,13 +1355,13 @@ "org/apache/pdfbox#pdfbox-parent/2.0.27": { "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po=" }, - "org/bouncycastle#bcpkix-jdk15on/1.70": { - "jar": "sha256-5bnLgh31f3CwWTNY6JwOjXJmUV2p0IivbGRvY9QzwHw=", - "pom": "sha256-bqVQK37r7HAYJxu4qCy4Gb9MHytlQ1ScXP2E1qE5lr8=" + "org/bouncycastle#bcpkix-jdk18on/1.76": { + "jar": "sha256-k1o4iFTDKfmm8ycI8wyQBF0vkSlPpocoEnMUXUz5g0o=", + "pom": "sha256-9iHsfqzNMj59L7yvD/2HIM9uqEKmXCvTDoMFiJEslG4=" }, - "org/bouncycastle#bcprov-ext-jdk15on/1.70": { - "jar": "sha256-XYGfO4hZfsaAyUFRoLoKOv/wwMHJmbWwZaZ8mYo+Phs=", - "pom": "sha256-349vD7+aZoBvsV+M/E40S1fEdgoiYpAIbKuLkb4X4m8=" + "org/bouncycastle#bcprov-ext-jdk18on/1.76": { + "jar": "sha256-KdZsEtOSFaKlY1+GskU+D59vP+MvQtzlN4++A21ZX7Q=", + "pom": "sha256-cGnxBvIKBvQFHbfJZ0Q2f3GOHEtbpDyLVX3nkhO/yJ4=" }, "org/bouncycastle#bcprov-jdk15on/1.52": { "jar": "sha256-DcTRgeTTR4k8LdvS5s1dcof8ZRwDZI+mSyNBxzZrF3M=", @@ -736,13 +1371,13 @@ "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" }, - "org/bouncycastle#bcprov-jdk15on/1.70": { - "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", - "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" + "org/bouncycastle#bcprov-jdk18on/1.76": { + "jar": "sha256-/ahdd3qq4WgBWGCyOnfK2bjTodXJBP2odTE0J71WAXk=", + "pom": "sha256-FTAJWS07j4NJ+XuPFTi+8MgzQbAmkYojJ9rOIjNP/ug=" }, - "org/bouncycastle#bcutil-jdk15on/1.70": { - "jar": "sha256-UtxVUbAldmZSbFCVQkVn/tfcewDSsbp71SKYQRESsdA=", - "pom": "sha256-nrrnHCXgyfLNdWADwB8a0Pw5jKBvvNoNF15xysWECq0=" + "org/bouncycastle#bcutil-jdk18on/1.76": { + "jar": "sha256-GmWtApWCI6PzE3O9cu6pQsr9Gxh3o+0LSSwkh+d8PCc=", + "pom": "sha256-3l7TyhGMaT0ZDFxG2J4DgLtdd6zYpDtRkEA+dkg/ge0=" }, "org/checkerframework#checker-qual/3.12.0": { "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", @@ -754,9 +1389,22 @@ "module": "sha256-EC7EgMhtWlEqb6BEgroCeX+kiwiSJ3cRBLgsRFGapDw=", "pom": "sha256-70TDGulmr9RNMXge4m7zviQm1UITPeVC10lBGOagAjE=" }, + "org/checkerframework#checker-qual/3.32.0": { + "jar": "sha256-tm4CXaCmv4Xwt/X9rcqDKjJ3H4WhLKwUAaPAzY/XPM0=", + "module": "sha256-zN7Nqhqu63g5UfanwY3Bk5XC4qXn93RQ1we41i6H3k8=", + "pom": "sha256-eVqIZSpu3vocMP26soASnkGDsaz5lKx0vkPz64qnfc8=" + }, + "org/checkerframework#checker-qual/3.33.0": { + "jar": "sha256-4xYlW7/Nn+UNFlMUuFq7KzPLKmapPEkdtkjkmKgsLeE=", + "module": "sha256-6FIddWJdQScsdn0mKhU6wWPMUFtmZEou9wX6iUn/tOU=", + "pom": "sha256-9VqSICenj92LPqFaDYv+P+xqXOrDDIaqivpKW5sN9gM=" + }, "org/codehaus#codehaus-parent/3": { "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" }, + "org/codehaus/groovy#groovy-bom/3.0.19": { + "pom": "sha256-E+POc+1L+fxu4rVA2FVWh/astwf4SSOUFMgnfUMd7KE=" + }, "org/codehaus/jackson#jackson-core-asl/1.9.13": { "jar": "sha256-RAqctcqVshX5U9OiCmsaENofCbUpqd3qX4pJBd2rT1o=", "pom": "sha256-95Xcr5QSdPZanVRaSSanQtCygttPLrGUADBgyvvv2QA=" @@ -765,20 +1413,43 @@ "jar": "sha256-dOegenby7breKTEqWi68z6AZEovAIezjhW12GX6b4MI=", "pom": "sha256-MPLZHeJHhRcjaODaGKh5cQLHWZqJdmuhf+YzDCQMy/4=" }, + "org/codehaus/mojo#animal-sniffer-annotations/1.23": { + "jar": "sha256-n/5Sa/Q6Y0jp2LM7nNb1gKf17tDPBVkTAH7aJj3pdNA=", + "pom": "sha256-VhDbBrczZBrLx6DEioDEAGnbYnutBD+MfI16+09qPSc=" + }, "org/codehaus/mojo#animal-sniffer-annotations/1.9": { "jar": "sha256-zZb+60fzSyVZcEcV23sXmgOjch+dxAksNFxxjim0LeQ=", "pom": "sha256-/nEJDiNXjdGapqj+9Rhvz6WPSPgHBnKprIlFhis7fz0=" }, + "org/codehaus/mojo#animal-sniffer-parent/1.23": { + "pom": "sha256-a38FSrhqh/jiWZ81gIsJiZIuhrbKsTmIAhzRJkCktAQ=" + }, "org/codehaus/mojo#animal-sniffer-parent/1.9": { "pom": "sha256-nyDSRN5e5OZQmbJ3tpiE7xr4EROcAJcl3TzPqPsaxjs=" }, "org/codehaus/mojo#mojo-parent/28": { "pom": "sha256-WrbfH5JfxhOX3y0XNSu8mK8UZOhT7SF+CeU9IKMm9wc=" }, + "org/codehaus/mojo#mojo-parent/74": { + "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM=" + }, + "org/conscrypt#conscrypt-openjdk-uber/2.5.2": { + "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=", + "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, "org/eclipse/jdt#core/3.1.1": { "jar": "sha256-+eOc9zJrYNHTAW7ZD63ASfcdMSyXqpfLqvhR1jdnMLo=", "pom": "sha256-thSFD4+KUKt1m1nJIZqv+xxbzz7yQMbE0eFjN/9ZJao=" }, + "org/eclipse/jetty#jetty-bom/9.4.53.v20231009": { + "pom": "sha256-+vlzoZh0JmzQhlsCmeup8WfLsHB13U/tvj1hVjV+ndU=" + }, "org/eclipse/jgit#org.eclipse.jgit-parent/6.0.0.202111291000-r": { "pom": "sha256-KlNYEM2GhoEaaT0au4sQGRE1bfRlhdxpD0TNNGx3vwU=" }, @@ -786,33 +1457,41 @@ "jar": "sha256-NSkKqsxiVhMEzQLvjPpbKXqIAHVdfXQk5SlU/MUqEgM=", "pom": "sha256-pRCLLHNdZ7Zfh7f+77kxAUhCax4dAfHdY04zLB2mJUs=" }, - "org/exbin/bined#bined-core/0.2.0": { - "jar": "sha256-V+URrCaEsKKGtEI5NrX6Itc2UJ/MqRLLgFmvYGKktAM=", - "pom": "sha256-Jl0xEBR+SbRNns8W4cQdbQMItCvteFcuhav7DPWQiwM=" + "org/exbin/auxiliary#binary_data-paged/0.2.1": { + "jar": "sha256-hrQsuJaXv56m0J6UYUjGil9nNRmZVBARar5RgiYiHgg=", + "pom": "sha256-hlRKJbEI0whPUNFB17aamkTAaevd2lptKraq3BsX/sM=" }, - "org/exbin/bined#bined-extended/0.2.0": { - "jar": "sha256-zSqJKG0pQ09mz7/mYXWT8CG8QE7xqOUqwpF8QtBhYA8=", - "pom": "sha256-zWZRTzYvH/3JLQPSf4dL+2hmD2lx+5d79jO4LLz1MLY=" + "org/exbin/auxiliary#binary_data/0.2.1": { + "jar": "sha256-KHLdfwFwKe7K4e+6WK/Y8TtZmfILLXpwC/+wGe3rIXU=", + "pom": "sha256-cKKzkvsi9Wu4nFtboqlVD1oR9W0Iw/49tGoVUz4qZgU=" }, - "org/exbin/bined#bined-highlight-swing/0.2.0": { - "jar": "sha256-mInT2MV+iH3NP063uXwjAb5TKumnNnqZa7lv8nutGG8=", - "pom": "sha256-yS9O78KNIZ5Z1GsxQCimeidtrHwmMHOP1YybD81FznA=" + "org/exbin/bined#bined-core/0.2.1": { + "jar": "sha256-V8Zi/yltzudxUW8z4Q64xqXrmxtirHLImlOOjYN/Qt4=", + "pom": "sha256-ArlTnv30BNGe0EAImfsW47RFSXIdRBPE3T8NJ4mHols=" }, - "org/exbin/bined#bined-operation-swing/0.2.0": { - "jar": "sha256-RTyGSbiv+h2dTmC7ob/Y0gKa9/IWweTZhiBH3sWFQC0=", - "pom": "sha256-VX1ftIJE/Jr4ld421jJvS0f5t6gHDUMode6l/9bdTyc=" + "org/exbin/bined#bined-extended/0.2.1": { + "jar": "sha256-zI3bMximn51QCmBNdBxnrwtvxAf8D8zzH6decd10S8A=", + "pom": "sha256-Bw93++Ua68eldogvD/raSrnuw4m6na2TUPQpwbFgD1A=" }, - "org/exbin/bined#bined-operation/0.2.0": { - "jar": "sha256-rFVLd5DdXoFzEoGkohFvYk902VQNs5hq/AT07EQppag=", - "pom": "sha256-o1y6AYkmzfs0pveozWSz8idrPNDHU2Nr7O8CyD2PxU0=" + "org/exbin/bined#bined-highlight-swing/0.2.1": { + "jar": "sha256-imLpd3jYhBi/6p7B+0xVAL4DBXZKttrRe3zRn120qkg=", + "pom": "sha256-+h9PY7ZMpk1f/aTppOv+H3jZPnHhRKgEOfaKOLNkm/A=" }, - "org/exbin/bined#bined-swing-extended/0.2.0": { - "jar": "sha256-FslY+vbzPtW+OytscgHfI1FHIdIl1X4CubCd1yyXIys=", - "pom": "sha256-h/WxZiFbKaoAZH2uVaC8P8b8SmcLpCqlHe3Djtz5YA8=" + "org/exbin/bined#bined-operation-swing/0.2.1": { + "jar": "sha256-W86xnZdd+QwMBtLBCfrLNc3Pfc9f22tPRuL9ZpQxYaM=", + "pom": "sha256-Yd1YChfo99RriJR8mbBrITv8twmRmJZImgR1VmeKPOM=" }, - "org/exbin/bined#bined-swing/0.2.0": { - "jar": "sha256-9az+O66PgOCt3LGWTDqdRfjk7njp+6/z+bNIvAKA8NY=", - "pom": "sha256-EcPobxsauuBDTGvaia9bDEBHyNzGYEsfN6QK4UNs+ho=" + "org/exbin/bined#bined-operation/0.2.1": { + "jar": "sha256-xwCLqoH5wDRYluFnxjgL8vFl6dZiLYKFkTtiGqNJKq4=", + "pom": "sha256-KcLNRZ0lASxfY6qlETPNE5oi/db6+QBLLf8QaD9ob9k=" + }, + "org/exbin/bined#bined-swing-extended/0.2.1": { + "jar": "sha256-pjSlaelSrdddQXoV/YobVFPuifBBaTc/+kMwO7VO1Ig=", + "pom": "sha256-CUHcanE/2Kuupq59YJDGmiV9sVzuNqpgcooDh9Ljv5g=" + }, + "org/exbin/bined#bined-swing/0.2.1": { + "jar": "sha256-uAI2FCXqNOP6XsoLiRLWjutzBcwsM6hU5fERpqE5e0Y=", + "pom": "sha256-VI8AQtjmm7ubBE9v3lsTrw6cHrcxwFFWuDP+Zt6n5AI=" }, "org/glassfish#glassfish-parent/10.0-b28": { "pom": "sha256-2DdvCwd5g3hYi0THaFhNWgg2IC/r1bthQV69NHlUhJw=" @@ -841,42 +1520,83 @@ "org/hamcrest#hamcrest-parent/1.3": { "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" }, - "org/jetbrains#annotations/20.1.0": { - "jar": "sha256-7cjj7JeWpfQcGuRLLTGFB+5qwSEvEh2T0zaZs9Cv9jg=", - "pom": "sha256-RKoM0kV47KB8dgMdQsQv+8rmHOwxMFdeIxlparBUgQQ=" + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains#annotations/23.0.0": { - "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", - "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" + "org/jetbrains#annotations/24.0.1": { + "jar": "sha256-YWZtvOfkLmyFtDwE/PuCk6Idy1WzyA6GknDOQsAaazU=", + "pom": "sha256-mb7eKcAzHBlS7uBL+ZeN5TWpDJfi3v/6XgCTNRcZJbA=" + }, + "org/jetbrains#annotations/25.0.0": { + "jar": "sha256-nAoVKCQNH3Mr/qwYLhJudurS5t+hV/GtjjyJGxkoFTg=", + "module": "sha256-fO4TLOY6T5RuLOK3fmFl2m7AMtSvGsJzGdGsCvUq0fk=", + "pom": "sha256-uuyLRILZFgoxmWGrhrBQdjKo5V1Uv/rX0rQkB6ri5pw=" }, "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.7.10": { - "jar": "sha256-GfEC7+lin46rxjhTrRXFM+R8R/kfygkoXFvehuWfkdQ=", - "pom": "sha256-EBHGO4julM3/XVlpNzB1WbxVA3tzPMAM5jzaPPrgqOs=" + "org/jetbrains/kotlin#kotlin-reflect/1.9.10": { + "jar": "sha256-ioNfUXY1UINmiv8O1u71s+sDDhDolnntPutwP9LVuQA=", + "pom": "sha256-6VNknBeNIuD+9U3JC3M/23UBAXJP5F1qnV+UsSmDEho=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.7.10": { - "jar": "sha256-53H+dCUKlD6PY0ZxMgH/HYy5XDpdGpGiK2Wp4E9qiQE=", - "pom": "sha256-bMDPWivALe4GDruQw1Nfw929ejurIQrOPhQqr4F2TYE=" + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" }, - "org/jetbrains/pty4j#pty4j/0.12.3": { - "jar": "sha256-j0VqkehguhKfPlwOlM6/WEmqN8pAEanXSYOaZjL6xrs=", - "module": "sha256-G7L2GjoEPAQaUDGEZOrzptK+J/JkNTeK/F1My2uZlb0=", - "pom": "sha256-GValtB7ec6dC0Tu8vBFZXaZdQJaAleM342qSi4vjbb4=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": { + "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=", + "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=", + "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM=" + }, + "org/jetbrains/pty4j#pty4j/0.12.35": { + "jar": "sha256-XMlLTyWRkTerRDwdticVB9pZlESLGELOBynZBsFImwA=", + "module": "sha256-CfCYdYzRcrVP+iFYFC9pMi+ehIX7HnP7SaG1tBz9Fd4=", + "pom": "sha256-rLLO0RQLfMjrcTjsCWBMqoQScunRA1ARQXKXkpjDauw=" }, "org/jmdns#jmdns/3.5.5": { "jar": "sha256-iUyFKyYAHjuxrQ9pFec3BqpZBjftXXMbZSoUYYZQRzc=", "pom": "sha256-bQIQbpkKWGMuq2ujjSce09Gei6OubT8uM113G2FW8hY=" }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, "org/junit#junit-bom/5.10.2": { "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" }, - "org/junit#junit-bom/5.7.1": { - "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", - "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + "org/junit#junit-bom/5.11.0-M2": { + "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", + "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" }, "org/mortbay/jetty#jetty-parent/7": { "pom": "sha256-AXPY2/7SuKsqWza2CKnFCeoKP7tPrKZ85wZ2gMiVBmo=" @@ -959,6 +1679,17 @@ "jar": "sha256-ch6stVl0/BuFz+GfRtjgRgTUDYNr1lxxoKpHf/RLumI=", "pom": "sha256-w6qSGYiYuDuLy3mWDXJSX+uMKiOI1lfjBw/iW8yZSCM=" }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm/9.3": { + "jar": "sha256-EmM2m1ninJQ5GN4R1tYVLi7GCFzmPlcQUW+MZ9No5Lw=", + "pom": "sha256-jqwH4p+K6oOoFW17Kfo2j26/O+z7IJyaGsNqvZBhI+A=" + }, + "org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" + }, "org/slf4j#slf4j-api/1.7.25": { "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" }, @@ -970,6 +1701,13 @@ "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" }, + "org/slf4j#slf4j-api/2.0.9": { + "jar": "sha256-CBiTDcjX3rtAMgRhFpHaWOSdQsULb/z9zgLa23w8K2w=", + "pom": "sha256-nDplT50KoaNLMXjr5TqJx2eS4dgfwelznL6bFhBSM4U=" + }, + "org/slf4j#slf4j-bom/2.0.9": { + "pom": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM=" + }, "org/slf4j#slf4j-parent/1.7.25": { "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" }, @@ -979,6 +1717,9 @@ "org/slf4j#slf4j-parent/1.7.36": { "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" }, + "org/slf4j#slf4j-parent/2.0.9": { + "pom": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U=" + }, "org/sonatype/oss#oss-parent/5": { "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" }, @@ -988,9 +1729,14 @@ "org/sonatype/oss#oss-parent/9": { "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" }, - "org/testng#testng/6.11": { - "jar": "sha256-VdWJesCTOQEO7SBREkMJpxJ5iNgv8GNCKJJtUdo1QPY=", - "pom": "sha256-mLAN2VtnH6U7TZjnzR5+/I2CfNdrEPW0uZjk07XN9JE=" + "org/testng#testng/7.10.2": { + "jar": "sha256-Il/VZEfy5eQ52ztIOnnNnylPrZ81f4NSsS7mo0EeuxU=", + "module": "sha256-AOr53InkDueoM9nIgDjF3v94rH/DhNNyAsQlJwC46Bk=", + "pom": "sha256-1tUdZ4rUzT1bIoBmuguIZ3l28QrQNSH+MEM/JTJGFkc=" + }, + "org/threeten#threetenbp/1.6.8": { + "jar": "sha256-5LHrPZDDilTH8zhP2pV+C1vwtBtAZypErosDy2yHzgY=", + "pom": "sha256-ztMznYANG7wB7mct+A5NqHUgrgKXuarI+MS33aI+SwI=" }, "org/tukaani#xz/1.9": { "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", @@ -1022,14 +1768,17 @@ "jar": "sha256-e4ZgbF9Mdls2MoUwvdJ/nHmW0NK3a1ZjKFEAE8x4cxI=", "pom": "sha256-ANTlWsGt0lnrbokL0oa3cQKjLtuXbou7qglQFLCztns=" }, - "org/yaml#snakeyaml/1.17": { - "jar": "sha256-Vmazb520bwbdWhnXO7/ztYjVlpwPS4hI/eD17ISUMKU=", - "pom": "sha256-2sbaZNJ6+/QXByGGcQTLB3iRGMR9YjhXLP9F1mmNMbc=" + "org/webjars#jquery/3.7.1": { + "jar": "sha256-JiAW3TpVnfh67745KATpv2IHh8kgTAq4Ui1MIx6mUJc=", + "pom": "sha256-RnwtczAljAxt4ZrtKny/Bgo29MT1Jjf6wLNkMJqKpSA=" }, "oro#oro/2.0.8": { "jar": "sha256-4AzNrV3360P97kQjLvZGAr9jgHwtEzp76Dugn9Sa8m4=", "pom": "sha256-mqnf6y6F4dXnkyyHFAaXzswrD63ZM9Z5/UIKLkODGoI=" }, + "servletapi#servletapi/2.3": { + "pom": "sha256-e71KE8Qp8H1NGyGrY9K8XTKTdeXqk9KGvzNJ8RCs4C8=" + }, "tomcat#jasper-compiler/5.5.12": { "jar": "sha256-V2Z7FKEPkc7Y9uw4iBcIuJghH9D6ull8MS/R0cjGwKM=", "pom": "sha256-eZ+lAPzpBrou6E+9mt409mN1p4oUgehMyuSgwdo+pWQ=" @@ -1060,5 +1809,11 @@ "jar": "sha256-02J4xJxQ8f5BwmRBSh9XKmV41US4yokFNZfsucqH9j4=", "pom": "sha256-mVi9bmvcCAJ60U1ztgWICaUTidM0mUiv2d+N7CUu5vk=" } + }, + "https://www.mucommander.com": { + "maven/com/mucommander#sevenzipjbinding-all-platforms/16.02-2.01": { + "jar": "sha256-IQzUnNUHVyqjLGdKFm6VvtbihY7EHG9Tw8I0TcLiarI=", + "pom": "sha256-SL90Ej+qA1eGFy5dnzg1Zj7tFrDkvtIAI4RxMcc6n7k=" + } } } diff --git a/pkgs/by-name/mu/mucommander/package.nix b/pkgs/by-name/mu/mucommander/package.nix index 978d295bfde3..c97b2605e5b2 100644 --- a/pkgs/by-name/mu/mucommander/package.nix +++ b/pkgs/by-name/mu/mucommander/package.nix @@ -2,24 +2,21 @@ lib, stdenv, fetchFromGitHub, - gradle_7, + gradle, makeWrapper, jdk, gsettings-desktop-schemas, }: -let - gradle = gradle_7; -in stdenv.mkDerivation (finalAttrs: { pname = "mucommander"; - version = "1.3.0-1"; + version = "1.5.2-1"; src = fetchFromGitHub { owner = "mucommander"; repo = "mucommander"; rev = finalAttrs.version; - sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw="; + sha256 = "sha256-J1paBXlAGe2eKMg4wvaXTzMIiSMFIJ1XIAaKrfOwQLc="; }; postPatch = '' From aaffd3746011de2b9ecd0b27ad5c15cba5e8ad42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 31 Oct 2024 09:42:00 -0300 Subject: [PATCH 092/369] colloid-icon-theme: 2024-08-31 -> 2024-10-18 Diff: https://github.com/vinceliuice/colloid-icon-theme/compare/2024-08-31...2024-10-18 --- pkgs/data/icons/colloid-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index 4fbfeb0fcc39..25ffaf87b493 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-08-31"; + version = "2024-10-18"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-/eUlc+fnmQZ61qE/JWZDiR0mMPntLOec0nmevJa7lrc="; + hash = "sha256-xpRgOt/FqZSbtOlZKlZS1ILQn6OAwqKAXX3hj41Wo+0="; }; nativeBuildInputs = [ From 2d05627c643040fb69759ab38af9b7d9dc315f8d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 01:50:43 +0900 Subject: [PATCH 093/369] python312Packages.ansitable: fix build --- pkgs/development/python-modules/ansitable/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix index ea6362b605d3..65be3068d7e8 100644 --- a/pkgs/development/python-modules/ansitable/default.nix +++ b/pkgs/development/python-modules/ansitable/default.nix @@ -7,6 +7,7 @@ colored, pytestCheckHook, numpy, + pandas, }: buildPythonPackage rec { @@ -30,6 +31,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook numpy + pandas ]; meta = with lib; { From da9da5f8bd9ab0c76a2900ba46b9a5e8ad62a43d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 01:51:03 +0900 Subject: [PATCH 094/369] python312Packages.ansitable: 0.11.2 -> 0.11.3 --- pkgs/development/python-modules/ansitable/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ansitable/default.nix b/pkgs/development/python-modules/ansitable/default.nix index 65be3068d7e8..e722d504d61f 100644 --- a/pkgs/development/python-modules/ansitable/default.nix +++ b/pkgs/development/python-modules/ansitable/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "ansitable"; - version = "0.11.2"; + version = "0.11.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-MQ6VLjFDt/dEHDK8PbQsBdfzogJCm+pzyVYDbqkDOao="; + hash = "sha256-navayezkSSHgwOysC3fbgTQahRZjIV24JzIAQl+X5Jk="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ colored ]; + dependencies = [ colored ]; pythonImportsCheck = [ "ansitable" ]; From fedfbdbd19e9c74b54dcc2bdf5480a05a08713dc Mon Sep 17 00:00:00 2001 From: Greaka Date: Thu, 31 Oct 2024 17:56:36 +0100 Subject: [PATCH 095/369] factorio: 2.0.12 -> 2.0.13 --- pkgs/by-name/fa/factorio/versions.json | 64 +++++++++++++------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 515cd3d66f00..989b3bea7fd7 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,25 +3,25 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.12.tar.xz" + "factorio_linux_2.0.13.tar.xz" ], - "name": "factorio_alpha_x64-2.0.12.tar.xz", + "name": "factorio_alpha_x64-2.0.13.tar.xz", "needsAuth": true, - "sha256": "e7307263990274f673e45df9d839c7754a49e389e80a01a79217dfec5532b104", + "sha256": "25fc4c8b0c0b63d8024e1e76efda50e6f8348e967e03c2770eb8a867494b9c98", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.12/alpha/linux64", - "version": "2.0.12" + "url": "https://factorio.com/get-download/2.0.13/alpha/linux64", + "version": "2.0.13" }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.12.tar.xz" + "factorio_linux_2.0.13.tar.xz" ], - "name": "factorio_alpha_x64-2.0.12.tar.xz", + "name": "factorio_alpha_x64-2.0.13.tar.xz", "needsAuth": true, - "sha256": "e7307263990274f673e45df9d839c7754a49e389e80a01a79217dfec5532b104", + "sha256": "25fc4c8b0c0b63d8024e1e76efda50e6f8348e967e03c2770eb8a867494b9c98", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.12/alpha/linux64", - "version": "2.0.12" + "url": "https://factorio.com/get-download/2.0.13/alpha/linux64", + "version": "2.0.13" } }, "demo": { @@ -51,51 +51,51 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.12.tar.xz" + "factorio-space-age_linux_2.0.13.tar.xz" ], - "name": "factorio_expansion_x64-2.0.12.tar.xz", + "name": "factorio_expansion_x64-2.0.13.tar.xz", "needsAuth": true, - "sha256": "6a8a776bc67713bf394c100059ce66e718e46d6bebae0bbc63fd6b3356f461ee", + "sha256": "5834dc11791aa24c0edc6ecfdd223f80af9c6842c39be0fb8c3b188463ec0f54", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.12/expansion/linux64", - "version": "2.0.12" + "url": "https://factorio.com/get-download/2.0.13/expansion/linux64", + "version": "2.0.13" }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.12.tar.xz" + "factorio-space-age_linux_2.0.13.tar.xz" ], - "name": "factorio_expansion_x64-2.0.12.tar.xz", + "name": "factorio_expansion_x64-2.0.13.tar.xz", "needsAuth": true, - "sha256": "6a8a776bc67713bf394c100059ce66e718e46d6bebae0bbc63fd6b3356f461ee", + "sha256": "5834dc11791aa24c0edc6ecfdd223f80af9c6842c39be0fb8c3b188463ec0f54", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.12/expansion/linux64", - "version": "2.0.12" + "url": "https://factorio.com/get-download/2.0.13/expansion/linux64", + "version": "2.0.13" } }, "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.12.tar.xz", - "factorio_headless_x64_2.0.12.tar.xz" + "factorio-headless_linux_2.0.13.tar.xz", + "factorio_headless_x64_2.0.13.tar.xz" ], - "name": "factorio_headless_x64-2.0.12.tar.xz", + "name": "factorio_headless_x64-2.0.13.tar.xz", "needsAuth": false, - "sha256": "d2f820e5e27a64414ed13522c4db01c82b3c6323c6380ae0aa75db4f94488d31", + "sha256": "27b36901a39e593adf28418c0286142c6c7a9f83d156963c7369bd405a25c7d1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.12/headless/linux64", - "version": "2.0.12" + "url": "https://factorio.com/get-download/2.0.13/headless/linux64", + "version": "2.0.13" }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.12.tar.xz", - "factorio_headless_x64_2.0.12.tar.xz" + "factorio-headless_linux_2.0.13.tar.xz", + "factorio_headless_x64_2.0.13.tar.xz" ], - "name": "factorio_headless_x64-2.0.12.tar.xz", + "name": "factorio_headless_x64-2.0.13.tar.xz", "needsAuth": false, - "sha256": "d2f820e5e27a64414ed13522c4db01c82b3c6323c6380ae0aa75db4f94488d31", + "sha256": "27b36901a39e593adf28418c0286142c6c7a9f83d156963c7369bd405a25c7d1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.12/headless/linux64", - "version": "2.0.12" + "url": "https://factorio.com/get-download/2.0.13/headless/linux64", + "version": "2.0.13" } } } From 331bd4004649dc479cea10066adbbf6646ae0417 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:12:43 +0100 Subject: [PATCH 096/369] azure-cli: rewrite extensions-tool in python Co-authored-by: Matej Urbas Co-authored-by: Sebastian Kowalak Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-tool.py | 319 +++++++++++++++++++ pkgs/by-name/az/azure-cli/package.nix | 39 +++ 2 files changed, 358 insertions(+) create mode 100644 pkgs/by-name/az/azure-cli/extensions-tool.py diff --git a/pkgs/by-name/az/azure-cli/extensions-tool.py b/pkgs/by-name/az/azure-cli/extensions-tool.py new file mode 100644 index 000000000000..3ba7c3636f40 --- /dev/null +++ b/pkgs/by-name/az/azure-cli/extensions-tool.py @@ -0,0 +1,319 @@ +#!/usr/bin/env python + +import argparse +import base64 +import datetime +import json +import logging +import os +import sys +from dataclasses import asdict, dataclass, replace +from pathlib import Path +from typing import Any, Dict, Iterable, List, Optional, Set, Tuple +from urllib.request import Request, urlopen + +import git +from packaging.version import Version, parse + +INDEX_URL = "https://azcliextensionsync.blob.core.windows.net/index1/index.json" + +logger = logging.getLogger(__name__) + + +@dataclass(frozen=True) +class Ext: + pname: str + version: Version + url: str + hash: str + description: str + + +def _read_cached_index(path: Path) -> Tuple[datetime.datetime, Any]: + with open(path, "r") as f: + data = f.read() + + j = json.loads(data) + cache_date_str = j["cache_date"] + if cache_date_str: + cache_date = datetime.datetime.fromisoformat(cache_date_str) + else: + cache_date = datetime.datetime.min + return cache_date, data + + +def _write_index_to_cache(data: Any, path: Path): + j = json.loads(data) + j["cache_date"] = datetime.datetime.now().isoformat() + with open(path, "w") as f: + json.dump(j, f, indent=2) + + +def _fetch_remote_index(): + r = Request(INDEX_URL) + with urlopen(r) as resp: + return resp.read() + + +def get_extension_index(cache_dir: Path) -> Set[Ext]: + index_file = cache_dir / "index.json" + os.makedirs(cache_dir, exist_ok=True) + + try: + index_cache_date, index_data = _read_cached_index(index_file) + except FileNotFoundError: + logger.info("index has not been cached, downloading from source") + logger.info("creating index cache in %s", index_file) + _write_index_to_cache(_fetch_remote_index(), index_file) + return get_extension_index(cache_dir) + + if ( + index_cache_date + and datetime.datetime.now() - index_cache_date > datetime.timedelta(days=1) + ): + logger.info( + "cache is outdated (%s), refreshing", + datetime.datetime.now() - index_cache_date, + ) + _write_index_to_cache(_fetch_remote_index(), index_file) + return get_extension_index(cache_dir) + + logger.info("using index cache from %s", index_file) + return json.loads(index_data) + + +def _read_extension_set(extensions_generated: Path) -> Set[Ext]: + with open(extensions_generated, "r") as f: + data = f.read() + + parsed_exts = {Ext(**json_ext) for _pname, json_ext in json.loads(data).items()} + parsed_exts_with_ver = set() + for ext in parsed_exts: + ext2 = replace(ext, version=parse(ext.version)) + parsed_exts_with_ver.add(ext2) + + return parsed_exts_with_ver + + +def _write_extension_set(extensions_generated: Path, extensions: Set[Ext]) -> None: + set_without_ver = {replace(ext, version=str(ext.version)) for ext in extensions} + ls = list(set_without_ver) + ls.sort(key=lambda e: e.pname) + with open(extensions_generated, "w") as f: + json.dump({ext.pname: asdict(ext) for ext in ls}, f, indent=2) + + +def _convert_hash_digest_from_hex_to_b64_sri(s: str) -> str: + try: + b = bytes.fromhex(s) + except ValueError as err: + logger.error("not a hex value: %s", str(err)) + raise err + + return f"sha256-{base64.b64encode(b).decode('utf-8')}" + + +def _commit(repo: git.Repo, message: str, files: List[Path]) -> None: + repo.index.add([str(f.resolve()) for f in files]) + if repo.index.diff("HEAD"): + logger.info(f'committing to nixpkgs "{message}"') + repo.index.commit(message) + else: + logger.warning("no changes in working tree to commit") + + +def _filter_invalid(o: Dict[str, Any]) -> bool: + if "metadata" not in o: + logger.warning("extension without metadata") + return False + metadata = o["metadata"] + if "name" not in metadata: + logger.warning("extension without name") + return False + if "version" not in metadata: + logger.warning(f"{metadata['name']} without version") + return False + if "azext.minCliCoreVersion" not in metadata: + logger.warning( + f"{metadata['name']} {metadata['version']} does not have azext.minCliCoreVersion" + ) + return False + if "summary" not in metadata: + logger.info(f"{metadata['name']} {metadata['version']} without summary") + return False + if "downloadUrl" not in o: + logger.warning(f"{metadata['name']} {metadata['version']} without downloadUrl") + return False + if "sha256Digest" not in o: + logger.warning(f"{metadata['name']} {metadata['version']} without sha256Digest") + return False + + return True + + +def _filter_compatible(o: Dict[str, Any], cli_version: Version) -> bool: + minCliVersion = parse(o["metadata"]["azext.minCliCoreVersion"]) + return cli_version >= minCliVersion + + +def _transform_dict_to_obj(o: Dict[str, Any]) -> Ext: + m = o["metadata"] + return Ext( + pname=m["name"], + version=parse(m["version"]), + url=o["downloadUrl"], + hash=_convert_hash_digest_from_hex_to_b64_sri(o["sha256Digest"]), + description=m["summary"].rstrip("."), + ) + + +def _get_latest_version(versions: dict) -> dict: + return max(versions, key=lambda e: parse(e["metadata"]["version"]), default=None) + + +def processExtension( + extVersions: dict, + cli_version: Version, + ext_name: Optional[str] = None, + requirements: bool = False, +) -> Optional[Ext]: + versions = filter(_filter_invalid, extVersions) + versions = filter(lambda v: _filter_compatible(v, cli_version), versions) + latest = _get_latest_version(versions) + if not latest: + return None + if ext_name and latest["metadata"]["name"] != ext_name: + return None + if not requirements and "run_requires" in latest["metadata"]: + return None + + return _transform_dict_to_obj(latest) + + +def _diff_sets( + set_local: Set[Ext], set_remote: Set[Ext] +) -> Tuple[Set[Ext], Set[Ext], Set[Tuple[Ext, Ext]]]: + local_exts = {ext.pname: ext for ext in set_local} + remote_exts = {ext.pname: ext for ext in set_remote} + only_local = local_exts.keys() - remote_exts.keys() + only_remote = remote_exts.keys() - local_exts.keys() + both = remote_exts.keys() & local_exts.keys() + return ( + {local_exts[pname] for pname in only_local}, + {remote_exts[pname] for pname in only_remote}, + {(local_exts[pname], remote_exts[pname]) for pname in both}, + ) + + +def _filter_updated(e: Tuple[Ext, Ext]) -> bool: + prev, new = e + return prev != new + + +def main() -> None: + sh = logging.StreamHandler(sys.stderr) + sh.setFormatter( + logging.Formatter( + "[%(asctime)s] [%(levelname)8s] --- %(message)s (%(filename)s:%(lineno)s)", + "%Y-%m-%d %H:%M:%S", + ) + ) + logging.basicConfig(level=logging.INFO, handlers=[sh]) + + parser = argparse.ArgumentParser( + prog="azure-cli.extensions-tool", + description="Script to handle Azure CLI extension updates", + ) + parser.add_argument( + "--cli-version", type=str, help="version of azure-cli (required)" + ) + parser.add_argument("--extension", type=str, help="name of extension to query") + parser.add_argument( + "--cache-dir", + type=Path, + help="path where to cache the extension index", + default=Path(os.getenv("XDG_CACHE_HOME", Path.home() / ".cache")) + / "azure-cli-extensions-tool", + ) + parser.add_argument( + "--requirements", + action=argparse.BooleanOptionalAction, + help="whether to list extensions that have requirements", + ) + parser.add_argument( + "--commit", + action=argparse.BooleanOptionalAction, + help="whether to commit changes to git", + ) + args = parser.parse_args() + + repo = git.Repo(Path(".").resolve(), search_parent_directories=True) + + index = get_extension_index(args.cache_dir) + assert index["formatVersion"] == "1" # only support formatVersion 1 + extensions_remote = index["extensions"] + + cli_version = parse(args.cli_version) + + extensions_remote_filtered = set() + for _ext_name, extension in extensions_remote.items(): + extension = processExtension(extension, cli_version, args.extension) + if extension: + extensions_remote_filtered.add(extension) + + extension_file = ( + Path(repo.working_dir) / "pkgs/by-name/az/azure-cli/extensions-generated.json" + ) + extensions_local = _read_extension_set(extension_file) + extensions_local_filtered = set() + if args.extension: + extensions_local_filtered = filter( + lambda ext: args.extension == ext.pname, extensions_local + ) + else: + extensions_local_filtered = extensions_local + + removed, init, updated = _diff_sets( + extensions_local_filtered, extensions_remote_filtered + ) + updated = set(filter(_filter_updated, updated)) + + logger.info("initialized extensions:") + for ext in init: + logger.info(f" {ext.pname} {ext.version}") + logger.info("removed extensions:") + for ext in removed: + logger.info(f" {ext.pname} {ext.version}") + logger.info("updated extensions:") + for prev, new in updated: + logger.info(f" {prev.pname} {prev.version} -> {new.version}") + + for ext in removed: + extensions_local.remove(ext) + # TODO: Add additional check why this is removed + # TODO: Add an alias to extensions manual? + commit_msg = f"azure-cli-extensions.{ext.pname}: remove" + _write_extension_set(extension_file, extensions_local) + if args.commit: + _commit(repo, commit_msg, [extension_file]) + + for ext in init: + extensions_local.add(ext) + commit_msg = f"azure-cli-extensions.{ext.pname}: init at {ext.version}" + _write_extension_set(extension_file, extensions_local) + if args.commit: + _commit(repo, commit_msg, [extension_file]) + + for prev, new in updated: + extensions_local.remove(prev) + extensions_local.add(new) + commit_msg = ( + f"azure-cli-extension.{prev.pname}: {prev.version} -> {new.version}" + ) + _write_extension_set(extension_file, extensions_local) + if args.commit: + _commit(repo, commit_msg, [extension_file]) + + +if __name__ == "__main__": + main() diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index a9167380ccaf..7f05a9e75e0b 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -10,6 +10,11 @@ python3, writeScriptBin, + black, + isort, + mypy, + makeWrapper, + # Whether to include patches that enable placing certain behavior-defining # configuration files in the Nix store. withImmutableConfig ? true, @@ -387,6 +392,40 @@ py.pkgs.toPythonApplication ( echo "Extension was saved to \"extensions-generated.nix\" file." echo "Move it to \"{nixpkgs}/pkgs/by-name/az/azure-cli/extensions-generated.nix\"." ''; + + extensions-tool = + runCommand "azure-cli-extensions-tool" + { + src = ./extensions-tool.py; + nativeBuildInputs = [ + black + isort + makeWrapper + mypy + python3 + ]; + meta.mainProgram = "extensions-tool"; + } + '' + black --check --diff $src + # mypy --strict $src + isort --profile=black --check --diff $src + + install -Dm755 $src $out/bin/extensions-tool + + patchShebangs --build $out + wrapProgram $out/bin/extensions-tool \ + --set PYTHONPATH "${ + python3.pkgs.makePythonPath ( + with python3.pkgs; + [ + packaging + semver + gitpython + ] + ) + }" + ''; }; meta = { From db70925a427d76812894934378d0792a437e4069 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 31 Oct 2024 16:30:03 +0100 Subject: [PATCH 097/369] azure-cli-extensions: transform set to json This was done with the following cursed sed expression: tail -n +3 extensions-generated.nix | sed -e 's/ = mkAzExtension rec / : /g' -e 's/=/:/g' -e 's/;/,/g' -e 's/\([a-zA-Z_][a-zA-Z_0-9-]*\) :/"\1":/g' -e '/^[[:space:]]*"description"/s/.$//' > extensions-generated.json and some cleanup afterwards. Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../az/azure-cli/extensions-generated.json | 1087 +++++++++++++++++ 1 file changed, 1087 insertions(+) create mode 100644 pkgs/by-name/az/azure-cli/extensions-generated.json diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json new file mode 100644 index 000000000000..b289e4bf7ae7 --- /dev/null +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -0,0 +1,1087 @@ +{ + "acat": { + "pname": "acat", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/acat-1.0.0b1-py3-none-any.whl", + "hash": "sha256-nCKOk/3aUxE3um5autK0hXfPWFEuS+De5RzvERJnMno=", + "description": "Microsoft Azure Command-Line Tools Acat Extension" + }, + "account": { + "pname": "account", + "version": "0.2.5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/account-0.2.5-py3-none-any.whl", + "hash": "sha256-C5TfMjrPxI6jFBkEZJEGu4VpUYfb9jqjuESOwSvADCM=", + "description": "Microsoft Azure Command-Line Tools SubscriptionClient Extension" + }, + "acrquery": { + "pname": "acrquery", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/acrquery-1.0.1-py3-none-any.whl", + "hash": "sha256-kJQTek0I8u3ntmLJnfBmXzOKrnvK9Jdr7V1C33VFcfE=", + "description": "Microsoft Azure Command-Line Tools AcrQuery Extension" + }, + "acrtransfer": { + "pname": "acrtransfer", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/acrtransfer-1.1.0-py3-none-any.whl", + "hash": "sha256-ZouU0DQbZjphAhLzGLiZpTvmCuDrWcR+Fi9dq9NINVE=", + "description": "Microsoft Azure Command-Line Tools Acrtransfer Extension" + }, + "ad": { + "pname": "ad", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/ad-0.1.0-py3-none-any.whl", + "hash": "sha256-Yd8jThB1npkWwdRHqwK4JjfeEP2XwxoXJS4fUYOFOIM=", + "description": "Microsoft Azure Command-Line Tools DomainServicesResourceProvider Extension" + }, + "adp": { + "pname": "adp", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/adp-0.1.0-py3-none-any.whl", + "hash": "sha256-/WRRmDL0/TFEMfhxdlB+ECSbjRZVN/gdBcnqUYWuhOw=", + "description": "Microsoft Azure Command-Line Tools Adp Extension" + }, + "aem": { + "pname": "aem", + "version": "0.3.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aem-0.3.0-py2.py3-none-any.whl", + "hash": "sha256-Jar5AGqx0RXXxITP2hya0ONhevbSFA24dJmq6oG2f/g=", + "description": "Manage Azure Enhanced Monitoring Extensions for SAP" + }, + "ai-examples": { + "pname": "ai-examples", + "version": "0.2.5", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/ai_examples-0.2.5-py2.py3-none-any.whl", + "hash": "sha256-utvfX8LgtKhcQSTT/JKFm1gq348w9XJ0QM6BlCFACZo=", + "description": "Add AI powered examples to help content" + }, + "aks-preview": { + "pname": "aks-preview", + "version": "9.0.0b6", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-9.0.0b6-py2.py3-none-any.whl", + "hash": "sha256-NqIV06L9tUuKl37KszDD9zwydGNoyXc2ThH9XLjgiaQ=", + "description": "Provides a preview for upcoming AKS features" + }, + "akshybrid": { + "pname": "akshybrid", + "version": "0.1.2", + "url": "https://hybridaksstorage.z13.web.core.windows.net/HybridAKS/CLI/akshybrid-0.1.2-py3-none-any.whl", + "hash": "sha256-l2fNpETEIVc7wiDgHNWKZ8MKNhdc7bposEVKPG6YOo4=", + "description": "Microsoft Azure Command-Line Tools HybridContainerService Extension" + }, + "alb": { + "pname": "alb", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/alb-1.0.0-py3-none-any.whl", + "hash": "sha256-sCDNjNPaYpncl4SZ2uRSdot2UcPtjgXy8LMhvZuDVNQ=", + "description": "Microsoft Azure Command-Line Tools ALB Extension" + }, + "alertsmanagement": { + "pname": "alertsmanagement", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/alertsmanagement-1.0.0b1-py3-none-any.whl", + "hash": "sha256-4eFa7/GrmyX7gguRTmAs6Ep9AOU4LrB9QT8UktkLCdE=", + "description": "Microsoft Azure Command-Line Tools AlertsManagementClient Extension" + }, + "amg": { + "pname": "amg", + "version": "2.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.4.0-py3-none-any.whl", + "hash": "sha256-YkyoyEfOk+zIOe5CgRXQmyY8Ts58UtoKvvOIk2RREdY=", + "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension" + }, + "amlfs": { + "pname": "amlfs", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amlfs-1.0.0-py3-none-any.whl", + "hash": "sha256-IbWhKUPnJzFSiKoMocSaJYA6ZWt/OIw8Y3WWz99nvR0=", + "description": "Microsoft Azure Command-Line Tools Amlfs Extension" + }, + "apic-extension": { + "pname": "apic-extension", + "version": "1.0.0b5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-1.0.0b5-py3-none-any.whl", + "hash": "sha256-+8ofhEYBMULWdhWbgpL9fC0xdfOeG661xNE/ljcAMlQ=", + "description": "Microsoft Azure Command-Line Tools ApicExtension Extension" + }, + "appservice-kube": { + "pname": "appservice-kube", + "version": "0.1.10", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/appservice_kube-0.1.10-py2.py3-none-any.whl", + "hash": "sha256-f9ctJ+Sw7O2jsrTzAcegwwaP6ouW1w+fyq0UIkDefQ0=", + "description": "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension" + }, + "astronomer": { + "pname": "astronomer", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/astronomer-1.0.0-py3-none-any.whl", + "hash": "sha256-tMpBtdnLd67StGLe1KOSrjzols6NnLlKCGcdDLaBds0=", + "description": "Microsoft Azure Command-Line Tools Astronomer Extension" + }, + "authV2": { + "pname": "authV2", + "version": "0.1.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/authV2-0.1.3-py3-none-any.whl", + "hash": "sha256-6wVjb4x44vg7f0Uv5W9amuSW1pCdw2kkrl+YovtbzkE=", + "description": "Microsoft Azure Command-Line Tools Authv2 Extension" + }, + "automanage": { + "pname": "automanage", + "version": "0.1.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/automanage-0.1.2-py3-none-any.whl", + "hash": "sha256-QjQabP2ss68EM7ELPpvLUibUx/tZcwN4QIqVdmImZVE=", + "description": "Microsoft Azure Command-Line Tools Automanage Extension" + }, + "automation": { + "pname": "automation", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/automation-1.0.0b1-py3-none-any.whl", + "hash": "sha256-0x/gQz+jCm4An3ub7mxBemhu2HUC3Zh7msitETODkVs=", + "description": "Microsoft Azure Command-Line Tools AutomationClient Extension" + }, + "azure-firewall": { + "pname": "azure-firewall", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.2.0-py2.py3-none-any.whl", + "hash": "sha256-VGjMCbjqeRgXa16Vqjwkx62bfRtoxH0Wv1IqBT/YEeg=", + "description": "Manage Azure Firewall resources" + }, + "azurelargeinstance": { + "pname": "azurelargeinstance", + "version": "1.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azurelargeinstance-1.0.0b4-py3-none-any.whl", + "hash": "sha256-b+5Hi9kZkioFMlc/3qO1Qikl03S6ZknqAV1NM5QegZo=", + "description": "Microsoft Azure Command-Line Tools Azurelargeinstance Extension" + }, + "azurestackhci": { + "pname": "azurestackhci", + "version": "0.2.9", + "url": "https://hybridaksstorage.z13.web.core.windows.net/SelfServiceVM/CLI/azurestackhci-0.2.9-py3-none-any.whl", + "hash": "sha256-JVey/j+i+VGieUupZ1VbpUwuk+t1U4FS8hqy+1aP7xY=", + "description": "Microsoft Azure Command-Line Tools AzureStackHCI Extension" + }, + "baremetal-infrastructure": { + "pname": "baremetal-infrastructure", + "version": "3.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/baremetal_infrastructure-3.0.0b2-py3-none-any.whl", + "hash": "sha256-DlhD4pWicFgmLpRf68Qxec4XOsJ+vP5EVrRmt6y5wiA=", + "description": "Microsoft Azure Command-Line Tools BaremetalInfrastructure Extension" + }, + "bastion": { + "pname": "bastion", + "version": "1.3.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-1.3.0-py3-none-any.whl", + "hash": "sha256-FRqyXU3N4QtGxGk879rx0NWEHhXP4+xkwImqr1XmyMA=", + "description": "Microsoft Azure Command-Line Tools Bastion Extension" + }, + "billing-benefits": { + "pname": "billing-benefits", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/billing_benefits-0.1.0-py3-none-any.whl", + "hash": "sha256-9xJQ0cJmkMwOF1zVybzVnnbHtwG7OkfIJz5M+LzKh44=", + "description": "Microsoft Azure Command-Line Tools BillingBenefits Extension" + }, + "blueprint": { + "pname": "blueprint", + "version": "0.3.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-0.3.2-py3-none-any.whl", + "hash": "sha256-WNODVEbdk+WFsPa1IKLbZVG4qSfjXiXaR0fUz4pMAJs=", + "description": "Microsoft Azure Command-Line Tools Blueprint Extension" + }, + "change-analysis": { + "pname": "change-analysis", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/change_analysis-0.1.0-py3-none-any.whl", + "hash": "sha256-SfF2Ghsa0pFpry7NV5PhDd7Hl+uyYQ58cOGxqyt1Emo=", + "description": "Microsoft Azure Command-Line Tools ChangeAnalysis Extension" + }, + "cli-translator": { + "pname": "cli-translator", + "version": "0.3.0", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/cli_translator-0.3.0-py3-none-any.whl", + "hash": "sha256-nqYWLTf8M5C+Tc5kywXFxYgHAQTz6SpwGrR1RzVlqKk=", + "description": "Translate ARM template to executable Azure CLI scripts" + }, + "compute-diagnostic-rp": { + "pname": "compute-diagnostic-rp", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/compute_diagnostic_rp-1.0.0b1-py3-none-any.whl", + "hash": "sha256-gQ6TzgDH0D322poPr1e5ZvttpYIxH5yudLK34ePEFCM=", + "description": "Microsoft Azure Command-Line Tools ComputeDiagnosticRp Extension" + }, + "confidentialledger": { + "pname": "confidentialledger", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/confidentialledger-1.0.0-py3-none-any.whl", + "hash": "sha256-Ovv0nxDN3dlnVWI2TOInX29w61MY+oW2WNcRseJNyU4=", + "description": "Microsoft Azure Command-Line Tools ConfidentialLedger Extension" + }, + "confluent": { + "pname": "confluent", + "version": "0.6.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/confluent-0.6.0-py3-none-any.whl", + "hash": "sha256-eYfSLg6craKAh6kAv6U0hlUxlB8rv+ln60bJCy4KEr4=", + "description": "Microsoft Azure Command-Line Tools ConfluentManagementClient Extension" + }, + "connectedmachine": { + "pname": "connectedmachine", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-1.0.0b2-py3-none-any.whl", + "hash": "sha256-i4xDQMTGVS44JiIP+5W/YZRHZ1sEaTBLcfqA4uTjHIE=", + "description": "Microsoft Azure Command-Line Tools ConnectedMachine Extension" + }, + "connectedvmware": { + "pname": "connectedvmware", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/connectedvmware-1.2.0-py2.py3-none-any.whl", + "hash": "sha256-tzGoIcYJqui/q34EcLNCuReefgxlSC9KQypg2HpMOV8=", + "description": "Microsoft Azure Command-Line Tools Connectedvmware Extension" + }, + "connection-monitor-preview": { + "pname": "connection-monitor-preview", + "version": "0.1.0", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/connection_monitor_preview-0.1.0-py2.py3-none-any.whl", + "hash": "sha256-mnltUYdXGZDSf+ue/u3eOMGU8T6iHL+ewGExGWv9gh0=", + "description": "Microsoft Azure Command-Line Connection Monitor V2 Extension" + }, + "cosmosdb-preview": { + "pname": "cosmosdb-preview", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.0.1-py2.py3-none-any.whl", + "hash": "sha256-xUABi8XaElLsPj5WRVJlDWrwjzSfP/M5vjmKeYPK8qk=", + "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" + }, + "costmanagement": { + "pname": "costmanagement", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/costmanagement-1.0.0-py3-none-any.whl", + "hash": "sha256-bl4FPQW61q1jBb0CT1HjVeYP3ou2oDNQ39gcJUN9LkU=", + "description": "Microsoft Azure Command-Line Tools CostManagementClient Extension" + }, + "csvmware": { + "pname": "csvmware", + "version": "0.3.0", + "url": "https://github.com/Azure/az-csvmware-cli/releases/download/0.3.0/csvmware-0.3.0-py2.py3-none-any.whl", + "hash": "sha256-37l2fwWsE8di6p3EMnFp5jpcEYeRI1RLIA7bmiyaikI=", + "description": "Manage Azure VMware Solution by CloudSimple" + }, + "custom-providers": { + "pname": "custom-providers", + "version": "0.2.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/custom_providers-0.2.1-py2.py3-none-any.whl", + "hash": "sha256-qZOPCchvpFdePIhyBpCMrBWSCvUoxTfAuZg2KhxD2vc=", + "description": "Microsoft Azure Command-Line Tools Custom Providers Extension" + }, + "customlocation": { + "pname": "customlocation", + "version": "0.1.3", + "url": "https://arcplatformcliextprod.blob.core.windows.net/customlocation/customlocation-0.1.3-py2.py3-none-any.whl", + "hash": "sha256-XjZDWxqB3iXnTnDEXCrJ+YBlE4w1BQ8pIQrkDBhITig=", + "description": "Microsoft Azure Command-Line Tools Customlocation Extension" + }, + "databox": { + "pname": "databox", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/databox-1.1.0-py3-none-any.whl", + "hash": "sha256-e0GmBSHXz2UtTNygUvydLsY3Hz14hOwKdLqafVAB17s=", + "description": "Microsoft Azure Command-Line Tools Databox Extension" + }, + "databricks": { + "pname": "databricks", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-1.0.1-py3-none-any.whl", + "hash": "sha256-VRZddDXNeg3IdYfoL8IC15Kl8oycRDmGVbCkdw0DjDA=", + "description": "Microsoft Azure Command-Line Tools DatabricksClient Extension" + }, + "datadog": { + "pname": "datadog", + "version": "0.1.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-0.1.1-py3-none-any.whl", + "hash": "sha256-mjj9XW0BZG8pnue19o6CrXCIicfQvXLgtraxPlRV6Tc=", + "description": "Microsoft Azure Command-Line Tools MicrosoftDatadogClient Extension" + }, + "datafactory": { + "pname": "datafactory", + "version": "1.0.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-1.0.2-py3-none-any.whl", + "hash": "sha256-6hNOKWO3zfK8vVAkSm8aQR2ne9TbfkLIyPllFjjIKsc=", + "description": "Microsoft Azure Command-Line Tools DataFactoryManagementClient Extension" + }, + "datamigration": { + "pname": "datamigration", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b2-py3-none-any.whl", + "hash": "sha256-iQG1ZkqV5mV4Fpi8Au6UtCl8gqyf36uZ3U8TusHAkj4=", + "description": "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension" + }, + "dataprotection": { + "pname": "dataprotection", + "version": "1.5.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.5.3-py3-none-any.whl", + "hash": "sha256-RnHOieOQZWlfIWJjUN/K1UOL2+/HFM816F7l6rD5ZmE=", + "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension" + }, + "datashare": { + "pname": "datashare", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datashare-0.2.0-py3-none-any.whl", + "hash": "sha256-8agBvQw46y6/nC+04LQ6mEcK57QLvNBesqpZbWlXnJ4=", + "description": "Microsoft Azure Command-Line Tools DataShareManagementClient Extension" + }, + "deploy-to-azure": { + "pname": "deploy-to-azure", + "version": "0.2.0", + "url": "https://github.com/Azure/deploy-to-azure-cli-extension/releases/download/20200318.1/deploy_to_azure-0.2.0-py2.py3-none-any.whl", + "hash": "sha256-+SUIDuerw673M9TGMTFwve2qlWmvG5VCc4O8PFnkzrg=", + "description": "Deploy to Azure using Github Actions" + }, + "desktopvirtualization": { + "pname": "desktopvirtualization", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/desktopvirtualization-1.0.0-py3-none-any.whl", + "hash": "sha256-Oh56jw5Xn6If7XcIWbIcI77IuEidg0phQRaVqakMfNQ=", + "description": "Microsoft Azure Command-Line Tools Desktopvirtualization Extension" + }, + "dev-spaces": { + "pname": "dev-spaces", + "version": "1.0.6", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/dev_spaces-1.0.6-py2.py3-none-any.whl", + "hash": "sha256-cQQYCLJ82dM/2QXFCAyX9hKRgW8t3dbc2y5muftuv1k=", + "description": "Dev Spaces provides a rapid, iterative Kubernetes development experience for teams" + }, + "devcenter": { + "pname": "devcenter", + "version": "6.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-6.0.1-py3-none-any.whl", + "hash": "sha256-JePc3Jy4MkPOsu1qbe3CJ5U8BsthC6lchN3sD3UDIk8=", + "description": "Microsoft Azure Command-Line Tools DevCenter Extension" + }, + "diskpool": { + "pname": "diskpool", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/diskpool-0.2.0-py3-none-any.whl", + "hash": "sha256-muaq6oWhdSnaKk5RwroqulW0smgW1WGOr9D5/cQ7Z7c=", + "description": "Microsoft Azure Command-Line Tools StoragePoolManagement Extension" + }, + "dms-preview": { + "pname": "dms-preview", + "version": "0.15.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dms_preview-0.15.0-py2.py3-none-any.whl", + "hash": "sha256-VWwUXAO41SnY5397NXAvuN44KJFjXoWPkoEX8zaI7pw=", + "description": "Support for new Database Migration Service scenarios" + }, + "dnc": { + "pname": "dnc", + "version": "0.2.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dnc-0.2.1-py3-none-any.whl", + "hash": "sha256-44R0ypsovtXd44jPc9/541BIJQMrA8W/iTDCXK8pICY=", + "description": "Microsoft Azure Command-Line Tools Dnc Extension" + }, + "dns-resolver": { + "pname": "dns-resolver", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dns_resolver-0.2.0-py3-none-any.whl", + "hash": "sha256-HEu4IW5QnC8I+nXEWTDsN3doMm8wy5qxJYQqqTUsbi4=", + "description": "Microsoft Azure Command-Line Tools DnsResolverManagementClient Extension" + }, + "durabletask": { + "pname": "durabletask", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-1.0.0b1-py3-none-any.whl", + "hash": "sha256-16kpspSSjfedgxL79q9yxdko4wTEp7N9rz/3cmZ9+yU=", + "description": "Microsoft Azure Command-Line Tools Durabletask Extension" + }, + "dynatrace": { + "pname": "dynatrace", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-0.1.0-py3-none-any.whl", + "hash": "sha256-ESp+QjRh0bb3w4X+i3O08rhQ4lcMNaVKS7zC6Hr+xmE=", + "description": "Microsoft Azure Command-Line Tools Dynatrace Extension" + }, + "edgeorder": { + "pname": "edgeorder", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/edgeorder-0.1.0-py3-none-any.whl", + "hash": "sha256-GGoG0PhgP34Pru1SluzHO/EJbg1oGs6kLV68zBZwNXs=", + "description": "Microsoft Azure Command-Line Tools EdgeOrderManagementClient Extension" + }, + "edgezones": { + "pname": "edgezones", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/edgezones-1.0.0b1-py3-none-any.whl", + "hash": "sha256-mPG5Yty7B4z7jNEtQKWNAbzDfbRBVw+E4pO6C6UsbAg=", + "description": "Microsoft Azure Command-Line Tools Edgezones Extension" + }, + "elastic": { + "pname": "elastic", + "version": "1.0.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic-1.0.0b3-py3-none-any.whl", + "hash": "sha256-LzrkMNPDTdQAfIxag3SWNWjMI1WIckZCQoEcxaJuLec=", + "description": "Microsoft Azure Command-Line Tools MicrosoftElastic Extension" + }, + "elastic-san": { + "pname": "elastic-san", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-1.0.0b2-py3-none-any.whl", + "hash": "sha256-bS8SR6545DHUg0mJ31gc0hJB0WuXBxv2cvuLce461wI=", + "description": "Microsoft Azure Command-Line Tools ElasticSan Extension" + }, + "eventgrid": { + "pname": "eventgrid", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/eventgrid-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-Ziyio4Hvz4IaFmSP87ie2+IfTpiH4Y/6fuDbuvAzLt4=", + "description": "Microsoft Azure Command-Line Tools EventGrid Command Module" + }, + "express-route-cross-connection": { + "pname": "express-route-cross-connection", + "version": "0.1.1", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/express_route_cross_connection-0.1.1-py2.py3-none-any.whl", + "hash": "sha256-uD9yO6rg6gRVeofzWPohMbrxXUXNOrp6mrQtFOyA3zg=", + "description": "Manage customer ExpressRoute circuits using an ExpressRoute cross-connection" + }, + "firmwareanalysis": { + "pname": "firmwareanalysis", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/firmwareanalysis-1.0.0-py3-none-any.whl", + "hash": "sha256-HD3xRB3nbtsIvtBawnndKwK9b6tooLmkld/X7M4+kss=", + "description": "Microsoft Azure Command-Line Tools Firmwareanalysis Extension" + }, + "fleet": { + "pname": "fleet", + "version": "1.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.4.0-py3-none-any.whl", + "hash": "sha256-HYOpAAyHn/Gpor/y6iMYOrYeNCcT3+22YjRVk7FlhDg=", + "description": "Microsoft Azure Command-Line Tools Fleet Extension" + }, + "fluid-relay": { + "pname": "fluid-relay", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fluid_relay-0.1.0-py3-none-any.whl", + "hash": "sha256-khdmb4E0o44JrtqQXnzIOZQzKlq1Y+yJNbn/bJFWPow=", + "description": "Microsoft Azure Command-Line Tools FluidRelay Extension" + }, + "footprint": { + "pname": "footprint", + "version": "1.0.0", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/footprint-1.0.0-py3-none-any.whl", + "hash": "sha256-SqWSiL9Gz9aFGfH39j0+M68W2AYyuEwoPMcVISkmCyw=", + "description": "Microsoft Azure Command-Line Tools FootprintMonitoringManagementClient Extension" + }, + "front-door": { + "pname": "front-door", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-1.2.0-py3-none-any.whl", + "hash": "sha256-Iyunss0kJA1Ohtgg5fp4oRFDs6Yk7ZU6NFEhBQDt++A=", + "description": "Manage networking Front Doors" + }, + "fzf": { + "pname": "fzf", + "version": "1.0.2", + "url": "https://pahealyfzf.blob.core.windows.net/fzf/fzf-1.0.2-py2.py3-none-any.whl", + "hash": "sha256-hKvu0DtLv6e4wL4I2TZv8wQOIWDfT1pTnw4cngocNZw=", + "description": "Microsoft Azure Command-Line Tools fzf Extension" + }, + "gallery-service-artifact": { + "pname": "gallery-service-artifact", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/gallery_service_artifact-1.0.0b1-py3-none-any.whl", + "hash": "sha256-PzDj6OfmeP2auRsiYfuRijA804JiZQnT8A6G8ZZ3UMY=", + "description": "Microsoft Azure Command-Line Tools GalleryServiceArtifact Extension" + }, + "graphservices": { + "pname": "graphservices", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/graphservices-1.0.0b1-py3-none-any.whl", + "hash": "sha256-iu2jkB6USwOPToErC3CZeY0r2C1V4D54UBelBMFFg+U=", + "description": "Microsoft Azure Command-Line Tools Graphservices Extension" + }, + "guestconfig": { + "pname": "guestconfig", + "version": "0.1.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/guestconfig-0.1.1-py3-none-any.whl", + "hash": "sha256-lINqXSHuEHHNQLFj0sgMMqaoG53IXZE3H35Ps1FB4nM=", + "description": "Microsoft Azure Command-Line Tools GuestConfigurationClient Extension" + }, + "hack": { + "pname": "hack", + "version": "0.4.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/hack-0.4.3-py2.py3-none-any.whl", + "hash": "sha256-+eYARX46n//DI1p7MBdtnwp/TTmsAeo+Jmi8ve5jmKY=", + "description": "Microsoft Azure Command-Line Tools Hack Extension" + }, + "hardware-security-modules": { + "pname": "hardware-security-modules", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/hardware_security_modules-0.2.0-py3-none-any.whl", + "hash": "sha256-rEoQ4sxkpNCBjkj/vN3+tDB91WuIdbwBwCaH1HPJ/ps=", + "description": "Microsoft Azure Command-Line Tools AzureDedicatedHSMResourceProvider Extension" + }, + "hdinsightonaks": { + "pname": "hdinsightonaks", + "version": "1.0.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/hdinsightonaks-1.0.0b3-py3-none-any.whl", + "hash": "sha256-9Um4UQe3uD/2T8+lyQpdfpAKXqLv527smx+BaJ5Yw2U=", + "description": "Microsoft Azure Command-Line Tools Hdinsightonaks Extension" + }, + "healthbot": { + "pname": "healthbot", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthbot-0.1.0-py3-none-any.whl", + "hash": "sha256-kTT60lEVFucUpds0bWOGWvC63wWZrePxwV+soAVVhaM=", + "description": "Microsoft Azure Command-Line Tools HealthbotClient Extension" + }, + "healthcareapis": { + "pname": "healthcareapis", + "version": "0.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/healthcareapis-0.4.0-py3-none-any.whl", + "hash": "sha256-ol19V9T9OtzDdYHQrMHWxqRtzQNRkz7TfPup0avWCXg=", + "description": "Microsoft Azure Command-Line Tools HealthcareApisManagementClient Extension" + }, + "hpc-cache": { + "pname": "hpc-cache", + "version": "0.1.5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/hpc_cache-0.1.5-py2.py3-none-any.whl", + "hash": "sha256-hSy0F6rfCtB+PFFBOFjEE79x6my0m6WCidlXL5o1BQc=", + "description": "Microsoft Azure Command-Line Tools StorageCache Extension" + }, + "image-copy-extension": { + "pname": "image-copy-extension", + "version": "0.2.13", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-0.2.13-py2.py3-none-any.whl", + "hash": "sha256-sNEr88dFAHkNWNmabDJWJUhxLLhyt5QuitSB4nBSGxk=", + "description": "Support for copying managed vm images between regions" + }, + "image-gallery": { + "pname": "image-gallery", + "version": "0.1.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/image_gallery-0.1.3-py2.py3-none-any.whl", + "hash": "sha256-YmDB9L+1idK6BWkxc1ihScqru9SaBI5pMo5EhxaUqs0=", + "description": "Support for Azure Image Gallery" + }, + "import-export": { + "pname": "import-export", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/import_export-1.0.0b1-py3-none-any.whl", + "hash": "sha256-xONvEAMDGmdhWkXNElkr9cEcVLe9lX9sKvkO/LXFF7I=", + "description": "Microsoft Azure Command-Line Tools StorageImportExport Extension" + }, + "informatica": { + "pname": "informatica", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/informatica-1.0.0b1-py3-none-any.whl", + "hash": "sha256-YWaukceOdMAa870erS1igycH4XbqD31dMKXdSF9IJGI=", + "description": "Microsoft Azure Command-Line Tools Informatica Extension" + }, + "init": { + "pname": "init", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/init-0.1.0-py3-none-any.whl", + "hash": "sha256-EXf8KT3BGLRJt2HsLHKNOXVfw5Od6NS/2JzOG/shjoY=", + "description": "Microsoft Azure Command-Line Tools Init Extension" + }, + "internet-analyzer": { + "pname": "internet-analyzer", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/internet_analyzer-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-RWSIGnyQus/YgcYppBgjmAB8iG0JnqiNuX4f8QBTpcQ=", + "description": "Microsoft Azure Command-Line Tools Internet Analyzer Extension" + }, + "ip-group": { + "pname": "ip-group", + "version": "0.1.2", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/ip_group-0.1.2-py2.py3-none-any.whl", + "hash": "sha256-r7otiophKGO2P1BNbP9tVZYQuWHkx33C/Um5/gPsZ6I=", + "description": "Microsoft Azure Command-Line Tools IpGroup Extension" + }, + "k8s-extension": { + "pname": "k8s-extension", + "version": "1.6.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.1-py3-none-any.whl", + "hash": "sha256-QYYdZbnYbgtiKYakmEznphH4e5LaV424wFJ+x0M08yw=", + "description": "Microsoft Azure Command-Line Tools K8s-extension Extension" + }, + "k8s-runtime": { + "pname": "k8s-runtime", + "version": "1.0.4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-1.0.4-py3-none-any.whl", + "hash": "sha256-ruLTAI2BjXg0IUnm8dLHkiq7vkPzI9UebNWMc7HGezo=", + "description": "Microsoft Azure Command-Line Tools K8sRuntime Extension" + }, + "kusto": { + "pname": "kusto", + "version": "0.5.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/kusto-0.5.0-py3-none-any.whl", + "hash": "sha256-z1cp6dAgKaGJGCUjVDKFyXN9UV9BxhDIM41D+HL58B0=", + "description": "Microsoft Azure Command-Line Tools KustoManagementClient Extension" + }, + "log-analytics": { + "pname": "log-analytics", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/log_analytics-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-zNNqjKaXnFSdt9f9eACZB+nnvCsJQ3iF292LEHyxW2Y=", + "description": "Support for Azure Log Analytics query capabilities" + }, + "log-analytics-solution": { + "pname": "log-analytics-solution", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/log_analytics_solution-1.0.1-py2.py3-none-any.whl", + "hash": "sha256-fhBEPehizQwZCQsKDa5emULotIwg46nDMFd42qdW6pY=", + "description": "Support for Azure Log Analytics Solution" + }, + "logic": { + "pname": "logic", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/logic-1.1.0-py3-none-any.whl", + "hash": "sha256-FMGHaMAu6cNwrH7tDyMgbu59NEoQOCowg7F7XhhIz80=", + "description": "Microsoft Azure Command-Line Tools Logic Extension" + }, + "logz": { + "pname": "logz", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/logz-0.1.0-py3-none-any.whl", + "hash": "sha256-apN9u4xadYspr9Rez8EBdDpb8kkfL7pg6OpRLVt2WEA=", + "description": "Microsoft Azure Command-Line Tools MicrosoftLogz Extension" + }, + "maintenance": { + "pname": "maintenance", + "version": "1.6.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-1.6.0-py3-none-any.whl", + "hash": "sha256-Orai2sSLpxsovI7gXSVNqnK2L4TdqVN0n6YhqAyjmuU=", + "description": "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension" + }, + "managedccfs": { + "pname": "managedccfs", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managedccfs-0.2.0-py3-none-any.whl", + "hash": "sha256-N49CXzVCA3PpcDpdyMDwXKgXb7hASzhhDU3oKPfCPTc=", + "description": "Microsoft Azure Command-Line Tools Managedccfs Extension" + }, + "managednetworkfabric": { + "pname": "managednetworkfabric", + "version": "6.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-6.4.0-py3-none-any.whl", + "hash": "sha256-nUEHjgZUqq42pfDyg/Ud6YzENgWCkgU2VCVG7TTKC8Q=", + "description": "Support for managednetworkfabric commands based on 2023-06-15 API version" + }, + "managementpartner": { + "pname": "managementpartner", + "version": "0.1.3", + "url": "https://azurecliprod.blob.core.windows.net/cli-extensions/managementpartner-0.1.3-py2.py3-none-any.whl", + "hash": "sha256-It30sc3HfpkmLLYInE2WBABlgoodOKJwn9uUXTyFGDk=", + "description": "Support for Management Partner preview" + }, + "mdp": { + "pname": "mdp", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-1.0.0b2-py3-none-any.whl", + "hash": "sha256-BirQJtnq95G1koxPt5MUjUDGwpfO4y8XXNOhVesk2T8=", + "description": "Microsoft Azure Command-Line Tools Mdp Extension" + }, + "microsoft-fabric": { + "pname": "microsoft-fabric", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/microsoft_fabric-1.0.0b1-py3-none-any.whl", + "hash": "sha256-i6RQpaPar6i5trbp7oIk9Gj9lyMy6QUADyrMf/AM2bs=", + "description": "Microsoft Azure Command-Line Tools Microsoft Fabric Extension" + }, + "mixed-reality": { + "pname": "mixed-reality", + "version": "0.0.5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mixed_reality-0.0.5-py2.py3-none-any.whl", + "hash": "sha256-AmqvWPmtAtdIN9IaH1wSImSlmBTgt8OVwm5f3BKTGH4=", + "description": "Mixed Reality Azure CLI Extension" + }, + "mobile-network": { + "pname": "mobile-network", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/mobile_network-1.0.0-py3-none-any.whl", + "hash": "sha256-LZVypO1wbfj2JsYgNq0i9GoVsRMnP4/5sGMTo4Cif1Y=", + "description": "Microsoft Azure Command-Line Tools MobileNetwork Extension" + }, + "monitor-control-service": { + "pname": "monitor-control-service", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_control_service-1.2.0-py3-none-any.whl", + "hash": "sha256-MVGjQYRdBTpL5F2bfATh4VuIUDq2sRAWOhK5rub9PNk=", + "description": "Microsoft Azure Command-Line Tools MonitorClient Extension" + }, + "monitor-pipeline-group": { + "pname": "monitor-pipeline-group", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-1.0.0b1-py3-none-any.whl", + "hash": "sha256-zzH54/qUWHFvDD0cFWmO95twfFvX0UZ3PSsq/kLmTCk=", + "description": "Microsoft Azure Command-Line Tools MonitorPipelineGroup Extension" + }, + "multicloud-connector": { + "pname": "multicloud-connector", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-1.0.0b1-py3-none-any.whl", + "hash": "sha256-rYQ1AWKuh3KH+KFRkgs8S9xjdd1BndYQHCcC22BqXRk=", + "description": "Microsoft Azure Command-Line Tools MulticloudConnector Extension" + }, + "network-analytics": { + "pname": "network-analytics", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/network_analytics-1.0.0b1-py3-none-any.whl", + "hash": "sha256-yNfhlfkTKYrAPvjrH41/sJUmlW0+t1CozUR66PYdQxc=", + "description": "Microsoft Azure Command-Line Tools NetworkAnalytics Extension" + }, + "networkcloud": { + "pname": "networkcloud", + "version": "2.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-2.0.0b4-py3-none-any.whl", + "hash": "sha256-BnB6AIQFc5pWOSMPP9CUAxCEpp+GdkhQOu1AOdEYrZ8=", + "description": "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version" + }, + "new-relic": { + "pname": "new-relic", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-1.0.0b1-py3-none-any.whl", + "hash": "sha256-nOafFoTOoUrLoPL9tHPkfgoGdF44O7UUSVTF6F5BYZk=", + "description": "Microsoft Azure Command-Line Tools NewRelic Extension" + }, + "next": { + "pname": "next", + "version": "0.1.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/next-0.1.3-py2.py3-none-any.whl", + "hash": "sha256-g8TgNCfxkCA+CUwU5PfnnOyYnxJ34WuSVruf5oiqXgc=", + "description": "Microsoft Azure Command-Line Tools Next Extension" + }, + "nginx": { + "pname": "nginx", + "version": "2.0.0b6", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-2.0.0b6-py2.py3-none-any.whl", + "hash": "sha256-2U93wSzmlFyCP376hCOOOYta7IeBVrvfMRLw3vHriWA=", + "description": "Microsoft Azure Command-Line Tools Nginx Extension" + }, + "notification-hub": { + "pname": "notification-hub", + "version": "1.0.0a1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/notification_hub-1.0.0a1-py3-none-any.whl", + "hash": "sha256-oDdRtxVwDg0Yo46Ai/7tFkM1AkyWCMS/1TrqzHMdEJk=", + "description": "Microsoft Azure Command-Line Tools Notification Hub Extension" + }, + "nsp": { + "pname": "nsp", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-1.0.0b2-py3-none-any.whl", + "hash": "sha256-/r/OOPxEnapnx62EEOf6JQ9/Oa+1+HBJbOBFu3STW80=", + "description": "Microsoft Azure Command-Line Tools Nsp Extension" + }, + "offazure": { + "pname": "offazure", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/offazure-0.1.0-py3-none-any.whl", + "hash": "sha256-GRiBcHCungzu9XuTNm0Ytui/V3/WMufamZ4eKru1NlY=", + "description": "Microsoft Azure Command-Line Tools AzureMigrateV2 Extension" + }, + "oracle-database": { + "pname": "oracle-database", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-1.0.0b1-py3-none-any.whl", + "hash": "sha256-BYw95sHhA/8MYqGIscYGo1CXpmUst+tsPlt3934VtbE=", + "description": "Microsoft Azure Command-Line Tools OracleDatabase Extension" + }, + "orbital": { + "pname": "orbital", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/orbital-0.1.0-py3-none-any.whl", + "hash": "sha256-Qln7j/VgRA1jJRzJchuz8ig0UvI5kTRRRhH4hvo1Dzc=", + "description": "Microsoft Azure Command-Line Tools Orbital Extension" + }, + "palo-alto-networks": { + "pname": "palo-alto-networks", + "version": "1.1.1b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/palo_alto_networks-1.1.1b1-py3-none-any.whl", + "hash": "sha256-jU9qS3I2a9V3gL0VjWwls2OZnhoT6oXUkYCcyaTSlgg=", + "description": "Microsoft Azure Command-Line Tools PaloAltoNetworks Extension" + }, + "peering": { + "pname": "peering", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/peering-1.0.0-py3-none-any.whl", + "hash": "sha256-/k47qFwfZZZqBZKR5G6+t8lW8o2isVtUGwSSdltiOZI=", + "description": "Microsoft Azure Command-Line Tools PeeringManagementClient Extension" + }, + "portal": { + "pname": "portal", + "version": "0.1.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/portal-0.1.3-py3-none-any.whl", + "hash": "sha256-PD6+I/WdtfLShspSz4z7vFmDzoBzYi3hGjXauVgAqZY=", + "description": "Microsoft Azure Command-Line Tools Portal Extension" + }, + "powerbidedicated": { + "pname": "powerbidedicated", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/powerbidedicated-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-4eWLtvV+3eR5P0xmoMEKJ3b4QhcoeBYjhfKx0hU53m4=", + "description": "Microsoft Azure Command-Line Tools PowerBIDedicated Extension" + }, + "providerhub": { + "pname": "providerhub", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/providerhub-1.0.0b1-py3-none-any.whl", + "hash": "sha256-e5PLfssfo6UgkJ1F5uZZfIun2qxPvBomw95mBDZ43Q0=", + "description": "Microsoft Azure Command-Line Tools ProviderHub Extension" + }, + "purview": { + "pname": "purview", + "version": "0.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/purview-0.1.0-py3-none-any.whl", + "hash": "sha256-cGzCVQ+9B7i2djRcLybFumZVCQW8jsIkxsTlY3xJcmY=", + "description": "Microsoft Azure Command-Line Tools PurviewManagementClient Extension" + }, + "qumulo": { + "pname": "qumulo", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-1.0.0-py3-none-any.whl", + "hash": "sha256-mXP1gKP8IMwv5VWKHP3BDd/GVnmC0S83AIu/7Hqvz5s=", + "description": "Microsoft Azure Command-Line Tools Qumulo Extension" + }, + "quota": { + "pname": "quota", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quota-1.0.0-py3-none-any.whl", + "hash": "sha256-i0w0dd8MNUTbzCjkh161sWPXK0Cv9CUKr9rZQYDD+ZU=", + "description": "Microsoft Azure Command-Line Tools AzureQuotaExtensionAPI Extension" + }, + "redisenterprise": { + "pname": "redisenterprise", + "version": "1.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.0-py3-none-any.whl", + "hash": "sha256-bndtRkr6r2ZFbXuObTarGhLxkFRhdHnqjxNjPTpJ/6w=", + "description": "Microsoft Azure Command-Line Tools RedisEnterprise Extension" + }, + "reservation": { + "pname": "reservation", + "version": "0.3.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/reservation-0.3.1-py3-none-any.whl", + "hash": "sha256-ZJ8IawIwXRQvLwjqlvUqMioWWm8qlY8yh/U1UJOKuRI=", + "description": "Microsoft Azure Command-Line Tools Reservation Extension" + }, + "resource-graph": { + "pname": "resource-graph", + "version": "2.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/resource_graph-2.1.0-py2.py3-none-any.whl", + "hash": "sha256-YsgePWLOYMWgpIWCnQC9sMczFF7pP7YJjBTjsn7ifEA=", + "description": "Support for querying Azure resources with Resource Graph" + }, + "resource-mover": { + "pname": "resource-mover", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/resource_mover-1.0.0b1-py3-none-any.whl", + "hash": "sha256-O8n0GqMMT2vAT/eA3DDo3wW/yIfyrb356J1Z+DieVfM=", + "description": "Microsoft Azure Command-Line Tools ResourceMoverServiceAPI Extension" + }, + "sap-hana": { + "pname": "sap-hana", + "version": "0.6.5", + "url": "https://github.com/Azure/azure-hanaonazure-cli-extension/releases/download/0.6.5/sap_hana-0.6.5-py2.py3-none-any.whl", + "hash": "sha256-tFVMEl86DrXIkc7DludwX26R1NgXiazvIOPE0XL6RUM=", + "description": "Additional commands for working with SAP HanaOnAzure instances" + }, + "scenario-guide": { + "pname": "scenario-guide", + "version": "0.1.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scenario_guide-0.1.1-py3-none-any.whl", + "hash": "sha256-QmS0i0uYAzRIij/bO8QyQegoonQsNc5ImF876/AZ6Pg=", + "description": "Microsoft Azure Command-Line Tools Scenario Guidance Extension" + }, + "scheduled-query": { + "pname": "scheduled-query", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scheduled_query-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-/V5p0EOLgInb4ZfVukxBd2rtkGlBysN0dVpMkETErwQ=", + "description": "Microsoft Azure Command-Line Tools Scheduled_query Extension" + }, + "scvmm": { + "pname": "scvmm", + "version": "1.1.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.1.1-py2.py3-none-any.whl", + "hash": "sha256-fXBFeLxetguBBd4LSpJBdlgaTPL9FisIltgSRvf3Omg=", + "description": "Microsoft Azure Command-Line Tools SCVMM Extension" + }, + "self-help": { + "pname": "self-help", + "version": "0.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/self_help-0.4.0-py3-none-any.whl", + "hash": "sha256-jJA6rxDWy2HmRV9gEN7utJbR4j1odmYgiSZqSUA1hrY=", + "description": "Microsoft Azure Command-Line Tools SelfHelp Extension" + }, + "sentinel": { + "pname": "sentinel", + "version": "0.2.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/sentinel-0.2.0-py3-none-any.whl", + "hash": "sha256-VRFUS040KwOkpCY2F8YD2HRCrVF5zp2MDR/RCRX5O3o=", + "description": "Microsoft Azure Command-Line Tools Sentinel Extension" + }, + "site-recovery": { + "pname": "site-recovery", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/site_recovery-1.0.0-py3-none-any.whl", + "hash": "sha256-qxkULJouBhkLbawnLYzynhecnig/ll+OOk0pJ1uEfOU=", + "description": "Microsoft Azure Command-Line Tools SiteRecovery Extension" + }, + "spring": { + "pname": "spring", + "version": "1.25.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring-1.25.1-py3-none-any.whl", + "hash": "sha256-nrim8vd7Gcn5gJUmu3AQdlkN2zX2suxDHOMYuWzEBzM=", + "description": "Microsoft Azure Command-Line Tools spring Extension" + }, + "spring-cloud": { + "pname": "spring-cloud", + "version": "3.1.8", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/spring_cloud-3.1.8-py3-none-any.whl", + "hash": "sha256-FJk6vjUkwopCsum6DwqKcIMWK6kXSXXgnYzqg0uYKe4=", + "description": "Microsoft Azure Command-Line Tools spring-cloud Extension" + }, + "stack-hci": { + "pname": "stack-hci", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci-1.1.0-py3-none-any.whl", + "hash": "sha256-m7A1D2worCBopaSiC7z3SuNLOS0F6xSMQDxhhSXLre8=", + "description": "Microsoft Azure Command-Line Tools AzureStackHCIClient Extension" + }, + "stack-hci-vm": { + "pname": "stack-hci-vm", + "version": "1.3.0", + "url": "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-1.3.0-py3-none-any.whl", + "hash": "sha256-GVU+UNWcr8wZFmvn6RvkPHJferrh2DOJFPjmBDhT/Ak=", + "description": "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension" + }, + "standbypool": { + "pname": "standbypool", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-1.0.0b1-py3-none-any.whl", + "hash": "sha256-RMA+MgyLSfUjkOPBHWGyWmev7/wY1iuqUiw3MULeDhU=", + "description": "Microsoft Azure Command-Line Tools Standbypool Extension" + }, + "staticwebapp": { + "pname": "staticwebapp", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/staticwebapp-1.0.0-py3-none-any.whl", + "hash": "sha256-+x3Nh2/C2CnMehzFRelEU2TUM1fYiLs97rNqcWuAVxc=", + "description": "Microsoft Azure Command-Line Tools Staticwebapp Extension" + }, + "storage-actions": { + "pname": "storage-actions", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_actions-1.0.0b1-py3-none-any.whl", + "hash": "sha256-B8W+JW7bviyB2DnkxtPZF6Vrk5IVFQKM+WI5PhF2Mxs=", + "description": "Microsoft Azure Command-Line Tools StorageActions Extension" + }, + "storage-blob-preview": { + "pname": "storage-blob-preview", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_blob_preview-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-H/5FHkFlfI8ooiq+44c3HRHO3YDS5Sz8vtCtrAqRe0E=", + "description": "Microsoft Azure Command-Line Tools Storage-blob-preview Extension" + }, + "storage-mover": { + "pname": "storage-mover", + "version": "1.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.1.0-py3-none-any.whl", + "hash": "sha256-fXaKylCqmJeKDZKcRs/+YL9IilJ2ZUhdpjGzNETK4kw=", + "description": "Microsoft Azure Command-Line Tools StorageMover Extension" + }, + "storagesync": { + "pname": "storagesync", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storagesync-1.0.1-py2.py3-none-any.whl", + "hash": "sha256-fyupGnpEdB9DhLRLp86nOooDtdOFtDQEy0lR3S6l3Fo=", + "description": "Microsoft Azure Command-Line Tools MicrosoftStorageSync Extension" + }, + "stream-analytics": { + "pname": "stream-analytics", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-1.0.0-py3-none-any.whl", + "hash": "sha256-FUQ/2Kc9MZpcn7xYbJcn0c4aMeEf0/PH5Py8l60Haqo=", + "description": "Microsoft Azure Command-Line Tools StreamAnalyticsManagementClient Extension" + }, + "subscription": { + "pname": "subscription", + "version": "0.1.5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-0.1.5-py2.py3-none-any.whl", + "hash": "sha256-/3iWrrxGhiptMKxfTPZL3UDLUOVDfOoplZCJbXXxAT4=", + "description": "Support for subscription management preview" + }, + "support": { + "pname": "support", + "version": "2.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/support-2.0.0-py2.py3-none-any.whl", + "hash": "sha256-Xd6X+PsS6qJYUw9o7CyuAKlX8wR5g16fXtBXlAMSdBo=", + "description": "Microsoft Azure Command-Line Tools Support Extension" + }, + "terraform": { + "pname": "terraform", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/terraform-1.0.0b1-py3-none-any.whl", + "hash": "sha256-gP3iuJa3B/2D+DghgJaCB5vTuwMqqcsEug0llbNnPyc=", + "description": "Microsoft Azure Command-Line Tools Terraform Extension" + }, + "timeseriesinsights": { + "pname": "timeseriesinsights", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/timeseriesinsights-1.0.0b1-py3-none-any.whl", + "hash": "sha256-xXiASmz7tO+KuR3iEwu6j2E58vrepO0eOLBepix6qV0=", + "description": "Microsoft Azure Command-Line Tools TimeSeriesInsightsClient Extension" + }, + "traffic-collector": { + "pname": "traffic-collector", + "version": "0.1.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-0.1.3-py3-none-any.whl", + "hash": "sha256-oUSk/aO86E2yIne9hhEISuGuOeC7jHtQYZ7DeHEfV7o=", + "description": "Microsoft Azure Command-Line Tools TrafficCollector Extension" + }, + "trustedsigning": { + "pname": "trustedsigning", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/trustedsigning-1.0.0b2-py3-none-any.whl", + "hash": "sha256-w66GnBNxSTGAue1x2wvcOEK61UyIMr62AHEY0mvtceg=", + "description": "Microsoft Azure Command-Line Tools Trustedsigning Extension" + }, + "virtual-network-manager": { + "pname": "virtual-network-manager", + "version": "1.3.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-1.3.0-py3-none-any.whl", + "hash": "sha256-8W+ZL5j9A8AdzvikD5uE3iNn/56IULSGY6m7HLVbe9Q=", + "description": "Microsoft Azure Command-Line Tools NetworkManagementClient Extension" + }, + "virtual-network-tap": { + "pname": "virtual-network-tap", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_tap-1.0.0b1-py2.py3-none-any.whl", + "hash": "sha256-7l9tz8CfwJ4MO704a007xswfij3ejtVQgE9D7Uw8t7o=", + "description": "Manage virtual network taps (VTAP)" + }, + "virtual-wan": { + "pname": "virtual-wan", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_wan-1.0.1-py2.py3-none-any.whl", + "hash": "sha256-LbbCU9Q4YtBqRSUHPWe2Hx00t8iDIWK9Owv//SS5raY=", + "description": "Manage virtual WAN, hubs, VPN gateways and VPN sites" + }, + "vmware": { + "pname": "vmware", + "version": "7.1.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-7.1.0-py2.py3-none-any.whl", + "hash": "sha256-U9yLHYA814TmaMTU1jDewgOQQGr0YmbfCGD1SKXCH50=", + "description": "Azure VMware Solution commands" + }, + "webapp": { + "pname": "webapp", + "version": "0.4.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/webapp-0.4.0-py2.py3-none-any.whl", + "hash": "sha256-kIsN8HzvZSF2oPK/D9z1i10W+0kD7jwG9z8Ls5E6XA8=", + "description": "Additional commands for Azure AppService" + }, + "workloads": { + "pname": "workloads", + "version": "1.1.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workloads-1.1.0b3-py3-none-any.whl", + "hash": "sha256-pzc7LTdmxDs8rq/A7du0kkKXULYsePdndgubC0I2MgY=", + "description": "Microsoft Azure Command-Line Tools Workloads Extension" + } +} From 692651eafa7f000aeed1d7a777675e232e6b2f89 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:15:32 +0100 Subject: [PATCH 098/369] azure-cli-extensions: consume extensions from json Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../az/azure-cli/extensions-generated.nix | 1090 ----------------- pkgs/by-name/az/azure-cli/package.nix | 20 +- 2 files changed, 11 insertions(+), 1099 deletions(-) delete mode 100644 pkgs/by-name/az/azure-cli/extensions-generated.nix diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.nix b/pkgs/by-name/az/azure-cli/extensions-generated.nix deleted file mode 100644 index 9dbfdb00dc95..000000000000 --- a/pkgs/by-name/az/azure-cli/extensions-generated.nix +++ /dev/null @@ -1,1090 +0,0 @@ -# This file is automatically generated. DO NOT EDIT! Read README.md -{ mkAzExtension }: -{ - acat = mkAzExtension rec { - pname = "acat"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/acat-${version}-py3-none-any.whl"; - sha256 = "9c228e93fdda531137ba6e5abad2b48577cf58512e4be0dee51cef111267327a"; - description = "Microsoft Azure Command-Line Tools Acat Extension"; - }; - account = mkAzExtension rec { - pname = "account"; - version = "0.2.5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/account-${version}-py3-none-any.whl"; - sha256 = "0b94df323acfc48ea3141904649106bb85695187dbf63aa3b8448ec12bc00c23"; - description = "Microsoft Azure Command-Line Tools SubscriptionClient Extension"; - }; - acrquery = mkAzExtension rec { - pname = "acrquery"; - version = "1.0.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/acrquery-${version}-py3-none-any.whl"; - sha256 = "9094137a4d08f2ede7b662c99df0665f338aae7bcaf4976bed5d42df754571f1"; - description = "Microsoft Azure Command-Line Tools AcrQuery Extension"; - }; - acrtransfer = mkAzExtension rec { - pname = "acrtransfer"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/acrtransfer-${version}-py3-none-any.whl"; - sha256 = "668b94d0341b663a610212f318b899a53be60ae0eb59c47e162f5dabd3483551"; - description = "Microsoft Azure Command-Line Tools Acrtransfer Extension"; - }; - ad = mkAzExtension rec { - pname = "ad"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/ad-${version}-py3-none-any.whl"; - sha256 = "61df234e10759e9916c1d447ab02b82637de10fd97c31a17252e1f5183853883"; - description = "Microsoft Azure Command-Line Tools DomainServicesResourceProvider Extension"; - }; - adp = mkAzExtension rec { - pname = "adp"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/adp-${version}-py3-none-any.whl"; - sha256 = "fd64519832f4fd314431f87176507e10249b8d165537f81d05c9ea5185ae84ec"; - description = "Microsoft Azure Command-Line Tools Adp Extension"; - }; - aem = mkAzExtension rec { - pname = "aem"; - version = "0.3.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/aem-${version}-py2.py3-none-any.whl"; - sha256 = "25aaf9006ab1d115d7c484cfda1c9ad0e3617af6d2140db87499aaea81b67ff8"; - description = "Manage Azure Enhanced Monitoring Extensions for SAP"; - }; - ai-examples = mkAzExtension rec { - pname = "ai-examples"; - version = "0.2.5"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/ai_examples-${version}-py2.py3-none-any.whl"; - sha256 = "badbdf5fc2e0b4a85c4124d3fc92859b582adf8f30f5727440ce81942140099a"; - description = "Add AI powered examples to help content"; - }; - aks-preview = mkAzExtension rec { - pname = "aks-preview"; - version = "9.0.0b6"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl"; - sha256 = "36a215d3a2fdb54b8a977ecab330c3f73c32746368c977364e11fd5cb8e089a4"; - description = "Provides a preview for upcoming AKS features"; - }; - akshybrid = mkAzExtension rec { - pname = "akshybrid"; - version = "0.1.2"; - url = "https://hybridaksstorage.z13.web.core.windows.net/HybridAKS/CLI/akshybrid-${version}-py3-none-any.whl"; - sha256 = "9767cda444c421573bc220e01cd58a67c30a36175cedba68b0454a3c6e983a8e"; - description = "Microsoft Azure Command-Line Tools HybridContainerService Extension"; - }; - alb = mkAzExtension rec { - pname = "alb"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/alb-${version}-py3-none-any.whl"; - sha256 = "b020cd8cd3da6299dc978499dae452768b7651c3ed8e05f2f0b321bd9b8354d4"; - description = "Microsoft Azure Command-Line Tools ALB Extension"; - }; - alertsmanagement = mkAzExtension rec { - pname = "alertsmanagement"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/alertsmanagement-${version}-py3-none-any.whl"; - sha256 = "e1e15aeff1ab9b25fb820b914e602ce84a7d00e5382eb07d413f1492d90b09d1"; - description = "Microsoft Azure Command-Line Tools AlertsManagementClient Extension"; - }; - amg = mkAzExtension rec { - pname = "amg"; - version = "2.4.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/amg-${version}-py3-none-any.whl"; - sha256 = "624ca8c847ce93ecc839ee428115d09b263c4ece7c52da0abef38893645111d6"; - description = "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"; - }; - amlfs = mkAzExtension rec { - pname = "amlfs"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/amlfs-${version}-py3-none-any.whl"; - sha256 = "21b5a12943e727315288aa0ca1c49a25803a656b7f388c3c637596cfdf67bd1d"; - description = "Microsoft Azure Command-Line Tools Amlfs Extension"; - }; - apic-extension = mkAzExtension rec { - pname = "apic-extension"; - version = "1.0.0b5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-${version}-py3-none-any.whl"; - sha256 = "fbca1f8446013142d676159b8292fd7c2d3175f39e1baeb5c4d13f9637003254"; - description = "Microsoft Azure Command-Line Tools ApicExtension Extension"; - }; - appservice-kube = mkAzExtension rec { - pname = "appservice-kube"; - version = "0.1.10"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/appservice_kube-${version}-py2.py3-none-any.whl"; - sha256 = "7fd72d27e4b0eceda3b2b4f301c7a0c3068fea8b96d70f9fcaad142240de7d0d"; - description = "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension"; - }; - astronomer = mkAzExtension rec { - pname = "astronomer"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/astronomer-${version}-py3-none-any.whl"; - sha256 = "b4ca41b5d9cb77aed2b462ded4a392ae3ce896ce8d9cb94a08671d0cb68176cd"; - description = "Microsoft Azure Command-Line Tools Astronomer Extension"; - }; - authV2 = mkAzExtension rec { - pname = "authV2"; - version = "0.1.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/authV2-${version}-py3-none-any.whl"; - sha256 = "eb05636f8c78e2f83b7f452fe56f5a9ae496d6909dc36924ae5f98a2fb5bce41"; - description = "Microsoft Azure Command-Line Tools Authv2 Extension"; - }; - automanage = mkAzExtension rec { - pname = "automanage"; - version = "0.1.2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/automanage-${version}-py3-none-any.whl"; - sha256 = "42341a6cfdacb3af0433b10b3e9bcb5226d4c7fb59730378408a957662266551"; - description = "Microsoft Azure Command-Line Tools Automanage Extension"; - }; - automation = mkAzExtension rec { - pname = "automation"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/automation-${version}-py3-none-any.whl"; - sha256 = "d31fe0433fa30a6e009f7b9bee6c417a686ed87502dd987b9ac8ad113383915b"; - description = "Microsoft Azure Command-Line Tools AutomationClient Extension"; - }; - azure-firewall = mkAzExtension rec { - pname = "azure-firewall"; - version = "1.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-${version}-py2.py3-none-any.whl"; - sha256 = "5468cc09b8ea7918176b5e95aa3c24c7ad9b7d1b68c47d16bf522a053fd811e8"; - description = "Manage Azure Firewall resources"; - }; - azurelargeinstance = mkAzExtension rec { - pname = "azurelargeinstance"; - version = "1.0.0b4"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/azurelargeinstance-${version}-py3-none-any.whl"; - sha256 = "6fee478bd919922a0532573fdea3b5422925d374ba6649ea015d4d33941e819a"; - description = "Microsoft Azure Command-Line Tools Azurelargeinstance Extension"; - }; - azurestackhci = mkAzExtension rec { - pname = "azurestackhci"; - version = "0.2.9"; - url = "https://hybridaksstorage.z13.web.core.windows.net/SelfServiceVM/CLI/azurestackhci-${version}-py3-none-any.whl"; - sha256 = "2557b2fe3fa2f951a2794ba967555ba54c2e93eb75538152f21ab2fb568fef16"; - description = "Microsoft Azure Command-Line Tools AzureStackHCI Extension"; - }; - baremetal-infrastructure = mkAzExtension rec { - pname = "baremetal-infrastructure"; - version = "3.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/baremetal_infrastructure-${version}-py3-none-any.whl"; - sha256 = "0e5843e295a27058262e945febc43179ce173ac27ebcfe4456b466b7acb9c220"; - description = "Microsoft Azure Command-Line Tools BaremetalInfrastructure Extension"; - }; - bastion = mkAzExtension rec { - pname = "bastion"; - version = "1.3.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-${version}-py3-none-any.whl"; - sha256 = "151ab25d4dcde10b46c4693cefdaf1d0d5841e15cfe3ec64c089aaaf55e6c8c0"; - description = "Microsoft Azure Command-Line Tools Bastion Extension"; - }; - billing-benefits = mkAzExtension rec { - pname = "billing-benefits"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/billing_benefits-${version}-py3-none-any.whl"; - sha256 = "f71250d1c26690cc0e175cd5c9bcd59e76c7b701bb3a47c8273e4cf8bcca878e"; - description = "Microsoft Azure Command-Line Tools BillingBenefits Extension"; - }; - blueprint = mkAzExtension rec { - pname = "blueprint"; - version = "0.3.2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-${version}-py3-none-any.whl"; - sha256 = "58d3835446dd93e585b0f6b520a2db6551b8a927e35e25da4747d4cf8a4c009b"; - description = "Microsoft Azure Command-Line Tools Blueprint Extension"; - }; - change-analysis = mkAzExtension rec { - pname = "change-analysis"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/change_analysis-${version}-py3-none-any.whl"; - sha256 = "49f1761a1b1ad29169af2ecd5793e10ddec797ebb2610e7c70e1b1ab2b75126a"; - description = "Microsoft Azure Command-Line Tools ChangeAnalysis Extension"; - }; - cli-translator = mkAzExtension rec { - pname = "cli-translator"; - version = "0.3.0"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/cli_translator-${version}-py3-none-any.whl"; - sha256 = "9ea6162d37fc3390be4dce64cb05c5c588070104f3e92a701ab475473565a8a9"; - description = "Translate ARM template to executable Azure CLI scripts"; - }; - compute-diagnostic-rp = mkAzExtension rec { - pname = "compute-diagnostic-rp"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/compute_diagnostic_rp-${version}-py3-none-any.whl"; - sha256 = "810e93ce00c7d03df6da9a0faf57b966fb6da582311f9cae74b2b7e1e3c41423"; - description = "Microsoft Azure Command-Line Tools ComputeDiagnosticRp Extension"; - }; - confidentialledger = mkAzExtension rec { - pname = "confidentialledger"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/confidentialledger-${version}-py3-none-any.whl"; - sha256 = "3afbf49f10cdddd9675562364ce2275f6f70eb5318fa85b658d711b1e24dc94e"; - description = "Microsoft Azure Command-Line Tools ConfidentialLedger Extension"; - }; - confluent = mkAzExtension rec { - pname = "confluent"; - version = "0.6.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/confluent-${version}-py3-none-any.whl"; - sha256 = "7987d22e0e9cada28087a900bfa534865531941f2bbfe967eb46c90b2e0a12be"; - description = "Microsoft Azure Command-Line Tools ConfluentManagementClient Extension"; - }; - connectedmachine = mkAzExtension rec { - pname = "connectedmachine"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-${version}-py3-none-any.whl"; - sha256 = "8b8c4340c4c6552e3826220ffb95bf619447675b0469304b71fa80e2e4e31c81"; - description = "Microsoft Azure Command-Line Tools ConnectedMachine Extension"; - }; - connectedvmware = mkAzExtension rec { - pname = "connectedvmware"; - version = "1.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedvmware-${version}-py2.py3-none-any.whl"; - sha256 = "b731a821c609aae8bfab7e0470b342b9179e7e0c65482f4a432a60d87a4c395f"; - description = "Microsoft Azure Command-Line Tools Connectedvmware Extension"; - }; - connection-monitor-preview = mkAzExtension rec { - pname = "connection-monitor-preview"; - version = "0.1.0"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/connection_monitor_preview-${version}-py2.py3-none-any.whl"; - sha256 = "9a796d5187571990d27feb9efeedde38c194f13ea21cbf9ec06131196bfd821d"; - description = "Microsoft Azure Command-Line Connection Monitor V2 Extension"; - }; - cosmosdb-preview = mkAzExtension rec { - pname = "cosmosdb-preview"; - version = "1.0.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-${version}-py2.py3-none-any.whl"; - sha256 = "c540018bc5da1252ec3e3e564552650d6af08f349f3ff339be398a7983caf2a9"; - description = "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension"; - }; - costmanagement = mkAzExtension rec { - pname = "costmanagement"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/costmanagement-${version}-py3-none-any.whl"; - sha256 = "6e5e053d05bad6ad6305bd024f51e355e60fde8bb6a03350dfd81c25437d2e45"; - description = "Microsoft Azure Command-Line Tools CostManagementClient Extension"; - }; - csvmware = mkAzExtension rec { - pname = "csvmware"; - version = "0.3.0"; - url = "https://github.com/Azure/az-csvmware-cli/releases/download/${version}/csvmware-0.3.0-py2.py3-none-any.whl"; - sha256 = "dfb9767f05ac13c762ea9dc4327169e63a5c11879123544b200edb9a2c9a8a42"; - description = "Manage Azure VMware Solution by CloudSimple"; - }; - custom-providers = mkAzExtension rec { - pname = "custom-providers"; - version = "0.2.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/custom_providers-${version}-py2.py3-none-any.whl"; - sha256 = "a9938f09c86fa4575e3c887206908cac15920af528c537c0b998362a1c43daf7"; - description = "Microsoft Azure Command-Line Tools Custom Providers Extension"; - }; - customlocation = mkAzExtension rec { - pname = "customlocation"; - version = "0.1.3"; - url = "https://arcplatformcliextprod.blob.core.windows.net/customlocation/customlocation-${version}-py2.py3-none-any.whl"; - sha256 = "5e36435b1a81de25e74e70c45c2ac9f98065138c35050f29210ae40c18484e28"; - description = "Microsoft Azure Command-Line Tools Customlocation Extension"; - }; - databox = mkAzExtension rec { - pname = "databox"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/databox-${version}-py3-none-any.whl"; - sha256 = "7b41a60521d7cf652d4cdca052fc9d2ec6371f3d7884ec0a74ba9a7d5001d7bb"; - description = "Microsoft Azure Command-Line Tools Databox Extension"; - }; - databricks = mkAzExtension rec { - pname = "databricks"; - version = "1.0.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/databricks-${version}-py3-none-any.whl"; - sha256 = "55165d7435cd7a0dc87587e82fc202d792a5f28c9c44398655b0a4770d038c30"; - description = "Microsoft Azure Command-Line Tools DatabricksClient Extension"; - }; - datadog = mkAzExtension rec { - pname = "datadog"; - version = "0.1.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-${version}-py3-none-any.whl"; - sha256 = "9a38fd5d6d01646f299ee7b5f68e82ad708889c7d0bd72e0b6b6b13e5455e937"; - description = "Microsoft Azure Command-Line Tools MicrosoftDatadogClient Extension"; - }; - datafactory = mkAzExtension rec { - pname = "datafactory"; - version = "1.0.2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-${version}-py3-none-any.whl"; - sha256 = "ea134e2963b7cdf2bcbd50244a6f1a411da77bd4db7e42c8c8f9651638c82ac7"; - description = "Microsoft Azure Command-Line Tools DataFactoryManagementClient Extension"; - }; - datamigration = mkAzExtension rec { - pname = "datamigration"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-${version}-py3-none-any.whl"; - sha256 = "8901b5664a95e665781698bc02ee94b4297c82ac9fdfab99dd4f13bac1c0923e"; - description = "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension"; - }; - dataprotection = mkAzExtension rec { - pname = "dataprotection"; - version = "1.5.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-${version}-py3-none-any.whl"; - sha256 = "4671ce89e39065695f21626350dfcad5438bdbefc714cf35e85ee5eab0f96661"; - description = "Microsoft Azure Command-Line Tools DataProtectionClient Extension"; - }; - datashare = mkAzExtension rec { - pname = "datashare"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/datashare-${version}-py3-none-any.whl"; - sha256 = "f1a801bd0c38eb2ebf9c2fb4e0b43a98470ae7b40bbcd05eb2aa596d69579c9e"; - description = "Microsoft Azure Command-Line Tools DataShareManagementClient Extension"; - }; - deploy-to-azure = mkAzExtension rec { - pname = "deploy-to-azure"; - version = "0.2.0"; - url = "https://github.com/Azure/deploy-to-azure-cli-extension/releases/download/20200318.1/deploy_to_azure-${version}-py2.py3-none-any.whl"; - sha256 = "f925080ee7abc3aef733d4c6313170bdedaa9569af1b95427383bc3c59e4ceb8"; - description = "Deploy to Azure using Github Actions"; - }; - desktopvirtualization = mkAzExtension rec { - pname = "desktopvirtualization"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/desktopvirtualization-${version}-py3-none-any.whl"; - sha256 = "3a1e7a8f0e579fa21fed770859b21c23bec8b8489d834a61411695a9a90c7cd4"; - description = "Microsoft Azure Command-Line Tools Desktopvirtualization Extension"; - }; - dev-spaces = mkAzExtension rec { - pname = "dev-spaces"; - version = "1.0.6"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/dev_spaces-${version}-py2.py3-none-any.whl"; - sha256 = "71041808b27cd9d33fd905c5080c97f61291816f2dddd6dcdb2e66b9fb6ebf59"; - description = "Dev Spaces provides a rapid, iterative Kubernetes development experience for teams"; - }; - devcenter = mkAzExtension rec { - pname = "devcenter"; - version = "6.0.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-${version}-py3-none-any.whl"; - sha256 = "25e3dcdc9cb83243ceb2ed6a6dedc227953c06cb610ba95c84ddec0f7503224f"; - description = "Microsoft Azure Command-Line Tools DevCenter Extension"; - }; - diskpool = mkAzExtension rec { - pname = "diskpool"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/diskpool-${version}-py3-none-any.whl"; - sha256 = "9ae6aaea85a17529da2a4e51c2ba2aba55b4b26816d5618eafd0f9fdc43b67b7"; - description = "Microsoft Azure Command-Line Tools StoragePoolManagement Extension"; - }; - dms-preview = mkAzExtension rec { - pname = "dms-preview"; - version = "0.15.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/dms_preview-${version}-py2.py3-none-any.whl"; - sha256 = "556c145c03b8d529d8e77f7b35702fb8de382891635e858f928117f33688ee9c"; - description = "Support for new Database Migration Service scenarios"; - }; - dnc = mkAzExtension rec { - pname = "dnc"; - version = "0.2.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/dnc-${version}-py3-none-any.whl"; - sha256 = "e38474ca9b28bed5dde388cf73dff9e3504825032b03c5bf8930c25caf292026"; - description = "Microsoft Azure Command-Line Tools Dnc Extension"; - }; - dns-resolver = mkAzExtension rec { - pname = "dns-resolver"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/dns_resolver-${version}-py3-none-any.whl"; - sha256 = "1c4bb8216e509c2f08fa75c45930ec377768326f30cb9ab125842aa9352c6e2e"; - description = "Microsoft Azure Command-Line Tools DnsResolverManagementClient Extension"; - }; - durabletask = mkAzExtension rec { - pname = "durabletask"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-${version}-py3-none-any.whl"; - sha256 = "d7a929b294928df79d8312fbf6af72c5d928e304c4a7b37daf3ff772667dfb25"; - description = "Microsoft Azure Command-Line Tools Durabletask Extension"; - }; - dynatrace = mkAzExtension rec { - pname = "dynatrace"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/dynatrace-${version}-py3-none-any.whl"; - sha256 = "112a7e423461d1b6f7c385fe8b73b4f2b850e2570c35a54a4bbcc2e87afec661"; - description = "Microsoft Azure Command-Line Tools Dynatrace Extension"; - }; - edgeorder = mkAzExtension rec { - pname = "edgeorder"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/edgeorder-${version}-py3-none-any.whl"; - sha256 = "186a06d0f8603f7e0faeed5296ecc73bf1096e0d681acea42d5ebccc1670357b"; - description = "Microsoft Azure Command-Line Tools EdgeOrderManagementClient Extension"; - }; - edgezones = mkAzExtension rec { - pname = "edgezones"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/edgezones-${version}-py3-none-any.whl"; - sha256 = "98f1b962dcbb078cfb8cd12d40a58d01bcc37db441570f84e293ba0ba52c6c08"; - description = "Microsoft Azure Command-Line Tools Edgezones Extension"; - }; - elastic = mkAzExtension rec { - pname = "elastic"; - version = "1.0.0b3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/elastic-${version}-py3-none-any.whl"; - sha256 = "2f3ae430d3c34dd4007c8c5a8374963568cc23558872464242811cc5a26e2de7"; - description = "Microsoft Azure Command-Line Tools MicrosoftElastic Extension"; - }; - elastic-san = mkAzExtension rec { - pname = "elastic-san"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/elastic_san-${version}-py3-none-any.whl"; - sha256 = "6d2f1247ae78e431d4834989df581cd21241d16b97071bf672fb8b71ee3ad702"; - description = "Microsoft Azure Command-Line Tools ElasticSan Extension"; - }; - eventgrid = mkAzExtension rec { - pname = "eventgrid"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/eventgrid-${version}-py2.py3-none-any.whl"; - sha256 = "662ca2a381efcf821a16648ff3b89edbe21f4e9887e18ffa7ee0dbbaf0332ede"; - description = "Microsoft Azure Command-Line Tools EventGrid Command Module"; - }; - express-route-cross-connection = mkAzExtension rec { - pname = "express-route-cross-connection"; - version = "0.1.1"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/express_route_cross_connection-${version}-py2.py3-none-any.whl"; - sha256 = "b83f723baae0ea04557a87f358fa2131baf15d45cd3aba7a9ab42d14ec80df38"; - description = "Manage customer ExpressRoute circuits using an ExpressRoute cross-connection"; - }; - firmwareanalysis = mkAzExtension rec { - pname = "firmwareanalysis"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/firmwareanalysis-${version}-py3-none-any.whl"; - sha256 = "1c3df1441de76edb08bed05ac279dd2b02bd6fab68a0b9a495dfd7ecce3e92cb"; - description = "Microsoft Azure Command-Line Tools Firmwareanalysis Extension"; - }; - fleet = mkAzExtension rec { - pname = "fleet"; - version = "1.4.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-${version}-py3-none-any.whl"; - sha256 = "1d83a9000c879ff1a9a2bff2ea23183ab61e342713dfedb662345593b1658438"; - description = "Microsoft Azure Command-Line Tools Fleet Extension"; - }; - fluid-relay = mkAzExtension rec { - pname = "fluid-relay"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/fluid_relay-${version}-py3-none-any.whl"; - sha256 = "9217666f8134a38e09aeda905e7cc83994332a5ab563ec8935b9ff6c91563e8c"; - description = "Microsoft Azure Command-Line Tools FluidRelay Extension"; - }; - footprint = mkAzExtension rec { - pname = "footprint"; - version = "1.0.0"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/footprint-${version}-py3-none-any.whl"; - sha256 = "4aa59288bf46cfd68519f1f7f63d3e33af16d80632b84c283cc7152129260b2c"; - description = "Microsoft Azure Command-Line Tools FootprintMonitoringManagementClient Extension"; - }; - front-door = mkAzExtension rec { - pname = "front-door"; - version = "1.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-${version}-py3-none-any.whl"; - sha256 = "232ba7b2cd24240d4e86d820e5fa78a11143b3a624ed953a3451210500edfbe0"; - description = "Manage networking Front Doors"; - }; - fzf = mkAzExtension rec { - pname = "fzf"; - version = "1.0.2"; - url = "https://pahealyfzf.blob.core.windows.net/fzf/fzf-${version}-py2.py3-none-any.whl"; - sha256 = "84abeed03b4bbfa7b8c0be08d9366ff3040e2160df4f5a539f0e1c9e0a1c359c"; - description = "Microsoft Azure Command-Line Tools fzf Extension"; - }; - gallery-service-artifact = mkAzExtension rec { - pname = "gallery-service-artifact"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/gallery_service_artifact-${version}-py3-none-any.whl"; - sha256 = "3f30e3e8e7e678fd9ab91b2261fb918a303cd382626509d3f00e86f1967750c6"; - description = "Microsoft Azure Command-Line Tools GalleryServiceArtifact Extension"; - }; - graphservices = mkAzExtension rec { - pname = "graphservices"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/graphservices-${version}-py3-none-any.whl"; - sha256 = "8aeda3901e944b038f4e812b0b7099798d2bd82d55e03e785017a504c14583e5"; - description = "Microsoft Azure Command-Line Tools Graphservices Extension"; - }; - guestconfig = mkAzExtension rec { - pname = "guestconfig"; - version = "0.1.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/guestconfig-${version}-py3-none-any.whl"; - sha256 = "94836a5d21ee1071cd40b163d2c80c32a6a81b9dc85d91371f7e4fb35141e273"; - description = "Microsoft Azure Command-Line Tools GuestConfigurationClient Extension"; - }; - hack = mkAzExtension rec { - pname = "hack"; - version = "0.4.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/hack-${version}-py2.py3-none-any.whl"; - sha256 = "f9e600457e3a9fffc3235a7b30176d9f0a7f4d39ac01ea3e2668bcbdee6398a6"; - description = "Microsoft Azure Command-Line Tools Hack Extension"; - }; - hardware-security-modules = mkAzExtension rec { - pname = "hardware-security-modules"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/hardware_security_modules-${version}-py3-none-any.whl"; - sha256 = "ac4a10e2cc64a4d0818e48ffbcddfeb4307dd56b8875bc01c02687d473c9fe9b"; - description = "Microsoft Azure Command-Line Tools AzureDedicatedHSMResourceProvider Extension"; - }; - hdinsightonaks = mkAzExtension rec { - pname = "hdinsightonaks"; - version = "1.0.0b3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/hdinsightonaks-${version}-py3-none-any.whl"; - sha256 = "f549b85107b7b83ff64fcfa5c90a5d7e900a5ea2efe76eec9b1f81689e58c365"; - description = "Microsoft Azure Command-Line Tools Hdinsightonaks Extension"; - }; - healthbot = mkAzExtension rec { - pname = "healthbot"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/healthbot-${version}-py3-none-any.whl"; - sha256 = "9134fad2511516e714a5db346d63865af0badf0599ade3f1c15faca0055585a3"; - description = "Microsoft Azure Command-Line Tools HealthbotClient Extension"; - }; - healthcareapis = mkAzExtension rec { - pname = "healthcareapis"; - version = "0.4.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/healthcareapis-${version}-py3-none-any.whl"; - sha256 = "a25d7d57d4fd3adcc37581d0acc1d6c6a46dcd0351933ed37cfba9d1abd60978"; - description = "Microsoft Azure Command-Line Tools HealthcareApisManagementClient Extension"; - }; - hpc-cache = mkAzExtension rec { - pname = "hpc-cache"; - version = "0.1.5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/hpc_cache-${version}-py2.py3-none-any.whl"; - sha256 = "852cb417aadf0ad07e3c51413858c413bf71ea6cb49ba58289d9572f9a350507"; - description = "Microsoft Azure Command-Line Tools StorageCache Extension"; - }; - image-copy-extension = mkAzExtension rec { - pname = "image-copy-extension"; - version = "0.2.13"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/image_copy_extension-${version}-py2.py3-none-any.whl"; - sha256 = "b0d12bf3c74500790d58d99a6c32562548712cb872b7942e8ad481e270521b19"; - description = "Support for copying managed vm images between regions"; - }; - image-gallery = mkAzExtension rec { - pname = "image-gallery"; - version = "0.1.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/image_gallery-${version}-py2.py3-none-any.whl"; - sha256 = "6260c1f4bfb589d2ba0569317358a149caabbbd49a048e69328e44871694aacd"; - description = "Support for Azure Image Gallery"; - }; - import-export = mkAzExtension rec { - pname = "import-export"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/import_export-${version}-py3-none-any.whl"; - sha256 = "c4e36f1003031a67615a45cd12592bf5c11c54b7bd957f6c2af90efcb5c517b2"; - description = "Microsoft Azure Command-Line Tools StorageImportExport Extension"; - }; - informatica = mkAzExtension rec { - pname = "informatica"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/informatica-${version}-py3-none-any.whl"; - sha256 = "6166ae91c78e74c01af3bd1ead2d62832707e176ea0f7d5d30a5dd485f482462"; - description = "Microsoft Azure Command-Line Tools Informatica Extension"; - }; - init = mkAzExtension rec { - pname = "init"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/init-${version}-py3-none-any.whl"; - sha256 = "1177fc293dc118b449b761ec2c728d39755fc3939de8d4bfd89cce1bfb218e86"; - description = "Microsoft Azure Command-Line Tools Init Extension"; - }; - internet-analyzer = mkAzExtension rec { - pname = "internet-analyzer"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/internet_analyzer-${version}-py2.py3-none-any.whl"; - sha256 = "4564881a7c90bacfd881c629a4182398007c886d099ea88db97e1ff10053a5c4"; - description = "Microsoft Azure Command-Line Tools Internet Analyzer Extension"; - }; - ip-group = mkAzExtension rec { - pname = "ip-group"; - version = "0.1.2"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/ip_group-${version}-py2.py3-none-any.whl"; - sha256 = "afba2d8a8a612863b63f504d6cff6d559610b961e4c77dc2fd49b9fe03ec67a2"; - description = "Microsoft Azure Command-Line Tools IpGroup Extension"; - }; - k8s-extension = mkAzExtension rec { - pname = "k8s-extension"; - version = "1.6.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-${version}-py3-none-any.whl"; - sha256 = "41861d65b9d86e0b622986a4984ce7a611f87b92da578db8c0527ec74334f32c"; - description = "Microsoft Azure Command-Line Tools K8s-extension Extension"; - }; - k8s-runtime = mkAzExtension rec { - pname = "k8s-runtime"; - version = "1.0.4"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_runtime-${version}-py3-none-any.whl"; - sha256 = "aee2d3008d818d78342149e6f1d2c7922abbbe43f323d51e6cd58c73b1c67b3a"; - description = "Microsoft Azure Command-Line Tools K8sRuntime Extension"; - }; - kusto = mkAzExtension rec { - pname = "kusto"; - version = "0.5.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/kusto-${version}-py3-none-any.whl"; - sha256 = "cf5729e9d02029a189182523543285c9737d515f41c610c8338d43f872f9f01d"; - description = "Microsoft Azure Command-Line Tools KustoManagementClient Extension"; - }; - log-analytics = mkAzExtension rec { - pname = "log-analytics"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/log_analytics-${version}-py2.py3-none-any.whl"; - sha256 = "ccd36a8ca6979c549db7d7fd78009907e9e7bc2b09437885dbdd8b107cb15b66"; - description = "Support for Azure Log Analytics query capabilities"; - }; - log-analytics-solution = mkAzExtension rec { - pname = "log-analytics-solution"; - version = "1.0.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/log_analytics_solution-${version}-py2.py3-none-any.whl"; - sha256 = "7e10443de862cd0c19090b0a0dae5e9942e8b48c20e3a9c3305778daa756ea96"; - description = "Support for Azure Log Analytics Solution"; - }; - logic = mkAzExtension rec { - pname = "logic"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/logic-${version}-py3-none-any.whl"; - sha256 = "14c18768c02ee9c370ac7eed0f23206eee7d344a10382a3083b17b5e1848cfcd"; - description = "Microsoft Azure Command-Line Tools Logic Extension"; - }; - logz = mkAzExtension rec { - pname = "logz"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/logz-${version}-py3-none-any.whl"; - sha256 = "6a937dbb8c5a758b29afd45ecfc101743a5bf2491f2fba60e8ea512d5b765840"; - description = "Microsoft Azure Command-Line Tools MicrosoftLogz Extension"; - }; - maintenance = mkAzExtension rec { - pname = "maintenance"; - version = "1.6.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/maintenance-${version}-py3-none-any.whl"; - sha256 = "3ab6a2dac48ba71b28bc8ee05d254daa72b62f84dda953749fa621a80ca39ae5"; - description = "Microsoft Azure Command-Line Tools MaintenanceManagementClient Extension"; - }; - managedccfs = mkAzExtension rec { - pname = "managedccfs"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/managedccfs-${version}-py3-none-any.whl"; - sha256 = "378f425f35420373e9703a5dc8c0f05ca8176fb8404b38610d4de828f7c23d37"; - description = "Microsoft Azure Command-Line Tools Managedccfs Extension"; - }; - managednetworkfabric = mkAzExtension rec { - pname = "managednetworkfabric"; - version = "6.4.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-${version}-py3-none-any.whl"; - sha256 = "9d41078e0654aaae36a5f0f283f51de98cc4360582920536542546ed34ca0bc4"; - description = "Support for managednetworkfabric commands based on 2023-06-15 API version"; - }; - managementpartner = mkAzExtension rec { - pname = "managementpartner"; - version = "0.1.3"; - url = "https://azurecliprod.blob.core.windows.net/cli-extensions/managementpartner-${version}-py2.py3-none-any.whl"; - sha256 = "22ddf4b1cdc77e99262cb6089c4d96040065828a1d38a2709fdb945d3c851839"; - description = "Support for Management Partner preview"; - }; - mdp = mkAzExtension rec { - pname = "mdp"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/mdp-${version}-py3-none-any.whl"; - sha256 = "062ad026d9eaf791b5928c4fb793148d40c6c297cee32f175cd3a155eb24d93f"; - description = "Microsoft Azure Command-Line Tools Mdp Extension"; - }; - microsoft-fabric = mkAzExtension rec { - pname = "microsoft-fabric"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/microsoft_fabric-${version}-py3-none-any.whl"; - sha256 = "8ba450a5a3daafa8b9b6b6e9ee8224f468fd972332e905000f2acc7ff00cd9bb"; - description = "Microsoft Azure Command-Line Tools Microsoft Fabric Extension"; - }; - mixed-reality = mkAzExtension rec { - pname = "mixed-reality"; - version = "0.0.5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/mixed_reality-${version}-py2.py3-none-any.whl"; - sha256 = "026aaf58f9ad02d74837d21a1f5c122264a59814e0b7c395c26e5fdc1293187e"; - description = "Mixed Reality Azure CLI Extension"; - }; - mobile-network = mkAzExtension rec { - pname = "mobile-network"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/mobile_network-${version}-py3-none-any.whl"; - sha256 = "2d9572a4ed706df8f626c62036ad22f46a15b113273f8ff9b06313a380a27f56"; - description = "Microsoft Azure Command-Line Tools MobileNetwork Extension"; - }; - monitor-control-service = mkAzExtension rec { - pname = "monitor-control-service"; - version = "1.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_control_service-${version}-py3-none-any.whl"; - sha256 = "3151a341845d053a4be45d9b7c04e1e15b88503ab6b110163a12b9aee6fd3cd9"; - description = "Microsoft Azure Command-Line Tools MonitorClient Extension"; - }; - monitor-pipeline-group = mkAzExtension rec { - pname = "monitor-pipeline-group"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_pipeline_group-${version}-py3-none-any.whl"; - sha256 = "cf31f9e3fa9458716f0c3d1c15698ef79b707c5bd7d146773d2b2afe42e64c29"; - description = "Microsoft Azure Command-Line Tools MonitorPipelineGroup Extension"; - }; - multicloud-connector = mkAzExtension rec { - pname = "multicloud-connector"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/multicloud_connector-${version}-py3-none-any.whl"; - sha256 = "ad84350162ae877287f8a151920b3c4bdc6375dd419dd6101c2702db606a5d19"; - description = "Microsoft Azure Command-Line Tools MulticloudConnector Extension"; - }; - network-analytics = mkAzExtension rec { - pname = "network-analytics"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/network_analytics-${version}-py3-none-any.whl"; - sha256 = "c8d7e195f913298ac03ef8eb1f8d7fb09526956d3eb750a8cd447ae8f61d4317"; - description = "Microsoft Azure Command-Line Tools NetworkAnalytics Extension"; - }; - networkcloud = mkAzExtension rec { - pname = "networkcloud"; - version = "2.0.0b4"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-${version}-py3-none-any.whl"; - sha256 = "06707a008405739a5639230f3fd094031084a69f867648503aed4039d118ad9f"; - description = "Support for Azure Operator Nexus network cloud commands based on 2024-07-01 API version"; - }; - new-relic = mkAzExtension rec { - pname = "new-relic"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/new_relic-${version}-py3-none-any.whl"; - sha256 = "9ce69f1684cea14acba0f2fdb473e47e0a06745e383bb5144954c5e85e416199"; - description = "Microsoft Azure Command-Line Tools NewRelic Extension"; - }; - next = mkAzExtension rec { - pname = "next"; - version = "0.1.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/next-${version}-py2.py3-none-any.whl"; - sha256 = "83c4e03427f190203e094c14e4f7e79cec989f1277e16b9256bb9fe688aa5e07"; - description = "Microsoft Azure Command-Line Tools Next Extension"; - }; - nginx = mkAzExtension rec { - pname = "nginx"; - version = "2.0.0b6"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-${version}-py2.py3-none-any.whl"; - sha256 = "d94f77c12ce6945c823f7efa84238e398b5aec878156bbdf3112f0def1eb8960"; - description = "Microsoft Azure Command-Line Tools Nginx Extension"; - }; - notification-hub = mkAzExtension rec { - pname = "notification-hub"; - version = "1.0.0a1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/notification_hub-${version}-py3-none-any.whl"; - sha256 = "a03751b715700e0d18a38e808bfeed164335024c9608c4bfd53aeacc731d1099"; - description = "Microsoft Azure Command-Line Tools Notification Hub Extension"; - }; - nsp = mkAzExtension rec { - pname = "nsp"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-${version}-py3-none-any.whl"; - sha256 = "febfce38fc449daa67c7ad8410e7fa250f7f39afb5f870496ce045bb74935bcd"; - description = "Microsoft Azure Command-Line Tools Nsp Extension"; - }; - offazure = mkAzExtension rec { - pname = "offazure"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/offazure-${version}-py3-none-any.whl"; - sha256 = "1918817070ae9e0ceef57b93366d18b6e8bf577fd632e7da999e1e2abbb53656"; - description = "Microsoft Azure Command-Line Tools AzureMigrateV2 Extension"; - }; - oracle-database = mkAzExtension rec { - pname = "oracle-database"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-${version}-py3-none-any.whl"; - sha256 = "058c3de6c1e103ff0c62a188b1c606a35097a6652cb7eb6c3e5b77f77e15b5b1"; - description = "Microsoft Azure Command-Line Tools OracleDatabase Extension"; - }; - orbital = mkAzExtension rec { - pname = "orbital"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/orbital-${version}-py3-none-any.whl"; - sha256 = "4259fb8ff560440d63251cc9721bb3f2283452f2399134514611f886fa350f37"; - description = "Microsoft Azure Command-Line Tools Orbital Extension"; - }; - palo-alto-networks = mkAzExtension rec { - pname = "palo-alto-networks"; - version = "1.1.1b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/palo_alto_networks-${version}-py3-none-any.whl"; - sha256 = "8d4f6a4b72366bd57780bd158d6c25b363999e1a13ea85d491809cc9a4d29608"; - description = "Microsoft Azure Command-Line Tools PaloAltoNetworks Extension"; - }; - peering = mkAzExtension rec { - pname = "peering"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/peering-${version}-py3-none-any.whl"; - sha256 = "fe4e3ba85c1f65966a059291e46ebeb7c956f28da2b15b541b0492765b623992"; - description = "Microsoft Azure Command-Line Tools PeeringManagementClient Extension"; - }; - portal = mkAzExtension rec { - pname = "portal"; - version = "0.1.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/portal-${version}-py3-none-any.whl"; - sha256 = "3c3ebe23f59db5f2d286ca52cf8cfbbc5983ce8073622de11a35dab95800a996"; - description = "Microsoft Azure Command-Line Tools Portal Extension"; - }; - powerbidedicated = mkAzExtension rec { - pname = "powerbidedicated"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/powerbidedicated-${version}-py2.py3-none-any.whl"; - sha256 = "e1e58bb6f57edde4793f4c66a0c10a2776f842172878162385f2b1d21539de6e"; - description = "Microsoft Azure Command-Line Tools PowerBIDedicated Extension"; - }; - providerhub = mkAzExtension rec { - pname = "providerhub"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/providerhub-${version}-py3-none-any.whl"; - sha256 = "7b93cb7ecb1fa3a520909d45e6e6597c8ba7daac4fbc1a26c3de66043678dd0d"; - description = "Microsoft Azure Command-Line Tools ProviderHub Extension"; - }; - purview = mkAzExtension rec { - pname = "purview"; - version = "0.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/purview-${version}-py3-none-any.whl"; - sha256 = "706cc2550fbd07b8b676345c2f26c5ba66550905bc8ec224c6c4e5637c497266"; - description = "Microsoft Azure Command-Line Tools PurviewManagementClient Extension"; - }; - qumulo = mkAzExtension rec { - pname = "qumulo"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-${version}-py3-none-any.whl"; - sha256 = "9973f580a3fc20cc2fe5558a1cfdc10ddfc6567982d12f37008bbfec7aafcf9b"; - description = "Microsoft Azure Command-Line Tools Qumulo Extension"; - }; - quota = mkAzExtension rec { - pname = "quota"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/quota-${version}-py3-none-any.whl"; - sha256 = "8b4c3475df0c3544dbcc28e4875eb5b163d72b40aff4250aafdad94180c3f995"; - description = "Microsoft Azure Command-Line Tools AzureQuotaExtensionAPI Extension"; - }; - redisenterprise = mkAzExtension rec { - pname = "redisenterprise"; - version = "1.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-${version}-py3-none-any.whl"; - sha256 = "6e776d464afaaf66456d7b8e6d36ab1a12f19054617479ea8f13633d3a49ffac"; - description = "Microsoft Azure Command-Line Tools RedisEnterprise Extension"; - }; - reservation = mkAzExtension rec { - pname = "reservation"; - version = "0.3.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/reservation-${version}-py3-none-any.whl"; - sha256 = "649f086b02305d142f2f08ea96f52a322a165a6f2a958f3287f53550938ab912"; - description = "Microsoft Azure Command-Line Tools Reservation Extension"; - }; - resource-graph = mkAzExtension rec { - pname = "resource-graph"; - version = "2.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/resource_graph-${version}-py2.py3-none-any.whl"; - sha256 = "62c81e3d62ce60c5a0a485829d00bdb0c733145ee93fb6098c14e3b27ee27c40"; - description = "Support for querying Azure resources with Resource Graph"; - }; - resource-mover = mkAzExtension rec { - pname = "resource-mover"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/resource_mover-${version}-py3-none-any.whl"; - sha256 = "3bc9f41aa30c4f6bc04ff780dc30e8df05bfc887f2adbdf9e89d59f8389e55f3"; - description = "Microsoft Azure Command-Line Tools ResourceMoverServiceAPI Extension"; - }; - sap-hana = mkAzExtension rec { - pname = "sap-hana"; - version = "0.6.5"; - url = "https://github.com/Azure/azure-hanaonazure-cli-extension/releases/download/${version}/sap_hana-0.6.5-py2.py3-none-any.whl"; - sha256 = "b4554c125f3a0eb5c891cec396e7705f6e91d4d81789acef20e3c4d172fa4543"; - description = "Additional commands for working with SAP HanaOnAzure instances"; - }; - scenario-guide = mkAzExtension rec { - pname = "scenario-guide"; - version = "0.1.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/scenario_guide-${version}-py3-none-any.whl"; - sha256 = "4264b48b4b980334488a3fdb3bc43241e828a2742c35ce48985f3bebf019e8f8"; - description = "Microsoft Azure Command-Line Tools Scenario Guidance Extension"; - }; - scheduled-query = mkAzExtension rec { - pname = "scheduled-query"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/scheduled_query-${version}-py2.py3-none-any.whl"; - sha256 = "fd5e69d0438b8089dbe197d5ba4c41776aed906941cac374755a4c9044c4af04"; - description = "Microsoft Azure Command-Line Tools Scheduled_query Extension"; - }; - scvmm = mkAzExtension rec { - pname = "scvmm"; - version = "1.1.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-${version}-py2.py3-none-any.whl"; - sha256 = "7d704578bc5eb60b8105de0b4a924176581a4cf2fd162b0896d81246f7f73a68"; - description = "Microsoft Azure Command-Line Tools SCVMM Extension"; - }; - self-help = mkAzExtension rec { - pname = "self-help"; - version = "0.4.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/self_help-${version}-py3-none-any.whl"; - sha256 = "8c903aaf10d6cb61e6455f6010deeeb496d1e23d6876662089266a49403586b6"; - description = "Microsoft Azure Command-Line Tools SelfHelp Extension"; - }; - sentinel = mkAzExtension rec { - pname = "sentinel"; - version = "0.2.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/sentinel-${version}-py3-none-any.whl"; - sha256 = "5511544b4e342b03a4a4263617c603d87442ad5179ce9d8c0d1fd10915f93b7a"; - description = "Microsoft Azure Command-Line Tools Sentinel Extension"; - }; - site-recovery = mkAzExtension rec { - pname = "site-recovery"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/site_recovery-${version}-py3-none-any.whl"; - sha256 = "ab19142c9a2e06190b6dac272d8cf29e179c9e283f965f8e3a4d29275b847ce5"; - description = "Microsoft Azure Command-Line Tools SiteRecovery Extension"; - }; - spring = mkAzExtension rec { - pname = "spring"; - version = "1.25.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/spring-${version}-py3-none-any.whl"; - sha256 = "9eb8a6f2f77b19c9f9809526bb701076590ddb35f6b2ec431ce318b96cc40733"; - description = "Microsoft Azure Command-Line Tools spring Extension"; - }; - spring-cloud = mkAzExtension rec { - pname = "spring-cloud"; - version = "3.1.8"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/spring_cloud-${version}-py3-none-any.whl"; - sha256 = "14993abe3524c28a42b2e9ba0f0a8a7083162ba9174975e09d8cea834b9829ee"; - description = "Microsoft Azure Command-Line Tools spring-cloud Extension"; - }; - stack-hci = mkAzExtension rec { - pname = "stack-hci"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/stack_hci-${version}-py3-none-any.whl"; - sha256 = "9bb0350f6c28ac2068a5a4a20bbcf74ae34b392d05eb148c403c618525cbadef"; - description = "Microsoft Azure Command-Line Tools AzureStackHCIClient Extension"; - }; - stack-hci-vm = mkAzExtension rec { - pname = "stack-hci-vm"; - version = "1.3.0"; - url = "https://hciarcvmsstorage.z13.web.core.windows.net/cli-extensions/stack_hci_vm-${version}-py3-none-any.whl"; - sha256 = "19553e50d59cafcc19166be7e91be43c725f7abae1d8338914f8e6043853fc09"; - description = "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension"; - }; - standbypool = mkAzExtension rec { - pname = "standbypool"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/standbypool-${version}-py3-none-any.whl"; - sha256 = "44c03e320c8b49f52390e3c11d61b25a67afeffc18d62baa522c373142de0e15"; - description = "Microsoft Azure Command-Line Tools Standbypool Extension"; - }; - staticwebapp = mkAzExtension rec { - pname = "staticwebapp"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/staticwebapp-${version}-py3-none-any.whl"; - sha256 = "fb1dcd876fc2d829cc7a1cc545e9445364d43357d888bb3deeb36a716b805717"; - description = "Microsoft Azure Command-Line Tools Staticwebapp Extension"; - }; - storage-actions = mkAzExtension rec { - pname = "storage-actions"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_actions-${version}-py3-none-any.whl"; - sha256 = "07c5be256edbbe2c81d839e4c6d3d917a56b93921515028cf962393e1176331b"; - description = "Microsoft Azure Command-Line Tools StorageActions Extension"; - }; - storage-blob-preview = mkAzExtension rec { - pname = "storage-blob-preview"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_blob_preview-${version}-py2.py3-none-any.whl"; - sha256 = "1ffe451e41657c8f28a22abee387371d11cedd80d2e52cfcbed0adac0a917b41"; - description = "Microsoft Azure Command-Line Tools Storage-blob-preview Extension"; - }; - storage-mover = mkAzExtension rec { - pname = "storage-mover"; - version = "1.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-${version}-py3-none-any.whl"; - sha256 = "7d768aca50aa98978a0d929c46cffe60bf488a527665485da631b33444cae24c"; - description = "Microsoft Azure Command-Line Tools StorageMover Extension"; - }; - storagesync = mkAzExtension rec { - pname = "storagesync"; - version = "1.0.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/storagesync-${version}-py2.py3-none-any.whl"; - sha256 = "7f2ba91a7a44741f4384b44ba7cea73a8a03b5d385b43404cb4951dd2ea5dc5a"; - description = "Microsoft Azure Command-Line Tools MicrosoftStorageSync Extension"; - }; - stream-analytics = mkAzExtension rec { - pname = "stream-analytics"; - version = "1.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-${version}-py3-none-any.whl"; - sha256 = "15443fd8a73d319a5c9fbc586c9727d1ce1a31e11fd3f3c7e4fcbc97ad076aaa"; - description = "Microsoft Azure Command-Line Tools StreamAnalyticsManagementClient Extension"; - }; - subscription = mkAzExtension rec { - pname = "subscription"; - version = "0.1.5"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/subscription-${version}-py2.py3-none-any.whl"; - sha256 = "ff7896aebc46862a6d30ac5f4cf64bdd40cb50e5437cea299590896d75f1013e"; - description = "Support for subscription management preview"; - }; - support = mkAzExtension rec { - pname = "support"; - version = "2.0.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/support-${version}-py2.py3-none-any.whl"; - sha256 = "5dde97f8fb12eaa258530f68ec2cae00a957f30479835e9f5ed057940312741a"; - description = "Microsoft Azure Command-Line Tools Support Extension"; - }; - terraform = mkAzExtension rec { - pname = "terraform"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/terraform-${version}-py3-none-any.whl"; - sha256 = "80fde2b896b707fd83f83821809682079bd3bb032aa9cb04ba0d2595b3673f27"; - description = "Microsoft Azure Command-Line Tools Terraform Extension"; - }; - timeseriesinsights = mkAzExtension rec { - pname = "timeseriesinsights"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/timeseriesinsights-${version}-py3-none-any.whl"; - sha256 = "c578804a6cfbb4ef8ab91de2130bba8f6139f2fadea4ed1e38b05ea62c7aa95d"; - description = "Microsoft Azure Command-Line Tools TimeSeriesInsightsClient Extension"; - }; - traffic-collector = mkAzExtension rec { - pname = "traffic-collector"; - version = "0.1.3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-${version}-py3-none-any.whl"; - sha256 = "a144a4fda3bce84db22277bd8611084ae1ae39e0bb8c7b50619ec378711f57ba"; - description = "Microsoft Azure Command-Line Tools TrafficCollector Extension"; - }; - trustedsigning = mkAzExtension rec { - pname = "trustedsigning"; - version = "1.0.0b2"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/trustedsigning-${version}-py3-none-any.whl"; - sha256 = "c3ae869c1371493180b9ed71db0bdc3842bad54c8832beb6007118d26bed71e8"; - description = "Microsoft Azure Command-Line Tools Trustedsigning Extension"; - }; - virtual-network-manager = mkAzExtension rec { - pname = "virtual-network-manager"; - version = "1.3.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-${version}-py3-none-any.whl"; - sha256 = "f16f992f98fd03c01dcef8a40f9b84de2367ff9e8850b48663a9bb1cb55b7bd4"; - description = "Microsoft Azure Command-Line Tools NetworkManagementClient Extension"; - }; - virtual-network-tap = mkAzExtension rec { - pname = "virtual-network-tap"; - version = "1.0.0b1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_tap-${version}-py2.py3-none-any.whl"; - sha256 = "ee5f6dcfc09fc09e0c3bbd386b4d3bc6cc1f8a3dde8ed550804f43ed4c3cb7ba"; - description = "Manage virtual network taps (VTAP)"; - }; - virtual-wan = mkAzExtension rec { - pname = "virtual-wan"; - version = "1.0.1"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_wan-${version}-py2.py3-none-any.whl"; - sha256 = "2db6c253d43862d06a4525073d67b61f1d34b7c8832162bd3b0bfffd24b9ada6"; - description = "Manage virtual WAN, hubs, VPN gateways and VPN sites"; - }; - vmware = mkAzExtension rec { - pname = "vmware"; - version = "7.1.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/vmware-${version}-py2.py3-none-any.whl"; - sha256 = "53dc8b1d803cd784e668c4d4d630dec20390406af46266df0860f548a5c21f9d"; - description = "Azure VMware Solution commands"; - }; - webapp = mkAzExtension rec { - pname = "webapp"; - version = "0.4.0"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/webapp-${version}-py2.py3-none-any.whl"; - sha256 = "908b0df07cef652176a0f2bf0fdcf58b5d16fb4903ee3c06f73f0bb3913a5c0f"; - description = "Additional commands for Azure AppService"; - }; - workloads = mkAzExtension rec { - pname = "workloads"; - version = "1.1.0b3"; - url = "https://azcliprod.blob.core.windows.net/cli-extensions/workloads-${version}-py3-none-any.whl"; - sha256 = "a7373b2d3766c43b3caeafc0eddbb492429750b62c78f767760b9b0b42363206"; - description = "Microsoft Azure Command-Line Tools Workloads Extension"; - }; - -} diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 7f05a9e75e0b..a66bf24ecac8 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -46,14 +46,14 @@ let pname, version, url, - sha256, + hash, description, ... }@args: python3.pkgs.buildPythonPackage ( { format = "wheel"; - src = fetchurl { inherit url sha256; }; + src = fetchurl { inherit url hash; }; meta = { inherit description; inherit (azure-cli.meta) platforms maintainers; @@ -65,18 +65,20 @@ let } // (removeAttrs args [ "url" - "sha256" + "hash" "description" "meta" ]) ); - extensions = - callPackages ./extensions-generated.nix { inherit mkAzExtension; } - // callPackages ./extensions-manual.nix { - inherit mkAzExtension; - python3Packages = python3.pkgs; - }; + extensions-generated = lib.mapAttrs (name: ext: mkAzExtension ext) ( + builtins.fromJSON (builtins.readFile ./extensions-generated.json) + ); + extensions-manual = callPackages ./extensions-manual.nix { + inherit mkAzExtension; + python3Packages = python3.pkgs; + }; + extensions = extensions-generated // extensions-manual; extensionDir = stdenvNoCC.mkDerivation { name = "azure-cli-extensions"; From 797fff9526b5ee58a0c04c7a50f4ef23298788f3 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 29 Oct 2024 22:53:35 +0100 Subject: [PATCH 099/369] azure-cli-extensions: migrate hashes of manually packaged extensions to sri Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/extensions-manual.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index d6f65b53cd69..c9b907630e9b 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -18,7 +18,7 @@ pname = "application-insights"; version = "1.2.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/application_insights-${version}-py2.py3-none-any.whl"; - sha256 = "e1fa824eb587e2bec7f4cb4d1c4ce1033ab3d3fac65af42dd6218f673b019cee"; + hash = "sha256-4fqCTrWH4r7H9MtNHEzhAzqz0/rGWvQt1iGPZzsBnO4="; description = "Support for managing Application Insights components and querying metrics, events, and logs from such components"; propagatedBuildInputs = with python3Packages; [ isodate ]; meta.maintainers = with lib.maintainers; [ andreasvoss ]; @@ -28,7 +28,7 @@ pname = "azure-devops"; version = "1.0.1"; url = "https://github.com/Azure/azure-devops-cli-extension/releases/download/20240206.1/azure_devops-${version}-py2.py3-none-any.whl"; - sha256 = "658a2854d8c80f874f9382d421fa45abf6a38d00334737dda006f8dec64cf70a"; + hash = "sha256-ZYooVNjID4dPk4LUIfpFq/ajjQAzRzfdoAb43sZM9wo="; description = "Tools for managing Azure DevOps"; propagatedBuildInputs = with python3Packages; [ distro ]; meta.maintainers = with lib.maintainers; [ katexochen ]; @@ -39,7 +39,7 @@ description = "The Azure IoT extension for Azure CLI."; version = "0.25.0"; url = "https://github.com/Azure/azure-iot-cli-extension/releases/download/v${version}/azure_iot-${version}-py3-none-any.whl"; - sha256 = "7db4bc07667efa8472513d9e121fb2551fcaeae68255c7bc0768ad4177c1b1c6"; + hash = "sha256-fbS8B2Z++oRyUT2eEh+yVR/K6uaCVce8B2itQXfBscY="; propagatedBuildInputs = ( with python3Packages; [ @@ -65,7 +65,7 @@ pname = "confcom"; version = "1.0.0"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/confcom-${version}-py3-none-any.whl"; - sha256 = "73823e10958a114b4aca84c330b4debcc650c4635e74c568679b6c32c356411d"; + hash = "sha256-c4I+EJWKEUtKyoTDMLTevMZQxGNedMVoZ5tsMsNWQR0="; description = "Microsoft Azure Command-Line Tools Confidential Container Security Policy Generator Extension"; nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ openssl_1_1 ]; @@ -85,7 +85,7 @@ pname = "containerapp"; version = "1.0.0b1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl"; - sha256 = "d80b83b0e22770925c24bca150c84182376b7b0aff9b6f28498d769dc8618b45"; + hash = "sha256-2AuDsOIncJJcJLyhUMhBgjdrewr/m28oSY12nchhi0U="; description = "Microsoft Azure Command-Line Tools Containerapp Extension"; propagatedBuildInputs = with python3Packages; [ docker @@ -98,7 +98,7 @@ pname = "rdbms-connect"; version = "1.0.6"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/rdbms_connect-${version}-py2.py3-none-any.whl"; - sha256 = "49cbe8d9b7ea07a8974a29ad90247e864ed798bed5f28d0e3a57a4b37f5939e7"; + hash = "sha256-Scvo2bfqB6iXSimtkCR+hk7XmL7V8o0OOleks39ZOec="; description = "Support for testing connection to Azure Database for MySQL & PostgreSQL servers"; propagatedBuildInputs = (with python3Packages; [ @@ -115,7 +115,7 @@ pname = "ssh"; version = "2.0.5"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/ssh-${version}-py3-none-any.whl"; - sha256 = "80c98b10d7bf1ce4005b7694aedd05c47355456775ba6125308be65fb0fefc93"; + hash = "sha256-gMmLENe/HOQAW3aUrt0FxHNVRWd1umElMIvmX7D+/JM="; description = "SSH into Azure VMs using RBAC and AAD OpenSSH Certificates"; propagatedBuildInputs = with python3Packages; [ oras @@ -128,7 +128,7 @@ pname = "storage-preview"; version = "1.0.0b2"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_preview-${version}-py2.py3-none-any.whl"; - sha256 = "2de8fa421622928a308bb70048c3fdf40400bad3b34afd601d0b3afcd8b82764"; + hash = "sha256-Lej6QhYikoowi7cASMP99AQAutOzSv1gHQs6/Ni4J2Q="; description = "Provides a preview for upcoming storage features"; propagatedBuildInputs = with python3Packages; [ azure-core ]; meta.maintainers = with lib.maintainers; [ katexochen ]; From 94bda990a7b0bd693112c9b906f27d216853ca16 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 31 Oct 2024 11:46:43 +0100 Subject: [PATCH 100/369] azure-cli.generate-extensions: use extensions-tool Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/az/azure-cli/package.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index a66bf24ecac8..539571b4fb6d 100644 --- a/pkgs/by-name/az/azure-cli/package.nix +++ b/pkgs/by-name/az/azure-cli/package.nix @@ -383,16 +383,7 @@ py.pkgs.toPythonApplication ( }; generate-extensions = writeScriptBin "${pname}-update-extensions" '' - export FILE=extensions-generated.nix - echo "# This file is automatically generated. DO NOT EDIT! Read README.md" > $FILE - echo "{ mkAzExtension }:" >> $FILE - echo "{" >> $FILE - ${./query-extension-index.sh} --requirements=false --download --nix --cli-version=${version} \ - | xargs -n1 -d '\n' echo " " >> $FILE - echo "" >> $FILE - echo "}" >> $FILE - echo "Extension was saved to \"extensions-generated.nix\" file." - echo "Move it to \"{nixpkgs}/pkgs/by-name/az/azure-cli/extensions-generated.nix\"." + ${lib.getExe azure-cli.extensions-tool} --cli-version ${azure-cli.version} --commit ''; extensions-tool = From ecbc72d1724087f2654323f5305a12278db86a0f Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Thu, 31 Oct 2024 17:52:37 +0100 Subject: [PATCH 101/369] azure-cli-extensions: cleanup old scripts Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- .../az/azure-cli/commit-update-hunks.sh | 19 -- .../az/azure-cli/query-extension-index.sh | 163 ------------------ 2 files changed, 182 deletions(-) delete mode 100755 pkgs/by-name/az/azure-cli/commit-update-hunks.sh delete mode 100755 pkgs/by-name/az/azure-cli/query-extension-index.sh diff --git a/pkgs/by-name/az/azure-cli/commit-update-hunks.sh b/pkgs/by-name/az/azure-cli/commit-update-hunks.sh deleted file mode 100755 index 7a9d913e260e..000000000000 --- a/pkgs/by-name/az/azure-cli/commit-update-hunks.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash - -# Just a tiny imperfect helper script to commit generated updates. -# -# First, ensure that that `git add -p extensions-generated.nix` only -# returns a series of clean update hunks, where each hunk updates a -# single package version. All additions/removals must be committed -# by hand. -# The script will then commit the remaining hunks with fitting commit messages. - -while true; do - echo -e "y\nq" | git add -p extensions-generated.nix || break - pname=$(git diff --no-ext-diff --cached | grep "pname =" | cut -d'"' -f2 | head -n1) || break - versions=$(git diff --no-ext-diff --cached | grep "version =" | cut -d'"' -f2) || break - oldver=$(echo "$versions" | head -n1) || break - newver=$(echo "$versions" | tail -n1) || break - commitmsg="azure-cli-extensions.${pname}: ${oldver} -> ${newver}" - git commit -m "$commitmsg" -done diff --git a/pkgs/by-name/az/azure-cli/query-extension-index.sh b/pkgs/by-name/az/azure-cli/query-extension-index.sh deleted file mode 100755 index 8dbd45ce937e..000000000000 --- a/pkgs/by-name/az/azure-cli/query-extension-index.sh +++ /dev/null @@ -1,163 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -function usage() { - { - echo "${0} - query Azure CLI extension index" - echo - echo "The Azure CLI extension index contains all versions of all extensions. This" - echo "script queries the index for the latest version of an extensions that is" - echo "compatible with the specified version of the Azure CLI. Data for that extension" - echo "is filtered for fields relevant to package the extension in Nix." - echo - echo "Usage:" - echo " --cli-version= version of azure-cli (required)" - echo " --extension= name of extension to query" - echo " --file= path to extension index file" - echo " --download download extension index file" - echo " --nix output Nix expression" - echo " --requirements= filter for extensions with/without requirements" - } >&2 -} - -for arg in "$@"; do - case "$arg" in - --cli-version=*) - cliVer="${arg#*=}" - shift - ;; - --extension=*) - extName="${arg#*=}" - shift - ;; - --file=*) - extensionFile="${arg#*=}" - shift - ;; - --download) - download=true - shift - ;; - --nix) - nix=true - shift - ;; - --requirements=*) - requirements="${arg#*=}" - shift - ;; - --help) - usage - exit 0 - ;; - *) - echo "Unknown argument: $arg" >&2 - exit 1 - ;; - esac -done - -if [[ -z "${cliVer:-}" ]]; then - echo "Missing --cli-version argument" >&2 - exit 1 -fi -if [[ -z "${extensionFile:-}" && -z "${download:-}" ]]; then - echo "Either --file or --download must be specified" >&2 - exit 1 -fi -if [[ -n "${extName:-}" && -n "${requirements:-}" ]]; then - echo "--requirements can only be used when listing all extensions" >&2 - exit 1 -fi - -if [[ "${download:-}" == true ]]; then - extensionFile="$(mktemp)" - echo "Downloading extensions index to ${extensionFile}" >&2 - curl -fsSL "https://azcliextensionsync.blob.core.windows.net/index1/index.json" > "${extensionFile}" -fi - -# shellcheck disable=SC2016 -jqProgram=' - def opt(f): - . as $in | try f catch $in - ; - - def version_to_array: - sub("\\+.*$"; "") - | capture("^(?[^a-z-]+)(?:(?

.*))?") | [.v, .p // empty] - | map(split(".") - | map(opt(tonumber))) - | flatten - ; - - def version_le($contstraint): - version_to_array as $v - | $contstraint | version_to_array as $c - | $v[0] < $c[0] or - ($v[0] == $c[0] and $v[1] < $c[1]) or - ($v[0] == $c[0] and $v[1] == $c[1] and $v[2] < $c[2]) or - ($v[0] == $c[0] and $v[1] == $c[1] and $v[2] == $c[2] and $v[3] <= $c[3]) - ; - - def max_constrained_version($constraint): - [ - .[] | select(.metadata."azext.minCliCoreVersion" // "0.0.0" | version_le($cliVer)) - ] - | sort_by(.metadata.version | version_to_array) - | last - ; - - def translate_struct: - { - pname : .metadata.name, - description: .metadata.summary, - version: .metadata.version, - url: .downloadUrl, - sha256: .sha256Digest, - license: .metadata.license, - requires: .metadata.run_requires.[0].requires - } - ; - - def to_nix: - [.].[] as $in - | .version as $version - | .description as $description - | .url | sub($version;"${version}") as $url - | $description |rtrimstr(".") as $description - | $in.pname + " = mkAzExtension rec {\n" + - " pname = \"" + $in.pname + "\";\n" + - " version = \"" + $in.version + "\";\n" + - " url = \"" + $url + "\";\n" + - " sha256 = \"" + $in.sha256 + "\";\n" + - " description = \"" + $description + "\";\n" + - "};" - ; - - def main: - .extensions - | map(max_constrained_version($cliVer)) - | .[] - | translate_struct - | if $extName != "" then - select(.pname == $extName) - elif $requirements == "false" then - select(.requires == null) - elif $requirements == "true" then - select(.requires != null) - end - | if $nix == "true" then - to_nix - end - ; - - main -' - -jq -r \ - --arg cliVer "${cliVer}" \ - --arg extName "${extName:-}" \ - --arg nix "${nix:-}" \ - --arg requirements "${requirements:-}" \ - "$jqProgram" "${extensionFile}" From 9243491f1ef4fdd0fa62523604e7f875cd7c42e0 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Thu, 31 Oct 2024 15:25:29 -0400 Subject: [PATCH 102/369] sbcl: 2.4.9 -> 2.4.10 --- pkgs/development/compilers/sbcl/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index b50928ce05f3..34632bf4b50d 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -16,12 +16,12 @@ let }; # By unofficial and very loose convention we keep the latest version of # SBCL, and the previous one in case someone quickly needs to roll back. - "2.4.8" = { - sha256 = "sha256-/G7NzFOOgKFKmY1TDMw4SkF5D09Pxs1//oyxJqZ3aUw="; - }; "2.4.9" = { sha256 = "sha256-mXDk68XWlD3GTXyh9S2bXNn8lM75TSMyE9eOx182BeI="; }; + "2.4.10" = { + sha256 = "sha256-zus5a2nSkT7uBIQcKva+ylw0LOFGTD/j5FPy3hDF4vg="; + }; }; # Collection of pre-built SBCL binaries for platforms that need them for # bootstrapping. Ideally these are to be avoided. If ECL (or any other diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa3c31089af6..ee1f3839d831 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23810,17 +23810,17 @@ with pkgs; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl_2_4_8 = wrapLisp { - pkg = callPackage ../development/compilers/sbcl { version = "2.4.8"; }; - faslExt = "fasl"; - flags = [ "--dynamic-space-size" "3000" ]; - }; sbcl_2_4_9 = wrapLisp { pkg = callPackage ../development/compilers/sbcl { version = "2.4.9"; }; faslExt = "fasl"; flags = [ "--dynamic-space-size" "3000" ]; }; - sbcl = sbcl_2_4_9; + sbcl_2_4_10 = wrapLisp { + pkg = callPackage ../development/compilers/sbcl { version = "2.4.10"; }; + faslExt = "fasl"; + flags = [ "--dynamic-space-size" "3000" ]; + }; + sbcl = sbcl_2_4_10; sbclPackages = recurseIntoAttrs sbcl.pkgs; From a26836327d397105a2a643f32e85f6125f260a64 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 09:33:29 -0500 Subject: [PATCH 103/369] sketchybar: switch to apple-sdk_11 --- pkgs/by-name/sk/sketchybar/package.nix | 30 +++++--------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index e0e2a004e6d7..d422801b59c6 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -1,26 +1,15 @@ { lib, - overrideSDK, stdenv, - darwin, fetchFromGitHub, testers, nix-update-script, + apple-sdk_11, + darwinMinVersionHook, }: let inherit (stdenv.hostPlatform) system; - inherit (darwin.apple_sdk_11_0.frameworks) - AppKit - Carbon - CoreAudio - CoreWLAN - CoreVideo - DisplayServices - IOKit - MediaRemote - SkyLight - ; target = { @@ -28,10 +17,8 @@ let "x86_64-darwin" = "x86"; } .${system} or (throw "Unsupported system: ${system}"); - - stdenv' = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; in -stdenv'.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "sketchybar"; version = "2.21.0"; @@ -43,15 +30,8 @@ stdenv'.mkDerivation (finalAttrs: { }; buildInputs = [ - AppKit - Carbon - CoreAudio - CoreWLAN - CoreVideo - DisplayServices - IOKit - MediaRemote - SkyLight + apple-sdk_11 + (darwinMinVersionHook "10.13") ]; makeFlags = [ target ]; From 1278bdd300906bbc3d8ef0e688650fff6bb37aa7 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 18:38:01 -0500 Subject: [PATCH 104/369] sketchybar: add versionCheckHook Check version on build and skip calling --help since it doesn't return version. --- pkgs/by-name/sk/sketchybar/package.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index d422801b59c6..b08e4ca81607 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -2,10 +2,10 @@ lib, stdenv, fetchFromGitHub, - testers, nix-update-script, apple-sdk_11, darwinMinVersionHook, + versionCheckHook, }: let @@ -45,14 +45,11 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru = { - tests.version = testers.testVersion { - package = finalAttrs.finalPackage; - version = "sketchybar-v${finalAttrs.version}"; - }; + passthru.updateScript = nix-update-script { }; - updateScript = nix-update-script { }; - }; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; meta = { description = "Highly customizable macOS status bar replacement"; From 7c8593086c16d746fdd0ed1c2b73a9dfb0c4b648 Mon Sep 17 00:00:00 2001 From: mksafavi Date: Fri, 1 Nov 2024 05:13:28 +0330 Subject: [PATCH 105/369] lms: 3.58.0 -> 3.60.0 --- pkgs/by-name/lm/lms/package.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index 4b2e56deee8f..dec420e3fe52 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "lms"; - version = "3.58.0"; + version = "3.60.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${version}"; - hash = "sha256-sWlD/n9Qjwiu/UfZrxRxwv2rc4XwRZN35fyjIriGZPY="; + hash = "sha256-sLs73356BaFbKtyQc4cTFm7Wp/UemH8J+tkajXAA0do="; }; strictDeps = true; @@ -54,10 +54,7 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace src/lms/main.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" - substituteInPlace src/tools/recommendation/LmsRecommendation.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" - substituteInPlace src/tools/db-generator/LmsDbGenerator.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" - substituteInPlace src/tools/cover/LmsCover.cpp --replace-fail "/etc/lms.conf" "$out/share/lms/lms.conf" + substituteInPlace src/libs/core/include/core/SystemPaths.hpp --replace-fail "/etc" "$out/share/lms" ''; postInstall = '' From 6fafd05b545480b98d90414e3b1e1c148d4f6897 Mon Sep 17 00:00:00 2001 From: zendo Date: Fri, 1 Nov 2024 11:56:51 +0800 Subject: [PATCH 106/369] shortwave: move to by-name --- .../shortwave/default.nix => by-name/sh/shortwave/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/audio/shortwave/default.nix => by-name/sh/shortwave/package.nix} (100%) diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/by-name/sh/shortwave/package.nix similarity index 100% rename from pkgs/applications/audio/shortwave/default.nix rename to pkgs/by-name/sh/shortwave/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e62ac36a9367..47851d96c125 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32219,8 +32219,6 @@ with pkgs; shipments = callPackage ../applications/misc/shipments { }; - shortwave = callPackage ../applications/audio/shortwave { }; - shotgun = callPackage ../tools/graphics/shotgun { }; shot-scraper = callPackage ../tools/graphics/shot-scraper { }; From 27169a4e7200537f5427c1058d08438aae9633cd Mon Sep 17 00:00:00 2001 From: zendo Date: Fri, 1 Nov 2024 12:33:14 +0800 Subject: [PATCH 107/369] shortwave: 3.2.0 -> 4.0.1 --- pkgs/by-name/sh/shortwave/package.nix | 101 +++++++++++++------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/pkgs/by-name/sh/shortwave/package.nix b/pkgs/by-name/sh/shortwave/package.nix index c1f3f53416fd..36eab9d392de 100644 --- a/pkgs/by-name/sh/shortwave/package.nix +++ b/pkgs/by-name/sh/shortwave/package.nix @@ -1,44 +1,46 @@ -{ stdenv -, lib -, fetchFromGitLab -, cargo -, dbus -, desktop-file-utils -, gdk-pixbuf -, gettext -, gitMinimal -, glib -, gst_all_1 -, gtk4 -, libadwaita -, meson -, ninja -, openssl -, pkg-config -, rustPlatform -, rustc -, sqlite -, wrapGAppsHook4 -, cmake -, libshumate +{ + stdenv, + lib, + fetchFromGitLab, + cargo, + dbus, + desktop-file-utils, + gdk-pixbuf, + gettext, + gitMinimal, + glib, + gst_all_1, + gtk4, + libadwaita, + meson, + ninja, + openssl, + pkg-config, + rustPlatform, + rustc, + sqlite, + wrapGAppsHook4, + libshumate, + libseccomp, + lcms2, }: stdenv.mkDerivation rec { pname = "shortwave"; - version = "3.2.0"; + version = "4.0.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Shortwave"; rev = version; - sha256 = "sha256-ESZ1yD1IuBar8bv83xMczZbtPtHbWRpe2yMVyr7K5gQ="; + sha256 = "sha256-W1eOMyiooDesI13lOze/JcxzhSSxYOW6FOY85NkVyps="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-8W46bGAitR2YbZbnsigAZMW5pSFTkDAe5JNaNOH5JfA="; + hash = "sha256-O5K5aNcWwUYkaJbGzTzS3FdNbEsQsdliyi0YShw+6PU="; }; nativeBuildInputs = [ @@ -53,35 +55,34 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustc wrapGAppsHook4 - cmake ]; - buildInputs = [ - dbus - gdk-pixbuf - glib - gtk4 - libadwaita - openssl - sqlite - libshumate - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - ]); + buildInputs = + [ + dbus + gdk-pixbuf + glib + gtk4 + libadwaita + openssl + sqlite + libshumate + libseccomp + lcms2 + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); - meta = with lib; { + meta = { homepage = "https://gitlab.gnome.org/World/Shortwave"; description = "Find and listen to internet radio stations"; mainProgram = "shortwave"; - longDescription = '' - Shortwave is a streaming audio player designed for the GNOME - desktop. It is the successor to the older Gradio application. - ''; - maintainers = with maintainers; [ lasandell ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ lasandell ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; } From f2563b4d4a6ce1732d79c9629e3d28273c3d9752 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 08:05:15 +0000 Subject: [PATCH 108/369] cgal: 5.6.1 -> 5.6.2 --- pkgs/development/libraries/CGAL/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index e7d26606f271..3c0ba58041a4 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { url = "https://github.com/CGAL/cgal/releases/download/v${version}/CGAL-${version}.tar.xz"; - hash = "sha256-zbFefuMeBmNYnTEHp5mIo3t7FxnfPSTyBYVF0bzdWDc="; + hash = "sha256-RY9g346PHy/a2TyPJOGqj0sJXMYaFPrIG5BoDXMGpC4="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; From 9675082459ed204deda6f824dcaf93dd5364d34f Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Fri, 11 Oct 2024 16:14:17 +0300 Subject: [PATCH 109/369] python3Packages.term-image: init at 0.7.2 --- .../python-modules/term-image/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/term-image/default.nix diff --git a/pkgs/development/python-modules/term-image/default.nix b/pkgs/development/python-modules/term-image/default.nix new file mode 100644 index 000000000000..a0a194b47a3c --- /dev/null +++ b/pkgs/development/python-modules/term-image/default.nix @@ -0,0 +1,56 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + setuptools, + pillow, + requests, + urwid, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "term-image"; + version = "0.7.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AnonymouX47"; + repo = "term-image"; + rev = "refs/tags/v${version}"; + hash = "sha256-uA04KHKLXW0lx1y5brpCDARLac4/C8VmVinVMkEtTdM="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + requests + pillow + ]; + + optional-dependencies = { + urwid = [ urwid ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + ] ++ optional-dependencies.urwid; + + disabledTestPaths = [ + # test_url needs online access + "tests/test_image/test_url.py" + ]; + + pythonImportsCheck = [ "term_image" ]; + + meta = { + description = "Display images in the terminal with python"; + homepage = "https://github.com/AnonymouX47/term-image"; + changelog = "https://github.com/AnonymouX47/term-image/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ liff ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae8070db1bb9..8a3335d3b5f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15572,6 +15572,8 @@ self: super: with self; { tellduslive = callPackage ../development/python-modules/tellduslive { }; + term-image = callPackage ../development/python-modules/term-image { }; + termcolor = callPackage ../development/python-modules/termcolor { }; termgraph = callPackage ../development/python-modules/termgraph { }; From 9f6c7f94f5cb73b4c052f7e9aec88d33a4501dd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 11:34:06 +0000 Subject: [PATCH 110/369] kodiPackages.youtube: 7.1.0 -> 7.1.0.1 --- pkgs/applications/video/kodi/addons/youtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index faa623f37e29..f9e37e80d509 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.1.0"; + version = "7.1.0.1"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-I3dSGcPQVVhn4RO8CHtn3FG2dheSv4XiDO7w+MtTjRU="; + hash = "sha256-5tctuY2vYEfkkNVjprnUPJ/crwmMGCEdcRxUQR5EQxw="; }; propagatedBuildInputs = [ From 8c6c8d83f43c00348baeb61c9925ed3d85b5d320 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 11:45:17 +0000 Subject: [PATCH 111/369] grpc_cli: 1.66.2 -> 1.67.1 --- pkgs/tools/networking/grpc_cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 582b8c017cc0..58915a3509e2 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.66.2"; + version = "1.67.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-nka7ZzyZIeEAPaz7v/8RAeo9XmkgrOrHpor3siAx7Ec="; + hash = "sha256-x49mh7gLliAiFjOZM5U/CnMQqs7fAhoipo18OBoeD0w="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; From 4b357e61ad5447ee82f0f19a41005d669e20f477 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 12:32:18 +0000 Subject: [PATCH 112/369] pscale: 0.209.0 -> 0.213.0 --- pkgs/development/tools/pscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index bf055522254a..a73f5f316157 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.209.0"; + version = "0.213.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-XbGxFpkAVPhOShZWE6W/Z26NSOumB+1oh/o0zVVswL8="; + sha256 = "sha256-WgivwlsT8QytB6oaB8lQASq+YQa8lbe/6PwpJUFZifU="; }; - vendorHash = "sha256-5Uul5c8Lwu6SJ7DlLU8+k2Pxa3V/DhqdvK5xY2g6S40="; + vendorHash = "sha256-R0ZabOquZQLONbW6p5xtYKLi8P3Q5JieM4EATT1a83U="; ldflags = [ "-s" "-w" From f6eb69845552485eb889f6600a5b4112622b1445 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 13:12:19 +0000 Subject: [PATCH 113/369] bazelisk: 1.22.0 -> 1.22.1 --- pkgs/development/tools/bazelisk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 1c149e72190c..2afb45ce8ea2 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KD8lh3N9GFlht+HtcuE3i20noVha0lT21a5pSS3zbTw="; + sha256 = "sha256-C5kCCSvIcjZPRXS8ckoHusYCZ4IfsaHeyQC7jLdjZQY="; }; - vendorHash = "sha256-zoiQ69y0EicH9Jq2XYn+fttKHZY64GD4m/Edk+kle9M="; + vendorHash = "sha256-q8W+WSOxR/VC0uU8c2PVZwIer2CDUdDQ64AA2K6KghM="; doCheck = false; From 08d98865e8894fbf857b08daf46d79abb882bf34 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 12:32:31 +0400 Subject: [PATCH 114/369] kotatogram-desktop: stop setting enableParallelBuilding explicitly It's enabled by default anyway --- .../instant-messengers/telegram/kotatogram-desktop/default.nix | 2 -- .../instant-messengers/telegram/kotatogram-desktop/tg_owt.nix | 2 -- 2 files changed, 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index f0c3b4e98721..b4507e680aa0 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -149,8 +149,6 @@ stdenv.mkDerivation rec { libicns ]); - enableParallelBuilding = true; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 922efe2d7bf0..b78b071011fe 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -109,7 +109,5 @@ stdenv.mkDerivation { ApplicationServices ]); - enableParallelBuilding = true; - meta.license = lib.licenses.bsd3; } From 06bf35c3f83eb76ce284ead27a0d07303b2c853d Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 22:54:45 +0900 Subject: [PATCH 115/369] glances: switch to pypa builder --- pkgs/applications/system/glances/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index de72bc7c728f..60a55ab7053c 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -5,20 +5,15 @@ isPyPy, lib, defusedxml, - future, - ujson, packaging, psutil, setuptools, - pydantic, # Optional dependencies: fastapi, jinja2, - orjson, pysnmp, hddtemp, netifaces, # IP module - py-cpuinfo, uvicorn, requests, prometheus-client, @@ -27,6 +22,8 @@ buildPythonApplication rec { pname = "glances"; version = "4.2.0"; + pyproject = true; + disabled = isPyPy; src = fetchFromGitHub { @@ -36,6 +33,8 @@ buildPythonApplication rec { hash = "sha256-liyrMaqBgK7UZjWIKIgIFbskTGaWfyrK8L74DKmaDmY="; }; + build-system = [ setuptools ]; + # On Darwin this package segfaults due to mismatch of pure and impure # CoreFoundation. This issues was solved for binaries but for interpreted # scripts a workaround below is still required. @@ -51,22 +50,16 @@ buildPythonApplication rec { export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks ''; - propagatedBuildInputs = [ + dependencies = [ defusedxml - future - ujson netifaces packaging psutil pysnmp - setuptools - py-cpuinfo - pydantic fastapi uvicorn requests jinja2 - orjson prometheus-client ] ++ lib.optional stdenv.hostPlatform.isLinux hddtemp; From 0289fb4b57caddb74a1e359c93ba3515b479524b Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 23:04:11 +0900 Subject: [PATCH 116/369] glances: enable tests on linux --- pkgs/applications/system/glances/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index 60a55ab7053c..1438e9729af4 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -45,9 +45,15 @@ buildPythonApplication rec { "/System/Library/Frameworks" ]; - doCheck = true; - preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' - export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks + # some tests fail in darwin sandbox + doCheck = !stdenv.hostPlatform.isDarwin; + + checkPhase = '' + runHook preCheck + + python unittest-core.py + + runHook postCheck ''; dependencies = [ From d73d8391fab3f5e02dc056cd868cdbcf84297035 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 1 Nov 2024 15:12:42 +0100 Subject: [PATCH 117/369] code-cursor: 0.42.3 -> 0.42.4 --- pkgs/by-name/co/code-cursor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index c3e879be8e4a..8f6c753577b2 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -8,11 +8,11 @@ }: let pname = "cursor"; - version = "0.42.3"; + version = "0.42.4"; appKey = "230313mzl4w4u92"; src = fetchurl { - url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.42.3-build-241016kxu9umuir-x86_64.AppImage"; - hash = "sha256-GWkilBlpXube//jbxRjmKJjYcmB42nhMY8K0OgkvtwA="; + url = "https://download.todesktop.com/230313mzl4w4u92/cursor-0.42.4-build-2410291z3bdg1dy-x86_64.AppImage"; + hash = "sha256-CD6bQ4T8DhJidiOxNRgRDL4obfEZx7hnO0VotVb6lDc="; }; appimageContents = appimageTools.extractType2 { inherit version pname src; }; in From f3305a504237f6e777261ad778840c579f673fe7 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 23:13:13 +0900 Subject: [PATCH 118/369] djhtml: refactor --- pkgs/development/tools/djhtml/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/djhtml/default.nix b/pkgs/development/tools/djhtml/default.nix index 1c5895466555..1859249eb0f3 100644 --- a/pkgs/development/tools/djhtml/default.nix +++ b/pkgs/development/tools/djhtml/default.nix @@ -1,28 +1,30 @@ { lib , buildPythonApplication , fetchFromGitHub -, pythonOlder +, setuptools }: buildPythonApplication rec { pname = "djhtml"; version = "3.0.7"; - - format = "setuptools"; - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "rtts"; - repo = pname; + repo = "djhtml"; rev = "refs/tags/${version}"; hash = "sha256-W93J3UFUrCqT718zoGcu96ORYFt0NLyYP7iVWbr8FYo="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "djhtml" ]; meta = with lib; { homepage = "https://github.com/rtts/djhtml"; description = "Django/Jinja template indenter"; + changelog = "https://github.com/rtts/djhtml/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = [ ]; + mainProgram = "djhtml"; }; } From e096c65389f657d36e163d5fe97183e94780e61b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 14:30:19 +0000 Subject: [PATCH 119/369] lf: 32 -> 33 --- pkgs/applications/file-managers/lf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/file-managers/lf/default.nix b/pkgs/applications/file-managers/lf/default.nix index 9bbe32fd298e..79975b988926 100644 --- a/pkgs/applications/file-managers/lf/default.nix +++ b/pkgs/applications/file-managers/lf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lf"; - version = "32"; + version = "33"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - hash = "sha256-rFK1M15NcshVY2vtXcMWZhB9Rd/DRC8JyKE5u4wjh2I="; + hash = "sha256-aKvTf2tqAUbB3plOemvgJJ7qYdGfQoXhsGVE7Y9wuMo="; }; - vendorHash = "sha256-r1Kq6CYGNbxTTue3sb3CKMsWZJDzX2dKX7QHQ73nZ8g="; + vendorHash = "sha256-E6uZVsQAiwy3uGXp9COvtJSlgXhXxfS7vOfhM5uBPQw="; nativeBuildInputs = [ installShellFiles ]; From 72364b6dc29c8952ab1376f4424dc8457457189f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 14:59:29 +0000 Subject: [PATCH 120/369] piv-agent: 0.21.2 -> 0.22.0 --- pkgs/by-name/pi/piv-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/piv-agent/package.nix b/pkgs/by-name/pi/piv-agent/package.nix index 5a8f25000efc..84f7db49becb 100644 --- a/pkgs/by-name/pi/piv-agent/package.nix +++ b/pkgs/by-name/pi/piv-agent/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "piv-agent"; - version = "0.21.2"; + version = "0.22.0"; src = fetchFromGitHub { owner = "smlx"; repo = "piv-agent"; rev = "v${version}"; - hash = "sha256-nHxtQaQ5Lc0QAJrWU6fUWViDwOKkxVyj9/B6XZ+Y0zw="; + hash = "sha256-bfJIrWDFQIg0n1RDadARPHhQwE6i7mAMxE5GPYo4WU8="; }; - vendorHash = "sha256-L5HuTYA01w3LUtSy7OVxG6QN5uQZ8LVYyrBcJQTkIUA="; + vendorHash = "sha256-HIB+p0yh7EWudLp1YGoClYbK3hkYEJZ+o+9BbOHE4+0="; subPackages = [ "cmd/piv-agent" ]; From d131ae75a50ca9ec670ba782b40d0e9120a04a6f Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 18 Oct 2024 20:15:59 +0200 Subject: [PATCH 121/369] python312Packages.gradio: 4.44.1 -> 5.1.0 --- .../gradio/conftest-skip-network-errors.py | 2 ++ .../python-modules/gradio/default.nix | 23 ++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py b/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py index eb2385bca8d6..a34ee1bbcd87 100644 --- a/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py +++ b/pkgs/development/python-modules/gradio/conftest-skip-network-errors.py @@ -28,6 +28,8 @@ def pytest_runtest_makereport(item, call): for exc in iterate_exc_chain(call.excinfo.value): if isinstance(exc, NixNetworkAccessDeniedError): tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." + if isinstance(exc, socket.gaierror): + tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." if isinstance(exc, httpx.ConnectError): tr.outcome, tr.wasxfail = 'skipped', "reason: Requires network access." if isinstance(exc, FileNotFoundError): # gradio specific diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix index 2a75ac5ed6e4..1b9e20496f6d 100644 --- a/pkgs/development/python-modules/gradio/default.nix +++ b/pkgs/development/python-modules/gradio/default.nix @@ -64,15 +64,15 @@ buildPythonPackage rec { pname = "gradio"; - version = "4.44.1"; - format = "pyproject"; + version = "5.1.0"; + pyproject = true; disabled = pythonOlder "3.7"; # We use the Pypi release, since it provides prebuilt webui assets src = fetchPypi { inherit pname version; - hash = "sha256-popSSYrGtj+IZO+Ev3hmpw59B+vpE+35IeHSo3CK1a4="; + hash = "sha256-0hU2aObeLfegG7M/AaB0/HcW7IY8QPRy2OQ5Q57x4VM="; }; # fix packaging.ParserSyntaxError, which can't handle comments @@ -83,7 +83,11 @@ buildPythonPackage rec { rm -rf venv/ ''; - pythonRelaxDeps = [ "tomlkit" ]; + pythonRelaxDeps = [ + "tomlkit" + "aiofiles" + "markupsafe" + ]; pythonRemoveDeps = [ # our package is presented as a binary, not a python lib - and @@ -91,7 +95,7 @@ buildPythonPackage rec { "ruff" ]; - nativeBuildInputs = [ + build-system = [ hatchling hatch-requirements-txt hatch-fancy-pypi-readme @@ -168,6 +172,7 @@ buildPythonPackage rec { disabledTests = [ # Actually broken "test_mount_gradio_app" + "test_processing_utils_backwards_compatibility" # type error # requires network, it caught our xfail exception "test_error_analytics_successful" @@ -280,14 +285,16 @@ buildPythonPackage rec { pythonRemoveDeps = (old.pythonRemoveDeps or [ ]) ++ [ "gradio-client" ]; doInstallCheck = false; doCheck = false; + preCheck = ""; pythonImportsCheck = null; dontCheckRuntimeDeps = true; }); - meta = with lib; { + meta = { homepage = "https://www.gradio.app/"; + changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio@${version}"; description = "Python library for easily interacting with trained machine learning models"; - license = licenses.asl20; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pbsds ]; }; } From bac107097b898dbb770caed387ce21795e267be7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 18 Oct 2024 20:16:05 +0200 Subject: [PATCH 122/369] python312Packages.gradio-pdf: 0.0.15 -> 0.0.17 --- .../python-modules/gradio-pdf/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/gradio-pdf/default.nix b/pkgs/development/python-modules/gradio-pdf/default.nix index abceb8b1c5c0..d35698c9f77e 100644 --- a/pkgs/development/python-modules/gradio-pdf/default.nix +++ b/pkgs/development/python-modules/gradio-pdf/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "gradio-pdf"; - version = "0.0.15"; - format = "pyproject"; + version = "0.0.17"; + pyproject = true; src = fetchPypi { pname = "gradio_pdf"; inherit version; - hash = "sha256-R+4CDJo84/+PUTTxoz9CsZlHUVsldgjufWsRkALrfN4="; + hash = "sha256-LoVcwE7eGcK5Nc6qKTnrnI+rNlsDbekhKUP+Fzq2SQ8="; }; - nativeBuildInputs = [ + build-system = [ hatch-fancy-pypi-readme hatch-requirements-txt hatchling @@ -36,10 +36,10 @@ buildPythonPackage rec { # tested in `gradio` doCheck = false; - meta = with lib; { + meta = { description = "Python library for easily interacting with trained machine learning models"; homepage = "https://pypi.org/project/gradio-pdf/"; - license = licenses.asl20; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pbsds ]; }; } From 5f3c27a74ab2a6fd07ad9a0b4fa77af7b5039d80 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 18 Oct 2024 20:29:47 +0200 Subject: [PATCH 123/369] python312Packages.gradio-client: 1.3.0 -> 1.4.0 Diff: https://github.com/gradio-app/gradio/compare/refs/tags/gradio_client@1.3.0...1.4.0 --- pkgs/development/python-modules/gradio/client.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix index d07f962b2668..aa869e445c54 100644 --- a/pkgs/development/python-modules/gradio/client.nix +++ b/pkgs/development/python-modules/gradio/client.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "gradio-client"; - version = "1.3.0"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { # not to be confused with @gradio/client@${version} rev = "refs/tags/gradio_client@${version}"; sparseCheckout = [ "client/python" ]; - hash = "sha256-UZQWguUN3l0cj2wb2f7A61RTLy9nPYcIEwHIo+F1kR0="; + hash = "sha256-pS7yrqBuq/Pe7sEfReAM6OL2qFQVA+vWra36UuhyDkk="; }; prePatch = '' cd client/python @@ -108,10 +108,11 @@ buildPythonPackage rec { extraArgs = [ "--version-regex" "gradio_client@(.*)" ]; }; - meta = with lib; { + meta = { homepage = "https://www.gradio.app/"; + changelog = "https://github.com/gradio-app/gradio/releases/tag/gradio_client@${version}"; description = "Lightweight library to use any Gradio app as an API"; - license = licenses.asl20; - maintainers = with maintainers; [ pbsds ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ pbsds ]; }; } From f532bc1c31f9638d7f6148fd74a03f04a4978fd2 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 12:33:37 +0400 Subject: [PATCH 124/369] kotatogram-desktop-with-webkit: use webkitgtk_4_1 instead of webkitgtk_6_0 This makes web bots work better on X11 --- .../telegram/kotatogram-desktop/with-webkit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index f41713389679..e1d8da67379b 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_6_0, makeWrapper }: +{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_4_1, makeWrapper }: stdenv.mkDerivation { pname = "${kotatogram-desktop.pname}-with-webkit"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { mkdir -p $out/bin makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_6_0 ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_4_1 ]} ''; meta = kotatogram-desktop.meta // { platforms = lib.platforms.linux; From a08fb2c9c2105e764c852a0b4dd7c255c61525c4 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 1 Nov 2024 19:20:13 +0400 Subject: [PATCH 125/369] kotatogram-desktop-with-webkit: fix D-Bus activation --- .../telegram/kotatogram-desktop/with-webkit.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index e1d8da67379b..731042ac924a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -8,6 +8,7 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out cp -r ${kotatogram-desktop}/share $out + substituteInPlace $out/share/dbus-1/services/* --replace-fail ${kotatogram-desktop} $out ''; postFixup = '' mkdir -p $out/bin From e8de72505173f9687010b5effa0c95798aef1b46 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 12:35:01 +0400 Subject: [PATCH 126/369] kotatogram-desktop: move protobuf dependency from tg_owt to kotatogram-desktop That's where it's really used --- .../instant-messengers/telegram/kotatogram-desktop/default.nix | 2 ++ .../instant-messengers/telegram/kotatogram-desktop/tg_owt.nix | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index b4507e680aa0..6b2727c7267e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -18,6 +18,7 @@ , lz4 , xxHash , ffmpeg +, protobuf , openalSoft , minizip , libopus @@ -108,6 +109,7 @@ stdenv.mkDerivation rec { microsoft-gsl boost ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + protobuf qtwayland kcoreaddons alsa-lib diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index b78b071011fe..9b6f64cbbd59 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -10,7 +10,6 @@ , openssl , libopus , ffmpeg -, protobuf , openh264 , crc32c , libvpx @@ -72,7 +71,6 @@ stdenv.mkDerivation { openssl libopus ffmpeg - protobuf openh264 crc32c libvpx From 94da61f36b0c5183dbe6aa35c18dc678144d065b Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 12:33:19 +0400 Subject: [PATCH 127/369] kotatogram-desktop.tg_owt: use hash --- .../instant-messengers/telegram/kotatogram-desktop/tg_owt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 9b6f64cbbd59..40dda5c25347 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { owner = "desktop-app"; repo = "tg_owt"; rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; - sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; + hash = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; fetchSubmodules = true; }; From 1ba6efe7872964fa970512f4bb887cc9d0ee21e1 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 12:43:50 +0400 Subject: [PATCH 128/369] telegram-desktop: stop overriding abseil-cpp It works just fine without that nowadays --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 6f6246702894..bbfb477acf5d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -55,10 +55,8 @@ let tg_owt = callPackage ./tg_owt.nix { + # tg_owt should use the same compiler inherit stdenv; - abseil-cpp = abseil-cpp.override { - cxxStandard = "20"; - }; }; in stdenv.mkDerivation (finalAttrs: { From f4687b2ebf1da72a0bff7475b711132152cecd52 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 12:44:23 +0400 Subject: [PATCH 129/369] telegram-desktop: remove scheme.patch It works just fine without it --- .../telegram/telegram-desktop/default.nix | 4 ---- .../telegram/telegram-desktop/scheme.patch | 12 ------------ 2 files changed, 16 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index bbfb477acf5d..a70a54df2833 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -73,10 +73,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./macos.patch - # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling - # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary - # see https://github.com/NixOS/nixpkgs/issues/218370 - ./scheme.patch ]; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch deleted file mode 100644 index 58aaa8a7fcb5..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp -index e3e0de6c6..d5851bd6e 100644 ---- a/Telegram/SourceFiles/core/application.cpp -+++ b/Telegram/SourceFiles/core/application.cpp -@@ -421,7 +421,6 @@ void Application::run() { - - void Application::autoRegisterUrlScheme() { - if (!OptionSkipUrlSchemeRegister.value()) { -- InvokeQueued(this, [] { RegisterUrlScheme(); }); - } - } - From 0eb0b2c62c0afb0f882989f925d0bf7e4f0eb1a5 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 12:51:24 +0400 Subject: [PATCH 130/369] telegram-desktop: remove outdated cppgir workaround --- .../instant-messengers/telegram/telegram-desktop/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index a70a54df2833..ddb0b8106a93 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -187,11 +187,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "DESKTOP_APP_USE_PACKAGED_FONTS" false) ]; - preBuild = '' - # for cppgir to locate gir files - export GI_GIR_PATH="$XDG_DATA_DIRS" - ''; - installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications From 7276705cb25ef02ff87ead34657db31b0d6b9b4a Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 12:51:50 +0400 Subject: [PATCH 131/369] telegram-desktop: remove cmake flags set to default values --- .../instant-messengers/telegram/telegram-desktop/default.nix | 3 --- pkgs/by-name/_6/_64gram/package.nix | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index ddb0b8106a93..034f7093d49f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -179,12 +179,9 @@ stdenv.mkDerivation (finalAttrs: { }; cmakeFlags = [ - (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) # We're allowed to used the API ID of the Snap package: (lib.cmakeFeature "TDESKTOP_API_ID" "611335") (lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c") - # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 - (lib.cmakeBool "DESKTOP_APP_USE_PACKAGED_FONTS" false) ]; installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index dfca50eb902e..b921efbf2dbc 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -28,6 +28,7 @@ telegram-desktop.overrideAttrs (old: rec { ]; cmakeFlags = (old.cmakeFlags or []) ++ [ + (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) (lib.cmakeBool "disable_autoupdate" true) ]; From a119092084487121048c498c09dd74db27b77012 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 15:24:42 +0000 Subject: [PATCH 132/369] python312Packages.aiovodafone: 0.6.1 -> 0.7.1 --- pkgs/development/python-modules/aiovodafone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix index fc5b91f13a1b..c7665fc0ba6c 100644 --- a/pkgs/development/python-modules/aiovodafone/default.nix +++ b/pkgs/development/python-modules/aiovodafone/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiovodafone"; - version = "0.6.1"; + version = "0.7.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiovodafone"; rev = "refs/tags/v${version}"; - hash = "sha256-ZBy3lo7rb361aysi2ezryd5H47r6sgSqmYNeAI+wXeQ="; + hash = "sha256-BVuDnIp9K+f4jZPPfCABMD+fpPXDQE6/RWTZ8k7ftMI="; }; postPatch = '' From c370dbbc60fb491bdea4180d764549f02b276890 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 12:54:57 +0400 Subject: [PATCH 133/369] telegram-desktop: use webkitgtk_4_1 instead of webkitgtk_6_0 This makes web bots work better on X11 --- .../telegram/telegram-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 034f7093d49f..ce4fb65c143f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -30,7 +30,7 @@ , range-v3 , tl-expected , hunspell -, webkitgtk_6_0 +, webkitgtk_4_1 , jemalloc , rnnoise , protobuf @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \ - --replace-fail '"libwebkitgtk-6.0.so.4"' '"${webkitgtk_6_0}/lib/libwebkitgtk-6.0.so.4"' + --replace-fail '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"' '' + lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster @@ -136,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio pipewire hunspell - webkitgtk_6_0 + webkitgtk_4_1 jemalloc ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa From d1a233b2145ce79e9699decb4190d03425e7b8e7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 Nov 2024 11:30:12 -0400 Subject: [PATCH 134/369] dbip-country-lite: 2024-10 -> 2024-11 --- pkgs/by-name/db/dbip-country-lite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix index 74f9ce977067..c02bdee10547 100644 --- a/pkgs/by-name/db/dbip-country-lite/package.nix +++ b/pkgs/by-name/db/dbip-country-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2024-10"; + version = "2024-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-MeAhfDY2jdX2WDsNGNjvH/JeCo9C1hx3PWyk8am9Ut0="; + hash = "sha256-Ua4hm0duKHAD/cgtOaDqAYT/4lWsuoIdPnM7K0Lqecw="; }; dontUnpack = true; From 0c535f3b9e0689599f6e7294c6c6cfca18378163 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 Nov 2024 11:30:18 -0400 Subject: [PATCH 135/369] dbip-asn-lite: 2024-10 -> 2024-11 --- pkgs/by-name/db/dbip-asn-lite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix index 8d844d3972d4..2f260a639d7c 100644 --- a/pkgs/by-name/db/dbip-asn-lite/package.nix +++ b/pkgs/by-name/db/dbip-asn-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-asn-lite"; - version = "2024-10"; + version = "2024-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-zfBRxZ6xwIrOC6MrmtbfKrIK7jxMD/1EMOgQDON6nPw="; + hash = "sha256-uqtn3Dy8GYjRHX3LNky0DUAc+MxEph41AKShxsPdJJM="; }; dontUnpack = true; From c14c93f4011854d8fdda82193eca627421f5da0d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 Nov 2024 11:30:26 -0400 Subject: [PATCH 136/369] dbip-city-lite: 2024-10 -> 2024-11 --- pkgs/by-name/db/dbip-city-lite/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix index b0e3e4260cbe..c957eb0bc510 100644 --- a/pkgs/by-name/db/dbip-city-lite/package.nix +++ b/pkgs/by-name/db/dbip-city-lite/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-city-lite"; - version = "2024-10"; + version = "2024-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-sPjtO0WRdMxGiTySFO3vA1mL3RHxDnhLFzQ1fq2LNUw="; + hash = "sha256-w/Dl89AdhIfsfNu4IvVMEVKqZtQcqg0UAjB7HJxq/OE="; }; dontUnpack = true; From 70a6092f1e77eccd2521ce8e5a97306aeb2b372c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 Nov 2024 15:44:27 +0100 Subject: [PATCH 137/369] nixos/doc: mention postgresql hardening --- .../manual/release-notes/rl-2411.section.md | 5 +++++ nixos/modules/services/databases/postgresql.md | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 38274583d540..73faa31ce107 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -602,6 +602,11 @@ - `iproute2` now has libbpf support. +- `postgresql` is now [hardened by default](#module-services-postgres-hardening) using the common `systemd` settings for that. + + If you use extensions that are not packaged in nixpkgs, please review whether it still works + with the current settings and adjust accordingly if needed. + - `nix.channel.enable = false` no longer implies `nix.settings.nix-path = []`. Since Nix 2.13, a `nix-path` set in `nix.conf` cannot be overriden by the `NIX_PATH` configuration variable. diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 5108f040e968..6cd3defb24a3 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -364,6 +364,24 @@ postgresql.withJIT.pname evaluates to `"foobar"`. +## Service hardening {#module-services-postgres-hardening} + +The service created by the [`postgresql`-module](#opt-services.postgresql.enable) uses +several common hardening options from `systemd`, most notably: + +* Memory pages must not be both writable and executable (this only applies to non-JIT setups). +* A system call filter (see {manpage}`systemd.exec(5)` for details on `@system-service`). +* A stricter default UMask (`0027`). +* Only sockets of type `AF_INET`/`AF_INET6`/`AF_NETLINK`/`AF_UNIX` allowed. +* Restricted filesystem access (private `/tmp`, most of the file-system hierachy is mounted read-only, only process directories in `/proc` that are owned by the same user). + +The NixOS module also contains necessary adjustments for extensions from `nixpkgs` +if these are enabled. If an extension or a postgresql feature from `nixpkgs` breaks +with hardening, it's considered a bug. + +When using extensions that are not packaged in `nixpkgs`, hardening adjustments may +become necessary. + ## Notable differences to upstream {#module-services-postgres-upstream-deviation} - To avoid circular dependencies between default and -dev outputs, the output of the `pg_config` system view has been removed. From 48d9153f3ba7b2b89b2066da28b9265883b2f366 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 02:12:33 +0000 Subject: [PATCH 138/369] grandorgue: 3.15.1-1 -> 3.15.2-1 --- .../audio/grandorgue/darwin-fixes.patch | 13 +++++++++++++ pkgs/applications/audio/grandorgue/default.nix | 11 +++-------- 2 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/audio/grandorgue/darwin-fixes.patch diff --git a/pkgs/applications/audio/grandorgue/darwin-fixes.patch b/pkgs/applications/audio/grandorgue/darwin-fixes.patch new file mode 100644 index 000000000000..f38a1dded2ec --- /dev/null +++ b/pkgs/applications/audio/grandorgue/darwin-fixes.patch @@ -0,0 +1,13 @@ +diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt +index d231e3d1..73f389a2 100644 +--- a/resources/CMakeLists.txt ++++ b/resources/CMakeLists.txt +@@ -62,7 +62,7 @@ if(WIN32) + DEPENDS "${CMAKE_SOURCE_DIR}/resources/GrandOrgue.manifest") + LIST(APPEND DEPLIST "${RESOURCEDIR}/GOIcon.ico" "${RESOURCEDIR}/GrandOrgue.rc" "${RESOURCEDIR}/GrandOrgue.manifest") + elseif(APPLE) +- ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND iconutil -c icns --output "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR} DEPENDS ${GENERATED_ICONS}) ++ ADD_CUSTOM_COMMAND(OUTPUT "${RESOURCEDIR}/GrandOrgue.icns" COMMAND png2icns "${RESOURCEDIR}/GrandOrgue.icns" ${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png DEPENDS ${GENERATED_ICONS}) + INSTALL(FILES "${RESOURCEDIR}/GrandOrgue.icns" DESTINATION "${RESOURCEINSTDIR}") + LIST(APPEND DEPLIST "${RESOURCEDIR}/GrandOrgue.icns") + elseif(UNIX) diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 771bef276221..7b3be4d9bb0d 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -21,22 +21,17 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.15.1-1"; + version = "3.15.2-1"; src = fetchFromGitHub { owner = "GrandOrgue"; repo = "grandorgue"; rev = version; fetchSubmodules = true; - hash = "sha256-5uAA878OBc04PkUgCwoRtc6lIASivq3YcfFffTae6uM="; + hash = "sha256-U0DAWCzhXqdL2klSFQjnLiWp7yTdw/n0dmNUJSAg/5c="; }; - postPatch = '' - substituteInPlace resources/CMakeLists.txt \ - --replace \ - "iconutil -c icns \''${GENERATED_ICONS_DIR}" \ - "png2icns \''${GENERATED_ICONS_DIR}/../GrandOrgue.icns \''${GENERATED_ICONS_DIR}/*{16,32,128,256,512,1024}.png" \ - ''; + patches = [ ./darwin-fixes.patch ]; nativeBuildInputs = [ cmake pkg-config imagemagick libicns makeWrapper ]; From 3db5cf0403d5c3a4c056496bd2893a3e10b12a21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Oct 2024 11:49:47 +0000 Subject: [PATCH 139/369] spicy-parser-generator: 1.11.2 -> 1.11.3 --- pkgs/development/tools/parsing/spicy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index 6751e7db17d0..095e679f8ccd 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "spicy"; - version = "1.11.2"; + version = "1.11.3"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "zeek"; repo = "spicy"; rev = "v${version}"; - hash = "sha256-cWK/LdV73VkiUpXyK+M7AotD7ucmNvh3HOzpxtCfGQM="; + hash = "sha256-SKhNBqZRgeN2cZZ2lv/IsOqaa5LY666OlICewN/iPVA="; fetchSubmodules = true; }; From 0c096dcd87e6773d979e659f67e88d1b2b3e1160 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 15:47:09 +0000 Subject: [PATCH 140/369] python312Packages.webrtc-models: 0.1.0 -> 0.2.0 --- pkgs/development/python-modules/webrtc-models/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webrtc-models/default.nix b/pkgs/development/python-modules/webrtc-models/default.nix index d03d77ca4924..5b2524dc0bc5 100644 --- a/pkgs/development/python-modules/webrtc-models/default.nix +++ b/pkgs/development/python-modules/webrtc-models/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "webrtc-models"; - version = "0.1.0"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-webrtc-models"; rev = "refs/tags/${version}"; - hash = "sha256-Wmz+P4FFJJZujWF0SR6HVERNNO7xSM1iCayg6tmVyso="; + hash = "sha256-6fVcp9kWr5nV4wOKov3ObqyPJo+u3jN443qv++sJ0TQ="; }; postPatch = '' From 4b411e35cb567c0441a9c3964aca80de15de37a1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 1 Nov 2024 16:56:12 +0100 Subject: [PATCH 141/369] edopro: Fixups Co-authored-by: Redhawk <77415970+Redhawk18@users.noreply.github.com> --- pkgs/by-name/ed/edopro/deps.nix | 5 +- .../ed/edopro/ocgcore-lua-symbols.patch | 29 ---- pkgs/by-name/ed/edopro/package.nix | 148 ++++++++---------- pkgs/by-name/ed/edopro/update.py | 14 +- 4 files changed, 66 insertions(+), 130 deletions(-) delete mode 100644 pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch diff --git a/pkgs/by-name/ed/edopro/deps.nix b/pkgs/by-name/ed/edopro/deps.nix index 6ca795ffab29..e45c21c0f662 100644 --- a/pkgs/by-name/ed/edopro/deps.nix +++ b/pkgs/by-name/ed/edopro/deps.nix @@ -4,11 +4,8 @@ assets-hash = "sha256-vZhkWJ1ZoNEwdc5kM1S0hyXnWmupiTOanCi9DCuqw/k="; edopro-version = "40.1.4"; edopro-rev = "c713e23491a1e55c9d8e91257e5f2b5873696b9b"; - edopro-hash = "sha256-2E1cjG0FONu/fbr67/3qRCKQ1W/wPznClEWsMa1FAzo="; + edopro-hash = "sha256-mj0xEJsFcnY//za0uJosAPOPbU/jlduNX0YSNmvduLE="; irrlicht-version = "1.9.0-unstable-2023-02-18"; irrlicht-rev = "7edde28d4f8c0c3589934c398a3a441286bb7c22"; irrlicht-hash = "sha256-Q2tNiYE/enZPqA5YhUe+Tkvmqtmmz2E0OqTRUDnt+UA="; - ocgcore-version = "0-unstable-2022-09-15"; - ocgcore-rev = "4a872ad7686e0d00ee4c1c051e90fc07c40613d4"; - ocgcore-hash = "sha256-s3DOHrZilRUy6fbXObNiLRinxpdHY99vDOmS/ZfOI78="; } diff --git a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch b/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch deleted file mode 100644 index 253051ebf0f7..000000000000 --- a/pkgs/by-name/ed/edopro/ocgcore-lua-symbols.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41e750142b44465f3af197b7e2f0d6f54fc48c2d Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Mon, 21 Oct 2024 17:42:24 +0200 -Subject: [PATCH] Mark Lua symbols as C symbols - -Otherwise linking against our Lua built by a C-compiler fails due to the symbols being resolved as C++ symbols. ---- - interpreter.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/interpreter.h b/interpreter.h -index 6c405a1..c471ecb 100644 ---- a/interpreter.h -+++ b/interpreter.h -@@ -9,9 +9,11 @@ - #define INTERPRETER_H_ - - // Due to longjmp behaviour, we must build Lua as C++ to avoid UB -+extern "C" { - #include - #include - #include -+} - - #include "common.h" - #include --- -2.44.1 - diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix index 89dd0acf3d86..adf1c896b0d3 100644 --- a/pkgs/by-name/ed/edopro/package.nix +++ b/pkgs/by-name/ed/edopro/package.nix @@ -15,6 +15,7 @@ # Use fmt 10+ after release 40.1.4+ fmt_9, freetype, + irrlicht, libevent, libgit2, libGL, @@ -25,7 +26,6 @@ libX11, libxkbcommon, libXxf86vm, - lua5_3, mono, nlohmann_json, openal, @@ -50,6 +50,11 @@ let .${stdenv.hostPlatform.system} or (throw "${stdenv.hostPlatform.system} is an unsupported arch label for edopro"); + maintainers = with lib.maintainers; [ + OPNA2608 + redhawk + ]; + deps = import ./deps.nix; in let @@ -78,9 +83,7 @@ let ]; enableParallelBuilding = true; - buildFlags = [ - "NDEBUG=1" - ]; + buildFlags = [ "NDEBUG=1" ]; makeFlags = [ "-C" "source/Irrlicht" @@ -89,57 +92,18 @@ let installPhase = '' runHook preInstall - mkdir -p $out/{bin,include} - cp lib/Linux/libIrrlicht.a $out/bin - cp -r include/* $out/include + install -Dm644 -t $out/lib lib/Linux/libIrrlicht.a + cp -r include $out/include runHook postInstall ''; - }; - ocgcore = stdenv.mkDerivation { - pname = "ygopro-core"; - version = deps.ocgcore-version; - - src = fetchFromGitHub { - owner = "edo9300"; - repo = "ygopro-core"; - rev = deps.ocgcore-rev; - hash = deps.ocgcore-hash; - fetchSubmodules = true; + meta = { + inherit (irrlicht.meta) description platforms; + homepage = "https://github.com/edo9300/irrlicht1-8-4"; + license = lib.licenses.agpl3Plus; + inherit maintainers; }; - - patches = [ - ./ocgcore-lua-symbols.patch - ]; - - nativeBuildInputs = [ premake5 ]; - - buildInputs = [ lua5_3 ]; - - preBuild = '' - premake5 gmake2 \ - --lua-path="${lua5_3}" - ''; - - enableParallelBuilding = true; - buildFlags = [ - "verbose=true" - "config=release" - "ocgcoreshared" - ]; - makeFlags = [ - "-C" - "build" - ]; - - installPhase = '' - runHook preInstall - - install -Dm644 -t $out/lib bin/release/libocgcore${stdenv.hostPlatform.extensions.sharedLibrary} - - runHook postInstall - ''; }; edopro = stdenv.mkDerivation { @@ -151,7 +115,6 @@ let repo = "edopro"; rev = deps.edopro-rev; hash = deps.edopro-hash; - fetchSubmodules = true; }; nativeBuildInputs = [ @@ -171,9 +134,7 @@ let libjpeg libpng libvorbis - lua5_3 nlohmann_json - ocgcore openal SDL2 sqlite @@ -183,6 +144,8 @@ let postPatch = '' substituteInPlace premake5.lua \ --replace-fail 'flags "LinkTimeOptimization"' 'removeflags "LinkTimeOptimization"' + + touch ocgcore/premake5.lua ''; preBuild = '' @@ -191,7 +154,7 @@ let --covers=\"${covers_url}\" \ --fields=\"${fields_url}\" \ --pics=\"${pics_url}\" \ - --prebuilt-core="${lib.getLib ocgcore}/lib" \ + --no-core \ --sound=sfml ''; @@ -205,7 +168,7 @@ let buildFlags = [ "verbose=true" "config=release_${archLabel}" - "ygopro" + "ygoprodll" ]; makeFlags = [ "-C" @@ -216,8 +179,8 @@ let runHook preInstall mkdir -p $out/bin - cp bin/${archLabel}/release/ygopro $out/bin - wrapProgram $out/bin/ygopro \ + cp bin/${archLabel}/release/ygoprodll $out/bin + wrapProgram $out/bin/ygoprodll \ --prefix PATH : ${lib.makeBinPath [ mono ]} \ --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ @@ -233,12 +196,30 @@ let runHook postInstall ''; + + meta = { + description = "Bleeding-edge automatic duel simulator, a fork of the YGOPro client"; + homepage = "https://projectignis.github.io"; + changelog = "https://github.com/edo9300/edopro/releases"; + license = lib.licenses.agpl3Plus; + mainProgram = "ygoprodll"; + # This is likely a very easy app to port if you're interested. + # We just have no way to test on other platforms. + platforms = [ + "x86_64-linux" + # Currently offline mode does not work, the problem is that the core is updated whenever it is needed. + # So in our method we would have to update the client if it's statically linked as well. + # It is possible but we have decided against it for now. In theory if we added more logic to the update script it could work. + "aarch64-linux" + ]; + inherit maintainers; + }; }; edopro-script = let assetsToCopy = lib.concatStringsSep "," [ - # Needed if we download files from ProjectIgnis' website or any https only website. + # Needed if we download files from ProjectIgnis' website or any https-only website. "cacert.pem" "config" "deck" @@ -267,17 +248,18 @@ let rm $EDOPRO_DIR/config/io.github.edo9300.EDOPro.desktop.in fi - exec ${edopro}/bin/ygopro -C $EDOPRO_DIR $@ + exec ${lib.getExe edopro} -C $EDOPRO_DIR $@ ''; edopro-desktop = runCommandLocal "io.github.edo9300.EDOPro.desktop" { } '' - cp ${assets}/config/io.github.edo9300.EDOPro.desktop.in desktop-template + mkdir -p $out/share/applications - sed '/Path=/d' -i desktop-template - sed 's/Exec=.*/Exec=EDOPro/' -i desktop-template - sed 's/Icon=.*/Icon=EDOPro/' -i desktop-template - - install -D desktop-template $out/share/applications/io.github.edo9300.EDOPro.desktop + sed ${assets}/config/io.github.edo9300.EDOPro.desktop.in \ + -e '/Path=/d' \ + -e 's/Exec=.*/Exec=edopro/' \ + -e 's/Icon=.*/Icon=edopro/' \ + -e 's/StartupWMClass=.*/StartupWMClass=edopro/' \ + >$out/share/applications/io.github.edo9300.EDOPro.desktop ''; in symlinkJoin { @@ -289,30 +271,28 @@ symlinkJoin { ]; postBuild = '' - mkdir -p $out/share/icons/hicolor/256x256/apps/ - ${imagemagick}/bin/magick \ - ${assets}/textures/AppIcon.png \ - -resize 256x256 \ - $out/share/icons/hicolor/256x256/apps/EDOPro.png + for size in 16 32 48 64 128 256 512 1024; do + res="$size"x"$size" + mkdir -p $out/share/icons/hicolor/"$res"/apps/ + ${imagemagick}/bin/magick \ + ${assets}/textures/AppIcon.png \ + -resize "$res" \ + $out/share/icons/hicolor/"$res"/apps/edopro.png + done ''; passthru.updateScript = ./update.py; meta = { - description = "Bleeding-edge automatic duel simulator, a fork of the YGOPro client"; - homepage = "https://projectignis.github.io"; - changelog = "https://github.com/edo9300/edopro/releases"; - license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ - OPNA2608 - redhawk - ]; + inherit (edopro.meta) + description + homepage + changelog + license + platforms + maintainers + ; + # To differenciate it from the original YGOPro mainProgram = "edopro"; - # This is likely a very easy app to port if you're interested. - # We just have no way to test on other platforms. - platforms = [ - "x86_64-linux" - "aarch64-linux" - ]; }; } diff --git a/pkgs/by-name/ed/edopro/update.py b/pkgs/by-name/ed/edopro/update.py index 05976976773d..c7594b758d21 100755 --- a/pkgs/by-name/ed/edopro/update.py +++ b/pkgs/by-name/ed/edopro/update.py @@ -15,14 +15,6 @@ DEPS_PATH: str = "./pkgs/by-name/ed/edopro/deps.nix" with GitHub(UnauthAuthStrategy()) as github: edopro: Tag = github.rest.repos.list_tags("edo9300", "edopro").parsed_data[0] - ocgcore_submodule: ContentSubmodule = github.rest.repos.get_content( - "edo9300", "edopro", "ocgcore" - ).parsed_data - - ocgcore: Commit = github.rest.repos.get_commit( - "edo9300", "ygopro-core", ocgcore_submodule.sha - ).parsed_data - # This dep is not versioned in anyway and is why we check below to see if this is a new version. irrlicht: Commit = github.rest.repos.list_commits( "edo9300", "irrlicht1-8-4" @@ -64,8 +56,7 @@ def get_hash(owner: str, repo: str, rev: str, submodule: bool = False) -> str: return out_json["hash"] -edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha, submodule=True) -ocgcore_hash = get_hash("edo9300", "ygopro-core", ocgcore.sha) +edopro_hash = get_hash("edo9300", "edopro", edopro.commit.sha) irrlicht_hash = get_hash("edo9300", "irrlicht1-8-4", irrlicht.sha) asset_legacy_hash: str = ( @@ -110,9 +101,6 @@ with open(DEPS_PATH, "w") as file: irrlicht-version = "{"1.9.0-unstable-" + irrlicht.commit.committer.date.split("T")[0]}"; irrlicht-rev = "{irrlicht.sha}"; irrlicht-hash = "{irrlicht_hash}"; - ocgcore-version = "{"0-unstable-" + ocgcore.commit.committer.date.split("T")[0]}"; - ocgcore-rev = "{ocgcore.sha}"; - ocgcore-hash = "{ocgcore_hash}"; }} """ From 65cac1fc8cfee8b15f8c86efc51733b86dd1b250 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 1 Nov 2024 11:10:03 -0500 Subject: [PATCH 142/369] balena-cli: format --- pkgs/tools/admin/balena-cli/default.nix | 61 ++++++++++++++----------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index e4bb9ba3ae2d..7c93a23fb181 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, buildNpmPackage -, overrideSDK -, fetchFromGitHub -, testers -, balena-cli -, node-gyp -, python3 -, udev -, cctools -, darwin +{ + lib, + stdenv, + buildNpmPackage, + overrideSDK, + fetchFromGitHub, + testers, + balena-cli, + node-gyp, + python3, + udev, + cctools, + darwin, }: let @@ -17,7 +18,8 @@ let buildNpmPackage' = buildNpmPackage.override { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; -in buildNpmPackage' rec { +in +buildNpmPackage' rec { pname = "balena-cli"; version = "19.0.13"; @@ -35,19 +37,23 @@ in buildNpmPackage' rec { ''; makeCacheWritable = true; - nativeBuildInputs = [ - node-gyp - python3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools - ]; + nativeBuildInputs = + [ + node-gyp + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - udev - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Cocoa - ]; + buildInputs = + lib.optionals stdenv.hostPlatform.isLinux [ + udev + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.Cocoa + ]; passthru.tests.version = testers.testVersion { package = balena-cli; @@ -69,7 +75,10 @@ in buildNpmPackage' rec { homepage = "https://github.com/balena-io/balena-cli"; changelog = "https://github.com/balena-io/balena-cli/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; - maintainers = [ maintainers.kalebpace maintainers.doronbehar ]; + maintainers = [ + maintainers.kalebpace + maintainers.doronbehar + ]; mainProgram = "balena"; }; } From 1a5d66c1d8796bf86c2339b327ae5cd1841c9778 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 1 Nov 2024 17:00:57 +0100 Subject: [PATCH 143/369] spicy-parser-generator: fix x86_64-darwin build --- pkgs/development/tools/parsing/spicy/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/parsing/spicy/default.nix b/pkgs/development/tools/parsing/spicy/default.nix index 095e679f8ccd..6199fad8e637 100644 --- a/pkgs/development/tools/parsing/spicy/default.nix +++ b/pkgs/development/tools/parsing/spicy/default.nix @@ -7,6 +7,7 @@ , bison , flex , zlib +, apple-sdk_11 }: stdenv.mkDerivation rec { @@ -34,6 +35,8 @@ stdenv.mkDerivation rec { buildInputs = [ flex zlib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_11 ]; postPatch = '' @@ -64,5 +67,6 @@ stdenv.mkDerivation rec { ''; license = licenses.bsd3; maintainers = with maintainers; [ tobim ]; + platforms = platforms.unix; }; } From c18e0380973687edb92ebaf75cd55bb1d15ccdb9 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 20 Jun 2024 14:28:54 +0200 Subject: [PATCH 144/369] writeTextFile: add support for passthru --- pkgs/build-support/trivial-builders/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index b0c9f93649c9..3b202881a85b 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -82,6 +82,7 @@ rec { , destination ? "" , checkPhase ? "" , meta ? { } + , passthru ? { } , allowSubstitutes ? false , preferLocalBuild ? true , derivationArgs ? { } @@ -105,7 +106,8 @@ rec { { mainProgram = lib.head matches; } // meta // derivationArgs.meta or {}; - } // removeAttrs derivationArgs [ "passAsFile" "meta" ]) + passthru = passthru // derivationArgs.passthru or {}; + } // removeAttrs derivationArgs [ "passAsFile" "meta" "passthru" ]) '' target=$out${lib.escapeShellArg destination} mkdir -p "$(dirname "$target")" From f4789133b8e654eab873582b35b91b5f3cd6e0be Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 20 Jun 2024 15:38:01 +0200 Subject: [PATCH 145/369] concatTextFile: add passthru argument --- pkgs/build-support/trivial-builders/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 3b202881a85b..84b945d7647c 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -368,9 +368,10 @@ rec { , destination ? "" # relative path appended to $out eg "/bin/foo" , checkPhase ? "" # syntax checks, e.g. for scripts , meta ? { } + , passthru ? { } }: runCommandLocal name - { inherit files executable checkPhase meta destination; } + { inherit files executable checkPhase meta passthru destination; } '' file=$out$destination mkdir -p "$(dirname "$file")" From d04d2858c928ae57bec19d32b43ab5e3c91b9823 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 20 Jun 2024 15:38:17 +0200 Subject: [PATCH 146/369] writeShellApplication: add passthru argument --- pkgs/build-support/trivial-builders/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 84b945d7647c..c5b27e85e5bb 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -222,6 +222,12 @@ rec { Type: AttrSet */ meta ? { }, + /* + `stdenv.mkDerivation`'s `passthru` argument. + + Type: AttrSet + */ + passthru ? { }, /* The `checkPhase` to run. Defaults to `shellcheck` on supported platforms and `bash -n`. @@ -265,7 +271,7 @@ rec { derivationArgs ? { }, }: writeTextFile { - inherit name meta derivationArgs; + inherit name meta passthru derivationArgs; executable = true; destination = "/bin/${name}"; allowSubstitutes = true; From 3bd63f44d582db718e70cebb5f7c85e27cdc88e9 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Fri, 1 Nov 2024 17:24:08 +0100 Subject: [PATCH 147/369] conduwuit: fix x86_64-darwin --- pkgs/by-name/co/conduwuit/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/conduwuit/package.nix b/pkgs/by-name/co/conduwuit/package.nix index 733b502246a0..f0ff83fe73b6 100644 --- a/pkgs/by-name/co/conduwuit/package.nix +++ b/pkgs/by-name/co/conduwuit/package.nix @@ -6,7 +6,8 @@ bzip2, zstd, stdenv, - darwin, + apple-sdk_15, + darwinMinVersionHook, rocksdb, nix-update-script, testers, @@ -63,7 +64,9 @@ rustPlatform.buildRustPackage rec { ++ lib.optional enableJemalloc rust-jemalloc-sys' ++ lib.optional enableLiburing liburing ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Security + apple-sdk_15 + # aws-lc-sys requires CryptoKit's CommonCrypto, which is available on macOS 10.15+ + (darwinMinVersionHook "10.15") ]; env = { From d97ca5ce744a45020a31a6ac4f19b7f07454e51d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 16:26:23 +0000 Subject: [PATCH 148/369] rush-parallel: 0.5.6 -> 0.5.7 --- pkgs/by-name/ru/rush-parallel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix index 930eab157eed..c1db6cf152fd 100644 --- a/pkgs/by-name/ru/rush-parallel/package.nix +++ b/pkgs/by-name/ru/rush-parallel/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "rush-parallel"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "shenwei356"; repo = "rush"; rev = "v${version}"; - hash = "sha256-u3KGjZ5C8jDuAKE/dy4zR+EEFb35aJtj2YkwIb+kad4="; + hash = "sha256-xwU6ZPGhaMxIsowTxWUxMDXO7hlWg2KynGGDX1dMZmo="; }; vendorHash = "sha256-zCloMhjHNkPZHYX1e1nx072IYbWHFWam4Af0l0s8a6M="; From 65a20bbd7fa8df2751ceda888d4fc2262f49eaee Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 1 Nov 2024 16:37:09 +0000 Subject: [PATCH 149/369] koboldcpp: 1.76 -> 1.77 Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.77 Diff: https://github.com/LostRuins/koboldcpp/compare/v1.76...v1.77 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index df10f0a4fd81..40cc23278ea7 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -53,13 +53,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.76"; + version = "1.77"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-0zV9aZIfNnbV/K6xYUp+ucdJvdEfuGdKgE/Q7vcBopQ="; + hash = "sha256-dyu//4LRjpdxkyA9M5yNDO0DA7inZZjH4pSkj6l2afk="; }; enableParallelBuilding = true; From 7bb0c854ee53d64d8f8938c6083d4268b4c7c353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Fri, 1 Nov 2024 16:44:30 +0000 Subject: [PATCH 150/369] zx: 8.1.9 -> 8.2.0 Diff: https://github.com/google/zx/compare/8.1.9...8.2.0 Changelog: https://github.com/google/zx/releases/tag/8.2.0 --- pkgs/tools/system/zx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index 0ceafe655e6b..edb53c145578 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zx"; - version = "8.1.9"; + version = "8.2.0"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-vy53g6nG/krK1PsfIKEdok67ghf9Jm2xNMmZpU2N+A0="; + hash = "sha256-tu5arRnbIVEVkmLBrutW8rNIHN3joA87AYyO+Smmcug="; }; - npmDepsHash = "sha256-bKckzwvJNWDYkF1ZBwB9RpzJAVTIoAjoKK8D3V8RHmQ="; + npmDepsHash = "sha256-TEVEa0hvSRFp1ju1Ajer4u7mdf4y/N3ged8wuXzyy8A="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 1356c59f6d414d590ef3f706c0437f6b0b36c741 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Fri, 1 Nov 2024 16:46:46 +0000 Subject: [PATCH 151/369] keycastr: 0.9.18 -> 0.10.1 --- pkgs/by-name/ke/keycastr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keycastr/package.nix b/pkgs/by-name/ke/keycastr/package.nix index 5eca502af147..8efa645b49aa 100644 --- a/pkgs/by-name/ke/keycastr/package.nix +++ b/pkgs/by-name/ke/keycastr/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "keycastr"; - version = "0.9.18"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/keycastr/keycastr/releases/download/v${finalAttrs.version}/KeyCastr.app.zip"; - hash = "sha256-q12c/W0yGoVL+wx+T/gaevx2P0Xwcv0a0FMv7bKfUnE="; + hash = "sha256-Ea/QtYiM7J2Gc5T8M+WizSBrgmhJ+NW4ern2A58glUk="; }; sourceRoot = "."; From 269236bbd4b253f702da9844369e0be4cf8c857a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 16:52:07 +0000 Subject: [PATCH 152/369] seqkit: 2.8.2 -> 2.9.0 --- pkgs/applications/science/biology/seqkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix index 0fbda84ccea7..c5fb63c66eda 100644 --- a/pkgs/applications/science/biology/seqkit/default.nix +++ b/pkgs/applications/science/biology/seqkit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "seqkit"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-jCzd36ds9YVBpnyR3gDJSX3CCVXzC9WkQWmkcDiDWfM="; + sha256 = "sha256-xPlqS0tYx077YD/MIxGFn8Bdy4h25dY8idhypIj28rI="; }; - vendorHash = "sha256-0//kySYhNmfiwiys/Ku0/8RzKpnxO0+byD8pcIkvDY0="; + vendorHash = "sha256-EzEomz9GVcirx+Uk1Ygmmb1/GkdUS9aBStLxuNzjHAU="; meta = with lib; { description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation"; From c055b007ece0431b45f9f79d75c2c861f8ee86f5 Mon Sep 17 00:00:00 2001 From: Matteo Pacini Date: Fri, 1 Nov 2024 16:56:17 +0000 Subject: [PATCH 153/369] easyaudiosync: 1.1.1 -> 1.1.2 --- .../easyaudiosync/0001-fix-project-name.patch | 4 ++-- .../0002-fix-qt67-deprecated-methods.patch | 21 ------------------- .../audio/easyaudiosync/default.nix | 5 ++--- 3 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 pkgs/applications/audio/easyaudiosync/0002-fix-qt67-deprecated-methods.patch diff --git a/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch b/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch index ed7a462d02c6..ebd13112e796 100644 --- a/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch +++ b/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7065538..b2716e1 100644 +index 34f3094..b161ba8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ if (VCPKG) @@ -8,6 +8,6 @@ index 7065538..b2716e1 100644 -project("Easy Audio Sync" +project("easyaudiosync" - VERSION 1.1.1 + VERSION 1.1.2 DESCRIPTION "Audio library syncing and conversion utility" HOMEPAGE_URL "https://github.com/complexlogic/EasyAudioSync" diff --git a/pkgs/applications/audio/easyaudiosync/0002-fix-qt67-deprecated-methods.patch b/pkgs/applications/audio/easyaudiosync/0002-fix-qt67-deprecated-methods.patch deleted file mode 100644 index 523c1821a10f..000000000000 --- a/pkgs/applications/audio/easyaudiosync/0002-fix-qt67-deprecated-methods.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e7befae..8689f13 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -43,11 +43,14 @@ configure_file("${PROJECT_SOURCE_DIR}/translations/languages.hpp.in" "${PROJECT_ - - # Make lupdate target for Qt 6 - if (${QT_VERSION} VERSION_GREATER_EQUAL "6") -- qt_add_lupdate(${EXECUTABLE_NAME} -+ qt_add_lupdate( - TS_FILES ${TS_FILES} "${PROJECT_SOURCE_DIR}/translations/source.ts" -+ SOURCE_TARGETS ${EXECUTABLE_NAME} - ) - endif () --qt_add_translation(QM_FILES "${TS_FILES}") -+qt_add_translations( -+ ${EXECUTABLE_NAME} -+) - foreach (FILE ${QM_FILES}) - get_filename_component(BASENAME ${FILE} NAME) - string(APPEND TRANSLATION_FILES " ${BASENAME}\n") diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/applications/audio/easyaudiosync/default.nix index 38fe6b15d937..b5f6a522ff5a 100644 --- a/pkgs/applications/audio/easyaudiosync/default.nix +++ b/pkgs/applications/audio/easyaudiosync/default.nix @@ -15,18 +15,17 @@ stdenv.mkDerivation rec { pname = "easyaudiosync"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "complexlogic"; repo = "EasyAudioSync"; rev = "v${version}"; - hash = "sha256-w98tj9BuixPhuDgwn74EYY0gvKH6kbfQmtg030RWRU0="; + hash = "sha256-UCOL4DzynKjNDvS0HZ4/K+Wn5lOqHZ0bNop0zqJl5kc="; }; patches = [ ./0001-fix-project-name.patch - ./0002-fix-qt67-deprecated-methods.patch ./0003-fix-darwin-app.patch ./0004-force-qt6.patch ]; From 2da5697d50c8f37916230be8a381c525f44a602e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 19 Oct 2024 06:42:12 +0000 Subject: [PATCH 154/369] xca: 2.7.0 -> 2.8.0 --- pkgs/applications/misc/xca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 2ddb36a87de8..04237ea7a742 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xca"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "chris2511"; repo = "xca"; rev = "RELEASE.${finalAttrs.version}"; - hash = "sha256-Ty6j0Fl2smMGxp+1nnD3Fu83bn19gqtRKSA1wDgNZes="; + hash = "sha256-2TqqHTutG+5YU2mJNTS3pvtEqV7qKVB+j/dipdmEkIk="; }; buildInputs = [ openssl qtbase ]; From 5bc28f17c9fce37ae81bd209e0f2e7c513cdc772 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 17:06:52 +0000 Subject: [PATCH 155/369] kubecm: 0.31.0 -> 0.32.0 --- pkgs/applications/networking/cluster/kubecm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix index 494d5e5e1b2e..cef37279778a 100644 --- a/pkgs/applications/networking/cluster/kubecm/default.nix +++ b/pkgs/applications/networking/cluster/kubecm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-Go2lroa8lq1XjIzvdA5ZL/lOjTAyDKopBepqgWzsUII="; + hash = "sha256-wwAJha576P5Gt70Ys83IS4Pe1qAKvq46ucnjAcRKEKA="; }; - vendorHash = "sha256-BrSYfxftrnNOcPgG/rsTF3OukDd+VlOvE7OJcos7vW4="; + vendorHash = "sha256-7NW6j5GzOCP0Eb6IVeC9NRtMJl4ujXPWoWu/NvkMxYA="; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; doCheck = false; From 5a117e377ca2790557575e029ab733c8f77c9bb8 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 1 Nov 2024 18:13:58 +0100 Subject: [PATCH 156/369] python312Packages.cachier: 3.1.1 -> 3.1.2 Changelog: https://github.com/python-cachier/cachier/releases/tag/v3.1.2 --- pkgs/development/python-modules/cachier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cachier/default.nix b/pkgs/development/python-modules/cachier/default.nix index fc1bad68f3aa..e040c536c54e 100644 --- a/pkgs/development/python-modules/cachier/default.nix +++ b/pkgs/development/python-modules/cachier/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "cachier"; - version = "3.1.1"; + version = "3.1.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "python-cachier"; repo = "cachier"; rev = "refs/tags/v${version}"; - hash = "sha256-LVGdPBDPj3c7eyOMt+JM0WynkJjmxzgsBlsfQCa8Wv0="; + hash = "sha256-siighT6hMicN+F/LIXfUAPQ2kkRiyk7CtjqmyC/qCFg="; }; pythonRemoveDeps = [ "setuptools" ]; From 954c49aa1c0f121ed05e92ce25bf82eb75649b78 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 1 Nov 2024 18:16:24 +0100 Subject: [PATCH 157/369] xca: fix darwin build --- pkgs/applications/misc/xca/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 04237ea7a742..0863756777e2 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -36,6 +36,13 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + dontWrapQtApps = stdenv.hostPlatform.isDarwin; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + mv "$out/xca.app" "$out/Applications/xca.app" + ''; + meta = with lib; { description = "X509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; mainProgram = "xca"; From 97addf2aff58acd74a049cd06b81482337117c4c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 Nov 2024 18:16:48 +0100 Subject: [PATCH 158/369] php83Extensions.couchbase: mark as broken ZHF #352882 Doesn't compile with PHP 8.3: https://hydra.nixos.org/build/276605925 We actually want to use the `couchbase-php-client`[1] repo. I briefly tried to package it, but given that I don't care a bit about this specific extension and it was far too annoying (vendored C++ libraries, .gitattributes removing CMake files from the GitHub tarball, a random CMake "package manager" is used) I decided to not bother. If nobody steps up, I'd suggest to throw it out when PHP 8.2 becomes EOL. [1] https://github.com/couchbase/couchbase-php-client/ --- pkgs/development/php-packages/couchbase/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 2ed284fe6079..381ec3734243 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -5,6 +5,7 @@ libcouchbase, zlib, substituteAll, + php, }: let pname = "couchbase"; @@ -40,5 +41,6 @@ buildPecl { license = licenses.asl20; homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html"; maintainers = teams.php.members; + broken = lib.versionAtLeast php.version "8.3"; }; } From d8cba43834746cd88347e2c4f96d9909a933174f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Oct 2024 11:01:05 +0000 Subject: [PATCH 159/369] bazarr: 1.4.4 -> 1.4.5 --- pkgs/servers/bazarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 3e8cac490961..86541b67996a 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.4.4"; + version = "1.4.5"; src = fetchzip { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - hash = "sha256-FZKGHC7CLzIzOXH77iHwSb9+Mw1z+kiz+1rLO6XU/94="; + hash = "sha256-BV+ON+SavPc0ZUlIk6tlsvmWub8TiYSSJSRutZb1q+g="; stripRoot = false; }; From bf517c0e5539122c4c301e418f04c066e2403978 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 11 Oct 2024 09:07:40 +0000 Subject: [PATCH 160/369] rdkafka: 2.5.3 -> 2.6.0 --- pkgs/development/libraries/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 569752ceaa81..bc0983599b36 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rdkafka"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg="; + sha256 = "sha256-QjmVu9d/wlLjt5WWyZi+WEWibfDUynHGvTwLbH36T84="; }; nativeBuildInputs = [ pkg-config python3 which ]; From badaebad24ca3306dc8675d6bff6358e9b7df647 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 21 Sep 2024 15:17:46 +0900 Subject: [PATCH 161/369] python312Packages.confluent-kafka: build with pypaBuildHook --- .../python-modules/confluent-kafka/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index e078836c9121..ecdcd5759349 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -13,12 +13,13 @@ rdkafka, requests, requests-mock, + setuptools, }: buildPythonPackage rec { pname = "confluent-kafka"; version = "2.5.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -31,18 +32,24 @@ buildPythonPackage rec { buildInputs = [ rdkafka ]; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; optional-dependencies = { avro = [ avro fastavro + requests ]; json = [ jsonschema pyrsistent + requests ]; - protobuf = [ protobuf ]; + protobuf = [ + protobuf + requests + ]; + schema-registry = [ requests ]; }; nativeCheckInputs = [ From a0034081298c792ea8fec56efd4eecec2152d707 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 Nov 2024 18:32:56 +0100 Subject: [PATCH 162/369] php84Extensions.xdebug: mark as broken https://hydra.nixos.org/build/276609037 --- pkgs/development/php-packages/xdebug/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 84ac38f6c4b8..56fff995095e 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -1,6 +1,7 @@ { buildPecl, lib, + php, fetchFromGitHub, }: @@ -29,5 +30,6 @@ buildPecl { homepage = "https://xdebug.org/"; license = lib.licenses.php301; maintainers = lib.teams.php.members; + broken = lib.versionAtLeast php.version "8.4"; }; } From c54778b34570e8487dfc62def1291f69f89d3ae5 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 Nov 2024 18:33:23 +0100 Subject: [PATCH 163/369] php84Extensions.swoole: mark as broken https://hydra.nixos.org/build/276557313 We have to await version 6.0 to support PHP 8.4. --- pkgs/development/php-packages/swoole/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/php-packages/swoole/default.nix b/pkgs/development/php-packages/swoole/default.nix index 6cc399be10dc..7b52c838f473 100644 --- a/pkgs/development/php-packages/swoole/default.nix +++ b/pkgs/development/php-packages/swoole/default.nix @@ -33,5 +33,6 @@ buildPecl { homepage = "https://www.swoole.com"; license = lib.licenses.asl20; maintainers = lib.teams.php.members; + broken = lib.versionAtLeast php.version "8.4"; }; } From d4f3913b1e6e36c4cd3ddd2092bf20ecd0218c26 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 Nov 2024 18:33:54 +0100 Subject: [PATCH 164/369] php84Extensions.phalcon: mark as broken https://hydra.nixos.org/build/276605866 --- pkgs/development/php-packages/phalcon/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index b5d89ee6a0d2..e571c746f652 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -33,5 +33,6 @@ buildPecl rec { license = licenses.bsd3; homepage = "https://phalcon.io"; maintainers = teams.php.members ++ [ maintainers.krzaczek ]; + broken = lib.versionAtLeast php.version "8.4"; }; } From 4be7bdeb146790408f932ecfc19ef25f65ebaee3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 Nov 2024 18:34:14 +0100 Subject: [PATCH 165/369] php84Extensions.openswoole: mark as broken https://hydra.nixos.org/build/276670463 --- pkgs/development/php-packages/openswoole/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index b250db4a3003..0a56b3f0e774 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -5,6 +5,7 @@ valgrind, pcre2, fetchFromGitHub, + php, }: let @@ -34,5 +35,6 @@ buildPecl { You can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process. ''; maintainers = teams.php.members; + broken = lib.versionAtLeast php.version "8.4"; }; } From f960d7534c0a92a532fb5a483d49c200c4bb39cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 14 Sep 2024 16:39:06 +0000 Subject: [PATCH 166/369] python312Packages.manimpango: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/manimpango/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 8218dcce9a6c..7c285f8fff9a 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { version = "0.6.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; From fd1d12a791cdba5e8893f8734acad897ee596c56 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 21 Sep 2024 15:01:25 +0900 Subject: [PATCH 167/369] python312Packages.manimpango: switch to pypaBuildHook --- .../python-modules/manimpango/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 7c285f8fff9a..d16c1dd29e6f 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -3,8 +3,8 @@ stdenv, buildPythonPackage, fetchFromGitHub, - python, pkg-config, + setuptools, pango, cython, AppKit, @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "manimpango"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -30,19 +30,22 @@ buildPythonPackage rec { buildInputs = [ pango ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ]; - propagatedBuildInputs = [ cython ]; + build-system = [ + setuptools + cython + ]; nativeCheckInputs = [ pytestCheckHook ]; + preCheck = '' + rm -r manimpango + ''; + postPatch = '' substituteInPlace setup.cfg \ --replace "--cov --no-cov-on-fail" "" ''; - preBuild = '' - ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace - ''; - pythonImportsCheck = [ "manimpango" ]; meta = with lib; { From 74b5aa68dc7428d0f82da368343fa69b5cbbe57e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 21 Sep 2024 15:02:53 +0900 Subject: [PATCH 168/369] python312Packages.manimpango: add pytest-cov-stub to nativeCheckInputs --- .../development/python-modules/manimpango/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index d16c1dd29e6f..383dfd40f327 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -8,6 +8,7 @@ pango, cython, AppKit, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: @@ -35,17 +36,15 @@ buildPythonPackage rec { cython ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytest-cov-stub + pytestCheckHook + ]; preCheck = '' rm -r manimpango ''; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov --no-cov-on-fail" "" - ''; - pythonImportsCheck = [ "manimpango" ]; meta = with lib; { From 59053abdf68730d6a0cd7fed3d8db3602e58e625 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 21 Sep 2024 15:05:12 +0900 Subject: [PATCH 169/369] python312Packages.manimpango: stop pname misuse --- pkgs/development/python-modules/manimpango/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/manimpango/default.nix b/pkgs/development/python-modules/manimpango/default.nix index 383dfd40f327..9197d44043e8 100644 --- a/pkgs/development/python-modules/manimpango/default.nix +++ b/pkgs/development/python-modules/manimpango/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ManimCommunity"; - repo = pname; + repo = "manimpango"; rev = "refs/tags/v${version}"; hash = "sha256-nN+XOnki8fG7URMy2Fhs2X+yNi8Y7wDo53d61xaRa3w="; }; From 4d0027d56d6afe42d93c21ed19c90f57e73e3a08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 20 Oct 2024 15:52:29 +0000 Subject: [PATCH 170/369] python312Packages.speechrecognition: 3.10.4 -> 3.11.0 --- pkgs/development/python-modules/speechrecognition/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix index ee20791679c0..547ac9e02628 100644 --- a/pkgs/development/python-modules/speechrecognition/default.nix +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "speechrecognition"; - version = "3.10.4"; + version = "3.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Uberi"; repo = "speech_recognition"; rev = "refs/tags/${version}"; - hash = "sha256-icXZUg2lVLo8Z5t9ptDj67BjQLnEgrG8geYZ/lZeJt4="; + hash = "sha256-5DZ5QhaYpVtd+AX5OSYD3cM+37Ez0+EL5a+zJ+X/uNg="; }; postPatch = '' From d16747df5673863733788ee1fab2e1f2c06321e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 21 Oct 2024 21:24:05 +0200 Subject: [PATCH 171/369] python312Packages.speechrecognition: add optional-dependencies - update disabled --- .../development/python-modules/speechrecognition/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix index 547ac9e02628..d53493b0a992 100644 --- a/pkgs/development/python-modules/speechrecognition/default.nix +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { version = "3.11.0"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Uberi"; @@ -47,6 +47,7 @@ buildPythonPackage rec { ]; optional-dependencies = { + audio = [ pyaudio ]; whisper-api = [ openai ]; whisper-local = [ openai-whisper @@ -57,7 +58,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pocketsphinx - ] ++ optional-dependencies.whisper-local ++ optional-dependencies.whisper-api; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); pythonImportsCheck = [ "speech_recognition" ]; From b732492974e0d9b9301c79bcb02cf2550d18a59e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 17:45:32 +0000 Subject: [PATCH 172/369] python312Packages.cvss: 3.2 -> 3.3 --- pkgs/development/python-modules/cvss/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cvss/default.nix b/pkgs/development/python-modules/cvss/default.nix index 5cbd7ab56bf4..c4b0dce62587 100644 --- a/pkgs/development/python-modules/cvss/default.nix +++ b/pkgs/development/python-modules/cvss/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cvss"; - version = "3.2"; + version = "3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "RedHatProductSecurity"; repo = "cvss"; rev = "refs/tags/v${version}"; - hash = "sha256-r4IWaOEZUX+3wW47rX8+lsixIjr14zAaXfFIFcbLVMM="; + hash = "sha256-+8aKNPcHFPcDyBvOO9QCVb1OIbpQHAEeJgt8fob0+lM="; }; build-system = [ setuptools ]; From 6fa26cc089aa0c5418c18d2bc99511068afb65a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 16 Oct 2024 19:49:37 +0000 Subject: [PATCH 173/369] exodus: 24.19.4 -> 24.41.3 --- pkgs/by-name/ex/exodus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix index b301e4e26cd8..09759bb7e5ff 100644 --- a/pkgs/by-name/ex/exodus/package.nix +++ b/pkgs/by-name/ex/exodus/package.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "exodus"; - version = "24.19.4"; + version = "24.41.3"; src = requireFile { name = "exodus-linux-x64-${finalAttrs.version}.zip"; url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip"; - hash = "sha256-+g7DdDrSVmBl1wCSCoJcO2gmbWQBnJUYqjT+GuDlCYw="; + hash = "sha256-cq8vHE/wAGRu20F3N3q9F+JXLV8VgGbo5JE9Q2OFuMw="; }; nativeBuildInputs = [ unzip ]; From 55cc00d85b37139b03697ad70038b8556722783f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 14 Oct 2024 09:43:23 +0000 Subject: [PATCH 174/369] yubihsm-shell: 2.5.0 -> 2.6.0 --- pkgs/tools/security/yubihsm-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/tools/security/yubihsm-shell/default.nix index 90af2f22068a..d9dea4c4fb9a 100644 --- a/pkgs/tools/security/yubihsm-shell/default.nix +++ b/pkgs/tools/security/yubihsm-shell/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yubihsm-shell"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubihsm-shell"; rev = version; - hash = "sha256-QTDFL/UTnnG0TuojJ0eVKw8fNEqZz86CXWb6uHvzUbs="; + hash = "sha256-0IsdIhuKpzfArVB4xBaxCPqtk0fKWb6RuGImUj1E4Zs="; }; postPatch = '' From 0e48c6f3c718f4a97d18e254e6c7b3cdfed36c6d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 1 Nov 2024 19:04:17 +0100 Subject: [PATCH 175/369] yubihsm-shell: mark as broken on darwin --- pkgs/tools/security/yubihsm-shell/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/yubihsm-shell/default.nix b/pkgs/tools/security/yubihsm-shell/default.nix index d9dea4c4fb9a..107053ca00a7 100644 --- a/pkgs/tools/security/yubihsm-shell/default.nix +++ b/pkgs/tools/security/yubihsm-shell/default.nix @@ -70,5 +70,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Yubico/yubihsm-shell"; maintainers = with maintainers; [ matthewcroughan ]; license = licenses.asl20; + platforms = platforms.all; + broken = stdenv.hostPlatform.isDarwin; }; } From 11c20b26cccb3dd1c1d2326fca70bc9859e01a99 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 Nov 2024 19:13:57 +0100 Subject: [PATCH 176/369] php84Extensions.soap: skip tests See https://hydra.nixos.org/build/275613910 The issue that symbols from `session.so` cannot be loaded doesn't happen when building a PHP with ext-soap enabled. To me it seems as if PHP just doesn't find it on runtime. My current hypothesis is that this is because ext-soap now depends on ext-session[1]. [1] https://github.com/php/php-src/commit/c7797fc8c0503c18791fd651f5ebdd7164b4bc48 --- pkgs/top-level/php-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0d864e837ff2..0307e5185a1d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -663,7 +663,7 @@ in { # Some tests are causing issues in the Darwin sandbox with issues # such as # Unknown: php_network_getaddresses: getaddrinfo for localhost failed: nodename nor servname provided - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = !stdenv.hostPlatform.isDarwin && lib.versionOlder php.version "8.4"; internalDeps = [ php.extensions.session ]; patches = lib.optionals (lib.versions.majorMinor php.version == "8.1") [ # Fix tests with libxml2 2.12 From 8236f19edb88f11949d250ae9d8e6d23d6432502 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 Nov 2024 19:16:35 +0100 Subject: [PATCH 177/369] phpPackages.psysh: update hashes I originally wanted to investigate what went wrong here, but I guess that the tag just got force-pushed. See https://hydra.nixos.org/build/276639542 --- pkgs/development/php-packages/psysh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix index e30fc51cfd8b..ffa163168286 100644 --- a/pkgs/development/php-packages/psysh/default.nix +++ b/pkgs/development/php-packages/psysh/default.nix @@ -19,7 +19,7 @@ let composerLock = fetchurl { name = "composer.lock"; url = "https://github.com/bobthecow/psysh/releases/download/v${version}/composer-v${version}.lock"; - hash = "sha256-ur6mzla3uXeFL6aEHAPdpxGdvcgzOgTLW/CKPbNqeCg="; + hash = "sha256-PQDWShzvTY8yF+OUPVJAV0HMx0/KnA03TDhZUM7ppXw="; }; in php.buildComposerProject2 (finalAttrs: { @@ -45,7 +45,7 @@ php.buildComposerProject2 (finalAttrs: { composer update --lock --no-install ''; - vendorHash = "sha256-mW276lzOTCY68EnvSVR+tD+gh3Y61GrWchVJHDZ4dpg="; + vendorHash = "sha256-tKy2A3dGGmZZzZF0JxtG6NYMfG/paQsuxAO1y3GfCsA="; }; meta = { From 33926c661bc12750da0d909921ee72d0374cd6b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 18:27:47 +0000 Subject: [PATCH 178/369] python312Packages.neo4j: 5.25.0 -> 5.26.0 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index 4e36e2dc37ec..0aa2309df04b 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.25.0"; + version = "5.26.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-aGUfyfN85JNOQSnnM+zep07cmLqq9YN1bc7UyH3uFWg="; + hash = "sha256-4rvs313MU4EXqpnxRZPKy5Z64OJmQnsWRq9T0MIoaOo="; }; postPatch = '' From 39f735299c83716580172693ea5d05ca04f8410b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 18:29:56 +0000 Subject: [PATCH 179/369] notes: 2.3.0 -> 2.3.1 --- pkgs/by-name/no/notes/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix index 83af624af20c..af926182fa91 100644 --- a/pkgs/by-name/no/notes/package.nix +++ b/pkgs/by-name/no/notes/package.nix @@ -12,13 +12,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "notes"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "nuttyartist"; repo = "notes"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z89Z7Il9K9pOxvNfFCoRUkRs0Wf5a6TQACDbBrQhGyw="; + hash = "sha256-ceZ37torgnxZJybacjnNG+kNAU/I2Ki7ZZ7Tzn4pIas="; fetchSubmodules = true; }; From c98ecdb4e15c178af3f3fffed6a94720d486c9d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 18:31:38 +0000 Subject: [PATCH 180/369] gql: 0.28.0 -> 0.29.1 --- pkgs/applications/version-management/gql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gql/default.nix b/pkgs/applications/version-management/gql/default.nix index 4e8cfbfd43fc..957ac402fb42 100644 --- a/pkgs/applications/version-management/gql/default.nix +++ b/pkgs/applications/version-management/gql/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.28.0"; + version = "0.29.1"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-BA94Q8nRf4NptVBHSMYLMEklB9vHaXRU1+o7shXhkZQ="; + hash = "sha256-Py2wTWuUfr6Poxtab4JikG4D7Iv6mBocLEbn0zgz+k8="; }; - cargoHash = "sha256-L+o0ZhTI7x01DpGuhWrvzvSZDYHc++31svWTJ41qx90="; + cargoHash = "sha256-BAaHnBkTmk58uAnZyZ7id1WmKz/HiOKSvdZApmgk6rs="; nativeBuildInputs = [ pkg-config From 8c78ce46de8ad94815a40149624c7bd88d611aff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Oct 2024 23:14:44 +0000 Subject: [PATCH 181/369] ocamlPackages.backoff: 0.1.0 -> 0.1.1 --- pkgs/development/ocaml-modules/backoff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/backoff/default.nix b/pkgs/development/ocaml-modules/backoff/default.nix index 5f8f7a12d79b..75ee51ede5c7 100644 --- a/pkgs/development/ocaml-modules/backoff/default.nix +++ b/pkgs/development/ocaml-modules/backoff/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "backoff"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { url = "https://github.com/ocaml-multicore/backoff/releases/download/${version}/backoff-${version}.tbz"; - hash = "sha256-EaSseCKekNE03gaNiqh5Y11r8TF9XulR9AZboPWMIwA="; + hash = "sha256-AL6jEbInsbwKVYedpNzjix/YRHtOTizxk6aVNzesnwM="; }; doCheck = true; @@ -20,5 +20,5 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; - minimalOCamlVersion = "4.13"; + minimalOCamlVersion = "4.12"; } From 8eb50527fcff13273a53428da2149e53b443dcc3 Mon Sep 17 00:00:00 2001 From: PapayaJackal <145766029+PapayaJackal@users.noreply.github.com> Date: Sun, 20 Oct 2024 18:30:35 +0000 Subject: [PATCH 182/369] mvt: init at 2.5.4 --- pkgs/by-name/mv/mvt/package.nix | 51 +++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/by-name/mv/mvt/package.nix diff --git a/pkgs/by-name/mv/mvt/package.nix b/pkgs/by-name/mv/mvt/package.nix new file mode 100644 index 000000000000..21659483fa3c --- /dev/null +++ b/pkgs/by-name/mv/mvt/package.nix @@ -0,0 +1,51 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mvt"; + pyproject = true; + version = "2.5.4"; + + src = fetchFromGitHub { + owner = "mvt-project"; + repo = "mvt"; + rev = "refs/tags/v${version}"; + hash = "sha256-xDUjyvOsiweRqibTe7V8I/ABeaahCoR/d5w23qixp9A"; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + adb-shell + appdirs + click + cryptography + libusb1 + iosbackup + packaging + pyahocorasick + pyyaml + requests + rich + simplejson + tld + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + pytest-mock + stix2 + ]; + + meta = { + description = "Tool to facilitate the consensual forensic analysis of Android and iOS devices"; + homepage = "https://docs.mvt.re/en/latest/"; + # https://github.com/mvt-project/mvt/blob/main/LICENSE + license = lib.licenses.unfree; + changelog = "https://github.com/mvt-project/mvt/releases/tag/v${version}"; + maintainers = with lib.maintainers; [ PapayaJackal ]; + }; +} From 9acb28c23e6933fe15e5a177620eff84a790f4d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 20:36:56 +0100 Subject: [PATCH 183/369] checkov: 3.2.271 -> 3.2.276 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.271...3.2.276 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.276 --- pkgs/development/tools/analysis/checkov/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 88d62e6a1be2..c8abce3e4f54 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.271"; + version = "3.2.276"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-d0WUn/wrwDY+w2mTUBslwwzjwZ5wFhNtRubtN7DikEI="; + hash = "sha256-oN1KMe+a5iqC+VhIgKqm+JddIU+xjJ7LzBQ2wT2F1sA="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { "cyclonedx-python-lib" "dpath" "igraph" + "importlib-metadata" "license-expression" "networkx" "openai" @@ -44,9 +45,7 @@ python3.pkgs.buildPythonApplication rec { "pycep-parser" ]; - build-system = with python3.pkgs; [ - setuptools-scm - ]; + build-system = with python3.pkgs; [ setuptools-scm ]; dependencies = with python3.pkgs; [ aiodns From cd2e893843b485a112280ffa156329f17ea4a533 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 19:54:51 +0000 Subject: [PATCH 184/369] osv-scanner: 1.9.0 -> 1.9.1 --- pkgs/tools/security/osv-scanner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index 35835d0dcc59..3426e424ea95 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "osv-scanner"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-hK8hvD59X+JzeBtYqwlfNBy2XX7slzMKoIHxL8DmRGc="; + hash = "sha256-s288EHtF/YRkPVwe7b1+q/1ky8tQdHvzb8GaOPpRqTw="; }; - vendorHash = "sha256-IVtdZCwjGrGr0DuyPCkt5DJQhD8mN7bEFI41e0a3s8s="; + vendorHash = "sha256-DNUkUmxzej/NDwJ3lgPek/6C3/ytjlHmFIb1IvKvAQs="; subPackages = [ "cmd/osv-scanner" From 91d94c1feda8d573b0bbdd61ff543b4f75a47dab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 19:54:58 +0000 Subject: [PATCH 185/369] chezmoi: 2.52.3 -> 2.53.1 --- pkgs/by-name/ch/chezmoi/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix index ffae0dd265ec..af04bdfc1413 100644 --- a/pkgs/by-name/ch/chezmoi/package.nix +++ b/pkgs/by-name/ch/chezmoi/package.nix @@ -8,16 +8,16 @@ let argset = { pname = "chezmoi"; - version = "2.52.3"; + version = "2.53.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${argset.version}"; - hash = "sha256-OoVf0Gxyd+hTlM4VOei1atNEZYL2ZF3eKAHyUqRkRzs="; + hash = "sha256-E7kr2fKBabbFVmtVRjgYy5TWhvQYb/RjhiNEcXYXL0E="; }; - vendorHash = "sha256-QJkTscj3MvmscanEqA9Md2OZPYoNtxIJsAd2J6E9zHk="; + vendorHash = "sha256-wOdDG/J/JYGNUGSUCPVCNtO+5TFkt5O5kFYniQgcN7A="; nativeBuildInputs = [ installShellFiles From ca5e6ff11316f24538aa0e868afdbc6fec9993d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 19:57:16 +0000 Subject: [PATCH 186/369] hugo: 0.136.4 -> 0.136.5 --- pkgs/by-name/hu/hugo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index 7a8f3f8bd214..2d57470e8cc0 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -12,13 +12,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.136.4"; + version = "0.136.5"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; rev = "refs/tags/v${version}"; - hash = "sha256-wCv0lZqvJNOwL/naFuGb6k0Xyk58NpgH1mkhoNnkSno="; + hash = "sha256-NluV9/tqWTRfs2u9g4cHC1TyrxOXx3ghOZ4GDx7OZFo="; }; vendorHash = "sha256-KqDsa7MlSONyn7AYOepQ95q1CEM83AhWk23iYSQ4twU="; From 5b787fd860ab40521bbdfb9854426dc76afe94cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 20:58:03 +0100 Subject: [PATCH 187/369] evillimiter: modernize --- .../ev/evillimiter/package.nix} | 40 +++++++++---------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 18 insertions(+), 24 deletions(-) rename pkgs/{tools/networking/evillimiter/default.nix => by-name/ev/evillimiter/package.nix} (63%) diff --git a/pkgs/tools/networking/evillimiter/default.nix b/pkgs/by-name/ev/evillimiter/package.nix similarity index 63% rename from pkgs/tools/networking/evillimiter/default.nix rename to pkgs/by-name/ev/evillimiter/package.nix index a96151a3355f..9f4fb0bfc2f4 100644 --- a/pkgs/tools/networking/evillimiter/default.nix +++ b/pkgs/by-name/ev/evillimiter/package.nix @@ -1,28 +1,26 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, colorama -, iproute2 -, iptables -, netaddr -, netifaces -, scapy -, terminaltables -, tqdm +{ + lib, + fetchFromGitHub, + iproute2, + iptables, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "evillimiter"; version = "1.5.0"; + pyproject = true; src = fetchFromGitHub { owner = "bitbrute"; - repo = pname; - rev = "v${version}"; - sha256 = "1l0acd4a36wzz1gyc6mcw3zpagyi2mc425c6d4c6anq3jxwm3847"; + repo = "evillimiter"; + rev = "refs/tags/v${version}"; + hash = "sha256-h6BReZcDW2UYaYYVQVgV0T91/+CsGuZf+J+boUhjCtA="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools-scm ]; + + dependencies = with python3Packages; [ colorama iproute2 iptables @@ -33,14 +31,11 @@ buildPythonApplication rec { tqdm ]; - # no tests present + # Project has no tests doCheck = false; - pythonImportsCheck = [ "evillimiter.evillimiter" ]; - - meta = with lib; { + meta = with lib; { description = "Tool that monitors, analyzes and limits the bandwidth"; - mainProgram = "evillimiter"; longDescription = '' A tool to monitor, analyze and limit the bandwidth (upload/download) of devices on your local network without physical or administrative access. @@ -48,7 +43,8 @@ buildPythonApplication rec { bandwidth of hosts on the network. ''; homepage = "https://github.com/bitbrute/evillimiter"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "evillimiter"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a060ec069721..13e2c5a9939e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7328,8 +7328,6 @@ with pkgs; eventstat = callPackage ../os-specific/linux/eventstat { }; - evillimiter = python3Packages.callPackage ../tools/networking/evillimiter { }; - evtest = callPackage ../applications/misc/evtest { }; evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { }; From eddda0f350bb2e2688596f97a209fc1e2b1ef2d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 21:15:48 +0100 Subject: [PATCH 188/369] python312Packages.aioflo: refactor --- .../python-modules/aioflo/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/aioflo/default.nix b/pkgs/development/python-modules/aioflo/default.nix index 13b51bf8ad21..a67453821a8d 100644 --- a/pkgs/development/python-modules/aioflo/default.nix +++ b/pkgs/development/python-modules/aioflo/default.nix @@ -15,34 +15,29 @@ buildPythonPackage rec { pname = "aioflo"; version = "2021.11.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "bachya"; - repo = pname; - rev = version; + repo = "aioflo"; + rev = "refs/tags/${version}"; hash = "sha256-7NrOoc1gi8YzZaKvCnHnzAKPlMnMhqxjdyZGN5H/8TQ="; }; patches = [ - # This patch removes references to setuptools and wheel that are no longer - # necessary and changes poetry to poetry-core, so that we don't need to add - # unnecessary nativeBuildInputs. - # - # https://github.com/bachya/aioflo/pull/65 - # (fetchpatch { + # Clean-up, https://github.com/bachya/aioflo/pull/65 name = "clean-up-build-dependencies.patch"; url = "https://github.com/bachya/aioflo/commit/f38d3f6427777ab0eeb56177943679e2570f0634.patch"; hash = "sha256-iLgklhEZ61rrdzQoO6rp1HGZcqLsqGNitwIiPNLNHQ4="; }) ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ aiohttp ]; + dependencies = [ aiohttp ]; __darwinAllowLocalNetworking = true; @@ -55,10 +50,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioflo" ]; + disabledTests = [ + # test is out-dated + "test_system_modes" + ]; + meta = with lib; { description = "Python library for Flo by Moen Smart Water Detectors"; homepage = "https://github.com/bachya/aioflo"; - license = with licenses; [ mit ]; + changelog = "https://github.com/bachya/aioflo/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From a91276b43a66143bac6f8aaef2f99cdec6b603bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 21:20:34 +0100 Subject: [PATCH 189/369] python312Packages.cdcs: disable failing test --- pkgs/development/python-modules/cdcs/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/cdcs/default.nix b/pkgs/development/python-modules/cdcs/default.nix index 38c643cd10a4..05be12f05226 100644 --- a/pkgs/development/python-modules/cdcs/default.nix +++ b/pkgs/development/python-modules/cdcs/default.nix @@ -44,6 +44,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "cdcs" ]; + disabledTests = [ + # Test is out-dated + "test_head" + ]; + meta = with lib; { description = "Python client for performing REST calls to configurable data curation system (CDCS) databases"; homepage = "https://github.com/usnistgov/pycdcs"; From 623598bd74b9568723c505609acca4b75aca4c8d Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Fri, 1 Nov 2024 21:17:47 +0100 Subject: [PATCH 190/369] rmpc: 0.4.0 -> 0.6.0 Bump the rmpc version to 0.6.0, since 0.4.0 is over two months old already. https://github.com/mierak/rmpc/blob/master/CHANGELOG.md#060---2024-10-28 --- pkgs/by-name/rm/rmpc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index 6efe7b07a43a..9df67d7d44a8 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rmpc"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mierak"; repo = "rmpc"; rev = "v${version}"; - hash = "sha256-eWscMWOjTGmFCNGwf/6lMU0JbULC7/AFCPbznGQYRQI="; + hash = "sha256-hQhcNeGNxUxJ9hO/ukmt6V8V8zQHQLvejeu692pKTwg="; }; - cargoHash = "sha256-PieGA8/C7d8Q5rdu7oRdVuCLNhwGp5LZYz/rM4agqng="; + cargoHash = "sha256-Y+NmBAcp6lu1dmMo1Gpozmm/YvNYM7mUAvU2C7iO0ew="; nativeBuildInputs = [ installShellFiles From e48c3685b026ea1a9f20fecaceb20a87df1c92e1 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Fri, 1 Nov 2024 21:26:07 +0100 Subject: [PATCH 191/369] rmpc: add bloxx12 to maintainers --- pkgs/by-name/rm/rmpc/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix index 9df67d7d44a8..ed25639833e2 100644 --- a/pkgs/by-name/rm/rmpc/package.nix +++ b/pkgs/by-name/rm/rmpc/package.nix @@ -48,7 +48,10 @@ rustPlatform.buildRustPackage rec { album art through kitty image protocol without any ugly hacks. It also features ranger/lf inspired browsing of songs and other goodies. ''; - maintainers = with lib.maintainers; [ donovanglover ]; + maintainers = with lib.maintainers; [ + donovanglover + bloxx12 + ]; mainProgram = "rmpc"; platforms = lib.platforms.linux; }; From 014c9b3c3425aae970df0a15419d9e6d0f6ade62 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 20:36:08 +0000 Subject: [PATCH 192/369] mympd: 18.0.0 -> 18.1.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 6db465c0d5ae..251c343c17df 100644 --- a/pkgs/applications/audio/mympd/default.nix +++ b/pkgs/applications/audio/mympd/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "18.0.0"; + version = "18.1.2"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-h88wqKwkxY/5uOU0SQp8vb4ri3Ndi3ezHPTDFJGVE2Q="; + sha256 = "sha256-4BGW7jDeqwhbAi1LODeiFrmBIzv0qAMKT3IVRgYn87E="; }; nativeBuildInputs = [ From 3801c98930a49f2680150ef17317670056cac5f0 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Fri, 1 Nov 2024 13:37:45 -0700 Subject: [PATCH 193/369] cargo-cross: disable impure unit tests --- .../tools/rust/cargo-cross/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-cross/default.nix b/pkgs/development/tools/rust/cargo-cross/default.nix index 772461683bf3..6e0d246f6146 100644 --- a/pkgs/development/tools/rust/cargo-cross/default.nix +++ b/pkgs/development/tools/rust/cargo-cross/default.nix @@ -1,7 +1,8 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, nix-update-script +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, }: rustPlatform.buildRustPackage rec { @@ -19,6 +20,11 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip=docker::shared::tests::directories::test_host" + + # The following tests require empty CARGO_BUILD_TARGET env variable, but we + # set it ever since https://github.com/NixOS/nixpkgs/pull/298108. + "--skip=config::tests::test_config::no_env_and_no_toml_default_target_then_none" + "--skip=config::tests::test_config::no_env_but_toml_default_target_then_use_toml" ]; passthru = { @@ -29,7 +35,10 @@ rustPlatform.buildRustPackage rec { description = "Zero setup cross compilation and cross testing"; homepage = "https://github.com/cross-rs/cross"; changelog = "https://github.com/cross-rs/cross/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ asl20 /* or */ mit ]; + license = with licenses; [ + asl20 # or + mit + ]; maintainers = with maintainers; [ otavio ]; mainProgram = "cross"; }; From 1f9eca8fb6b7196b9f1a4de578088388299f7e6b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 1 Nov 2024 21:52:56 +0100 Subject: [PATCH 194/369] ruff: 0.7.1 -> 0.7.2 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.7.1...0.7.2 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.7.2 --- pkgs/by-name/ru/ruff/Cargo.lock | 93 ++++++++++++++++---------------- pkgs/by-name/ru/ruff/package.nix | 8 +-- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock index 0e488abec554..32edeb8ae709 100644 --- a/pkgs/by-name/ru/ruff/Cargo.lock +++ b/pkgs/by-name/ru/ruff/Cargo.lock @@ -123,9 +123,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.90" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" +checksum = "c042108f3ed77fd83760a5fd79b53be043192bb3b9dba91d8c574c0ada7850c8" [[package]] name = "append-only-vec" @@ -407,7 +407,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -687,7 +687,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -698,7 +698,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -1213,9 +1213,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.40.0" +version = "1.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6593a41c7a73841868772495db7dc1e8ecab43bb5c0b6da2059246c4b506ab60" +checksum = "a1f72d3e19488cf7d8ea52d2fc0f8754fc933398b337cd3cbdb28aaeb35159ef" dependencies = [ "console", "globset", @@ -1267,7 +1267,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -1393,7 +1393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b" dependencies = [ "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -1848,7 +1848,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -1963,9 +1963,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -2247,9 +2247,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -2306,7 +2306,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.7.1" +version = "0.7.2" dependencies = [ "anyhow", "argfile", @@ -2523,7 +2523,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.7.1" +version = "0.7.2" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2590,7 +2590,7 @@ dependencies = [ "proc-macro2", "quote", "ruff_python_trivia", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -2620,6 +2620,7 @@ dependencies = [ "compact_str", "is-macro", "itertools 0.13.0", + "memchr", "ruff_cache", "ruff_macros", "ruff_python_trivia", @@ -2748,7 +2749,6 @@ dependencies = [ "ruff_python_ast", "ruff_python_parser", "ruff_python_stdlib", - "ruff_source_file", "ruff_text_size", "rustc-hash 2.0.0", "schemars", @@ -2779,7 +2779,6 @@ dependencies = [ "insta", "ruff_python_parser", "ruff_python_trivia", - "ruff_source_file", "ruff_text_size", ] @@ -2838,7 +2837,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.7.1" +version = "0.7.2" dependencies = [ "console_error_panic_hook", "console_log", @@ -3009,7 +3008,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "synstructure", ] @@ -3043,7 +3042,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3066,9 +3065,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "3ea7893ff5e2466df8d720bb615088341b295f849602c6956047f8f80f0e9bc1" dependencies = [ "serde_derive", ] @@ -3086,13 +3085,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.213" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "7e85ad2009c50b58e87caa8cd6dac16bdf511bbfb7af6c33df902396aa480fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3103,7 +3102,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3126,7 +3125,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3167,7 +3166,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3269,7 +3268,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3291,9 +3290,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.82" +version = "2.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" +checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56" dependencies = [ "proc-macro2", "quote", @@ -3308,7 +3307,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3371,7 +3370,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3382,28 +3381,28 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "test-case-core", ] [[package]] name = "thiserror" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "5d11abd9594d9b38965ef50805c5e469ca9cc6f197f883f717e0269a3057b3d5" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "ae71770322cbd277e69d762a16c444af02aa0575ac0d174f0b9562d3b37f8602" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3515,7 +3514,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3773,7 +3772,7 @@ checksum = "6b91f57fe13a38d0ce9e28a03463d8d3c2468ed03d75375110ec71d93b449a08" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -3859,7 +3858,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "wasm-bindgen-shared", ] @@ -3893,7 +3892,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3927,7 +3926,7 @@ checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] @@ -4215,7 +4214,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.82", + "syn 2.0.85", ] [[package]] diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 25678f65f83a..a647e00c91cd 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { pname = "ruff"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; outputs = [ @@ -27,7 +27,7 @@ python3Packages.buildPythonPackage rec { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-TPr6YdSb5JKltXHDi1PdGzPYjmmsbCFQKxIiJURrBMI="; + hash = "sha256-9zbLlQfDeqdUp1AKP/NRMZl9KeTyyTJz7JZVW/GGRM0="; }; # Do not rely on path lookup at runtime to find the ruff binary @@ -93,8 +93,8 @@ python3Packages.buildPythonPackage rec { # According to the maintainers, those tests are from an experimental crate that isn't actually # used by ruff currently and can thus be safely skipped. checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + "--skip=add_search_path" "--skip=changed_file" - "--skip=changed_metadata" "--skip=changed_versions_file" "--skip=deleted_file" "--skip=directory_deleted" @@ -109,7 +109,9 @@ python3Packages.buildPythonPackage rec { "--skip=new_ignored_file" "--skip=rename_file" "--skip=search_path" + "--skip=unix::changed_metadata" "--skip=unix::symlink_inside_workspace" + "--skip=unix::symlinked_module_search_path" ]; nativeCheckInputs = [ From 6438f901085e6e9e4b445bc7390f61e39bc065d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 21:13:11 +0000 Subject: [PATCH 195/369] arkade: 0.11.27 -> 0.11.29 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index 2d9e23b7cc99..639dca88f966 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.27"; + version = "0.11.29"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-5/QAtaAAiIzpvOl43A4OqnIcKlfdxehGjmCREFRKXTs="; + hash = "sha256-B5MgBX8GPjBsfOCa1OoZRhQAUQxKH7GXYKMaH6TsUV4="; }; CGO_ENABLED = 0; From 41c9bb7209f97ff20d5c69167d908e706e24349a Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 1 Nov 2024 10:56:35 +0100 Subject: [PATCH 196/369] python312Packages.torchprofile: init at 0.0.3 --- .../python-modules/torchprofile/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/torchprofile/default.nix diff --git a/pkgs/development/python-modules/torchprofile/default.nix b/pkgs/development/python-modules/torchprofile/default.nix new file mode 100644 index 000000000000..a040283e9b14 --- /dev/null +++ b/pkgs/development/python-modules/torchprofile/default.nix @@ -0,0 +1,48 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + numpy, + torch, + torchvision, +}: + +buildPythonPackage rec { + pname = "torchprofile"; + version = "0.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "zhijian-liu"; + repo = "torchprofile"; + rev = "refs/tags/v${version}"; + hash = "sha256-6vxZHQwBjKpy288wcANdJ9gmvIOZloLv+iN76TtqYAI="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ + "torchvision" + ]; + + dependencies = [ + numpy + torch + torchvision + ]; + + pythonImportsCheck = [ + "torchprofile" + ]; + + meta = { + changelog = "https://github.com/zhijian-liu/torchprofile/releases/tag/v${version}"; + description = "General and accurate MACs / FLOPs profiler for PyTorch models"; + homepage = "https://github.com/zhijian-liu/torchprofile"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48bdda41d3ca..dec0803ece86 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15921,6 +15921,8 @@ self: super: with self; { # Used by streamlit, 2021-01-29 tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; + torchprofile = callPackage ../development/python-modules/torchprofile { }; + torpy = callPackage ../development/python-modules/torpy { }; torrent-parser = callPackage ../development/python-modules/torrent-parser { }; From f803fa80cc1d32370498d561c150abb88bb41d38 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 1 Nov 2024 11:08:19 +0100 Subject: [PATCH 197/369] python312Packages.pytorch-bench: init at unstable-2024-07-18 --- .../python-modules/pytorch-bench/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/pytorch-bench/default.nix diff --git a/pkgs/development/python-modules/pytorch-bench/default.nix b/pkgs/development/python-modules/pytorch-bench/default.nix new file mode 100644 index 000000000000..e705028b1db8 --- /dev/null +++ b/pkgs/development/python-modules/pytorch-bench/default.nix @@ -0,0 +1,49 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + colorama, + matplotlib, + numpy, + pynvml, + torch, + torchprofile, +}: + +buildPythonPackage { + pname = "pytorch-bench"; + version = "unstable-2024-07-18"; + pyproject = true; + + src = fetchFromGitHub { + owner = "MaximeGloesener"; + repo = "torch-benchmark"; + rev = "405a3fc2d147b43b4c1f7edb7aca0a60ba343ac5"; + hash = "sha256-KU3dAf97A6lkMNTKRay23BMFQfn1ReAFNaJ0kG2RfnA="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + colorama + matplotlib + numpy + pynvml + torch + torchprofile + ]; + + pythonImportsCheck = [ + "pytorch_bench" + ]; + + meta = { + description = "Benchmarking tool for torch"; + homepage = "https://github.com/MaximeGloesener/torch-benchmark"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dec0803ece86..b68012dcf33f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13093,6 +13093,8 @@ self: super: with self; { pytools = callPackage ../development/python-modules/pytools { }; + pytorch-bench = callPackage ../development/python-modules/pytorch-bench { }; + pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; From 2bef4475d9a7226fe5d123cb8d7523dfdd55c738 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 21:18:59 +0000 Subject: [PATCH 198/369] aiken: 1.1.4 -> 1.1.5 --- pkgs/by-name/ai/aiken/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index 272adcfb401e..34ffc4a35ada 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "aiken"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; rev = "v${version}"; - hash = "sha256-PTC7qn8Z1PGcBTNK5MtMvThIEhmAqTj23B/cHHhiDFE="; + hash = "sha256-cspIIuH+0LJItTz9wk6mChwEMFP3GDpI+KKg0FWM9bQ="; }; - cargoHash = "sha256-p//1TZJ6sJUUDPPpxRBKL7w7MBTUQppbQedj2x4T17w="; + cargoHash = "sha256-aylmZFb+UaK3OEpJLOf4NuT4uMLRhdUg+cSjzxRo7t8="; buildInputs = [ openssl ] From cff9234310a7df51b290a25933ab4cfbefef9eca Mon Sep 17 00:00:00 2001 From: dr56ekgbb Date: Sat, 2 Nov 2024 05:44:15 +0800 Subject: [PATCH 199/369] sly: init at 0.4.0 --- pkgs/by-name/sl/sly/package.nix | 34 + pkgs/by-name/sl/sly/pubspec.lock.json | 922 ++++++++++++++++++++++++++ 2 files changed, 956 insertions(+) create mode 100644 pkgs/by-name/sl/sly/package.nix create mode 100644 pkgs/by-name/sl/sly/pubspec.lock.json diff --git a/pkgs/by-name/sl/sly/package.nix b/pkgs/by-name/sl/sly/package.nix new file mode 100644 index 000000000000..82fd9823285f --- /dev/null +++ b/pkgs/by-name/sl/sly/package.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + flutter, +}: +let + version = "0.4.0"; + src = fetchFromGitHub { + owner = "kra-mo"; + repo = "sly"; + rev = "v${version}"; + hash = "sha256-P7LhhXQQDRsDQ8bZgfvWazLRMYVGhFhMTD41fgs718g="; + }; +in +flutter.buildFlutterApplication { + pname = "sly"; + inherit version src; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + postInstall = '' + install -Dm0644 ./packaging/linux/page.kramo.Sly.svg $out/share/icons/hicolor/scalable/apps/page.kramo.Sly.svg + install -Dm0644 ./packaging/linux/page.kramo.Sly.desktop $out/share/applications/page.kramo.Sly.desktop + ''; + + meta = { + description = "Friendly image editor"; + homepage = "https://github.com/kra-mo/sly"; + mainProgram = "sly"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ aucub ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/sl/sly/pubspec.lock.json b/pkgs/by-name/sl/sly/pubspec.lock.json new file mode 100644 index 000000000000..12897b2cd77c --- /dev/null +++ b/pkgs/by-name/sl/sly/pubspec.lock.json @@ -0,0 +1,922 @@ +{ + "packages": { + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "crop_image": { + "dependency": "direct main", + "description": { + "name": "crop_image", + "sha256": "6cf20655ecbfba99c369d43ec7adcfa49bf135af88fb75642173d6224a95d3f1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.13" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_selector": { + "dependency": "direct main", + "description": { + "name": "file_selector", + "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "file_selector_android": { + "dependency": "transitive", + "description": { + "name": "file_selector_android", + "sha256": "b8c9717a0177ca6fa035554b82cd6c83b838ddc66b7704eb6df0f77f027ecc90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1+7" + }, + "file_selector_ios": { + "dependency": "transitive", + "description": { + "name": "file_selector_ios", + "sha256": "38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.3" + }, + "file_selector_linux": { + "dependency": "transitive", + "description": { + "name": "file_selector_linux", + "sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.2+1" + }, + "file_selector_macos": { + "dependency": "transitive", + "description": { + "name": "file_selector_macos", + "sha256": "f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4" + }, + "file_selector_platform_interface": { + "dependency": "transitive", + "description": { + "name": "file_selector_platform_interface", + "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "file_selector_web": { + "dependency": "transitive", + "description": { + "name": "file_selector_web", + "sha256": "c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4+2" + }, + "file_selector_windows": { + "dependency": "transitive", + "description": { + "name": "file_selector_windows", + "sha256": "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+2" + }, + "fl_chart": { + "dependency": "direct main", + "description": { + "name": "fl_chart", + "sha256": "94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.69.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.22" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "gal": { + "dependency": "direct main", + "description": { + "name": "gal", + "sha256": "54c9b72528efce7c66234f3b6dd01cb0304fd8af8196de15571d7bdddb940977", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.0" + }, + "handy_window": { + "dependency": "direct main", + "description": { + "name": "handy_window", + "sha256": "56b813e58a68b0ee2ab22051400b8b1f1b5cfe88b8cd32288623defb3926245a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "image": { + "dependency": "direct main", + "description": { + "name": "image", + "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "image_picker": { + "dependency": "direct main", + "description": { + "name": "image_picker", + "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "image_picker_android": { + "dependency": "transitive", + "description": { + "name": "image_picker_android", + "sha256": "c0a6763d50b354793d0192afd0a12560b823147d3ded7c6b77daf658fa05cc85", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.12+13" + }, + "image_picker_for_web": { + "dependency": "transitive", + "description": { + "name": "image_picker_for_web", + "sha256": "65d94623e15372c5c51bebbcb820848d7bcb323836e12dfdba60b5d3a8b39e50", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "image_picker_ios": { + "dependency": "transitive", + "description": { + "name": "image_picker_ios", + "sha256": "6703696ad49f5c3c8356d576d7ace84d1faf459afb07accbb0fae780753ff447", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.12" + }, + "image_picker_linux": { + "dependency": "transitive", + "description": { + "name": "image_picker_linux", + "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1+1" + }, + "image_picker_macos": { + "dependency": "transitive", + "description": { + "name": "image_picker_macos", + "sha256": "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1+1" + }, + "image_picker_platform_interface": { + "dependency": "transitive", + "description": { + "name": "image_picker_platform_interface", + "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.10.0" + }, + "image_picker_windows": { + "dependency": "transitive", + "description": { + "name": "image_picker_windows", + "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1+1" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "msix": { + "dependency": "direct dev", + "description": { + "name": "msix", + "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.8" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.2" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.10" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.5" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + } + }, + "sdks": { + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.24.0" + } +} From 37847c5a11ce694d2cd45fbc5c252e96b86cbe55 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 1 Nov 2024 22:52:47 +0100 Subject: [PATCH 200/369] supercollider: fix build with emacs support Signed-off-by: Sefa Eyeoglu --- pkgs/development/interpreters/supercollider/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index 344d00703164..eeca83414a6c 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -26,11 +26,11 @@ mkDerivation rec { strictDeps = true; - nativeBuildInputs = [ cmake pkg-config qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ] + ++ lib.optionals useSCEL [ emacs ]; buildInputs = [ gcc libjack2 libsndfile fftw curl libXt qtbase qtwebengine qtwebsockets readline ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib - ++ lib.optional useSCEL emacs; + ++ lib.optional (!stdenv.hostPlatform.isDarwin) alsa-lib; hardeningDisable = [ "stackprotector" ]; From 56fc1592a92cb61d50936868f2d6f34032b47bd9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 21:54:46 +0000 Subject: [PATCH 201/369] boxbuddy: 2.2.13 -> 2.3.1 --- pkgs/by-name/bo/boxbuddy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index 34c3cd1911ac..eb0682542036 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.13"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-47LOwBm7ql3Nvx6PZ2+x5aR9LSpzc8xuixdvKGdNS94="; + hash = "sha256-s0StSMpLNRwiI+T78ySfW2DQ3s5A9kuclC9f32UDkiI="; }; - cargoHash = "sha256-W4W2tnnNgBcGD0/t5pobj4ca/YrRkHE1l5dIVe21KPU="; + cargoHash = "sha256-WJ35lxo4h91xtcfUuevLsWNBvulxq5ZaAVE3u9BbtzI="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here From 10783260062df4a54629e7d971acd5437cbb0ad4 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Fri, 1 Nov 2024 23:11:07 +0100 Subject: [PATCH 202/369] pypyPackages.tkinter: fix eval --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae8070db1bb9..4694fa514f48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15707,7 +15707,7 @@ self: super: with self; { thttp = callPackage ../development/python-modules/thttp { }; tkinter = callPackage ../development/python-modules/tkinter { - py = python.override { x11Support=true; }; + py = python.override (lib.optionalAttrs (!python.isPyPy) { x11Support = true; }); }; tidalapi = callPackage ../development/python-modules/tidalapi { }; From 1a2f434862b3f5365bdd0a6aac05303d1b420003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 22:32:09 +0000 Subject: [PATCH 203/369] nzbhydra2: 7.7.0 -> 7.8.0 --- pkgs/by-name/nz/nzbhydra2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index db143bf1a513..8a00d6ac8824 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -10,11 +10,11 @@ }: stdenv.mkDerivation rec { pname = "nzbhydra2"; - version = "7.7.0"; + version = "7.8.0"; src = fetchzip { url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip"; - hash = "sha256-8Q/aTMwHFy7OG+VyoSRYlXp4l247nUSPP0YCMkv9Cec="; + hash = "sha256-xE43ACFF9B5YMPjcSDcG2I3YlTSLR5oD3UdAL9XXUWI="; stripRoot = false; }; From f7e019e0aefb08a1e135cf2d28a99a5f8b6f343f Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 16 Oct 2024 11:05:31 +0200 Subject: [PATCH 204/369] perlPackages.IteratorSimple: init at 0.07 --- pkgs/development/compilers/z88dk/default.nix | 21 ++++---------------- pkgs/top-level/perl-packages.nix | 13 ++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index ea5582375abd..c2b36703d51d 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -30,19 +30,6 @@ let }; }; - IteratorSimple = perlPackages.buildPerlPackage { - pname = "Iterator-Simple"; - version = "0.07"; - src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz"; - hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q="; - }; - meta = { - description = "Simple iterator and utilities"; - license = with lib.licenses; [ artistic1 gpl2Only ]; - }; - }; - IteratorSimpleLookahead = perlPackages.buildPerlPackage { pname = "Iterator-Simple-Lookahead"; version = "0.09"; @@ -50,9 +37,9 @@ let url = "mirror://cpan/authors/id/P/PS/PSCUST/Iterator-Simple-Lookahead-0.09.tar.gz"; hash = "sha256-FmPE1xdU8LAXS21+H4DJaQ87qDi4Q4UkLawsUAqseZw="; }; - propagatedBuildInputs = [ IteratorSimple ] ++ (with perlPackages; [ - ClassAccessor - ]); + propagatedBuildInputs = with perlPackages; [ + ClassAccessor IteratorSimple + ]; meta = { description = "Simple iterator with lookahead and unget"; license = with lib.licenses; [ artistic1 gpl2Only ]; @@ -67,9 +54,9 @@ let hash = "sha256-pVTpIqGxZpBxZlAbXuGDapuOxsp3uM/AM5dKUxlej1M="; }; propagatedBuildInputs = [ - IteratorSimple IteratorSimpleLookahead ] ++ (with perlPackages; [ + IteratorSimple TextTemplate DataDump FileSlurp diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0d703f43124e..b55caff10fd3 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13317,6 +13317,19 @@ with self; { }; }; + IteratorSimple = buildPerlPackage { + pname = "Iterator-Simple"; + version = "0.07"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MICHAEL/Iterator-Simple-0.07.tar.gz"; + hash = "sha256-y1dNBju0gcj7nLV4GkZFiWqg4e5xW6lHz3ZvH/Tp60Q="; + }; + meta = { + description = "Simple iterator and utilities"; + license = with lib.licenses; [ artistic1 gpl2Only ]; + }; + }; + IPCSignal = buildPerlPackage { pname = "IPC-Signal"; version = "1.00"; From 87ef82b02a4dc4ee434c1ceb262a279bb13efdd9 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 16 Oct 2024 11:06:00 +0200 Subject: [PATCH 205/369] perlPackages.FileKDBX: init at 0.906 --- pkgs/top-level/perl-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b55caff10fd3..78175b359655 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9938,6 +9938,21 @@ with self; { }; }; + FileKDBX = buildPerlPackage { + pname = "File-KDBX"; + version = "0.906"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CC/CCM/File-KDBX-0.906.tar.gz"; + hash = "sha256-tHt/kzOrtJHqrsY0WhTn+TlW0UOUTBS4Fkp/0bIkvW8="; + }; + propagatedBuildInputs = [ CryptArgon2 CryptX DevelGlobalDestruction FileKeePass IteratorSimple RefUtil XMLLibXML boolean namespaceclean ]; + buildInputs = [ ScopeGuard TestDeep TestFatal TestWarnings ]; + meta = { + description = "Interface to KeePass V3 and V4 database files"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FileKeePass = buildPerlPackage { pname = "File-KeePass"; version = "2.03"; From 550a5ab669fcaa7419ad38ebbe3df6fd8a700e30 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 16 Oct 2024 11:06:15 +0200 Subject: [PATCH 206/369] kpcli: KDBX 4 support --- pkgs/tools/security/kpcli/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 6f8b166d4444..dff2a8d8c7c8 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/kpcli/${pname}-${version}.pl"; - sha256 = "sha256-hvyCC8eUXNm1d1g+/kEnVllRJokChgJWzuoQB5Xd8j8="; + hash = "sha256-hvyCC8eUXNm1d1g+/kEnVllRJokChgJWzuoQB5Xd8j8="; }; nativeBuildInputs = [ makeWrapper ]; @@ -21,7 +21,9 @@ stdenv.mkDerivation rec { makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \ "${with perlPackages; makePerlPath ([ - CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser + BHooksEndOfScope CaptureTiny Clipboard Clone CryptRijndael CryptX DevelGlobalDestruction ModuleImplementation + ModuleRuntime SortNaturally SubExporterProgressive TermReadKey TermShellUI TryTiny FileKDBX FileKeePass + PackageStash RefUtil TermReadLineGnu XMLParser boolean namespaceclean ] ++ lib.optional stdenv.hostPlatform.isDarwin MacPasteboard)}" ''; From d33cc1a7c077551e783075a757d909ecb70c8b9c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 22:39:20 +0000 Subject: [PATCH 207/369] python312Packages.aiohttp-client-cache: 0.11.1 -> 0.12.4 --- .../python-modules/aiohttp-client-cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix index 6f3116938465..e7e1812db0ff 100644 --- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aiohttp-client-cache"; - version = "0.11.1"; + version = "0.12.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "aiohttp_client_cache"; inherit version; - hash = "sha256-MuY60hAkD4Ik8+Encv5TrBAs8kx88Y3bhqy7n9+eS28="; + hash = "sha256-5g/oFhNrWx1m87trJyq4HZeFTqHk2bVwhaNgQmln0mU="; }; build-system = [ poetry-core ]; From 2491be0a6ddfeb0fa54c26c5b22d05f79e384e23 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 30 Oct 2024 09:39:26 -0400 Subject: [PATCH 208/369] zfs: update usage of deprecated `--replace` - In some cases, move into a conditional as the substitution is only needed on some version - One use of `--replace-warn` since it is looking in a set of files where the exact files that might contain it may change over time, but we want to cover all of them --- pkgs/os-specific/linux/zfs/generic.nix | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 56e37ec0b847..a7b16109f608 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -69,39 +69,39 @@ let # The arrays must remain the same length, so we repeat a flag that is # already part of the command and therefore has no effect. substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \ - --replace '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \ - --replace '"/usr/bin/env", "mount"' '"${util-linux}/bin/mount", "-n"' + --replace-fail '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \ + --replace-fail '"/usr/bin/env", "mount"' '"${util-linux}/bin/mount", "-n"' '' + optionalString buildUser '' - substituteInPlace ./lib/libshare/os/linux/nfs.c --replace "/usr/sbin/exportfs" "${ + substituteInPlace ./lib/libshare/os/linux/nfs.c --replace-fail "/usr/sbin/exportfs" "${ # We don't *need* python support, but we set it like this to minimize closure size: # If it's disabled by default, no need to enable it, even if we have python enabled # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; }) }/bin/exportfs" - substituteInPlace ./lib/libshare/smb.h --replace "/usr/bin/net" "${samba}/bin/net" + substituteInPlace ./lib/libshare/smb.h --replace-fail "/usr/bin/net" "${samba}/bin/net" # Disable dynamic loading of libcurl - substituteInPlace ./config/user-libfetch.m4 --replace "curl-config --built-shared" "true" - substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" - substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ - --replace "/etc/default" "$out/etc/default" + substituteInPlace ./config/user-libfetch.m4 --replace-fail "curl-config --built-shared" "true" + substituteInPlace ./config/user-systemd.m4 --replace-fail "/usr/lib/modules-load.d" "$out/etc/modules-load.d" + substituteInPlace ./config/zfs-build.m4 --replace-fail "\$sysconfdir/init.d" "$out/etc/init.d" \ + --replace-fail "/etc/default" "$out/etc/default" substituteInPlace ./contrib/initramfs/Makefile.am \ - --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools" + --replace-fail "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools" '' + optionalString isAtLeast22Series '' substituteInPlace ./udev/vdev_id \ - --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ + --replace-fail "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" + + substituteInPlace ./config/zfs-build.m4 \ + --replace-fail "bashcompletiondir=/etc/bash_completion.d" \ + "bashcompletiondir=$out/share/bash-completion/completions" '' + optionalString (!isAtLeast22Series) '' - substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)/zfs" "$out/etc/zfs" + substituteInPlace ./etc/zfs/Makefile.am --replace-fail "\$(sysconfdir)/zfs" "$out/etc/zfs" find ./contrib/initramfs -name Makefile.am -exec sed -i -e 's|/usr/share/initramfs-tools|'$out'/share/initramfs-tools|g' {} \; substituteInPlace ./cmd/vdev_id/vdev_id \ - --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ + --replace-fail "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \ "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}" - '' + '' - substituteInPlace ./config/zfs-build.m4 \ - --replace "bashcompletiondir=/etc/bash_completion.d" \ - "bashcompletiondir=$out/share/bash-completion/completions" ''; nativeBuildInputs = [ autoreconfHook269 nukeReferences ] @@ -176,7 +176,7 @@ let continue fi sed -i '/zfs-import-scan.service/d' $i - substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target" + substituteInPlace $i --replace-warn "zfs-import-cache.service" "zfs-import.target" done # Remove tests because they add a runtime dependency on gcc From 9ce881027b195742f0c2e373e0c4f5199adf251a Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 30 Oct 2024 10:00:33 -0400 Subject: [PATCH 209/369] zfs: remove recommendations to use unstable `pkgs.zfs_unstable` is pre-release software and may very well have critical bugs that make it unsuitable for general use. As such, we should not recommend it as a general solution to the problem of "my Kernel is too new for stable ZFS". --- nixos/modules/tasks/filesystems/zfs.nix | 2 +- pkgs/os-specific/linux/zfs/generic.nix | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index d4ed269efc6c..87876867c572 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -221,7 +221,7 @@ in type = lib.types.package; default = pkgs.zfs; defaultText = lib.literalExpression "pkgs.zfs"; - description = "Configured ZFS userland tools package, use `pkgs.zfs_unstable` if you want to track the latest staging ZFS branch."; + description = "Configured ZFS userland tools package."; }; modulePackage = lib.mkOption { diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index a7b16109f608..cf1bb132223e 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -237,8 +237,6 @@ let inherit maintainers; mainProgram = "zfs"; - # If your Linux kernel version is not yet supported by zfs, try zfs_unstable. - # On NixOS set the option `boot.zfs.package = pkgs.zfs_unstable`. broken = buildKernel && (kernelCompatible != null) && !(kernelCompatible kernel); }; }; From b5e959d3c39451f4b26ec66904a9ea7286eba66d Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Wed, 30 Oct 2024 10:05:11 -0400 Subject: [PATCH 210/369] zfs_unstable: expand on unstable nature in long description --- pkgs/os-specific/linux/zfs/generic.nix | 3 ++- pkgs/os-specific/linux/zfs/unstable.nix | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index cf1bb132223e..3f6a1c71dc75 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -26,6 +26,7 @@ let { version , hash , kernelModuleAttribute + , extraLongDescription ? "" , extraPatches ? [] , rev ? "zfs-${version}" , kernelCompatible ? null @@ -220,7 +221,7 @@ let snapshotting, cloning, block devices, deduplication, and more. ${if buildUser then "This is the userspace tools package." else "This is the kernel module package."} - ''; + '' + extraLongDescription; homepage = "https://github.com/openzfs/zfs"; changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = lib.licenses.cddl; diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix index 0d75c8c7072c..7590481b6efb 100644 --- a/pkgs/os-specific/linux/zfs/unstable.nix +++ b/pkgs/os-specific/linux/zfs/unstable.nix @@ -28,4 +28,9 @@ callPackage ./generic.nix args { }; hash = "sha256-/INlfiPpRm5JprcORzJJKyjpGIMY1LceY3yZ811uf2A="; + + extraLongDescription = '' + This is "unstable" ZFS, and will usually be a pre-release version of ZFS. + It may be less well-tested and have critical bugs. + ''; } From ec91c9026935fc2c8f871605aa93557284e1a494 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:51:41 +0100 Subject: [PATCH 211/369] ogre: 14.3.0 -> 14.3.1 --- 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 0643fabdd8c6..2a4007c3ce71 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.3.0"; - hash = "sha256-SQ0Ij04W/KgonHDLFEPFDhXb/TDkT8I6W8J7hz3gtrg="; - # https://github.com/OGRECave/ogre/blob/v14.3.0/Components/Overlay/CMakeLists.txt + version = "14.3.1"; + hash = "sha256-rr8tetBfFdZPVvN3fYRWltf8/e6oLcLL0uhHKWanuVA="; + # https://github.com/OGRECave/ogre/blob/v14.3.1/Components/Overlay/CMakeLists.txt imguiVersion = "1.91.2"; imguiHash = "sha256-B7XXQNuEPcT1ID5nMYbAV+aNCG9gIrC9J7BLnYB8yjI="; }; From 356dffc6ab0a59d1e7fcb96005e2f2ba51f8eacd Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Fri, 1 Nov 2024 23:55:01 +0100 Subject: [PATCH 212/369] zoneminder: 1.36.34 -> 1.36.35 Fixes GHSA-rqxv-447h-g7jx. Changes: https://github.com/ZoneMinder/zoneminder/releases/tag/1.36.35 --- pkgs/servers/zoneminder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 420c923367d6..766c42c8b742 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -57,13 +57,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.34"; + version = "1.36.35"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - hash = "sha256-ClO1f0Aspz04C8wgQurtHWmwzu2f4RZ/1oGjPN8HQrw="; + hash = "sha256-0mpT3qjF8zlcsd6OlNIvrabDsz+oJPPy9Vn2TQSuHAI="; fetchSubmodules = true; }; From 340ebc2232a6d1fddd1069da789af0d324209abd Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 2 Nov 2024 00:02:45 +0100 Subject: [PATCH 213/369] vunnel: relax more deps Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/vu/vunnel/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 5543834ea5a6..fff20fecc568 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -20,7 +20,9 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "defusedxml" "ijson" + "importlib-metadata" "sqlalchemy" + "websockets" "xsdata" ]; From 2abce5f19ff72abc544170f7400d2f94748fdf7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Nov 2024 23:11:33 +0000 Subject: [PATCH 214/369] python312Packages.array-api-compat: 1.9 -> 1.9.1 --- pkgs/development/python-modules/array-api-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/array-api-compat/default.nix b/pkgs/development/python-modules/array-api-compat/default.nix index 258e69f44bda..b373fb558972 100644 --- a/pkgs/development/python-modules/array-api-compat/default.nix +++ b/pkgs/development/python-modules/array-api-compat/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "array-api-compat"; - version = "1.9"; + version = "1.9.1"; pyproject = true; src = fetchFromGitHub { owner = "data-apis"; repo = "array-api-compat"; rev = "refs/tags/${version}"; - hash = "sha256-azd98kJtW8QKizfOr670pyr44BHNkWCO7BMFg3zr23g="; + hash = "sha256-X6y6hX/HdkiLZkj9AOEYsZOlYhR7wUt9kQjHfMfWqIc="; }; build-system = [ setuptools ]; From 5e9e432e063889cf0696126da2e44f68d9c72cf9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 23:43:47 +0100 Subject: [PATCH 215/369] python312Packages.renson-endura-delta: refactor --- .../python-modules/renson-endura-delta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/renson-endura-delta/default.nix b/pkgs/development/python-modules/renson-endura-delta/default.nix index 03914c36dba2..0e1a5d7fb9e6 100644 --- a/pkgs/development/python-modules/renson-endura-delta/default.nix +++ b/pkgs/development/python-modules/renson-endura-delta/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "'pytest-runner'" "" + --replace-fail "'pytest-runner'" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ requests ]; + dependencies = [ requests ]; nativeCheckInputs = [ pytestCheckHook From 4227516001065718b5d2f4c24f0f608b57c2c13e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 2 Nov 2024 00:13:48 +0100 Subject: [PATCH 216/369] php84: 8.4.0beta3 -> 8.4.0RC3 Changes: https://github.com/php/php-src/blob/php-8.4.0RC3/NEWS --- pkgs/development/interpreters/php/8.4.nix | 6 +++--- .../interpreters/php/fix-paths-php84.patch | 17 +++++++++-------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix index 3c1f17048c37..c794e3963700 100644 --- a/pkgs/development/interpreters/php/8.4.nix +++ b/pkgs/development/interpreters/php/8.4.nix @@ -4,10 +4,10 @@ let base = callPackage ./generic.nix ( _args // { - version = "8.4.0beta3"; + version = "8.4.0RC3"; phpSrc = fetchurl { - url = "https://downloads.php.net/~calvinb/php-8.4.0beta3.tar.xz"; - hash = "sha256-aTgUCmS3tdV304Ag05DZObLKTQ8XgpNIfHARbhpZUAw="; + url = "https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz"; + hash = "sha256-6eA5w7NRfH5k+AyoIvuSEY9JgjtQqYwyZXTRSuKHBvY="; }; } ); diff --git a/pkgs/development/interpreters/php/fix-paths-php84.patch b/pkgs/development/interpreters/php/fix-paths-php84.patch index 294d13569af7..12a392bc973c 100644 --- a/pkgs/development/interpreters/php/fix-paths-php84.patch +++ b/pkgs/development/interpreters/php/fix-paths-php84.patch @@ -13,15 +13,16 @@ index e46acf0928..ee8e5a88f8 100644 AS_VAR_IF([GETTEXT_DIR],, [AC_MSG_ERROR([Cannot locate header file libintl.h])]) -diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 ---- a/sapi/apache2handler/config.m4 2018-11-07 15:35:23.000000000 +0000 -+++ b/sapi/apache2handler/config.m4 2018-11-27 00:32:28.000000000 +0000 -@@ -66,7 +66,7 @@ - AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) - fi +diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 +index e335721f19..a5087e1320 100644 +--- a/sapi/apache2handler/config.m4 ++++ b/sapi/apache2handler/config.m4 +@@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then + AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0], + [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])]) -- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` +- APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR) + APXS_LIBEXECDIR="$prefix/modules" - if test -z `$APXS -q SYSCONFDIR`; then + if test -z $($APXS -q SYSCONFDIR); then INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ From 38aceb6f61a04b14342952338c7cfc179df2a0f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 00:21:32 +0100 Subject: [PATCH 217/369] python312Packages.mypy-boto3-amp: 1.35.0 -> 1.35.53 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 80f729e231cb..5314f596604a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -62,8 +62,8 @@ rec { "sha256-9hJo5ZV8ckN5+V/L6MOowyWr2eZoroVRmzooMDDA6WE="; mypy-boto3-amp = - buildMypyBoto3Package "amp" "1.35.0" - "sha256-Pm/KyqcUUAQBZjQKaVhuL/9c+qfkgfeD51esgE+EgQw="; + buildMypyBoto3Package "amp" "1.35.53" + "sha256-kPQ6DAbf1hEmDyDu8SFAL4WwTrmhEkNsg3ndEbhgJvg="; mypy-boto3-amplify = buildMypyBoto3Package "amplify" "1.35.41" From d63f657effccd9d3495c3a430d7036b1c6171363 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 00:21:40 +0100 Subject: [PATCH 218/369] python312Packages.mypy-boto3-autoscaling: 1.35.45 -> 1.35.53 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 5314f596604a..9f1650cb774b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -150,8 +150,8 @@ rec { "sha256-nr00I/1oqR16ZIw3+iA2BrS0C0Wr7UlJ48VnuOFIcb0="; mypy-boto3-autoscaling = - buildMypyBoto3Package "autoscaling" "1.35.45" - "sha256-HQLkmsxLESKVXzNW+60XFLhYTT6oDeNFsm6WGNP1cgk="; + buildMypyBoto3Package "autoscaling" "1.35.53" + "sha256-cknZ2hZ8hV7gnOqBD6XWxrJZS7j3B4TiP29y6QBGCoQ="; mypy-boto3-autoscaling-plans = buildMypyBoto3Package "autoscaling-plans" "1.35.0" From 1400776408b6f63e6fd8af7f751d8fbf23e8908d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 00:21:42 +0100 Subject: [PATCH 219/369] python312Packages.mypy-boto3-batch: 1.35.0 -> 1.35.53 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 9f1650cb774b..95954fc5e815 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -166,8 +166,8 @@ rec { "sha256-8IRkY4sMGkj2ZxZBM4n/7clzQHwuon8wmXIOAGa4nEI="; mypy-boto3-batch = - buildMypyBoto3Package "batch" "1.35.0" - "sha256-LVwSfDll7H0xxvF6b2wlqr/gQ5nR4oqtev4ZT4hgJX0="; + buildMypyBoto3Package "batch" "1.35.53" + "sha256-1qJvWSYN94rV8xiIOoGO5FVKl2Q1hcLfooOfMYEp5M0="; mypy-boto3-billingconductor = buildMypyBoto3Package "billingconductor" "1.35.0" From 66f35276b48cc6ad914c682d5b75143af45a1963 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 00:22:03 +0100 Subject: [PATCH 220/369] python312Packages.mypy-boto3-docdb-elastic: 1.35.0 -> 1.35.54 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 95954fc5e815..cb337afbfecd 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -422,8 +422,8 @@ rec { "sha256-gRSlQ63BPat6gxy+jZP/vtZIn6a4fXN0tx6oPvvgROo="; mypy-boto3-docdb-elastic = - buildMypyBoto3Package "docdb-elastic" "1.35.0" - "sha256-bmhGGMR9x0QKFl2p0p4xhxtE+A5PZQ/HO1FdLuAgLtI="; + buildMypyBoto3Package "docdb-elastic" "1.35.54" + "sha256-LMkXVrDNmfJPB5rl32i4OQSm0Q5gqdpV7PR4vNe0iIQ="; mypy-boto3-drs = buildMypyBoto3Package "drs" "1.35.0" From d56d4526d9147a4b53fa4238366b73a1047ce816 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 00:22:09 +0100 Subject: [PATCH 221/369] python312Packages.mypy-boto3-elbv2: 1.35.39 -> 1.35.53 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index cb337afbfecd..69ca5320d279 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -494,8 +494,8 @@ rec { "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.35.39" - "sha256-k7IgKkdS2h5p+Xl+UhiQRtk9fjCZQMzc2FXRRTjscTc="; + buildMypyBoto3Package "elbv2" "1.35.53" + "sha256-MQYmmlnrK7sbbO9AiVavD79ImyUZIMavuHz/rn1gTTs="; mypy-boto3-emr = buildMypyBoto3Package "emr" "1.35.39" From f4790cc1add1fc434b0390623783ceb53cd80da3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 00:22:16 +0100 Subject: [PATCH 222/369] python312Packages.mypy-boto3-glue: 1.35.25 -> 1.35.53 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 69ca5320d279..dbb1d0adc774 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -574,8 +574,8 @@ rec { "sha256-RJEZBr3yU/lGEainrpidLsdYBvVOPMq3cIaIpsTAziQ="; mypy-boto3-glue = - buildMypyBoto3Package "glue" "1.35.25" - "sha256-hWpxnfHPaCUlxFg/3vNhluQnc2IHYoNVq9owH3D2eME="; + buildMypyBoto3Package "glue" "1.35.53" + "sha256-eUXh24klobdPHgxu3Wjg638PeAu3ArlO3tsxewthfDo="; mypy-boto3-grafana = buildMypyBoto3Package "grafana" "1.35.0" From 9c92a7e4871e77af913a3ca7e5837202b5fc4a3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 00:22:36 +0100 Subject: [PATCH 223/369] python312Packages.mypy-boto3-logs: 1.35.51 -> 1.35.54 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index dbb1d0adc774..cdf3d69b7f9b 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -810,8 +810,8 @@ rec { "sha256-6Vs5eRibHCZvDDIcIEThPa6T1OmfJXjLg4GAZlworsM="; mypy-boto3-logs = - buildMypyBoto3Package "logs" "1.35.51" - "sha256-MOzamNfZJdX4R/NO/1dEwErSdsCfFw8ZwGje5Ocb7oY="; + buildMypyBoto3Package "logs" "1.35.54" + "sha256-RnHt15tR/cGO0w9mLYbCW0T82fyhVsJbBkfxSwDZItw="; mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.35.0" From 9df7f9591404f194232f696cf0e34f9344f89e39 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 00:23:04 +0100 Subject: [PATCH 224/369] python312Packages.mypy-boto3-sagemaker: 1.35.52 -> 1.35.53 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index cdf3d69b7f9b..f8e48a8ac5bc 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1174,8 +1174,8 @@ rec { "sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.35.52" - "sha256-i2XQmwv5AP0qSN6Bc1xM22XLaNSgo3FTbX8UIgOsFBQ="; + buildMypyBoto3Package "sagemaker" "1.35.53" + "sha256-Vj7lAt1eU47vE7XZ95QJBe95302681tJuy4nw02Bibc="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0" From 1cd46b3b5255564dd447ea951b8682b7e778ea88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 00:23:11 +0100 Subject: [PATCH 225/369] python312Packages.mypy-boto3-sesv2: 1.35.41 -> 1.35.53 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index f8e48a8ac5bc..442bc4e246d6 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1254,8 +1254,8 @@ rec { "sha256-+TyI+ffXN0M9HVWA3iQfg3T/xF49wslYFx9MTxHCfYw="; mypy-boto3-sesv2 = - buildMypyBoto3Package "sesv2" "1.35.41" - "sha256-DUotfO7GlrWHOU8LuhbmF4U2oywMW48JzYomlXYS8Tg="; + buildMypyBoto3Package "sesv2" "1.35.53" + "sha256-jIxFFcXYJgwxH78gnMHxIaQWeF88DT7tH1pukUEpDc4="; mypy-boto3-shield = buildMypyBoto3Package "shield" "1.35.0" From da8c5488d1e3c15816d5e75bc8a76f010526de29 Mon Sep 17 00:00:00 2001 From: Matt Moriarity Date: Fri, 1 Nov 2024 17:20:18 -0600 Subject: [PATCH 226/369] python3Packages.strawberry-graphql: remove poetry patch and missing test path --- .../python-modules/strawberry-graphql/default.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix index 19db050f392b..b17589b562ab 100644 --- a/pkgs/development/python-modules/strawberry-graphql/default.nix +++ b/pkgs/development/python-modules/strawberry-graphql/default.nix @@ -10,7 +10,6 @@ email-validator, fastapi, fetchFromGitHub, - fetchpatch, flask, freezegun, graphql-core, @@ -57,15 +56,6 @@ buildPythonPackage rec { hash = "sha256-m+KaUd0rl0RRZzVPI+ldwW77YGLq45egkV5vYYz4dW8="; }; - patches = [ - (fetchpatch { - # https://github.com/strawberry-graphql/strawberry/pull/2199 - name = "switch-to-poetry-core.patch"; - url = "https://github.com/strawberry-graphql/strawberry/commit/710bb96f47c244e78fc54c921802bcdb48f5f421.patch"; - hash = "sha256-ekUZ2hDPCqwXp9n0YjBikwSkhCmVKUzQk7LrPECcD7Y="; - }) - ]; - postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "--emoji" "" \ @@ -161,7 +151,6 @@ buildPythonPackage rec { "tests/schema/extensions/" "tests/schema/test_dataloaders.py" "tests/schema/test_lazy/" - "tests/starlite/" "tests/test_dataloaders.py" "tests/utils/test_pretty_print.py" "tests/websockets/test_graphql_transport_ws.py" From d4c411f2b0fb21eccf15b215b4558bcde7f2f86d Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Sat, 2 Nov 2024 02:26:40 +0300 Subject: [PATCH 227/369] vscode-extensions.cweijan.dbclient-jdbc: 1.3.4 -> 1.3.6 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 2522929f094c..3fa814e9a441 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1122,8 +1122,8 @@ let mktplcRef = { name = "dbclient-jdbc"; publisher = "cweijan"; - version = "1.3.4"; - hash = "sha256-qknooeedRhTvEWSuGXFoO/BczGanYCdMr7WWjthxG+k="; + version = "1.3.6"; + hash = "sha256-CETB2hLaXD7DuNmop/DHjpI8NgHfMGyMMZyfw/Bt1yc="; }; meta = { description = "JDBC Adapter For Database Client"; From a852533205300a814f4713a1aa6662190f9da49e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 1 Nov 2024 22:19:44 +0100 Subject: [PATCH 228/369] python312Packages.marimo: 0.9.1 -> 0.9.14 Diff: https://github.com/marimo-team/marimo/compare/0.9.1...0.9.14 Changelog: https://github.com/marimo-team/marimo/releases/tag/0.9.14 --- .../python-modules/marimo/default.nix | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 07bf6ae8c078..3d135bd357f0 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -2,13 +2,17 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, - setuptools, + + # build-system + hatchling, + + # dependencies click, docutils, itsdangerous, jedi, markdown, + narwhals, packaging, psutil, pygments, @@ -19,25 +23,25 @@ uvicorn, websockets, pyyaml, - pytestCheckHook, + + # tests + versionCheckHook, }: buildPythonPackage rec { pname = "marimo"; - version = "0.9.1"; + version = "0.9.14"; pyproject = true; - disabled = pythonOlder "3.8"; - + # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-7sG6i1WusNuCpuaojFXhSfPWCA2/nzHXvMF29ApGTDg="; + hash = "sha256-Q3dnRuAS8B4cWvF04GGg5OOZtmAJPKa2fHwnoO2DXDs="; }; - build-system = [ setuptools ]; + build-system = [ hatchling ]; - # ruff is not packaged as a python module in nixpkgs - pythonRemoveDeps = [ "ruff" ]; + pythonRelaxDeps = [ "websockets" ]; dependencies = [ click @@ -45,6 +49,7 @@ buildPythonPackage rec { itsdangerous jedi markdown + narwhals packaging psutil pygments @@ -57,17 +62,21 @@ buildPythonPackage rec { pyyaml ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "marimo" ]; - meta = with lib; { + # The pypi archive does not contain tests so we do not use `pytestCheckHook` + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = [ "--version" ]; + + meta = { description = "Reactive Python notebook that's reproducible, git-friendly, and deployable as scripts or apps"; homepage = "https://github.com/marimo-team/marimo"; changelog = "https://github.com/marimo-team/marimo/releases/tag/${version}"; - license = licenses.asl20; + license = lib.licenses.asl20; mainProgram = "marimo"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ akshayka dmadisetti ]; From 3b46176295ebb11c793ee93784fb635332e4ca4e Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Fri, 1 Nov 2024 22:17:47 +0100 Subject: [PATCH 229/369] apacheHttpdPackages.mod_python: nixfmt --- .../http/apache-modules/mod_python/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index bebd1278acc2..bcebd835229f 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -26,12 +26,14 @@ stdenv.mkDerivation rec { "BINDIR=$(out)/bin" ]; - buildInputs = [ - apacheHttpd - python3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libintl - ]; + buildInputs = + [ + apacheHttpd + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libintl + ]; passthru = { inherit apacheHttpd; From cb47906e8529c5144eacbaa25ab5b7962d337499 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Fri, 1 Nov 2024 22:31:28 +0100 Subject: [PATCH 230/369] apacheHttpdPackages.mod_python: fix for python3.12 adding distutils, packaging and setuptools to fix: - ModuleNotFoundError: No module named 'distutils' - ModuleNotFoundError: No module named 'packaging' - error: invalid command 'install' and ensureNewerSourcesForZipFilesHook for: - ValueError: ZIP does not support timestamps before 1980 --- .../apache-modules/mod_python/default.nix | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index bcebd835229f..c45da6cdd48f 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,5 +1,6 @@ { apacheHttpd, + ensureNewerSourcesForZipFilesHook, fetchFromGitHub, lib, libintl, @@ -8,15 +9,15 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mod_python"; version = "3.5.0.2"; src = fetchFromGitHub { owner = "grisha"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-EH8wrXqUAOFWyPKfysGeiIezgrVc789RYO4AHeSA6t4="; + repo = "mod_python"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-++yHNKVe1u3w47DaB0zvYyuTrBcQdmuDm22areAeejs="; }; patches = [ ./install.patch ]; @@ -26,10 +27,18 @@ stdenv.mkDerivation rec { "BINDIR=$(out)/bin" ]; + nativeBuildInputs = [ + ensureNewerSourcesForZipFilesHook + ]; + buildInputs = [ apacheHttpd - python3 + (python3.withPackages (ps: with ps; [ + distutils + packaging + setuptools + ])) ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libintl @@ -40,12 +49,12 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { homepage = "https://modpython.org/"; - changelog = "https://github.com/grisha/mod_python/blob/${version}/NEWS"; + changelog = "https://github.com/grisha/mod_python/blob/master/NEWS"; description = "Apache module that embeds the Python interpreter within the server"; mainProgram = "mod_python"; - platforms = platforms.unix; + platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) From 6965f0578e8fe92ae8eabb91fae2469877e13967 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sat, 2 Nov 2024 00:50:16 +0100 Subject: [PATCH 231/369] ja2-stracciatella: fix build with gcc13 --- pkgs/games/ja2-stracciatella/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix index 9ad6e3105406..6b89a806e26b 100644 --- a/pkgs/games/ja2-stracciatella/default.nix +++ b/pkgs/games/ja2-stracciatella/default.nix @@ -49,6 +49,10 @@ stdenv.mkDerivation { cmakeFlagsArray+=("-DLOCAL_RAPIDJSON_LIB=OFF" "-DLOCAL_GTEST_LIB=OFF" "-DEXTRA_DATA_DIR=$out/share/ja2") ''; + # error: 'uint64_t' does not name a type + # gcc13 and above don't automatically include cstdint + env.CXXFLAGS = "-include cstdint"; + doInstallCheck = true; installCheckPhase = '' HOME=/tmp $out/bin/ja2 -unittests From cd16ba5569a0ef0ea63004846c4e80c536c2f56e Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Sat, 2 Nov 2024 03:13:24 +0300 Subject: [PATCH 232/369] vscode-extensions.equinusocio.vsc-material-theme-icons: 3.5.0 -> 3.8.8 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 3fa814e9a441..bc73d8ccc781 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1724,8 +1724,8 @@ let mktplcRef = { name = "vsc-material-theme-icons"; publisher = "Equinusocio"; - version = "3.5.0"; - hash = "sha256-XqtyZVlsPaPkKB9HdigKSXjCwqXe9wzJWeRcPpS6EVM="; + version = "3.8.8"; + hash = "sha256-el2hQaq1gZBn2PZ+f+S1fHM/g3V0sX7Chyre04sds8k="; }; meta = { description = "Material Theme Icons, the most epic icons theme for Visual Studio Code and Material Theme"; From 7e8f6d46521c0b34b8585c1a7e17583882dfa990 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 2 Nov 2024 01:26:00 +0100 Subject: [PATCH 233/369] python3Packages.diffenator2: relax dep --- pkgs/development/python-modules/diffenator2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix index 5dc3bbd3554a..111cf8aa2a83 100644 --- a/pkgs/development/python-modules/diffenator2/default.nix +++ b/pkgs/development/python-modules/diffenator2/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "protobuf" "python-bidi" + "youseedee" ]; build-system = [ From 21ef37c088714ce3df902f9e3feb57213bf61882 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Sat, 2 Nov 2024 03:18:07 +0300 Subject: [PATCH 234/369] vscode-extensions.firsttris.vscode-jest-runner: 0.4.72 -> 0.4.74 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index bc73d8ccc781..b7721ee2dc8c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1852,8 +1852,8 @@ let mktplcRef = { name = "vscode-jest-runner"; publisher = "firsttris"; - version = "0.4.72"; - hash = "sha256-1nUpOXdteWsyFYJ2uATCcr1SUbeusmbpa09Bkw9/TZM="; + version = "0.4.74"; + hash = "sha256-35Ix6B/vkYQIky9KYsMsxgmRh1LYzBoRs9pMe8M5/rI="; }; meta = { description = "Simple way to run or debug a single (or multiple) tests from context-menu"; From 7af650a58892e4c8d4c8c9b5be67a4dd7eebef38 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Fri, 1 Nov 2024 11:10:44 -0500 Subject: [PATCH 235/369] balena-cli: switch to apple-sdk_12 Upstream is building with macos 12. Looks like 10.15 should be supported, though. --- pkgs/tools/admin/balena-cli/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index 7c93a23fb181..ee9eb2e640ae 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -2,7 +2,6 @@ lib, stdenv, buildNpmPackage, - overrideSDK, fetchFromGitHub, testers, balena-cli, @@ -10,16 +9,11 @@ python3, udev, cctools, - darwin, + apple-sdk_12, + darwinMinVersionHook, }: -let - # Fix for: https://github.com/NixOS/nixpkgs/issues/272156 - buildNpmPackage' = buildNpmPackage.override { - stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; - }; -in -buildNpmPackage' rec { +buildNpmPackage rec { pname = "balena-cli"; version = "19.0.13"; @@ -51,8 +45,7 @@ buildNpmPackage' rec { udev ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - darwin.apple_sdk.frameworks.Cocoa + apple-sdk_12 ]; passthru.tests.version = testers.testVersion { From 7f6fe7982b9b2167c14d2cf22de8a581a0621808 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Sat, 2 Nov 2024 03:41:11 +0300 Subject: [PATCH 236/369] vscode-extensions.hashicorp.hcl: 0.3.2 -> 0.6.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index b7721ee2dc8c..691859cdb38c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2262,8 +2262,8 @@ let mktplcRef = { name = "HCL"; publisher = "HashiCorp"; - version = "0.3.2"; - hash = "sha256-cxF3knYY29PvT3rkRS8SGxMn9vzt56wwBXpk2PqO0mo="; + version = "0.6.0"; + hash = "sha256-Za2ODrsHR/y0X/FOhVEtbg6bNs439G6rlBHW84EZS60="; }; meta = { description = "HashiCorp HCL syntax"; From 6383a20b3170d807c1c7173b1ecd55292fd0cdba Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Sat, 2 Nov 2024 03:46:22 +0300 Subject: [PATCH 237/369] vscode-extensions.redhat.ansible: 2.12.143 -> 24.10.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 691859cdb38c..c533e67a9ae7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3955,8 +3955,8 @@ let mktplcRef = { name = "ansible"; publisher = "redhat"; - version = "2.12.143"; - hash = "sha256-NEV7sVYJJvapZjk5sylkzijH8qLZ7xzmBzHI7qcj2Ok="; + version = "24.10.0"; + hash = "sha256-NDIGyVCo3Az6oncnKR9PXXnZ4ynwF7HBeIiNyiGTPko="; }; meta = { description = "Ansible language support"; From 52ba81f6c06e69f53922b9ee24dc1c68ee627d7b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 31 Oct 2024 18:43:27 -0500 Subject: [PATCH 238/369] sketchybar: apple_sdk-11 -> apple_sdk-15 Upstream uses availability checks for different features. Lets not hold back functionality by building with latest SDK available. --- pkgs/by-name/sk/sketchybar/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index b08e4ca81607..c6c83ca298cd 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -3,8 +3,7 @@ stdenv, fetchFromGitHub, nix-update-script, - apple-sdk_11, - darwinMinVersionHook, + apple-sdk_15, versionCheckHook, }: @@ -30,8 +29,7 @@ stdenv.mkDerivation (finalAttrs: { }; buildInputs = [ - apple-sdk_11 - (darwinMinVersionHook "10.13") + apple-sdk_15 ]; makeFlags = [ target ]; From 256e270e24f354d523a3baa1feab6eac51de3f86 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Sat, 2 Nov 2024 03:52:25 +0300 Subject: [PATCH 239/369] vscode-extensions.stylelint.vscode-stylelint: 1.3.0 -> 1.4.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c533e67a9ae7..c3cb75af8919 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4547,8 +4547,8 @@ let mktplcRef = { name = "vscode-stylelint"; publisher = "stylelint"; - version = "1.3.0"; - hash = "sha256-JoCa2d0ayBEuCcQi3Z/90GJ4AIECVz8NCpd+i+9uMeA="; + version = "1.4.0"; + hash = "sha256-CsQBRoVDtNLlkHa6NLmOspkswB/JUMfMuU2dMYDlDnc="; }; meta = { description = "Official Stylelint extension for Visual Studio Code"; From e79b047756cd2790a73bccdcbbad245578768588 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Sat, 2 Nov 2024 03:56:52 +0300 Subject: [PATCH 240/369] vscode-extensions.visualstudioexptteam.intellicode-api-usage-examples: 0.2.8 -> 0.2.9 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c3cb75af8919..de2e115da2d2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5036,8 +5036,8 @@ let mktplcRef = { name = "intellicode-api-usage-examples"; publisher = "VisualStudioExptTeam"; - version = "0.2.8"; - hash = "sha256-aXAS3QX+mrX0kJqf1LUsvguqRxxC0o+jj1bKQteXPNA="; + version = "0.2.9"; + hash = "sha256-8xBD+WLBaxYt8v3+8lvV2SiqV89iE4jeQod2kH7LNHU="; }; meta = { description = "See relevant code examples from GitHub for over 100K different APIs right in your editor"; From ee7aa5ce97fd75db271ec15d354bdd81231df153 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Sat, 2 Nov 2024 00:58:11 +0000 Subject: [PATCH 241/369] waveterm: 0.9.0 -> 0.9.1 --- pkgs/by-name/wa/waveterm/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index de86b9a5b46f..a72a83b30f03 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -33,7 +33,7 @@ let pname = "waveterm"; - version = "0.9.0"; + version = "0.9.1"; src = let @@ -46,10 +46,10 @@ let aarch64-darwin = "Wave-darwin-arm64-${version}.zip"; }; hash = selectSystem { - x86_64-linux = "sha256-BYGWXieBYrkaN/8VrDDZ9f67xjOD9EkrJKz1S4uc+u8="; - aarch64-linux = "sha256-e4YHKNbzK/Eyn8oHs2iJUI5mgpYBfWjQ36dO2l3cmo4="; - x86_64-darwin = "sha256-QaFpeXPdrLuVrUTvxJN7MwqOYoBOxlDDYoKgkgcEX94="; - aarch64-darwin = "sha256-WiJ+2WSxh4wWXIK4Egu5YKiH4JYam6FgvZ8ZGdSZaqY="; + x86_64-linux = "sha256-DtpS9jRQljAhPA9Qcpd5acIeCyb5E/Nkyg3LXa4wrk0="; + aarch64-linux = "sha256-xM+34vsp+LFCYAFIrb0mKQRy/vPqn7FFvPlzV4JWPCg="; + x86_64-darwin = "sha256-fadf/qOec1liqpBOH+lTEGnTYJlvL8QJ3kHNcuI1wew="; + aarch64-darwin = "sha256-kKDDeIyO4CSxLWYpJyfz0Egl2S1ADRk4N/XXpsCBXVo="; }; in fetchurl { From 18f997649834e11707a44a8986c7f9b74f1d1fc0 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Sat, 2 Nov 2024 04:02:21 +0300 Subject: [PATCH 242/369] vscode-extensions.visualstudioexptteam.vscodeintellicode: 1.2.30 -> 1.3.2 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index de2e115da2d2..871fd86ed5be 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5052,8 +5052,8 @@ let mktplcRef = { name = "vscodeintellicode"; publisher = "VisualStudioExptTeam"; - version = "1.2.30"; - hash = "sha256-f2Gn+W0QHN8jD5aCG+P93Y+JDr/vs2ldGL7uQwBK4lE="; + version = "1.3.2"; + hash = "sha256-2zexyX1YKD5jgtsvDx7/z3luh5We71ys+XRlVcNywfs="; }; meta = { description = "AI-assisted development"; From 7e23262fe3a2673e1d228f99bbcda25836f30f88 Mon Sep 17 00:00:00 2001 From: TheMaxMur Date: Sat, 2 Nov 2024 04:09:26 +0300 Subject: [PATCH 243/369] vscode-extensions.vscjava.vscode-java-pack: 0.25.2023121402 -> 0.29.2024091906 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 871fd86ed5be..9401202aef9c 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5155,8 +5155,8 @@ let mktplcRef = { name = "vscode-java-pack"; publisher = "vscjava"; - version = "0.25.2023121402"; - hash = "sha256-JhVJK2gZe3R6dpynon+9wauSAWPdW4LmG9oRWylCexM="; + version = "0.29.2024091906"; + hash = "sha256-A0WHSqqYVkRN1C3WI7Gd7DZJFDJPYDVsEygDCG67GoQ="; }; meta = { description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more"; From 7877e40b9a894e92c059bd2a7aea724ac1c6b092 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Nov 2024 02:43:35 +0100 Subject: [PATCH 244/369] zigbee2mqtt: 1.40.2 -> 1.41.0 https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.41.0 --- pkgs/servers/zigbee2mqtt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index eb96dbd5f355..bd4038cf3dee 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.40.2"; + version = "1.41.0"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-gm4MQabvm8NipV6Szml6l2Dy7q3O6YsurGGg9DzahHI="; + hash = "sha256-WIU3fTONRckPmSdW5DJXripsf4QdEZM7UBVSru7JqYc="; }; - npmDepsHash = "sha256-FF7RCV5SDzLUZ/dY8mnPEmYmBhJNjJScQ1R2yKDSawU="; + npmDepsHash = "sha256-yCFhHJCBSc8tCWib9ffqBg4sF9VURx+nXln9ghmBpyM="; buildInputs = lib.optionals withSystemd [ systemdMinimal From ab133a3158c9f7b5d21bc1ef9ca36c064d680bca Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 09:53:13 +0900 Subject: [PATCH 245/369] python312Packages.jupyter-collaboration-ui: init at 1.0.0 https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-collaboration-ui --- .../jupyter-collaboration-ui/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/jupyter-collaboration-ui/default.nix diff --git a/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix new file mode 100644 index 000000000000..2e571e222c25 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-collaboration-ui/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + hatch-jupyter-builder, + jupyter-collaboration, +}: + +buildPythonPackage rec { + pname = "jupyter-collaboration-ui"; + version = "1.0.0"; + pyproject = true; + + src = fetchPypi { + pname = "jupyter_collaboration_ui"; + inherit version; + hash = "sha256-hTyUmLzRvexNTZxTv4Mbflm+OTW9j0HReLpAJuk/WnY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "jupyterlab>=4.0.0"' "" + ''; + + build-system = [ + hatchling + hatch-jupyter-builder + ]; + + pythonImportsCheck = [ "jupyter_collaboration_ui" ]; + + # no tests + doCheck = false; + + passthru.tests = jupyter-collaboration.tests; + + meta = { + description = "JupyterLab/Jupyter Notebook 7+ extension providing user interface integration for real time collaboration"; + homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-collaboration-ui"; + license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae8070db1bb9..f2841ec66580 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6634,6 +6634,8 @@ self: super: with self; { jupyter-collaboration = callPackage ../development/python-modules/jupyter-collaboration { }; + jupyter-collaboration-ui = callPackage ../development/python-modules/jupyter-collaboration-ui { }; + jupyter-contrib-core = callPackage ../development/python-modules/jupyter-contrib-core { }; jupyter-console = callPackage ../development/python-modules/jupyter-console { }; From 3e566da3a778fb66ef5a583f8282ac4c841c4d38 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 09:56:27 +0900 Subject: [PATCH 246/369] python312Packages.jupyter-docprovider: init at 1.0.0 https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-docprovider --- .../jupyter-docprovider/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/jupyter-docprovider/default.nix diff --git a/pkgs/development/python-modules/jupyter-docprovider/default.nix b/pkgs/development/python-modules/jupyter-docprovider/default.nix new file mode 100644 index 000000000000..d32dc1b31140 --- /dev/null +++ b/pkgs/development/python-modules/jupyter-docprovider/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + hatch-jupyter-builder, + jupyter-collaboration, +}: + +buildPythonPackage rec { + pname = "jupyter-docprovider"; + version = "1.0.0"; + pyproject = true; + + src = fetchPypi { + pname = "jupyter_docprovider"; + inherit version; + hash = "sha256-EcO3GqdbhRxawHwfSnjOHfFmYjpZy2NuuGc5CSW/xlY="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail ', "jupyterlab>=4.0.0"' "" + ''; + + build-system = [ + hatchling + hatch-jupyter-builder + ]; + + pythonImportsCheck = [ "jupyter_docprovider" ]; + + # no tests + doCheck = false; + + passthru.tests = jupyter-collaboration.tests; + + meta = { + description = "JupyterLab/Jupyter Notebook 7+ extension integrating collaborative shared models"; + homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-docprovider"; + license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f2841ec66580..14b6da712c8c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6642,6 +6642,8 @@ self: super: with self; { jupyter-core = callPackage ../development/python-modules/jupyter-core { }; + jupyter-docprovider = callPackage ../development/python-modules/jupyter-docprovider { }; + jupyter-events = callPackage ../development/python-modules/jupyter-events { }; jupyter-highlight-selected-word = callPackage ../development/python-modules/jupyter-highlight-selected-word { }; From 627c69bef1f1350c72efaeb9a31f0c0039eb4203 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 10:01:13 +0900 Subject: [PATCH 247/369] python312Packages.jupyter-server-ydoc: init at 1.0.0 https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-server-ydoc --- .../jupyter-server-ydoc/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 54 insertions(+) create mode 100644 pkgs/development/python-modules/jupyter-server-ydoc/default.nix diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix new file mode 100644 index 000000000000..1e988383621b --- /dev/null +++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix @@ -0,0 +1,52 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + hatchling, + jsonschema, + jupyter-events, + jupyter-server, + jupyter-server-fileid, + jupyter-ydoc, + pycrdt, + pycrdt-websocket, + jupyter-collaboration, +}: + +buildPythonPackage rec { + pname = "jupyter-server-ydoc"; + version = "1.0.0"; + pyproject = true; + + src = fetchPypi { + pname = "jupyter_server_ydoc"; + inherit version; + hash = "sha256-MBdSTB2gaIFbdIyPHr5+wI7aBH/Fl85ywSWxgAmjkek="; + }; + + build-system = [ hatchling ]; + + dependencies = [ + jsonschema + jupyter-events + jupyter-server + jupyter-server-fileid + jupyter-ydoc + pycrdt + pycrdt-websocket + ]; + + pythonImportsCheck = [ "jupyter_server_ydoc" ]; + + # no tests + doCheck = false; + + passthru.tests = jupyter-collaboration.tests; + + meta = { + description = "Jupyter-server extension integrating collaborative shared models"; + homepage = "https://github.com/jupyterlab/jupyter-collaboration/tree/main/projects/jupyter-server-ydoc"; + license = lib.licenses.bsd3; + maintainers = lib.teams.jupyter.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 14b6da712c8c..7a756d262b26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6658,6 +6658,8 @@ self: super: with self; { jupyter-server-terminals = callPackage ../development/python-modules/jupyter-server-terminals { }; + jupyter-server-ydoc = callPackage ../development/python-modules/jupyter-server-ydoc { }; + jupyter-ui-poll = callPackage ../development/python-modules/jupyter-ui-poll { }; jupyter-ydoc = callPackage ../development/python-modules/jupyter-ydoc { }; From 9a7f31fffb87504ee4a6c4054e0b53d9b8e82e60 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 02:30:31 +0900 Subject: [PATCH 248/369] python312Packages.jupyter-collaboration: 2.1.4 -> 3.0.0 Changelog: https://github.com/jupyterlab/jupyter_collaboration/blob/v3.0.0/CHANGELOG.md --- .../jupyter-collaboration/default.nix | 57 +++++-------------- .../jupyter-collaboration/test.nix | 39 +++++++++++++ 2 files changed, 52 insertions(+), 44 deletions(-) create mode 100644 pkgs/development/python-modules/jupyter-collaboration/test.nix diff --git a/pkgs/development/python-modules/jupyter-collaboration/default.nix b/pkgs/development/python-modules/jupyter-collaboration/default.nix index 0489550cfc68..4f6e29fee66d 100644 --- a/pkgs/development/python-modules/jupyter-collaboration/default.nix +++ b/pkgs/development/python-modules/jupyter-collaboration/default.nix @@ -4,73 +4,42 @@ fetchPypi, # build-system - hatch-jupyter-builder, - hatch-nodejs-version, hatchling, - jupyterlab, # dependencies - jsonschema, - jupyter-events, - jupyter-server, - jupyter-server-fileid, - jupyter-ydoc, - pycrdt, - pycrdt-websocket, + jupyter-collaboration-ui, + jupyter-docprovider, + jupyter-server-ydoc, # tests - pytest-jupyter, - pytestCheckHook, - websockets, + callPackage, }: buildPythonPackage rec { pname = "jupyter-collaboration"; - version = "2.1.4"; + version = "3.0.0"; pyproject = true; src = fetchPypi { pname = "jupyter_collaboration"; inherit version; - hash = "sha256-YT3wrTQ8imuTK8zeJbwscHtawtqspf1oItGzMMfg5io="; + hash = "sha256-eewAsh/EI8DV4FNWgjEhT61RUbaYE6suOAny4bf1CCw="; }; - postPatch = '' - sed -i "/^timeout/d" pyproject.toml - ''; - - build-system = [ - hatch-jupyter-builder - hatch-nodejs-version - hatchling - jupyterlab - ]; + build-system = [ hatchling ]; dependencies = [ - jsonschema - jupyter-events - jupyter-server - jupyter-server-fileid - jupyter-ydoc - pycrdt - pycrdt-websocket - ]; - - nativeCheckInputs = [ - pytest-jupyter - pytestCheckHook - websockets + jupyter-collaboration-ui + jupyter-docprovider + jupyter-server-ydoc ]; pythonImportsCheck = [ "jupyter_collaboration" ]; - preCheck = '' - export HOME=$TEMP - ''; + # no tests + doCheck = false; - pytestFlagsArray = [ "-Wignore::DeprecationWarning" ]; - - __darwinAllowLocalNetworking = true; + passthru.tests = callPackage ./test.nix { }; meta = { description = "JupyterLab Extension enabling Real-Time Collaboration"; diff --git a/pkgs/development/python-modules/jupyter-collaboration/test.nix b/pkgs/development/python-modules/jupyter-collaboration/test.nix new file mode 100644 index 000000000000..044b923a723d --- /dev/null +++ b/pkgs/development/python-modules/jupyter-collaboration/test.nix @@ -0,0 +1,39 @@ +{ + stdenvNoCC, + fetchFromGitHub, + jupyter-collaboration, + pytest-jupyter, + pytestCheckHook, + websockets, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "jupyter-collaboration-test"; + inherit (jupyter-collaboration) version; + + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = "jupyter-collaboration"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-6hDYB1uC0WraB37s9EKLJF7jyFu0B3xLocuLYyKj4hs="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "timeout = 300" "" + ''; + + installPhase = '' + touch $out + ''; + + env.HOME = "$TMPDIR"; + + doCheck = true; + + nativeCheckInputs = [ + jupyter-collaboration + pytest-jupyter + pytestCheckHook + websockets + ]; +}) From c8b4aa8a482dd6ccb206a741019c0f3367864dbd Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 02:31:13 +0900 Subject: [PATCH 249/369] python312Packages.jupyter-ydoc: 2.1.2 -> 3.0.0 Changelog: https://github.com/jupyter-server/jupyter_ydoc/blob/v3.0.0/CHANGELOG.md --- pkgs/development/python-modules/jupyter-ydoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-ydoc/default.nix b/pkgs/development/python-modules/jupyter-ydoc/default.nix index 4bb08e6ed9a5..5fa69f424fbd 100644 --- a/pkgs/development/python-modules/jupyter-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-ydoc/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "jupyter-ydoc"; - version = "2.1.2"; + version = "3.0.0"; pyproject = true; src = fetchPypi { pname = "jupyter_ydoc"; inherit version; - hash = "sha256-yYnIm0s9ljtYQJVzKJcimNTVSDTtjzz3Zo3WE9OfKsw="; + hash = "sha256-nPOU7nxpVSh+6tERJq2DYIOpyjze8uJyIdxN/gW7arE="; }; build-system = [ From 71d74ab048626db99b7773f62913fc210a6ea136 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 02:32:18 +0900 Subject: [PATCH 250/369] python312Packages.jupyterhub: 5.1.0 -> 5.2.1 Diff: https://github.com/jupyterhub/jupyterhub/compare/refs/tags/5.1.0...5.2.1 Changelog: https://github.com/jupyterhub/jupyterhub/blob/5.2.1/docs/source/reference/changelog.md --- pkgs/development/python-modules/jupyterhub/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 76fbe01ae3d1..5fb9cc969b59 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pname = "jupyterhub"; - version = "5.1.0"; + version = "5.2.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -51,12 +51,12 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "jupyterhub"; rev = "refs/tags/${version}"; - hash = "sha256-3L83FLhLCdTgOuFRgRMbz316cYbai0Z+hJwxXUCYB2Y="; + hash = "sha256-zOWcXpByJRzI9sTjTl+w/vo99suKOEN0TvPn1ZWlNmc="; }; npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-b7j6iGYXrwco4YruqRPEEi4yWRF6otTUD2jKCEPcLTE="; + hash = "sha256-My7WUAqIvOrbbVTxSnA6a5NviM6u95+iyykx1xbudpw="; }; postPatch = '' From 30448f4e0c9655d95bad9e9c7f02fe2dd2230efa Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 02:32:35 +0900 Subject: [PATCH 251/369] python312Packages.jupyterhub-systemdspawner: 1.0.1 -> 1.0.2 Diff: https://github.com/jupyterhub/systemdspawner/compare/refs/tags/v1.0.1...v1.0.2 Changelog: https://github.com/jupyterhub/systemdspawner/blob/v1.0.2/CHANGELOG.md --- .../python-modules/jupyterhub-systemdspawner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix index c40866fd3d82..ebcbfb71d7c5 100644 --- a/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix +++ b/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jupyterhub-systemdspawner"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "jupyterhub"; repo = "systemdspawner"; rev = "refs/tags/v${version}"; - hash = "sha256-2Pxswa472umovHBUVTIX1l+Glj6bzzgBLsu+p4IA6jA="; + hash = "sha256-obM8HGCHsisRV1+kHMWdA7d6eb6awwPMBuDUAf3k0uI="; }; postPatch = '' From e4509e3840200ae1208af736c576ffd49c23e42a Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 02:33:19 +0900 Subject: [PATCH 252/369] python312Packages.mkdocs-jupyter: 0.25.0 -> 0.25.1 Changelog: https://github.com/danielfrg/mkdocs-jupyter/blob/0.25.1/CHANGELOG.md --- pkgs/development/python-modules/mkdocs-jupyter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index dd0c300ab175..c0286491927c 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mkdocs-jupyter"; - version = "0.25.0"; + version = "0.25.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mkdocs_jupyter"; inherit version; - hash = "sha256-4mwdNBkWvFf5bqP5PY0KiPx3yH1M7iIvZtIAd5jZJPU="; + hash = "sha256-DpJy/0lH4OxoPJJCOkv7QqJkd8EDqxpquCd+LcyPev4="; }; pythonRelaxDeps = [ "nbconvert" ]; From 36353c8444f9404aca74cc4f541cfc0c4eb7f1c6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 02:34:11 +0900 Subject: [PATCH 253/369] python312Packages.qtconsole: 5.6.0 -> 5.6.1 Diff: https://github.com/jupyter/qtconsole/compare/refs/tags/5.6.0...5.6.1 Changelog: https://qtconsole.readthedocs.io/en/stable/changelog.html#changes-in-jupyter-qt-console --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 858785307a47..fcda25cc9ff2 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.6.0"; + version = "5.6.1"; pyproject = true; src = fetchFromGitHub { owner = "jupyter"; repo = "qtconsole"; rev = "refs/tags/${version}"; - hash = "sha256-V82tGAmpvfGeUoewtJXXsBBXx2HNcV9/IMJxJg3bJL8="; + hash = "sha256-esCt7UQ0va/FJ0gdSrcc/k/FgyBVqKy7ttrN6E6mx+E="; }; build-system = [ setuptools ]; From 225a727fc057cf25ca22be1871cd114c2501bfed Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 1 Nov 2024 02:34:24 +0900 Subject: [PATCH 254/369] python312Packages.spyder-kernels: 3.0.0 -> 3.0.1 Diff: https://github.com/spyder-ide/spyder-kernels/compare/refs/tags/v3.0.0...v3.0.1 Changelog: https://github.com/spyder-ide/spyder-kernels/blob/v3.0.1/CHANGELOG.md --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 46bf6bb70bb2..c0511c2fc6a7 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; src = fetchFromGitHub { owner = "spyder-ide"; repo = "spyder-kernels"; rev = "refs/tags/v${version}"; - hash = "sha256-oyPgujvaj2tqouZKuMVDq3gxm0GNrKmeUWqUFUkEMB4="; + hash = "sha256-OWdm4ytF9evqMEOOASssMag6QuJq2MwqmIZ+4et5IoI="; }; build-system = [ setuptools ]; From 54785180cffebdbfcafa7eddc8af481283c3eb7a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 11:34:02 +0900 Subject: [PATCH 255/369] python312Packages.jupyterhub-ldapauthenticator: 1.3.2 -> 2.0.1 Diff: https://github.com/jupyterhub/ldapauthenticator/compare/1.3.2...2.0.1 Changelog: https://github.com/jupyterhub/ldapauthenticator/blob/2.0.1/CHANGELOG.md --- .../jupyterhub-ldapauthenticator/default.nix | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index c4da40729c0f..79c5c99ff99e 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -1,32 +1,52 @@ { lib, buildPythonPackage, + fetchFromGitHub, + setuptools, jupyterhub, ldap3, - fetchPypi, + traitlets, + pytestCheckHook, + pytest-asyncio, }: buildPythonPackage rec { pname = "jupyterhub-ldapauthenticator"; - version = "1.3.2"; - format = "setuptools"; + version = "2.0.1"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "758081bbdb28b26313bb18c9d8aa2b8fcdc9162e4d3ab196c626567e64f1ab8b"; + src = fetchFromGitHub { + owner = "jupyterhub"; + repo = "ldapauthenticator"; + rev = "refs/tags/${version}"; + hash = "sha256-pb1d0dqu3VGCsuibpYgncbqCM9fz09yyoKGcKb14f4k="; }; - # No tests implemented - doCheck = false; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jupyterhub ldap3 + traitlets + ]; + + pythonImportsCheck = [ "ldapauthenticator" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ + # touch the socket + "test_allow_config" + "test_ldap_auth" ]; meta = with lib; { description = "Simple LDAP Authenticator Plugin for JupyterHub"; homepage = "https://github.com/jupyterhub/ldapauthenticator"; + changelog = "https://github.com/jupyterhub/ldapauthenticator/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; }; } From 558dafdd0dd0c8f167a00413fe5c82ea94dfde8e Mon Sep 17 00:00:00 2001 From: Tomo Date: Sat, 2 Nov 2024 02:17:32 +0000 Subject: [PATCH 256/369] javacard-devkit: drop Had a dependency on the Oracle JDK, as well as being several years out-of-date. --- .../manual/release-notes/rl-2411.section.md | 3 + .../compilers/javacard-devkit/default.nix | 70 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 4 insertions(+), 72 deletions(-) delete mode 100644 pkgs/development/compilers/javacard-devkit/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 2e6547528341..6e3fd6844f03 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -342,6 +342,9 @@ nvimpager settings: user commands in `-c` and `--cmd` now override the respective default settings because they are executed later. +- `javacard-devkit` was dropped due to having a dependency on the Oracle JDK, + as well as being several years out-of-date. + - Kubernetes `featureGates` have changed from a `listOf str` to `attrsOf bool`. This refactor makes it possible to also disable feature gates, without having to use `extraOpts` flags. diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix deleted file mode 100644 index c9e9b34e6ee0..000000000000 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib, stdenv, requireFile, unzip, makeWrapper, oraclejdk8, autoPatchelfHook -, pcsclite -}: - -stdenv.mkDerivation rec { - pname = "javacard-devkit"; - version = "2.2.2"; - uscoreVersion = builtins.replaceStrings ["."] ["_"] version; - - src = requireFile { - name = "java_card_kit-${uscoreVersion}-linux.zip"; - url = "http://www.oracle.com/technetwork/java/javasebusiness/downloads/" - + "java-archive-downloads-javame-419430.html#java_card_kit-2.2.2-oth-JPR"; - sha256 = "1rzkw8izqq73ifvyp937wnjjc40a40drc4zsm0l1s6jyv3d7agb2"; - }; - - nativeBuildInputs = [ unzip oraclejdk8 makeWrapper autoPatchelfHook ]; - buildInputs = [ pcsclite ]; - - zipPrefix = "java_card_kit-${uscoreVersion}"; - - sourceRoot = "."; - unpackCmd = '' - unzip -p "$curSrc" "$zipPrefix/$zipPrefix-rr-bin-linux-do.zip" | jar x - ''; - - installPhase = '' - mkdir -p "$out/share/$pname" - cp -rt "$out/share/$pname" api_export_files - cp -rt "$out" lib - - for i in bin/*; do - case "$i" in - *.so) install -vD "$i" "$out/libexec/$pname/$(basename "$i")";; - *) target="$out/bin/$(basename "$i")" - install -vD "$i" "$target" - sed -i -e 's|^$JAVA_HOME/bin/java|''${JAVA:-$JAVA_HOME/bin/java}|' "$target" - wrapProgram "$target" \ - --set JAVA_HOME "$JAVA_HOME" \ - --prefix CLASSPATH : "$out/share/$pname/api_export_files" - ;; - esac - done - - makeWrapper "$JAVA_HOME/bin/javac" "$out/bin/javacardc" \ - --prefix CLASSPATH : "$out/lib/api.jar" - ''; - - meta = { - description = "Official development kit by Oracle for programming for the Java Card platform"; - longDescription = '' - This Java Card SDK is the official SDK made available by Oracle for programming for the Java Card platform. - - Instructions for usage: - - First, compile your '.java' (NixOS-specific: you should not need to set the class path -- if you need, it's a bug): - javacardc -source 1.5 -target 1.5 [MyJavaFile].java - Then, test with 'jcwde' (NixOS-specific: you can change the java version used to run jcwde with eg. JAVA=jdb): - CLASSPATH=. jcwde [MyJcwdeConfig].app & sleep 1 && apdutool [MyApdus].apdu - Finally, convert the '.class' file into a '.cap': - converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] - For more details, please refer to the documentation by Oracle - ''; - homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html"; - sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.unfree; - maintainers = [ lib.maintainers.ekleog ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index cfbc05fa7739..1555b1df45b0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -536,6 +536,7 @@ mapAliases { jami-client-qt = jami-client; # Added 2022-11-06 jami-client = jami; # Added 2023-02-10 jami-daemon = jami.daemon; # Added 2023-02-10 + javacard-devkit = throw "javacard-devkit was dropped due to having a dependency on the Oracle JDK, as well as being several years out-of-date."; # Added 2024-11-01 jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30 jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2028-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ae20f332ec2..fc0201cb32f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15041,8 +15041,6 @@ with pkgs; jna = callPackage ../development/java-modules/jna { }; - javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { }; - juniper = callPackage ../development/compilers/juniper { }; inherit (callPackage ../development/compilers/julia { }) From b23d20e724b6c1f61dcefc419375b7fffc980883 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 1 Aug 2024 04:08:55 +0200 Subject: [PATCH 257/369] openvino: 2024.2.0 -> 2024.4.1 https://github.com/openvinotoolkit/openvino/releases/tag/2024.3.0 https://github.com/openvinotoolkit/openvino/releases/tag/2024.4.0 https://github.com/openvinotoolkit/openvino/releases/tag/2024.4.1 --- pkgs/development/libraries/openvino/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openvino/default.nix b/pkgs/development/libraries/openvino/default.nix index 98129c5944d1..21372f8aea4c 100644 --- a/pkgs/development/libraries/openvino/default.nix +++ b/pkgs/development/libraries/openvino/default.nix @@ -18,6 +18,7 @@ # runtime , flatbuffers +, gflags , level-zero , libusb1 , libxml2 @@ -48,6 +49,7 @@ let python = python3Packages.python.withPackages (ps: with ps; [ cython + distutils pybind11 setuptools sphinx @@ -58,14 +60,14 @@ in stdenv.mkDerivation rec { pname = "openvino"; - version = "2024.2.0"; + version = "2024.4.1"; src = fetchFromGitHub { owner = "openvinotoolkit"; repo = "openvino"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-HiKKvmqgbwW625An+Su0EOHqVrP18yvG2aOzrS0jWr4="; + hash = "sha256-v0PPGFUHCGNWdlTff40Ol2NvaYglb/+L/zZAQujk6lk="; }; outputs = [ @@ -117,6 +119,7 @@ stdenv.mkDerivation rec { # features (cmakeBool "ENABLE_INTEL_CPU" stdenv.hostPlatform.isx86_64) + (cmakeBool "ENABLE_INTEL_NPU" false) # undefined reference to `std::ios_base_library_init()@GLIBCXX_3.4.32' (cmakeBool "ENABLE_JS" false) (cmakeBool "ENABLE_LTO" true) (cmakeBool "ENABLE_ONEDNN_FOR_GPU" false) @@ -138,6 +141,7 @@ stdenv.mkDerivation rec { buildInputs = [ flatbuffers + gflags level-zero libusb1 libxml2 From a2404123368dda63c71ede1cd22c93abebb5a82a Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 1 Nov 2024 12:03:04 -0700 Subject: [PATCH 258/369] python312Packages.langchain.openai: correct to 0.2.5 --- .../python-modules/langchain-openai/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix index 96019d63e692..e58b03a7d2cd 100644 --- a/pkgs/development/python-modules/langchain-openai/default.nix +++ b/pkgs/development/python-modules/langchain-openai/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "langchain-openai"; - version = "0.3.6"; + version = "0.2.5"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; + rev = "refs/tags/langchain-openai==${version}"; + hash = "sha256-Gm7MAOuG+kYQ3TRTRdQXJ+HcoUz+iL9j+pTXz+zAySg="; }; sourceRoot = "${src.name}/libs/partners/openai"; @@ -96,6 +96,9 @@ buildPythonPackage rec { description = "Integration package connecting OpenAI and LangChain"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/openai"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } From d5ab4665408a284369d7046c92263e43874ed0fb Mon Sep 17 00:00:00 2001 From: sarahec Date: Fri, 1 Nov 2024 21:17:57 -0700 Subject: [PATCH 259/369] python312Packages.langchain-core: 0.3.12 -> 0.3.15 --- .../python-modules/langchain-core/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix index 49ad6cf3c7a1..8bdc7ededc7b 100644 --- a/pkgs/development/python-modules/langchain-core/default.nix +++ b/pkgs/development/python-modules/langchain-core/default.nix @@ -34,14 +34,14 @@ buildPythonPackage rec { pname = "langchain-core"; - version = "0.3.12"; + version = "0.3.15"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-WWzEIP/JirA4btYVy4+U7PSg6S8VnkZqxPLgLriWbTY="; + hash = "sha256-lSXAqjjnihuucTZOSwQJk8gtrtFbUOTHN4J587iLKy0="; }; sourceRoot = "${src.name}/libs/core"; @@ -143,6 +143,9 @@ buildPythonPackage rec { homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/core"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } From 3e88c02357a0ba57b1ea028b63366610141aa4b6 Mon Sep 17 00:00:00 2001 From: sarahec Date: Fri, 1 Nov 2024 21:18:56 -0700 Subject: [PATCH 260/369] python312Packages.langchain-huggingface: correct to 0.1.2 --- .../python-modules/langchain-huggingface/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix index 54c3c2f41285..074f87ee135e 100644 --- a/pkgs/development/python-modules/langchain-huggingface/default.nix +++ b/pkgs/development/python-modules/langchain-huggingface/default.nix @@ -30,13 +30,13 @@ buildPythonPackage rec { pname = "langchain-huggingface"; - version = "0.3.6"; + version = "0.1.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; + rev = "refs/tags/langchain-huggingface==${version}"; hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; }; @@ -80,6 +80,9 @@ buildPythonPackage rec { description = "An integration package connecting Huggingface related classes and LangChain"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/huggingface"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } From 3a9a6ecfd8cdad64525a42188b0d9f26ba9f932f Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 1 Nov 2024 13:29:13 -0700 Subject: [PATCH 261/369] python312Packages.langchain-azure-dynamic-sessions: Fix version to 0.2.0 (latest) --- .../langchain-azure-dynamic-sessions/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix index 508608ca7362..84e899b288f1 100644 --- a/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix +++ b/pkgs/development/python-modules/langchain-azure-dynamic-sessions/default.nix @@ -27,13 +27,13 @@ buildPythonPackage rec { pname = "langchain-azure-dynamic-sessions"; - version = "0.3.6"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; + rev = "refs/tags/langchain-azure-dynamic-sessions==${version}"; hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; }; @@ -74,6 +74,9 @@ buildPythonPackage rec { homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/azure-dynamic-sessions"; changelog = "https://github.com/langchain-ai/langchain/releases/tag/langchain-azure-dynamic-sessions==${version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } From 98882fd72f47d4950288f2561f07b4251742d536 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 1 Nov 2024 13:33:46 -0700 Subject: [PATCH 262/369] python312Packages.langchain-chroma: revert to 0.1.4 (latest) --- .../development/python-modules/langchain-chroma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index e7ad5196c6fd..1ec6ce71ed5d 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "langchain-chroma"; - version = "0.3.6"; + version = "0.1.4"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; + rev = "refs/tags/langchain-chroma==${version}"; + hash = "sha256-pU7H8OYXa+JjdkSO36xESPI6r3xA+9cFXxeJnfpYuHc="; }; sourceRoot = "${src.name}/libs/partners/chroma"; From 65089d8a13b43088713d889d7812edfa7d08a5a8 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 1 Nov 2024 13:51:24 -0700 Subject: [PATCH 263/369] python312Packages.langchain-mongodb: restore to 0.2.0 --- .../python-modules/langchain-mongodb/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index f58683581833..0c1422bbeb59 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "langchain-mongodb"; - version = "0.3.6"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; + rev = "refs/tags/langchain-mongodb==${version}"; + hash = "sha256-Jd9toXkS9dGtSIrJQ/5W+swV1z2BJOJKBtkyGzj3oSc="; }; sourceRoot = "${src.name}/libs/partners/mongodb"; @@ -65,6 +65,9 @@ buildPythonPackage rec { description = "Integration package connecting MongoDB and LangChain"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/mongodb"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } From 1125cd805eb55362c57b6e66cb66dd5b83d6e227 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 1 Nov 2024 13:55:21 -0700 Subject: [PATCH 264/369] python312Packages.langchain-standard-tests: track langchain-core --- .../python-modules/langchain-standard-tests/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain-standard-tests/default.nix b/pkgs/development/python-modules/langchain-standard-tests/default.nix index 3bec0ee76be3..34a7b5c2adcc 100644 --- a/pkgs/development/python-modules/langchain-standard-tests/default.nix +++ b/pkgs/development/python-modules/langchain-standard-tests/default.nix @@ -21,12 +21,11 @@ buildPythonPackage rec { pname = "langchain-standard-tests"; - version = "0.1.1"; pyproject = true; # this is an internal library, so there are no tags # sync source with langchain-core for easy updates - inherit (langchain-core) src; + inherit (langchain-core) src version; sourceRoot = "${src.name}/libs/standard-tests"; build-system = [ poetry-core ]; @@ -51,6 +50,9 @@ buildPythonPackage rec { description = "Build context-aware reasoning applications"; homepage = "https://github.com/langchain-ai/langchain"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ natsukium ]; + maintainers = with lib.maintainers; [ + natsukium + sarahec + ]; }; } From 969127fcd90e80ecddf4039f6bf5bc3ee117ecaa Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 1 Nov 2024 14:00:11 -0700 Subject: [PATCH 265/369] python312Packages.langchain-ollama: restore to 0.2.0 --- .../development/python-modules/langchain-ollama/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix index 344aa5cc8616..72bcf180d414 100644 --- a/pkgs/development/python-modules/langchain-ollama/default.nix +++ b/pkgs/development/python-modules/langchain-ollama/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "langchain-ollama"; - version = "0.3.6"; + version = "0.2.0"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; + rev = "refs/tags/langchain-ollama==${version}"; + hash = "sha256-NtlJqIevdaoOO4oDqKsL4OFbw8tHb3FjV9LrTytOGKE="; }; sourceRoot = "${src.name}/libs/partners/ollama"; From c20d082fc0e3936108c041437892e2b297c634e1 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 1 Nov 2024 14:05:28 -0700 Subject: [PATCH 266/369] python312Packages.langchain-text-splitters: correct to 0.3.2 --- .../langchain-text-splitters/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix index 5e3412efacc9..aed23439349e 100644 --- a/pkgs/development/python-modules/langchain-text-splitters/default.nix +++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix @@ -17,23 +17,21 @@ buildPythonPackage rec { pname = "langchain-text-splitters"; - version = "0.3.6"; + version = "0.3.2"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; - rev = "refs/tags/langchain-core==${version}"; - hash = "sha256-ACR+JzKcnYXROGOQe6DlZeqcYd40KlesgXSUOybOT20="; + rev = "refs/tags/langchain-text-splitters==${version}"; + hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY="; }; sourceRoot = "${src.name}/libs/text-splitters"; build-system = [ poetry-core ]; - dependencies = [ - langchain-core - ]; + dependencies = [ langchain-core ]; pythonImportsCheck = [ "langchain_text_splitters" ]; @@ -54,6 +52,9 @@ buildPythonPackage rec { description = "LangChain utilities for splitting into chunks a wide variety of text documents"; homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/text-splitters"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; + maintainers = with lib.maintainers; [ + fab + sarahec + ]; }; } From 16213efc0599089bb4c2aa1cc69d8e86e0e1f82c Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 1 Nov 2024 14:23:52 -0700 Subject: [PATCH 267/369] python312Packages.langgraph-sdk: correct to 1.35 --- pkgs/development/python-modules/langgraph-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix index 3e53fd0b28aa..f1e1a2520e22 100644 --- a/pkgs/development/python-modules/langgraph-sdk/default.nix +++ b/pkgs/development/python-modules/langgraph-sdk/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "langgraph-sdk"; - version = "0.2.28"; + version = "0.1.35"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - rev = "refs/tags/${version}"; - hash = "sha256-RbV4G5YPAUjS20B1sQsmFGBje1pbxgCu81pCESFbJLs="; + rev = "refs/tags/sdk==${version}"; + hash = "sha256-HWUGRoe5S0HPfOEbqUnFYLVrHe3SJtk3U8cy1JON050="; }; sourceRoot = "${src.name}/libs/sdk-py"; From d4e9e68774445365d53daa39fd8bcdfaabb68496 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 1 Nov 2024 14:24:46 -0700 Subject: [PATCH 268/369] python312Packages.langgraph: correct to 0.2.43 --- pkgs/development/python-modules/langgraph/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix index 6ddb731aab37..65f4e3aa23c7 100644 --- a/pkgs/development/python-modules/langgraph/default.nix +++ b/pkgs/development/python-modules/langgraph/default.nix @@ -17,6 +17,7 @@ dataclasses-json, grandalf, httpx, + langgraph-checkpoint-duckdb, langgraph-checkpoint-postgres, langgraph-checkpoint-sqlite, langsmith, @@ -34,14 +35,14 @@ buildPythonPackage rec { pname = "langgraph"; - version = "0.2.39"; + version = "0.2.43"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/${version}"; - hash = "sha256-VZRGlE3MSOzur1TWC6swQjf/o5M62LsYncx2g8dtS+o="; + hash = "sha256-8xTjWBq6GSl6X2IId3roS3ZNM/h76EGPitS08YQ4e7Y="; }; postgresqlTestSetupPost = '' @@ -70,6 +71,7 @@ buildPythonPackage rec { dataclasses-json grandalf httpx + langgraph-checkpoint-duckdb langgraph-checkpoint-postgres langgraph-checkpoint-sqlite langsmith @@ -86,6 +88,8 @@ buildPythonPackage rec { postgresqlTestHook ]; + pytestFlagsArray = [ "tests/unit_tests" ]; + disabledTests = [ # test is flaky due to pydantic error on the exception "test_doesnt_warn_valid_schema" From 51091e5185cfa974269b29950a9adbfacbc444b3 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Fri, 1 Nov 2024 14:27:28 -0700 Subject: [PATCH 269/369] python312Packages.langgraph-cli: correct to 0.1.52 --- pkgs/development/python-modules/langgraph-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix index 026fcde7d7d3..347be2ffcfa3 100644 --- a/pkgs/development/python-modules/langgraph-cli/default.nix +++ b/pkgs/development/python-modules/langgraph-cli/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "langgraph-cli"; - version = "0.2.28"; + version = "0.1.52"; pyproject = true; disabled = pythonOlder "3.10"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "langchain-ai"; repo = "langgraph"; - rev = "refs/tags/${version}"; - hash = "sha256-RbV4G5YPAUjS20B1sQsmFGBje1pbxgCu81pCESFbJLs="; + rev = "refs/tags/cli==${version}"; + hash = "sha256-zTBeDJB1Xu/rWsvEC/L4BRzxyh04lPYV7HQNHoJcskk="; }; sourceRoot = "${src.name}/libs/cli"; From 85ac13b7ef8ed068c0685eb8ca3f166b050fd102 Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sun, 19 May 2024 12:30:16 -0700 Subject: [PATCH 270/369] baidupcs-go: init at 3.9.5 --- pkgs/by-name/ba/baidupcs-go/package.nix | 33 +++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/by-name/ba/baidupcs-go/package.nix diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix new file mode 100644 index 000000000000..bc02fbf83729 --- /dev/null +++ b/pkgs/by-name/ba/baidupcs-go/package.nix @@ -0,0 +1,33 @@ +{ + buildGo122Module, + lib, + fetchFromGitHub, + versionCheckHook, +}: +buildGo122Module rec { + pname = "baidupcs-go"; + version = "3.9.5"; + src = fetchFromGitHub { + owner = "qjfoidnh"; + repo = "BaiduPCS-Go"; + rev = "v${version}"; + hash = "sha256-zNodRQzflOOB3hAeq4KbjRFlHQwknVy+4ucipUcoufY="; + }; + + vendorHash = "sha256-msTlXtidxLTe3xjxTOWCqx/epFT0XPdwGPantDJUGpc="; + doCheck = false; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + + meta = { + maintainers = with lib.maintainers; [ xddxdd ]; + description = "Baidu Netdisk commandline client, mimicking Linux shell file handling commands"; + homepage = "https://github.com/qjfoidnh/BaiduPCS-Go"; + license = lib.licenses.asl20; + mainProgram = "BaiduPCS-Go"; + }; +} From 3de49c67ac13d23492f7f99f3cf1204f4471e99d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 13:34:49 +0900 Subject: [PATCH 271/369] python312Packages.spatialmath-python: 1.1.11 -> 1.1.13 --- .../spatialmath-python/default.nix | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/spatialmath-python/default.nix b/pkgs/development/python-modules/spatialmath-python/default.nix index 16c43e079c30..48314a348209 100644 --- a/pkgs/development/python-modules/spatialmath-python/default.nix +++ b/pkgs/development/python-modules/spatialmath-python/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, pythonOlder, @@ -10,18 +11,12 @@ numpy, scipy, typing-extensions, - coverage, - flake8, - pytest, - pytest-timeout, - pytest-xvfb, - sympy, pytestCheckHook, }: buildPythonPackage rec { pname = "spatialmath-python"; - version = "1.1.11"; + version = "1.1.13"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,17 +24,19 @@ buildPythonPackage rec { src = fetchPypi { pname = "spatialmath_python"; inherit version; - hash = "sha256-9EUlDGkpV/a73XWvrbtZLK8wrR8Am5EOkv3iSf9J4rM="; + hash = "sha256-BhIB4VapnARkzyhps8xRWnQTAlRB8aVPDpNuN/FNezo="; }; - nativeBuildInputs = [ + build-system = [ oldest-supported-numpy setuptools ]; pythonRemoveDeps = [ "pre-commit" ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "matplotlib" ]; + + dependencies = [ ansitable matplotlib numpy @@ -47,21 +44,17 @@ buildPythonPackage rec { typing-extensions ]; - optional-dependencies = { - dev = [ - coverage - flake8 - pytest - pytest-timeout - pytest-xvfb - sympy - ]; - }; - pythonImportsCheck = [ "spatialmath" ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTestPaths = [ + # tests hang + "tests/test_spline.py" + ]; + + env.MPLBACKEND = lib.optionalString stdenv.hostPlatform.isDarwin "Agg"; + meta = with lib; { description = "Provides spatial maths capability for Python"; homepage = "https://pypi.org/project/spatialmath-python/"; From c42f38cf542b253618c783c7d792071e2bef86b0 Mon Sep 17 00:00:00 2001 From: Lan Tian Date: Sun, 19 May 2024 12:03:17 -0700 Subject: [PATCH 272/369] uesave: init at 0.5.0 --- pkgs/by-name/ue/uesave/package.nix | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/ue/uesave/package.nix diff --git a/pkgs/by-name/ue/uesave/package.nix b/pkgs/by-name/ue/uesave/package.nix new file mode 100644 index 000000000000..ce4d23fb138d --- /dev/null +++ b/pkgs/by-name/ue/uesave/package.nix @@ -0,0 +1,32 @@ +{ + fetchFromGitHub, + lib, + rustPlatform, + versionCheckHook, +}: +rustPlatform.buildRustPackage rec { + pname = "uesave"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "trumank"; + repo = "uesave-rs"; + rev = "v${version}"; + hash = "sha256-9gOOSLejVfR1KJMhcNuKDkuTOvPC6sNG8xQOZlt8NxI="; + }; + + cargoHash = "sha256-U6RzSS2j6FK70OHlmWmHZZYT3UB0+Hi+uLofLy+XtGQ="; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + + meta = { + maintainers = with lib.maintainers; [ xddxdd ]; + description = "Reading and writing Unreal Engine save files (commonly referred to as GVAS)"; + homepage = "https://github.com/trumank/uesave-rs"; + license = lib.licenses.mit; + mainProgram = "uesave"; + }; +} From 5625380369ffb2a99633c08f48f982c300a63719 Mon Sep 17 00:00:00 2001 From: sarahec Date: Fri, 1 Nov 2024 20:05:43 -0700 Subject: [PATCH 273/369] python312Packages.langgraph-checkpoint-duckdb: init at 2.0.1 --- .../langgraph-checkpoint-duckdb/default.nix | 62 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix diff --git a/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix new file mode 100644 index 000000000000..b40afc694f52 --- /dev/null +++ b/pkgs/development/python-modules/langgraph-checkpoint-duckdb/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + langgraph-checkpoint, + aiosqlite, + duckdb, + pytest-asyncio, + pytestCheckHook, + langgraph-sdk, + poetry-core, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "langgraph-checkpoint-duckdb"; + version = "2.0.1"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "langchain-ai"; + repo = "langgraph"; + rev = "refs/tags/checkpointduckdb==${version}"; + hash = "sha256-wSrlFBfTcTgyE46uwv9GCyxRT1xVafgWyP2g87KUTAU="; + }; + + sourceRoot = "${src.name}/libs/checkpoint-duckdb"; + + build-system = [ poetry-core ]; + + dependencies = [ + aiosqlite + duckdb + langgraph-checkpoint + ]; + + pythonImportsCheck = [ "langgraph.checkpoint.duckdb" ]; + + nativeCheckInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = [ "test_basic_store_ops" ]; # depends on networking + + passthru = { + updateScript = langgraph-sdk.updateScript; + }; + + meta = { + changelog = "https://github.com/langchain-ai/langgraph/releases/tag/checkpointduckdb==${version}"; + description = "Library with a DuckDB implementation of LangGraph checkpoint saver"; + homepage = "https://github.com/langchain-ai/langgraph/tree/main/libs/checkpoint-duckdb"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + drupol + sarahec + ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b91ac96acde..8d9f3e1940b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6937,6 +6937,8 @@ self: super: with self; { langgraph-checkpoint-postgres = callPackage ../development/python-modules/langgraph-checkpoint-postgres { }; + langgraph-checkpoint-duckdb = callPackage ../development/python-modules/langgraph-checkpoint-duckdb { }; + langgraph-checkpoint-sqlite = callPackage ../development/python-modules/langgraph-checkpoint-sqlite { }; langgraph-cli = callPackage ../development/python-modules/langgraph-cli { }; From bffa19847a2113dc38e84b1ec44950d9883dccf4 Mon Sep 17 00:00:00 2001 From: sarahec Date: Fri, 1 Nov 2024 21:24:43 -0700 Subject: [PATCH 274/369] python312Packages.langchain: 0.3.4 -> 0.3.7 --- pkgs/development/python-modules/langchain/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index 3d0ae4b72f48..ad7821606b96 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -12,6 +12,7 @@ # dependencies aiohttp, + httpx-sse, langchain-core, langchain-text-splitters, langsmith, @@ -42,14 +43,14 @@ buildPythonPackage rec { pname = "langchain"; - version = "0.3.4"; + version = "0.3.7"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain"; rev = "refs/tags/langchain==${version}"; - hash = "sha256-MRpXR4nQDobzofhzkU5Y2OiEsi+VdjCcF/vcxcG/144="; + hash = "sha256-TaK8lnPxKUqwvKLtQIfzg2l8McQ1fd0g9vocHM0+kjY="; }; sourceRoot = "${src.name}/libs/langchain"; @@ -62,6 +63,7 @@ buildPythonPackage rec { dependencies = [ aiohttp + httpx-sse langchain-core langchain-text-splitters langsmith From a9417215c7ee51ee329e25166cb3aa402940f5e1 Mon Sep 17 00:00:00 2001 From: sarahec Date: Fri, 1 Nov 2024 20:50:19 -0700 Subject: [PATCH 275/369] python312Packages.langgraph-checkpoint: 2.0.1 -> 2.0.2 --- .../python-modules/langgraph-checkpoint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix index b895ab501eb1..eccfbe11935c 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpoint==${version}"; - hash = "sha256-BDuc6PpziOFIsPpDets7OM2Z+VJ6ekxKpkAuoavDdmI="; + hash = "sha256-Mjo6NJ6vYb2E7nk0D/2M7jzr39xRvRRhUZE4tP247to="; }; sourceRoot = "${src.name}/libs/checkpoint"; From 244f731c61c96ebd19f9ae9990a4558a6e87ec92 Mon Sep 17 00:00:00 2001 From: sarahec Date: Fri, 1 Nov 2024 20:52:05 -0700 Subject: [PATCH 276/369] python312Packages.langgraph-checkpoint-postgres: 2.0.1 -> 2.0.2 --- .../python-modules/langgraph-checkpoint-postgres/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix index 0161609fdd08..ce958ca954f2 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-postgres"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpointpostgres==${version}"; - hash = "sha256-5gKgCd0hl2iPLBfh94n8kMojECknhd0r+W4gt3m4g+M="; + hash = "sha256-E3gdHWUYelR/xI3Cv3T2uVwsyt+tOkw9MjX7I2RAuiQ="; }; postgresqlTestSetupPost = '' From bc79b9a4f34130d190d552aaa0c31b781c7a9760 Mon Sep 17 00:00:00 2001 From: sarahec Date: Fri, 1 Nov 2024 20:52:36 -0700 Subject: [PATCH 277/369] python312Packages.langgraph-checkpoint-sqlite: 2.0.0 -> 2.0.1 --- .../python-modules/langgraph-checkpoint-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix index 3bf88e24f998..9d4df9530640 100644 --- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix +++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "langgraph-checkpoint-sqlite"; - version = "2.0.0"; + version = "2.0.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "langchain-ai"; repo = "langgraph"; rev = "refs/tags/checkpointsqlite==${version}"; - hash = "sha256-aG7kHdlOkrjfYcdDWwCum0mQvWNMlF2CcEDlkzbv4Zw="; + hash = "sha256-dh+cjcOp6rGFntz82VNfVyetcrQBdBFdXk5xFb0aR5c="; }; sourceRoot = "${src.name}/libs/checkpoint-sqlite"; From 88f09c87d3715e83f0da17ee25f609f33909443e Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 5 Sep 2024 13:46:52 -0700 Subject: [PATCH 278/369] rustc: fix cross compilation of LLVM with shared libs The PR which fixed `useLLVM` native rustc builds (#320432) also broke cross builds. The C compiler it used to produce `llvmShared` and `llvmPackages`, `llvmPackages.clangUseLLVM`, was built to run on the host and create binaries for the target (`pkgsHostTarget`). Instead, the compiler should be built to run on the build machine and produce binaries for the host machine (`pkgsBuildHost`). Replace the overridden compilers with ones from `pkgsBuildHost` Co-Authored-By: Artemis Tosini --- pkgs/development/compilers/rust/1_82.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/rust/1_82.nix b/pkgs/development/compilers/rust/1_82.nix index 12cfbb80b2fb..8e74e8c3a3e6 100644 --- a/pkgs/development/compilers/rust/1_82.nix +++ b/pkgs/development/compilers/rust/1_82.nix @@ -20,6 +20,7 @@ pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, + pkgsHostTarget, pkgsTargetTarget, makeRustPlatform, wrapRustcWith, @@ -40,7 +41,7 @@ let # Force LLVM to compile using clang + LLVM libs when targeting pkgsLLVM stdenv = pkgSet.stdenv.override { allowedRequisites = null; - cc = pkgSet.llvmPackages_18.clangUseLLVM; + cc = pkgSet.pkgsBuildHost.llvmPackages_18.clangUseLLVM; }; } ); @@ -55,7 +56,7 @@ import ./default.nix llvmSharedForTarget = llvmSharedFor pkgsBuildTarget; # For use at runtime - llvmShared = llvmSharedFor { inherit llvmPackages_18 stdenv; }; + llvmShared = llvmSharedFor pkgsHostTarget; # Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox llvmPackages = @@ -74,7 +75,7 @@ import ./default.nix pkg.override { stdenv = stdenv.override { allowedRequisites = null; - cc = llvmPackages.clangUseLLVM; + cc = pkgsBuildHost.llvmPackages_18.clangUseLLVM; }; }; in @@ -87,7 +88,7 @@ import ./default.nix libcxx = llvmPackages.libcxx.override { stdenv = stdenv.override { allowedRequisites = null; - cc = llvmPackages.clangNoLibcxx; + cc = pkgsBuildHost.llvmPackages_18.clangNoLibcxx; hostPlatform = stdenv.hostPlatform // { useLLVM = !stdenv.hostPlatform.isDarwin; }; @@ -142,5 +143,6 @@ import ./default.nix "wrapCCWith" "overrideCC" "fetchpatch" + "pkgsHostTarget" ] ) From 7f179a1b12f1537fc3a49cf0a4886a38a533f109 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Thu, 5 Sep 2024 13:36:59 -0700 Subject: [PATCH 279/369] rustc: do not force compilation with libunwind on FreeBSD FreeBSD's unwind libs are named "libgcc" despite being llvm in origin and come from the FreeBSD source tree. --- pkgs/development/compilers/rust/rustc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index f22add43a6d8..0e999407c9d0 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -172,7 +172,7 @@ in stdenv.mkDerivation (finalAttrs: { ] ++ optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [ # https://github.com/rust-lang/rust/issues/92173 "--set rust.jemalloc" - ] ++ optionals useLLVM [ + ] ++ optionals (useLLVM && !stdenv.targetPlatform.isFreeBSD) [ # https://github.com/NixOS/nixpkgs/issues/311930 "--llvm-libunwind=${if withBundledLLVM then "in-tree" else "system"}" "--enable-use-libcxx" @@ -262,7 +262,7 @@ in stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl ] ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Security zlib ] ++ optional (!withBundledLLVM) llvmShared.lib - ++ optional (useLLVM && !withBundledLLVM) [ + ++ optional (useLLVM && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) [ llvmPackages.libunwind # Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284 (runCommandLocal "libunwind-libgcc" {} '' From 8b37d453d0f71814db327f8b74fb4c8b0767b942 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Sat, 2 Nov 2024 07:52:05 +0100 Subject: [PATCH 280/369] ngspice: remove rongcuid from maintainers on his request (PR #352381) --- pkgs/development/libraries/libngspice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index 1a31f88a6e9e..044d1b25fafe 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { mainProgram = "ngspice"; homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING - maintainers = with maintainers; [ bgamari rongcuid ]; + maintainers = with maintainers; [ bgamari ]; platforms = platforms.unix; }; } From 7ffd9ae656aec493492b44d0ddfb28e79a1ea25d Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Sat, 2 Nov 2024 08:13:23 +0100 Subject: [PATCH 281/369] Revert "bundler: 2.5.16 -> 2.5.21" (#353045) This reverts commit 4dd40b15d8b5eac7870930f574669560b0630519. revert the bundler update to fix the gitlab nixosTest, gitlab apparently wants only the old version. --- pkgs/development/ruby-modules/bundler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 0e5c71ba2da7..c144149da290 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.5.21"; - source.sha256 = "sha256-ID1kXl9tqmC7+0zMsafUq6gXFnTgC8KHJChHQPjZ7/s="; + version = "2.5.16"; + source.sha256 = "sha256-h7oDOPQNWSinmxqwZ4Z6Ns3lgTXQi2MmfvY5eVuVmDo="; dontPatchShebangs = true; postFixup = '' From a37e330ff33ad5d80a011331baed2abdf9ed5e68 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 2 Nov 2024 00:01:16 -0700 Subject: [PATCH 282/369] bftpd: fix x86_64-darwin build --- pkgs/servers/ftp/bftpd/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 895e3cd063fc..b244bec5fddc 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -9,10 +9,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-lZGFsUV6LNjkBNUpV9UYedVt1yt1qTBJUorxGt4ApsI="; }; - # utmp.h is deprecated on aarch64-darwin - postPatch = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' + # utmp has been replaced by utmpx since Mac OS X 10.6 (Snow Leopard): + # + # https://stackoverflow.com/a/37913019 + # + # bftpd does not have support for this, so disable it. + # + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' for file in login.*; do - substituteInPlace $file --replace "#ifdef HAVE_UTMP_H" "#if 0" + substituteInPlace $file --replace-fail "#ifdef HAVE_UTMP_H" "#if 0" done ''; From 87d715659e0440baa5fe1f7f10f5e97cea93c692 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 2 Nov 2024 07:41:42 +0000 Subject: [PATCH 283/369] factorio-experimental: 2.0.13 -> 2.0.14 --- pkgs/by-name/fa/factorio/versions.json | 32 +++++++++++++------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 989b3bea7fd7..64f337f14b42 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,14 +3,14 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.13.tar.xz" + "factorio_linux_2.0.14.tar.xz" ], - "name": "factorio_alpha_x64-2.0.13.tar.xz", + "name": "factorio_alpha_x64-2.0.14.tar.xz", "needsAuth": true, - "sha256": "25fc4c8b0c0b63d8024e1e76efda50e6f8348e967e03c2770eb8a867494b9c98", + "sha256": "8853ce1cdea0c142f78c3ebb3b7d51420f9eb28e9113f2be08a12d4e476dcadc", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.13/alpha/linux64", - "version": "2.0.13" + "url": "https://factorio.com/get-download/2.0.14/alpha/linux64", + "version": "2.0.14" }, "stable": { "candidateHashFilenames": [ @@ -51,14 +51,14 @@ "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.13.tar.xz" + "factorio-space-age_linux_2.0.14.tar.xz" ], - "name": "factorio_expansion_x64-2.0.13.tar.xz", + "name": "factorio_expansion_x64-2.0.14.tar.xz", "needsAuth": true, - "sha256": "5834dc11791aa24c0edc6ecfdd223f80af9c6842c39be0fb8c3b188463ec0f54", + "sha256": "7878444d65dc12815d7ce4d2c941441b8b7e05605e3f0bd69d45d02b3aa8f81a", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.13/expansion/linux64", - "version": "2.0.13" + "url": "https://factorio.com/get-download/2.0.14/expansion/linux64", + "version": "2.0.14" }, "stable": { "candidateHashFilenames": [ @@ -75,15 +75,15 @@ "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.13.tar.xz", - "factorio_headless_x64_2.0.13.tar.xz" + "factorio-headless_linux_2.0.14.tar.xz", + "factorio_headless_x64_2.0.14.tar.xz" ], - "name": "factorio_headless_x64-2.0.13.tar.xz", + "name": "factorio_headless_x64-2.0.14.tar.xz", "needsAuth": false, - "sha256": "27b36901a39e593adf28418c0286142c6c7a9f83d156963c7369bd405a25c7d1", + "sha256": "5a4bc4c3b2a97ed1fc58eb796321e848dcc64435bd91013dd9c78a14a8ce8815", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.13/headless/linux64", - "version": "2.0.13" + "url": "https://factorio.com/get-download/2.0.14/headless/linux64", + "version": "2.0.14" }, "stable": { "candidateHashFilenames": [ From 3283d8742cf029d38d67a18a7888d46c26adecad Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 30 Oct 2024 19:52:32 +0800 Subject: [PATCH 284/369] toot: move to pkgs/by-name --- .../misc/toot/default.nix => by-name/to/toot/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/toot/default.nix => by-name/to/toot/package.nix} (100%) diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/by-name/to/toot/package.nix similarity index 100% rename from pkgs/applications/misc/toot/default.nix rename to pkgs/by-name/to/toot/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc4f4b0c2b32..e469584d9c88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32769,8 +32769,6 @@ with pkgs; tony = libsForQt5.callPackage ../applications/audio/tony { }; - toot = callPackage ../applications/misc/toot { }; - toipe = callPackage ../applications/misc/toipe { }; toxiproxy = callPackage ../development/tools/toxiproxy { }; From 5d077fc1068ac8aad55d0eb36b323365f8fadcce Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 9 Oct 2024 21:22:42 -0500 Subject: [PATCH 285/369] python312Packages.lancedb: 0.13.0 -> 0.14.0 --- .../python-modules/lancedb/Cargo.lock | 819 +++++++++--------- .../python-modules/lancedb/default.nix | 29 +- pkgs/top-level/python-packages.nix | 4 +- 3 files changed, 426 insertions(+), 426 deletions(-) diff --git a/pkgs/development/python-modules/lancedb/Cargo.lock b/pkgs/development/python-modules/lancedb/Cargo.lock index 9fd06f89770b..b3a01fc8f1df 100644 --- a/pkgs/development/python-modules/lancedb/Cargo.lock +++ b/pkgs/development/python-modules/lancedb/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.88" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -161,6 +161,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7d0a018de4f6aa429b9d33d69edf69072b1c5b1cb8d3e4a5f7ef898fc3eb76" +[[package]] +name = "arrayref" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" + [[package]] name = "arrow" version = "52.2.0" @@ -307,7 +313,7 @@ dependencies = [ "arrow-schema", "chrono", "half", - "indexmap 2.5.0", + "indexmap 2.6.0", "lexical-core", "num", "serde", @@ -385,9 +391,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429" dependencies = [ "flate2", "futures-core", @@ -447,7 +453,7 @@ dependencies = [ "derive_builder", "futures", "rand", - "reqwest 0.12.7", + "reqwest", "reqwest-eventsource", "secrecy", "serde", @@ -476,18 +482,18 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -519,15 +525,15 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-config" -version = "1.5.6" +version = "1.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc" +checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6" dependencies = [ "aws-credential-types", "aws-runtime", @@ -593,9 +599,9 @@ dependencies = [ [[package]] name = "aws-sdk-dynamodb" -version = "1.45.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f3d9e807092149e3df266e3f4d9760dac439b90f82d8438e5b2c0bbe62007f" +checksum = "ab0ade000608877169533a54326badd6b5a707d2faf876cfc3976a7f9d7e5329" dependencies = [ "aws-credential-types", "aws-runtime", @@ -616,9 +622,9 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "1.43.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f7cb482caa5444d445c94417b9c74e49a849beb09ede4f2f4c3c15f8157387" +checksum = "e33590e8d45206fdc4273ded8a1f292bcceaadd513037aa790fc67b237bc30ee" dependencies = [ "aws-credential-types", "aws-runtime", @@ -638,9 +644,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.49.0" +version = "1.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e518950d4ac43508c8bfc2fe4e24b0752d99eab80134461d5e162dcda0214b55" +checksum = "e2f2a62020f3e06f9b352b2a23547f6e1d110b6bf1e18a6b588ae36114eaf6e2" dependencies = [ "ahash", "aws-credential-types", @@ -673,9 +679,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27bf24cd0d389daa923e974b0e7c38daf308fc21e963c049f57980235017175e" +checksum = "e33ae899566f3d395cbf42858e433930682cc9c1889fa89318896082fef45efb" dependencies = [ "aws-credential-types", "aws-runtime", @@ -695,9 +701,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.43.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b43b3220f1c46ac0e9dcc0a97d94b93305dacb36d1dd393996300c6b9b74364" +checksum = "f39c09e199ebd96b9f860b0fce4b6625f211e064ad7c8693b72ecf7ef03881e0" dependencies = [ "aws-credential-types", "aws-runtime", @@ -717,9 +723,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.42.0" +version = "1.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c46924fb1add65bba55636e12812cae2febf68c0f37361766f627ddcca91ce" +checksum = "3d95f93a98130389eb6233b9d615249e543f6c24a68ca1f109af9ca5164a8765" dependencies = [ "aws-credential-types", "aws-runtime", @@ -852,9 +858,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" +checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -896,9 +902,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.6" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" +checksum = "147100a7bea70fa20ef224a6bad700358305f5dc0f84649c53769761395b355b" dependencies = [ "base64-simd", "bytes", @@ -1113,13 +1119,13 @@ dependencies = [ [[package]] name = "bytemuck_derive" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc8b54b395f2fcfbb3d90c47b01c7f444d94d05bdeb775811dec868ac3bbc26" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1130,9 +1136,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bytes-utils" @@ -1162,7 +1168,7 @@ dependencies = [ "byteorder", "gemm", "half", - "memmap2 0.9.4", + "memmap2 0.9.5", "num-traits", "num_cpus", "rand", @@ -1232,9 +1238,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1" dependencies = [ "jobserver", "libc", @@ -1586,7 +1592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1616,7 +1622,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1627,7 +1633,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1644,10 +1650,24 @@ dependencies = [ ] [[package]] -name = "datafusion" -version = "40.0.0" +name = "dashmap" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9d55a9cd2634818953809f75ebe5248b00dd43c3227efb2a51a2d5feaad54e" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "datafusion" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4fd4a99fc70d40ef7e52b243b4a399c3f8d353a40d5ecb200deee05e49c61bb" dependencies = [ "ahash", "arrow", @@ -1657,24 +1677,26 @@ dependencies = [ "async-trait", "bytes", "chrono", - "dashmap", + "dashmap 6.1.0", + "datafusion-catalog", "datafusion-common", "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", "datafusion-functions", "datafusion-functions-aggregate", - "datafusion-functions-array", + "datafusion-functions-nested", "datafusion-optimizer", "datafusion-physical-expr", "datafusion-physical-expr-common", + "datafusion-physical-optimizer", "datafusion-physical-plan", "datafusion-sql", "futures", "glob", "half", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "num_cpus", @@ -1683,7 +1705,7 @@ dependencies = [ "paste", "pin-project-lite", "rand", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "tempfile", "tokio", "url", @@ -1691,10 +1713,24 @@ dependencies = [ ] [[package]] -name = "datafusion-common" -version = "40.0.0" +name = "datafusion-catalog" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def66b642959e7f96f5d2da22e1f43d3bd35598f821e5ce351a0553e0f1b7367" +checksum = "e13b3cfbd84c6003594ae1972314e3df303a27ce8ce755fcea3240c90f4c0529" +dependencies = [ + "arrow-schema", + "async-trait", + "datafusion-common", + "datafusion-execution", + "datafusion-expr", + "datafusion-physical-plan", +] + +[[package]] +name = "datafusion-common" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fdbc877e3e40dcf88cc8f283d9f5c8851f0a3aa07fee657b1b75ac1ad49b9c" dependencies = [ "ahash", "arrow", @@ -1708,27 +1744,27 @@ dependencies = [ "libc", "num_cpus", "object_store", - "sqlparser 0.47.0", + "sqlparser 0.49.0", ] [[package]] name = "datafusion-common-runtime" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f104bb9cb44c06c9badf8a0d7e0855e5f7fa5e395b887d7f835e8a9457dc1352" +checksum = "8a7496d1f664179f6ce3a5cbef6566056ccaf3ea4aa72cc455f80e62c1dd86b1" dependencies = [ "tokio", ] [[package]] name = "datafusion-execution" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac0fd8b5d80bbca3fc3b6f40da4e9f6907354824ec3b18bbd83fee8cf5c3c3e" +checksum = "799e70968c815b611116951e3dd876aef04bf217da31b72eec01ee6a959336a1" dependencies = [ "arrow", "chrono", - "dashmap", + "dashmap 6.1.0", "datafusion-common", "datafusion-expr", "futures", @@ -1743,9 +1779,9 @@ dependencies = [ [[package]] name = "datafusion-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2103d2cc16fb11ef1fa993a6cac57ed5cb028601db4b97566c90e5fa77aa1e68" +checksum = "1c1841c409d9518c17971d15c9bae62e629eb937e6fb6c68cd32e9186f8b30d2" dependencies = [ "ahash", "arrow", @@ -1755,18 +1791,19 @@ dependencies = [ "datafusion-common", "paste", "serde_json", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "strum", "strum_macros 0.26.4", ] [[package]] name = "datafusion-functions" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a369332afd0ef5bd565f6db2139fb9f1dfdd0afa75a7f70f000b74208d76994f" +checksum = "a8e481cf34d2a444bd8fa09b65945f0ce83dc92df8665b761505b3d9f351bebb" dependencies = [ "arrow", + "arrow-buffer", "base64 0.22.1", "chrono", "datafusion-common", @@ -1784,9 +1821,9 @@ dependencies = [ [[package]] name = "datafusion-functions-aggregate" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92718db1aff70c47e5abf9fc975768530097059e5db7c7b78cd64b5e9a11fc77" +checksum = "2b4ece19f73c02727e5e8654d79cd5652de371352c1df3c4ac3e419ecd6943fb" dependencies = [ "ahash", "arrow", @@ -1797,14 +1834,14 @@ dependencies = [ "datafusion-physical-expr-common", "log", "paste", - "sqlparser 0.47.0", + "sqlparser 0.49.0", ] [[package]] -name = "datafusion-functions-array" -version = "40.0.0" +name = "datafusion-functions-nested" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bb80f46ff3dcf4bb4510209c2ba9b8ce1b716ac8b7bf70c6bf7dca6260c831" +checksum = "a1474552cc824e8c9c88177d454db5781d4b66757d4aca75719306b8343a5e8d" dependencies = [ "arrow", "arrow-array", @@ -1819,13 +1856,14 @@ dependencies = [ "itertools 0.12.1", "log", "paste", + "rand", ] [[package]] name = "datafusion-optimizer" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82f34692011bec4fdd6fc18c264bf8037b8625d801e6dd8f5111af15cb6d71d3" +checksum = "791ff56f55608bc542d1ea7a68a64bdc86a9413f5a381d06a39fd49c2a3ab906" dependencies = [ "arrow", "async-trait", @@ -1834,7 +1872,7 @@ dependencies = [ "datafusion-expr", "datafusion-physical-expr", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "paste", @@ -1843,9 +1881,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45538630defedb553771434a437f7ca8f04b9b3e834344aafacecb27dc65d5e5" +checksum = "9a223962b3041304a3e20ed07a21d5de3d88d7e4e71ca192135db6d24e3365a4" dependencies = [ "ahash", "arrow", @@ -1863,7 +1901,7 @@ dependencies = [ "half", "hashbrown 0.14.5", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "paste", @@ -1873,9 +1911,9 @@ dependencies = [ [[package]] name = "datafusion-physical-expr-common" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8a72b0ca908e074aaeca52c14ddf5c28d22361e9cb6bc79bb733cd6661b536" +checksum = "db5e7d8532a1601cd916881db87a70b0a599900d23f3db2897d389032da53bc6" dependencies = [ "ahash", "arrow", @@ -1886,10 +1924,22 @@ dependencies = [ ] [[package]] -name = "datafusion-physical-plan" -version = "40.0.0" +name = "datafusion-physical-optimizer" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b504eae6107a342775e22e323e9103f7f42db593ec6103b28605b7b7b1405c4a" +checksum = "fdb9c78f308e050f5004671039786a925c3fee83b90004e9fcfd328d7febdcc0" +dependencies = [ + "datafusion-common", + "datafusion-execution", + "datafusion-physical-expr", + "datafusion-physical-plan", +] + +[[package]] +name = "datafusion-physical-plan" +version = "41.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d1116949432eb2d30f6362707e2846d942e491052a206f2ddcb42d08aea1ffe" dependencies = [ "ahash", "arrow", @@ -1909,7 +1959,7 @@ dependencies = [ "futures", "half", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "itertools 0.12.1", "log", "once_cell", @@ -1921,9 +1971,9 @@ dependencies = [ [[package]] name = "datafusion-sql" -version = "40.0.0" +version = "41.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5db33f323f41b95ae201318ba654a9bf11113e58a51a1dff977b1a836d3d889" +checksum = "b45d0180711165fe94015d7c4123eb3e1cf5fb60b1506453200b8d1ce666bef0" dependencies = [ "arrow", "arrow-array", @@ -1932,7 +1982,7 @@ dependencies = [ "datafusion-expr", "log", "regex", - "sqlparser 0.47.0", + "sqlparser 0.49.0", "strum", ] @@ -1984,38 +2034,38 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "derive_builder" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "derive_builder_macro" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" dependencies = [ "derive_builder_core", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2058,7 +2108,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2151,7 +2201,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2163,7 +2213,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2342,9 +2392,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -2356,6 +2406,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2" + [[package]] name = "foreign-types" version = "0.3.2" @@ -2398,9 +2454,9 @@ dependencies = [ [[package]] name = "fsst" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26212c1db7eee3ec0808bd99107cf62ba4d3edd3489df601e2d0c73c5d739aec" +checksum = "6b1d2a2da56a2bf2dea67567e50c066c9323db26c78d9051b98e552b236f15fe" dependencies = [ "rand", ] @@ -2413,9 +2469,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -2428,9 +2484,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -2438,15 +2494,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -2455,9 +2511,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-lite" @@ -2476,26 +2532,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-timer" @@ -2505,9 +2561,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -2664,9 +2720,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -2697,7 +2753,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -2716,7 +2772,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.5.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -2754,6 +2810,17 @@ dependencies = [ "rayon", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash", +] + [[package]] name = "heck" version = "0.4.1" @@ -2883,9 +2950,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2969,7 +3036,7 @@ dependencies = [ "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", @@ -2979,22 +3046,25 @@ dependencies = [ [[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 0.14.30", + "http-body-util", + "hyper 1.4.1", + "hyper-util", "native-tls", "tokio", "tokio-native-tls", + "tower-service", ] [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -3005,7 +3075,6 @@ dependencies = [ "pin-project-lite", "socket2 0.5.7", "tokio", - "tower", "tower-service", "tracing", ] @@ -3021,9 +3090,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3071,12 +3140,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -3124,9 +3193,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is-terminal" @@ -3217,18 +3286,18 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b" dependencies = [ "wasm-bindgen", ] [[package]] name = "lance" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a427160737dd74d2d4f566f3111027edc63927106541d173459d010209371c42" +checksum = "4c4a02330c306f5cdb4ae1f54f413f81710fe2bb8d0f09e10898f16ff28906ae" dependencies = [ "arrow", "arrow-arith", @@ -3246,7 +3315,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "dashmap", + "dashmap 5.5.3", "datafusion", "datafusion-functions", "datafusion-physical-expr", @@ -3285,9 +3354,9 @@ dependencies = [ [[package]] name = "lance-arrow" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f1cfebe08c64b1edabe9b6ccd6f8ea1bc6349d0870d47f2db8cdadf02ab8e2" +checksum = "164a8935b3b093f5e7a4935de8e115ac738d193bf3fe94aa0e9ea3a0f5f5c30d" dependencies = [ "arrow-array", "arrow-buffer", @@ -3303,9 +3372,9 @@ dependencies = [ [[package]] name = "lance-core" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243aa2323dee6fcab6bb9bb3a21ae8f040c98a5de9bbfb7ab8484a036176185a" +checksum = "b02e4e248390e11b092e546fb1117d50b0d278b178b82d8438cda26eb65edd75" dependencies = [ "arrow-array", "arrow-buffer", @@ -3341,9 +3410,9 @@ dependencies = [ [[package]] name = "lance-datafusion" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a69d039f93a43477245b51a8f1ce58a1f41485f8ded946f53031a11ded8c97" +checksum = "e7a7597b224cf428762187f7b70d775b7e29d65b90c9df82e677de85e88f165a" dependencies = [ "arrow", "arrow-array", @@ -3368,10 +3437,11 @@ dependencies = [ [[package]] name = "lance-encoding" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b713e49ce6039d0ca0f88e8ded66ee64d89c42f85107bc9e684fbff41386a65" +checksum = "b7cf8fa33073f9ad592638f522103eca150594e4648721e7c17a308334d9ccdd" dependencies = [ + "arrayref", "arrow", "arrow-arith", "arrow-array", @@ -3380,6 +3450,7 @@ dependencies = [ "arrow-data", "arrow-schema", "arrow-select", + "bytemuck", "bytes", "fsst", "futures", @@ -3390,10 +3461,12 @@ dependencies = [ "lance-core", "log", "num-traits", + "paste", "prost", "prost-build", "prost-types", "rand", + "seq-macro", "snafu", "tokio", "tracing", @@ -3402,9 +3475,9 @@ dependencies = [ [[package]] name = "lance-file" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0eaebd40c77f8f06a0cbadcd07f9344aea616dcd4d8712f6cad81c2eda14d5" +checksum = "d21247b1f8579ebf0d7f938d930c0c89d2b35cd503fc3b94adfb8bf5eb40acc3" dependencies = [ "arrow-arith", "arrow-array", @@ -3438,9 +3511,9 @@ dependencies = [ [[package]] name = "lance-index" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ad5a42b9a4909749ee62fc94c64d19259c2aadca7c8446f42ee8e9c7a097d3" +checksum = "fecf46eef5a2d4b1a44b2d01b98fb45e7923fe9471d8d2f907f485e12dddac4e" dependencies = [ "arrow", "arrow-array", @@ -3491,9 +3564,9 @@ dependencies = [ [[package]] name = "lance-io" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0f334f2c279f80f19803141cf7f98c6b82e6ace3c7f75c8740f1df7a73bb720" +checksum = "48071e1d45f4dda04d8660d6378a7e23825faae46b4717170dbf1fd0ba583e2c" dependencies = [ "arrow", "arrow-arith", @@ -3532,9 +3605,9 @@ dependencies = [ [[package]] name = "lance-linalg" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fa019770a0afb287360a4ea919cff482371ad43318607d1e797534c819bf356" +checksum = "5944b11e2fef3b992c5609eb20b6336de622f468c2ae4d40f746498f910551f5" dependencies = [ "arrow-array", "arrow-ord", @@ -3557,9 +3630,9 @@ dependencies = [ [[package]] name = "lance-table" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fa39bede133d578431db3f77b0c2c63fcaff12a088000648014c27266830a2" +checksum = "98106c7a29e810cb08b943bc3039a706577183366ffc27a4933c3a12e3a8334c" dependencies = [ "arrow", "arrow-array", @@ -3598,9 +3671,9 @@ dependencies = [ [[package]] name = "lance-testing" -version = "0.17.0" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4eae0993cda6130cfd75d3d9d11830dd4ec8d4c66cf81def939837c419d4bc" +checksum = "4cdadadeae5c76fc70b0345ea2248f9ce4b7944d7b0df5db9385f7c0d30fcac6" dependencies = [ "arrow-array", "arrow-schema", @@ -3611,7 +3684,7 @@ dependencies = [ [[package]] name = "lancedb" -version = "0.10.0-beta.1" +version = "0.11.0-beta.1" dependencies = [ "arrow", "arrow-array", @@ -3632,10 +3705,13 @@ dependencies = [ "candle-nn", "candle-transformers", "chrono", + "datafusion-common", "datafusion-physical-plan", "futures", "half", "hf-hub", + "http 1.1.0", + "http-body 1.0.1", "lance", "lance-datafusion", "lance-encoding", @@ -3645,6 +3721,7 @@ dependencies = [ "lance-testing", "lazy_static", "log", + "moka", "num-traits", "object_store", "pin-project", @@ -3653,7 +3730,7 @@ dependencies = [ "rand", "random_word", "regex", - "reqwest 0.11.27", + "reqwest", "serde", "serde_json", "serde_with", @@ -3668,7 +3745,7 @@ dependencies = [ [[package]] name = "lancedb-jni" -version = "0.4.18" +version = "0.10.0" dependencies = [ "arrow", "arrow-schema", @@ -3684,7 +3761,7 @@ dependencies = [ [[package]] name = "lancedb-node" -version = "0.10.0-beta.1" +version = "0.11.0-beta.1" dependencies = [ "arrow-array", "arrow-ipc", @@ -3709,7 +3786,7 @@ dependencies = [ [[package]] name = "lancedb-nodejs" -version = "0.0.0" +version = "0.11.0-beta.1" dependencies = [ "arrow-ipc", "futures", @@ -3722,13 +3799,12 @@ dependencies = [ [[package]] name = "lancedb-python" -version = "0.13.0" +version = "0.14.0" dependencies = [ "arrow", "env_logger 0.10.2", "futures", "lancedb", - "lzma-sys", "pin-project", "pyo3", "pyo3-asyncio-0-21", @@ -3814,9 +3890,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libloading" @@ -3884,27 +3960,27 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904" +checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" dependencies = [ - "hashbrown 0.14.5", + "hashbrown 0.15.0", ] [[package]] name = "lz4" -version = "1.27.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a231296ca742e418c43660cb68e082486ff2538e8db432bc818580f3965025ed" +checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725" dependencies = [ "lz4-sys", ] [[package]] name = "lz4-sys" -version = "1.11.0" +version = "1.11.1+lz4-1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb44a01837a858d47e5a630d2ccf304c8efcc4b83b8f9f75b7a9ee4fcc6e57d" +checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6" dependencies = [ "cc", "libc", @@ -3992,9 +4068,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", "stable_deref_trait", @@ -4104,7 +4180,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4143,9 +4219,9 @@ checksum = "2195bf6aa996a481483b29d62a7663eed3fe39600c460e323f8ff41e90bdd89b" [[package]] name = "napi" -version = "2.16.10" +version = "2.16.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04409e8c2d61995696e44d2181b79b68c1dd41f7e24a17cde60bbd9f54ddddef" +checksum = "53575dfa17f208dd1ce3a2da2da4659aae393b256a472f2738a8586a6c4107fd" dependencies = [ "bitflags 2.6.0", "ctor", @@ -4172,7 +4248,7 @@ dependencies = [ "napi-derive-backend", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4187,7 +4263,7 @@ dependencies = [ "quote", "regex", "semver 1.0.23", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4394,7 +4470,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4405,9 +4481,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -4431,9 +4507,9 @@ dependencies = [ "percent-encoding", "quick-xml", "rand", - "reqwest 0.12.7", + "reqwest", "ring", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "serde", "serde_json", "snafu", @@ -4445,9 +4521,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oneshot" @@ -4500,7 +4576,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4628,7 +4704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.5.0", + "indexmap 2.6.0", ] [[package]] @@ -4671,22 +4747,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4713,9 +4789,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "planus" @@ -4821,7 +4897,7 @@ dependencies = [ "comfy-table", "either", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "num-traits", "once_cell", "polars-arrow", @@ -4919,7 +4995,7 @@ dependencies = [ "either", "hashbrown 0.14.5", "hex", - "indexmap 2.5.0", + "indexmap 2.6.0", "memchr", "num-traits", "polars-arrow", @@ -5063,11 +5139,11 @@ dependencies = [ "ahash", "bytemuck", "hashbrown 0.14.5", - "indexmap 2.5.0", + "indexmap 2.6.0", "num-traits", "once_cell", "polars-error", - "raw-cpuid 11.1.0", + "raw-cpuid 11.2.0", "rayon", "smartstring", "stacker", @@ -5093,9 +5169,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -5119,7 +5195,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5133,9 +5209,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -5167,7 +5243,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.77", + "syn 2.0.79", "tempfile", ] @@ -5181,7 +5257,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5307,7 +5383,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5320,7 +5396,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config 0.21.2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5341,9 +5417,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", "serde", @@ -5360,7 +5436,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "socket2 0.5.7", "thiserror", "tokio", @@ -5377,7 +5453,7 @@ dependencies = [ "rand", "ring", "rustc-hash 2.0.0", - "rustls 0.23.13", + "rustls 0.23.14", "slab", "thiserror", "tinyvec", @@ -5483,9 +5559,9 @@ dependencies = [ [[package]] name = "raw-cpuid" -version = "11.1.0" +version = "11.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d" +checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0" dependencies = [ "bitflags 2.6.0", ] @@ -5544,14 +5620,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ "bitflags 2.6.0", ] @@ -5569,9 +5645,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -5581,9 +5657,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -5598,60 +5674,20 @@ checksum = "53a49587ad06b26609c52e423de037e7f57f20d53535d66e08c695f347df952a" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "reqwest" -version = "0.11.27" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "async-compression", - "base64 0.21.7", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2 0.3.26", - "http 0.2.12", - "http-body 0.4.6", - "hyper 0.14.30", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper 0.1.2", - "system-configuration", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg", -] - -[[package]] -name = "reqwest" -version = "0.12.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" -dependencies = [ "base64 0.22.1", "bytes", + "encoding_rs", "futures-core", "futures-util", "h2 0.4.6", @@ -5660,25 +5696,29 @@ dependencies = [ "http-body-util", "hyper 1.4.1", "hyper-rustls 0.27.3", + "hyper-tls", "hyper-util", "ipnet", "js-sys", "log", "mime", "mime_guess", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.13", - "rustls-native-certs 0.7.3", - "rustls-pemfile 2.1.3", + "rustls 0.23.14", + "rustls-native-certs 0.8.0", + "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper", + "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls 0.26.0", "tokio-util", "tower-service", @@ -5702,7 +5742,7 @@ dependencies = [ "mime", "nom", "pin-project-lite", - "reqwest 0.12.7", + "reqwest", "thiserror", ] @@ -5820,9 +5860,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "log", "once_cell", @@ -5845,19 +5885,6 @@ dependencies = [ "security-framework", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile 2.1.3", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-native-certs" version = "0.8.0" @@ -5865,7 +5892,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", "security-framework", @@ -5882,19 +5909,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -5950,9 +5976,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -6021,9 +6047,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -6076,7 +6102,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6114,15 +6140,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.5.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -6132,14 +6158,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6200,9 +6226,9 @@ dependencies = [ [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "siphasher" @@ -6341,9 +6367,9 @@ dependencies = [ [[package]] name = "sqlparser" -version = "0.47.0" +version = "0.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "295e9930cd7a97e58ca2a070541a3ca502b17f5d1fa7157376d0fabd85324f25" +checksum = "a4a404d0e14905361b918cb8afdb73605e25c1d5029312bd9785142dcb3aa49e" dependencies = [ "log", "sqlparser_derive", @@ -6357,7 +6383,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6443,7 +6469,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6456,7 +6482,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6478,9 +6504,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -6498,12 +6524,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.1" @@ -6521,7 +6541,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6554,20 +6574,20 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "system-configuration-sys", ] [[package]] name = "system-configuration-sys" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" dependencies = [ "core-foundation-sys", "libc", @@ -6604,7 +6624,7 @@ dependencies = [ "lru", "lz4_flex", "measure_time", - "memmap2 0.9.4", + "memmap2 0.9.5", "num_cpus", "once_cell", "oneshot", @@ -6740,9 +6760,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand 2.1.1", @@ -6762,22 +6782,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6892,7 +6912,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6921,7 +6941,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "tokio", ] @@ -6958,36 +6978,15 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.5.0", + "indexmap 2.6.0", "toml_datetime", "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -7013,7 +7012,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7027,9 +7026,9 @@ dependencies = [ [[package]] name = "triomphe" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6631e42e10b40c0690bf92f404ebcfe6e1fdb480391d15f17cc8e96eeed5369" +checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85" [[package]] name = "try-lock" @@ -7064,9 +7063,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" @@ -7076,9 +7075,9 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -7103,15 +7102,15 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode_categories" @@ -7142,7 +7141,7 @@ dependencies = [ "log", "native-tls", "once_cell", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "serde", "serde_json", @@ -7240,9 +7239,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887" dependencies = [ "cfg-if", "once_cell", @@ -7251,24 +7250,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.43" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" +checksum = "65471f79c1022ffa5291d33520cbbb53b7687b01c2f8e83b57d102eed7ed479d" dependencies = [ "cfg-if", "js-sys", @@ -7278,9 +7277,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7288,28 +7287,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -7320,9 +7319,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.70" +version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" +checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9" dependencies = [ "js-sys", "wasm-bindgen", @@ -7330,9 +7329,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -7633,23 +7632,13 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.18" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.50.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "wyz" version = "0.5.1" @@ -7691,7 +7680,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "synstructure", ] @@ -7713,7 +7702,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7733,7 +7722,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "synstructure", ] @@ -7753,7 +7742,7 @@ dependencies = [ "crc32fast", "crossbeam-utils", "displaydoc", - "indexmap 2.5.0", + "indexmap 2.6.0", "num_enum", "thiserror", ] diff --git a/pkgs/development/python-modules/lancedb/default.nix b/pkgs/development/python-modules/lancedb/default.nix index e1dcbd2a1a22..950a67d1d334 100644 --- a/pkgs/development/python-modules/lancedb/default.nix +++ b/pkgs/development/python-modules/lancedb/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, darwin, libiconv, + openssl, pkg-config, protobuf, attrs, @@ -28,14 +29,14 @@ buildPythonPackage rec { pname = "lancedb"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "lancedb"; repo = "lancedb"; rev = "refs/tags/python-v${version}"; - hash = "sha256-6E20WgyoEALdxmiOfgq89dCkqovvIMzc/wy+kvjDWwU="; + hash = "sha256-lw2tZ26Py6JUxuetaokJKnxOv/WoLK4spxssLKxvxJA="; }; buildAndTestSubdir = "python"; @@ -50,13 +51,14 @@ buildPythonPackage rec { nativeBuildInputs = [ pkg-config + protobuf rustPlatform.cargoSetupHook ]; buildInputs = [ libiconv - protobuf + openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; @@ -96,14 +98,21 @@ buildPythonPackage rec { pytestFlagsArray = [ "-m 'not slow'" ]; - disabledTests = [ - # require tantivy which is not packaged in nixpkgs - "test_basic" + disabledTests = + [ + # require tantivy which is not packaged in nixpkgs + "test_basic" - # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size' - # https://github.com/lancedb/lancedb/issues/1539 - "test_polars" - ]; + # polars.exceptions.ComputeError: TypeError: _scan_pyarrow_dataset_impl() got multiple values for argument 'batch_size' + # https://github.com/lancedb/lancedb/issues/1539 + "test_polars" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # fail with darwin sandbox + "test_async_remote_db" + "test_http_error" + "test_retry_error" + ]; disabledTestPaths = [ # touch the network diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f201fad95c5f..b4d18806b155 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6887,7 +6887,9 @@ self: super: with self; { inherit (pkgs) lammps; }; - lancedb = callPackage ../development/python-modules/lancedb { }; + lancedb = callPackage ../development/python-modules/lancedb { + inherit (pkgs) protobuf; + }; langchain = callPackage ../development/python-modules/langchain { }; From 2d3e8a86f857fc0d39fdb0a3b2612cc6b29d7677 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 30 Oct 2024 20:06:13 +0800 Subject: [PATCH 286/369] toot: 0.42.0 -> 0.45.0 Diff: https://github.com/ihabunek/toot/compare/0.42.0...0.45.0 Changelog: https://github.com/ihabunek/toot/releases/tag/0.45.0 https://github.com/ihabunek/toot/releases/tag/0.44.1 https://github.com/ihabunek/toot/releases/tag/0.44.0 https://github.com/ihabunek/toot/releases/tag/0.43.0 --- pkgs/by-name/to/toot/package.nix | 49 +++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/to/toot/package.nix b/pkgs/by-name/to/toot/package.nix index 496644ff4d42..0f1b5ce9ed1b 100644 --- a/pkgs/by-name/to/toot/package.nix +++ b/pkgs/by-name/to/toot/package.nix @@ -1,36 +1,57 @@ -{ lib, fetchFromGitHub, python3Packages, nixosTests }: +{ + lib, + fetchFromGitHub, + python3Packages, + nixosTests, +}: python3Packages.buildPythonApplication rec { pname = "toot"; - version = "0.42.0"; + version = "0.45.0"; + pyproject = true; src = fetchFromGitHub { - owner = "ihabunek"; - repo = "toot"; + owner = "ihabunek"; + repo = "toot"; rev = "refs/tags/${version}"; - sha256 = "sha256-FxA/loJzb/DBI1vWC71IFqdFcwjwIezhBJCGNeBzRoU="; + hash = "sha256-xBpqB81LSOq+eGVwEL6fAxBR8UXCduf5syzCdwydW4Q="; }; nativeCheckInputs = with python3Packages; [ pytest ]; - propagatedBuildInputs = with python3Packages; - [ - requests beautifulsoup4 future wcwidth - urwid urwidgets psycopg2 tomlkit click + build-system = with python3Packages; [ + setuptools + setuptools-scm + ]; + + dependencies = with python3Packages; [ + requests + beautifulsoup4 + wcwidth + urwid + urwidgets + tomlkit + click + pillow + term-image ]; checkPhase = '' + runHook preCheck py.test + runHook postCheck ''; passthru.tests.toot = nixosTests.pleroma; - meta = with lib; { + meta = { description = "Mastodon CLI interface"; mainProgram = "toot"; - homepage = "https://github.com/ihabunek/toot"; - license = licenses.gpl3; - maintainers = [ maintainers.matthiasbeyer ]; + homepage = "https://github.com/ihabunek/toot"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + matthiasbeyer + aleksana + ]; }; - } From d2d3ea9cda8e035f6347ee4454fac1a6ee0efd01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 09:22:54 +0100 Subject: [PATCH 287/369] trivy: 0.56.2 -> 0.57.0 Diff: https://github.com/aquasecurity/trivy/compare/refs/tags/v0.56.2...v0.57.0 Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.57.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index ebbae9ad48c1..ac34affce1c8 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.56.2"; + version = "0.57.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-wqiFUiNZ3VG4c/QkoliU2BtqanyC4GwlwUZomOX3VrU="; + hash = "sha256-al8hxVNyDoGQaoqa0fmA7Bn7M1twwlS4I5+XZnETXyc="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-+WkOGy/Z4BuDlwpfisWqhjJlshPXTxjRy2pmmHxU6B8="; + vendorHash = "sha256-TEjV9Cr5oXNMvzFpRDQ9MxgbZMJnq++eU/xJi2/piF8="; subPackages = [ "cmd/trivy" ]; From be114ed7b98ae1e1d16b4cd3e5fcded1f490e394 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 26 Oct 2024 11:45:43 +0200 Subject: [PATCH 288/369] python312Packages.publicsuffixlist: 1.0.2.20241023 -> 1.0.2.20241026 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20241026-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 136e9e800609..798f8a82efe3 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20241023"; + version = "1.0.2.20241026"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WQs4DJygcyOTzDZHlbjW+uZAna5oswDDk4NwgS/Vr1c="; + hash = "sha256-vCTHs5HFW21d7W0G/W92ugA2F9JbqE6IwmHHHb6rdUs="; }; build-system = [ setuptools ]; From a77b15c64651465e4f7d0e91f55dd0b0f11d2676 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 09:25:41 +0100 Subject: [PATCH 289/369] python312Packages.publicsuffixlist: 1.0.2.20241026 -> 1.0.2.20241102 Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20241102-gha/CHANGES.md --- pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix index 798f8a82efe3..826e97b476c4 100644 --- a/pkgs/development/python-modules/publicsuffixlist/default.nix +++ b/pkgs/development/python-modules/publicsuffixlist/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "publicsuffixlist"; - version = "1.0.2.20241026"; + version = "1.0.2.20241102"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-vCTHs5HFW21d7W0G/W92ugA2F9JbqE6IwmHHHb6rdUs="; + hash = "sha256-dNnGnAybp11y8WGSvXiP0MNFRmw5TQgnrVBQGqwsDSQ="; }; build-system = [ setuptools ]; From 27e4702b3b9f692dce4b37752f83886b3ee41110 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 09:47:14 +0100 Subject: [PATCH 290/369] python312Packages.librespot: add PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION --- pkgs/development/python-modules/librespot/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/librespot/default.nix b/pkgs/development/python-modules/librespot/default.nix index 628f2ab1922f..642b67cdac31 100644 --- a/pkgs/development/python-modules/librespot/default.nix +++ b/pkgs/development/python-modules/librespot/default.nix @@ -6,7 +6,9 @@ protobuf, pycryptodomex, pyogg, + pythonOlder, requests, + setuptools, websocket-client, zeroconf, }: @@ -14,7 +16,9 @@ buildPythonPackage rec { pname = "librespot"; version = "0.0.9"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "kokarare1212"; @@ -23,10 +27,13 @@ buildPythonPackage rec { hash = "sha256-k9qVsxjRlUZ7vCBx00quiAR7S+YkfyoZiAKVnOOG4xM="; }; + env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python"; + pythonRelaxDeps = true; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ defusedxml protobuf pycryptodomex From 35fb000eebeb0c32dd39a2d4440c9b4c1119c37b Mon Sep 17 00:00:00 2001 From: Francesco Carmelo Capria Date: Fri, 1 Nov 2024 21:53:17 +0100 Subject: [PATCH 291/369] hyprgui: init at 0.1.6 --- pkgs/by-name/hy/hyprgui/package.nix | 52 +++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 pkgs/by-name/hy/hyprgui/package.nix diff --git a/pkgs/by-name/hy/hyprgui/package.nix b/pkgs/by-name/hy/hyprgui/package.nix new file mode 100644 index 000000000000..62a3c36d5565 --- /dev/null +++ b/pkgs/by-name/hy/hyprgui/package.nix @@ -0,0 +1,52 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + pkg-config, + glib, + pango, + cairo, + gtk4, + wrapGAppsHook4, +}: + +rustPlatform.buildRustPackage rec { + pname = "hyprgui"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "hyprutils"; + repo = "hyprgui"; + rev = "refs/tags/v${version}"; + hash = "sha256-n/poyVDBnMb4vw2YEymxxdjscGmu76qQ/BbS5BJOknM="; + }; + + cargoHash = "sha256-w+Bfjv7usyYfgTKW+KHqskNPco17QSjwn96cG/6yVoU="; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; + buildInputs = [ + glib + cairo + pango + gtk4 + ]; + + postInstall = '' + install -Dm644 -t $out/usr/share/icons hyprgui.png + install -Dm644 -t $out/usr/share/applications hyprgui.desktop + ''; + + meta = { + description = "GUI for configuring Hyprland written in Rust"; + homepage = "https://github.com/hyprutils/hyprgui"; + license = lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ fccapria ]; + badPlatforms = lib.platforms.darwin; + mainProgram = "hyprgui"; + }; +} From d8ccbf3c1e00a2113fe0b8b149e8c1fe9afd356a Mon Sep 17 00:00:00 2001 From: Nipe Setiawan Harefa Date: Sat, 2 Nov 2024 16:07:16 +0700 Subject: [PATCH 292/369] maintainers: add nipeharefa --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6fd827cd72b9..8d817fbb2728 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15580,6 +15580,12 @@ githubId = 3159451; name = "Nicolas Schneider"; }; + nipeharefa = { + name = "Nipe Harefa"; + email = "nipeharefa@gmail.com"; + github = "nipeharefa"; + githubId = 12620257; + }; NIS = { name = "NSC IT Solutions"; github = "dev-nis"; From 75d4c782597e26d52bbc00043a6087bed0659148 Mon Sep 17 00:00:00 2001 From: Nipe Setiawan Harefa Date: Sat, 2 Nov 2024 16:07:42 +0700 Subject: [PATCH 293/369] deepsource: init at 0.8.6 --- pkgs/by-name/de/deepsource/package.nix | 62 ++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/de/deepsource/package.nix diff --git a/pkgs/by-name/de/deepsource/package.nix b/pkgs/by-name/de/deepsource/package.nix new file mode 100644 index 000000000000..10d48b0fc4ce --- /dev/null +++ b/pkgs/by-name/de/deepsource/package.nix @@ -0,0 +1,62 @@ +{ + lib, + stdenv, + installShellFiles, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule rec { + pname = "deepsource"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "DeepSourceCorp"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-6uNb4cQVerrlW/eUkjmlO1i1YKYX3qaVdo0i5cczt+I="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + doCheck = true; + + checkFlags = + let + # Skip tests that require network access + skippedTests = [ + "TestReportKeyValueWorkflow" + "TestReportAnalyzerTypeWorkflow" + "TestReportKeyValueFileWorkflow" + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + vendorHash = "sha256-SsMq4ngq3sSOL28ysHTxTF4CT9sIcCIW7yIhBxIPrNs="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd deepsource \ + --bash <($out/bin/deepsource completion bash) \ + --fish <($out/bin/deepsource completion fish) \ + --zsh <($out/bin/deepsource completion zsh) + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + meta = { + description = "Command line interface to DeepSource, the code health platform"; + mainProgram = "deepsource"; + homepage = "https://github.com/DeepSourceCorp/cli"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ nipeharefa ]; + }; +} From 14b06b7b7dd57e631fe24cffd719f9aa1323f05b Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 1 Nov 2024 22:32:47 +0100 Subject: [PATCH 294/369] mlv-app: fix aarch64 patch Signed-off-by: Sefa Eyeoglu --- pkgs/applications/video/mlv-app/aarch64-flags.patch | 8 ++++---- pkgs/applications/video/mlv-app/default.nix | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/mlv-app/aarch64-flags.patch b/pkgs/applications/video/mlv-app/aarch64-flags.patch index affd85d2b732..4d26bfdd39d0 100644 --- a/pkgs/applications/video/mlv-app/aarch64-flags.patch +++ b/pkgs/applications/video/mlv-app/aarch64-flags.patch @@ -2,12 +2,12 @@ diff --git a/platform/qt/MLVApp.pro b/platform/qt/MLVApp.pro index ebdc552..3e37573 100644 --- a/platform/qt/MLVApp.pro +++ b/platform/qt/MLVApp.pro -@@ -84,7 +84,7 @@ win32{ +@@ -120,7 +120,7 @@ win32{ # Linux linux-g++*{ -- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -+ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 - QMAKE_CXXFLAGS += -fopenmp +- QMAKE_CFLAGS += -O3 -fopenmp -msse4.1 -mssse3 -msse3 -msse2 -msse -std=c99 -ftree-vectorize ++ QMAKE_CFLAGS += -O3 -fopenmp -std=c99 -ftree-vectorize + QMAKE_CXXFLAGS += -fopenmp -std=c++11 -ftree-vectorize LIBS += -lgomp } diff --git a/pkgs/applications/video/mlv-app/default.nix b/pkgs/applications/video/mlv-app/default.nix index da9f4d5807e1..c4f0f984518e 100644 --- a/pkgs/applications/video/mlv-app/default.nix +++ b/pkgs/applications/video/mlv-app/default.nix @@ -18,7 +18,10 @@ mkDerivation rec { sha256 = "sha256-RfZXHmWSjZBxNFwQ/bzHppsLS0LauURIdnkAzxAIBcU="; }; - patches = if stdenv.hostPlatform.isAarch64 then ./aarch64-flags.patch else null; + patches = lib.optionals stdenv.hostPlatform.isAarch64 [ + # remove optimization flags with x86 only instruction sets + ./aarch64-flags.patch + ]; installPhase = '' runHook preInstall From 8a2e3554a90c47b9030e92b1ac19969f3b899224 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 10:53:46 +0100 Subject: [PATCH 295/369] python312Packages.boiboite-opener-framework: disable pythonImportsCheck Race condition in scapy https://github.com/secdev/scapy/pull/4558 --- .../python-modules/boiboite-opener-framework/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/boiboite-opener-framework/default.nix b/pkgs/development/python-modules/boiboite-opener-framework/default.nix index 9be58802c5e3..79442baf25b4 100644 --- a/pkgs/development/python-modules/boiboite-opener-framework/default.nix +++ b/pkgs/development/python-modules/boiboite-opener-framework/default.nix @@ -34,7 +34,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "bof" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # Race condition, https://github.com/secdev/scapy/pull/4558 + # pythonImportsCheck = [ "bof" ]; disabledTests = [ # Tests are using netcat and cat to do UDP connections From 7565a22471e61f0d01d0077db712e0c2cb8ccfec Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 18:49:23 +0900 Subject: [PATCH 296/369] python312Packages.pymdstat: 0.4.2 -> 0.4.3 Diff: https://github.com/nicolargo/pymdstat/compare/v0.4.2...v0.4.3 --- pkgs/development/python-modules/pymdstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymdstat/default.nix b/pkgs/development/python-modules/pymdstat/default.nix index ecc913b075b1..5ca16a3bc852 100644 --- a/pkgs/development/python-modules/pymdstat/default.nix +++ b/pkgs/development/python-modules/pymdstat/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pymdstat"; - version = "0.4.2"; + version = "0.4.3"; format = "setuptools"; src = fetchFromGitHub { owner = "nicolargo"; repo = pname; rev = "v${version}"; - sha256 = "01hj8vyd9f7610sqvzphpr033rvnazbwvl11gi18ia3yqlnlncp0"; + sha256 = "sha256-ifQZXc+it/UTltHc1ZL2zxJu7GvAxYzzmB4D+mCqEoE="; }; checkPhase = '' From bff3e3105a80fa9751aee6097eef712baaeca352 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 19:05:26 +0900 Subject: [PATCH 297/369] python312Packages.pymdstat: refactor --- .../python-modules/pymdstat/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pymdstat/default.nix b/pkgs/development/python-modules/pymdstat/default.nix index 5ca16a3bc852..f447d15e45af 100644 --- a/pkgs/development/python-modules/pymdstat/default.nix +++ b/pkgs/development/python-modules/pymdstat/default.nix @@ -2,27 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, - python, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "pymdstat"; version = "0.4.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "nicolargo"; - repo = pname; + repo = "pymdstat"; rev = "v${version}"; - sha256 = "sha256-ifQZXc+it/UTltHc1ZL2zxJu7GvAxYzzmB4D+mCqEoE="; + hash = "sha256-ifQZXc+it/UTltHc1ZL2zxJu7GvAxYzzmB4D+mCqEoE="; }; - checkPhase = '' - ${python.interpreter} $src/unitest.py - ''; + build-system = [ setuptools ]; pythonImportsCheck = [ "pymdstat" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ "unitest.py" ]; + meta = with lib; { description = "Pythonic library to parse Linux /proc/mdstat file"; homepage = "https://github.com/nicolargo/pymdstat"; From 4d649279be992aaa23388032841ed13866b40604 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 11:06:40 +0100 Subject: [PATCH 298/369] python312Packages.types-s3transfer: fix build-system --- .../python-modules/types-s3transfer/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix index c8a0102e49ed..bb2211a43dfb 100644 --- a/pkgs/development/python-modules/types-s3transfer/default.nix +++ b/pkgs/development/python-modules/types-s3transfer/default.nix @@ -2,7 +2,8 @@ lib, buildPythonPackage, fetchPypi, - poetry-core, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -10,13 +11,15 @@ buildPythonPackage rec { version = "0.10.2"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchPypi { pname = "types_s3transfer"; inherit version; hash = "sha256-YBZ6O/tcU27GzbWBj3+aKO3KncPgtf+FrjdFJvxeV24="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ setuptools ]; # Module has no tests doCheck = false; From 7c9109eb3ad7e5b967d09d6e4f340f3cf4549305 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Thu, 31 Oct 2024 20:48:28 +0800 Subject: [PATCH 299/369] aerogramme: mark as broken --- pkgs/by-name/ae/aerogramme/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ae/aerogramme/package.nix b/pkgs/by-name/ae/aerogramme/package.nix index 49379db4a2c6..a8643ba1b6cf 100644 --- a/pkgs/by-name/ae/aerogramme/package.nix +++ b/pkgs/by-name/ae/aerogramme/package.nix @@ -50,5 +50,6 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ supinie ]; mainProgram = "aerogramme"; platforms = lib.platforms.linux; + broken = true; # https://github.com/rust-lang/rust/issues/129811 }; } From 1924ed8075d24ee8d1f2e68268b3c63aa1a9180d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 11:18:08 +0100 Subject: [PATCH 300/369] aws-sam-cli: 1.120.0 -> 1.127.0 Diff: https://github.com/aws/aws-sam-cli/compare/refs/tags/v1.120.0...1.127.0 Changelog: https://github.com/aws/aws-sam-cli/releases/tag/v1.127.0 --- pkgs/development/tools/aws-sam-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index bc28ff15db2e..a65a16fdbf8f 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.120.0"; + version = "1.127.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-sam-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-XFVh7e9ooIBhWRkVovPdrSuyosBMQ84PDRjV2o0x9ns="; + hash = "sha256-5/zXvO5xrNkhPCei4O/nMXA/e18VNrED2lpBbflaJLQ="; }; build-system = with python3.pkgs; [ setuptools ]; From 1488b3efdc768768b709e4f81426837c1736871f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 19:18:35 +0900 Subject: [PATCH 301/369] python312Packages.rustworkx: 0.14.2 -> 0.15.1 Diff: https://github.com/Qiskit/rustworkx/compare/0.14.2...0.15.1 --- pkgs/development/python-modules/rustworkx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 3f17b45e2d20..2fa64b6d7bc4 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -16,19 +16,19 @@ buildPythonPackage rec { pname = "rustworkx"; - version = "0.14.2"; + version = "0.15.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Qiskit"; repo = pname; rev = version; - hash = "sha256-gck5X6J4Yg5it/YCBsk/yZ5qXg/iwCEbyDIKfBTRxHM="; + hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-FNCa5pshcnsYpjlz6yDITe2k0cHLTybj3rF34qrsRVU="; + hash = "sha256-AgHfCKLna30WERAFGEs8yRxxZHwvLzR+/S+ivwKHXXE="; }; nativeBuildInputs = [ From 8f740302cfd450dcb2d6d75463e94b10aef059e5 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Fri, 1 Nov 2024 22:34:37 +0100 Subject: [PATCH 302/369] gnome-maps: fix broken .desktop file --- pkgs/by-name/gn/gnome-maps/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index 0d19b6de7c91..233c0f2296ee 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -5,7 +5,6 @@ meson, ninja, gettext, - python3, pkg-config, gnome, glib, @@ -75,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: { # entry point to the wrapped binary we get back to a wrapped # binary. substituteInPlace "data/org.gnome.Maps.service.in" \ - --replace "Exec=@pkgdatadir@/@app-id@" \ - "Exec=$out/bin/gnome-maps" + --replace-fail "Exec=@pkgdatadir@/@app-id@" \ + "Exec=$out/bin/gnome-maps" ''; preCheck = '' @@ -97,6 +96,12 @@ stdenv.mkDerivation (finalAttrs: { rm $out/lib/gnome-maps/libgnome-maps.so.0 ''; + preFixup = '' + substituteInPlace "$out/share/applications/org.gnome.Maps.desktop" \ + --replace-fail "Exec=gapplication launch org.gnome.Maps" \ + "Exec=gnome-maps" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-maps"; }; }; From c3be898d34cb93ab8b019cd0fdfeb2a691ea20dc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 11:51:36 +0100 Subject: [PATCH 303/369] python312Packages.diffenator2: relax youseedee --- pkgs/development/python-modules/diffenator2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix index 5dc3bbd3554a..111cf8aa2a83 100644 --- a/pkgs/development/python-modules/diffenator2/default.nix +++ b/pkgs/development/python-modules/diffenator2/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "protobuf" "python-bidi" + "youseedee" ]; build-system = [ From 841dd2b1a0d81f0e53ceb732f160420bababf34e Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 29 Aug 2024 19:55:42 +0200 Subject: [PATCH 304/369] home-assistant-custom-lovelace-modules.weather-card: init at 1.5.0 Signed-off-by: Matthias Beyer Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> --- .../custom-lovelace-modules/default.nix | 2 ++ .../weather-card/default.nix | 34 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix index 6271c3681bb1..bf372c75ec5b 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix @@ -37,6 +37,8 @@ valetudo-map-card = callPackage ./valetudo-map-card { }; + weather-card = callPackage ./weather-card { }; + zigbee2mqtt-networkmap = callPackage ./zigbee2mqtt-networkmap { }; } // lib.optionalAttrs pkgs.config.allowAliases { diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix new file mode 100644 index 000000000000..63bc63e29a93 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/weather-card/default.nix @@ -0,0 +1,34 @@ +{ + lib, + stdenv, + fetchFromGitHub, +}: + +stdenv.mkDerivation rec { + pname = "weather-card"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "bramkragten"; + repo = "weather-card"; + rev = "refs/tags/v${version}"; + hash = "sha256-pod5cayaHP+4vgdBgBRMQ7szkyz9HLaKVJWQX36XdTY="; + }; + dontBuild = true; + installPhase = '' + runHook preInstall + + mkdir $out + cp dist/weather-card.js $out/ + + runHook postInstall + ''; + + meta = { + description = "Weather Card with animated icons for Home Assistant Lovelace"; + homepage = "https://github.com/bramkragten/weather-card"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ matthiasbeyer ]; + platforms = lib.platforms.all; + }; +} From 3ebbc8add8ee6f36d05ea80b0f90e8662890cfb5 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sat, 2 Nov 2024 12:33:49 +0100 Subject: [PATCH 305/369] python3Packages.mmengine: fix pytorch 2.5 compatibility --- pkgs/development/python-modules/mmengine/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/mmengine/default.nix b/pkgs/development/python-modules/mmengine/default.nix index f31daa71f443..bd3f1e2daa5d 100644 --- a/pkgs/development/python-modules/mmengine/default.nix +++ b/pkgs/development/python-modules/mmengine/default.nix @@ -3,6 +3,7 @@ stdenv, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system setuptools, @@ -41,6 +42,14 @@ buildPythonPackage rec { hash = "sha256-bZ6O4UOYUCwq11YmgRWepOIngYxYD/fNfM/VmcyUv9k="; }; + patches = [ + (fetchpatch2 { + name = "mmengine-torch-2.5-compat.patch"; + url = "https://github.com/open-mmlab/mmengine/commit/4c22f78cdea2981a2b48a167e9feffe4721f8901.patch"; + hash = "sha256-k+IFLeqTEVUGGiqmZg56LK64H/UTvpGN20GJT59wf4A="; + }) + ]; + build-system = [ setuptools ]; dependencies = [ From d110bb06c516646eb72e2ebd96d59e00e3eec7d1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:31:41 +0900 Subject: [PATCH 306/369] python312Packages.zodbpickle: 4.1 -> 4.1.1 Changelog: https://github.com/zopefoundation/zodbpickle/blob/4.1.1/CHANGES.rst --- pkgs/development/python-modules/zodbpickle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index be3a8f85cb07..b42479db165b 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "4.1"; + version = "4.1.1"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-esg1awxi3HQA+b0mUyX2Fe7LJPFDWFnB4utEQ1ivt1c="; + hash = "sha256-38DJFe8Umd0GA5cPXBECxr1+t7asRkNLKabYQL8Cckg="; }; # fails.. From 6d68f2054b769a7db1fb1fcf8267fea312c817e4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:45:44 +0900 Subject: [PATCH 307/369] python312Packages.zodbpickle: switch to pypa builder and enable tests --- .../python-modules/zodbpickle/default.nix | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index b42479db165b..6b0b0a97b584 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -3,12 +3,14 @@ buildPythonPackage, pythonOlder, fetchPypi, + setuptools, + pytestCheckHook, }: buildPythonPackage rec { pname = "zodbpickle"; version = "4.1.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -17,11 +19,25 @@ buildPythonPackage rec { hash = "sha256-38DJFe8Umd0GA5cPXBECxr1+t7asRkNLKabYQL8Cckg="; }; - # fails.. - doCheck = false; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "setuptools<74" "setuptools" + ''; + + build-system = [ setuptools ]; pythonImportsCheck = [ "zodbpickle" ]; + nativeCheckInputs = [ pytestCheckHook ]; + + # fails.. + disabledTests = [ + "test_dump" + "test_dumps" + "test_load" + "test_loads" + ]; + meta = with lib; { description = "Fork of Python's pickle module to work with ZODB"; homepage = "https://github.com/zopefoundation/zodbpickle"; From a45dcff69e1f9e1a4bf0b17df872c721ffd920f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 31 Oct 2024 23:46:42 +0100 Subject: [PATCH 308/369] python312Packages.types-awscrt: 0.21.5 -> 0.23.0 Changelog: https://github.com/youtype/types-awscrt/releases/tag/0.23.0 --- pkgs/development/python-modules/types-awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix index bbf905dcb82c..a783600fc5de 100644 --- a/pkgs/development/python-modules/types-awscrt/default.nix +++ b/pkgs/development/python-modules/types-awscrt/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "types-awscrt"; - version = "0.21.5"; + version = "0.23.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "types_awscrt"; inherit version; - hash = "sha256-n39H3mh5nLK8ueSG9I13ufWJYrkvukPLiGDacLPFfRs="; + hash = "sha256-P9Ht6skj0ZVsDpB8lz+4O9pGW+rn8FRxazcbKT+bX9w="; }; build-system = [ setuptools ]; From e5cbc1bf658e1d077c7eb639a01f8126767db862 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Sat, 2 Nov 2024 02:00:39 +0100 Subject: [PATCH 309/369] go-chromecast: nixfmt --- pkgs/applications/video/go-chromecast/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index cade6f0c7484..f038471f9fad 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ + lib, + buildGoModule, + fetchFromGitHub, +}: buildGoModule rec { pname = "go-chromecast"; @@ -13,7 +17,13 @@ buildGoModule rec { vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og="; - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" + "-X main.date=unknown" + ]; meta = with lib; { homepage = "https://github.com/vishen/go-chromecast"; From f23fe574f8a19aad50e633b275c6a6ef945787c6 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Sat, 2 Nov 2024 13:39:40 +0100 Subject: [PATCH 310/369] go-chromecast: fix build "go test" fails with go 1.23 use buildGo122Module for now. --- pkgs/applications/video/go-chromecast/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index f038471f9fad..0c00eb04380e 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -1,10 +1,11 @@ { lib, - buildGoModule, + buildGo122Module, fetchFromGitHub, }: -buildGoModule rec { +# "go test" fails with go 1.23 +buildGo122Module rec { pname = "go-chromecast"; version = "0.3.1"; From 90e636c1ba028ed26a1d26d8a91080be5f6b20b3 Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Sat, 2 Nov 2024 13:43:09 +0100 Subject: [PATCH 311/369] go-chromecast: adopt and other improvements - adopt (no hardware to test) - add `versionCheckHook` - add shell completions with `installShellFiles` - other improvements --- .../video/go-chromecast/default.nix | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 0c00eb04380e..52a8321c300e 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -2,6 +2,9 @@ lib, buildGo122Module, fetchFromGitHub, + installShellFiles, + stdenvNoCC, + versionCheckHook, }: # "go test" fails with go 1.23 @@ -11,26 +14,45 @@ buildGo122Module rec { src = fetchFromGitHub { owner = "vishen"; - repo = pname; - rev = "v${version}"; + repo = "go-chromecast"; + rev = "refs/tags/v${version}"; hash = "sha256-Kzo8iWj4mtnX1Jxm2sLsnmEOmpzScxWHZ/sLYYm3vQI="; }; vendorHash = "sha256-cEUlCR/xtPJJSWplV1COwV6UfzSmVArF4V0pJRk+/Og="; + CGO_ENABLED = 0; + ldflags = [ "-s" "-w" - "-X main.version=${version}" - "-X main.commit=${src.rev}" - "-X main.date=unknown" + "-X=main.version=${version}" + "-X=main.commit=${src.rev}" + "-X=main.date=unknown" ]; - meta = with lib; { + doInstallCheck = true; + + nativeBuildInputs = [ installShellFiles ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + versionCheckProgramArg = "--version"; + + postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd go-chromecast \ + --bash <($out/bin/go-chromecast completion bash) \ + --fish <($out/bin/go-chromecast completion fish) \ + --zsh <($out/bin/go-chromecast completion zsh) + ''; + + meta = { homepage = "https://github.com/vishen/go-chromecast"; description = "CLI for Google Chromecast, Home devices and Cast Groups"; - license = licenses.asl20; - maintainers = [ ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.zi3m5f ]; mainProgram = "go-chromecast"; }; } From a8214534fd423e4d67fc64834a90cd414287c5dd Mon Sep 17 00:00:00 2001 From: zi3m5f <113244000+zi3m5f@users.noreply.github.com> Date: Sat, 2 Nov 2024 13:48:07 +0100 Subject: [PATCH 312/369] go-chromecast: move to pkgs/by-name --- .../default.nix => by-name/go/go-chromecast/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/video/go-chromecast/default.nix => by-name/go/go-chromecast/package.nix} (100%) diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/by-name/go/go-chromecast/package.nix similarity index 100% rename from pkgs/applications/video/go-chromecast/default.nix rename to pkgs/by-name/go/go-chromecast/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 84907eb22fbb..5a4708df3c50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5027,8 +5027,6 @@ with pkgs; gfxreconstruct = callPackage ../tools/graphics/gfxreconstruct { }; - go-chromecast = callPackage ../applications/video/go-chromecast { }; - go-containerregistry = callPackage ../development/tools/go-containerregistry { }; inherit (go-containerregistry) crane gcrane; From 6fb9a340d79ca5ee9110c4d264fa5a4e22a45e92 Mon Sep 17 00:00:00 2001 From: rczb Date: Tue, 3 Sep 2024 10:10:29 +0800 Subject: [PATCH 313/369] s7: init at 11.2-unstable-2024-11-02 --- pkgs/by-name/s7/s7/package.nix | 159 +++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 pkgs/by-name/s7/s7/package.nix diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix new file mode 100644 index 000000000000..acc989e0283a --- /dev/null +++ b/pkgs/by-name/s7/s7/package.nix @@ -0,0 +1,159 @@ +{ + lib, + fetchFromGitLab, + stdenv, + notcurses, + gmp, + mpfr, + libmpc, + flint3, + unstableGitUpdater, + writeScript, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "s7"; + version = "11.2-unstable-2024-11-02"; + + src = fetchFromGitLab { + domain = "cm-gitlab.stanford.edu"; + owner = "bil"; + repo = "s7"; + rev = "6b6651de318c3360aa2711a445659f372ffe894e"; + hash = "sha256-9x1u60jflESAHgP0gwIDVFwhI5XU5gsAiXaic8zdW2U="; + }; + + buildInputs = [ + notcurses + gmp + mpfr + libmpc + flint3 + ]; + + # The following scripts are modified from [Guix's](https://packages.guix.gnu.org/packages/s7/). + + patchPhase = '' + runHook prePatch + + substituteInPlace s7.c \ + --replace-fail libc_s7.so $out/lib/libc_s7.so + + runHook postPatch + ''; + + buildPhase = '' + runHook preBuild + + # The older REPL + cc s7.c -o s7-repl \ + -O2 -I. \ + -Wl,-export-dynamic \ + -lm -ldl \ + -DWITH_MAIN \ + -DS7_LOAD_PATH=\"$out/share/s7/scm\" + + # The newer REPL powered by Notcurses + cc s7.c -o s7-nrepl \ + -O2 -I. \ + -Wl,-export-dynamic \ + -lm -ldl \ + -DWITH_MAIN \ + -DWITH_NOTCURSES -lnotcurses-core \ + -DS7_LOAD_PATH=\"$out/share/s7/scm\" + + cc libarb_s7.c -o libarb_s7.so \ + -O2 -I. \ + -shared \ + -lflint -lmpc \ + -fPIC + + cc notcurses_s7.c -o libnotcurses_s7.so \ + -O2 -I. \ + -shared \ + -lnotcurses-core \ + -fPIC + + cc s7.c -c -o s7.o \ + -O2 -I. \ + -ldl -lm + + cc ffitest.c s7.o -o ffitest \ + -I. \ + -Wl,-export-dynamic \ + -ldl -lm + + ./s7-repl libc.scm + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dst_bin=$out/bin + dst_lib=$out/lib + dst_inc=$out/include + dst_share=$out/share/s7 + dst_scm=$out/share/s7/scm + dst_doc=$out/share/doc/s7 + mkdir -p $dst_bin $dst_lib $dst_inc $dst_share $dst_scm $dst_doc + + cp -pr -t $dst_bin s7-repl s7-nrepl + ln -s s7-nrepl $dst_bin/s7 + cp -pr -t $dst_lib libarb_s7.so libnotcurses_s7.so libc_s7.so + cp -pr -t $dst_share s7.c + cp -pr -t $dst_inc s7.h + cp -pr -t $dst_scm *.scm + cp -pr -t $dst_doc s7.html + + runHook postInstall + ''; + + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + + $dst_bin/s7-repl s7test.scm + + runHook postInstallCheck + ''; + + passthru.updateScript = unstableGitUpdater rec { + branch = "master"; + tagConverter = writeScript "update-s7-version-number" '' + #! /usr/bin/env nix-shell + #! nix-shell -p curl -i bash + set -eu -o pipefail + read tag # should be "0" if the upstream sticks to tagging nothing. + curl -sS https://cm-gitlab.stanford.edu/bil/s7/-/raw/${branch}/s7.h \ + | grep '#define S7_VERSION' \ + | awk -F \" '{print $2}' + ''; + }; + + meta = { + description = "Scheme interpreter intended as an extension language for other applications"; + longDescription = '' + s7 is a Scheme interpreter intended as an extension language for other + applications. + + Although it is a descendant of tinyScheme, s7 is closest as a Scheme + dialect to Guile 1.8. It is expected to be compatible with r5rs and r7rs. + It has continuations, ratios, complex numbers, macros, keywords, + hash-tables, multiprecision arithmetic, generalized `set!`, unicode, and so + on. It does not have `syntax-rules` or any of its friends, and it thinks + there is no such thing as an inexact integer. + + s7 is an extension language of Snd and sndlib, Rick Taube's Common Music + (commonmusic at sourceforge), Kjetil Matheussen's Radium music editor, and + Iain Duncan's Scheme for Max (or Pd). + ''; + homepage = "https://ccrma.stanford.edu/software/s7/"; + license = lib.licenses.bsd0; + maintainers = with lib.maintainers; [ rc-zb ]; + mainProgram = "s7"; + platforms = lib.platforms.linux; + }; +}) From de5bab8a810416cc4932c7ec7e4554829a9883e1 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 2 Nov 2024 13:01:50 +0000 Subject: [PATCH 314/369] skydns: mark as broken on Darwin --- pkgs/servers/skydns/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index ff628ba2e329..27581d185463 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "skydns"; @@ -25,11 +25,13 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - meta = with lib; { + meta = { description = "Distributed service for announcement and discovery of services"; homepage = "https://github.com/skynetservices/skydns"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "skydns"; + # link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg + broken = stdenv.hostPlatform.isDarwin; }; } From 90d6a67760a956385180f163825ca25967e8e337 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 14:05:30 +0100 Subject: [PATCH 315/369] tunnelgraf: 0.6.1 -> 0.7.2 Diff: https://github.com/denniswalker/tunnelgraf/compare/refs/tags/v0.6.1...v0.7.2 Changelog: https://github.com/denniswalker/tunnelgraf/releases/tag/v0.7.2 --- pkgs/by-name/tu/tunnelgraf/package.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/tu/tunnelgraf/package.nix b/pkgs/by-name/tu/tunnelgraf/package.nix index a24ea1b67fc6..08086fc91807 100644 --- a/pkgs/by-name/tu/tunnelgraf/package.nix +++ b/pkgs/by-name/tu/tunnelgraf/package.nix @@ -1,28 +1,28 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "tunnelgraf"; - version = "0.6.1"; + version = "0.7.2"; pyproject = true; src = fetchFromGitHub { owner = "denniswalker"; repo = "tunnelgraf"; rev = "refs/tags/v${version}"; - hash = "sha256-CsrbSpp1VszEAKpmHx8GbB7vfZCOvB+tDFNFwWKexEw="; + hash = "sha256-pwHP9eAf2S08ucUawxrQvzMBJNITxbddoLzEoSNUdao="; }; pythonRelaxDeps = [ "click" + "paramiko" "pydantic" ]; - build-system = with python3.pkgs; [ - hatchling - ]; + build-system = with python3.pkgs; [ hatchling ]; dependencies = with python3.pkgs; [ click @@ -37,13 +37,12 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "tunnelgraf" - ]; + pythonImportsCheck = [ "tunnelgraf" ]; meta = with lib; { description = "Tool to manage SSH tunnel hops to many endpoints"; homepage = "https://github.com/denniswalker/tunnelgraf"; + changelog = "https://github.com/denniswalker/tunnelgraf/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; mainProgram = "tunnelgraf"; From 0c2f29ac63e30ac72f2a188fa03692b6a93bfb6b Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 2 Nov 2024 14:18:11 +0100 Subject: [PATCH 316/369] chromium,chromedriver: 130.0.6723.69 -> 130.0.6723.91 https://chromereleases.googleblog.com/2024/10/stable-channel-update-for-desktop_29.html This update includes 2 security fixes. CVEs: CVE-2024-10487 CVE-2024-10488 --- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 202375b4867e..0dfcb6e6ccd4 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-SZfl93TcaD9j59zGflPFmHgIP5NaS8bgDi3l3SRRFiI="; + hash_darwin = "sha256-4uE34f99fTiG5FJq0xnEodqQvNT2Aa8kesYOxY44xXA="; hash_darwin_aarch64 = - "sha256-wLX63aA8l+23ehdBHPcXtoZ2WEhrmYVKzqUDBbrhSRw="; - hash_linux = "sha256-kP6N7fM+7+S3JwT2JvqfWDRCfAQiNc/rQlHxjJ8DNuo="; - version = "130.0.6723.69"; + "sha256-gDrfR5EgBx3YRxf3/08gayOhmEqSw4G/QcuNtfHmRHk="; + hash_linux = "sha256-qMlM6ilsIqm8G5KLE4uGVb/s2bNyZSyQmxsq+EHKX/c="; + version = "130.0.6723.91"; }; deps = { gn = { @@ -15,8 +15,8 @@ version = "2024-09-09"; }; }; - hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8="; - version = "130.0.6723.69"; + hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M="; + version = "130.0.6723.91"; }; ungoogled-chromium = { deps = { From c6d46d68efe8e11c4519f8c0ded630606f742b85 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 2 Nov 2024 14:18:50 +0100 Subject: [PATCH 317/369] ungoogled-chromium: 130.0.6723.69-1 -> 130.0.6723.91-1 https://chromereleases.googleblog.com/2024/10/stable-channel-update-for-desktop_29.html This update includes 2 security fixes. CVEs: CVE-2024-10487 CVE-2024-10488 --- .../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 0dfcb6e6ccd4..9e57f0d1c316 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-09-09"; }; ungoogled-patches = { - hash = "sha256-usNlX/ol8Zn3lQTvp311DuyYbSHF/HN0r7k8qeUIJmU="; - rev = "130.0.6723.69-1"; + hash = "sha256-LhCrwOwPmEn5xlBLTgp2NMfQLxYbSg0pdZxshoqQAGw="; + rev = "130.0.6723.91-1"; }; }; - hash = "sha256-k0epbUw9D3Vx7ELNDXIFEnsML+cYvDnHZFOW0kz4Kq8="; - version = "130.0.6723.69"; + hash = "sha256-qXCcHas3l3viszDtY5d5JEToPo2hHTaBmi+pJlKQr4M="; + version = "130.0.6723.91"; }; } From dd1a1cc582e979c489995a0e625d8c63a3011728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 1 Nov 2024 17:20:57 +0100 Subject: [PATCH 318/369] mg: fix darwin build --- pkgs/applications/editors/mg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 121d62219db0..70f5dd604296 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, buildPackages, darwin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "mg"; version = "7.3-unstable-2024-06-04"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ]; meta = with lib; { description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; From f6ecf9784cbd815c393d155cba36cfa98c5647c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 1 Nov 2024 17:25:35 +0100 Subject: [PATCH 319/369] uhdm: fix darwin build --- pkgs/applications/science/logic/uhdm/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/logic/uhdm/default.nix b/pkgs/applications/science/logic/uhdm/default.nix index 72b55ffbcd7a..eb078d482732 100644 --- a/pkgs/applications/science/logic/uhdm/default.nix +++ b/pkgs/applications/science/logic/uhdm/default.nix @@ -5,6 +5,7 @@ , python3 , capnproto , gtest +, darwin }: stdenv.mkDerivation (finalAttrs: { @@ -28,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ capnproto + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libutil ]; cmakeFlags = [ From 1dfbe1cd0eef38283ad917c50c8e39b19d2caf32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 1 Nov 2024 17:25:54 +0100 Subject: [PATCH 320/369] fnc: fix darwin build --- pkgs/applications/version-management/fnc/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index b0bae95ba9d1..293fb563af60 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: +{ lib, fetchurl, stdenv, zlib, ncurses, libiconv, darwin }: stdenv.mkDerivation (finalAttrs: { pname = "fnc"; @@ -9,7 +9,9 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-npS+sOxF0S/9TuFjtEFlev0HpIOsaP6zmcfopPNUehk="; }; - buildInputs = [ libiconv ncurses zlib ]; + buildInputs = [ libiconv ncurses zlib ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libutil + ]; makeFlags = [ "PREFIX=$(out)" ]; From 0a3f21564fabd3ecc88bf38bb863900c6d115fad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 1 Nov 2024 17:26:15 +0100 Subject: [PATCH 321/369] abduco: fix darwin build --- pkgs/tools/misc/abduco/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index eef5fe0df344..1f454d40bc85 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchzip, writeText, conf ? null }: +{ lib, stdenv, fetchpatch, fetchzip, writeText, darwin, conf ? null }: let rev = "8c32909a159aaa9484c82b71f05b7a73321eb491"; @@ -21,6 +21,10 @@ stdenv.mkDerivation { installFlags = [ "install-completion" ]; CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE"; + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libutil + ]; + patches = [ # https://github.com/martanne/abduco/pull/22 (fetchpatch { From 9f449b4ebb55c5f872dce12c87ef29b087234dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 1 Nov 2024 17:26:33 +0100 Subject: [PATCH 322/369] mtm: fix darwin build --- pkgs/tools/misc/mtm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mtm/default.nix b/pkgs/tools/misc/mtm/default.nix index 8ecbc087894b..97d2c72d52be 100644 --- a/pkgs/tools/misc/mtm/default.nix +++ b/pkgs/tools/misc/mtm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses, darwin }: stdenv.mkDerivation rec { pname = "mtm"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0gibrvah059z37jvn1qs4b6kvd4ivk2mfihmcpgx1vz6yg70zghv"; }; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses ] ++ lib.optionals stdenv.isDarwin [ darwin.libutil ]; makeFlags = [ "DESTDIR=${placeholder "out"}" "MANDIR=${placeholder "out"}/share/man/man1" ]; From 8a620b38476b5ea29d0f992723ec87d016dbf702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 1 Nov 2024 17:26:49 +0100 Subject: [PATCH 323/369] eternal-terminal: fix darwin build --- pkgs/tools/networking/eternal-terminal/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix index 7a48cbe77529..c580d02a794f 100644 --- a/pkgs/tools/networking/eternal-terminal/default.nix +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -8,6 +8,7 @@ , protobuf , zlib , catch2 +, darwin }: stdenv.mkDerivation rec { @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { openssl protobuf zlib + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.libutil ]; preBuild = '' From 7ed598dcfbf1703a1bb777008fe874041d99b4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Fri, 1 Nov 2024 17:40:37 +0100 Subject: [PATCH 324/369] surelog: fix darwin build --- pkgs/applications/science/logic/surelog/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/surelog/default.nix b/pkgs/applications/science/logic/surelog/default.nix index 0d795611b95a..595a3e168040 100644 --- a/pkgs/applications/science/logic/surelog/default.nix +++ b/pkgs/applications/science/logic/surelog/default.nix @@ -12,6 +12,7 @@ , antlr4 , capnproto , nlohmann_json +, darwin }: stdenv.mkDerivation (finalAttrs: { @@ -45,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { capnproto antlr4.runtime.cpp nlohmann_json - ]; + ] ++ lib.optional stdenv.isDarwin [ darwin.libutil ]; cmakeFlags = [ "-DSURELOG_USE_HOST_CAPNP=On" From 13f67336b4ed769cab717993bafe7bd4a220598e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= Date: Thu, 31 Oct 2024 18:45:20 +0100 Subject: [PATCH 325/369] bazel-watcher: fix darwin build https://hydra.nixos.org/build/274346443/log/tail --- pkgs/development/tools/bazel-watcher/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index f8300db3c064..eb875a4bb220 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -4,6 +4,7 @@ buildGoModule, testers, bazel-watcher, + stdenv, }: buildGoModule rec { @@ -19,7 +20,8 @@ buildGoModule rec { vendorHash = "sha256-0I/bvuyosN55oNSMuom4C8rVjxneUaqV19l9OMiwWhU="; - CGO_ENABLED = "0"; + # The dependency github.com/fsnotify/fsevents requires CGO + CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0"; ldflags = [ "-s" "-X main.Version=${version}" @@ -28,7 +30,10 @@ buildGoModule rec { subPackages = [ "cmd/ibazel" ]; passthru = { - tests.version = testers.testVersion { package = bazel-watcher; }; + tests.version = testers.testVersion { + package = bazel-watcher; + command = "ibazel version"; + }; }; meta = with lib; { From b685ddd6b8e2e733c17c060969ae5d0dafd11391 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 22:39:37 +0900 Subject: [PATCH 326/369] python312Packages.rustworkx: switch to pypa builder --- pkgs/development/python-modules/rustworkx/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 2fa64b6d7bc4..8cda7ed35704 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -4,6 +4,7 @@ cargo, rustPlatform, rustc, + setuptools, setuptools-rust, numpy, fixtures, @@ -17,11 +18,11 @@ buildPythonPackage rec { pname = "rustworkx"; version = "0.15.1"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Qiskit"; - repo = pname; + repo = "rustworkx"; rev = version; hash = "sha256-0WYgShihTBM0e+MIhON0dnhZug6l280tZcVp3KF1Jq0="; }; @@ -32,12 +33,16 @@ buildPythonPackage rec { }; nativeBuildInputs = [ - setuptools-rust rustPlatform.cargoSetupHook cargo rustc ]; + build-system = [ + setuptools + setuptools-rust + ]; + buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; checkInputs = [ From 897f4ea6eb52175eade45f89d23736177829c50f Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 22:40:10 +0900 Subject: [PATCH 327/369] python312Packages.rustworkx: enable tests --- pkgs/development/python-modules/rustworkx/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rustworkx/default.nix b/pkgs/development/python-modules/rustworkx/default.nix index 8cda7ed35704..d2ee15fa36b1 100644 --- a/pkgs/development/python-modules/rustworkx/default.nix +++ b/pkgs/development/python-modules/rustworkx/default.nix @@ -13,6 +13,7 @@ libiconv, stdenv, lib, + pytestCheckHook, }: buildPythonPackage rec { @@ -45,12 +46,17 @@ buildPythonPackage rec { buildInputs = [ numpy ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; - checkInputs = [ + nativeCheckInputs = [ fixtures networkx + pytestCheckHook testtools ]; + preCheck = '' + rm -r rustworkx + ''; + pythonImportsCheck = [ "rustworkx" ]; meta = with lib; { From 43be78d4808ff9e58c9aec5d6f6f2af2269fdabd Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:31:33 +0900 Subject: [PATCH 328/369] python312Packages.zipstream-ng: 1.7.1 -> 1.8.0 Diff: https://github.com/pR0Ps/zipstream-ng/compare/refs/tags/v1.7.1...v1.8.0 Changelog: https://github.com/pR0Ps/zipstream-ng/blob/v1.8.0/CHANGELOG.md --- pkgs/development/python-modules/zipstream-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix index b8f054c27840..6bd4b0860e19 100644 --- a/pkgs/development/python-modules/zipstream-ng/default.nix +++ b/pkgs/development/python-modules/zipstream-ng/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "zipstream-ng"; - version = "1.7.1"; + version = "1.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pR0Ps"; repo = "zipstream-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-BYQse+DlyLUH9CofRfGrPUZjP7E8AP/wpirvJmSRfow="; + hash = "sha256-mmPxzml+gaVg2IQ/Gql+3ru0hHosbyX4WjLCMxD/MJw="; }; pythonImportsCheck = [ "zipstream" ]; From a74add32fb42ac73d506860c22a95e940a8057b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Nov 2024 14:44:34 +0100 Subject: [PATCH 329/369] python312Packages.signxml: 3.2.2 -> 4.0.2 Diff: https://github.com/XML-Security/signxml/compare/refs/tags/v3.2.2...v4.0.2 Changelog: https://github.com/XML-Security/signxml/blob/refs/tags/v4.0.2/Changes.rst --- pkgs/development/python-modules/signxml/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/signxml/default.nix b/pkgs/development/python-modules/signxml/default.nix index cf5b9504012e..433858761261 100644 --- a/pkgs/development/python-modules/signxml/default.nix +++ b/pkgs/development/python-modules/signxml/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "signxml"; - version = "3.2.2"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,12 +22,12 @@ buildPythonPackage rec { owner = "XML-Security"; repo = "signxml"; rev = "refs/tags/v${version}"; - hash = "sha256-TlOIHYvx1o46nr/3qq45pgeOqmuyWaaTGvOS0Jwz1zs="; + hash = "sha256-ZpboU0N8dD03yHSboMpC+TJvp16StM45Qhn0Hv9+6fg="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ certifi cryptography lxml From e7bf5fb758c684f25c7df871b1c7d90923fcc72e Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 22:44:50 +0900 Subject: [PATCH 330/369] python312Packages.zipstream-ng: switch to pypa builder --- pkgs/development/python-modules/zipstream-ng/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/zipstream-ng/default.nix b/pkgs/development/python-modules/zipstream-ng/default.nix index 6bd4b0860e19..fbc7038a49de 100644 --- a/pkgs/development/python-modules/zipstream-ng/default.nix +++ b/pkgs/development/python-modules/zipstream-ng/default.nix @@ -4,12 +4,13 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "zipstream-ng"; version = "1.8.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,6 +21,8 @@ buildPythonPackage rec { hash = "sha256-mmPxzml+gaVg2IQ/Gql+3ru0hHosbyX4WjLCMxD/MJw="; }; + build-system = [ setuptools ]; + pythonImportsCheck = [ "zipstream" ]; nativeCheckInputs = [ pytestCheckHook ]; From e84326b6b7b9b85c269fb622f8bddff82f42c421 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:31:03 +0900 Subject: [PATCH 331/369] python312Packages.yaramod: 4.0.0 -> 4.0.1 Diff: https://github.com/avast/yaramod/compare/refs/tags/v4.0.0...v4.0.1 Changelog: https://github.com/avast/yaramod/blob/v4.0.1/CHANGELOG.md --- pkgs/development/python-modules/yaramod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index 3bf6ba1b7546..f65b34047596 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -21,7 +21,7 @@ let in buildPythonPackage rec { pname = "yaramod"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "avast"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-YbsNFtDk5u5UyTsS1aGKUv/HWYxEwERinZ3G84/mC9o="; + hash = "sha256-EkGG3J84mTFnor1YX9B1TyjvW6mCCF/AH904DaVX+VU="; }; postPatch = '' From ff8466cb40c40e2b430340326c83a623b2e9cd02 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 22:53:43 +0900 Subject: [PATCH 332/369] python312Packages.yaramod: refactor --- .../python-modules/yaramod/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/yaramod/default.nix b/pkgs/development/python-modules/yaramod/default.nix index f65b34047596..87cd9ffcee7f 100644 --- a/pkgs/development/python-modules/yaramod/default.nix +++ b/pkgs/development/python-modules/yaramod/default.nix @@ -5,10 +5,10 @@ fetchFromGitHub, pytestCheckHook, libxcrypt, - pythonOlder, gtest, pybind11, nlohmann_json, + setuptools, }: let @@ -22,13 +22,11 @@ in buildPythonPackage rec { pname = "yaramod"; version = "4.0.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "avast"; - repo = pname; + repo = "yaramod"; rev = "refs/tags/v${version}"; hash = "sha256-EkGG3J84mTFnor1YX9B1TyjvW6mCCF/AH904DaVX+VU="; }; @@ -48,12 +46,16 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake pog - gtest ]; - setupPyBuildFlags = [ "--with-unit-tests" ]; + build-system = [ setuptools ]; - checkInputs = [ pytestCheckHook ]; + env.ENV_YARAMOD_BUILD_WITH_UNIT_TESTS = true; + + nativeCheckInputs = [ + gtest + pytestCheckHook + ]; pytestFlagsArray = [ "tests/" ]; From 11e112ff2fa4249bfe3e7fa5e39f34efd4bd91a0 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:30:57 +0900 Subject: [PATCH 333/369] python312Packages.yappi: 1.6.3 -> 1.6.4 Diff: https://github.com/sumerc/yappi/compare/refs/tags/1.6.3...1.6.4 --- pkgs/development/python-modules/yappi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 90126ce1be2f..1b45984eb34e 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "yappi"; - version = "1.6.3"; + version = "1.6.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "sumerc"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-nkkm50/94iVYZdUBm7DZkNQsBqddO6unjP29ctf7dxo="; + hash = "sha256-3lGbFDu7sk83KrSHo6qZxHT2dxPWtT8yfXXQO1GbteU="; }; patches = [ ./tests.patch ]; From d5f92921defe9d35d3933374a0ee8bb8bcfc6094 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 23:02:20 +0900 Subject: [PATCH 334/369] python312Packages.yappi: refactor --- pkgs/development/python-modules/yappi/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index 1b45984eb34e..2120be04acc9 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -5,28 +5,33 @@ gevent, python, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "yappi"; version = "1.6.4"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "sumerc"; - repo = pname; + repo = "yappi"; rev = "refs/tags/${version}"; hash = "sha256-3lGbFDu7sk83KrSHo6qZxHT2dxPWtT8yfXXQO1GbteU="; }; patches = [ ./tests.patch ]; + build-system = [ setuptools ]; + nativeCheckInputs = [ gevent ]; checkPhase = '' + runHook preCheck ${python.interpreter} run_tests.py + runHook postCheck ''; pythonImportsCheck = [ "yappi" ]; From 4c8f5367726c054764ccf0de98f58dddba9cce12 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:30:24 +0900 Subject: [PATCH 335/369] python312Packages.xformers: 0.0.23.post1 -> 0.0.28.post3 Diff: https://github.com/facebookresearch/xformers/compare/refs/tags/v0.0.23.post1...v0.0.28.post3 Changelog: https://github.com/facebookresearch/xformers/blob/0.0.28.post3/CHANGELOG.md --- pkgs/development/python-modules/xformers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 69c7583c9eac..1c72490531c2 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -29,20 +29,20 @@ }: let inherit (torch) cudaCapabilities cudaPackages cudaSupport; - version = "0.0.23.post1"; + version = "0.0.28.post3"; in buildPythonPackage { pname = "xformers"; inherit version; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "xformers"; rev = "refs/tags/v${version}"; - hash = "sha256-AJXow8MmX4GxtEE2jJJ/ZIBr+3i+uS4cA6vofb390rY="; + hash = "sha256-23tnhCHK+Z0No8fqZxkgDFp2VIgXZR4jpM+pkb/vvmw="; fetchSubmodules = true; }; From 953b80665eb98896c469a3e39b493a43664504dd Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 23:13:09 +0900 Subject: [PATCH 336/369] python312Packages.xformers: refactor --- pkgs/development/python-modules/xformers/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 1c72490531c2..b23be6f21314 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -5,6 +5,7 @@ pythonOlder, fetchFromGitHub, which, + setuptools, # runtime dependencies numpy, torch, @@ -34,7 +35,7 @@ in buildPythonPackage { pname = "xformers"; inherit version; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -48,6 +49,8 @@ buildPythonPackage { patches = [ ./0001-fix-allow-building-without-git.patch ]; + build-system = [ setuptools ]; + preBuild = '' cat << EOF > ./xformers/version.py # noqa: C801 @@ -81,7 +84,7 @@ buildPythonPackage { which ] ++ lib.optionals cudaSupport (with cudaPackages; [ cuda_nvcc ]); - propagatedBuildInputs = [ + dependencies = [ numpy torch ]; @@ -115,7 +118,7 @@ buildPythonPackage { ]; meta = with lib; { - description = "XFormers: A collection of composable Transformer building blocks"; + description = "Collection of composable Transformer building blocks"; homepage = "https://github.com/facebookresearch/xformers"; changelog = "https://github.com/facebookresearch/xformers/blob/${version}/CHANGELOG.md"; license = licenses.bsd3; From 9a90bbd6a160d83bf7cf6d653bba428501013552 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 26 Oct 2024 01:02:09 +0000 Subject: [PATCH 337/369] glasgow: 0-unstable-2024-09-10 -> 0-unstable-2024-10-24 --- pkgs/tools/misc/glasgow/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/glasgow/default.nix b/pkgs/tools/misc/glasgow/default.nix index 39d936527dfa..a2e72db0f57a 100644 --- a/pkgs/tools/misc/glasgow/default.nix +++ b/pkgs/tools/misc/glasgow/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "0-unstable-2024-09-10"; + version = "0-unstable-2024-10-24"; # from `pdm show` realVersion = let tag = builtins.elemAt (lib.splitString "-" version) 0; @@ -22,8 +22,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "f2c0ecbe0d47d96f940e77f9def209e9c57d3962"; - sha256 = "sha256-aNzNh/YkWjnHiO+QWbJu2Y3kL/53kDvVn/8Ncz2kpFI="; + rev = "3d7a14165f9f5179bcd2a2a119ab4bbf9d81326c"; + sha256 = "sha256-fhT5xRq4VE8lOTJI470E2PPTSPSUHh90S17MdilFWAA="; }; nativeBuildInputs = [ @@ -51,6 +51,8 @@ python3.pkgs.buildPythonApplication rec { enableParallelBuilding = true; + __darwinAllowLocalNetworking = true; + preBuild = '' make -C firmware LIBFX2=${python3.pkgs.fx2}/share/libfx2 cp firmware/glasgow.ihex software/glasgow From 879f5bce7d97e271668dffd892d360b3b6ca8076 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 7 Oct 2024 12:23:14 +0000 Subject: [PATCH 338/369] aws-rotate-key: 1.1.0 -> 1.2.0 --- pkgs/tools/admin/aws-rotate-key/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 298584ce8d24..b2f3a85e439e 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -2,21 +2,22 @@ buildGoModule rec { pname = "aws-rotate-key"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Fullscreen"; repo = "aws-rotate-key"; rev = "v${version}"; - sha256 = "sha256-PZ7+GC4P4bkT+DWOhW70KkhUCUjn4gIG+OKoOBSc/8c="; + sha256 = "sha256-fYpgHHOw0k/8WLGhq+uVOvoF4Wff6wzTXuN8r4D+TmU="; }; - vendorHash = "sha256-Asfbv7avT+L8/WNQ6NS7gFcjA9MiTCu5PzsuA/PT6/k="; + vendorHash = "sha256-gXtTd7lU9m9rO1w7Fx8o/s45j63h6GtUZrjOzFI4Q/o="; ldflags = [ "-s" "-w" ]; passthru.tests.version = testers.testVersion { package = aws-rotate-key; + command = "AWS_SHARED_CREDENTIALS_FILE=/dev/null aws-rotate-key --version"; }; meta = with lib; { From 4c3c3358dfbbd554ad346d668ac57642f4b7f239 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 20:26:59 +0900 Subject: [PATCH 339/369] python312Packages.wadllib: 1.3.9 -> 2.0.0 --- pkgs/development/python-modules/wadllib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix index 3021d3506f12..b22fa5615c97 100644 --- a/pkgs/development/python-modules/wadllib/default.nix +++ b/pkgs/development/python-modules/wadllib/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "wadllib"; - version = "1.3.9"; + version = "2.0.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wL4oM4myKP/ZPNru+44HDyLd98tcd+SMaMOWD98lmEQ="; + sha256 = "sha256-HtuvI+T6NP6nDJs4C6oqE5sQhq5InrzMxLO2X8lzdCc="; }; propagatedBuildInputs = [ From fb643493e8104164e27ba85a46ad704d4e770ecc Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 23:54:53 +0900 Subject: [PATCH 340/369] python312Packages.wadllib: refactor --- .../python-modules/wadllib/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/wadllib/default.nix b/pkgs/development/python-modules/wadllib/default.nix index b22fa5615c97..f5bbaddb6c34 100644 --- a/pkgs/development/python-modules/wadllib/default.nix +++ b/pkgs/development/python-modules/wadllib/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - isPy3k, setuptools, lazr-uri, }: @@ -10,24 +9,28 @@ buildPythonPackage rec { pname = "wadllib"; version = "2.0.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-HtuvI+T6NP6nDJs4C6oqE5sQhq5InrzMxLO2X8lzdCc="; + hash = "sha256-HtuvI+T6NP6nDJs4C6oqE5sQhq5InrzMxLO2X8lzdCc="; }; - propagatedBuildInputs = [ - setuptools + build-system = [ setuptools ]; + + dependencies = [ lazr-uri ]; - doCheck = isPy3k; + pythonImportsCheck = [ "wadllib" ]; + + # pypi tarball has no tests + doCheck = false; meta = with lib; { description = "Navigate HTTP resources using WADL files as guides"; homepage = "https://launchpad.net/wadllib"; - license = licenses.lgpl3; + license = licenses.lgpl3Only; maintainers = [ ]; }; } From 5ebc7e350b92451f072ff46abbcde7b644ba9553 Mon Sep 17 00:00:00 2001 From: pongo1231 Date: Sat, 26 Oct 2024 00:12:45 +0200 Subject: [PATCH 341/369] distrobox: 1.7.2.1 -> 1.8.0 --- .../virtualization/distrobox/default.nix | 12 +++++---- .../distrobox/relative-default-icon.patch | 26 +++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/virtualization/distrobox/relative-default-icon.patch diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index 567a1b4db6eb..ce3c4e075a95 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.7.2.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; rev = finalAttrs.version; - hash = "sha256-H2jeKs0h4ZAcP33HB5jptlubq62cwnjPK2wSlEIfFWA="; + hash = "sha256-e9oSTk+UlkrkRSipqjjMqwtxEvEZffVBmlSTmsIT7cU="; }; dontConfigure = true; @@ -16,12 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; + patches = [ + # https://github.com/89luca89/distrobox/issues/408 + ./relative-default-icon.patch + ]; + installPhase = '' runHook preInstall - # https://github.com/89luca89/distrobox/issues/408 - substituteInPlace ./distrobox-generate-entry \ - --replace-fail 'icon_default="''${HOME}/.local' "icon_default=\"$out" ./install -P $out runHook postInstall diff --git a/pkgs/applications/virtualization/distrobox/relative-default-icon.patch b/pkgs/applications/virtualization/distrobox/relative-default-icon.patch new file mode 100644 index 000000000000..069c2d40d618 --- /dev/null +++ b/pkgs/applications/virtualization/distrobox/relative-default-icon.patch @@ -0,0 +1,26 @@ +diff --git a/distrobox-generate-entry b/distrobox-generate-entry +index 65fcea0..8d57e4e 100755 +--- a/distrobox-generate-entry ++++ b/distrobox-generate-entry +@@ -51,7 +51,7 @@ container_manager="autodetect" + container_name_default="my-distrobox" + delete=0 + icon="auto" +-icon_default="${XDG_DATA_HOME:-${HOME}/.local/share}/icons/terminal-distrobox-icon.svg" ++icon_default="terminal-distrobox-icon" + verbose=0 + online=0 + version="1.8.0" +@@ -335,12 +335,6 @@ if [ "${icon}" = "auto" ]; then + + icon_url="$(echo "${DISTRO_ICON_MAP}" | grep "${container_distro}:" | cut -d':' -f2-)" + +- # Distro not found in our map, fallback to generic icon +- if [ -z "${icon_url}" ]; then +- icon_url="https://raw.githubusercontent.com/89luca89/distrobox/main/icons/terminal-distrobox-icon.svg" +- container_distro="terminal-distrobox-icon" +- fi +- + if [ -n "${icon_url}" ] && [ "${download}" != "null" ]; then + icon_extension="${icon_url##*.}" + From fd7b9a397817dac74f278f7683a22d5b8e99d118 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 2 Nov 2024 19:40:25 +0900 Subject: [PATCH 342/369] python312Packages.upass: 0.2.1 -> 0.3.0 Diff: https://github.com/Kwpolska/upass/compare/v0.2.1...v0.3.0 --- pkgs/development/python-modules/upass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 7e82256d3917..217f09035f1b 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "upass"; - version = "0.2.1"; + version = "0.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Kwpolska"; repo = "upass"; rev = "v${version}"; - sha256 = "0bgplq07dmlld3lp6jag1w055glqislfgwwq2k7cb2bzjgvysdnj"; + sha256 = "sha256-IlNqPmDaRZ3yRV8O6YKjQkZ3fKNcFgzJHtIX0ADrOyU="; }; propagatedBuildInputs = [ From 7f89e114e215c7f198bfb4a4f4b2f8f3a06b18ad Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 3 Nov 2024 00:24:54 +0900 Subject: [PATCH 343/369] python312Packages.upass: switch to pypa builder --- pkgs/development/python-modules/upass/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index 217f09035f1b..616afc78bcd4 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -4,21 +4,24 @@ fetchFromGitHub, pyperclip, urwid, + setuptools, }: buildPythonPackage rec { pname = "upass"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Kwpolska"; repo = "upass"; rev = "v${version}"; - sha256 = "sha256-IlNqPmDaRZ3yRV8O6YKjQkZ3fKNcFgzJHtIX0ADrOyU="; + hash = "sha256-IlNqPmDaRZ3yRV8O6YKjQkZ3fKNcFgzJHtIX0ADrOyU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ pyperclip urwid ]; From 6dff44868c482270fe4587911718df3d6ecc2fa7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Nov 2024 16:26:43 +0100 Subject: [PATCH 344/369] python312Packages.rich-argparse: 1.5.2 -> 1.6.0 https://github.com/hamdanal/rich-argparse/blob/v1.6.0/CHANGELOG.md --- .../development/python-modules/rich-argparse/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/rich-argparse/default.nix b/pkgs/development/python-modules/rich-argparse/default.nix index 4f11691266b3..061394e5fc3f 100644 --- a/pkgs/development/python-modules/rich-argparse/default.nix +++ b/pkgs/development/python-modules/rich-argparse/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "rich-argparse"; - version = "1.5.2"; + version = "1.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "hamdanal"; repo = "rich-argparse"; rev = "refs/tags/v${version}"; - hash = "sha256-kHGNjVx3d+JSsN/BpNua2rGD5S5sBfJvh1NyqQnziBI="; + hash = "sha256-ae++npgZ8jZazwARwlPw73uhpQ8IT+7OekNl2vfu4Z0="; }; build-system = [ hatchling ]; @@ -28,11 +28,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; - disabledTests = [ - # https://github.com/hamdanal/rich-argparse/issues/133 - "test_help_preview_generation" - ]; - pythonImportsCheck = [ "rich_argparse" ]; meta = with lib; { From 7f3ce4934cf9a3fcb70b769917b6715572efdd10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Sep 2024 01:14:03 +0000 Subject: [PATCH 345/369] notesnook: 3.0.16 -> 3.0.19 --- pkgs/applications/misc/notesnook/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/notesnook/default.nix b/pkgs/applications/misc/notesnook/default.nix index 8f3cb528722d..e99f4553b925 100644 --- a/pkgs/applications/misc/notesnook/default.nix +++ b/pkgs/applications/misc/notesnook/default.nix @@ -2,7 +2,7 @@ let pname = "notesnook"; - version = "3.0.16"; + version = "3.0.19"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/streetwriters/notesnook/releases/download/v${version}/notesnook_${suffix}"; hash = { - x86_64-linux = "sha256-HywWk3MAWdRVaQyimlQJCFsgydXdE0VSLWliZT7f8w0="; - x86_64-darwin = "sha256-GgZVVt1Gm95/kyI/q99fZ9BIN+5kpxumcSJ9BexfARc="; - aarch64-darwin = "sha256-ldg+bVROm/XzACCmiMapMQf3f6le9FHzt18QcaH8TxA="; + x86_64-linux = "sha256-yCzREyFyGoAPXVVnNX6GUrr83oaPtoNOgZOOd6vJD1Q="; + x86_64-darwin = "sha256-WciEpt0vUuXS6YeZkbyFGqQaotXoZkWnkkn5B6/JXwE="; + aarch64-darwin = "sha256-iP3Xd/otYEVwU85U2dlFcX9QjDq2CbIqHmcDYVxzqzI="; }.${system} or throwSystem; }; From 5799b968e3c8f3da606f5bca7b4e03c7a147f836 Mon Sep 17 00:00:00 2001 From: Dane Rieber Date: Sat, 2 Nov 2024 12:07:35 -0500 Subject: [PATCH 346/369] mantainers: rename danerieber -> computerdane --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/os-specific/linux/universal-pidff/default.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6fd827cd72b9..86ba6402a342 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4368,6 +4368,12 @@ githubId = 18414241; name = "Andreas Erdes"; }; + computerdane = { + email = "danerieber@gmail.com"; + github = "computerdane"; + githubId = 6487079; + name = "Dane Rieber"; + }; confus = { email = "con-f-use@gmx.net"; github = "con-f-use"; @@ -4766,12 +4772,6 @@ githubId = 24708079; name = "Dan Eads"; }; - danerieber = { - email = "danerieber@gmail.com"; - github = "danerieber"; - githubId = 6487079; - name = "Dane Rieber"; - }; danid3v = { email = "sch220233@spengergasse.at"; github = "DaniD3v"; diff --git a/pkgs/os-specific/linux/universal-pidff/default.nix b/pkgs/os-specific/linux/universal-pidff/default.nix index 3325735c279b..e073d5a01ff6 100644 --- a/pkgs/os-specific/linux/universal-pidff/default.nix +++ b/pkgs/os-specific/linux/universal-pidff/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/JacKeTUs/universal-pidff"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - danerieber + computerdane racci ]; platforms = lib.platforms.linux; From cd4ebf6c8178227ad7e68392ef821a5c5850ac29 Mon Sep 17 00:00:00 2001 From: Florian Sanders Date: Thu, 24 Oct 2024 20:49:28 +0200 Subject: [PATCH 347/369] clever-tools: 3.8.3 -> 3.9.0 --- pkgs/by-name/cl/clever-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index ddea9886a888..bdd81a849fef 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -10,7 +10,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "3.8.3"; + version = "3.9.0"; nodejs = nodejs_18; @@ -18,10 +18,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-70wyu8+Jb9kR5lIucBZG9UWIufMhsgMBMkT2ohGvE50="; + hash = "sha256-nSTcJIZO/CMliAYFUGu/oA+VdtONDPwyj6vCr5Ry6ac="; }; - npmDepsHash = "sha256-LljwS6Rd/8WnGpxSHwCr87KWLaRR2i7sMdUuuprYiOE="; + npmDepsHash = "sha256-+3/zSsO5+s1MUome3CQ1p1tN3OtWp+XE9Z6GSdDiRh8="; dontNpmBuild = true; From d8b13b8f8b6178a60d3e39d230d94f580f00f565 Mon Sep 17 00:00:00 2001 From: Florian Sanders Date: Sat, 26 Oct 2024 18:32:06 +0200 Subject: [PATCH 348/369] clever-tools: rely on bundled package generated through the build script --- pkgs/by-name/cl/clever-tools/package.nix | 32 ++++++++++++++---------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index bdd81a849fef..ca7b6fa5c617 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, nodejs_18, installShellFiles, + makeWrapper, stdenv, }: @@ -23,22 +24,27 @@ buildNpmPackage rec { npmDepsHash = "sha256-+3/zSsO5+s1MUome3CQ1p1tN3OtWp+XE9Z6GSdDiRh8="; - dontNpmBuild = true; + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; - nativeBuildInputs = [ installShellFiles ]; + installPhase = '' + mkdir -p $out/bin $out/lib/clever-tools + cp build/clever.cjs $out/lib/clever-tools/clever.cjs - makeWrapperArgs = [ "--set NO_UPDATE_NOTIFIER true" ]; + makeWrapper ${nodejs}/bin/node $out/bin/clever \ + --add-flags "$out/lib/clever-tools/clever.cjs" \ + --set NO_UPDATE_NOTIFIER true - postInstall = - lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd clever \ - --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \ - --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever) - '' - + '' - rm $out/bin/install-clever-completion - rm $out/bin/uninstall-clever-completion - ''; + runHook postInstall + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd clever \ + --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \ + --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever) + ''; meta = with lib; { homepage = "https://github.com/CleverCloud/clever-tools"; From 846b85f734a46d7f6770cfe93327a6adacf951fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 2 Nov 2024 18:49:41 +0100 Subject: [PATCH 349/369] python312Packages.mobly: disable failing tests on darwin These tests want to access pgrep, which is in /usr/bin, but the sandbox has no permission to acccess it. --- pkgs/development/python-modules/mobly/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/mobly/default.nix b/pkgs/development/python-modules/mobly/default.nix index dc76a6d6ea09..c4d400cae107 100644 --- a/pkgs/development/python-modules/mobly/default.nix +++ b/pkgs/development/python-modules/mobly/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -47,6 +48,13 @@ buildPythonPackage rec { pytz ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # cannot access /usr/bin/pgrep from the sandbox + "test_stop_standing_subproc" + "test_stop_standing_subproc_and_descendants" + "test_stop_standing_subproc_without_pipe" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { From 1bbd3d6981730ecac13e9002e8c59687a78d6445 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 12:56:57 +0400 Subject: [PATCH 350/369] telegram-desktop: update dependencies Quite a lot of current dependencies are not used by the application while some new optional dependencies are missing leading to subpar UX --- .../telegram/telegram-desktop/default.nix | 70 ++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 31 insertions(+), 41 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index ce4fb65c143f..dd523a820c04 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,48 +1,42 @@ { lib +, stdenv , fetchFromGitHub , callPackage , pkg-config , cmake , ninja +, clang +, lld , python3 -, gobject-introspection -, wrapGAppsHook3 , wrapQtAppsHook -, extra-cmake-modules , qtbase -, qtwayland -, qtsvg , qtimageformats -, gtk3 -, glib-networking -, boost -, fmt -, libdbusmenu +, qtsvg +, qtwayland +, kcoreaddons , lz4 , xxHash , ffmpeg +, protobuf , openalSoft , minizip , libopus , alsa-lib , libpulseaudio -, pipewire , range-v3 , tl-expected , hunspell -, webkitgtk_4_1 +, gobject-introspection , jemalloc , rnnoise -, protobuf -, abseil-cpp -, xdg-utils , microsoft-gsl -, rlottie +, boost , ada -, stdenv -, darwin -, lld +, wrapGAppsHook3 +, glib-networking +, webkitgtk_4_1 , libicns +, darwin , nix-update-script }: @@ -89,9 +83,11 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster ''; - # We want to run wrapProgram manually (with additional parameters) + # Avoid double-wrapping dontWrapGApps = true; - dontWrapQtApps = true; + + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.hostPlatform.isDarwin; nativeBuildInputs = [ pkg-config @@ -100,18 +96,18 @@ stdenv.mkDerivation (finalAttrs: { python3 wrapQtAppsHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + # to build bundled libdispatch + clang gobject-introspection wrapGAppsHook3 - extra-cmake-modules ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; buildInputs = [ qtbase - qtsvg qtimageformats - boost + qtsvg lz4 xxHash ffmpeg @@ -121,23 +117,20 @@ stdenv.mkDerivation (finalAttrs: { range-v3 tl-expected rnnoise - protobuf tg_owt microsoft-gsl - rlottie + boost ada ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + protobuf qtwayland - gtk3 - glib-networking - fmt - libdbusmenu + kcoreaddons alsa-lib libpulseaudio - pipewire hunspell - webkitgtk_4_1 jemalloc + glib-networking + webkitgtk_4_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation @@ -190,14 +183,11 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} ''; - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - # This is necessary to run Telegram in a pure environment. - # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ - "''${gappsWrapperArgs[@]}" \ - "''${qtWrapperArgs[@]}" \ - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 926c9e76ecc6..d2da22ddbb44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32608,7 +32608,7 @@ with pkgs; taskopen = callPackage ../applications/misc/taskopen { }; - telegram-desktop = qt6Packages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { + telegram-desktop = kdePackages.callPackage ../applications/networking/instant-messengers/telegram/telegram-desktop { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; From d33abd9e24a2b6bf7a47bb3bb228d32f18594e68 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 1 Nov 2024 19:42:57 +0400 Subject: [PATCH 351/369] telegram-desktop: allow to build without webkitgtk --- .../telegram/telegram-desktop/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index dd523a820c04..7fa26993abaf 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -32,6 +32,7 @@ , microsoft-gsl , boost , ada +, withWebKitGTK ? true , wrapGAppsHook3 , glib-networking , webkitgtk_4_1 @@ -76,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' + '' + lib.optionalString (stdenv.hostPlatform.isLinux && withWebKitGTK) '' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp \ --replace-fail '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"' '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -99,6 +101,7 @@ stdenv.mkDerivation (finalAttrs: { # to build bundled libdispatch clang gobject-introspection + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [ wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ lld @@ -129,6 +132,7 @@ stdenv.mkDerivation (finalAttrs: { libpulseaudio hunspell jemalloc + ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withWebKitGTK) [ glib-networking webkitgtk_4_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ @@ -183,7 +187,7 @@ stdenv.mkDerivation (finalAttrs: { ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} ''; - preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + preFixup = lib.optionalString (stdenv.hostPlatform.isLinux && withWebKitGTK) '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; From cc6100fee5028096d6704d4765f9b4c6ab5389eb Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 13:00:01 +0400 Subject: [PATCH 352/369] telegram-desktop.tg_owt: remove cmake flags set to default values --- .../instant-messengers/telegram/telegram-desktop/tg_owt.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 425b82f15d9b..ac4adb4fc24a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -113,11 +113,6 @@ stdenv.mkDerivation { libvpx ]; - cmakeFlags = [ - # Building as a shared library isn't officially supported and may break at any time. - (lib.cmakeBool "BUILD_SHARED_LIBS" false) - ]; - passthru.updateScript = unstableGitUpdater { }; meta = { From b7565900d7a9b838add129c2d5c60bd750e137fb Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 13:01:10 +0400 Subject: [PATCH 353/369] telegram-desktop.tg_owt: use hash --- .../instant-messengers/telegram/telegram-desktop/tg_owt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index ac4adb4fc24a..62375aa48312 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { owner = "desktop-app"; repo = "tg_owt"; rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8"; - sha256 = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; + hash = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; fetchSubmodules = true; }; From 3cf059eafdde56c0099e757a82d046671e029d75 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 30 Oct 2024 13:02:11 +0400 Subject: [PATCH 354/369] telegram-desktop.tg_owt: update dependencies Quite a lot of current dependencies are not used by the library while some new optional dependencies are missing leadin g to subpar UX This also makes all dependencies propagated as that is logical for a static library --- .../telegram/telegram-desktop/tg_owt.nix | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 62375aa48312..a0847b98139e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -5,29 +5,31 @@ fetchpatch2, pkg-config, cmake, - crc32c, + ninja, python3, libjpeg, openssl, libopus, ffmpeg, openh264, + crc32c, libvpx, - libXi, - libXfixes, + libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, + libXi, glib, abseil-cpp, pipewire, mesa, + libdrm, libGL, - unstableGitUpdater, darwin, + unstableGitUpdater, }: stdenv.mkDerivation { @@ -54,36 +56,50 @@ stdenv.mkDerivation { }) ]; + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ + --replace-fail '"libEGL.so.1"' '"${lib.getLib libGL}/lib/libEGL.so.1"' \ + --replace-fail '"libGL.so.1"' '"${lib.getLib libGL}/lib/libGL.so.1"' \ + --replace-fail '"libgbm.so.1"' '"${lib.getLib mesa}/lib/libgbm.so.1"' \ + --replace-fail '"libdrm.so.2"' '"${lib.getLib libdrm}/lib/libdrm.so.2"' + ''; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ - cmake pkg-config + cmake + ninja python3 ]; - buildInputs = + propagatedBuildInputs = [ - openssl libjpeg + openssl libopus ffmpeg + openh264 + crc32c + libvpx + abseil-cpp ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - glib - libXi + libX11 + libXtst libXcomposite libXdamage libXext - libXfixes libXrender libXrandr - libXtst + libXi + glib pipewire mesa + libdrm libGL ] ++ lib.optionals stdenv.hostPlatform.isDarwin ( @@ -99,6 +115,7 @@ stdenv.mkDerivation { VideoToolbox CoreGraphics CoreVideo + OpenGL Metal MetalKit CoreFoundation @@ -106,13 +123,6 @@ stdenv.mkDerivation { ] ); - propagatedBuildInputs = [ - abseil-cpp - crc32c - openh264 - libvpx - ]; - passthru.updateScript = unstableGitUpdater { }; meta = { From 60db589a7cc1c95850beef136267808c9d1bf772 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 31 Oct 2024 16:05:07 +0400 Subject: [PATCH 355/369] kotatogram-desktop: override telegram-desktop's tg_owt derivation --- .../telegram/kotatogram-desktop/default.nix | 17 ++- .../telegram/kotatogram-desktop/tg_owt.nix | 111 ------------------ 2 files changed, 15 insertions(+), 113 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 6b2727c7267e..0b52d3f38a7e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -7,6 +7,7 @@ , ninja , clang , lld +, yasm , python3 , wrapQtAppsHook , removeReferencesTo @@ -37,10 +38,22 @@ }: let - tg_owt = callPackage ./tg_owt.nix { + tg_owt = (callPackage ../telegram-desktop/tg_owt.nix { # tg_owt should use the same compiler inherit stdenv; - }; + }).overrideAttrs(oldAttrs: { + version = "0-unstable-2024-06-15"; + + src = fetchFromGitHub { + owner = "desktop-app"; + repo = "tg_owt"; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + hash = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; + fetchSubmodules = true; + }; + + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ]; + }); mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; in diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix deleted file mode 100644 index 40dda5c25347..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch2 -, pkg-config -, cmake -, ninja -, yasm -, libjpeg -, openssl -, libopus -, ffmpeg -, openh264 -, crc32c -, libvpx -, libX11 -, libXtst -, libXcomposite -, libXdamage -, libXext -, libXrender -, libXrandr -, libXi -, glib -, abseil-cpp -, pipewire -, mesa -, libdrm -, libGL -, darwin -}: - -stdenv.mkDerivation { - pname = "tg_owt"; - version = "0-unstable-2024-06-15"; - - src = fetchFromGitHub { - owner = "desktop-app"; - repo = "tg_owt"; - rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; - hash = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; - fetchSubmodules = true; - }; - - patches = [ - # Remove usage of AVCodecContext::reordered_opaque - (fetchpatch2 { - name = "webrtc-ffmpeg-7.patch"; - url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; - decode = "base64 -d"; - stripLen = 1; - extraPrefix = "src/"; - hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU="; - }) - ]; - - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ - --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ - --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ - --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \ - --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"' - ''; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config cmake ninja yasm ]; - - propagatedBuildInputs = [ - libjpeg - openssl - libopus - ffmpeg - openh264 - crc32c - libvpx - abseil-cpp - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXtst - libXcomposite - libXdamage - libXext - libXrender - libXrandr - libXi - glib - pipewire - mesa - libdrm - libGL - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Cocoa - AppKit - IOKit - IOSurface - Foundation - AVFoundation - CoreMedia - VideoToolbox - CoreGraphics - CoreVideo - OpenGL - Metal - MetalKit - CoreFoundation - ApplicationServices - ]); - - meta.license = lib.licenses.bsd3; -} From 44e8a1e25af2736616e7902712bf9c596cf1a832 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 31 Oct 2024 16:27:00 +0400 Subject: [PATCH 356/369] kotatogram-desktop: override telegram-desktop's derivation --- .../telegram/kotatogram-desktop/default.nix | 161 +----------------- .../telegram/telegram-desktop/default.nix | 7 +- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 9 insertions(+), 161 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 0b52d3f38a7e..cf5566dccdbf 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -2,42 +2,13 @@ , stdenv , fetchFromGitHub , callPackage -, pkg-config -, cmake -, ninja -, clang -, lld +, libsForQt5 , yasm -, python3 -, wrapQtAppsHook -, removeReferencesTo -, qtbase -, qtimageformats -, qtsvg -, qtwayland -, kcoreaddons -, lz4 -, xxHash -, ffmpeg -, protobuf -, openalSoft -, minizip -, libopus -, alsa-lib -, libpulseaudio -, range-v3 -, tl-expected -, hunspell -, gobject-introspection -, jemalloc -, rnnoise -, microsoft-gsl -, boost -, libicns -, darwin }: -let +(libsForQt5.callPackage ../telegram-desktop/default.nix { + inherit stdenv; + tg_owt = (callPackage ../telegram-desktop/tg_owt.nix { # tg_owt should use the same compiler inherit stdenv; @@ -55,9 +26,8 @@ let nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ]; }); - mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; -in -stdenv.mkDerivation rec { + withWebKitGTK = false; +}).overrideAttrs { pname = "kotatogram-desktop"; version = "1.4.9-unstable-2024-09-27"; @@ -75,125 +45,7 @@ stdenv.mkDerivation rec { ./macos-qt5.patch ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ - --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ - --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ - --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ - --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster - ''; - - # Wrapping the inside of the app bundles, avoiding double-wrapping - dontWrapQtApps = stdenv.hostPlatform.isDarwin; - - nativeBuildInputs = [ - pkg-config - cmake - ninja - python3 - wrapQtAppsHook - removeReferencesTo - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - # to build bundled libdispatch - clang - gobject-introspection - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - lld - ]; - - buildInputs = [ - qtbase - qtimageformats - qtsvg - lz4 - xxHash - ffmpeg - openalSoft - minizip - libopus - range-v3 - tl-expected - rnnoise - tg_owt - microsoft-gsl - boost - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - protobuf - qtwayland - kcoreaddons - alsa-lib - libpulseaudio - hunspell - jemalloc - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Cocoa - CoreFoundation - CoreServices - CoreText - CoreGraphics - CoreMedia - OpenGL - AudioUnit - ApplicationServices - Foundation - AGL - Security - SystemConfiguration - Carbon - AudioToolbox - VideoToolbox - VideoDecodeAcceleration - AVFoundation - CoreAudio - CoreVideo - CoreMediaIO - QuartzCore - AppKit - CoreWLAN - WebKit - IOKit - GSS - MediaPlayer - IOSurface - Metal - NaturalLanguage - libicns - ]); - - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; - - cmakeFlags = [ - "-DTDESKTOP_API_TEST=ON" - ]; - - installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - cp -r ${mainProgram}.app $out/Applications - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} - ''; - - preFixup = '' - remove-references-to -t ${stdenv.cc.cc} $out/bin/${mainProgram} - remove-references-to -t ${microsoft-gsl} $out/bin/${mainProgram} - remove-references-to -t ${tg_owt.dev} $out/bin/${mainProgram} - ''; - - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} - ''; - - passthru = { - inherit tg_owt; - }; - meta = with lib; { - inherit mainProgram; description = "Kotatogram – experimental Telegram Desktop fork"; longDescription = '' Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. @@ -205,5 +57,6 @@ stdenv.mkDerivation rec { homepage = "https://kotatogram.github.io"; changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; maintainers = with maintainers; [ ilya-fedin ]; + mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 7fa26993abaf..c4de1b979195 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -9,6 +9,7 @@ , lld , python3 , wrapQtAppsHook +, tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; } , qtbase , qtimageformats , qtsvg @@ -48,12 +49,6 @@ # - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD # - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template -let - tg_owt = callPackage ./tg_owt.nix { - # tg_owt should use the same compiler - inherit stdenv; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; version = "5.6.3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2da22ddbb44..678574454fc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30285,7 +30285,7 @@ with pkgs; kondo = callPackage ../applications/misc/kondo { }; - kotatogram-desktop = libsForQt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { + kotatogram-desktop = callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv; From 87e3f9d9377dd12c760b9f1919511e08911b207d Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 1 Nov 2024 17:54:48 +0400 Subject: [PATCH 357/369] kotatogram-desktop: fix build with new glib --- .../telegram/kotatogram-desktop/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index cf5566dccdbf..ad1173be2ed1 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , callPackage , libsForQt5 , yasm @@ -43,6 +44,12 @@ ./macos.patch ./macos-opengl.patch ./macos-qt5.patch + (fetchpatch { + url = "https://gitlab.com/mnauw/cppgir/-/commit/c8bb1c6017a6f7f2e47bd10543aea6b3ec69a966.patch"; + stripLen = 1; + extraPrefix = "cmake/external/glib/cppgir/"; + hash = "sha256-8B4h3BTG8dIlt3+uVgBI569E9eCebcor9uohtsrZpnI="; + }) ]; meta = with lib; { From b241aedce647585af3f268ab987eef02a32e9853 Mon Sep 17 00:00:00 2001 From: Tomo Date: Sat, 2 Nov 2024 02:21:10 +0000 Subject: [PATCH 358/369] docear: drop Upstream itself says it is not actively developed: https://docear.org/2017/10/05/update-for-the-google-scholar-parser-library-to-fetch-metadata-for-pdf-files/ The sole Nixpkgs maintainer has not used Docear in 4 years: https://github.com/NixOS/nixpkgs/pull/353043#discussion_r1826528473 --- .../manual/release-notes/rl-2411.section.md | 3 ++ pkgs/applications/office/docear/default.nix | 45 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 pkgs/applications/office/docear/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 6e3fd6844f03..0ebd2e9dd818 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -391,6 +391,9 @@ - `services.pgbouncer` systemd service is configured with `Type=notify-reload` and allows reloading configuration without process restart. PgBouncer configuration options were moved to the free-form type option named [`services.pgbouncer.settings`](#opt-services.pgbouncer.settings) according to the NixOS RFC 0042. +- Docear was removed because it was unmaintained upstream. + JabRef, Zotero, or Mendeley are potential replacements. + - `nodePackages.coc-metals` was removed due to being deprecated upstream. `vimPlugins.nvim-metals` is its official replacement. diff --git a/pkgs/applications/office/docear/default.nix b/pkgs/applications/office/docear/default.nix deleted file mode 100644 index 3f0544d56f6e..000000000000 --- a/pkgs/applications/office/docear/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{lib, stdenv, fetchurl, runtimeShell, makeWrapper -, oraclejre -, antialiasFont ? true -}: - -stdenv.mkDerivation { - pname = "docear"; - version = "1.2"; - - src = fetchurl { - url = "http://docear.org/downloads/docear_linux.tar.gz"; - sha256 = "1g5n7r2x4gas6dl2fbyh7v9yxdcb6bzml8n3ldmpzv1rncgjcdp4"; - }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ oraclejre ]; - - buildPhase = ""; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share - cp -R * $out/share - chmod 0755 $out/share/ -R - - # The wrapper ensures oraclejre is used - makeWrapper ${runtimeShell} $out/bin/docear \ - --set _JAVA_OPTIONS "${lib.optionalString antialiasFont "-Dswing.aatext=TRUE -Dawt.useSystemAAFontSettings=on"}" \ - --set JAVA_HOME ${oraclejre.home} \ - --add-flags "$out/share/docear.sh" - - chmod 0755 $out/bin/docear - ''; - - meta = with lib; { - description = "Unique solution to academic literature management"; - homepage = "http://www.docear.org/"; - # Licenses at: http://www.docear.org/software/download/ - license = with licenses; [ - gpl2 # for the main software and some dependencies - bsd3 # for one of its dependencies - ]; - maintainers = with maintainers; [ unode ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1555b1df45b0..30b00916acf8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -273,6 +273,7 @@ mapAliases { dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07 dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17 dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14 + docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02 docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29 docker-distribution = distribution; # Added 2023-12-26 dolphin-emu-beta = dolphin-emu; # Added 2023-02-11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fc0201cb32f4..8c50b583ec75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6938,8 +6938,6 @@ with pkgs; docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; - docear = callPackage ../applications/office/docear { }; - dockbarx = callPackage ../applications/misc/dockbarx { }; dog = callPackage ../tools/system/dog { }; From 376509e0c5d329b1acd894f61f156ef143eeb212 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 2 Nov 2024 19:59:50 +0100 Subject: [PATCH 359/369] ffmpeg: disable xev{e,d} when under 7.1 The update to xev caused an incompatibility with ffmpeg 7.0 which broke handbrake's ffmpeg. Fixes https://github.com/NixOS/nixpkgs/issues/353072 --- pkgs/development/libraries/ffmpeg/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 28a08cb0d2f5..7569b8c72f10 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -135,8 +135,8 @@ , withXcbShape ? withFullDeps # X11 grabbing shape rendering , withXcbShm ? withFullDeps # X11 grabbing shm communication , withXcbxfixes ? withFullDeps # X11 grabbing mouse rendering -, withXevd ? withFullDeps && lib.versionAtLeast version "7" && !xevd.meta.broken # MPEG-5 EVC decoding -, withXeve ? withFullDeps && lib.versionAtLeast version "7" && !xeve.meta.broken # MPEG-5 EVC encoding +, withXevd ? withFullDeps && lib.versionAtLeast version "7.1" && !xevd.meta.broken # MPEG-5 EVC decoding +, withXeve ? withFullDeps && lib.versionAtLeast version "7.1" && !xeve.meta.broken # MPEG-5 EVC encoding , withXlib ? withFullDeps # Xlib support , withXml2 ? withFullDeps # libxml2 support, for IMF and DASH demuxers , withXvid ? withHeadlessDeps && withGPL # Xvid encoder, native encoder exists From e5a0b0c39efbd7cbe9f94c34c9234c3b6dd8beca Mon Sep 17 00:00:00 2001 From: Tomo Date: Sat, 2 Nov 2024 18:11:06 +0000 Subject: [PATCH 360/369] sqldeveloper: drop sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support. --- .../manual/release-notes/rl-2411.section.md | 3 + .../tools/database/sqldeveloper/default.nix | 84 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 4 files changed, 4 insertions(+), 88 deletions(-) delete mode 100644 pkgs/development/tools/database/sqldeveloper/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 0ebd2e9dd818..75d9dcfa235f 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -498,6 +498,9 @@ - PPD files for Utax printers got renamed (spaces replaced by underscores) in newest `foomatic-db` package; users of Utax printers might need to adapt their `hardware.printers.ensurePrinters.*.model` value. +- `sqldeveloper` was dropped due to being severely out-of-date and having a dependency on + JavaFX for Java 8, which we do not support. + - The `kvdo` kernel module package was removed, because it was upstreamed in kernel version 6.9, where it is called `dm-vdo`. - `libe57format` has been updated to `>= 3.0.0`, which contains some backward-incompatible API changes. See the [release note](https://github.com/asmaloney/libE57Format/releases/tag/v3.0.0) for more details. diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix deleted file mode 100644 index 655156c176c6..000000000000 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: - -let - version = "20.4.0.379.2205"; - - desktopItem = makeDesktopItem { - name = "sqldeveloper"; - exec = "sqldeveloper"; - icon = "sqldeveloper"; - desktopName = "Oracle SQL Developer"; - genericName = "Oracle SQL Developer"; - comment = "Oracle's Oracle DB GUI client"; - categories = [ "Development" ]; - }; -in - stdenv.mkDerivation { - - inherit version; - pname = "sqldeveloper"; - - src = requireFile rec { - name = "sqldeveloper-${version}-no-jre.zip"; - url = "https://www.oracle.com/tools/downloads/sqldev-downloads.html"; - message = '' - This Nix expression requires that ${name} already be part of the store. To - obtain it you need to - - - navigate to ${url} - - make sure that it says "Version ${version}" above the list of downloads - - if it does not, click on the "Previous Version" link below the downloads - and repeat until the version is correct. This is necessarry because as the - time of this writing there exists no permanent link for the current version - yet. - Also consider updating this package yourself (you probably just need to - change the `version` variable and update the sha256 to the one of the - new file) or opening an issue at the nixpkgs repo. - - accept the license agreement - - download the file listed under "Other Platforms" - - sign in or create an oracle account if neccessary - - and then add the file to the Nix store using either: - - nix-store --add-fixed sha256 ${name} - - or - - nix-prefetch-url --type sha256 file:///path/to/${name} - ''; - sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k"; - }; - - nativeBuildInputs = [ makeWrapper unzip ]; - - unpackCmd = "unzip $curSrc"; - - installPhase = '' - mkdir -p $out/libexec $out/share/{applications,pixmaps} - mv * $out/libexec/ - - mv $out/libexec/icon.png $out/share/pixmaps/sqldeveloper.png - cp ${desktopItem}/share/applications/* $out/share/applications - - makeWrapper $out/libexec/sqldeveloper/bin/sqldeveloper $out/bin/sqldeveloper \ - --set JAVA_HOME ${jdk.home} \ - --chdir "$out/libexec/sqldeveloper/bin" - ''; - - meta = with lib; { - description = "Oracle's Oracle DB GUI client"; - longDescription = '' - Oracle SQL Developer is a free integrated development environment that - simplifies the development and management of Oracle Database in both - traditional and Cloud deployments. SQL Developer offers complete - end-to-end development of your PL/SQL applications, a worksheet for - running queries and scripts, a DBA console for managing the database, - a reports interface, a complete data modeling solution, and a migration - platform for moving your 3rd party databases to Oracle. - ''; - homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/"; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ ardumont ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 30b00916acf8..00ae5e1dbca9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1114,6 +1114,7 @@ mapAliases { spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07 spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17 + sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02 srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c50b583ec75..2e47a9b6b669 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15706,10 +15706,6 @@ with pkgs; spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; - sqldeveloper = callPackage ../development/tools/database/sqldeveloper { - jdk = oraclejdk; - }; - sqlfluff = callPackage ../development/tools/database/sqlfluff { }; sqlx-cli = callPackage ../development/tools/rust/sqlx-cli { From ddf557de7d45fd255eead834765e2a43ac124ccb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 2 Nov 2024 17:28:01 -0300 Subject: [PATCH 361/369] earlyoom: remove AndersonTorres from maintainers (#353091) --- pkgs/by-name/ea/earlyoom/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ea/earlyoom/package.nix b/pkgs/by-name/ea/earlyoom/package.nix index 9452bbfabf79..fead6ff586e0 100644 --- a/pkgs/by-name/ea/earlyoom/package.nix +++ b/pkgs/by-name/ea/earlyoom/package.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.mit; mainProgram = "earlyoom"; - maintainers = with lib.maintainers; [ AndersonTorres ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.linux; }; }) From a5337b56fe644823e36acb7d59859c50056a377d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D1=80=D0=B0=D1=81=D1=85=D0=BE=D0=B4=D0=BD=D1=8B=D0=B9=20?= =?UTF-8?q?=D0=BC=D0=B0=D1=82=D0=B5=D1=80=D0=B8=D0=B0=D0=BB?= <78630225+aucub@users.noreply.github.com> Date: Sun, 3 Nov 2024 04:30:34 +0800 Subject: [PATCH 362/369] keyguard: 1.6.3 -> 1.6.4 (#353089) --- pkgs/by-name/ke/keyguard/deps.json | 1497 +++++++++++++------------- pkgs/by-name/ke/keyguard/package.nix | 6 +- 2 files changed, 753 insertions(+), 750 deletions(-) diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index d1b62fc29aae..be2e151a0f94 100644 --- a/pkgs/by-name/ke/keyguard/deps.json +++ b/pkgs/by-name/ke/keyguard/deps.json @@ -2,17 +2,17 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://dl.google.com/dl/android/maven2": { - "androidx/activity#activity-compose/1.9.2": { - "module": "sha256-L3Jdm3GUbZ9FBOfFp768M7TsW8hwoSUb/dU/C1Zh6AU=", - "pom": "sha256-nYzZFp0iXZ48bJm7kC2xEFVMs7k7o7x3FML8tVbFw8E=" + "androidx/activity#activity-compose/1.9.3": { + "module": "sha256-+yJYhGSGHiedZtpv4kxZed2jS2m4RNI4DIq2eYxTMPk=", + "pom": "sha256-atgGcvLdAuuB/Hzl3OtAYenAl64WJnU+qWtPtlA/vtA=" }, - "androidx/activity#activity-ktx/1.9.2": { - "module": "sha256-Qqkke3aD9azp/srepo8rvNlepY1FUZvOJtdtc53iGMA=", - "pom": "sha256-xZIpvS4BeGpFRMcpFhIRpW5HkB1igrNvhD9Nl6MdbZ4=" + "androidx/activity#activity-ktx/1.9.3": { + "module": "sha256-MdDatmPQTZEaZ1iJMfhrEBEx4RaWu3KJWn5WA3F6wkE=", + "pom": "sha256-PIx4xqu50vaIXtgfKh2FewFLGaapoi9J2UIFAr/aKlM=" }, - "androidx/activity#activity/1.9.2": { - "module": "sha256-S2Kjf0hP+BCeWd6kisd7QIjTXCORT6ga88Rk1X9eK3Q=", - "pom": "sha256-JUcFSQUnpNsEe7eiVUrxCpAqHnm0YYVqolAs3OMkz6M=" + "androidx/activity#activity/1.9.3": { + "module": "sha256-fmok3aIF4csenJb6Nf9vJhYICH8x0yPUz/QrlxbX7Vc=", + "pom": "sha256-Pz4I4X2rXwdPqB25eL2lYmH7l8+eGS8zN4mM/YAaajQ=" }, "androidx/annotation#annotation-experimental/1.4.0": { "module": "sha256-WTDqfyH8ttDesroydIoO98j9LEI4SGBYK6fNIN65A3k=", @@ -22,12 +22,8 @@ "module": "sha256-KsL3EG4S8mNCW0pN/ICYlEf7iVZ1/pAthnWap0/RK30=", "pom": "sha256-/leyKEF/TXxneQPcYftKfPmT1gNJneJtjYET5HfMTxs=" }, - "androidx/annotation#annotation-jvm/1.8.0": { - "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", - "module": "sha256-48tFJVOdDtdLsjjvksae7yKoDkIsDSrLxR5hh/67ChM=", - "pom": "sha256-2fkI7m1IgSSs7VVv2Ka6nf5kf+AUuFrXIhRhEQ0DI2E=" - }, "androidx/annotation#annotation-jvm/1.8.1": { + "jar": "sha256-mqsybZSSgAmRhUNgrCSPSTzn98MYNRkwm3is6eJA9vY=", "module": "sha256-yVnjsM3HXBXv4BYF+laqefAz45I44VBji4+r3mqhIaA=", "pom": "sha256-1JIDczqm+uBGw6PeTnlu7TR1lXVUhqZCc5iYRHWXULQ=" }, @@ -65,13 +61,13 @@ "module": "sha256-VFHhsAgBaOJG7jVICY7iuEIqAHJ0GbNNw/NpDAO0Yn4=", "pom": "sha256-oVX2W6cA2yGiyIHd/g99z4WnMUcoeSPETvC51N2WZWg=" }, - "androidx/baselineprofile#androidx.baselineprofile.gradle.plugin/1.3.1": { - "pom": "sha256-BZQd/om3Iydt0EQl9joNOQZ9U6yNrnZ2hVVE+yeG2J0=" + "androidx/baselineprofile#androidx.baselineprofile.gradle.plugin/1.3.3": { + "pom": "sha256-ZYnvXw+bO8zqaMR+RNqnvYR0dmDhZxBQj1Wrsj3TJJo=" }, - "androidx/benchmark#benchmark-baseline-profile-gradle-plugin/1.3.1": { - "jar": "sha256-qDNAO89ka3bXSbQlXCHP0L9BG+ze6XDoJqn7qpLqE1M=", - "module": "sha256-j+nuWr7IfgX4NI92+gTX5Fy10knaB+uP5rfmkHwKLKw=", - "pom": "sha256-8MJDjRGVCHvxGlOt3hCrSz6TIn+S0QTzCxlkYS8OiTI=" + "androidx/benchmark#benchmark-baseline-profile-gradle-plugin/1.3.3": { + "jar": "sha256-TKAH2ltb/dN0oyfjMhbFYHfAX/NYhltKisnly3xTQBE=", + "module": "sha256-vxES0J8aprPfr5fyPn2DxdGY+JXEQ0SOloN9xdtGVOk=", + "pom": "sha256-nk9XEP4o1qFmNDXO0Pdo1N7pOA9j62QL6oouHVDMnFY=" }, "androidx/biometric#biometric-ktx/1.4.0-alpha02": { "module": "sha256-XlftRi6dw2P0RWxLf6eFe48clA3vatawHCMKVts0x20=", @@ -85,29 +81,29 @@ "module": "sha256-sTorfGTA8vNJoZ31EjYO2RemP4lPw94peh/eT7KHVGw=", "pom": "sha256-jJ19VEqBvl8eje0qT/R0wn6V1S1Qj1nUeSker3/gM38=" }, - "androidx/camera#camera-camera2/1.4.0-rc02": { - "module": "sha256-e7qskKx5eh7Ec8PHdsnx/cjyaKt21Ztqaj/5/qYtPcE=", - "pom": "sha256-Ca7pMgvmMOHdD97SbHkeE6PQbauA+GENC3ermmwYMx8=" + "androidx/camera#camera-camera2/1.4.0": { + "module": "sha256-drgu7NQwOhjrk/GIkO+iBqZ4bbRA9QTEgjhRy83DJ64=", + "pom": "sha256-K+q0XeFlcncn4+U0xXOI5WHUPA6WYWqb+EzbNLOhhYM=" }, - "androidx/camera#camera-core/1.4.0-rc02": { - "module": "sha256-gyKCSex584MOAOFd/FJYrJzltXb9tW06Y6TFeYoMe08=", - "pom": "sha256-hBesMfgTAskpCwxCS6N7HnIKOWBu6t1hDyODnSG2u/E=" + "androidx/camera#camera-core/1.4.0": { + "module": "sha256-YhzS8TFlQWPLeWci6brGUre2718uWInyveyK3lrev+c=", + "pom": "sha256-kIxHGTVflkb/V2A1BFxYfUT/2KEozDnMkxn3jvex6Rk=" }, - "androidx/camera#camera-extensions/1.4.0-rc02": { - "module": "sha256-Q9AvfZley507mYg6cV3UtIYL6ZwnyHZj0TmciLEh+MA=", - "pom": "sha256-rEE+UkUV2cWt9pBDpfLMXQLO+V4nqtwEHemlXTWxN+0=" + "androidx/camera#camera-extensions/1.4.0": { + "module": "sha256-ynxFG03NNyf2nnQUFDULo9T8q4ZTLdVuXZe4EbH5FrE=", + "pom": "sha256-qYJFwM6WPQVNBP0G3wNxjmyeRo0vOJDqNqW5CZAUbSo=" }, - "androidx/camera#camera-lifecycle/1.4.0-rc02": { - "module": "sha256-FDsXoLZr5ofKp+4YdJVZZSpUAMvupFhGNchhYCDi4SU=", - "pom": "sha256-3zwhtXWt5sROsYvjv14Igf1xgAH48wvjYkW7pNtIRNc=" + "androidx/camera#camera-lifecycle/1.4.0": { + "module": "sha256-ZdPS2POtzpQ4VYFP6fqKXZTb9vQmQJVge9O6ntIAGpw=", + "pom": "sha256-xxDllk/kVcjZ9tNHsMLdhL1Jngi+URow4z5HU0AmKZg=" }, - "androidx/camera#camera-video/1.4.0-rc02": { - "module": "sha256-CAQlCz+9htdQyszZo+KudN/z9zl08UZDAP3vJl7WHuM=", - "pom": "sha256-BONbwyqWaimMwtOf2kxaQnIELakH/4PjSzpXgPiV0P0=" + "androidx/camera#camera-video/1.4.0": { + "module": "sha256-mRe3EQjOtA+wIaLhCq6JgiryhDqxyENHUGtORuBtGMw=", + "pom": "sha256-q6ysRQwBXzE3zctyAwsYUiq4svySo7b1UKAVQ/z2slU=" }, - "androidx/camera#camera-view/1.4.0-rc02": { - "module": "sha256-ux6LqBw/KaL0NWgVYvQct5c90BPyUGbp04SCk1uoFmI=", - "pom": "sha256-UZd9Y9bxx6LUZArxhBvI5b7gy9hiard07IyL1M9q6Yc=" + "androidx/camera#camera-view/1.4.0": { + "module": "sha256-SGpo2BPphB1W23EWWgvjo3GLQ9xw5ecWDhIUmaPJ1S8=", + "pom": "sha256-9y8oiFiMIJat0Od1nc1ae6VSfl7bkqd3h86MFXhOr40=" }, "androidx/collection#collection-jvm/1.4.0": { "jar": "sha256-1c97cmR8eZUHFYj+hwRQ/5yPEn8lPS1IUeFhuAD2euA=", @@ -127,8 +123,8 @@ "androidx/compose#compose-bom/2023.10.01": { "pom": "sha256-brBsrckwx2qUp+PRzAYIkCdbYUJ7lpM9YFT09kHrGeE=" }, - "androidx/compose#compose-bom/2024.09.02": { - "pom": "sha256-m5ChXj8Tf1b7enp9aA0xZOtCXgJxuGD+4JK7pDB6h4k=" + "androidx/compose#compose-bom/2024.09.03": { + "pom": "sha256-TKZnMx2PrMhga+MI04mkwAlNuS2zfdZGmYyLESYNCeY=" }, "androidx/compose/animation#animation-android/1.7.1": { "module": "sha256-PFi192N3vQUR991Qv2VSPh+eCB7BwqSSRnpVw3x7Blo=", @@ -344,9 +340,9 @@ "module": "sha256-UOPdyUI2kQ5hRYijrCmm/XZbg526DMWDmkmNMYKX+I8=", "pom": "sha256-0cNjxT33H8deP2ehdUeUSeDdlB9FQJ8HJ3zNLUXopmE=" }, - "androidx/core#core-ktx/1.13.1": { - "module": "sha256-q1MLBOL75zIFSEiZo75WyQlohz60lvxS5ep1ltkQNdE=", - "pom": "sha256-Mcw0W4xs3SBG3PZ4ct+KjLT0TqDK3k34AALKp+O3GAk=" + "androidx/core#core-ktx/1.15.0": { + "module": "sha256-vum0RmT/N+LiIuvN5LMOOClKP5J0Ue3GEf7H9FT/pEI=", + "pom": "sha256-QXxqoCeex42wL+OV1AGgm8qqnYLZNRSKPi3pD9842Uw=" }, "androidx/core#core-splashscreen/1.2.0-alpha02": { "module": "sha256-gcUBgXOMI2x53hhnAYoawlCY7PSjIv3QhkVl0rfRrww=", @@ -356,13 +352,13 @@ "module": "sha256-Lg5uXBIFt0YqDFw+MrWMLlJUNYEu2JlGx75nN0k7UeM=", "pom": "sha256-RQLk7YtZEiAhrJocExLiMm5LD0P37Lu8m1Dud0KVdNQ=" }, - "androidx/core#core/1.13.1": { - "module": "sha256-KhCXm7s7zXslt/Zkq06bAW+r8hdKJnaLZ34S5L6kx8Q=", - "pom": "sha256-Unq/pajWr3SLN+HAFi0WM6LV6kOHsCBai0NrYhS6HPY=" + "androidx/core#core/1.15.0": { + "module": "sha256-6KbDhuF2XYcAEv7SIhFz1KLo0v1a7HMsUa+0qfRoRRk=", + "pom": "sha256-4WiuVgZLjlpAvOQV75X/1agTq7VFbSd18P70Ju1J41o=" }, - "androidx/credentials#credentials/1.5.0-alpha05": { - "module": "sha256-LN+mg+VI9ezkQHH5B3GOQpO3fpNH+hrwG6wALIR7CJE=", - "pom": "sha256-Or+sYjmkkUkdm91MTdxs9Z/rGHWe0Kb2uaWL/BFhKgE=" + "androidx/credentials#credentials/1.5.0-beta01": { + "module": "sha256-B/L48LIEgtXMj6HP7M1/FnOaQck7ca721Av14yIQ950=", + "pom": "sha256-rj8bwK/teqKqSRlXbhAZ3avOawZ/i6dBA988BWd8y+g=" }, "androidx/cursoradapter#cursoradapter/1.0.0": { "pom": "sha256-YtlciYUK8hAwsZ8U1ffs1ti8yaMBTFkALsmWJMqsgQA=" @@ -370,13 +366,13 @@ "androidx/customview#customview/1.0.0": { "pom": "sha256-zp5HuHGE9b1eE56b7NWyZHbULXjDG/L97cN6y0G5rUk=" }, - "androidx/databinding#databinding-common/8.7.0": { + "androidx/databinding#databinding-common/8.7.2": { "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=", - "pom": "sha256-etTmwGJMO0eBWYYWQFMEuplOP77K/siKSjp7n7iG3aM=" + "pom": "sha256-AQGf9/Vhv2TVaegUbZt6csYkLy/b6toB+MgtUub0Js8=" }, - "androidx/databinding#databinding-compiler-common/8.7.0": { - "jar": "sha256-9MzA6vykpHvlv5ECCbmGrAkhtrW1LKob9KpSkA0kTt0=", - "pom": "sha256-zSUfiqqBlSb5RpTRRXf8VDOoGNA7FLGA2VdO78cYK0w=" + "androidx/databinding#databinding-compiler-common/8.7.2": { + "jar": "sha256-+BvLBHX5CY1U7RFBRSJY5Lk/4aihK14v97k7rKjicRQ=", + "pom": "sha256-2C3qfNGkIhr4HbOCWiEZBFM7SXrevHzN2GH6AESp/Y0=" }, "androidx/datastore#datastore-android/1.1.1": { "module": "sha256-cj7ozPSDglESIdoh4KPv3Nz1ix3kiU/drEBaFIERnCU=", @@ -416,114 +412,114 @@ "module": "sha256-rzJggI3OtlMu/C1yFb5Fhywkppna2n13v/c4zjuFp/A=", "pom": "sha256-+MoYd8ZuZCxVSQfhzlpJOol8opJwyxniu21CS6Q7bJg=" }, + "androidx/fragment#fragment/1.6.1": { + "module": "sha256-bXthnLEipKiiCSCHHbaohvOIQ/adLqqVISccLAi2NqA=", + "pom": "sha256-p7ITPxYF5+mMFRg27BYoyPBki4FWt3Yx8vIZbiTNOzA=" + }, "androidx/interpolator#interpolator/1.0.0": { "pom": "sha256-DdwHzDlpn0js2eyJS1gwwPCeIugpWSlO3zchciTIi3s=" }, "androidx/legacy#legacy-support-core-utils/1.0.0": { "pom": "sha256-j9CTAIs+58BuUseNoq+YCntHtpuWf6kdrXr0ZvegCjg=" }, - "androidx/lifecycle#lifecycle-common-jvm/2.8.6": { + "androidx/lifecycle#lifecycle-common-jvm/2.8.7": { "jar": "sha256-YchzpzJ8lG7AM8MQu5jz+S7qvO3g4aUgCrihiWSDx78=", - "module": "sha256-v8cWUtTFP6K8xNQV81odlVdxlmanhaGtYVtkGxgG5hQ=", - "pom": "sha256-eyfb/GATm8UCBnoPJovKa4lZl5oFpUu5Hq2euaMO//g=" + "module": "sha256-5IekwAfWq/KdAQg8M+KGls1Cz/z3FEidyR6Xw9QsYGA=", + "pom": "sha256-jwAH1nB0myxwwibXX+ODfGQ14bQANvHrgpB46QRhp+A=" }, - "androidx/lifecycle#lifecycle-common/2.8.6": { + "androidx/lifecycle#lifecycle-common/2.8.7": { "jar": "sha256-4mxtfQSkkMb9qhQVrJV5en3MdES+Pzqz2ayth9rkkhw=", - "module": "sha256-0CgJRRLgk9qZD6+uRvhrFOxzQdft+kVwneVRICfCLUo=", - "pom": "sha256-DWr4krkkdt+IY9YwIlSYET0zFKBiB4ILmV32e+MeAOk=" + "module": "sha256-DeePwG7lBF1o/H6BwxOio9U6x9En95+byVq/e+SeV2Q=", + "pom": "sha256-9Vz/SvKIUl1CXEZ43bNrqGRZH18O2huSIFZ8NshRO0k=" }, - "androidx/lifecycle#lifecycle-livedata-core-ktx/2.8.6": { - "module": "sha256-9xE2PFgyVHYR1BbIo6DcTmNi9K+wRQ0iuetXFlan+OU=", - "pom": "sha256-XGqveFJL0Qc92DnffeJLXrumDosGQOED7/GRvpsJ4tM=" + "androidx/lifecycle#lifecycle-livedata-core-ktx/2.8.7": { + "module": "sha256-PRiLtiL8uwIdk8wAfTxHfU9AKub1i3/EakQdCrcGeK0=", + "pom": "sha256-L+CUUbL5uqaNBcClSer9urSh5P69PvpHSraHXY5rJxw=" }, - "androidx/lifecycle#lifecycle-livedata-core/2.8.6": { - "module": "sha256-gkylmy7v2NtJMAvqT/afKNYfxFqK9ALlUVyJsvX7HCI=", - "pom": "sha256-uYdZtb80AXH4IGZnFnY6IoEhiPE63fygX+nfhJtIUtE=" + "androidx/lifecycle#lifecycle-livedata-core/2.8.7": { + "module": "sha256-sKHafx/jYGDseEfxlyhXokt9sp5s1FFuYsVSAAnYE8I=", + "pom": "sha256-5eML08Ctu0JGtP6vXTjgs+q25JWxJu6USX90kMo1FWo=" }, - "androidx/lifecycle#lifecycle-livedata-ktx/2.8.6": { - "module": "sha256-0g9Tn59yfEiiWd1gQSGzE4P594D4js0mKYbFc4XUfHU=", - "pom": "sha256-G9LZ96+nMgWYcC4ZoNG+EaAbNFlMyi0n239Bp1AtAz0=" + "androidx/lifecycle#lifecycle-livedata-ktx/2.8.7": { + "module": "sha256-QZCrI+E7vNbMP10HN7Rfg6QAQQR4Col8/YaX4CQhyJU=", + "pom": "sha256-kgv4IXw/1fkO03KmqIenBXnDiaHt3qoHiC7389ywPcc=" }, - "androidx/lifecycle#lifecycle-livedata/2.8.6": { - "module": "sha256-nOWJiUmAb5rhNuPZijI+Hg21HI+JJcaMCIp3/n70k+U=", - "pom": "sha256-8hb3WxZ6ZcoVWslLvQBt7wqY2SFZcM45gZY64kT5X+E=" + "androidx/lifecycle#lifecycle-livedata/2.8.7": { + "module": "sha256-1yUWz854vvZU/l30yZudq9GXgMlQUyaKbVtLDdotQyM=", + "pom": "sha256-0yTLeFE01Bl1dwkRj4biqI88wLIivYwjSV3by3qADKw=" }, - "androidx/lifecycle#lifecycle-process/2.8.6": { - "module": "sha256-csIIGfPJOQ+RrNnfj7yeYkbxvvTgj9UfeQ8BzaBArSw=", - "pom": "sha256-QCOkIKHiGSOrNWYx4s5wDgTlP9ykNaFJ3GUuIITmt+I=" + "androidx/lifecycle#lifecycle-process/2.8.7": { + "module": "sha256-mKHAjBDP1L2qienCVqm5bAnN1bz7sDqSYIF6bYnMI3g=", + "pom": "sha256-gbo66f/iWUvyGjXhgctTzns5bzV/fDy/++j906IzAzk=" }, - "androidx/lifecycle#lifecycle-runtime-android/2.8.6": { - "module": "sha256-kzdNZnU93hHZc12V5Y9PvJxXezJBjOCT5KOCIAfxJXE=", - "pom": "sha256-PgirDNhskFhYcxQroie35d1GlRsWRA8LT8o+vokFMfU=" + "androidx/lifecycle#lifecycle-runtime-android/2.8.7": { + "module": "sha256-TRs4gcmNQpNMuNXefIqeEgSVSaUUdxhkfXvmym2VjEY=", + "pom": "sha256-KMsZDeh94F08Gk92dNH0WLerk151z4O6KLFTm1+pPBo=" }, - "androidx/lifecycle#lifecycle-runtime-compose-android/2.8.6": { - "module": "sha256-EP6/9T6cZWTGGOd0pouKhYcN/SqUFe6/LV+oc+ARo2U=", - "pom": "sha256-bf2cbBp3F29E+yj+hW/mVzDHFWA2Qs1Q8+gLxYcBJrU=" + "androidx/lifecycle#lifecycle-runtime-compose-android/2.8.7": { + "module": "sha256-wCShZpTItcQeyO8O3iNl62Evij2iUBf98v80MCnzOQI=", + "pom": "sha256-DMi8bSk7qjYAj3HfaNrMZWx2D/6y8CsxNKY23LlHBeU=" }, - "androidx/lifecycle#lifecycle-runtime-compose-desktop/2.8.6": { - "jar": "sha256-ZR05Mr5ztRprhMzoiy7e7yGmr6YRGxgyfdB3Luw6HAo=", - "module": "sha256-8QsiOV9fXhpxteQqzt2qrIl+oRL0krO3Z0jysC+AP+I=", - "pom": "sha256-rx0/38DbtoYQOgB12MzK9Mt4DylAFZEEOMkF8s7MmII=" + "androidx/lifecycle#lifecycle-runtime-compose-jvmstubs/2.8.7": { + "jar": "sha256-+P5MfIt9nJzBfmA5L2T2FZD4WJU/WSNzqwyN3VrRGmg=", + "module": "sha256-5u7rnaQ7LvUAAI6coqmTMwDFfR0KoFyPO9MRMajSo1s=", + "pom": "sha256-iP5IfROOI3S8g8ZOBZyG3dG49V/45/7pHypoF9o7ot8=" }, - "androidx/lifecycle#lifecycle-runtime-compose/2.8.6": { - "jar": "sha256-Gs44yUcMeOiXHrzfjQOQvmQBD8hpp/08bl6vEDcOwbo=", - "module": "sha256-39DkQkEBKxPZVfF0Kr1O0YPKykHuCdXCzF/N0qJPCBk=", - "pom": "sha256-RbZBVmSy/2MkRlaDAgVFzKiJIB81rCswFYPjliyi+w0=" + "androidx/lifecycle#lifecycle-runtime-compose/2.8.7": { + "jar": "sha256-u1SJyb9WG3rdz/QXmxD5WbPUQaoPuuXC0kqQZZE/ohI=", + "module": "sha256-zJiohJ2B2rMGS8n/hx5D6RtI4Lp9Uh98mbomr+wlZXw=", + "pom": "sha256-zskvxmBNjuu5WJpsEdS75jYigPY62/hqns3GzD0UO6s=" }, - "androidx/lifecycle#lifecycle-runtime-desktop/2.8.6": { + "androidx/lifecycle#lifecycle-runtime-desktop/2.8.7": { "jar": "sha256-EL/lO7J1L5Z3UaUQLNt4Xu6lTh1N9r3oj7D1CwpJFWw=", - "module": "sha256-kq1WHlcSsxhBF7sMm4tES+8q0F5nZXR8n44VnEniHj8=", - "pom": "sha256-IY6pUIUJKL/ENIJv+OLr2X0XpCEbvwDDrNUelnc4SlE=" + "module": "sha256-1Av71SuALGpa8GMW9goihG5ljRLXw/xe+lqorJ1LAvo=", + "pom": "sha256-zvqomZ96sPTkSmm+lCK7LxJPBqYmZjQ+uus3fjCLlw4=" }, - "androidx/lifecycle#lifecycle-runtime-ktx-android/2.8.6": { - "module": "sha256-GEkqX9thU9CUKzZ9k2d4gAdCguPwXYm6W+erH92zSUk=", - "pom": "sha256-aw/cGAmhTDJyRutN5dou3tT/ibHMSitmV3K3Ug6pBJ8=" + "androidx/lifecycle#lifecycle-runtime-ktx-android/2.8.7": { + "module": "sha256-rcYVIeiU8WO+7jrtyMTA37WZFmO4jqHqd5j6yVaU4X0=", + "pom": "sha256-Htpm9jgGDNOY5EiW+TTCc/ADuejtNplc/fPrEx8HI2U=" }, - "androidx/lifecycle#lifecycle-runtime-ktx/2.8.6": { - "module": "sha256-bsekXvsY7kq/BTAqtTioEeRqzhEYpTCJ+C7DXwnh1QY=", - "pom": "sha256-kZTdaFi55iUSc4uisOLBVBtR32e+YSxHaob5zLyHEwE=" + "androidx/lifecycle#lifecycle-runtime-ktx/2.8.7": { + "module": "sha256-Ccbc8P7irWnFI9tsKjQxaKjZ6dJ3Q8+Etpx1e3/KskM=", + "pom": "sha256-sONluppAXk2pi58FCLmRzXb01aaCKQhHJMUFDied/BI=" }, - "androidx/lifecycle#lifecycle-runtime/2.8.6": { + "androidx/lifecycle#lifecycle-runtime/2.8.7": { "jar": "sha256-TueEUw5VB1QjA5XU9PVoF8n8vAjbTWRed0QfPdgsVrU=", - "module": "sha256-cfO/aHhz8W79hNrL46H0IdGWlQsi2aMO8wqRGfp8fOA=", - "pom": "sha256-YcWBu6Kgb5Y3B5XnzRrSfiyCvufTsqh1jeJT4pYWW0w=" + "module": "sha256-ywDly5KDt1lI3MDScjT7bXKoDDTct7O41JMYXkMWv4U=", + "pom": "sha256-YeEGnpk4pBTWv4OmwIjIpDaKJ6sjjmLvuN5E6dbqMfo=" }, - "androidx/lifecycle#lifecycle-viewmodel-android/2.8.6": { - "module": "sha256-fp3IlBPMdIWxRiHbXM8eEwZo8UY2iw/+ZuDzDNKqZQI=", - "pom": "sha256-RUUiujSKDyqMwil3K9v3JzxS0aQu0CS8je/OVdxT9nM=" + "androidx/lifecycle#lifecycle-viewmodel-android/2.8.7": { + "module": "sha256-sEmUzmfWmZQ4MW/0Gy3bhGE6ZLj4E5nvMHSJWtgQZdw=", + "pom": "sha256-s3waQR7rmHfw8leD0eyuz1ZWuEQsVEU4gEbmmqznxrA=" }, - "androidx/lifecycle#lifecycle-viewmodel-compose-android/2.8.6": { - "module": "sha256-JeRZ8PXWrPI80LwtFSzjlAfV8OpFlJ6BwsQAI/KUW8Y=", - "pom": "sha256-EK7C8fM984U3WZV4EQd/cBINVsfuLnm66vSGG0w2XqY=" + "androidx/lifecycle#lifecycle-viewmodel-compose-android/2.8.7": { + "module": "sha256-AysPqJLMBM7TnExfDHPloBSNoIR79L+3b8J14UPUjog=", + "pom": "sha256-TZIH05CtwnAzrm/o5nQefQ+DH4EQaIHf51o1y47mmAQ=" }, - "androidx/lifecycle#lifecycle-viewmodel-compose/2.8.6": { - "module": "sha256-IE/2DG0V2F/F3NykERxVr46JiTgkxBu3u+CAYj8NhRs=", - "pom": "sha256-SM5k+9vFkrDyhlWdrWnbYhx0q8ydapBv6McTZstw2H0=" + "androidx/lifecycle#lifecycle-viewmodel-compose/2.8.7": { + "module": "sha256-BRqR7t2IwYtSLEt7VA+TYQhe9EbyIjyhZYnZjtYmrHg=", + "pom": "sha256-7hQf0QJPhZOnqeLt7Ba8E50vj1X+/e4xSyVvBWLlq1w=" }, - "androidx/lifecycle#lifecycle-viewmodel-desktop/2.8.6": { + "androidx/lifecycle#lifecycle-viewmodel-desktop/2.8.7": { "jar": "sha256-IewOd9wC7Q1r/m88un9D4lQARG2J3thWjuFlQ34MGSI=", - "module": "sha256-wTRuA275rdk8d9bsI6BpBxGxErMYbi9b2HUJDQOCwxo=", - "pom": "sha256-+BLmr3NVnIgfejWPPN0ejd2GE4m3b2nomvRnqOBs8BA=" + "module": "sha256-WA2ZXD2wdDeY8sFz5jzxnIDUpxmZwgOaR2a2x8cQbWQ=", + "pom": "sha256-ohtgR3xEXNBIpmJuD2goSip9TJ0SEBATb07N8FqOa5E=" }, - "androidx/lifecycle#lifecycle-viewmodel-ktx/2.8.6": { - "module": "sha256-5cgGQ2qPGgZRkBPj41Hrlqc3Z6XjmQEpxxzetlL/4+8=", - "pom": "sha256-KJw1DgKA0MTpts9FuRJrItv+1E7myHHyM3dP1wwUQs0=" + "androidx/lifecycle#lifecycle-viewmodel-ktx/2.8.7": { + "module": "sha256-qZ49Ahjukr2o9cHr8l1IMrMB71gQYE4uluS2B+v2p/U=", + "pom": "sha256-kzgneQTN8EjY8dNZ+uVTejUMZPDeFrcf+k4gpCPIp8I=" }, - "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.6.1": { - "module": "sha256-2vuGSXY9KcKc2ie8IvzauanvxTwP/5rj3pCILquqiUQ=", - "pom": "sha256-qjTLhYY4S44xTP1lsYExl/Mve6cdJSmhHAcerwJ0Hls=" - }, - "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.8.6": { - "module": "sha256-hrNlXUG+xPLHkUREjIPG7HHD3WATQtX9uNNH3wxMniQ=", - "pom": "sha256-1ltx+CJUqXqhyA75V7ln/wMjCfvTbcv/Xq/rY0Q1sRI=" + "androidx/lifecycle#lifecycle-viewmodel-savedstate/2.8.7": { + "module": "sha256-urIsBn8lV3pqwzToaCQUgYBz6fRFA40ZA5yQ+HFvv20=", + "pom": "sha256-m5HFWPwxzZpBgaQQ3bk2g1nLAjYqUK9koaMKEsPVwak=" }, "androidx/lifecycle#lifecycle-viewmodel/2.6.1": { "module": "sha256-K0BvrqXBLyuN9LemCTH4RmSPLh9NeDYeGY0RhPGaR5c=", "pom": "sha256-3C6OZdtT0hZZon7ZO5Zt7jNsHC6OhyhhZ3OJqZuLkTQ=" }, - "androidx/lifecycle#lifecycle-viewmodel/2.8.6": { - "module": "sha256-T/VDcJ4IUwF2erNzpbuFMkbWUh3JEBRwLv12fE3Ho4k=", - "pom": "sha256-3N7kezp5ve43ESOTrpb4V78BNerUVS8WJ6ZzIltvDNE=" + "androidx/lifecycle#lifecycle-viewmodel/2.8.7": { + "module": "sha256-8dgh/BgDbdIMwh/74C9UcSC/AFHgaunhl3FAITyTQ3I=", + "pom": "sha256-7h37GDtTqmIzrVLtp6dU9y2Vptttyi85FEoWDetBlfs=" }, "androidx/loader#loader/1.0.0": { "pom": "sha256-yXjVUICLR0NKpJpjFkEQpQtVsLzGFgqTouN9URDfjF4=" @@ -622,24 +618,24 @@ "androidx/viewpager#viewpager/1.0.0": { "pom": "sha256-H3L4NjOdA8brAT9lB152yocHWld1eOtPlfdKOl0lMSg=" }, - "androidx/work#work-runtime-ktx/2.9.1": { - "module": "sha256-cR+5UijQc0faUgid+10ZXFGgfddVKK1RR0w5cZavs1w=", - "pom": "sha256-EIx091ygy16ACVdo8o9Sn3aqg1CDjvji6XNTxkUdXTg=" + "androidx/work#work-runtime-ktx/2.10.0": { + "module": "sha256-gKptxuwMwhBHXIIKbTbcgQDV2prvfMysCBFpoaJQKwQ=", + "pom": "sha256-EnN38XWHfslygvmN0j5x48H37JSaoMLQKkUNtN0FhL0=" }, - "androidx/work#work-runtime/2.9.1": { - "module": "sha256-1UTtZMXLoYYflvSKzfFfegaJTzZ1oWqoFamfOqKQlGs=", - "pom": "sha256-2XC71x8rkoV4oAUexALJzKZxDV5ox96G/69eiHBr1dw=" + "androidx/work#work-runtime/2.10.0": { + "module": "sha256-RlwbR1AJLr8LAx4G7P2AEffhWs6NzLHkxH1An3e+y6A=", + "pom": "sha256-GuzFFWca/IS1/1so1Yle+0Q93atJ3VzHQAl2oc/FEMk=" }, - "com/android#signflinger/8.7.0": { + "com/android#signflinger/8.7.2": { "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=", - "pom": "sha256-3nZoa+311WsNLgStx7IEthYqUrUwNg3klHY0uaTWfGA=" + "pom": "sha256-+Nlz5WpB7x6khOXP7m2aIFcyrTGov5xBpGjcH/oKsJU=" }, - "com/android#zipflinger/8.7.0": { + "com/android#zipflinger/8.7.2": { "jar": "sha256-gd1IVhilCaMjWSm56xMJHYhEUmYd5s5aRcw4scVVQhw=", - "pom": "sha256-n5w8SGypunT4CBVFWLc5RXV7+MEhZc6DRvSWzzjofJ0=" + "pom": "sha256-JQzkBbIaA5xl06CkTwNwz1mfjR/mQQkG0NmPT5m6z8k=" }, - "com/android/application#com.android.application.gradle.plugin/8.7.0": { - "pom": "sha256-7h5ZwC4JeVS67atxKbxn0cANSSfoAFPMLT2TB1hiPQU=" + "com/android/application#com.android.application.gradle.plugin/8.7.2": { + "pom": "sha256-s0CUyf2Jvehy8Lz6h9d+++HRb0tKnLz64dxI2eNVyDU=" }, "com/android/billingclient#billing-ktx/7.1.1": { "pom": "sha256-PMPwTqj+PMOAi75eG0Y/3jQzM1RDOqeRERHQzK6Dt9g=" @@ -647,112 +643,112 @@ "com/android/billingclient#billing/7.1.1": { "pom": "sha256-S+5D2uFUS1LoqOUCefEyBPcrve1/ECdDCbG4ekhLdgU=" }, - "com/android/databinding#baseLibrary/8.7.0": { + "com/android/databinding#baseLibrary/8.7.2": { "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=", - "pom": "sha256-spuchjrVnveI/QF+UsxTC59xEU3SXBHwrvwewDdTC5w=" + "pom": "sha256-OcbTHhZrbU/09vCTLfB5kVZoDVfiX3E8WEAqMAmzsT8=" }, - "com/android/library#com.android.library.gradle.plugin/8.7.0": { - "pom": "sha256-qEI1Ny/YtfAS/MRRwaMWq9jVv/hFLnBVX1pHr2wabOY=" + "com/android/library#com.android.library.gradle.plugin/8.7.2": { + "pom": "sha256-pvWBDNz+bwVIHtJf5olffEDwL2ZcD6Okz3C5XNhgAWg=" }, - "com/android/test#com.android.test.gradle.plugin/8.7.0": { - "pom": "sha256-nlbxt2NGM3f+qeHaXfTCdbAeTw0wy6NyAAsyneJO7mc=" + "com/android/test#com.android.test.gradle.plugin/8.7.2": { + "pom": "sha256-RpF0YddrSbf5q0Aw1iebH5GJeFcvO6KrhKZtzVl3ncA=" }, - "com/android/tools#annotations/31.7.0": { + "com/android/tools#annotations/31.7.2": { "jar": "sha256-slmV+nsiDTX7uOMl3wcfgpFpG/uv+XNMmOOPRewqc+4=", - "pom": "sha256-hRjzbfHM0bJFjGRhGlXKu9zgCi5cyL5PvVc6ZWK7pUI=" + "pom": "sha256-gPvd6AprCtEgkWukhxS0YppDEhBuASGe4dZxuykI2OU=" }, - "com/android/tools#common/31.7.0": { - "jar": "sha256-KHe7/ziyy9GMT6c0AKhK3bYK3uaVr5S5hM813CZl47U=", - "pom": "sha256-I3c6OAlykdtH5legTMh00W0Uax6eI5KChaGbJky+Ftk=" + "com/android/tools#common/31.7.2": { + "jar": "sha256-eE+AUG0Xe3cNUT9DAzFWCYk6mElH7Oocbn8JDLZvPKI=", + "pom": "sha256-gubnuIknJjmS1z6STcWF0aq33B+DrxitmEO7QL30S24=" }, - "com/android/tools#dvlib/31.7.0": { + "com/android/tools#dvlib/31.7.2": { "jar": "sha256-j9NJWi67ULGqyxtDYtxKRxuHRiwersQ2kbtW+JXpxjY=", - "pom": "sha256-77YN2IPOd9FGZq+CQDFLhMuN/P8h9D0zG4RJ/jlMEhg=" + "pom": "sha256-dR+c4x3mn6slbazHyJbRJ3yuz47/OC+HFG/rivhh6kA=" }, - "com/android/tools#repository/31.7.0": { + "com/android/tools#repository/31.7.2": { "jar": "sha256-FpwueneqMJeIedv4swQ2ZxFlhy/L392mxzWq3bZxA0A=", - "pom": "sha256-gF/BqRqM2aW2MbDmKHfZwB8x/4P04HztbwuDQgbIoJ8=" + "pom": "sha256-xMZLLfgLHCvbIs9HRUxYLiSZB5lw078mu1DfdoieA8w=" }, - "com/android/tools#sdk-common/31.7.0": { + "com/android/tools#sdk-common/31.7.2": { "jar": "sha256-T6RKfZZ13xPaYU3uUS35CtPkMI0K3bMurZn1fOWPZ18=", - "pom": "sha256-XWcvw0L2prUWMoBq6/eVdlP1ODaP3DAxLGDF2LCSh+w=" + "pom": "sha256-bsFDlhq1jIWutSaYTCgs1vXTwdXiL+fn1KY6FnWGYWs=" }, - "com/android/tools#sdklib/31.7.0": { + "com/android/tools#sdklib/31.7.2": { "jar": "sha256-Cj9wl6SgCzhARreDtwU6WewL2SJWq4S6pr2AeqAoWLM=", - "pom": "sha256-tYwRPOs2Lu8I5HJOSXz61v5m9IyjbZE265oRs2FFWaM=" + "pom": "sha256-mCfT7BwVqKxPXthmHCQ6zK0UUlJ3LtrTF/daW3ibCpE=" }, - "com/android/tools/analytics-library#crash/31.7.0": { + "com/android/tools/analytics-library#crash/31.7.2": { "jar": "sha256-zKl6wpoTKb0xCj6DK25X9GIn5QGqUpwApj3yF8XX30E=", - "pom": "sha256-6gsKxUwhyPYOOgIj2BupCDXdmdspNMhp6rmItfbCPZA=" + "pom": "sha256-rBBC4sEx265SouZ2TDV4bxhBTgKqQWrGbQAlRgVzNEE=" }, - "com/android/tools/analytics-library#protos/31.7.0": { + "com/android/tools/analytics-library#protos/31.7.2": { "jar": "sha256-aSz5gTlf4XGi8in/cMxswd354iYbKOrdoiadZuVQl4Y=", - "pom": "sha256-6WFdvb0hsQOB+5XBVetsy4qHymEZAWgSF9Y0m9n56RQ=" + "pom": "sha256-cU7Ku1rvYje/tMFutI6tDSiW8q633v1nIuUYt5Nr9xY=" }, - "com/android/tools/analytics-library#shared/31.7.0": { + "com/android/tools/analytics-library#shared/31.7.2": { "jar": "sha256-yte7j5agR6XvehOxyDA0FCKenVByCWRuw7Y6ZIYeHOE=", - "pom": "sha256-BiLSvOTmMBZr8SgT6DhUOUFx+vJ1k6/S2kvpwtkJEL8=" + "pom": "sha256-HrmdoNGhdtIgvidf8ARgZBDLlHpNdUFKaBAFJLOow4g=" }, - "com/android/tools/analytics-library#tracker/31.7.0": { + "com/android/tools/analytics-library#tracker/31.7.2": { "jar": "sha256-4flUlzpHM/dgJ6X5b6RUctw8wi0nsdyT8/5qRqdWgb4=", - "pom": "sha256-dvrrRI7XbpYwXlV87CwMskFP+ZXCTF4KacthsDJIes4=" + "pom": "sha256-cqrveu3eQlqUxtXMt09Qcmfjjt+3GuqpyD2gFexBMGc=" }, - "com/android/tools/build#aapt2-proto/8.7.0-12006047": { - "jar": "sha256-/he6M0iin4xBkizK/wz1TvRAfD53QHqfh8HlVaFzTJA=", - "module": "sha256-d4xt5AOdryGQB5Kq/PoN5jdIJDfiyxA4FIhlaitml0k=", - "pom": "sha256-0MBH8qY4ilqNnHto3UuvCTwDhVxXJnNNRDOHwrc17EI=" + "com/android/tools/build#aapt2-proto/8.7.2-12006047": { + "jar": "sha256-yiM9kx8k9C69fjjvSwFU97qShAHuuhpx1xFMK4sVI3I=", + "module": "sha256-WUBXRxZ4oa78DSpch+nQYa2hE56o+mBfmMa3mtp/7Ts=", + "pom": "sha256-QYCpSSeK8+D+cSUssDv722/6CNTnSUBtD7xnN2jaPyk=" }, - "com/android/tools/build#aaptcompiler/8.7.0": { - "jar": "sha256-6kqIYAlERDX3oZ/K7eHq8YDo2FFF98UqS6h8vDVsVjo=", - "module": "sha256-3v4hb6toU2kC/2hPHVupgpWXVNoI0pYBmMg1zfnrRpU=", - "pom": "sha256-mDxsnWrL9rYdo/qn4WRgLx0Z7xigFcdpEmutZ3Yo86k=" + "com/android/tools/build#aaptcompiler/8.7.2": { + "jar": "sha256-lj8abX8TYfI+RT9Bd+wQVPqlzQ1V5vn3c9hn8IhfwEU=", + "module": "sha256-gY8GpdWl5kiO9YSC/6Kr68cVem/vYZARvpuMFAYEWd8=", + "pom": "sha256-p3dFTXMlI4OOOhVGMRYVFBIla2G3KWzMILYnG1xYvY4=" }, - "com/android/tools/build#apksig/8.7.0": { + "com/android/tools/build#apksig/8.7.2": { "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=", - "pom": "sha256-HoToNvBKfksjm+gnP/r23e28LYITkSiZ3XnfpvJUMTI=" + "pom": "sha256-0QaOHB2J/VPmVKdvmag2eIo6tyMEMktuKYK22J0BR5E=" }, - "com/android/tools/build#apkzlib/8.7.0": { + "com/android/tools/build#apkzlib/8.7.2": { "jar": "sha256-HBpn1vTxhkJ6wWbrqg3YZ/WV1RRPySUlKwX/udGhVrc=", - "pom": "sha256-YeIsbhnURBJstE09/zk40sqXiEGe1IeSZZGa6Zj/ZX4=" + "pom": "sha256-+Vo1Yrq5+yJH1mUV11BNGAAUEDhkMDaN7Hb5GMlnaPk=" }, - "com/android/tools/build#builder-model/8.7.0": { - "jar": "sha256-qW3HjPObTlad6Q6BULXvpmZC0lkIyvKJDGA8xkehbHg=", - "module": "sha256-9FjJyYRDzuRy8bIVS5wOZ6qqBYDNG7OuCMw0Z3N3qUc=", - "pom": "sha256-1ZHiHL89U4t1gaf8k8oCDye1lLTnmDM3WLcqy0/YTTI=" + "com/android/tools/build#builder-model/8.7.2": { + "jar": "sha256-RkgBANdcOWwtzwRqS7Je83VvZpvEs87QtnRBVy1MidI=", + "module": "sha256-f66ACHV/AddPO2Gxst1XZj1jwDvDrND2uHZGmOWo/9o=", + "pom": "sha256-JnhzHNlgHzbi9kWcxuIjHUH5lI0lzgPkzZQR4yudrDA=" }, - "com/android/tools/build#builder-test-api/8.7.0": { - "jar": "sha256-wyUGET0QpRlrXj+GmAJyLI8ijBIwhsBIUvhmzfeMBQ0=", - "module": "sha256-Jz8BFVEUVKBmmPHS6h0Hd8qy7gBknaSeNwNB+uSnSvY=", - "pom": "sha256-XXVdxCpB7BU1lnho/yUric2ul3fKD1CRuCXZ7SNWBDQ=" + "com/android/tools/build#builder-test-api/8.7.2": { + "jar": "sha256-+jL/JjBTSAwtICP9OhlbA13Q6YuT7oT91Zl+46LHp8o=", + "module": "sha256-PsegoYlTeeQvi4Ou0N4pAMYCtbnZPAWllIh/AKCj+WA=", + "pom": "sha256-HNMeW4I/5062W63lg35Zs68e74ex/4MdKmiIF1QaNwk=" }, - "com/android/tools/build#builder/8.7.0": { - "jar": "sha256-ibW+szlqi0UpvMxlOzIanNlo4lJFvjscMgGJdZq7bt8=", - "module": "sha256-v9ZsEzgsS+tKMHItT1j++OHNQ3dcAT8yygs7kmJvMW8=", - "pom": "sha256-DN4sH7Rl891OOgHJqcTRTDGT8c43t+nmSP1AAFNEkag=" + "com/android/tools/build#builder/8.7.2": { + "jar": "sha256-8p9ibOnkHd+vMFQBOXqITloxEmpB/Rj0D9thylRhAww=", + "module": "sha256-EfWL/6/TpHkm9wsk4pAxnB/+WBoKXIR4EcnssFluasY=", + "pom": "sha256-PLR1LKU9qfSgjooty2N4jfFFniNz6pU0n5j7huSiuns=" }, "com/android/tools/build#bundletool/1.17.1": { "jar": "sha256-OS/TsJm9grEWyHcquPxBOZhKkRCKZD+N/J7ilkiBitg=", "pom": "sha256-fN0zdkTVI/5gz7YyQQxrf7fZgu7FMnDdvt/xwmMzVF0=" }, - "com/android/tools/build#gradle-api/8.7.0": { - "jar": "sha256-CeRBcyyUyBG59oXYQO3uSphu57Mi4Qq7bwq9/Wx8M4I=", - "module": "sha256-LW3zWEKMh6teJWIpIET4/MuOk5NmPUR7bylWyzF6GcA=", - "pom": "sha256-sipgfp6d69MjAK1dHx0aUxj9GIobUZlQo3YYyJPbS14=" + "com/android/tools/build#gradle-api/8.7.2": { + "jar": "sha256-ohzomuUaP3MzNyVcKbHVESBN0ZOuUoD3Wk2B0hVMv1I=", + "module": "sha256-yph0Jjvn5igYSQivBtIwrGTLWrXKCv5F65GmvRznx2A=", + "pom": "sha256-xj3pBlGK6+VhHshZdZO9qtHkck+ytM3J1rCVzHXmSr8=" }, - "com/android/tools/build#gradle-settings-api/8.7.0": { - "jar": "sha256-fd/HczLe41hSQxUiOP8ArEexcHpBnA8USEU6BJj7aDY=", - "module": "sha256-UogIaEZOzhDffTxjbC97RXHyWORY8alHO8Wds9ktAMc=", - "pom": "sha256-lrCfK/WA+DHi3D+qL0/u/ODHyj7dxpOSjuEjiLxSPoc=" + "com/android/tools/build#gradle-settings-api/8.7.2": { + "jar": "sha256-r2oaF8zcVhvhBB7f7RNtot3euvcivJVOEZ8uBhpIONQ=", + "module": "sha256-Uy6JVY4zp+pA2fj0NIrekj8WZhIkxkV6DKHMZPo0ru0=", + "pom": "sha256-Md0thmxB4ku8c32fjuW8bBIhFmhXyUNKSfKyZ3Gt0EQ=" }, - "com/android/tools/build#gradle/8.7.0": { - "jar": "sha256-H1a4cMQJth55iDqkAnoixIyvwMrNAE9N7z8t6hiC+qU=", - "module": "sha256-jQyDawhju9N6R91wmJF6Q3IwwmNoXqd/S4vFman6E1Q=", - "pom": "sha256-/W/cIMQKcXosG1+bLUtGNgWxTm4zmLMzEAvw867m69k=" + "com/android/tools/build#gradle/8.7.2": { + "jar": "sha256-kGyVRG0MGZurpmCORLVJJCoPMmNfzUOvplY3yqLUk/Y=", + "module": "sha256-ZpeR3shz+2H44JOKpZRVlsy4SiBx5AnlW1tbFbb2pBQ=", + "pom": "sha256-LRFC0n6qSZVMdPfbABzhRQlgG8IgL0jrSs16cxnDG0g=" }, - "com/android/tools/build#manifest-merger/31.7.0": { - "jar": "sha256-q5InZDTlph6GxZDnsZ8t4WF3j6J1/Aio7shAgeJwO7M=", - "module": "sha256-EugDDYtTNOtaSsPQwQ9Q9I9fe0+FQpZlmd+kX4tsU9c=", - "pom": "sha256-XV78GWn1LfmVAx2XGIkWm39oRoVEZjG6ynrODjKtwRM=" + "com/android/tools/build#manifest-merger/31.7.2": { + "jar": "sha256-g+a/vHleFh7llgkXDpUuNZGuqGyJXBGevqRk6lP59QA=", + "module": "sha256-XYlnGbfMPK7aw1a4/BLqON3QFy3laJ8/e7dpMgNGnpg=", + "pom": "sha256-pagwwHgWGZT/NBRif8b8saon9ZxfXrK1L/46D5i7i4E=" }, "com/android/tools/build#transform-api/2.0.0-deprecated-use-gradle-api": { "jar": "sha256-TeSj0F4cU0wtueRYi/NAgrsr0jLYq7lyfEMCkM4iV0A=", @@ -768,61 +764,61 @@ "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=", "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI=" }, - "com/android/tools/ddms#ddmlib/31.7.0": { + "com/android/tools/ddms#ddmlib/31.7.2": { "jar": "sha256-DX71OCP2ohuAfzmPDQOaXd4YS1jFWJYlYmykqj1hCO0=", - "pom": "sha256-xF5JiS4dMxYuu8Px1FpXrAO1M9sJI1HIChEXGsemC3s=" + "pom": "sha256-ge+WpZRhtLmdMSBSNnHhbIzzy/q9ARixnnVgtZcLYJ0=" }, - "com/android/tools/layoutlib#layoutlib-api/31.7.0": { + "com/android/tools/layoutlib#layoutlib-api/31.7.2": { "jar": "sha256-mLrjb/BR4RTdTu9e/6gPvl5VKUT0IzzokhYNos2e6u0=", - "pom": "sha256-Oc6KjaxnhwVd1yk9DuxGwGgoJ1pcMCDoB4aBmfue2Sw=" + "pom": "sha256-VtfZFwAPKmp8g884n+aC4KawfLysJXX8ze4L8ScncGE=" }, - "com/android/tools/lint#lint-model/31.7.0": { + "com/android/tools/lint#lint-model/31.7.2": { "jar": "sha256-n0wIehmRdFIdG8e4/wX/FIT3cPRRi3/Z9trmwmGILb0=", - "pom": "sha256-bOKv4L2eVokKZMnOl8xm1XgkBc4f5lVLf2LKeuSMl40=" + "pom": "sha256-1M8hv1CrYQinX1s9DLojlvzEaEhfuHjvTGmWKdwy1rY=" }, - "com/android/tools/lint#lint-typedef-remover/31.7.0": { + "com/android/tools/lint#lint-typedef-remover/31.7.2": { "jar": "sha256-W09IUhXKTYbvIxn8OYtfIlHmL1RGvF/Q4AZTZI3d4xg=", - "pom": "sha256-JClmoX4PSX7Pfw8ZbzDdHrz14v4CHvTi47QtFF53rq0=" + "pom": "sha256-n2H8dvOXG3W++jZyBxKSUvxdMp1mKSpTO04vDg/FpzY=" }, - "com/android/tools/utp#android-device-provider-ddmlib-proto/31.7.0": { + "com/android/tools/utp#android-device-provider-ddmlib-proto/31.7.2": { "jar": "sha256-2p8/Pa4mVEyQZoVJWEdl1YVKh8Ql0s/ld80002AOoJc=", - "pom": "sha256-jO6IDyp30tYiR3BtjUf85buIXCkz1hR5+H3TuFKcXTk=" + "pom": "sha256-fceVfuEAeETkitNQUrJh7EZ8jj0mc055gHXWDl0txrc=" }, - "com/android/tools/utp#android-device-provider-gradle-proto/31.7.0": { + "com/android/tools/utp#android-device-provider-gradle-proto/31.7.2": { "jar": "sha256-rSNCux1vlVY0AKMiST6hwinLk985RPEmG3OZ9xhJQEk=", - "pom": "sha256-K6qTHUdHBV/2rp+Adz/zqhxC+6D626Ghph4X9rQB9rQ=" + "pom": "sha256-b7wYgVZ6Ij0h8MU4FpxFRTqgTuZoarSxSTIaNpIdKH8=" }, - "com/android/tools/utp#android-device-provider-profile-proto/31.7.0": { + "com/android/tools/utp#android-device-provider-profile-proto/31.7.2": { "jar": "sha256-ENEAztXQg3FMHGi7uxC7N16FRvkqsOQhnA5KX/KYEV4=", - "pom": "sha256-/1hgmrxlfZWAFFBM/e6kG3J3wNI6sOtQikfu3uMPZ5Y=" + "pom": "sha256-NCYLH8BzJ0AW4K+jqJzkCnTAlTnOKDU170uwn6nUiZo=" }, - "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.7.2": { "jar": "sha256-OEUGlN5jKMLEy6aW+cBOzdXOaVI1X2jDoi+VQdHWVG8=", - "pom": "sha256-+yuHVmFNkIZ4QU7pbG+wphVTVSd8viOeCZogZhZxidE=" + "pom": "sha256-HZVLjspjr1oTeqIYvZBmn6pLPS6fKJpkEU3w6LI6wWM=" }, - "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.7.2": { "jar": "sha256-VD62yNcrLtdFH46TnV2AiQVm8UvCa335yDR1BrJY164=", - "pom": "sha256-3ShDC26IL1zYVG4V3puMjAzkwoVLg8xLAxOCj/9YaIw=" + "pom": "sha256-Wj7az0WoDtusdGLVwroPciKVO4ER9naXzOgVH39iP7E=" }, - "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.7.2": { "jar": "sha256-77TXAUqqc1UkagfC5DeiIx+yUlQP8bzmhyyI3I2onRI=", - "pom": "sha256-Kr+9L1LkoLxWGzY29JUmZ7zSseaNW3S4+ecDnogCzH4=" + "pom": "sha256-z95c2bXo9Uha7d8ExVVzwPdFvRh0wJDWdb6tVX8rAuQ=" }, - "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.7.2": { "jar": "sha256-rt7F7EYn2JjMzfQtgDjbIOukSVdTxT0bCzeHNEkcr18=", - "pom": "sha256-ClVyJT95043mEia9b0/2iv5kJ/IAzDsdfrHfl8I7jIQ=" + "pom": "sha256-ewlMa3tMgyeIeTNY8/gQ7t+oWkKRxCjGIyYE3Q30yVE=" }, - "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.7.2": { "jar": "sha256-kSkCS9jjg1O8o+sm39jjYo4FjVfW6dhFH/w18BZ1HmM=", - "pom": "sha256-mEg9815euIrO9MCHlq3RAHI+HgTV8bpojRc073/i8LI=" + "pom": "sha256-/DgckYxfXZ7Do8/3tSB2508CJgWZs6KaR9ybjfNGgLU=" }, - "com/android/tools/utp#android-test-plugin-host-retention-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-host-retention-proto/31.7.2": { "jar": "sha256-PbjtOO9JtpTK6kZq4i47Ns7clVezWJ0OB8DN2DKUWRw=", - "pom": "sha256-C0HkUK7ULzF6kiKOhy1zgrp8/6bVEeXxHx28aQGv3JI=" + "pom": "sha256-nMDyQxX/ewv9HxsCAFmGxbRSMbQZm1ddUY6uN/SXAhw=" }, - "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.7.0": { + "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.7.2": { "jar": "sha256-y99xvKYOFMMOeyz0uQ8PCj6ME498rdh0sNnArgguAnQ=", - "pom": "sha256-uYdrvyTXt53Y7vvEl8+kC1LR89Lw9B/C4YltMEHtsX4=" + "pom": "sha256-zvNh4UxGVOKXJBHYPNscXKzTkkjwe0ABaN5/RF/r5n0=" }, "com/google/android/datatransport#transport-api/3.0.0": { "pom": "sha256-FTe+vUTaLrfjvnP8QlnhEW8qaKUwX0/iPGzqmm+E95E=" @@ -883,14 +879,14 @@ "com/google/android/odml#image/1.0.0-beta1": { "pom": "sha256-eV9Hk8N17t9DMqA4EIKYGlznC3oKd2IhyiStnUDL6hw=" }, - "com/google/android/play#core-common/2.0.2": { - "pom": "sha256-GUBYeVHY7e/s+jBJHYVzMon1q1K3q2fSXw+XNaxW//c=" + "com/google/android/play#core-common/2.0.4": { + "pom": "sha256-jd6WHLfhDKX6DlUmHnurweNAv1lyujU4x89ONNM4774=" }, - "com/google/android/play#review-ktx/2.0.1": { - "pom": "sha256-LtP+xq8/PoHy1NBqQh8uXWFk8GQPMzYKGFZhR/jSpOo=" + "com/google/android/play#review-ktx/2.0.2": { + "pom": "sha256-tllwHlCGY+vaa1CiaXuywPjJhGMxRrE5BtfJhqmdBDY=" }, - "com/google/android/play#review/2.0.1": { - "pom": "sha256-chcx/XEy53bt0gj5Z+3wOOI95uZQ8PBVxC1G2TZLznQ=" + "com/google/android/play#review/2.0.2": { + "pom": "sha256-308kkM3bZR/754TIxbl57GmZa8aHynzWeMfV9lsol+g=" }, "com/google/firebase#firebase-analytics-ktx/22.1.2": { "pom": "sha256-SLZ3ajqET+jxaebbQdCcwNFilqMjGBZHLvSwTl2f030=" @@ -901,8 +897,8 @@ "com/google/firebase#firebase-annotations/16.2.0": { "pom": "sha256-CFsRHeSXHLO5OP+QAMyAeQEE/WmlE0doTftybmnoUko=" }, - "com/google/firebase#firebase-bom/33.4.0": { - "pom": "sha256-vjxNSx4io2a3/RYgg/I9AW4g+ThDDrfMTZbPoXGnadU=" + "com/google/firebase#firebase-bom/33.5.1": { + "pom": "sha256-qmUG1IFF8L6ttoh2vcA7dkaxZFC1OVEqtUm7yOe6JTs=" }, "com/google/firebase#firebase-common-ktx/21.0.0": { "pom": "sha256-wn7MtIuViBFtb9MvRle8Wd+FUAJDIpNVjbuX6YeK3rg=" @@ -928,11 +924,11 @@ "module": "sha256-/vKMVYn+7ogZWmq5SylhBAL4dVQRoTUXbdXZSASY7gQ=", "pom": "sha256-1N7+UvJE/0C7+enGSoroyoocJs3y5lZ1fAY1CuUgeI4=" }, - "com/google/firebase#firebase-crashlytics-ktx/19.2.0": { - "pom": "sha256-rsljNsCG26s6XVWGVQ/sqyI1nXvKCwwnQvVEGwbNdEc=" + "com/google/firebase#firebase-crashlytics-ktx/19.2.1": { + "pom": "sha256-4z68t3jNh55vkF/z8CDvpxd2s1WxexwI8HyHnKnEayQ=" }, - "com/google/firebase#firebase-crashlytics/19.2.0": { - "pom": "sha256-AHkhpTDKn69Dc0V4SGTxFnczsQVFUMJaPy6mEkUnGdU=" + "com/google/firebase#firebase-crashlytics/19.2.1": { + "pom": "sha256-8gfVXglDfRP0ZlCCRTDCFVAPS3g8iFPO4iBEekUfaHU=" }, "com/google/firebase#firebase-encoders-json/17.1.0": { "pom": "sha256-yCPL7XoOdb8w/tu6Qv8cDIdS49wW7cz30PLl1stpx6g=" @@ -958,8 +954,8 @@ "com/google/firebase#firebase-measurement-connector/20.0.1": { "pom": "sha256-exiY9N12nBHKu6lwJUbWiAEV6B191v8ra+JI7hVtyLw=" }, - "com/google/firebase#firebase-sessions/2.0.5": { - "pom": "sha256-1Vw4Y6oAPcTNcFJEv8g7PYmlzR3Gz1lGX7fGfXO/0WA=" + "com/google/firebase#firebase-sessions/2.0.6": { + "pom": "sha256-VtizN1WQ+rqBl1T0uI535GODGqQe0xffqx52hvGYXbU=" }, "com/google/firebase/crashlytics#com.google.firebase.crashlytics.gradle.plugin/3.0.2": { "pom": "sha256-T51Vb0qwfPielD9NqD+p8nW4v02PZEKrG15fuwm5qdw=" @@ -995,8 +991,8 @@ } }, "https://plugins.gradle.org/m2": { - "app/cash/licensee#app.cash.licensee.gradle.plugin/1.11.0": { - "pom": "sha256-TW6qfssPqKRDuXUP+4I9kU0/bJeO67Jcf4gShq6VNb4=" + "app/cash/licensee#app.cash.licensee.gradle.plugin/1.12.0": { + "pom": "sha256-a1NXxoXtJlxl+2W5S49bIf7d5kyY5TS4JzFfugt9EVs=" }, "app/cash/sqldelight#app.cash.sqldelight.gradle.plugin/2.0.2": { "pom": "sha256-xI4eHTquSFcUqPmVqfwmIE3v0FJXhyJaRotJQfOPKwk=" @@ -1019,11 +1015,11 @@ "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" }, - "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.20-1.0.25": { - "pom": "sha256-yzUQdo5Yv9tQqt2JXf5jB6XPBHblZZ221YRYHBSBuy8=" + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.21-1.0.26": { + "pom": "sha256-Z2JdXXdbvXnCpO5wWNDyGeskBBs6Dqyl60p6XExoRC4=" }, - "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.4": { - "pom": "sha256-Tkw14qX9gVWTV8wn9hfQfWRMQFn2MgCq4QpEucBn+iw=" + "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.5": { + "pom": "sha256-a+z8hpHftExSYVqCqWeS8TQBpXXleMkBkR1/qjMPgoo=" }, "org/gradle/kotlin#gradle-kotlin-dsl-plugins/4.5.0": { "jar": "sha256-Ga92VnnptJN0uyg6xE81O4EJrZz+ZmjO1tmmZFVA4vo=", @@ -1172,26 +1168,26 @@ "jar": "sha256-4NqKfwZIV8BIOmVyfRYtPtV84m1+R3ix8ADg0MDck3E=", "pom": "sha256-krQjr9XnKbsRT3G1ip4DhF3+K9pWJFTrvbg8nYOyMHE=" }, - "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.20": { - "pom": "sha256-xK4aEO2SGNYivOCqvA7d9JsnMahRbWjhzfhFpXD5HBo=" + "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.21": { + "pom": "sha256-nYQQN8WWRNxbvoFOeS7Yd060hkbws6d5YE7lwbMH+Wk=" }, - "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.20": { - "pom": "sha256-JyOoqUP6SkTTcD8VTEW31UcMcZ1OYKvz4ixzt3s4i5M=" + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.21": { + "pom": "sha256-Jk8V5sp1XIU/oPWvEPa9GgHwmLKsDPmOHP05kBF/tjo=" }, - "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.20": { - "pom": "sha256-3sIntTJrP/MWMuYmdesCZOtzhonuGoHHbOrP00HQDT8=" + "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.21": { + "pom": "sha256-A3jdmghkzs3xepZE4cpNaYzJBjT6z39QT1GiA+UnTSw=" }, - "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.20": { - "pom": "sha256-eB3fXoWUHaYbaNxvts/TEvQb20Z7A9LYFEkDkc8PHA0=" + "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.21": { + "pom": "sha256-tnnDkpTLqUUVcGw6nW/EDzGhCq5mqjPysFgNUp5Zx+A=" }, - "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.20": { - "pom": "sha256-qYIKx23l4slfvXM/0y0CQQRMWMo1cC1JvpkVeA4Eito=" + "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.21": { + "pom": "sha256-9hnDJ/rpwiSeUZmg9Takn0kRV2ZK+tFjyGOedA8ibUo=" }, - "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.20": { - "pom": "sha256-LVF6OaKUxLG4cV7ldiyhQx/EDL+VV5KSrSTU5B4lnFk=" + "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.21": { + "pom": "sha256-RJ1618SBWsfvZKnCwXOrJiAZ8W45q/EPx/wTvyBM82I=" }, - "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.20": { - "pom": "sha256-0s2V9THwNRgW+fg0bsbWB2xxyt9jLz6PZX3dft+RukE=" + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.21": { + "pom": "sha256-ZqPrh44Nk5i1JY0VveqGR1pdRJ9jthi1rcgMsz0bT5Y=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=", @@ -1208,13 +1204,13 @@ } }, "https://repo.maven.apache.org/maven2": { - "app/cash/licensee#app.cash.licensee.gradle.plugin/1.11.0": { - "pom": "sha256-TW6qfssPqKRDuXUP+4I9kU0/bJeO67Jcf4gShq6VNb4=" + "app/cash/licensee#app.cash.licensee.gradle.plugin/1.12.0": { + "pom": "sha256-a1NXxoXtJlxl+2W5S49bIf7d5kyY5TS4JzFfugt9EVs=" }, - "app/cash/licensee#licensee-gradle-plugin/1.11.0": { - "jar": "sha256-421lXSEpw9HX+oVCAVAyX81n+tcPw5ELftex7w9vqXk=", - "module": "sha256-4hKLda1Y5Tr5CtcyLGKXfI/NonykVCykOQ+ysrr0QHc=", - "pom": "sha256-rRT8P6I5Wd+LQY8Ib0vxN/snc5TRccJWT1a/18xGJ9M=" + "app/cash/licensee#licensee-gradle-plugin/1.12.0": { + "jar": "sha256-oWiz6TSJ8RiIPrGD2uCfBAgqRIwzwKjrBipJ5co8WV0=", + "module": "sha256-lrpFacljyIiZDNT7YePL8HfdKrYRR74+2OZbvODrlqU=", + "pom": "sha256-hhw2H09+on8XdLSKb0NayvWJ2KW6pczg5WZ3xx/iSk8=" }, "app/cash/sqldelight#android-driver/2.0.2": { "module": "sha256-o/3k4blEM0Kq/3SeuCOxd3oh8Yqa0oiEJae416a4wXE=", @@ -1423,38 +1419,38 @@ "module": "sha256-pf5zlSZUrdVw3EuE5w0KeoQK5QZyqENfmFFs9WqWexE=", "pom": "sha256-g+AAH5lPJWhjyc4wzYMlf7qjQEayclcfyGQ0O8x43TQ=" }, - "com/github/bumptech/glide#disklrucache/4.16.0": { - "pom": "sha256-pejfbx0ifD6b4W/L39P1M7IdjQPiaCrddxr498u9qUQ=" + "com/github/bumptech/glide#disklrucache/5.0.0-rc01": { + "pom": "sha256-rTCxr8Od/ObYsLN/OXXMI1iY4bM67RBfEUoqgPlH9zM=" }, - "com/github/bumptech/glide#gifdecoder/4.16.0": { - "pom": "sha256-MKYI93fKdyACjDZd1nD7XDctDhFRuUAWgOPQlHLbABc=" + "com/github/bumptech/glide#gifdecoder/5.0.0-rc01": { + "pom": "sha256-bWon0m4DSok1jGLEO7/aF+vyDM4I5GItBHhFUrnEXrY=" }, - "com/github/bumptech/glide#glide/4.16.0": { - "pom": "sha256-5yyOMQ16K5zuWs3NuS/S72OU63LlapbKy1aSQEcC5XE=" + "com/github/bumptech/glide#glide/5.0.0-rc01": { + "pom": "sha256-t4B6qZ0o2S98YxD/gOEo36btXUzZsH7sQKuU2Bi2kQE=" }, "com/github/jai-imageio#jai-imageio-core/1.4.0": { "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw=" }, - "com/github/skydoves#landscapist-android/2.4.0": { - "module": "sha256-Iqip9b/NaDVEyHqOLbYgXHE9u+Bdrvc2Bo0zo98kKFo=", - "pom": "sha256-mohtrp2I43wKcmCGxLS+zENS3V98+Xvk5fr8UWZb4bQ=" + "com/github/skydoves#landscapist-android/2.4.1": { + "module": "sha256-CTabQKPpIMrvOjGdj/U/X3bifUQHKejj/T6ArRKtbPw=", + "pom": "sha256-HDoFMmJl4MMZmvYwaRvY9JsVB7uo1dWcUXdM0zm9r/Q=" }, - "com/github/skydoves#landscapist-glide/2.4.0": { - "module": "sha256-OJN/jZK/wE6f06GNVKUgFxVMoshfUFs/B/C5w3cN/YY=", - "pom": "sha256-aJH4hyrihRy22EWcGkIC5BtViDpNjvfQfP5XkUfpXwg=" + "com/github/skydoves#landscapist-glide/2.4.1": { + "module": "sha256-8mmntu8gt7n0OqzL7ZuzoTWBf2q1eB3CEGULrtztEso=", + "pom": "sha256-TYUKEnhZzXwXlS98Nha2HMgtxSXa8BQClPoXld2KvMA=" }, - "com/github/skydoves#landscapist-placeholder-android/2.4.0": { - "module": "sha256-fC7SUqnzD9u2B2TCzs+WWO5rB5GlIpMpUG1kLlLsETQ=", - "pom": "sha256-ojiYeuJG+n3S33m+wW9gFmRn/JmL997R2zoEcISTOG0=" + "com/github/skydoves#landscapist-placeholder-android/2.4.1": { + "module": "sha256-ycd1URN0vJMSrKqZVwPpq1YTnCTh1f5nas39bbVZpBI=", + "pom": "sha256-Ioz9A84Hdk4FgM4aLQa83LGcUwU8g5pHPboF5b49MsI=" }, - "com/github/skydoves#landscapist-placeholder/2.4.0": { - "module": "sha256-uyaHzkRh61cDI/C9DjVGxJKJtXv1b+KH+mBt4TTzu7A=", - "pom": "sha256-UKohOAS24T1yD3xKXtBp6hXfTQQ5bD81S5bpaWp9mds=" + "com/github/skydoves#landscapist-placeholder/2.4.1": { + "module": "sha256-lun5yfhpSIfMLMG79kczkV0U6sIyG0j4/3Y9hZqqaSw=", + "pom": "sha256-viPts4vQrpOlnm7gP8hECEj5jreFWQKvs3COoJ+VhOE=" }, - "com/github/skydoves#landscapist/2.4.0": { - "module": "sha256-kbVxRSW+nuZiuJ7ZO2OSnBYQqbnM8Hq5+zcBZSHNQb4=", - "pom": "sha256-Fsnfutava8Ul5R7/DmNgSI+OS2abRm/nSg6SkMyxUFc=" + "com/github/skydoves#landscapist/2.4.1": { + "module": "sha256-uYel+PoSDuDea1Ghy8galJH7VRBtwdgZditT4YAR0hM=", + "pom": "sha256-ROr1OImdYtx5/F7iv4U9t3j9SzvKNIvrdoV793cuZsA=" }, "com/google/accompanist#accompanist-drawablepainter/0.36.0": { "module": "sha256-LR2pP7TwcbJ3xHuLD439Ie53v7BUsWpWeT/xjThB2A8=", @@ -1516,32 +1512,32 @@ "jar": "sha256-8d0j+K40qOkTZnI5kerQ1kmdGj6RY85VDCALAtdqhys=", "pom": "sha256-JlupWajhPDoGEz8EtTkWnBAY2v/U0z9TxFOrTLOG9XA=" }, - "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.20-1.0.25": { - "pom": "sha256-yzUQdo5Yv9tQqt2JXf5jB6XPBHblZZ221YRYHBSBuy8=" + "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.0.21-1.0.26": { + "pom": "sha256-Z2JdXXdbvXnCpO5wWNDyGeskBBs6Dqyl60p6XExoRC4=" }, "com/google/devtools/ksp#symbol-processing-api/1.9.23-1.0.19": { "jar": "sha256-vuN5tEleLbL6L56WQysQzr9WCo5udUnVen8oIst6Jfw=", "module": "sha256-aT0JqlhIGPS2yK2oI6VLDLK8sITgWgX+WqaA9YlD9G4=", "pom": "sha256-Oup3dI9mum/DvGrSjD07+lnt9jMyAYlGCrcIWx88KXM=" }, - "com/google/devtools/ksp#symbol-processing-api/2.0.20-1.0.25": { - "jar": "sha256-vdOj527iHJWODypi1xfMYWZeb1oLFB7/AOBW659Y2P4=", - "module": "sha256-XXBDIYzfJjWb3+xLpniu15S6qtSn4EA0TTOi7ZKIR+4=", - "pom": "sha256-jjjxZ9N69wbkkn3PI/IczZKr9DXKQTC0YF9E3GTfelw=" + "com/google/devtools/ksp#symbol-processing-api/2.0.21-1.0.26": { + "jar": "sha256-BsS8s+tAlT1ENeziIyrWt2CGhjGWhZbOZmz5+AVyml8=", + "module": "sha256-ajqhacgqqBf0biw0rQajdVLjehcI8rlzMqiva35bYI0=", + "pom": "sha256-MUzVy+PX+Mw/sOa0jfrrnISBf3fYdDMGlyEUhpWHbRY=" }, - "com/google/devtools/ksp#symbol-processing-common-deps/2.0.20-1.0.25": { - "jar": "sha256-bCly0hPau2S6jdjBRxHJA0wTqjzs9Y9eyKjc40vUpPA=", - "module": "sha256-Q5xUkJOChRNfbVdylQUSnWixhp0pVMVKQ0AnMmfXsOQ=", - "pom": "sha256-pdbQUAbsbfVDFLhNRqWa8ZsNisI7TRymfZhKMyXjUdY=" + "com/google/devtools/ksp#symbol-processing-common-deps/2.0.21-1.0.26": { + "jar": "sha256-9U3futWSOlb8pZ8s/8/6SWFIizOWmTXCXpSS9N51TOQ=", + "module": "sha256-mDHtWjLSJCMF9GCKM3RLOJierSpbAUpEQCDbCuMvSh8=", + "pom": "sha256-tZqVRlTVsPdKwO33x499WS/c4kUguOIOocUGtkFgS3A=" }, - "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.0.20-1.0.25": { - "jar": "sha256-TOH8G26gjE6txjB2jWCKYk9VbWWwVr6g97l4kBgQWkE=", - "module": "sha256-+gLE/UYfiow7j2o265zQQWySRBg61m1c2eIFsId1VZs=", - "pom": "sha256-fi22jD+Ksa+WoDdPRNgBaIpX03/gG4GCLsjPPVG5vf0=" + "com/google/devtools/ksp#symbol-processing-gradle-plugin/2.0.21-1.0.26": { + "jar": "sha256-wB+hdK5CikTHfFQ6sP5qytZj8uyvmon/BT8gmfQ8804=", + "module": "sha256-gLkXElrOkTMqyrUxTqXHYs8TC/TGS6QTUfqHY1FlfHA=", + "pom": "sha256-opW31fnR1sMOuItUi6fQE2PtsP++YeNHVDIIN95ryM4=" }, - "com/google/devtools/ksp#symbol-processing/2.0.20-1.0.25": { - "jar": "sha256-5xdB6pE0JqUlMnIZkb2kqRihibNyVpVzMdww/PLb6xE=", - "pom": "sha256-2S7Uicdzd9fEaDuflleaNjQc/EfzwlJ095vzeMYr0qU=" + "com/google/devtools/ksp#symbol-processing/2.0.21-1.0.26": { + "jar": "sha256-Wo4TWFWSMrLNcFdf7QnSHRUQ3uQuJ27qUZNqR2mWNnU=", + "pom": "sha256-JU/hkxHS2kHNBwgHfCVfQgXsD8ZKHAfuE7Cxr7i0TYo=" }, "com/google/errorprone#error_prone_annotations/2.11.0": { "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" @@ -1761,6 +1757,11 @@ "module": "sha256-LiFIzSE7T49U1m0FSKIoBX4fe2czLg+Xmxoc42sidqc=", "pom": "sha256-MVkkh9X6euW87fZ4Bqy93Eh9zPROH9t/z3zlNkrPyFw=" }, + "com/squareup/okhttp3#okhttp-sse/4.12.0": { + "jar": "sha256-v/T7yu96rC2RDU/0ba+qTm0V2hJ99rrJchbaRpQ6fUw=", + "module": "sha256-c+RIzK9gfU9gO4tuZmGHKk/6PCZBGTyLvE1r2h5Ww0I=", + "pom": "sha256-lKunzO96e5DcolIFhb8LEjNtyO+U1ZGWPu2sV3lnkzw=" + }, "com/squareup/okhttp3#okhttp/4.11.0": { "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", @@ -1780,15 +1781,10 @@ "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" }, - "com/squareup/okio#okio-jvm/3.7.0": { - "jar": "sha256-2LNa3Ch2j0OuWv5qfRqiqHi6UeC5ak8wiBHzsfWxPlU=", - "module": "sha256-b64CAbCuSKGWBt4Ab/6YQtjQ/CoeQ04Hhc7Ni3Wr5HQ=", - "pom": "sha256-d07LnSsHlLT7J+eeCHYMpWC39U+qlRm5GDxn/rRfLJc=" - }, - "com/squareup/okio#okio-jvm/3.9.0": { - "jar": "sha256-3cOG/xS9JdXJNBZxlur0WxjeTyjhxVpNs3rllMv9N+Q=", - "module": "sha256-z5coTsYbtR5t/Lx/K22VVsm3s+PLIswOLU8O7782GVs=", - "pom": "sha256-VEiNRUqsyvaPcZnz3l3Ns4CBblfUYJBJF06FZSAROH4=" + "com/squareup/okio#okio-jvm/3.9.1": { + "jar": "sha256-/m/pE3j5v6ewjDhkgozkGABc8orMoS6IR+tlxWXDdQA=", + "module": "sha256-sK+pGSxC18Rj3jjWMlk2xpAdnjtxSXNf/RihHfMQNKs=", + "pom": "sha256-VXZInO8kBTNoAPxt6VhUU18zVxpO/lpa0OybmwkNIdU=" }, "com/squareup/okio#okio/3.2.0": { "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", @@ -1798,13 +1794,9 @@ "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, - "com/squareup/okio#okio/3.7.0": { - "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=", - "pom": "sha256-H2KMRSg726uM4DwHps+3akeLjdrhgL2PNKusJz5Id24=" - }, - "com/squareup/okio#okio/3.9.0": { - "module": "sha256-aNHIef9liTHQKzrb6vu1EuFjwgqQyt8H2QyNvqfnYhA=", - "pom": "sha256-FPNR2puXtDaeP26PaWsK1ANtFNIbD9l6pcjG7BW+fZA=" + "com/squareup/okio#okio/3.9.1": { + "module": "sha256-m5C0J0pa1gLdV01tS0iQNmOy3ppgufw0AiSCk9hD4SE=", + "pom": "sha256-06DDd+epr8zbsCqrXgUNwhL/2pQNvUcOo5cSpDQt8I4=" }, "com/sun/activation#all/1.2.0": { "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" @@ -1861,18 +1853,10 @@ "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" }, - "commons-io#commons-io/2.11.0": { - "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", - "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" - }, "commons-io#commons-io/2.13.0": { "jar": "sha256-Zx6qOWiNrC/6pGRbPJmAri0OokceSual2hmc0VriNmY=", "pom": "sha256-2z/tZMLhd06/1rGnSQN3MrFJuREd1+a5hfCN2lVHBDk=" }, - "commons-logging#commons-logging/1.0.4": { - "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", - "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" - }, "commons-logging#commons-logging/1.2": { "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" @@ -1948,13 +1932,13 @@ "module": "sha256-lYBVD63Yll7/0JcuBPyr18a4tGnbZYJETGBDlhpwU3w=", "pom": "sha256-5qaM9mg8s0uAuqRMq+AKR8yzYVAK1ANjoksSYKFVePg=" }, - "io/github/pdvrieze/xmlutil#core/0.86.3": { - "module": "sha256-MzlXsdCR2LrPqwYCCGgi+a2S9hMCy3Ru8g4Z9nprTbk=", - "pom": "sha256-ngeyUCJI+U7AYn9Wsn3wiBySBCrfzoCg35oa6sQWg4M=" + "io/github/pdvrieze/xmlutil#core/0.90.2": { + "module": "sha256-h13of98HvSr9BM7PRgnTA8adxpnAJD2UPXuLR3WC5ec=", + "pom": "sha256-cZNkfkOFEPBfYeVd6cDcF9hHe4R3ndIyadDs6EIk1IA=" }, - "io/github/pdvrieze/xmlutil#serialization/0.86.3": { - "module": "sha256-gWAn/0s15EE1ZytqCH8U4O9pyfVXeUJpvXN4wm9mhOE=", - "pom": "sha256-dr67jk0C9ZRpOV1p9HIsz+W34gMz2w3sLpZXZRK5+MI=" + "io/github/pdvrieze/xmlutil#serialization/0.90.2": { + "module": "sha256-+Yzn81bcp0UrrS+E9ogdLQI1Y0b+V7FHZTOnPLU7860=", + "pom": "sha256-gW/FQKiUEdXSOCkpBj1bgVfrpgLKG0rS/y+hq2/4sYk=" }, "io/github/reactivecircus/cache4k#cache4k-jvm/0.13.0": { "jar": "sha256-jhGawjDyzFFVaPyo/o7q/TgvyPCTl6JHSqsY5JZidcs=", @@ -1997,138 +1981,184 @@ "jar": "sha256-bm7hQVOfoU2fpHn39RFgVUREPH4BHnjic8+UaKoYMGA=", "pom": "sha256-bURZSHxiHf8xUQqIgpBjYx6RXS3Md01xkoQYEW5ZqI0=" }, - "io/ktor#ktor-client-content-negotiation-jvm/2.3.12": { - "jar": "sha256-tlKQrBAAljY9AepxAn2XDOxqSNB2tuSzbeHK4sGDzXI=", - "module": "sha256-aE9TOE1TEuLn/JQRyIMdkhnRnT48Ykph2Tcm+rrNH5U=", - "pom": "sha256-BQ388K9CsJyFJJmnK6F/mi2c7RimnnHA7LhmJ6in+Kk=" + "io/ktor#ktor-client-cio-jvm/3.0.0": { + "jar": "sha256-C+BPu8totNQEhT43DXXHqVqwkUmxPq8m9bQWAhs0bQQ=", + "module": "sha256-ypP35C2hTnq0db27+u6c1qddrxM3kLcJKMNVtUprdsQ=", + "pom": "sha256-KXVutf4U73dFHckAjV6EPXMEtM8JUm2aIDR8mwqvTr8=" }, - "io/ktor#ktor-client-content-negotiation/2.3.12": { - "jar": "sha256-Ak3H3Td7OXwXg7LDbJeQ8BYVbphzGEP1phOc8o3uP70=", - "module": "sha256-c7tFC5zZ1K6AmA8McRto9+iaYPQ4DQ1EtBeNQnmmxfM=", - "pom": "sha256-fq1NUgsZkUKY11B/SlxwkGkkMPSJXTWcc0KzjVwUZbI=" + "io/ktor#ktor-client-cio/3.0.0": { + "module": "sha256-iudmnpXhbVcoZ74lGx6jkWg3X//6ksd/ETjRSk80GgY=", + "pom": "sha256-SzlUFp02r11bGgxSfgytL026K1PGyFdvRsZkTG6GZoo=" }, - "io/ktor#ktor-client-core-jvm/2.3.12": { - "jar": "sha256-tAeoHZLmzUH5LBUPH9MGDV/KNJHOAq+39xNCRAQIHHo=", - "module": "sha256-tLgSabjOWrX2/g+F/kfRVoqOlZxKuUtn1XQn6XEzVh4=", - "pom": "sha256-DRlPg9ywetvZfpAp+cotuwCcqXJXd8bRuezOqvw7Fns=" + "io/ktor#ktor-client-content-negotiation-jvm/3.0.0": { + "jar": "sha256-m9WHswowDLaO9d47j9P9bqqm3HQ9jAeQjRt7WJceW10=", + "module": "sha256-07tySO95a59///X7utw4OyLzbd2DygXQ3M4FFTWbleI=", + "pom": "sha256-fa9qTK+Ho2lVVzlB4+4HuHKFpXPLBjMoXnxKTOa0ib0=" }, - "io/ktor#ktor-client-core/2.3.12": { - "jar": "sha256-E/nV7COKqNoX8sCAUA0GipY6OKMaFkFQl7hA5fjDv/Y=", - "module": "sha256-hCfawQzvA9tUJUm9tArUlCSP/tB5Ar35BeSw6MVB7UU=", - "pom": "sha256-0rEDA3TSk+63skT9xwQxmThMh6oJh0Wv+OqCxcnj8fM=" + "io/ktor#ktor-client-content-negotiation/3.0.0": { + "jar": "sha256-9OSVojUAqGywmqk37Jc1I/0dP8pazVarSIkSbwyE52U=", + "module": "sha256-1HEXV3yDW0vWu09WiAEO1whHuwVdcaOPyYwBGreoT8M=", + "pom": "sha256-daODY/EQym4aPbMclIxY/wCt8ZmA2AmLDvfqVLL4v8c=" }, - "io/ktor#ktor-client-darwin/2.3.11": { - "module": "sha256-YoVOVpzRv6jTMgt1jPOc1arRZi+nFzYX5r52c6ZmhCw=", - "pom": "sha256-fbAq8OBLy7jeADx7NjTeLQzx9hH76pnEZM8GDz4lkf4=" + "io/ktor#ktor-client-core-jvm/3.0.0": { + "jar": "sha256-QNLQ70M+/dc6f3lVP1INp9eg6u5Ss6mla6DnDQyplhM=", + "module": "sha256-DkDPlWGCAsCVe5ESvcCj7ViMqZeSr3+Q1dpUEOVKUL8=", + "pom": "sha256-jYcwy42ptl7pZ26tKS8gZwnSOhLKBLZl8ptQRcNaiJ4=" }, - "io/ktor#ktor-client-logging-jvm/2.3.12": { - "jar": "sha256-KQI3ExFtuckQYY7b08oOeg8H7RimeFI7iS/RZNHJ2s8=", - "module": "sha256-aRw5R1p+oq4uGM3UqbzfudfoJK+5PUfLVpimVeaH4uM=", - "pom": "sha256-eZbE6aHzj2YbMQLSwXo/UvQvLXmo8SzSjsfe6muNTXI=" + "io/ktor#ktor-client-core/3.0.0": { + "jar": "sha256-ju597n1o1mxjmmW6cqeQHwa5PDaB7+fkZcMzYP/dr9o=", + "module": "sha256-J5RlKvbMd7eog3ypfs6URW18KdutmaFS43z1QibT8Io=", + "pom": "sha256-un9vXGzVyAMMxRNmp4m52IiIxneZhJ6wqboVvFHYljY=" }, - "io/ktor#ktor-client-logging/2.3.12": { - "jar": "sha256-5j6nvrSK6N2AcBfkydxyZtUg1DTMyMmTHyONgvPXEX8=", - "module": "sha256-ELZ6GceSS+/J6/AN65qaIlFv6hW3/SRLoRjgpIL+fzQ=", - "pom": "sha256-TjkQM8cnuQsynsNMAFSWexRK+Z23LM5Xk+nVw0ceCdQ=" + "io/ktor#ktor-client-darwin/3.0.0": { + "module": "sha256-GXxqh0vyPTsH5HPIUnpG34WtfbRwQ6XC4uBga1rsJ3c=", + "pom": "sha256-5vYXKJXZezPLdShe5XWT7Jf3CMEptt0XSlEl0MAg6bM=" }, - "io/ktor#ktor-client-okhttp-jvm/2.3.12": { - "jar": "sha256-MfTZz7AtqNh08FDJhBsssx5TX5sTqXl69HmdWwNW0Qo=", - "module": "sha256-3LbvJt/LC5G4gprlRHqpPgkPOO9JoNNSHFKdD4dCUX8=", - "pom": "sha256-duHyGn0yARx70fSo5+PQLAlLqTBUbUNoJFfP/dYa91I=" + "io/ktor#ktor-client-logging-jvm/3.0.0": { + "jar": "sha256-VPWVvr26mEql1nZr/k2ZlLErMOLu+gMd0ZzF0+cASgk=", + "module": "sha256-BG20wfsZIQVklg9QhnAW2+9KpjXbvEp9Y1XEQtgZ5r4=", + "pom": "sha256-bfYvdXx5aBJP2B737DJs8i2xfbMIbxfp9qEACBn8Fn8=" }, - "io/ktor#ktor-client-okhttp/2.3.12": { - "module": "sha256-qbO/16t1wKjwHfdeBFgZ+QarS+hmNntpPI8rEV7ib9E=", - "pom": "sha256-bJpOKExTlJOcWcJPMBw+Um0v9ST/MY3+xTHPz53+CPA=" + "io/ktor#ktor-client-logging/3.0.0": { + "jar": "sha256-mHGJZAhCeexxqus3CN4eJKA33wamhBHIvjT2LBgQNMw=", + "module": "sha256-ldf3dcH61Ixik2hxBWXeb1gf257VUT7QvdzTxTagLvE=", + "pom": "sha256-uX8Y+QLz7wPBRngBvPYPTbeOw7vM/FWLNJSOR16A6Gs=" }, - "io/ktor#ktor-client-websockets-jvm/2.3.12": { - "jar": "sha256-1oyl95W+4IelVSiXQe9jhlFJuOUFuy0I5Fyh8x2MYuI=", - "module": "sha256-SNST0Ov+mK7puBx4WrgBR30iVTSC2UGUqEaeuPzp4cA=", - "pom": "sha256-VxEuZo1G9lKoq7yyVorduwzHbenEQb7+I86hrwYljNo=" + "io/ktor#ktor-client-okhttp-jvm/3.0.0": { + "jar": "sha256-p9mmD55TfEseB73ca/N7D+bSXFiNmT+DE2eHsevH5SY=", + "module": "sha256-tfBQk+8L6NeGdHdEtW059dJyhfG54umsf+32GBAXrfA=", + "pom": "sha256-b3jxdL69Mwc2L7OXgQjvZhIU6dqIjqvkTrJxewLevIc=" }, - "io/ktor#ktor-client-websockets/2.3.12": { - "jar": "sha256-qr3hPBfOOQOkZD+X89uWRfRiuDLtXQeDb2WBtNMMoz0=", - "module": "sha256-lBQ+mI228ZzeU2u7pdkwc2gxy+OFaPQoH5VSQgpanJ0=", - "pom": "sha256-DjRE95fKkOKxq4ZqH799sfnZBQguKl7v0YKoSrDxQyU=" + "io/ktor#ktor-client-okhttp/3.0.0": { + "module": "sha256-mnEmHQPWnGpy0G7rE8CFfxxjX5zEZkYE4dBa1VFJtl0=", + "pom": "sha256-4Un/ScN05PknjuBYCQ235TK6LoFPjHwILD14HRMfS1A=" }, - "io/ktor#ktor-events-jvm/2.3.12": { - "jar": "sha256-RPCx3msJRxgtJUCNEQHFbPjAGnuAnuAVK9gdmtyapXY=", - "module": "sha256-wbvWTDPBa1jkGAsX84UjGAVQl72vhJFKSCNhkxLtJ7U=", - "pom": "sha256-PKeHv6OHkBQvbKaLwYR7+AAtHiSDh3nhihK1vwIna5A=" + "io/ktor#ktor-client-websockets-jvm/3.0.0": { + "jar": "sha256-b6MvwTEvhkbtaoRXSNk2nvC/xOuKz/LxLHOFmFJ/g/8=", + "module": "sha256-vTOmfaXJez0PEd5S8bXiTWc1VTAibWp7Qc0LslIHZUI=", + "pom": "sha256-vECMavY453lRRmLluc/uzXiJvnUN9yhlgnYlyTfUbpw=" }, - "io/ktor#ktor-events/2.3.12": { - "jar": "sha256-dQdvbe9/VwlGkWmYMw0n28OvdhfOyyXRZXyaDUKQFgQ=", - "module": "sha256-+Smg6nj7EudbLYIlbMUfGL77D+8ZpGHuuJOJyVG43q4=", - "pom": "sha256-OUMSxuErQx+I/6KbrRS7mTXvJRBgyWWhatNcLxEr56w=" + "io/ktor#ktor-client-websockets/3.0.0": { + "jar": "sha256-bHJ51BRecggrWv5RsTn4KhIy0Z0y71tjU26cokrHfwg=", + "module": "sha256-WYHr66PadulBfFn1s5H+B1WRzJHdWnHKy5Jf8Pv0s08=", + "pom": "sha256-q0VIACgLhfvUBfvS8V5MW1Lbyvn1J75E7Acw9+/i6vA=" }, - "io/ktor#ktor-http-jvm/2.3.12": { - "jar": "sha256-kHERxDmzvUQz0t67aHkg1fjfjGIpto7VQIBdXjdjtqg=", - "module": "sha256-HbJfyAaPHE6s8LRgJCSSclOZItL3xCWOUR+F4FhSuMY=", - "pom": "sha256-QULK0p5v7rrjm64YKryEmVrsdwRk8lLfT+ZF4aXdfBM=" + "io/ktor#ktor-events-jvm/3.0.0": { + "jar": "sha256-hYuNvw+oTgKBYMw1jYgAKeImhgqWUdE1I95DaGn1qAQ=", + "module": "sha256-MrOYUrHaB8Ok/JO52KygXs/M1JdDIIsMxN8Zo9BdKw0=", + "pom": "sha256-pvL+a0iw1GRaHneE7ksqXYhRzhANxmiPXBnd+dRPLUA=" }, - "io/ktor#ktor-http/2.3.12": { - "jar": "sha256-2RVRfiXE5feMUP0Yg3twtGKbhQ7sXmTz5GF8Jj5ovbc=", - "module": "sha256-97kqlGhYpGSFonWEZ7EolLEmNK3B1AKQN62Fiec7MOU=", - "pom": "sha256-urBNfz5lqaxHnOzij77ymx/UAVkT6ZUZfHbORE9uWGA=" + "io/ktor#ktor-events/3.0.0": { + "jar": "sha256-9ZTNha1EJSlDiwtnUxk/nQcddWC+0Jh/RI/N1eKFUBM=", + "module": "sha256-f6YQu/QOHvwO0R7EfBuHmxtfoj+BGuo3SPBn12I4d5A=", + "pom": "sha256-2HDxlAmG2penAr/ssP/r0mn+Gh+dmlVtwZRsNu0zzEQ=" }, - "io/ktor#ktor-io-jvm/2.3.12": { - "jar": "sha256-HZOkVmX2dE/5bNe5ekX7hf/scltjvMMn0zomocfgX70=", - "module": "sha256-ZH9Yx3f3Z9IIkwbbiF9o9YyJjqGwm4+956NwUC/61BQ=", - "pom": "sha256-W8eJXaz7EhDj8C/Qchz7sSaQOaFqr5PppHGpMa9Ufe4=" + "io/ktor#ktor-http-cio-jvm/3.0.0": { + "jar": "sha256-uMqpcgttvrmKEuPXZlLZePe9237p0QO4xHJ+SK2t+Ew=", + "module": "sha256-F1/xTt58LIlDrv6ZM1mfNI0twO4Z0bMJnR0P2hm6SOg=", + "pom": "sha256-hcmW2+P201EgrxIjDwMrQ7d4x0H4tfHZJWgCvsFj9CE=" }, - "io/ktor#ktor-io/2.3.12": { - "jar": "sha256-n4jHL7xCPrCerCM9Qc4/npXZJQ4EntgD4HSoIeQsv3U=", - "module": "sha256-QCIhmbDLWK9t6Kv8UzMIVLv3h05GYpsma49J68XW54U=", - "pom": "sha256-WAtT3KPqyxvto29WIH+8uA3T9hk5h5/iEhd/G2RLJb8=" + "io/ktor#ktor-http-cio/3.0.0": { + "module": "sha256-BryhzL2ZnhkXL9sMP9fFchEO2Zb2er/p77yKCqOjX4k=", + "pom": "sha256-rQVo9KYQTK3KH7vr8bytRxo5cPCCMfE5Lv3WhMZeMKI=" }, - "io/ktor#ktor-serialization-jvm/2.3.12": { - "jar": "sha256-DgVTT7w7CUESe27znnBcNMNn2uiwoIKQcBxg6X6I+nI=", - "module": "sha256-GTKCfmbOzf9dgIaAjJdK/es3fM/bL50f+UBFdX8o1LE=", - "pom": "sha256-NrmT7RV8Xg2N6VDQjNIZyykQnY37JPYIyonzI062VzA=" + "io/ktor#ktor-http-jvm/3.0.0": { + "jar": "sha256-5YLda+2FFQWMn2obwwfIkawnkL0teyzJ7uwBbOUiru0=", + "module": "sha256-4gQAv16GCdB4DmNqz41jTEbprpYcDcYQaf9ednDfzJI=", + "pom": "sha256-66HWXy8EQXLl17IU9TKqngBZH9IEbddnqwwCX36quME=" }, - "io/ktor#ktor-serialization-kotlinx-jvm/2.3.12": { - "jar": "sha256-xhQnYJ9dbw45jfvySnyafftK1ZDon1TFwCHNfHEtSn8=", - "module": "sha256-UO9Nf4ee4QDi2uz81/tHpIX7/CPcNXDAPki21LZIfgg=", - "pom": "sha256-XbOFoQf2k+Mgk+TrG92VWfIqVsJdvxkN77eCrAtQocI=" + "io/ktor#ktor-http/3.0.0": { + "jar": "sha256-CEl/mOtpUABmJ4T12qd2FOw+ZsoemAM5zLPYri5Hr1c=", + "module": "sha256-lM74twGDwzx0gSwe4aD8lnlUAj7VzCIeZaW42UkqmXA=", + "pom": "sha256-jlUcXPg38AJy34ylxQOfRDIeoIO+8rLP73qofrqNVaw=" }, - "io/ktor#ktor-serialization-kotlinx/2.3.12": { - "jar": "sha256-+lu+kbBqPGUW1olfbvKp15rAEJO5jDKAzCv/+kgktQg=", - "module": "sha256-giYVZjIHuPTT72bZO+yzk1QhDhUEgOcHrI/LFkmYPRA=", - "pom": "sha256-1WBIrQOYmjq3ZFiYEZZ/Pt3edNBwPNGIQyS4LWCDHZc=" + "io/ktor#ktor-io-jvm/3.0.0": { + "jar": "sha256-ustZQyg85u0gFCYJeUXppbVqyV94O6abqFRWT3POT70=", + "module": "sha256-C868aTrqNg4R36xXe+9d4qo8QhBcCHPUPMj/sTzvRoM=", + "pom": "sha256-6uEaluV4CT87forg1wW3Xx11llzvt3Xq8SNz+O/zDjU=" }, - "io/ktor#ktor-serialization/2.3.12": { - "jar": "sha256-I/oFsvofdMi+5JsvpNCmzRaXdvXLw7e00I5nfmr7n14=", - "module": "sha256-k6tLV6lbcXNH6smUDI5QkhvQ2EBKw4j6mDlLRaqMRGo=", - "pom": "sha256-Q3WCoJTbZp2kPogfpctbs8IGJ+O+HgNkqk53hSqrG4Q=" + "io/ktor#ktor-io/3.0.0": { + "jar": "sha256-CZDBLe1OL74D6pFX4X0hoNH0IXtdjKlqV8r0NY00Mhg=", + "module": "sha256-9ZwwqS0Pw6mfz+Iho1F78enmaHznA8neNopHZmyBy8U=", + "pom": "sha256-Z49tKZWdnC2PV78B76DN0wNBhlxiC3eGpw9EaHhvtb8=" }, - "io/ktor#ktor-utils-jvm/2.3.12": { - "jar": "sha256-anLWhnMwBl7UYZUv/xnqVbqEQ1L3SM7Bhy9bx7Ie/AI=", - "module": "sha256-rYMuChkwgwCinDQNvY2I0pAcLzuw+CFhrWamLSB4VgQ=", - "pom": "sha256-Xi3ckkIaAAWDUdMPo45yB6qYsZ6fLYCYRFmIB3yPNGE=" + "io/ktor#ktor-network-jvm/3.0.0": { + "jar": "sha256-aKbOFcq9o5XK+Nq1X6+NfcnjH3BshrLOkMz+dHSIwwU=", + "module": "sha256-QQObTaUHAcPcLz0ef8qOhRrQPvN7Rndws1JQPo2MoRY=", + "pom": "sha256-84dDKHVkySEeG9z4f5anqHzR/TiiZqQsBjkUPDbESPw=" }, - "io/ktor#ktor-utils/2.3.12": { - "jar": "sha256-SJeUj4AL85YHGPuaWv9QErcht7iWZjhZWCbGstp8TiU=", - "module": "sha256-Rxwq3h1BTGX6Y9C0LIdLqcuUhGsZQQnD0PAEOwtnt6E=", - "pom": "sha256-lIfQwBRDfsjcthP6Gl345WmTsc7wQqKXMPw99SQlsrg=" + "io/ktor#ktor-network-tls-jvm/3.0.0": { + "jar": "sha256-w6Xr0Z1DiWKpZFjTptuyJDJTxSjWtgloLPObh68bkNk=", + "module": "sha256-/tUy73zGrUvrVIBb82LrIiG1SHQkxHQIZw3HOFXOM04=", + "pom": "sha256-NLeibN8zzWUCpPOngEj5sgX5ZAqRBh5EFYx+lck9IiY=" }, - "io/ktor#ktor-websocket-serialization-jvm/2.3.12": { - "jar": "sha256-v/iQ16thcVUa5PBjLprsy5BI3zHW1zz1Cr1bMwCArTo=", - "module": "sha256-PeyRtQnxTtpFGjWpyOY+bmuNJz/4i2u74BK7dTzdOwk=", - "pom": "sha256-pqTtw4NX9DjErB5Zbqp4SILGmurmVz1ksaKrc/cNBp0=" + "io/ktor#ktor-network-tls/3.0.0": { + "module": "sha256-zSpBln//ZOOe8ow60Hta9o2BF0C+eIJVCj24o8qgoAM=", + "pom": "sha256-WsIkLG+Uxz8ZmNky70+OxI8omNwjuunuPp5F1xdYChQ=" }, - "io/ktor#ktor-websocket-serialization/2.3.12": { - "jar": "sha256-JCEwwgnDIoLZ8g7EnlfXSBihpyiADs2QLe7dzwURgMU=", - "module": "sha256-lbcbDeXFGs93fnTXkCAnFoZi59dR3aU7lJ/C+ChHSuE=", - "pom": "sha256-eU8LskUjFQQH8+ZTrYqUYzKptPmp1ryv/RBlvxN9iSw=" + "io/ktor#ktor-network/3.0.0": { + "module": "sha256-3EgpWzP2klWeajqD3fBLMXBIVt7y86oaF4x7qyKM4qQ=", + "pom": "sha256-A8TtZp2CmBY+KwEWDTKyqtNMpMtY40U8UYP6xzjY2NE=" }, - "io/ktor#ktor-websockets-jvm/2.3.12": { - "jar": "sha256-3DXMU59N+lpK2bORwU0GUn36xPZLPj8FD1FDzrIVvKQ=", - "module": "sha256-Xcz1g9dBybFg9pnYyGS53n6JrFz+f2fTHQIHvaejvl0=", - "pom": "sha256-Pc9D1TtWf3T3z2VvF/r7QfRtqztf+6AHZ2EsJH/W7Rw=" + "io/ktor#ktor-serialization-jvm/3.0.0": { + "jar": "sha256-tphacvF9XmNyJga+0q4+7V8qG2guBQ00s/RiOJ1BZMU=", + "module": "sha256-WxJ3pA51L/9d16G0KUIX5yA05F0DkLvYDVXSwOzeduI=", + "pom": "sha256-dbdCQwGmzkLBWMaLHdk1WFR5kPgldH2k++lrx/jb7rY=" }, - "io/ktor#ktor-websockets/2.3.12": { - "jar": "sha256-XdKULp+AhVyqGFXiShT3DxqHWcg3tFTplRdqPMl3QVg=", - "module": "sha256-7biouqRoijD0YqQtIuirAHY4HvISCkwKqyasIkTsQaw=", - "pom": "sha256-fikEQUdSd1ifC2TgEptfmZHQir9YQwZCzMXfiYbEh+E=" + "io/ktor#ktor-serialization-kotlinx-jvm/3.0.0": { + "jar": "sha256-Y/3fsW8jhfou66QDYK36mZORJmfjNbBUbizE3g/WamQ=", + "module": "sha256-pNrlPxx/8Gok5UuUZh8MSsuG6p2okwAAW1kzbcBnbXc=", + "pom": "sha256-Cn/umjR5S15uoqzhlA97DP+2eYKJhtzQEInaoLzFgmw=" + }, + "io/ktor#ktor-serialization-kotlinx/3.0.0": { + "jar": "sha256-AWgIAmI0ygHr3iE67Uc/T8+4VA3xLkPvqd9NjB2HBtc=", + "module": "sha256-2n1xFSKjIhKqqzrFXOi+g272X+fBxaibqH0DbTOsUEg=", + "pom": "sha256-hrIYOupbviqDE5LlbUGlsNlnzL/pUs1rydbtBTYJw/g=" + }, + "io/ktor#ktor-serialization/3.0.0": { + "jar": "sha256-sgYtSF4XAhkeDpzlck6xSIxujiT3pzHd/GVp18XNFtc=", + "module": "sha256-6Hm2OkUpK6vY+9Vq/apM0tRcgl9UDUCbV1qtMreBzgU=", + "pom": "sha256-GCmTn7aFj24LQt0gXZm6Rbs0WQXtGX9nZsNKxRXzHHw=" + }, + "io/ktor#ktor-sse-jvm/3.0.0": { + "jar": "sha256-2JiNEV264UTuMIXtHBdKj9liZbxgM08oe6T1MvsGEk4=", + "module": "sha256-8jNJUX6IfymWJgNyBJg++6eqZV76pBSoeI0GxaCiflg=", + "pom": "sha256-Pf5Qu4jMkmzPn4pQouE0/ZzLPrN7W8pXW54OH0T4hu8=" + }, + "io/ktor#ktor-sse/3.0.0": { + "jar": "sha256-CkMI+fHIHh4OBspttiiNLerdin6lbj0ecsGurdY8FE8=", + "module": "sha256-JuiqoUnE62CLupjnCtcASvcN+DTD+BhRxeSOpA6ocX4=", + "pom": "sha256-J62e0p1svkljhSjK59ygtKmhdrhhdFBSSw+KIG6OoSo=" + }, + "io/ktor#ktor-utils-jvm/3.0.0": { + "jar": "sha256-lDZE3TKFJchGh7zbQjblTTN9Gh0MQShovw7dU6XwZ24=", + "module": "sha256-No4rXA43P0HACHGBm0/PSaZbUDuLld9t3uy8RnAUrvk=", + "pom": "sha256-kBqY9RkGg97j1yDTayuOhAcVLMTA/H5ZQTqYP8JITjo=" + }, + "io/ktor#ktor-utils/3.0.0": { + "jar": "sha256-KhfT/Xw0P8joWZ4YGu61WK9gg97quti+DONF/yODxHI=", + "module": "sha256-ycYexU9YjOSZHvczyapSggPDQV3d2mJS/sxpLk5sgyM=", + "pom": "sha256-I7S5AYs7mWJg4MgMDskOaOQgknoBshGwqkZBa+NDkOU=" + }, + "io/ktor#ktor-websocket-serialization-jvm/3.0.0": { + "jar": "sha256-Xbqz6z12xUytvAAfC1DEK9ypIJIcKuLGnMCBg6DsM0A=", + "module": "sha256-0eyfafctLS7fjzXprokVGSMPbvj17Y10IunQO+d7s9c=", + "pom": "sha256-4YgNYCDataGuPj6V+Sp+NxpC67ddXbp+DovuLvyUsNk=" + }, + "io/ktor#ktor-websocket-serialization/3.0.0": { + "jar": "sha256-5AGS3sjS8nW1CBCTYUwci8XWzz9Dg0GmVK241fmFwnE=", + "module": "sha256-k+e4Y1Helw6ePdNX1gkxKjmQAFku8/FRs0VsXQI76z4=", + "pom": "sha256-exvxu8zgYx2lyIa1b62xwd2aPTqLDL21Lp56URCPx5Q=" + }, + "io/ktor#ktor-websockets-jvm/3.0.0": { + "jar": "sha256-dQt7iJh6EZ+jK9yt14FVV8NWNYe7temFx2l98hBieaM=", + "module": "sha256-9PY7ei2ivWRtfqoKU8pULQE4YkuMTKMzTEaK92lxizc=", + "pom": "sha256-+aeJOtYmEras6xdL+BwwdUGKIJ15JodU/XnYKKAM9Tk=" + }, + "io/ktor#ktor-websockets/3.0.0": { + "jar": "sha256-phi7sxswNCc9YhDNMuTD5OJ+2vi0npU/Kf9vQdfcso4=", + "module": "sha256-fOCebPFtIZtUgJ98HXjDuuY3LAEmB+IEgVbGaeKiGF8=", + "pom": "sha256-eNL1rfAuoz38I4lK4bYLfhbKJiGwPmKBOlEgUMgBMlI=" }, "io/netty#netty-buffer/4.1.93.Final": { "jar": "sha256-AHx9nDeN8C05BWfQ1931Qv/dsCG3MT2/UCOSET/6uwg=", @@ -2206,23 +2236,77 @@ "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" }, - "media/kamel#kamel-core-desktop/0.9.5": { - "jar": "sha256-q9TSnDOThoqV9YEyU1cBjuowoN2a7QbDDNyv8cJ+m0w=", - "module": "sha256-bExl33UFF/bJa7mRqh+JVA8lYD4G7y9V7svnkzBA9lc=", - "pom": "sha256-4+vAf2+3wh9bib7xc+5KQns3xzvEFhWMJ8l0EayFgms=" + "media/kamel#kamel-core-desktop/1.0.1": { + "jar": "sha256-8vKOmPKlyGT/PHcEyrH0BQkYGsp07Qcz0P0+DR2Zw+8=", + "module": "sha256-CKKOsNNILL/MVX4eNg5YSEBWr0cKOfmzDZkLyiKZIr0=", + "pom": "sha256-/9V0d+0R5jbb9z0u6zw9ZPi6k4CpwDcKx4tqSbnze4w=" }, - "media/kamel#kamel-core/0.9.5": { - "module": "sha256-o7ZF44wFJCXXyhmWWE6+nEX0L67aYyEXV9ZTC4Pz2zE=", - "pom": "sha256-iRvxS1TFkxpw4QWQkAYp8mgA1FWM3hdldMZJvEy1Z+4=" + "media/kamel#kamel-core/1.0.1": { + "module": "sha256-H4FkNQdjPKhfz2S3yuvawg0mru3nm5QuvEHIooyg5Kc=", + "pom": "sha256-HN563jjU0YGQRjG648IZ0yD3nQ0agoTbTCYZoY98jYc=" }, - "media/kamel#kamel-image-desktop/0.9.5": { - "jar": "sha256-hcIZ8U9u3bJM+u3uLnf9U7lPaBBpRrKpjLC3ZODCFKQ=", - "module": "sha256-GIUN5w3IniJ03C0xIzhABInowxxi1niWQRj0Yh8Lcww=", - "pom": "sha256-dMQr6gAM5sTJPssay+jFNi70msEMTJDz9CzS9YusgEM=" + "media/kamel#kamel-decoder-animated-image-jvm/1.0.1": { + "jar": "sha256-SVItvyv5ILBqn+cR2fnlU/IPLMvKyPgL16UD8f5wWVU=", + "module": "sha256-fG/Oz6p5DSvMU1oMy2i90w9Wuqh4VGxxL12b6QAi69A=", + "pom": "sha256-0rTizFuE/zZB7f0bgvm8gSitaKv59SRdu9sUXvjshF0=" }, - "media/kamel#kamel-image/0.9.5": { - "module": "sha256-lKjteS+qHphhO9C1gpeipIVDqKqp41kXB1x32sQiunE=", - "pom": "sha256-IxeO09JzxhY98/inBV9cU4oksNpXGYUFsFyQ1bdau98=" + "media/kamel#kamel-decoder-animated-image/1.0.1": { + "module": "sha256-PTstgotFXOJ/IDn+68g0Y14z2CjE+K5b/Azw0KZ0vjA=", + "pom": "sha256-s9YLVLRetKBzBcSbHTAs5ARfq0AzU9GPrJZdUaieG1Q=" + }, + "media/kamel#kamel-decoder-image-bitmap-jvm/1.0.1": { + "jar": "sha256-YJ8Kq8+FBtNrcg7BzuUZO/BJqWi1cMb1ACmGokZ3bqA=", + "module": "sha256-Hj8292JjzDiNFyosy2mtPdgnY856U71BWpNHN6JXykg=", + "pom": "sha256-TsyEfyOCza1utcvDidlsTTx5P2z/SdsjS40KBBVoLF0=" + }, + "media/kamel#kamel-decoder-image-bitmap/1.0.1": { + "module": "sha256-bGMQcs47rFFKZtxyfPG3+Y3q9FW5omsJHUUMOFsA9NQ=", + "pom": "sha256-2H7DNLj5q7ydVwLOuasaj2wBCSblSwHPa7DZXsYPXFw=" + }, + "media/kamel#kamel-decoder-image-vector-jvm/1.0.1": { + "jar": "sha256-yt6sb2hn2pNOYwhsvvA4zXbQYP7BaAbCnSSKddGUGgE=", + "module": "sha256-5fkYIJR3T1ape4M0kyi/WcYfgnqgwwCy02yEfBCJYTU=", + "pom": "sha256-xHylt0kkZXXK1JHg6thTVBafGpZsG2swu2NPm0PW5aM=" + }, + "media/kamel#kamel-decoder-image-vector/1.0.1": { + "module": "sha256-2zU1AaJ92tjuTAs+BXrnDgf1dxTvMFxAFdUbHV4DxOw=", + "pom": "sha256-U27v42PhrWYaZuPN1q5Y6dK7TYTo7t+6AAfoQF3ykHs=" + }, + "media/kamel#kamel-decoder-svg-std-jvm/1.0.1": { + "jar": "sha256-ERkO0a3BAKbPH1DgdnxHWGB6m8+heC2yZ1Vf578zZMY=", + "module": "sha256-KtMHGYxMW2yHCKSFdNeHJ950taP/KPwha1yls3EwDVI=", + "pom": "sha256-BBMl8hh54taGflYEuB0uwI6VZvi0ozxzYNqwvTsY8V0=" + }, + "media/kamel#kamel-decoder-svg-std/1.0.1": { + "module": "sha256-wQW13UlxDGTDkWUkPgK2FpgNi8WN7V+3e/kEfHdOR10=", + "pom": "sha256-onFDz/fQpE9590nSpZnX6iaH7oafEK8MjkabCYcZNPo=" + }, + "media/kamel#kamel-fetcher-resources-jvm-jvm/1.0.1": { + "jar": "sha256-waJjSnPzMBsj21DVp90moiFGpbgp8IMMsQIdhLch80I=", + "module": "sha256-1GTYoXbFRIau3JzvaQfon7V2B5Xtr7WXDgXFwX15zB0=", + "pom": "sha256-ssYSzIH/yo138/ZgDq6UgT9hYamPBnllM2H2g52Igww=" + }, + "media/kamel#kamel-fetcher-resources-jvm/1.0.1": { + "module": "sha256-//HU2afNeW4SzaPxdhZyIjfSZNZ6lTfld/+X1d+jSxY=", + "pom": "sha256-VU0rk/zn0iyxqraaTEq9OKH0ug9MA6uOY4YRsOmJbOo=" + }, + "media/kamel#kamel-image-default-jvm/1.0.1": { + "jar": "sha256-/CcFqll+8JmLBj2FkiWajx0HcfzReIjPL54CYD/CiwQ=", + "module": "sha256-jcOjGd53g4DBbJCxI9MfR0FgBUsHDUF6UFsUDdu1k8w=", + "pom": "sha256-Wj+xE+vtx9mCeSGmns8aHnIOPPLmp9HfC88eQSi/vNY=" + }, + "media/kamel#kamel-image-default/1.0.1": { + "module": "sha256-SFbCHa/OFee6/3kqMXUFUPsJJ+qyfhucXDyhdLK1p/Y=", + "pom": "sha256-83dDAmegjOsqSwGiZj6K18Ur63RjP+McmtbnnDzG22I=" + }, + "media/kamel#kamel-image-desktopjvm/1.0.1": { + "jar": "sha256-vgmSUIpe4daxBiqdbPUJGBL2BgOLrS6c0waIl1L9Ln8=", + "module": "sha256-O59acoMjfMgzDcGJFaMlj/tkyzfJuSv+F+E0KH5YrfQ=", + "pom": "sha256-YIiiImO40TkdYTIPYsQKsyPAZsY9XVCkiZsujhMQXsQ=" + }, + "media/kamel#kamel-image/1.0.1": { + "module": "sha256-faLXSUC3gTNAbabysCyh9o+WAK6wO7fOLvdxHTodonY=", + "pom": "sha256-QXovGqqUSErVNV0ylHdRkhVC/TgIKtC7YWQLBEMMdWg=" }, "net/harawata#appdirs/1.2.2": { "jar": "sha256-wf0q5mJLk4+7/Cr4fTdlb6lTYRNW4lKOhN0EYor4B68=", @@ -2278,13 +2362,13 @@ "module": "sha256-6NeZJbYmUlEtku/D9v+0SL97teQQtwDt7KpabA6mfm0=", "pom": "sha256-gMRjsS90NbGxi0UXYRjAKoktGFJnfzP7sHF29hI3UlA=" }, - "nl/littlerobots/vcu#plugin/0.8.4": { - "jar": "sha256-54Zg4AVaPeGW7E9O7cBB34upJus06eLzIlnIj9/OLrc=", - "module": "sha256-cFqZ+tmabls7BiLsrXcF3+D1jfkXOzo5UdozWkYGNqQ=", - "pom": "sha256-U3Oz7JPtlCF07QEuUZBTR/PCmms0DEl+PJBfc8HEiUo=" + "nl/littlerobots/vcu#plugin/0.8.5": { + "jar": "sha256-bMCdHHgrZ1qTLIzypOMDQA3uPPRGShOuUa5k04oBgtI=", + "module": "sha256-B9AOrP99ZqEmVYp7WU1BaSfj9QBjGHoApMhdmf16ZwM=", + "pom": "sha256-8ydVioHfhiKEe6DDTyxKRH8/pEW/gumvo7vaTbktX0I=" }, - "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.4": { - "pom": "sha256-wXuWwZU3Y1m5uVZLE/ivDIGvCWFYZJaY3rlpYET4L68=" + "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.5": { + "pom": "sha256-W/veb7xPghahHsYmub2pMmzhrSEt+/slMg0YtjBCoFc=" }, "org/apache#apache/13": { "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" @@ -2304,29 +2388,16 @@ "org/apache#apache/29": { "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" }, - "org/apache#apache/3": { - "pom": "sha256-OTxQr7S3qm61flN3pVoaBhCxn3W1Ls4BMI2wShGHog4=" - }, - "org/apache#apache/31": { - "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" - }, "org/apache#apache/32": { "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" }, "org/apache#apache/33": { "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, - "org/apache#apache/7": { - "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" - }, "org/apache/commons#commons-compress/1.21": { "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=", "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" }, - "org/apache/commons#commons-lang3/3.12.0": { - "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", - "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" - }, "org/apache/commons#commons-lang3/3.17.0": { "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" @@ -2379,106 +2450,27 @@ "jar": "sha256-CysRAsGNPH4Fp3IUubdQGm9gVhdK5WBODiVndu2nVT4=", "pom": "sha256-37/W/+KnhMqYF8RjZap/ileDILgFveOdb1WgsJ2KqMo=" }, - "org/apache/maven#maven-artifact/3.9.6": { - "jar": "sha256-rXoPtAj45HWFzMDQAR4LUB2Tv8mIjTabvUoEPRlHUHM=", - "pom": "sha256-thCjsCWYK5hXbXZkkArOMTYvAFgnBR82mOZJ0onz/7U=" + "org/apache/maven#maven-artifact/3.9.9": { + "jar": "sha256-MPAV0cGjk+GcGM1PQ1MgicNtTKMoYIzj3aeLdNPTFRU=", + "pom": "sha256-Zd33a5KnB7nxJA7Mu0d0sw1Md3eGcSkf01XgbU06lt8=" }, - "org/apache/maven#maven-builder-support/3.9.6": { - "jar": "sha256-4fTSeERZzoo0udrhgpoZmbVp5IPiHun6pzaGkecpKW4=", - "pom": "sha256-fel2uM6xpmr+Jn8qp9YVcA0JxREHqt4hifaf5DNIKlA=" + "org/apache/maven#maven-builder-support/3.9.9": { + "jar": "sha256-LKSpZ73RKp6F1A4BI3T4bmPUoQMMGZ2kgy49ChxncNg=", + "pom": "sha256-CsMYAC8RBXG6pXHs8gaX/sR2cEjSl+JohFW5FNUDD/4=" }, - "org/apache/maven#maven-model-builder/3.9.6": { - "jar": "sha256-X5ba+8QR7ksehCY2jQ0x0Fq1pNrOaYCBQxQqABdZhyE=", - "pom": "sha256-yMK3G3CDmPoHecNIR04O/+R3kb/MgPkikhnzCzoqRSw=" + "org/apache/maven#maven-model-builder/3.9.9": { + "jar": "sha256-pDdxgqwuWt/ha+OzyBmBpezdqwFBhN5yrh5SLwSndgI=", + "pom": "sha256-nSOvDg8jIkwgMgnRG3asYJClqWfT2IepIKekeyYMC9g=" }, - "org/apache/maven#maven-model/3.9.6": { - "jar": "sha256-T48H/ba4cB+omiOi7fgwgI/WWJLZDM5AwObffI8vy2I=", - "pom": "sha256-xNfsyyheYhET5UPvKT/SffqNEuoGEh81e8sR69gHrnU=" + "org/apache/maven#maven-model/3.9.9": { + "jar": "sha256-j1mwoW/pyTO+dJpgrgcFoMsze7WrrziAG0C3QP93Vyc=", + "pom": "sha256-G0gGKxU4fBxCBBV64ZpWCRnftXKLPpKhHlUD8iL6q0o=" }, - "org/apache/maven#maven-parent/41": { - "pom": "sha256-di/N1M6GIcX6Ciz2SVrSaXKoCT60Mqo+QCvC1OJQDFM=" + "org/apache/maven#maven-parent/43": { + "pom": "sha256-RooSYumqpf6/nWBOKDYmf4FTUfK0Ug8o+xf1PHHjNVQ=" }, - "org/apache/maven#maven/3.9.6": { - "pom": "sha256-ugvzJcUpVAWOmnAp5AJzof4GvkpQUw9qTrpGxVih5Kw=" - }, - "org/apache/xmlgraphics#batik-anim/1.17": { - "jar": "sha256-Z9nWkezshXrDYo+9IWfCAZQNPEtlq3OGSErHMMuM+eo=", - "pom": "sha256-SNpMQT2e8VZ6EKLn7UNPpbuOzrfolW9jxLlw42/avxw=" - }, - "org/apache/xmlgraphics#batik-awt-util/1.17": { - "jar": "sha256-f+OPlFHrlFdSFDIyYcgZK2Px39JhBlklX7u7/elKKmY=", - "pom": "sha256-K0uhvyKqtiKmdyIXZTnRlWJ92KVfggGRq0udbh/PrgI=" - }, - "org/apache/xmlgraphics#batik-bridge/1.17": { - "jar": "sha256-O9An4ZoL4klsLDlQFSUlyRRhp9CB7b2Ci7PS0mnsWHA=", - "pom": "sha256-SfOQORML7tSikG1DGOSpv8l+yRax0bo+trqK9BigvVc=" - }, - "org/apache/xmlgraphics#batik-codec/1.17": { - "jar": "sha256-ZDSkhxe2nwWYaGZlPnXVKED4Es0rwnpb9diK7pXkEh8=", - "pom": "sha256-cfyOmfGNajQC9Dtl+R9OwtkiHy22pzTOvohmAUKOhJ4=" - }, - "org/apache/xmlgraphics#batik-constants/1.17": { - "jar": "sha256-ddsAGAveTvXK7jkW1vZeUEUFHVnPUdV+ZzwDlp17u80=", - "pom": "sha256-BtbvBrb+NCkKDiopaz95YejFX18VgvCVIcguAAt5Px8=" - }, - "org/apache/xmlgraphics#batik-css/1.17": { - "jar": "sha256-3PmpAr0MSxqErAVh17ZgUryTOBxJI6W8VgIpDByCt3k=", - "pom": "sha256-kt6q1WROf4uqA6h0YZwha2eEc02elByJYnkzsKmxUTs=" - }, - "org/apache/xmlgraphics#batik-dom/1.17": { - "jar": "sha256-8kLdsFsmixX/BV0dGq8tycNBjoQrqAZzFAiphNTjJAw=", - "pom": "sha256-5j2XE/BJoPrXcWpbixROVgr7L4Opygbe0mi0QlRTjyY=" - }, - "org/apache/xmlgraphics#batik-ext/1.17": { - "jar": "sha256-gmf8YLSlsPKvp9z9rUC+sOcj1qGbZrjiS8N8LsbcVFA=", - "pom": "sha256-SIjUiOkeJB9Apenz6xS3eg+/tGK29U7i4krFp0NYh94=" - }, - "org/apache/xmlgraphics#batik-gvt/1.17": { - "jar": "sha256-k/TkqETK/Fs9VzGimbwAzxRAQCbdyx10nSnKeUhrS5A=", - "pom": "sha256-zIhrsEtaMpUrKgtYmx3XNZNoZg/ysqxcBJ5MNkdSmpE=" - }, - "org/apache/xmlgraphics#batik-i18n/1.17": { - "jar": "sha256-1aZGgDY+ezaz8ow0o6U2126Ef3fOwHQKq3x5mme1LYs=", - "pom": "sha256-LczXNOp8Pf3cOQDcrOgYGIsUZsAq6dqK4wpwj3Tw9MI=" - }, - "org/apache/xmlgraphics#batik-parser/1.17": { - "jar": "sha256-XkSLv69hJ1Z/QfaY7iWtebhENjBxwS0RdYlseIkXF9c=", - "pom": "sha256-O4WKAV0DzUCF+HnRF81IbyijM3IIG0oRL/w5OjPzMOs=" - }, - "org/apache/xmlgraphics#batik-script/1.17": { - "jar": "sha256-LMu0vW1aYw+30m8N0xGNR0L3uuDpcu5nITDoA/ZylQw=", - "pom": "sha256-cev1FjXjwA1UnPAc/HxAZXssvZOCUVkUf73N0U83xqI=" - }, - "org/apache/xmlgraphics#batik-shared-resources/1.17": { - "jar": "sha256-XXQYK5yhns2NSBTy/0tCpK7qbhiXfpBcyE6Kb4GUDJ8=", - "pom": "sha256-ut4U1rq9//BiLBjNPCUf9flZN4MFieL2jgO92nu1RxE=" - }, - "org/apache/xmlgraphics#batik-svg-dom/1.17": { - "jar": "sha256-GTRyGKSQZwxLnSzRWkUVXBr59B539+rameuU27kL6OM=", - "pom": "sha256-BRKX2S6SjPAcAWqpNp8zhw7EEBQ0j30C6avoVZKIvlA=" - }, - "org/apache/xmlgraphics#batik-svggen/1.17": { - "jar": "sha256-EI9yX/4TXcpWbZJfOs4mpfgDmfKIyhkFYYBd7CgAXWM=", - "pom": "sha256-3HgOLwRWFTzXBP+zLhjGababh+ZW77ku3KNv7tIz1DA=" - }, - "org/apache/xmlgraphics#batik-transcoder/1.17": { - "jar": "sha256-H2nphrRukfcHzxMUP04ukwufYKaXhY26vbq1y4bNWg8=", - "pom": "sha256-4UQOu5q+0Ev3RDbBkVOFeGNE4iFBaooCLHGO2oY8al0=" - }, - "org/apache/xmlgraphics#batik-util/1.17": { - "jar": "sha256-oeT3Q8i4CsaC7dSzl/qkrELeWRNDA2MkyA7o8ilzyXY=", - "pom": "sha256-gtWFfUG9TeWskX7sgSoz0zKXN04UOAew4KYt7KBVofk=" - }, - "org/apache/xmlgraphics#batik-xml/1.17": { - "jar": "sha256-+8wjAAZqxAQodsUsMnrN8LUVli8WkEAO16eO0sDUwbQ=", - "pom": "sha256-0ypeBt4LkxxN2ebgS/oSQHwkNwmmmNdpZ7TnkYoPLn0=" - }, - "org/apache/xmlgraphics#batik/1.17": { - "pom": "sha256-D9ZlDtWtkmuw6X2xx/yMJqQOOmtrShOxR2XryjKvsTo=" - }, - "org/apache/xmlgraphics#xmlgraphics-commons/2.9": { - "jar": "sha256-Lr0zOrKmJFFHk8M2468IZghnMob+N7oeY54Kw+G1i+I=", - "pom": "sha256-CS1SCmHKS4pFkEN0JMQhzbDPQOeYrs7PKwUm8q+PH4g=" + "org/apache/maven#maven/3.9.9": { + "pom": "sha256-0k7WiSPfIQ0IW7XThtQzbRLt5UczkuFZ1ebmRJevbzk=" }, "org/apfloat#apfloat-parent/1.10.1": { "pom": "sha256-rHDBL+cJtXDurKOZT4NbpGnnJaWbvjYRDTpBImHgUt8=" @@ -2495,29 +2487,29 @@ "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" }, - "org/bouncycastle#bcpkix-jdk18on/1.78.1": { - "jar": "sha256-S0jqCE5SMrnXnryhiHud4DexJJMYB81gcQdIwq7gjMk=", - "pom": "sha256-CVIrr36Zuqk6JRXRbPHLlT+iJ41+PEbIvv8n3AQXKDE=" + "org/bouncycastle#bcpkix-jdk18on/1.79": { + "jar": "sha256-NjmiTd+bpLfroGWbRHcOkeuoFkIYiOVx8oWq3v5TLNY=", + "pom": "sha256-NeSfQTTeKsMmw6UKJXYsu021bzgC+j9zDMhbZTrQmHs=" }, "org/bouncycastle#bcprov-jdk18on/1.77": { "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" }, - "org/bouncycastle#bcprov-jdk18on/1.78.1": { - "jar": "sha256-rdWRXmrPxqtYNuH9il4hxkiFNqjB8h84bus78oC3Atc=", - "pom": "sha256-KJEtE5+e7RQcOUNx++W6b//5HnjxycuDSPlEok0gTtI=" + "org/bouncycastle#bcprov-jdk18on/1.79": { + "jar": "sha256-DYHswxJFNrU5vOmqP+liG3+Eyc7jcbY1pbMceLeasdo=", + "pom": "sha256-2PGgaxSddG6dmN5U4veqmy62E/s1ymfYrjls6qxmHuQ=" }, - "org/bouncycastle#bctls-jdk18on/1.78.1": { - "jar": "sha256-SDvRWC05V63+EAdH8ixtoP+VMtZGT5xFQYH5m/pE5Ss=", - "pom": "sha256-Y4vYWwP9193HoELp+C8gXgNq/6DfjS4vXbvzsIEQKBA=" + "org/bouncycastle#bctls-jdk18on/1.79": { + "jar": "sha256-Sv6EeOVsB7vaRetA+omJjxPEf7mW77IDjz91ob2kS1o=", + "pom": "sha256-igGqMNhmTofBiuQ0VlTc28EtiT44bh+KBjmZj4QjeG0=" }, "org/bouncycastle#bcutil-jdk18on/1.77": { "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" }, - "org/bouncycastle#bcutil-jdk18on/1.78.1": { - "jar": "sha256-2fpW+XsPdhzjvI2ddMXXE3qYe/W9Or/hAD+br6RaHS8=", - "pom": "sha256-dB1Vy0XEwsiJtaQ2t0fcIVKSMTLkJr5u9VUA7uf6UxI=" + "org/bouncycastle#bcutil-jdk18on/1.79": { + "jar": "sha256-xwuIraWJOMvC8AXUAykFQHi8+hFJ5v/APpJC62qyGDY=", + "pom": "sha256-4kwftM8WBUBaaYjp5NbksuH0OT/HOompRSrmJe4xHQI=" }, "org/checkerframework#checker-qual/2.5.8": { "pom": "sha256-M6xqDxNBrpZkfH1EZfSqPST+l9Jpe87izq5vyLXvLDw=" @@ -2541,9 +2533,9 @@ "org/codehaus/mojo#mojo-parent/74": { "pom": "sha256-FHIyWhbwsb2r7SH6SDk3KWSURhApTOJoGyBZ7cZU8rM=" }, - "org/codehaus/plexus#plexus-interpolation/1.26": { - "jar": "sha256-s7VBLOF4iRA+pWS838+fs9+lQDRP/qxrU4pzydcYJmI=", - "pom": "sha256-4cELOmM1ZB63SmaNqp7oauSrBmEBdOWboHyMaAQjJ/c=" + "org/codehaus/plexus#plexus-interpolation/1.27": { + "jar": "sha256-P7T7YUP9+WQCTDy3OFUVJLnqhOXCEc1mDFWa0HA+UjA=", + "pom": "sha256-1U+8vEOZ41IyKHSkEoudKP6f4Vg/iew2HeJC6jjTP5s=" }, "org/codehaus/plexus#plexus-utils/3.5.1": { "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", @@ -2552,8 +2544,8 @@ "org/codehaus/plexus#plexus/10": { "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" }, - "org/codehaus/plexus#plexus/5.1": { - "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k=" + "org/codehaus/plexus#plexus/16": { + "pom": "sha256-aNTu1lo9u8NC7YDdE4++nGfLf7TCq8T1IBzbW59kWGg=" }, "org/commonmark#commonmark-ext-autolink/0.21.0": { "jar": "sha256-PNV9XR295yTmcAxTpZBTS7JPPiaV/zUF66MtxMd4G6k=", @@ -2580,12 +2572,12 @@ "org/eclipse/ee4j#project/1.0.5": { "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" }, - "org/eclipse/sisu#org.eclipse.sisu.inject/0.9.0.M2": { - "jar": "sha256-m2K8/DUqLsh9qLAeN8lSpU01i7sa8/ISZIrq/nqy27U=", - "pom": "sha256-BWZvJ5QRF8yt+rYykRjBw0j4uDjOie0jGCwVHLKUPuk=" + "org/eclipse/sisu#org.eclipse.sisu.inject/0.9.0.M3": { + "jar": "sha256-FTNcTc8IL1mfuO3c+1jWp+mpyX3iiDwlcImkebmyRSI=", + "pom": "sha256-V+0X4Fe6cWzB8eWy1OAUpow9UL0zSYInqQ9xJRkzTdQ=" }, - "org/eclipse/sisu#sisu-inject/0.9.0.M2": { - "pom": "sha256-djD0zU0WIAZ/qD4ddIsBLP+gZV5TgMwOSl4oPTtEH9s=" + "org/eclipse/sisu#sisu-inject/0.9.0.M3": { + "pom": "sha256-LkNlY9XK6jUbzl8IY+vGN2QFy2Wm9mSyVfqtnnLjuFQ=" }, "org/glassfish/jaxb#jaxb-bom/2.3.2": { "pom": "sha256-oQGLtUZ47Z9ayy96QITjhf9RAgH06dv1913GpnX2a+c=" @@ -2695,6 +2687,9 @@ "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.7.0": { "pom": "sha256-2/9VPqXxybksnQwdoeEr983HeciyDY+m/CotdzXJpnY=" }, + "org/jetbrains/compose/desktop#desktop-jvm-macos-arm64/1.7.0": { + "pom": "sha256-WIlrEnKu7QOcgli6rohipcNQqRgL5uaabEz8p9JOoa4=" + }, "org/jetbrains/compose/desktop#desktop-jvm/1.7.0": { "jar": "sha256-YsgWBzGVzAEZ3B1msXhUS9t3Lvi+5IeZVFKMZ5ixfr4=", "module": "sha256-Fl1IccnE3fepQGDfGDhdfsuzzefe543VqcfoC50GzZY=", @@ -2876,105 +2871,105 @@ "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" }, - "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.20": { - "module": "sha256-T0tsqhEaZFnFKSfpM2+DG8qDIUtuiYndph8BAYXe5qo=", - "pom": "sha256-Q9nypAfaiyhtjfMNZw8lVhUPZW9RnYQWqbGOTHGrfFo=" + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.21": { + "module": "sha256-eP8Nm7m6KylBJw6aHmdCeG+r3oCAjSVLMhb7YvOGr5s=", + "pom": "sha256-9Bb6+imfEFZlOB1F3CPLdS6sGXAzy7sOfrP4M0CbrfE=" }, - "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.20/gradle85": { - "jar": "sha256-wMMkdfUoT+fBgMrwC/QLb6OjsOkP7FgXttAg6xDtKbw=" + "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-aNTHT22g1eErtyVbjW3b2IaPCiSdTf307OcPbT+/XQM=" }, "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/1.9.24": { "jar": "sha256-AoVjJSRkxIYBkX8rbFTRuOQhzcfya/L5zzCIlcgSSgY=", "pom": "sha256-Hzfc9EhcI3qtLk70O40RQJleMTKduiTJ9qa3uEBrg9Q=" }, - "org/jetbrains/kotlin#kotlin-build-common/2.0.20": { - "jar": "sha256-NvDXXOmviQZNnbT9IeIsVQdyAP5OOufZnjREmCZ6oNs=", - "pom": "sha256-EOhYxaCAxN21Wx0GvujV6Ea4YQX1aw5A8ojj+mGWEXI=" + "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { + "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", + "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" }, - "org/jetbrains/kotlin#kotlin-build-statistics/2.0.20": { - "jar": "sha256-c6fXFRN1WzF9Kxttp2bW5reiXcmdzv5DEzJTNkIuzhE=", - "pom": "sha256-10GK0lyAbeg2FQvdNQsAvmwtJQmeXXQd3+PzgcUurY0=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { + "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", + "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.20": { - "jar": "sha256-V+1QIg547DnoqAAUMw8pXlSFtWOMESmvntfVPXhYxcI=", - "pom": "sha256-nHrVho+yGJsb9NbCL2yUmDs6jhopTpWlQSy4Lg9C3bI=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.20": { - "jar": "sha256-nOb4Gmmcw32zY6KDcVC8YqJJA9r2EhA00Sl5qpUBRGs=", - "pom": "sha256-DyiqOx3o2AWm+HlX08PWbDOeDEMmaZlc9Zf58r6J4II=" + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { + "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", + "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" }, "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.24": { "jar": "sha256-5x/xnmsUGrhakyj9AQlBUxowJUMCa9QkTJWtwgjVAfY=", "pom": "sha256-1w0fiFkkQ/R1eVFUVqTWwxBRztoK0RRGkjrK/kwMldE=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.20": { - "jar": "sha256-o2BL81DIvM4nECFYu7OD+k0YFLxIaq7VnyeOraUf9q0=", - "pom": "sha256-WXBD+4xlJ/QpmcoE7TUpY5Is0W5piKqlLT2zLaHbhZ0=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.20": { - "jar": "sha256-4DzwSwNA8a4VEhBjC10pFcKXmIxuIuTe206nz7dKz2c=", - "pom": "sha256-3M3xugxPzYvUIwNFroP6fb6SglY9ilP9XmHFM1tbcYA=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" }, - "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.0.20": { - "jar": "sha256-549YH9VsEe1nrxzZhA3y8OCC9duKj5s949hygeZRUPg=", - "pom": "sha256-y6whk7JPaifqr5kWlZydoO+5EvrFfpWzkG5kwKbxJkc=" + "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-SaUyw+hjiBeUKVdB+A+/t5QeaLGGPPlMRoXgC01urOA=", + "pom": "sha256-CNjXRPVM+aKlZwoS4HP6qjG7F0DSivWD9v7dCAvXw64=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.0.20": { - "jar": "sha256-cxUswf2CHQcTlHOry/jH0B0A5oaEuWHhkurogNycfaQ=", - "pom": "sha256-qUcReIj0z/tjk9QurqYRtj31ib8pYXgmzLclNxK/OsM=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" }, "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.24": { "jar": "sha256-F3vIsqQHbcznh4rQ2P0HFjrzF44/qQ7mPU9zO7R7/ck=", "pom": "sha256-T7V/xqxyCVGzIkd0s7sqVFSelj0vTf3GhB6Ex77WKrE=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.20": { - "jar": "sha256-W9URO4WrhSjhkuK7P8GX9bw0SLzb0Fh5Czf9N/TuV68=", - "pom": "sha256-IZgoJm6keO7rQuT1L5bQuQfYykhHz4aq45FprYsupKU=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.20": { - "jar": "sha256-i2O0/7e6aOKHIFaa1HqWzAZclFZO0WHuoVrIZIh7pN4=", - "pom": "sha256-D8eaPIg8fbbsD6lU1cimiugRBlIm+4WRbhy/9pnlwUc=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { + "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", + "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20": { - "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=", - "module": "sha256-CJ8SCJE61calM09nu8pI/HsK+hCv0L2lFT+8tSzCqWw=", - "pom": "sha256-IQOK734wtxG0qE3grS1TO9MgXhOKrWfP1YnXl+/afII=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", + "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", + "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.20/gradle85": { - "jar": "sha256-D3NXvFzMjjaB7DtGQ8cMrSiDskbIt699bZccQeOTTy0=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.20": { - "jar": "sha256-Ce2wJ7mh899xYnGuyte7QaHdvC+cETFyl5ANTyvc6Iw=", - "pom": "sha256-wZireMJmzzvnodJHBeW7GIbUlF/cpPcX9U77hv9M10o=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { + "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", + "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.20": { + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", - "module": "sha256-wy8Uw0SXgCqOjXk7K11nkj4gIlOUePNm4Yp+9kFOut4=", - "pom": "sha256-Vn7N8kaceWkMLgmdz6r8PhF67GTe3BejtJ/Uo/ptDgg=" + "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", + "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.20": { - "jar": "sha256-UUx/F9xeVO5dFqdhs2S500OVa8rUnf0I4IWWIldzfhk=", - "module": "sha256-HPn20+xtMFqgiQMqyJL/rogcwQUAP0VvLBX9PDAyCm4=", - "pom": "sha256-SEIbKUnHKiDU4OPybYcYxruScIbHbF/AlSCg1jbPumc=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { + "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", + "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", + "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20": { - "module": "sha256-aBPMpB7w+/FciL7MQB44cGuWlEwhtr7HPdiM+QoPIB4=", - "pom": "sha256-eEmYfUbGj7neKvOwReEq1nPm1mOvbqpf2MYRlCt3LF0=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { + "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", + "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.20/gradle85": { - "jar": "sha256-gSn2LLfGJ7XOghh+QqbYfEKVK8e6ZLgFo1R/aFIxlmI=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.20": { - "module": "sha256-GwMjHvp7O20xsJNocpQfh+J6gZwANxiz0JiAt25j180=", - "pom": "sha256-TDLrNQlMFjWd943q7BHOUjvjYEB0FPoK7Miu/GftSkM=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { + "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", + "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.20": { - "jar": "sha256-QsQvvic/oDBOThf3OSxms56R+Z01+FwGixG91Wuemdw=", - "pom": "sha256-5f4GjE69XIhYw1w56GI6vrnIb4oXJUdC5/VZjkP62jw=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { + "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", + "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" }, - "org/jetbrains/kotlin#kotlin-native-utils/2.0.20": { - "jar": "sha256-wWbyBR6R0ZnpYP/HsnZEhcFRDNF2dN17jOPC/NBqhys=", - "pom": "sha256-mISZMftwkWhS6qfCDm2Pr1IsUNd627r9k2T1JrfN7EI=" + "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { + "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", + "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", @@ -3000,55 +2995,55 @@ "jar": "sha256-MUx9MI/nUGVDZbrGFEeAYTyRac89nh2vurkc+AvcNXw=", "pom": "sha256-mGDF58qg5AlxmVCQEtoD01GX/teewKkKUOKPjeh1QE0=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/2.0.20": { - "jar": "sha256-/pcAKmeY9yB1ZGSJGdbuzPszi5XcBLSIhthWZVvGSk4=", - "pom": "sha256-o6N2KcmFzt17+d12rGdJaz+ApZIoVB6WiAKg7obEuRQ=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { + "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", + "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" }, "org/jetbrains/kotlin#kotlin-scripting-common/1.9.24": { "jar": "sha256-KqeY6XgokBDYByTdGdn+GQtSQkFIEQT89RjAO8OdTks=", "pom": "sha256-S9rpUqslCWFRsfqERCooGupzwW0dTNVdigLDccqJusQ=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/2.0.20": { - "jar": "sha256-XTdTOT5/7PHSG67l2314gyZ4K9v4qOxqKyzM97Ve5sY=", - "pom": "sha256-BesUmiCZ8ILJf1xFQ1HQuMphLFUwo6wyHSyMB12wEVU=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { + "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", + "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.24": { "jar": "sha256-02gR+1yZeXaEH/PQqxnGt96RkomeQIK6Hz/7oH6UBfQ=", "pom": "sha256-FUgOkd8v/sfFfOHgpfFBBltFIrbbyJsv2yk9xsVwwMU=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.20": { - "jar": "sha256-Ie8wOrS54Pnzl8FIliU6rkkCV7+w3VAInBwcBPAYcXE=", - "pom": "sha256-zr8swRmuHPJqP2tECxidwrruhS0nASU06qNqrNue4VI=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { + "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", + "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.24": { "jar": "sha256-i/2A2RNqKjJhALC3O/saG7NX7d+uDYEiDkYSa4im7no=", "pom": "sha256-Sg6yUXF8Sih6ZBfp/QRBZ4xJatxnAdhasPFi8W0s+4c=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.20": { - "jar": "sha256-WgaucwO1TL0XdYnWEFumv9WbGxgur7W2aHJf9ypf0y0=", - "pom": "sha256-z6al9YOJy3K0SRLTABoB9eqL+vx5mbr6BRGz7t/LYdI=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { + "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", + "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" }, "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.24": { "jar": "sha256-G9aQBgqUhDl3N0pFds2J10nk7srx+3pYA2/rOuVRxKw=", "pom": "sha256-kkM+M+MLpFvMS/hKxUsX0p8Dlkp2BwYW1sZS3WxhySU=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.20": { - "jar": "sha256-sLtQD2MztLFsjraeo5TvaE8zRT+NNDEDSokHqfGNtvE=", - "pom": "sha256-m8uNHCOvcm21KpNrpbkXeyRoKSBYxT8Ckd5MwNpOzh4=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { + "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", + "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" }, - "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.20": { - "jar": "sha256-zI9QG2dslESLAWgNyvZ68cjFfOqEFQKnFuttEX+Xy4Y=", - "pom": "sha256-X74y6I+ly4WFjb1wpPZKWsJTSaTijzlQ3zJrMSRmUGY=" + "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-3v0m28WB8x1QKe5EmZ4QRpLrAw6rrX2TZMI9jwuP2Fk=", + "pom": "sha256-0opI/fcJ0wz4lqL3XMbx7aA3L2r+MYdCDPigSrJCb/w=" }, - "org/jetbrains/kotlin#kotlin-serialization/2.0.20": { - "module": "sha256-rsyQ8DJ7IQJTYRNdyJQBDmHDVzVFBtLTP3pZeakRxGQ=", - "pom": "sha256-wYgmEN73pFKwREi8GVqr+D6CqMEcUSmFYUAbGyxfKCw=" + "org/jetbrains/kotlin#kotlin-serialization/2.0.21": { + "module": "sha256-HXUsci8E/La3an9mSgXqFQAuEO1c/30pBJtd5ZfxID8=", + "pom": "sha256-Ju6iFEnSY66HScTjq7enkNl1ubpRP2jVSMzFCOFfUkI=" }, - "org/jetbrains/kotlin#kotlin-serialization/2.0.20/gradle85": { - "jar": "sha256-Jjd6xiKasd8/ojVJPYxWfkcLjYa2PolUSMwmbL/Ob1o=" + "org/jetbrains/kotlin#kotlin-serialization/2.0.21/gradle85": { + "jar": "sha256-wd9+ggYbMC3WH0hoOT54Uy/qeKprY7eBmybK9sJHRME=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.22": { - "pom": "sha256-pysR3wi1Mi16Xo5iB4nuPkz+846GxDDn0RO/qeVMWB4=" + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.10": { + "pom": "sha256-91ryF83Y3Z4HseDgGAhKMgkqCRo5C3P+qmV+xE5c8JQ=" }, "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.0": { "jar": "sha256-KDJ0IEvXwCB4nsRvj45yr0JE1/VQszkqV+XKAGrXqiw=", @@ -3058,9 +3053,9 @@ "module": "sha256-6Y6oxE+zaCDQG7iwAxaOI6IhtAHLQyVtcjo/C3fWFsI=", "pom": "sha256-XZfiDNWGLoR6aYF1uTno3Fxr11vtmZ1vPU6ghIESFsA=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.20": { - "module": "sha256-tZe3Be/U4tgnFCCQw2BUJlVI7VG09SN38r+JxFlNU28=", - "pom": "sha256-o11/wINw+TE6S5U7zu7d2F4OHnLTEGLTe/jHeBs/b18=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { + "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", + "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.3.72": { "pom": "sha256-nVoT2avDNEXhNm0livCnfkLwGUWs73wJF7nVOYVOL84=" @@ -3121,45 +3116,49 @@ "pom": "sha256-uc6tTCIt7pDHT28BPTFqnlD4EaApMxPDNRrssvfM7V8=" }, "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { - "jar": "sha256-+xaVlmWaUYNXxLLBb0PcdascSYBWXtS0oxegUOXjkAY=", "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.0.20/all": { + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21/all": { "jar": "sha256-UP+t6yC00kVqUmWVpPep6FiJaCcVBz5s26Gx2A461Fg=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.0.20": { + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", - "pom": "sha256-XhIxEeAQewRmSIOgpAjB/zvbXQR+SQH4L0xC8QV4Bi0=" + "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" }, - "org/jetbrains/kotlin#kotlin-util-io/2.0.20": { - "jar": "sha256-ZGTbjUFywhoXp5C20XiQIu1nrbN8UL5ri59YK1UrhSI=", - "pom": "sha256-LrBxVfqEF46ZVjnOe3aRcofK5UKjXSm1a7CZEB0oajw=" + "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { + "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", + "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" }, - "org/jetbrains/kotlin#kotlin-util-klib/2.0.20": { - "jar": "sha256-h92Djcd3gsuVZ/GnYUmbPkpQ9SjABbJjii4+V0EKljs=", - "pom": "sha256-fbTRw72mdZvifuk35gfoscRpWNwIR3Ey/a7t4BbnOP8=" + "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { + "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", + "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" }, - "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.20": { - "pom": "sha256-kGFltQT4vUoqP4eFvhbp89a8mtiG6lXoMtQRG/rkt38=" + "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.0.21": { + "pom": "sha256-Yf+ockTHIjCtz8MiedShzEFxLCvF61CXG2MO2IDeSF8=" }, - "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.20": { - "pom": "sha256-sNVZXjrtI9TH63BSN0pZQGXaYdxG0GYxHT1YVz2jSSE=" + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.0.21": { + "pom": "sha256-qUIL3zmifFDNZ/njC5vSJk/P4Yaq8iHrw8t5VZ8iIEw=" }, - "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.20": { - "pom": "sha256-2zSCieaFMro55pUv9XVm/50NnslJBYTuLprNllrMHFI=" + "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.0.21": { + "pom": "sha256-K2hwNmz5nvZS5bVbw7kDfxwS3rMy3GauAgKn/CI2WLk=" }, - "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.20": { - "pom": "sha256-I25/dk1/4C5RCIG/1ShkK+c4Y6oDbjRvs4PL3cXB8sw=" + "org/jetbrains/kotlin/multiplatform#org.jetbrains.kotlin.multiplatform.gradle.plugin/2.0.21": { + "pom": "sha256-0+fOgZ7Wkw4mf8bW9uQ/NYX66BNTJTdaUy3CSeuM5Kk=" }, - "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.20": { - "pom": "sha256-+kn1eMN8x3/hA7MrEU+iTbkblHrjQAQivCcuk658pYY=" + "org/jetbrains/kotlin/plugin/compose#org.jetbrains.kotlin.plugin.compose.gradle.plugin/2.0.21": { + "pom": "sha256-unqwb198FjgzO/+AScoZX9YY02+UtM0jJeIh4qruOB4=" }, - "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.20": { - "pom": "sha256-7W4IMHEMURJT2NQTEs1MMDP9pkXAFJ0/EYULaPzTPJk=" + "org/jetbrains/kotlin/plugin/parcelize#org.jetbrains.kotlin.plugin.parcelize.gradle.plugin/2.0.21": { + "pom": "sha256-WlFqKbXkklcrjyCq65qyEnkyzSFiQJC8Ur5bjZ0yLnI=" }, - "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.20": { - "pom": "sha256-iVt45mokOOVxOXu8KVbSUgqTpl2jHB2Ce2NEIvbOsQ4=" + "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.0.21": { + "pom": "sha256-qWzO0nL6L6tLdB40cgtedO9RS0QRFSMD7fnBJ5V6R6o=" }, "org/jetbrains/kotlinx#atomicfu-jvm/0.23.2": { "jar": "sha256-EB/0P/Vj/KFnr1remMO2m/VpAQ6rdFATuE2JVQNNOzw=", @@ -3192,9 +3191,6 @@ "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.1": { - "pom": "sha256-uSWqmIxApceqDHeyE3P+sYw5QUkmvVHHbvRENPW66cI=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.9.0": { "pom": "sha256-vqVRHpAB8sWTq1CA3xMbIZq14ghcxZec5YPqzUlG/Xg=" }, @@ -3213,23 +3209,10 @@ "module": "sha256-rVNANKlTtOEsvuuHTGat+LHKFN8V/g0uZUeqNOht/so=", "pom": "sha256-dw8nk9BeKwJ7nHmZOOwdLU7xQc5YGceAwyw5lcrbCkc=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.7.1": { - "module": "sha256-sJV+aTzxwefUrWJGqm4weV2/S/t1jB5LMv25wkQJuXM=", - "pom": "sha256-x3kWU2lOpaVLnN1HCAgtv7i9apeKX0IYSxFBz7SjDnU=" - }, - "org/jetbrains/kotlinx#kotlinx-coroutines-jdk8/1.9.0": { - "jar": "sha256-0YE4yMHDSyuprzcyQec0E3b9+A0ecC36kJKdMgEx83w=", - "module": "sha256-UZXcGgvvl7cdtHJ+R9QlIFaTtT9Gs4MbVeqQtk0Qj9U=", - "pom": "sha256-i4RBO/nktxLB5mvV4mkihWTfePlxKaLw3msyuJ/MoOo=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-play-services/1.9.0": { "module": "sha256-k9zumoMaL53NqVKLqyjXJOFeigv+xBlO+B1Ox+cwH/I=", "pom": "sha256-BMklOqqrM6EDRGL//unXOkNiKpSBh/gDSLpcuXqydLE=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.7.1": { - "module": "sha256-I8EQcq7URvsrZsj57aP4mWbe09mP9bnfCg3LeTwBX/o=", - "pom": "sha256-HEWyu0XLYIIjT06yJj46XBxzQ4Rm6NUlr2gZCxbIklM=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.9.0": { "jar": "sha256-hCh6m9dNy+ad6MFwGQsVWhHrtJqJ6U4DaslPx4MecyU=", "module": "sha256-ki7Xf8+ELN0KiwAi3bcPQdynPhc/WU5r/VkrTQONY64=", @@ -3250,6 +3233,26 @@ "module": "sha256-ZoDoXgAKb/ckfN38YkZyPzlXCWzT7qCp9/Qqumlzaug=", "pom": "sha256-Wx4Ylt2DYUnbnUuSIRXKxiIrDKKIm1VDTbi+hOI0wUs=" }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring-jvm/0.5.4": { + "jar": "sha256-H8luGbRFOH28SRg9DMYjxaYb+kfIbPgar1r/SEUVT6s=", + "module": "sha256-D6a3n1wQfnNp/IMquGDLY1Ac96oH/ovZTRUTzmFOAoc=", + "pom": "sha256-DMAsF8sJSA/qlURmv8/O+JYq6+AuV+35tHZ0ZEek1eQ=" + }, + "org/jetbrains/kotlinx#kotlinx-io-bytestring/0.5.4": { + "jar": "sha256-jMGXmjmiO2RLGRCjv22efNg4aGSKDb3auRs44DxfTBk=", + "module": "sha256-npefmLnoEmKwjAHFosKwBSEwE9SigNR1nBkEYFvcZ3c=", + "pom": "sha256-bKYOZ58tAJw94jCnSaYwqxi8Z+YAoj+4d4xPu820thQ=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core-jvm/0.5.4": { + "jar": "sha256-3DWHwSeVrwEjFZHA7wmkE538qBE8KYknO5a5WABoU8M=", + "module": "sha256-PTizMz62XBMqfFZuAxDfoJEw2t+SirkjBHAstPFmjbE=", + "pom": "sha256-Diy3MY4zyA2U8M/EyEn8YsXLzQwxYOyhojm2ebn+dXM=" + }, + "org/jetbrains/kotlinx#kotlinx-io-core/0.5.4": { + "jar": "sha256-7XupL4/u1v8jBKsvd4DYf4HITxVfce9zwfhsW/mM8EM=", + "module": "sha256-3j/q85vfcKlbT85FjMMI6MNzfPl/rIcvSbT26/VXdgU=", + "pom": "sha256-ot/XmJrts7onKtrlmPfuuDTmnhVNSuylMFYwwY+K9CU=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.2": { "pom": "sha256-ew4dde6GIUmc+VQwyhL9qjL0p/kg1cMBv+lfoYfyczc=" }, @@ -3325,6 +3328,10 @@ "jar": "sha256-L72ZRbh+1QE5HTE+jK396wDXXKsyhiIgzOs4Uuv/3Hc=", "pom": "sha256-Nfg93UsA2fZYuezotPCaYkwrwPbGNGgtxS6a5FyNHQQ=" }, + "org/jetbrains/skiko#skiko-awt-runtime-macos-arm64/0.8.15": { + "jar": "sha256-FoepnFtMLNiavGVlVmidzgGkaBKSqTzu9KnEl+nhQNk=", + "pom": "sha256-e4KThaZFcZwANJjph1MCGfssKV7TwosVbio3nQxf/NQ=" + }, "org/jetbrains/skiko#skiko-awt/0.8.15": { "jar": "sha256-LW7+mI+NOlfmP8+SPzQ5zau4iUfjUfl9BuybKmqH//A=", "module": "sha256-1I2dg0p9yC6vpxX0nxLI+uKg35vEPqw3RJi/EdFrECU=", @@ -3346,6 +3353,18 @@ "jar": "sha256-SamJjaN1hlk4jxMzxTzK22+9FCp9GKp7GjNXcJBoQnk=", "pom": "sha256-Fge2IOHytOGg9IkQELNJCx+0qD5xOsTTiwjcLGf6PlE=" }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, "org/junit#junit-bom/5.11.0": { "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" @@ -3354,14 +3373,6 @@ "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" }, - "org/junit#junit-bom/5.7.1": { - "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", - "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" - }, - "org/junit#junit-bom/5.7.2": { - "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", - "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" - }, "org/junit#junit-bom/5.9.2": { "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" @@ -3476,10 +3487,10 @@ "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" }, "org/slf4j#slf4j-api/1.7.36": { - "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" }, "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" }, "org/slf4j#slf4j-bom/2.0.16": { @@ -3508,14 +3519,6 @@ "jar": "sha256-Uylw98VdRF8E5NBaa0Pw6Gdjgi0IrYnkxp4ymdMaDXQ=", "module": "sha256-ccMC3YcbfoIsZ5V28baF6UueyQUshzkF6yFN+kqrufw=", "pom": "sha256-rk4+z470z6LX39SJRUeIM+pDNL4Kq2+XoENzJBX7rr8=" - }, - "xml-apis#xml-apis-ext/1.3.04": { - "jar": "sha256-0LSIfcNNV95JB0pYr/rUOaAT0Lr/oagDT47ypeoZFkY=", - "pom": "sha256-G1k5qTEKWcDfDANyZyHV/JUh6H1sIDv6ciC66Cow2eg=" - }, - "xml-apis#xml-apis/1.4.01": { - "jar": "sha256-qECWgXZkVoS7Aa7TduBnqzlhSIX57uRKvjWl8g6+f60=", - "pom": "sha256-Cagv8VCshr+jEUXgpq/YmgLkUEeF9doRLk+uFCUCDpI=" } } } diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index 5929e48efba7..48d175882475 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - rev = "8f6d527a42f13c6bdcee2ca3f133dd19751fc37a"; - hash = "sha256-llr+792hzifV5vP0e7AKWhW3OtYcyAhzXPR45Do62ug="; + rev = "81a8486ca31c86630c84c78285c49d16d7491328"; + hash = "sha256-e0Ea2QSAMQqZRVPy5/5pblHfeG+L6oHEXHV5mepE5Z8="; }; inherit gradleBuildTask gradleUpdateTask desktopItems; From fa08eabc4ad369b8e59c87620ae3f8ca7ef96670 Mon Sep 17 00:00:00 2001 From: Tomo Date: Sat, 2 Nov 2024 20:36:14 +0000 Subject: [PATCH 363/369] atlassian-{bamboo,confluence,crowd,jira}: drop Support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements c.f. https://github.com/NixOS/nixpkgs/pull/353043#issuecomment-2452825826 --- .../manual/release-notes/rl-2411.section.md | 9 + nixos/modules/module-list.nix | 3 - nixos/modules/rename.nix | 3 + .../web-apps/atlassian/confluence.nix | 224 ------------------ .../services/web-apps/atlassian/crowd.nix | 193 --------------- .../services/web-apps/atlassian/jira.nix | 219 ----------------- pkgs/servers/atlassian/bamboo.nix | 38 --- pkgs/servers/atlassian/confluence.nix | 51 ---- pkgs/servers/atlassian/crowd.nix | 50 ---- pkgs/servers/atlassian/jira.nix | 44 ---- pkgs/top-level/aliases.nix | 4 + pkgs/top-level/all-packages.nix | 5 - 12 files changed, 16 insertions(+), 827 deletions(-) delete mode 100644 nixos/modules/services/web-apps/atlassian/confluence.nix delete mode 100644 nixos/modules/services/web-apps/atlassian/crowd.nix delete mode 100644 nixos/modules/services/web-apps/atlassian/jira.nix delete mode 100644 pkgs/servers/atlassian/bamboo.nix delete mode 100644 pkgs/servers/atlassian/confluence.nix delete mode 100644 pkgs/servers/atlassian/crowd.nix delete mode 100644 pkgs/servers/atlassian/jira.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 75d9dcfa235f..c5d1395ebb6a 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -672,6 +672,15 @@ lists by default. Backwards-compatible behavior can be enabled with `atomsCoercedToLists`. +- Atlassian Server products have been removed, as support for the Atlassian Server + products ended in February 2024 and there was insufficient interest in + maintaining the Atlassian Data Center replacements: + - The `atlassian-bamboo` package + - The `atlassian-confluence` package and its `services.confluence` NixOS module + - The `atlassian-crowd` package and its `services.crowd` NixOS module + - The `atlassian-jira` package and its `services.jira` NixOS module + + - `python3Packages.nose` has been removed, as it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12. Please switch to `pytest` or another test runner/framework. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d05bafae4a23..7b753937e808 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1390,9 +1390,6 @@ ./services/web-apps/alps.nix ./services/web-apps/anuko-time-tracker.nix ./services/web-apps/artalk.nix - ./services/web-apps/atlassian/confluence.nix - ./services/web-apps/atlassian/crowd.nix - ./services/web-apps/atlassian/jira.nix ./services/web-apps/audiobookshelf.nix ./services/web-apps/bluemap.nix ./services/web-apps/bookstack.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 160ad91e42aa..18b7e9faaa72 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -62,7 +62,9 @@ in (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") (mkRemovedOptionModule [ "services" "cgmanager" "enable"] "cgmanager was deprecated by lxc and therefore removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "confluence" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements") (mkRemovedOptionModule [ "services" "couchpotato" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "crowd" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements") (mkRemovedOptionModule [ "services" "dd-agent" ] "dd-agent was removed from nixpkgs in favor of the newer datadog-agent.") (mkRemovedOptionModule [ "services" "dnscrypt-proxy" ] "Use services.dnscrypt-proxy2 instead") (mkRemovedOptionModule [ "services" "dnscrypt-wrapper" ] '' @@ -82,6 +84,7 @@ in (mkRemovedOptionModule [ "services" "homeassistant-satellite"] "The `services.homeassistant-satellite` module has been replaced by `services.wyoming-satellite`.") (mkRemovedOptionModule [ "services" "hydron" ] "The `services.hydron` module has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability.") (mkRemovedOptionModule [ "services" "ihatemoney" ] "The ihatemoney module has been removed for lack of downstream maintainer") + (mkRemovedOptionModule [ "services" "jira" ] "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements") (mkRemovedOptionModule [ "services" "kippo" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "lshd" ] "The corresponding package was removed from nixpkgs as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decades.") (mkRemovedOptionModule [ "services" "mailpile" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix deleted file mode 100644 index 683a1c7603ef..000000000000 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ /dev/null @@ -1,224 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.confluence; - - pkg = cfg.package.override (optionalAttrs cfg.sso.enable { - enableSSO = cfg.sso.enable; - }); - - crowdProperties = pkgs.writeText "crowd.properties" '' - application.name ${cfg.sso.applicationName} - application.password ${if cfg.sso.applicationPassword != null then cfg.sso.applicationPassword else "@NIXOS_CONFLUENCE_CROWD_SSO_PWD@"} - application.login.url ${cfg.sso.crowd}/console/ - - crowd.server.url ${cfg.sso.crowd}/services/ - crowd.base.url ${cfg.sso.crowd}/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval ${toString cfg.sso.validationInterval} - session.lastvalidation session.lastvalidation - ''; - -in - -{ - options = { - services.confluence = { - enable = mkEnableOption "Atlassian Confluence service"; - - user = mkOption { - type = types.str; - default = "confluence"; - description = "User which runs confluence."; - }; - - group = mkOption { - type = types.str; - default = "confluence"; - description = "Group which runs confluence."; - }; - - home = mkOption { - type = types.str; - default = "/var/lib/confluence"; - description = "Home directory of the confluence instance."; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Address to listen on."; - }; - - listenPort = mkOption { - type = types.port; - default = 8090; - description = "Port to listen on."; - }; - - catalinaOptions = mkOption { - type = types.listOf types.str; - default = []; - example = [ "-Xms1024m" "-Xmx2048m" "-Dconfluence.disable.peopledirectory.all=true" ]; - description = "Java options to pass to catalina/tomcat."; - }; - - proxy = { - enable = mkEnableOption "proxy support"; - - name = mkOption { - type = types.str; - example = "confluence.example.com"; - description = "Virtual hostname at the proxy"; - }; - - port = mkOption { - type = types.port; - default = 443; - example = 80; - description = "Port used at the proxy"; - }; - - scheme = mkOption { - type = types.str; - default = "https"; - example = "http"; - description = "Protocol used at the proxy."; - }; - }; - - sso = { - enable = mkEnableOption "SSO with Atlassian Crowd"; - - crowd = mkOption { - type = types.str; - example = "http://localhost:8095/crowd"; - description = "Crowd Base URL without trailing slash"; - }; - - applicationName = mkOption { - type = types.str; - example = "jira"; - description = "Exact name of this Confluence instance in Crowd"; - }; - - applicationPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = "Application password of this Confluence instance in Crowd"; - }; - - applicationPasswordFile = mkOption { - type = types.nullOr types.str; - default = null; - description = "Path to the application password for Crowd of Confluence."; - }; - - validationInterval = mkOption { - type = types.int; - default = 2; - example = 0; - description = '' - Set to 0, if you want authentication checks to occur on each - request. Otherwise set to the number of minutes between request - to validate if the user is logged in or out of the Crowd SSO - server. Setting this value to 1 or higher will increase the - performance of Crowd's integration. - ''; - }; - }; - - package = mkPackageOption pkgs "atlassian-confluence" { }; - - jrePackage = mkPackageOption pkgs "oraclejre8" { - extraDescription = '' - ::: {.note } - Atlassian only supports the Oracle JRE (JRASERVER-46152). - ::: - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - }; - - assertions = [ - { assertion = cfg.sso.enable -> ((cfg.sso.applicationPassword == null) != (cfg.sso.applicationPasswordFile)); - message = "Please set either applicationPassword or applicationPasswordFile"; - } - ]; - - warnings = mkIf (cfg.sso.enable && cfg.sso.applicationPassword != null) [ - "Using `services.confluence.sso.applicationPassword` is deprecated! Use `applicationPasswordFile` instead!" - ]; - - users.groups.${cfg.group} = {}; - - systemd.tmpfiles.rules = [ - "d '${cfg.home}' - ${cfg.user} - - -" - "d /run/confluence - - - - -" - - "L+ /run/confluence/home - - - - ${cfg.home}" - "L+ /run/confluence/logs - - - - ${cfg.home}/logs" - "L+ /run/confluence/temp - - - - ${cfg.home}/temp" - "L+ /run/confluence/work - - - - ${cfg.home}/work" - "L+ /run/confluence/server.xml - - - - ${cfg.home}/server.xml" - ]; - - systemd.services.confluence = { - description = "Atlassian Confluence"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - - path = [ cfg.jrePackage pkgs.bash ]; - - environment = { - CONF_USER = cfg.user; - JAVA_HOME = "${cfg.jrePackage}"; - CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; - JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties"; - }; - - preStart = '' - mkdir -p ${cfg.home}/{logs,work,temp,deploy} - - sed -e 's,port="8090",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ - '' + (lib.optionalString cfg.proxy.enable '' - -e 's,protocol="org.apache.coyote.http11.Http11NioProtocol",protocol="org.apache.coyote.http11.Http11NioProtocol" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}",' \ - '') + '' - ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml - - ${optionalString cfg.sso.enable '' - install -m660 ${crowdProperties} ${cfg.home}/crowd.properties - ${optionalString (cfg.sso.applicationPasswordFile != null) '' - ${pkgs.replace-secret}/bin/replace-secret \ - '@NIXOS_CONFLUENCE_CROWD_SSO_PWD@' \ - ${cfg.sso.applicationPasswordFile} \ - ${cfg.home}/crowd.properties - ''} - ''} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - PrivateTmp = true; - Restart = "on-failure"; - RestartSec = "10"; - ExecStart = "${pkg}/bin/start-confluence.sh -fg"; - ExecStop = "${pkg}/bin/stop-confluence.sh"; - }; - }; - }; -} diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix deleted file mode 100644 index 527fa1743df2..000000000000 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ /dev/null @@ -1,193 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.crowd; - - pkg = cfg.package.override { - home = cfg.home; - port = cfg.listenPort; - openidPassword = cfg.openidPassword; - } // (optionalAttrs cfg.proxy.enable { - proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}"; - }); - - crowdPropertiesFile = pkgs.writeText "crowd.properties" '' - application.name crowd-openid-server - application.password @NIXOS_CROWD_OPENID_PW@ - application.base.url http://localhost:${toString cfg.listenPort}/openidserver - application.login.url http://localhost:${toString cfg.listenPort}/openidserver - application.login.url.template http://localhost:${toString cfg.listenPort}/openidserver?returnToUrl=''${RETURN_TO_URL} - - crowd.server.url http://localhost:${toString cfg.listenPort}/crowd/services/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval 0 - session.lastvalidation session.lastvalidation - ''; - -in - -{ - options = { - services.crowd = { - enable = mkEnableOption "Atlassian Crowd service"; - - user = mkOption { - type = types.str; - default = "crowd"; - description = "User which runs Crowd."; - }; - - group = mkOption { - type = types.str; - default = "crowd"; - description = "Group which runs Crowd."; - }; - - home = mkOption { - type = types.str; - default = "/var/lib/crowd"; - description = "Home directory of the Crowd instance."; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Address to listen on."; - }; - - listenPort = mkOption { - type = types.port; - default = 8092; - description = "Port to listen on."; - }; - - openidPassword = mkOption { - type = types.str; - default = "WILL_NEVER_BE_SET"; - description = "Application password for OpenID server."; - }; - - openidPasswordFile = mkOption { - type = types.nullOr types.str; - default = null; - description = "Path to the file containing the application password for OpenID server."; - }; - - catalinaOptions = mkOption { - type = types.listOf types.str; - default = []; - example = [ "-Xms1024m" "-Xmx2048m" ]; - description = "Java options to pass to catalina/tomcat."; - }; - - proxy = { - enable = mkEnableOption "reverse proxy support"; - - name = mkOption { - type = types.str; - example = "crowd.example.com"; - description = "Virtual hostname at the proxy"; - }; - - port = mkOption { - type = types.port; - default = 443; - example = 80; - description = "Port used at the proxy"; - }; - - scheme = mkOption { - type = types.str; - default = "https"; - example = "http"; - description = "Protocol used at the proxy."; - }; - - secure = mkOption { - type = types.bool; - default = true; - description = "Whether the connections to the proxy should be considered secure."; - }; - }; - - package = mkPackageOption pkgs "atlassian-crowd" { }; - - jrePackage = mkPackageOption pkgs "oraclejre8" { - extraDescription = '' - ::: {.note } - Atlassian only supports the Oracle JRE (JRASERVER-46152). - ::: - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - }; - - users.groups.${cfg.group} = {}; - - systemd.tmpfiles.rules = [ - "d '${cfg.home}' - ${cfg.user} ${cfg.group} - -" - "d /run/atlassian-crowd - - - - -" - - "L+ /run/atlassian-crowd/database - - - - ${cfg.home}/database" - "L+ /run/atlassian-crowd/logs - - - - ${cfg.home}/logs" - "L+ /run/atlassian-crowd/work - - - - ${cfg.home}/work" - "L+ /run/atlassian-crowd/server.xml - - - - ${cfg.home}/server.xml" - ]; - - systemd.services.atlassian-crowd = { - description = "Atlassian Crowd"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - - path = [ cfg.jrePackage ]; - - environment = { - JAVA_HOME = "${cfg.jrePackage}"; - CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; - CATALINA_TMPDIR = "/tmp"; - JAVA_OPTS = mkIf (cfg.openidPasswordFile != null) "-Dcrowd.properties=${cfg.home}/crowd.properties"; - }; - - preStart = '' - rm -rf ${cfg.home}/work - mkdir -p ${cfg.home}/{logs,database,work} - - sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ - '' + (lib.optionalString cfg.proxy.enable '' - -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \ - '') + '' - ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml - - ${optionalString (cfg.openidPasswordFile != null) '' - install -m660 ${crowdPropertiesFile} ${cfg.home}/crowd.properties - ${pkgs.replace-secret}/bin/replace-secret \ - '@NIXOS_CROWD_OPENID_PW@' \ - ${cfg.openidPasswordFile} \ - ${cfg.home}/crowd.properties - ''} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - PrivateTmp = true; - Restart = "on-failure"; - RestartSec = "10"; - ExecStart = "${pkg}/start_crowd.sh -fg"; - }; - }; - }; -} diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix deleted file mode 100644 index 40c5d95cae3a..000000000000 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ /dev/null @@ -1,219 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.jira; - - pkg = cfg.package.override (optionalAttrs cfg.sso.enable { - enableSSO = cfg.sso.enable; - }); - - crowdProperties = pkgs.writeText "crowd.properties" '' - application.name ${cfg.sso.applicationName} - application.password @NIXOS_JIRA_CROWD_SSO_PWD@ - application.login.url ${cfg.sso.crowd}/console/ - - crowd.server.url ${cfg.sso.crowd}/services/ - crowd.base.url ${cfg.sso.crowd}/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval ${toString cfg.sso.validationInterval} - session.lastvalidation session.lastvalidation - ''; - -in - -{ - options = { - services.jira = { - enable = mkEnableOption "Atlassian JIRA service"; - - user = mkOption { - type = types.str; - default = "jira"; - description = "User which runs JIRA."; - }; - - group = mkOption { - type = types.str; - default = "jira"; - description = "Group which runs JIRA."; - }; - - home = mkOption { - type = types.str; - default = "/var/lib/jira"; - description = "Home directory of the JIRA instance."; - }; - - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1"; - description = "Address to listen on."; - }; - - listenPort = mkOption { - type = types.port; - default = 8091; - description = "Port to listen on."; - }; - - catalinaOptions = mkOption { - type = types.listOf types.str; - default = []; - example = [ "-Xms1024m" "-Xmx2048m" ]; - description = "Java options to pass to catalina/tomcat."; - }; - - proxy = { - enable = mkEnableOption "reverse proxy support"; - - name = mkOption { - type = types.str; - example = "jira.example.com"; - description = "Virtual hostname at the proxy"; - }; - - port = mkOption { - type = types.port; - default = 443; - example = 80; - description = "Port used at the proxy"; - }; - - scheme = mkOption { - type = types.str; - default = "https"; - example = "http"; - description = "Protocol used at the proxy."; - }; - - secure = mkOption { - type = types.bool; - default = true; - description = "Whether the connections to the proxy should be considered secure."; - }; - }; - - sso = { - enable = mkEnableOption "SSO with Atlassian Crowd"; - - crowd = mkOption { - type = types.str; - example = "http://localhost:8095/crowd"; - description = "Crowd Base URL without trailing slash"; - }; - - applicationName = mkOption { - type = types.str; - example = "jira"; - description = "Exact name of this JIRA instance in Crowd"; - }; - - applicationPasswordFile = mkOption { - type = types.str; - description = "Path to the file containing the application password of this JIRA instance in Crowd"; - }; - - validationInterval = mkOption { - type = types.int; - default = 2; - example = 0; - description = '' - Set to 0, if you want authentication checks to occur on each - request. Otherwise set to the number of minutes between request - to validate if the user is logged in or out of the Crowd SSO - server. Setting this value to 1 or higher will increase the - performance of Crowd's integration. - ''; - }; - }; - - package = mkPackageOption pkgs "atlassian-jira" { }; - - jrePackage = mkPackageOption pkgs "oraclejre8" { - extraDescription = '' - ::: {.note } - Atlassian only supports the Oracle JRE (JRASERVER-46152). - ::: - ''; - }; - }; - }; - - config = mkIf cfg.enable { - users.users.${cfg.user} = { - isSystemUser = true; - group = cfg.group; - home = cfg.home; - }; - - users.groups.${cfg.group} = {}; - - systemd.tmpfiles.rules = [ - "d '${cfg.home}' - ${cfg.user} - - -" - "d /run/atlassian-jira - - - - -" - - "L+ /run/atlassian-jira/home - - - - ${cfg.home}" - "L+ /run/atlassian-jira/logs - - - - ${cfg.home}/logs" - "L+ /run/atlassian-jira/work - - - - ${cfg.home}/work" - "L+ /run/atlassian-jira/temp - - - - ${cfg.home}/temp" - "L+ /run/atlassian-jira/server.xml - - - - ${cfg.home}/server.xml" - ]; - - systemd.services.atlassian-jira = { - description = "Atlassian JIRA"; - - wantedBy = [ "multi-user.target" ]; - requires = [ "postgresql.service" ]; - after = [ "postgresql.service" ]; - - path = [ cfg.jrePackage pkgs.bash ]; - - environment = { - JIRA_USER = cfg.user; - JIRA_HOME = cfg.home; - JAVA_HOME = "${cfg.jrePackage}"; - CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; - JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties"; - }; - - preStart = '' - mkdir -p ${cfg.home}/{logs,work,temp,deploy} - - sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ - '' + (lib.optionalString cfg.proxy.enable '' - -e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \ - '') + '' - ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml - - ${optionalString cfg.sso.enable '' - install -m660 ${crowdProperties} ${cfg.home}/crowd.properties - ${pkgs.replace-secret}/bin/replace-secret \ - '@NIXOS_JIRA_CROWD_SSO_PWD@' \ - ${cfg.sso.applicationPasswordFile} \ - ${cfg.home}/crowd.properties - ''} - ''; - - serviceConfig = { - User = cfg.user; - Group = cfg.group; - PrivateTmp = true; - Restart = "on-failure"; - RestartSec = "10"; - ExecStart = "${pkg}/bin/start-jira.sh -fg"; - ExecStop = "${pkg}/bin/stop-jira.sh"; - }; - }; - }; - - imports = [ - (mkRemovedOptionModule [ "services" "jira" "sso" "applicationPassword" ] '' - Use `applicationPasswordFile` instead! - '') - ]; -} diff --git a/pkgs/servers/atlassian/bamboo.nix b/pkgs/servers/atlassian/bamboo.nix deleted file mode 100644 index b5e97a87da56..000000000000 --- a/pkgs/servers/atlassian/bamboo.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenvNoCC, lib, fetchurl, mysql_jdbc -, withMysql ? true -}: - - -stdenvNoCC.mkDerivation rec { - pname = "atlassian-bamboo"; - version = "9.6.4"; - - src = fetchurl { - url = "https://product-downloads.atlassian.com/software/bamboo/downloads/atlassian-bamboo-${version}.tar.gz"; - hash = "sha256-Gd4+rH/40s9AvJi/waEVfVwWtT0H3bSlknNV6wxGpNg="; - }; - - buildPhase = '' - echo "bamboo.home=/run/bamboo/home" > atlassian-bamboo/WEB-INF/classes/bamboo-init.properties - mv conf/server.xml conf/server.xml.dist - ln -sf /run/atlassian-bamboo/server.xml conf/server.xml - rm -r logs; ln -sf /run/atlassian-bamboo/logs/ . - rm -r temp; ln -sf /run/atlassian-bamboo/temp/ . - rm -r work; ln -sf /run/atlassian-bamboo/work/ . - '' + lib.optionalString withMysql '' - cp -v ${mysql_jdbc}/share/java/*jar atlassian-bamboo/lib/ - ''; - - installPhase = '' - cp -rva . $out - patchShebangs $out/bin - ''; - - meta = with lib; { - description = "Bamboo Data Center is a continuous delivery server"; - homepage = "https://www.atlassian.com/software/bamboo"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = with licenses; [ unfree ]; - maintainers = with maintainers; [ techknowlogick ]; - }; -} diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix deleted file mode 100644 index ea33a66ee044..000000000000 --- a/pkgs/servers/atlassian/confluence.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenvNoCC, lib, fetchurl, mysql_jdbc ? null -, enableSSO ? false -, crowdProperties ? null -, withMysql ? true -}: - -assert withMysql -> (mysql_jdbc != null); - -lib.warnIf (crowdProperties != null) "Using `crowdProperties` is deprecated!" -(stdenvNoCC.mkDerivation rec { - pname = "atlassian-confluence"; - version = "9.0.1"; - - src = fetchurl { - url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - hash = "sha256-WCshWmJaTfyjRLaXUtkDuXHO5eEhHa/rDCPVFSLd3aU="; - }; - - buildPhase = '' - echo "confluence.home=/run/confluence/home" > confluence/WEB-INF/classes/confluence-init.properties - mv conf/server.xml conf/server.xml.dist - ln -sf /run/confluence/home/deploy conf/Standalone - ln -sf /run/confluence/server.xml conf/server.xml - rm -r logs; ln -sf /run/confluence/logs/ . - rm -r work; ln -sf /run/confluence/work/ . - rm -r temp; ln -sf /run/confluence/temp/ . - '' + lib.optionalString enableSSO '' - substituteInPlace confluence/WEB-INF/classes/seraph-config.xml \ - --replace com.atlassian.confluence.user.ConfluenceAuthenticator\ - com.atlassian.confluence.user.ConfluenceCrowdSSOAuthenticator - '' + lib.optionalString (crowdProperties != null) '' - cat < confluence/WEB-INF/classes/crowd.properties - ${crowdProperties} - EOF - '' + lib.optionalString withMysql '' - cp -v ${mysql_jdbc}/share/java/*jar confluence/WEB-INF/lib/ - ''; - - installPhase = '' - cp -rva . $out - patchShebangs $out/bin - ''; - - meta = with lib; { - description = "Team collaboration software written in Java and mainly used in corporate environments"; - homepage = "https://www.atlassian.com/software/confluence"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.unfree; - maintainers = with maintainers; [ willibutz ciil techknowlogick ]; - }; -}) diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix deleted file mode 100644 index 44c44a0d2681..000000000000 --- a/pkgs/servers/atlassian/crowd.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchurl, home ? "/var/lib/crowd" -, port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }: - -lib.warnIf (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!" -(stdenv.mkDerivation rec { - pname = "atlassian-crowd"; - version = "5.0.1"; - - src = fetchurl { - url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz"; - sha256 = "sha256-ccXSNuiXP0+b9WObboikqVd0nKH0Fi2gMVEF3+WAx5M="; - }; - - buildPhase = '' - mv apache-tomcat/conf/server.xml apache-tomcat/conf/server.xml.dist - ln -s /run/atlassian-crowd/server.xml apache-tomcat/conf/server.xml - - rm -rf apache-tomcat/{logs,work} - ln -s /run/atlassian-crowd/logs apache-tomcat/logs - ln -s /run/atlassian-crowd/work apache-tomcat/work - - ln -s /run/atlassian-crowd/database database - - substituteInPlace apache-tomcat/bin/startup.sh --replace start run - - echo "crowd.home=${home}" > crowd-webapp/WEB-INF/classes/crowd-init.properties - substituteInPlace build.properties \ - --replace "openidserver.url=http://localhost:8095/openidserver" \ - "openidserver.url=http://localhost:${toString port}/openidserver" - substituteInPlace crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ - --replace "http://localhost:8095/" \ - "http://localhost:${toString port}/" - sed -r -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ - -e 's,application.password\s+password,application.password ${openidPassword},' - '' + lib.optionalString (proxyUrl != null) '' - sed -i crowd-openidserver-webapp/WEB-INF/classes/crowd.properties \ - -e 's,http://localhost:${toString port}/openidserver,${proxyUrl}/openidserver,' - ''; - - installPhase = '' - cp -rva . $out - ''; - - meta = with lib; { - description = "Single sign-on and identity management tool"; - homepage = "https://www.atlassian.com/software/crowd"; - license = licenses.unfree; - maintainers = [ ]; - }; -}) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix deleted file mode 100644 index ea0f6579845b..000000000000 --- a/pkgs/servers/atlassian/jira.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv -, lib -, fetchurl -, gawk -, enableSSO ? false -, makeWrapper -}: - -stdenv.mkDerivation rec { - pname = "atlassian-jira"; - version = "9.17.1"; - - src = fetchurl { - url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - hash = "sha256-hSwPVYIN1/BG6d8UepopLEMExjwDg/w/Bwj9k27nmDQ="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildPhase = '' - mv conf/server.xml conf/server.xml.dist - ln -sf /run/atlassian-jira/server.xml conf/server.xml - rm -r logs; ln -sf /run/atlassian-jira/logs/ . - rm -r work; ln -sf /run/atlassian-jira/work/ . - rm -r temp; ln -sf /run/atlassian-jira/temp/ . - substituteInPlace bin/check-java.sh \ - --replace "awk" "${gawk}/bin/gawk" - '' + lib.optionalString enableSSO '' - substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \ - --replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \ - com.atlassian.jira.security.login.SSOSeraphAuthenticator - ''; - - installPhase = '' - cp -rva . $out - ''; - - meta = with lib; { - description = "Proprietary issue tracking product, also providing project management functions"; - homepage = "https://www.atlassian.com/software/jira"; - license = licenses.unfree; - maintainers = with maintainers; [ ciil megheaiulian techknowlogick ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 00ae5e1dbca9..7db3127df523 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -115,6 +115,10 @@ mapAliases { aria = aria2; # Added 2024-03-26 armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11 aseprite-unfree = aseprite; # Added 2023-08-26 + atlassian-bamboo = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 + atlassian-confluence = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 + atlassian-crowd = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 + atlassian-jira = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02 audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06 auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02 aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e47a9b6b669..a6992f6a702c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23969,11 +23969,6 @@ with pkgs; appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { }; - atlassian-bamboo = callPackage ../servers/atlassian/bamboo.nix { }; - atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { }; - atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { }; - atlassian-jira = callPackage ../servers/atlassian/jira.nix { }; - cadvisor = callPackage ../servers/monitoring/cadvisor { }; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { From e4ee7324f9c1977c16a9f2426ac4aee102c5a36b Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 3 Nov 2024 00:03:35 +0300 Subject: [PATCH 364/369] home-assistant-custom-components.midea_ac_lan: add missed dependency (#353216) --- .../home-assistant/custom-components/midea_ac_lan/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix index 7123389e8bc1..98ba5281c5df 100644 --- a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix +++ b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix @@ -1,6 +1,7 @@ { lib , buildHomeAssistantComponent , fetchFromGitHub +, pycryptodome }: buildHomeAssistantComponent rec { @@ -15,6 +16,8 @@ buildHomeAssistantComponent rec { hash = "sha256-xTnbA4GztHOE61QObEJbzUSdbuSrhbcJ280DUDdM+n4="; }; + dependencies = [ pycryptodome ]; + meta = with lib; { description = "Auto-configure and then control your Midea M-Smart devices (Air conditioner, Fan, Water heater, Washer, etc) via local area network"; homepage = "https://github.com/georgezhao2010/midea_ac_lan/"; From 1f7ba4a14870359616608a440094285c68a2af52 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 2 Nov 2024 21:06:12 +0000 Subject: [PATCH 365/369] rs-tftpd: 0.3.1 -> 0.3.2 --- pkgs/by-name/rs/rs-tftpd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rs/rs-tftpd/package.nix b/pkgs/by-name/rs/rs-tftpd/package.nix index ec6c62e96e36..79b5180c065a 100644 --- a/pkgs/by-name/rs/rs-tftpd/package.nix +++ b/pkgs/by-name/rs/rs-tftpd/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "rs-tftpd"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "altugbakan"; repo = "rs-tftpd"; rev = version; - hash = "sha256-ZWafSqHEBgS7LR9hTfatatvAFZnCP8L5rHLerdjyrUc="; + hash = "sha256-RUjxCHO4X3V3Mt6zargqqT2v92XTt8FO9S68+tYZFC0="; }; - cargoHash = "sha256-uBVDH7YYSuFv0r5T2+EAoL02ta+1hjaza/Ilu+a+k0k="; + cargoHash = "sha256-sLdOVthIHXzdY0/tVn2J0CUr3IqLsVHO/5S4X0NmN64="; buildFeatures = [ "client" ]; From c0d9ad3ec405593ac12fcfa57355186e6961b56f Mon Sep 17 00:00:00 2001 From: Tomo Date: Sat, 2 Nov 2024 21:10:32 +0000 Subject: [PATCH 366/369] doc/languages-frameworks/java: remove reference to oraclejdk About to be removed, and this doesn't look true anymore. --- doc/languages-frameworks/java.section.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/languages-frameworks/java.section.md b/doc/languages-frameworks/java.section.md index 6d56ffcd4503..5208a6388a32 100644 --- a/doc/languages-frameworks/java.section.md +++ b/doc/languages-frameworks/java.section.md @@ -33,8 +33,7 @@ stdenv.mkDerivation { ``` Note that `jdk` is an alias for the OpenJDK (self-built where available, -or pre-built via Zulu). Platforms with OpenJDK not (yet) in Nixpkgs -(`Aarch32`, `Aarch64`) point to the (unfree) `oraclejdk`. +or pre-built via Zulu). Also note that not using `stripJavaArchivesHook` will likely cause the generated `.jar` files to be non-deterministic, which is not optimal. From d6eb9f15156c62f801e53ad62d04041a98205107 Mon Sep 17 00:00:00 2001 From: Tomo Date: Sat, 2 Nov 2024 02:42:27 +0000 Subject: [PATCH 367/369] oracle{jdk,jre}: drop "Unmaintained security disaster" -anonymous Nixpkgs maintainer --- .../manual/release-notes/rl-2411.section.md | 5 + .../compilers/oraclejdk/dlj-bundle-builder.sh | 60 ------ .../compilers/oraclejdk/jdk-linux-base.nix | 193 ------------------ .../compilers/oraclejdk/jdk11-linux.nix | 54 ----- .../compilers/oraclejdk/jdk8-linux.nix | 10 - pkgs/top-level/aliases.nix | 9 + pkgs/top-level/all-packages.nix | 21 -- 7 files changed, 14 insertions(+), 338 deletions(-) delete mode 100644 pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh delete mode 100644 pkgs/development/compilers/oraclejdk/jdk-linux-base.nix delete mode 100644 pkgs/development/compilers/oraclejdk/jdk11-linux.nix delete mode 100644 pkgs/development/compilers/oraclejdk/jdk8-linux.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index c5d1395ebb6a..0b3a160e28e7 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -333,6 +333,11 @@ This change requires granting access to the repositories to this user or setting the appropriate one through `services.cgit.some-instance.user`. +- All Oracle JDKs and JREs (`oraclejdk`, `oraclejdk8`, `oraclejre`, `oraclejre8`, + `jrePlugin`, `jre8Plugin`, `jdkdistro`, `oraclejdk8distro`, and `oraclejdk11`) + were dropped due to being unmaintained and heavily insecure. OpenJDK provides + compatible replacements for JDKs and JREs. + - `gradle_6` was removed due to being [unsupported upstream as of 10 Feb 2023](https://endoflife.date/gradle). Additionally, it had numerous security vulnerabilities that were only patched in later versions, such as [CVE-2021-29429](https://nvd.nist.gov/vuln/detail/CVE-2021-32751), diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh deleted file mode 100644 index 459bfce50988..000000000000 --- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh +++ /dev/null @@ -1,60 +0,0 @@ -source $stdenv/setup - -echo "Unpacking distribution" -unzip ${src} || true - -# set the dynamic linker of unpack200, necessary for construct script -echo "patching unpack200" -patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 - -echo "constructing JDK and JRE installations" -if test -z "$installjdk"; then - sh ${construct} . tmp-linux-jdk tmp-linux-jre - mkdir -p $out - cp -R tmp-linux-jre/* $out -else - sh ${construct} . $out tmp-linux-jre -fi - -echo "removing files at top level of installation" -for file in $out/* -do - if test -f $file ; then - rm $file - fi -done -rm -rf $out/docs - -# construct the rpath -rpath= -for i in $libraries; do - rpath=$rpath${rpath:+:}$i/lib -done - -if test -z "$installjdk"; then - jrePath=$out -else - jrePath=$out/jre -fi - -if test -n "$jce"; then - unzip $jce - cp -v jce/*.jar $jrePath/lib/security -fi - -rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli - -# set all the dynamic linkers -find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - -find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - -if test -z "$pluginSupport"; then - rm -f $out/bin/javaws -fi - -mkdir $jrePath/lib/$architecture/plugins -ln -s $jrePath/lib/$architecture/libnpjp2.so $jrePath/lib/$architecture/plugins - diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix deleted file mode 100644 index 05045f9bccd2..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ /dev/null @@ -1,193 +0,0 @@ -{ productVersion -, patchVersion -, sha256 -, jceName -, sha256JCE -}: - -{ swingSupport ? true -, lib, stdenv -, requireFile -, makeWrapper -, unzip -, file -, xorg ? null -, installjdk ? true -, pluginSupport ? true -, installjce ? false -, config -, glib -, libxml2 -, ffmpeg -, libxslt -, libGL -, freetype -, fontconfig -, gtk2 -, pango -, cairo -, alsa-lib -, atk -, gdk-pixbuf -, setJavaClassPath -}: - -assert swingSupport -> xorg != null; - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = { - i686-linux = "i386"; - x86_64-linux = "amd64"; - armv7l-linux = "arm"; - aarch64-linux = "aarch64"; - }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - - jce = - if installjce then - requireFile { - name = jceName; - url = "http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html"; - sha256 = sha256JCE; - } - else - ""; - - rSubPaths = [ - "lib/${architecture}/jli" - "lib/${architecture}/server" - "lib/${architecture}/xawt" - "lib/${architecture}" - ]; - -in - -let result = stdenv.mkDerivation rec { - pname = if installjdk then "oraclejdk" else "oraclejre" + lib.optionalString pluginSupport "-with-plugin"; - version = "${productVersion}u${patchVersion}"; - - src = - let - platformName = { - i686-linux = "linux-i586"; - x86_64-linux = "linux-x64"; - armv7l-linux = "linux-arm32-vfp-hflt"; - aarch64-linux = "linux-aarch64"; - }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - in requireFile { - name = "jdk-${productVersion}u${patchVersion}-${platformName}.tar.gz"; - url = "http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"; - sha256 = sha256.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); - }; - - nativeBuildInputs = [ file makeWrapper ] - ++ lib.optional installjce unzip; - - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = 1; - - installPhase = '' - cd .. - - if test -z "$installjdk"; then - mv $sourceRoot/jre $out - else - mv $sourceRoot $out - fi - - shopt -s extglob - for file in $out/!(*src.zip) - do - if test -f $file ; then - rm $file - fi - done - - if test -n "$installjdk"; then - for file in $out/jre/* - do - if test -f $file ; then - rm $file - fi - done - fi - - if test -z "$installjdk"; then - jrePath=$out - else - jrePath=$out/jre - fi - - if test -n "${jce}"; then - unzip ${jce} - cp -v UnlimitedJCEPolicy*/*.jar $jrePath/lib/security - fi - - if test -z "$pluginSupport"; then - rm -f $out/bin/javaws - if test -n "$installjdk"; then - rm -f $out/jre/bin/javaws - fi - fi - - mkdir $jrePath/lib/${architecture}/plugins - ln -s $jrePath/lib/${architecture}/libnpjp2.so $jrePath/lib/${architecture}/plugins - - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath+="''${rpath:+:}${lib.concatStringsSep ":" (map (a: "$jrePath/${a}") rSubPaths)}" - - # set all the dynamic linkers - find $out -type f -perm -0100 \ - -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$rpath" {} \; - - find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; - - # Oracle Java Mission Control needs to know where libgtk-x11 and related is - if test -n "$installjdk" -a -x $out/bin/jmc; then - wrapProgram "$out/bin/jmc" \ - --suffix-each LD_LIBRARY_PATH ':' "$rpath" - fi - ''; - - inherit installjdk pluginSupport; - - /** - * libXt is only needed on amd64 - */ - libraries = - [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsa-lib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ - lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc]; - - rpath = lib.strings.makeLibraryPath libraries; - - passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; - - passthru.jre = result; # FIXME: use multiple outputs or return actual JRE package - - passthru.home = result; - - passthru.architecture = architecture; - - meta = with lib; { - license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms - mainProgram = "java"; - knownVulnerabilities = [ - "The Oracle JDKs included with Nixpkgs have not been updated since 2021. They contain many known vulnerabilities (https://openjdk.org/groups/vulnerability/advisories/). OpenJDK provides a comparable alternative." - ]; - }; - -}; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix b/pkgs/development/compilers/oraclejdk/jdk11-linux.nix deleted file mode 100644 index a232b796a068..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk11-linux.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv -, requireFile -, xorg -, zlib -, freetype -, alsa-lib -, setJavaClassPath -}: - -let result = stdenv.mkDerivation rec { - pname = "oraclejdk"; - version = "11.0.10"; - - src = requireFile { - name = "jdk-${version}_linux-x64_bin.tar.gz"; - url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html"; - sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2"; - }; - - installPhase = '' - mv ../$sourceRoot $out - - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}" - - for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true - patchelf --set-rpath "$rpath" "$f" || true - done - - for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do - if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi - done - ''; - - passthru.jre = result; - passthru.home = result; - - dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10 - - meta = with lib; { - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -}; in result diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix deleted file mode 100644 index 206df75b9ebf..000000000000 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ /dev/null @@ -1,10 +0,0 @@ -import ./jdk-linux-base.nix { - productVersion = "8"; - patchVersion = "281"; - sha256.i686-linux = "/yEY5O6MYNyjS5YSGZtgydb8th6jHQLNvI9tNPIh3+0="; - sha256.x86_64-linux = "hejH2nJIx0UPsQVWeniEHQlzWXhQd2wkpSf+sC7z5YY="; - sha256.armv7l-linux = "oXbW8hZxesDqwV79ANB4SdnS71O51ZApKbQhqq4i/EM="; - sha256.aarch64-linux = "oFH3TeIzVsFk6IZcDEHVDVJC7dSbGcwhdUH/WUXSNDM="; - jceName = "jce_policy-8.zip"; - sha256JCE = "19n5wadargg3v8x76r7ayag6p2xz1bwhrgdzjs9f4i6fvxz9jr4w"; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7db3127df523..6603b96b8191 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -900,6 +900,15 @@ mapAliases { onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03 openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24 + oraclejdk = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + oraclejdk8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + oraclejre = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + oraclejre8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + jrePlugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + jre8Plugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + jdkdistro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + oraclejdk8distro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 + oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01 OSCAR = oscar; # Added 2024-06-12 osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17 ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6992f6a702c..a1d0b7aca1b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15012,27 +15012,6 @@ with pkgs; openspin = callPackage ../development/compilers/openspin { }; - oraclejdk = jdkdistro true false; - - oraclejdk8 = oraclejdk8distro true false; - - oraclejre = lowPrio (jdkdistro false false); - - oraclejre8 = lowPrio (oraclejdk8distro false false); - - jrePlugin = jre8Plugin; - - jre8Plugin = lowPrio (oraclejdk8distro false true); - - jdkdistro = oraclejdk8distro; - - oraclejdk8distro = installjdk: pluginSupport: - (callPackage ../development/compilers/oraclejdk/jdk8-linux.nix { - inherit installjdk pluginSupport; - }); - - oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { }; - jasmin = callPackage ../development/compilers/jasmin { }; java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; From 69c5da4e43117b178b6cbfaa16ee2e31b5177bf3 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sat, 2 Nov 2024 18:24:44 -0400 Subject: [PATCH 368/369] python312Packages.hypothesmith: Disable failing test This test now fails with black 24.8.0+, so it is disabled until (hopefully) upstream releases a new version that addresses this. --- pkgs/development/python-modules/hypothesmith/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hypothesmith/default.nix b/pkgs/development/python-modules/hypothesmith/default.nix index c53c3c2e3670..fa40d34c8a82 100644 --- a/pkgs/development/python-modules/hypothesmith/default.nix +++ b/pkgs/development/python-modules/hypothesmith/default.nix @@ -45,6 +45,8 @@ buildPythonPackage rec { disabledTests = [ # super slow "test_source_code_from_libcst_node_type" + # https://github.com/Zac-HD/hypothesmith/issues/38 + "test_black_autoformatter_from_grammar" ]; pythonImportsCheck = [ "hypothesmith" ]; From 90f551609f70c121c0671b91639e16faabc90a89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Nov 2024 01:28:07 +0000 Subject: [PATCH 369/369] srain: 1.7.0 -> 1.8.0 --- pkgs/applications/networking/irc/srain/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/srain/default.nix b/pkgs/applications/networking/irc/srain/default.nix index c083c1a8048a..6984d720b638 100644 --- a/pkgs/applications/networking/irc/srain/default.nix +++ b/pkgs/applications/networking/irc/srain/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - hash = "sha256-mhnlHnF23+VZvSPNuTYYUVcA6Md4y2AGqEuJphY1/IY="; + hash = "sha256-c5dy5dD5Eb/MVNCpLqIGNuafsrmgLjEfRfSxKVxu5wY="; }; nativeBuildInputs = [