From ece1ffd894d994d79dacc50cd872787d72933d7f Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Tue, 21 Jan 2025 10:02:31 -0800 Subject: [PATCH 01/43] fourmolu: init at 0.14.0.0 `fourmolu` is a configurable fork of `ormolu`, and it's one of the more common Haskell formatters (used by `cabal-install` among other projects). This adds a top-level derivation for it. --- pkgs/by-name/fo/fourmolu/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 pkgs/by-name/fo/fourmolu/package.nix diff --git a/pkgs/by-name/fo/fourmolu/package.nix b/pkgs/by-name/fo/fourmolu/package.nix new file mode 100644 index 000000000000..fb0f938944df --- /dev/null +++ b/pkgs/by-name/fo/fourmolu/package.nix @@ -0,0 +1,11 @@ +{ + haskellPackages, + haskell, +}: + +let + inherit (haskell.lib.compose) + justStaticExecutables + ; +in +justStaticExecutables haskellPackages.fourmolu From 7a095000f2b074715117b676d1d5e40718c6afc0 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 23 Jan 2025 22:50:01 +0100 Subject: [PATCH 02/43] mmex: 1.8.0 -> 1.8.1 --- pkgs/by-name/mm/mmex/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/mm/mmex/package.nix b/pkgs/by-name/mm/mmex/package.nix index a5eb63ddc001..5663c2c27c25 100644 --- a/pkgs/by-name/mm/mmex/package.nix +++ b/pkgs/by-name/mm/mmex/package.nix @@ -21,25 +21,16 @@ stdenv.mkDerivation rec { pname = "money-manager-ex"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "moneymanagerex"; repo = "moneymanagerex"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-jV1jW0aFx95JpwzywEVajstnMKVcEtBdvyL7y6OLl+k="; + hash = "sha256-TOT5dFDCF3F1L8P2u+9Ve3/N9mtBD2/KirzF0pyfdIA="; }; - patches = [ - (fetchpatch { - # https://github.com/moneymanagerex/moneymanagerex/pull/6716 - name = "workaround-appstream-1.0.3.patch"; - url = "https://github.com/moneymanagerex/moneymanagerex/commit/bb98eab92d95b7315d27f4e59ae59b50587106d8.patch"; - hash = "sha256-98OyFO2nnGBRTIirxZ3jX1NPvsw5kVT8nsCSSmyfabo="; - }) - ]; - postPatch = '' substituteInPlace src/dbwrapper.cpp src/model/Model_Report.cpp \ --replace-fail "sqlite3mc_amalgamation.h" "sqlite3.h" From b0fc09c000ab828c792b67b48a7f7afb00b7913a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 24 Jan 2025 18:36:11 +0000 Subject: [PATCH 03/43] byedpi: 0.15 -> 0.16 --- pkgs/by-name/by/byedpi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/by/byedpi/package.nix b/pkgs/by-name/by/byedpi/package.nix index 674119df83f2..98e789aa91f5 100644 --- a/pkgs/by-name/by/byedpi/package.nix +++ b/pkgs/by-name/by/byedpi/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "byedpi"; - version = "0.15"; + version = "0.16"; src = fetchFromGitHub { owner = "hufrea"; repo = "byedpi"; tag = "v${finalAttrs.version}"; - hash = "sha256-jsQFfIvWvpJRBewUSS5bhDGocfPTvtG6LiejUxdqk28="; + hash = "sha256-/K60znoC/5NNOJ5olQI7YZkjShkGZaJDdub+LwZ/FKc="; }; installPhase = '' From bfc192c114e38051fc20a5563f677438287a1919 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 20:37:50 +0100 Subject: [PATCH 04/43] poedit: move to pkgs/by-name --- .../text/poedit/default.nix => by-name/po/poedit/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 4 deletions(-) rename pkgs/{tools/text/poedit/default.nix => by-name/po/poedit/package.nix} (100%) diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/by-name/po/poedit/package.nix similarity index 100% rename from pkgs/tools/text/poedit/default.nix rename to pkgs/by-name/po/poedit/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cb482bc375f..a68a8c91a510 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4752,10 +4752,6 @@ with pkgs; inherit (darwin) autoSignDarwinBinariesHook; }; - poedit = callPackage ../tools/text/poedit { - wxGTK32 = wxGTK32.override { withWebKit = true; }; - }; - polaris = callPackage ../servers/polaris { }; polaris-web = callPackage ../servers/polaris/web.nix { }; From 91e5112184970e5b452da2b38a75582a7a54de68 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 25 Jan 2025 20:38:06 +0100 Subject: [PATCH 05/43] poedit: 3.4.4 -> 3.5.2 --- pkgs/by-name/po/poedit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/poedit/package.nix b/pkgs/by-name/po/poedit/package.nix index 8b702994a000..09f60abdc6c9 100644 --- a/pkgs/by-name/po/poedit/package.nix +++ b/pkgs/by-name/po/poedit/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "poedit"; - version = "3.4.4"; + version = "3.5.2"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${version}-oss"; - hash = "sha256-SZjsJQYJCXQendzQ2Tobg+IgkWL6lFX5YnMfruPt7UA="; + hash = "sha256-FYLTHVoqXypW1QhnVmIWMp9u+/8pbdUoV7v9GSWEMIU="; }; nativeBuildInputs = [ From b2ef8ebfd6f7c6c30ffeab226128196f2689b3d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 27 Jan 2025 20:33:07 +0000 Subject: [PATCH 06/43] aerospike: 7.2.0.6 -> 8.0.0.1 --- pkgs/by-name/ae/aerospike/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ae/aerospike/package.nix b/pkgs/by-name/ae/aerospike/package.nix index 806932aa3d12..5ea24c9cf1c8 100644 --- a/pkgs/by-name/ae/aerospike/package.nix +++ b/pkgs/by-name/ae/aerospike/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "aerospike-server"; - version = "7.2.0.6"; + version = "8.0.0.1"; src = fetchFromGitHub { owner = "aerospike"; repo = "aerospike-server"; rev = version; - hash = "sha256-YjX/2+0n+nrtNwQaZSY5PPYAOnhR+jrIMp02STcJHRY="; + hash = "sha256-uVHi1/cT/3Rr/r3JudA09d3TMaTPYjc0ZpvTlz4m8aU="; fetchSubmodules = true; }; From 7d5418f5c10214024bde32b588e74e541fc504f6 Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 28 Jan 2025 21:04:39 -0500 Subject: [PATCH 07/43] python3Packages.azure-kusto-data: 4.6.1 -> 4.6.3 --- pkgs/development/python-modules/azure-kusto-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-kusto-data/default.nix b/pkgs/development/python-modules/azure-kusto-data/default.nix index 77d2c06f0e8d..8abc0b3578bb 100644 --- a/pkgs/development/python-modules/azure-kusto-data/default.nix +++ b/pkgs/development/python-modules/azure-kusto-data/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "azure-kusto-data"; - version = "4.6.1"; + version = "4.6.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "azure-kusto-python"; tag = "v${version}"; - hash = "sha256-rm8G3/WAUlK1/80uk3uiTqDA5hUIr+VVZEmPe0mYBjI="; + hash = "sha256-VndOEvSi4OMf/yAjNl34X9IFF0T+wNfjlPW8NfdrwUo="; }; sourceRoot = "${src.name}/${pname}"; From 0c496abff81883758c6c3a6f91a2b179e6ad1fe9 Mon Sep 17 00:00:00 2001 From: dish Date: Tue, 28 Jan 2025 21:04:51 -0500 Subject: [PATCH 08/43] python3Packages.azure-kusto-ingest: 4.6.1 -> 4.6.3 --- .../development/python-modules/azure-kusto-ingest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-kusto-ingest/default.nix b/pkgs/development/python-modules/azure-kusto-ingest/default.nix index 424581c59c19..223a24bfbd29 100644 --- a/pkgs/development/python-modules/azure-kusto-ingest/default.nix +++ b/pkgs/development/python-modules/azure-kusto-ingest/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "azure-kusto-ingest"; - version = "4.6.1"; + version = "4.6.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "azure-kusto-python"; tag = "v${version}"; - hash = "sha256-rm8G3/WAUlK1/80uk3uiTqDA5hUIr+VVZEmPe0mYBjI="; + hash = "sha256-VndOEvSi4OMf/yAjNl34X9IFF0T+wNfjlPW8NfdrwUo="; }; sourceRoot = "${src.name}/${pname}"; From a150314db43d82f8c1f8b816663f154d651108a9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 30 Jan 2025 13:34:01 +0100 Subject: [PATCH 09/43] prrte: fix to make multi-node openmpi jobs work out-of-the-box --- pkgs/by-name/pr/prrte/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/pr/prrte/package.nix b/pkgs/by-name/pr/prrte/package.nix index 1deb96f3a6c7..a4284b88168f 100644 --- a/pkgs/by-name/pr/prrte/package.nix +++ b/pkgs/by-name/pr/prrte/package.nix @@ -35,6 +35,13 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs ./autogen.pl ./config + + # This is needed for multi-node jobs. + # mpirun/srun/prterun does not have "prted" in its path unless + # it is actively pulled in. Hard-coding the nix store path + # as a default universally solves this issue. + substituteInPlace src/runtime/prte_mca_params.c --replace-fail \ + "prte_launch_agent = \"prted\"" "prte_launch_agent = \"$out/bin/prted\"" ''; preConfigure = '' From c8127fc287c344b9578458e69c760e36d4284749 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 30 Jan 2025 16:04:08 +0100 Subject: [PATCH 10/43] build-support/rust/sysroot: remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The sysroot derivation used by buildRustPackage hasn't built since c263e0b33b77 ("cargo,clippy,rustc,rustfmt: 1.81.0 -> 1.82.0"). That means that it's never built on 24.11, so there can't be anybody relying on it working on any supported version Nixpkgs. In the meantime, it's causing maintenance friction — I've spent a lot of time trying to figure out how to build it as part of the transition away from fetchCargoTarball, before realising that it doesn't work anyway and must be unused. It can come back in the future if somebody wants to maintain it. --- .../rust/build-rust-package/default.nix | 24 +-------- .../build-rust-package/sysroot/default.nix | 52 ------------------- pkgs/build-support/rust/sysroot/Cargo.lock | 44 ---------------- pkgs/build-support/rust/sysroot/cargo.py | 47 ----------------- pkgs/build-support/rust/sysroot/src.nix | 31 ----------- .../rust/sysroot/update-lockfile.sh | 27 ---------- 6 files changed, 1 insertion(+), 224 deletions(-) delete mode 100644 pkgs/build-support/rust/build-rust-package/sysroot/default.nix delete mode 100644 pkgs/build-support/rust/sysroot/Cargo.lock delete mode 100644 pkgs/build-support/rust/sysroot/cargo.py delete mode 100644 pkgs/build-support/rust/sysroot/src.nix delete mode 100755 pkgs/build-support/rust/sysroot/update-lockfile.sh diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 909ec8f4c05f..058d5a674f26 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -54,9 +54,6 @@ depsExtraArgs ? { }, - # Toggles whether a custom sysroot is created when the target is a .json file. - __internal_dontAddSysroot ? false, - # Needed to `pushd`/`popd` into a subdir of a tarball if this subdir # contains a Cargo.toml, but isn't part of a workspace (which is e.g. the # case for `rustfmt`/etc from the `rust-sources). @@ -125,21 +122,8 @@ let target = stdenv.hostPlatform.rust.rustcTargetSpec; targetIsJSON = lib.hasSuffix ".json" target; - useSysroot = targetIsJSON && !__internal_dontAddSysroot; - - sysroot = callPackage ./sysroot { } { - inherit target; - shortTarget = stdenv.hostPlatform.rust.cargoShortTarget; - RUSTFLAGS = args.RUSTFLAGS or ""; - originalCargoToml = src + /Cargo.toml; # profile info is later extracted - }; - in -# Tests don't currently work for `no_std`, and all custom sysroots are currently built without `std`. -# See https://os.phil-opp.com/testing/ for more information. -assert useSysroot -> !(args.doCheck or true); - stdenv.mkDerivation ( (removeAttrs args [ "depsExtraArgs" @@ -147,14 +131,8 @@ stdenv.mkDerivation ( "cargoDeps" "cargoLock" ]) - // lib.optionalAttrs useSysroot { - RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or ""); - } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") { - RUSTFLAGS = - "-C split-debuginfo=packed " - + lib.optionalString useSysroot "--sysroot ${sysroot} " - + (args.RUSTFLAGS or ""); + RUSTFLAGS = "-C split-debuginfo=packed " + (args.RUSTFLAGS or ""); } // { cargoDeps = cargoDeps'; diff --git a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix b/pkgs/build-support/rust/build-rust-package/sysroot/default.nix deleted file mode 100644 index d9d071df06cc..000000000000 --- a/pkgs/build-support/rust/build-rust-package/sysroot/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - buildPackages, -}: - -{ - shortTarget, - originalCargoToml, - target, - RUSTFLAGS, -}: - -let - cargoSrc = import ../../sysroot/src.nix { - inherit - lib - stdenv - rustPlatform - buildPackages - originalCargoToml - ; - }; -in -rustPlatform.buildRustPackage { - inherit target RUSTFLAGS; - - name = "custom-sysroot"; - src = cargoSrc; - - RUSTC_BOOTSTRAP = 1; - __internal_dontAddSysroot = true; - cargoHash = "sha256-zgkwevitxsu1C4OgGTsqNSc0gDxaNXYK1WPbfER48d0="; - - doCheck = false; - - installPhase = '' - export LIBS_DIR=$out/lib/rustlib/${shortTarget}/lib - mkdir -p $LIBS_DIR - for f in target/${shortTarget}/release/deps/*.{rlib,rmeta}; do - cp $f $LIBS_DIR - done - - export RUST_SYSROOT=$(rustc --print=sysroot) - host=${stdenv.buildPlatform.rust.rustcTarget} - cp -r $RUST_SYSROOT/lib/rustlib/$host $out - ''; - - # allows support for cross-compilation - meta.platforms = lib.platforms.all; -} diff --git a/pkgs/build-support/rust/sysroot/Cargo.lock b/pkgs/build-support/rust/sysroot/Cargo.lock deleted file mode 100644 index d9b0c25d02f2..000000000000 --- a/pkgs/build-support/rust/sysroot/Cargo.lock +++ /dev/null @@ -1,44 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "alloc" -version = "0.0.0" -dependencies = [ - "compiler_builtins", - "core", -] - -[[package]] -name = "compiler_builtins" -version = "0.1.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f867ce54c09855ccd135ad4a50c777182a0c7af5ff20a8f537617bd648b10d50" -dependencies = [ - "rustc-std-workspace-core", -] - -[[package]] -name = "core" -version = "0.0.0" - -[[package]] -name = "nixpkgs-sysroot-stub-crate" -version = "0.0.0" -dependencies = [ - "alloc", - "compiler_builtins", - "core", -] - -[[package]] -name = "rustc-std-workspace-core" -version = "1.99.0" -dependencies = [ - "core", -] - -[[patch.unused]] -name = "rustc-std-workspace-alloc" -version = "1.99.0" diff --git a/pkgs/build-support/rust/sysroot/cargo.py b/pkgs/build-support/rust/sysroot/cargo.py deleted file mode 100644 index 9d970eff79e8..000000000000 --- a/pkgs/build-support/rust/sysroot/cargo.py +++ /dev/null @@ -1,47 +0,0 @@ -import os -import toml - -rust_src = os.environ['RUSTC_SRC'] -orig_cargo = os.environ['ORIG_CARGO'] if 'ORIG_CARGO' in os.environ else None - -base = { - 'package': { - 'name': 'nixpkgs-sysroot-stub-crate', - 'version': '0.0.0', - 'authors': ['The Rust Project Developers'], - 'edition': '2018', - }, - 'dependencies': { - 'compiler_builtins': { - 'version': '0.1.0', - 'features': ['rustc-dep-of-std', 'mem'], - }, - 'core': { - 'path': os.path.join(rust_src, 'core'), - }, - 'alloc': { - 'path': os.path.join(rust_src, 'alloc'), - }, - }, - 'patch': { - 'crates-io': { - 'rustc-std-workspace-core': { - 'path': os.path.join(rust_src, 'rustc-std-workspace-core'), - }, - 'rustc-std-workspace-alloc': { - 'path': os.path.join(rust_src, 'rustc-std-workspace-alloc'), - }, - }, - }, -} - -if orig_cargo is not None: - with open(orig_cargo, 'r') as f: - src = toml.loads(f.read()) - if 'profile' in src: - base['profile'] = src['profile'] - -out = toml.dumps(base) - -with open('Cargo.toml', 'x') as f: - f.write(out) diff --git a/pkgs/build-support/rust/sysroot/src.nix b/pkgs/build-support/rust/sysroot/src.nix deleted file mode 100644 index d41cbf55fcdc..000000000000 --- a/pkgs/build-support/rust/sysroot/src.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - buildPackages, - originalCargoToml ? null, -}: - -stdenv.mkDerivation { - name = "cargo-src"; - preferLocalBuild = true; - - unpackPhase = "true"; - dontConfigure = true; - dontBuild = true; - - installPhase = - '' - export RUSTC_SRC=${rustPlatform.rustLibSrc.override { }} - '' - + lib.optionalString (originalCargoToml != null) '' - export ORIG_CARGO=${originalCargoToml} - '' - + '' - ${buildPackages.python3.withPackages (ps: with ps; [ toml ])}/bin/python3 ${./cargo.py} - mkdir -p $out/src - echo '#![no_std]' > $out/src/lib.rs - cp Cargo.toml $out/Cargo.toml - cp ${./Cargo.lock} $out/Cargo.lock - ''; -} diff --git a/pkgs/build-support/rust/sysroot/update-lockfile.sh b/pkgs/build-support/rust/sysroot/update-lockfile.sh deleted file mode 100755 index d0596d1e5a62..000000000000 --- a/pkgs/build-support/rust/sysroot/update-lockfile.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p python3 python3.pkgs.toml cargo - -set -eu pipefile - -HERE=$(readlink -e $(dirname "${BASH_SOURCE[0]}")) -NIXPKGS_ROOT="$HERE/../../../.." - -# https://unix.stackexchange.com/a/84980/390173 -tempdir=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-lockfile') -cd "$tempdir" -mkdir -p src -touch src/lib.rs - -RUSTC_SRC=$(nix-build "${NIXPKGS_ROOT}" -A pkgs.rustPlatform.rustLibSrc --no-out-link) - -ln -s $RUSTC_SRC/{core,alloc} ./ - -export RUSTC_SRC -python3 "$HERE/cargo.py" - -export RUSTC_BOOTSTRAP=1 -cargo generate-lockfile - -cp Cargo.lock "$HERE" - -rm -rf "$tempdir" From 7213a586768aa736825b9a5a4e872c1c22c8d30a Mon Sep 17 00:00:00 2001 From: nayeko Date: Sat, 1 Feb 2025 06:03:34 +0800 Subject: [PATCH 11/43] keyguard: 1.7.2 -> 1.7.6 --- pkgs/by-name/ke/keyguard/deps.json | 674 ++++++++++++++------------- pkgs/by-name/ke/keyguard/package.nix | 61 +-- pkgs/by-name/ke/keyguard/update.sh | 2 +- 3 files changed, 376 insertions(+), 361 deletions(-) diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index f558f6d9d41a..c91eb0ffbcbc 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.3": { - "module": "sha256-+yJYhGSGHiedZtpv4kxZed2jS2m4RNI4DIq2eYxTMPk=", - "pom": "sha256-atgGcvLdAuuB/Hzl3OtAYenAl64WJnU+qWtPtlA/vtA=" + "androidx/activity#activity-compose/1.10.0": { + "module": "sha256-T450M4dUyzrY0q1AX8G/l3ETthSjwGfUk6FHu0KBpiM=", + "pom": "sha256-+fNiZzO1EL6xmirguxrmbozWm0l5ucYiJ3hzeU7T3OQ=" }, - "androidx/activity#activity-ktx/1.9.3": { - "module": "sha256-MdDatmPQTZEaZ1iJMfhrEBEx4RaWu3KJWn5WA3F6wkE=", - "pom": "sha256-PIx4xqu50vaIXtgfKh2FewFLGaapoi9J2UIFAr/aKlM=" + "androidx/activity#activity-ktx/1.10.0": { + "module": "sha256-uQU4W2mydbCxvTx2XemWTmTo/hBcI9qkp3a95mwsMVk=", + "pom": "sha256-njf/aztEO7EgpEWtldPRe+coFwRN29n/D+NoHjbG/Jw=" }, - "androidx/activity#activity/1.9.3": { - "module": "sha256-fmok3aIF4csenJb6Nf9vJhYICH8x0yPUz/QrlxbX7Vc=", - "pom": "sha256-Pz4I4X2rXwdPqB25eL2lYmH7l8+eGS8zN4mM/YAaajQ=" + "androidx/activity#activity/1.10.0": { + "module": "sha256-M0MVwyXDutND/F9wt6USbiaP8P6jiw9dwGgQalKGiY8=", + "pom": "sha256-jU/034VtgqpjLg6Jj2UAd9p/t9TIuVE13lO8ETcyVT0=" }, "androidx/annotation#annotation-experimental/1.4.0": { "module": "sha256-WTDqfyH8ttDesroydIoO98j9LEI4SGBYK6fNIN65A3k=", @@ -132,8 +132,8 @@ "androidx/compose#compose-bom/2023.10.01": { "pom": "sha256-brBsrckwx2qUp+PRzAYIkCdbYUJ7lpM9YFT09kHrGeE=" }, - "androidx/compose#compose-bom/2024.11.00": { - "pom": "sha256-E93EicbDc+bl5w8NnzsAXF8fIBw+kGJF3OHNWNFdc7k=" + "androidx/compose#compose-bom/2024.12.01": { + "pom": "sha256-cRjoO1KMoxUtnCeK/pxs03Bi20nvAfg420y0pjQfZOY=" }, "androidx/compose/animation#animation-android/1.8.0-alpha03": { "module": "sha256-OkaEc+HUXBAZBfiz0fVHYwQYeV5sNuCx98qEcGntc0Y=", @@ -228,21 +228,17 @@ "module": "sha256-zsW2D1i/MZBXMJbnlAWFXEaAUYc4ref9JU0vcOEq3so=", "pom": "sha256-tJAG0Sq62RXTUN/ixO1D9X90xKHphaVOveVltI/rHv8=" }, - "androidx/compose/runtime#runtime-saveable-android/1.5.1": { - "module": "sha256-FzvjOTjImZmWKc06tJUC+9joB0VDgSl73A2lC7I6/Ck=", - "pom": "sha256-QglXJx1ftRMDuRyRlY0jlCdiVKU9dvnyWW6yEqaGi+Q=" + "androidx/compose/runtime#runtime-saveable-android/1.7.0": { + "module": "sha256-FPU88sgBBcde61vxmQRDmtXfpDJ93ZRIKdy3KDraCWA=", + "pom": "sha256-NB5w5ZLSQyjAvfAz9nk5Wz1r6Ps/T/hh2GBkvUrZw3E=" }, "androidx/compose/runtime#runtime-saveable-android/1.8.0-alpha03": { "module": "sha256-rhny8nws+pqNpqt4JGR8qULIVGf+Gb8qHrXSZBXN64w=", "pom": "sha256-5QirXIA9crZYffINwTJOscP8/YeBCbYBvD+ZdEkr440=" }, - "androidx/compose/runtime#runtime-saveable/1.0.1": { - "module": "sha256-wNbxQlQtjXT2VIHvZSbSviZfAfgSoRKUj83oekWPT7Y=", - "pom": "sha256-+F0qwnJpi3epjQvp+DwGP6Hn6pSCQR/I3ZKMvCzo2pA=" - }, - "androidx/compose/runtime#runtime-saveable/1.5.1": { - "module": "sha256-Cc94gcpUYu5l7ZVzuuoT2k8Eak0GbsJYsPSqejdSy9c=", - "pom": "sha256-yg+wXAvCX5L47Fa4IkcDV2NXgjJn2LuTO4Fa4rkXvo4=" + "androidx/compose/runtime#runtime-saveable/1.7.0": { + "module": "sha256-V096AtKqST7Zo0pfOFZyJm6XS77qNQMnRU6gCL3S7Zc=", + "pom": "sha256-UG3TGS4UUkxsHClvNFl7hGoyZPqtF820AuHszCJNDko=" }, "androidx/compose/runtime#runtime-saveable/1.7.1": { "module": "sha256-Oflyur/Hr6pqaiVKqqoMOh8NuG3tFtMuI2CYifXnyQQ=", @@ -252,9 +248,9 @@ "module": "sha256-gqSBbLtVPuHmUFwYoDLAy76LllGMJbyKBtLmm0Exnug=", "pom": "sha256-YBz9nw5manFdfuNBeGmLz1DVNTs/HVmpZxUzM7iKg+k=" }, - "androidx/compose/runtime#runtime/1.0.1": { - "module": "sha256-JUOox+3Ba96R8UAoa0/Tdz1yBKKDpOyZ9uXihqqSwMM=", - "pom": "sha256-iriBQ6tzG09pstEhQ6SPMskYCQSz9ZJVyVAFNndOtMg=" + "androidx/compose/runtime#runtime/1.7.0": { + "module": "sha256-e5NRsP9t+SdtAtQPEnZa5Vv1xt+4/430x338oTj7n8E=", + "pom": "sha256-eUHY/NaDVXGG0vU8gXPDX3GqrJ1OZI6a6x7cS5L702E=" }, "androidx/compose/runtime#runtime/1.7.1": { "jar": "sha256-aaGZCC7i6Jb7xePbxnLE5weaqNGbtK3n4dNUsKq2Rvw=", @@ -373,9 +369,9 @@ "module": "sha256-6KbDhuF2XYcAEv7SIhFz1KLo0v1a7HMsUa+0qfRoRRk=", "pom": "sha256-4WiuVgZLjlpAvOQV75X/1agTq7VFbSd18P70Ju1J41o=" }, - "androidx/credentials#credentials/1.5.0-beta01": { - "module": "sha256-B/L48LIEgtXMj6HP7M1/FnOaQck7ca721Av14yIQ950=", - "pom": "sha256-rj8bwK/teqKqSRlXbhAZ3avOawZ/i6dBA988BWd8y+g=" + "androidx/credentials#credentials/1.5.0-rc01": { + "module": "sha256-7R8pJLr8CuroWsNPoGLCVII47MqPRz3BozIz1QCPu9U=", + "pom": "sha256-1GJrjVIKqo8y1Kgjntrc1YqGFu+zgqunh4jHW8Qcfvc=" }, "androidx/cursoradapter#cursoradapter/1.0.0": { "pom": "sha256-YtlciYUK8hAwsZ8U1ffs1ti8yaMBTFkALsmWJMqsgQA=" @@ -383,37 +379,37 @@ "androidx/customview#customview/1.0.0": { "pom": "sha256-zp5HuHGE9b1eE56b7NWyZHbULXjDG/L97cN6y0G5rUk=" }, - "androidx/databinding#databinding-common/8.7.3": { + "androidx/databinding#databinding-common/8.8.0": { "jar": "sha256-Zsq4JjnawPbCQzRkwJOwdNYIxLuIfsOKm4vErJgSZzI=", - "pom": "sha256-n+PDSKMnWP7DyJbrWleh9jyiuJXePYZ1E7Zx4e4iDqQ=" + "pom": "sha256-2IeF64gYlPW6Z9vgAf+bWsaqLru/10zh75bUK89ZGbU=" }, - "androidx/databinding#databinding-compiler-common/8.7.3": { - "jar": "sha256-skMcu+ONCjHgAbfDT1L2mjI/yexXO2r+WJPaztWrMoU=", - "pom": "sha256-HHunhKp5zc9OfMtUmGdZgEpo+oz4v/sy0FOP6gwd1Rc=" + "androidx/databinding#databinding-compiler-common/8.8.0": { + "jar": "sha256-u8B72Q4qjRIu7ZtTd8s10VbJLCeYMndG10L18Gk6NYc=", + "pom": "sha256-TR/44itcdDltXg7evUsgO+vEoLZV72zyElxxr4GMNmM=" }, - "androidx/datastore#datastore-android/1.1.1": { - "module": "sha256-cj7ozPSDglESIdoh4KPv3Nz1ix3kiU/drEBaFIERnCU=", - "pom": "sha256-vagKjRgg5MMqMFNJfkJmiKD4FQZv2vPUYOGkQzrCigE=" + "androidx/datastore#datastore-android/1.1.2": { + "module": "sha256-z4KjyWZ7U1BlQV/NeNlditdD4CKS/nvg5nNGcpq4afY=", + "pom": "sha256-OX0S3x0f1x4kV6TlVbEObSXqIG8yXiWyUoSgzfTXkaI=" }, - "androidx/datastore#datastore-core-android/1.1.1": { - "module": "sha256-HfJlkjeXmn+2qcqIFrKevaVSvM8StzGhDM0+opalvBo=", - "pom": "sha256-Z0/KO81/el1DWWgD5YATZHpf2PAIVJCSAt9HtnRkH+I=" + "androidx/datastore#datastore-core-android/1.1.2": { + "module": "sha256-2tyszVyNMynqSda0kCC6HCvm6j2EyGXpVPEaJVwtx6E=", + "pom": "sha256-pCZPySuq/vLGDPtimGuTIG56dTlYqTg9yq+UlDiq3uE=" }, - "androidx/datastore#datastore-core-okio-jvm/1.1.1": { - "module": "sha256-rvk/MIHb2FY+Es43XwZTmfvHVjmSxkviIUzv4rTxosI=", - "pom": "sha256-4sXE9HJfab5MnfcCWQRodksR/lrjnR/JIadJc4v369o=" + "androidx/datastore#datastore-core-okio-jvm/1.1.2": { + "module": "sha256-H1ZyiLmnpFtVNqoSEft2jBrEnsUTnNF9JaFItWw/5Io=", + "pom": "sha256-gRrvNWgz63UZVpbXne9fDdEc6j8lnnhZKmNZGFMLKkM=" }, - "androidx/datastore#datastore-core-okio/1.1.1": { - "module": "sha256-4OPp5kKYiPMMflboAN7MA4OiDpuu5QXuqINXTfoL0nU=", - "pom": "sha256-TLFx9wnPoM1KLXJqbpXdUdSWZ9tn51noe90t7R78Pyc=" + "androidx/datastore#datastore-core-okio/1.1.2": { + "module": "sha256-ipFbL2kNUMsfLhMAFHWRcNSPC8ldH5tcMzBsJneIRI8=", + "pom": "sha256-bu2bWPbx4OZR/X8/Xf3n5EZTp+hs62EzbFvI+nqhYrg=" }, - "androidx/datastore#datastore-core/1.1.1": { - "module": "sha256-bvOQJeV00Boa7AAO+NQWNo8ejhWSnE/XRqODzvs2rk4=", - "pom": "sha256-flJrLiB4rVLveQpPzou9yvjPVMXUixnpHuDNvPSjlio=" + "androidx/datastore#datastore-core/1.1.2": { + "module": "sha256-j/zkbU7vBjgRG1p2OZU0DefJ8njh/0yMTHztKC/Hr7A=", + "pom": "sha256-JWS0Ny50q0tI/7OMhQHvj2fsMt8fpFftHLGI3E0sauw=" }, - "androidx/datastore#datastore/1.1.1": { - "module": "sha256-K2Ia+sdmG1U//8GxNBoAWrB3suopCAdt26vl/vv4kpQ=", - "pom": "sha256-X+cZlxXfG6K32Nrblr5redPmVNIPtoBxGLXaB4rvYGg=" + "androidx/datastore#datastore/1.1.2": { + "module": "sha256-3X18MDwbrGmfCc0QQbCCOwqixpi40tG4Lem3D69UKz4=", + "pom": "sha256-aP1Cm2XxJAKs6DKbrNFHlQTTuluVuHRIi4NmcpbnS6w=" }, "androidx/documentfile#documentfile/1.0.0": { "pom": "sha256-ATKIqTF6VScGzmJfskST6CIyiFKSI+xXjPhVpa6cFuU=" @@ -748,16 +744,16 @@ "module": "sha256-RlwbR1AJLr8LAx4G7P2AEffhWs6NzLHkxH1An3e+y6A=", "pom": "sha256-GuzFFWca/IS1/1so1Yle+0Q93atJ3VzHQAl2oc/FEMk=" }, - "com/android#signflinger/8.7.3": { + "com/android#signflinger/8.8.0": { "jar": "sha256-wdyixoNjTuGilCmPnHF5V4r2qG4IC9xA+WGRW8XIFC8=", - "pom": "sha256-/EbBXN+8shna1dluzsd0AikmzP+ZMmOEO+srUyup2h8=" + "pom": "sha256-AG0P7dhYwY82owPh3p/fAGkHAxvPR/NkC83Bl7s++zA=" }, - "com/android#zipflinger/8.7.3": { + "com/android#zipflinger/8.8.0": { "jar": "sha256-gd1IVhilCaMjWSm56xMJHYhEUmYd5s5aRcw4scVVQhw=", - "pom": "sha256-eoR+FAkDQ1VYyEcDqQpS+1SGyLdn4MixrOkTVUsqW5g=" + "pom": "sha256-76qCmEhKD2kIvheQFW6H75liJVGYqViMuJnm25G+YG8=" }, - "com/android/application#com.android.application.gradle.plugin/8.7.3": { - "pom": "sha256-lFjUZhcxlXbTf77C7HMwBh70tmbfhTijdbxTmGIpuRQ=" + "com/android/application#com.android.application.gradle.plugin/8.8.0": { + "pom": "sha256-9Vt5jRKfLLRRxmlsIIIJ/0R7IDb1btIvWdtwx1wSLnM=" }, "com/android/billingclient#billing-ktx/7.1.1": { "pom": "sha256-PMPwTqj+PMOAi75eG0Y/3jQzM1RDOqeRERHQzK6Dt9g=" @@ -765,112 +761,112 @@ "com/android/billingclient#billing/7.1.1": { "pom": "sha256-S+5D2uFUS1LoqOUCefEyBPcrve1/ECdDCbG4ekhLdgU=" }, - "com/android/databinding#baseLibrary/8.7.3": { + "com/android/databinding#baseLibrary/8.8.0": { "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=", - "pom": "sha256-3t+hkSFIJf8+NUON0wcZMMYfF/g3hz626xvpwqQ97J4=" + "pom": "sha256-tU0tLvQmt+RVCo3AN5v0AWDc/KGz2TaVQBRBdXmly6M=" }, - "com/android/library#com.android.library.gradle.plugin/8.7.3": { - "pom": "sha256-eo+bqKjZnZBI29ySvJZ9O/dcioHNgoIXceEyktO55fI=" + "com/android/library#com.android.library.gradle.plugin/8.8.0": { + "pom": "sha256-XnoS+DsGzPbMKeCDIErQp2tM/VhNslzhfygyqTdMGzE=" }, - "com/android/test#com.android.test.gradle.plugin/8.7.3": { - "pom": "sha256-B/LW22Q19aXaVBwkIqVPtqlvfbUj5HL+fszlinvpPiY=" + "com/android/test#com.android.test.gradle.plugin/8.8.0": { + "pom": "sha256-rBqEBLyE6qp/bIJZjtj72eVbJ+iI7pZmfZ6YnM3Y5AA=" }, - "com/android/tools#annotations/31.7.3": { + "com/android/tools#annotations/31.8.0": { "jar": "sha256-slmV+nsiDTX7uOMl3wcfgpFpG/uv+XNMmOOPRewqc+4=", - "pom": "sha256-IggjjUccCrksasegWaCp7INdWuE5Kq8Lsk5FW3D9a0s=" + "pom": "sha256-j4rRvRCR61bNCEGyTMa13HEqq77RGzFKvpWPC+uihoU=" }, - "com/android/tools#common/31.7.3": { - "jar": "sha256-q7Wy8olUrAnc+10ZLjVa9BI2yDN6/AixaqGtwOiuv2M=", - "pom": "sha256-fWLfKNC8mKnW3l3Vz5pStYe59NOORrAiqY/KqXLgwMM=" + "com/android/tools#common/31.8.0": { + "jar": "sha256-TSN4Q0mRHPkyAYEUvtKR9SynnBXjC+EHbrRmCujEMBo=", + "pom": "sha256-LRllN+IOsB+NVMRUCB0QGsfnowAZN4bNBY9IALsd8pk=" }, - "com/android/tools#dvlib/31.7.3": { - "jar": "sha256-j9NJWi67ULGqyxtDYtxKRxuHRiwersQ2kbtW+JXpxjY=", - "pom": "sha256-/u38iQ67+yMC/G83ZefB/V0/SBsTdC8nrbYArwRze7Y=" + "com/android/tools#dvlib/31.8.0": { + "jar": "sha256-488/3JR3iN7o1bqnbLcqZlcRdLxHQe3w47q5enypDhs=", + "pom": "sha256-dlgMypK/qT0dXNi2xB9NIaARThT5VKHSyJMr0I9s3xU=" }, - "com/android/tools#repository/31.7.3": { - "jar": "sha256-FpwueneqMJeIedv4swQ2ZxFlhy/L392mxzWq3bZxA0A=", - "pom": "sha256-/KvwRMRUxajJlJ6d7Flu9eqhvvBDsOEaLBlUspjH2wQ=" + "com/android/tools#repository/31.8.0": { + "jar": "sha256-+TdsaBL4d2qGW16agXfFDCe/wD2+KcJuRq0pdjlsyFY=", + "pom": "sha256-VImJkN0PhLygSdn1dYVC/4IAEbVQB47WS+S7+v/Rhgs=" }, - "com/android/tools#sdk-common/31.7.3": { - "jar": "sha256-T6RKfZZ13xPaYU3uUS35CtPkMI0K3bMurZn1fOWPZ18=", - "pom": "sha256-qixXwckc96kRBeDOS73akUUdNka2fZHRVpVdvPTIwdM=" + "com/android/tools#sdk-common/31.8.0": { + "jar": "sha256-u/y8yx1jIkonBLFSGosCk8ahzd7TkgVyv6rJoCGm3oY=", + "pom": "sha256-WIyP/lufou7z/kqFK091OzU1FcDRmrYV3LQgnOyb+uI=" }, - "com/android/tools#sdklib/31.7.3": { - "jar": "sha256-Cj9wl6SgCzhARreDtwU6WewL2SJWq4S6pr2AeqAoWLM=", - "pom": "sha256-a/777V0ro1SwxNEVT6YIbnSBDSZdfOD5gdpRS4c1kS4=" + "com/android/tools#sdklib/31.8.0": { + "jar": "sha256-jHONPAqkB/RG+R0wwPTJSJ/KoMadr0WeMvCTHZaKm/4=", + "pom": "sha256-TPgV3CDUNXxuFQ5CGJFGK+nURPlm51VHjBLzOhrLtbU=" }, - "com/android/tools/analytics-library#crash/31.7.3": { + "com/android/tools/analytics-library#crash/31.8.0": { "jar": "sha256-zKl6wpoTKb0xCj6DK25X9GIn5QGqUpwApj3yF8XX30E=", - "pom": "sha256-Y2k1CO6e1TLmb+4Skpna+6kaD41RZMGXS+IqWvLm34c=" + "pom": "sha256-/T6faEywwdYrH/QQ9yil2PBWqCPY1yVxvtfZ0/HXstk=" }, - "com/android/tools/analytics-library#protos/31.7.3": { - "jar": "sha256-aSz5gTlf4XGi8in/cMxswd354iYbKOrdoiadZuVQl4Y=", - "pom": "sha256-OULGcsqFS4Ql6JllHPAj9imcYkgXxSCYA0pOXkImS7Q=" + "com/android/tools/analytics-library#protos/31.8.0": { + "jar": "sha256-ecd+mendqcNfUT784zsgPDzQrmoS4vhVmnG18teHjto=", + "pom": "sha256-gLWaKY/pUgo3/3Igy1wFEimwAj7yWgmN7zgF5INT2D8=" }, - "com/android/tools/analytics-library#shared/31.7.3": { - "jar": "sha256-yte7j5agR6XvehOxyDA0FCKenVByCWRuw7Y6ZIYeHOE=", - "pom": "sha256-XqiMevFXcLSVBzsH77c1WWVGL3JUnJk9+xnz7u2TCfI=" + "com/android/tools/analytics-library#shared/31.8.0": { + "jar": "sha256-m0c1kibJs0NqxPySEyHBBxjdGFTLqld1+6+UM/8saWA=", + "pom": "sha256-TNjklaUfCLTQzpnOjZSxZw2L8iRkySrr38dc0BQOQhY=" }, - "com/android/tools/analytics-library#tracker/31.7.3": { - "jar": "sha256-4flUlzpHM/dgJ6X5b6RUctw8wi0nsdyT8/5qRqdWgb4=", - "pom": "sha256-1ag5OTcKdMumfmDfbPGnP3cwJWLCaxMbJikc2AX/iy8=" + "com/android/tools/analytics-library#tracker/31.8.0": { + "jar": "sha256-B9blp3ExfmHuyzprbjYdCD9+0DsGpYohDPq9E97Z7rs=", + "pom": "sha256-IKYLjgGXcM2gMGuv9ruTxUC8xWwpPVrVwhkmc1YFz18=" }, - "com/android/tools/build#aapt2-proto/8.7.3-12006047": { - "jar": "sha256-sy99Syl1rJ7n8GBUwY8f6p2gRdwaYf9Dbs9UNIADYwI=", - "module": "sha256-vElUf3eyh2nNyoQZjS/s4dZZSikY0RyrPPSxu1eRXis=", - "pom": "sha256-u0XfDcUZLK+jKKGwxaxQJDjeJPM+jvQdyYNt2IzZ8Do=" + "com/android/tools/build#aapt2-proto/8.8.0-12006047": { + "jar": "sha256-86uQlcl7R0Dj4TlK1HadjJ0rnArv38z+0SClPCeWr68=", + "module": "sha256-9rwXjnexs4Oiw9lJPT8oOkHiVB7STlrd1nH8KnN1zMI=", + "pom": "sha256-G1VQdnYSIiV0tX2h9l/fgP1jzINzGi1AL3cWJX/HYLM=" }, - "com/android/tools/build#aaptcompiler/8.7.3": { - "jar": "sha256-RwYuueVJfgdClGUo/ZPDiGdz3SM5BZMV9jFtXAXXza8=", - "module": "sha256-Pfe+D8ZksWVlQoGEyMu0DI8iMiojO0qCINu9bTmTU68=", - "pom": "sha256-yhzBgzCbhrtVFahbPJlUgg1jw50AHMdZCCoTGi0vfhY=" + "com/android/tools/build#aaptcompiler/8.8.0": { + "jar": "sha256-Tjq13JGbQErjBWtzE8skDz2Dr3vBiPcVLs71nPSiQsY=", + "module": "sha256-EUrf/bs137XxLKftyhUYW4CSrJVyjJS8s4iQMfnU05M=", + "pom": "sha256-FawNzhd1MtCDCv0kDZMJ2GV5Xxa4b4knNcYuRZvgfE4=" }, - "com/android/tools/build#apksig/8.7.3": { + "com/android/tools/build#apksig/8.8.0": { "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=", - "pom": "sha256-pouibUpuejW77i/lFGYBRubCshcUa5wahrW1q62Zo8k=" + "pom": "sha256-JIv5ThH48f82S6Lmhgdqu7rusYWOQ0p8CufwD9+8A/w=" }, - "com/android/tools/build#apkzlib/8.7.3": { + "com/android/tools/build#apkzlib/8.8.0": { "jar": "sha256-HBpn1vTxhkJ6wWbrqg3YZ/WV1RRPySUlKwX/udGhVrc=", - "pom": "sha256-fDrDehKu9BN7cxbt6jXl3zKmEEjYu6jdNJA7xIUxp90=" + "pom": "sha256-lPHldZcGz+m6OA30jllUOztaFVX4Bdq02gE0oITNph4=" }, - "com/android/tools/build#builder-model/8.7.3": { - "jar": "sha256-ABjH3SyraW4H8UC7HcjAsOyTtr8ZXpOHBDAQrIlNt9c=", - "module": "sha256-thR6gFeGPiAZR1wG9A7W9MHHU6kzTXU4RNgdNfEHXH8=", - "pom": "sha256-TeLf91xue+6OP/9JYo08LwfY0uriXkntj9pkwgM1ssU=" + "com/android/tools/build#builder-model/8.8.0": { + "jar": "sha256-uTxbvxiA1Do+5+Bz0VILFQQ4i+T9AXuuAgqMNPFf3PQ=", + "module": "sha256-yXrcrXptW+sEycuyHJUICe274EDOxlA+h5QCrttyeV4=", + "pom": "sha256-06tSP6JLqajYQFEtzfGO9J1xfqHPnMJf3J6caRjsrK4=" }, - "com/android/tools/build#builder-test-api/8.7.3": { - "jar": "sha256-d43ZwX5VlAHIDbCOvKtny3c6Q95mV0F7QyCWDSlrm0A=", - "module": "sha256-6iyiLxBrb83jr26EH204l4KmkywivcgIT3vWLdyFLZU=", - "pom": "sha256-GKBnNBY92tqv7Vp8Gim4HwGV+yj12CogkU9UnszCNRU=" + "com/android/tools/build#builder-test-api/8.8.0": { + "jar": "sha256-jCVKBgyot+jFuU0eix8f13A050DDiuya1OS9kwbMZEY=", + "module": "sha256-cN5Fxy0hteny7XzHHSYmNfFOb7YeTgjla9Oa5nGO2wI=", + "pom": "sha256-oOr3Wj7IPUoJ/YlOTchnqCqTqA3Oh8NoFkncGugaLH8=" }, - "com/android/tools/build#builder/8.7.3": { - "jar": "sha256-LQrANphsDyVrnzJ4EMJcHd5tWDmVZYDTKD4ODxRsuSY=", - "module": "sha256-iQxY1qte99ABTaqN3zj9W2iqStY8m7TdQl2jPqZAB7M=", - "pom": "sha256-9E/DMAcOdQDMrwmvaHWC2LSYq6oHD01qwzfLvR+MLY8=" + "com/android/tools/build#builder/8.8.0": { + "jar": "sha256-Av1WaoDzdfqnZKibAzRdO16KcNDO0Zk1fsuGN07UE6U=", + "module": "sha256-yYmNJ9/l+R9LVtV02K2mW8WHUW+d7PyQLPcBe2E9AJ0=", + "pom": "sha256-CrqTy/5KfxZvc6tjzhIcoYsMp/UYKYWv1XTjbEJmv8Q=" }, - "com/android/tools/build#bundletool/1.17.1": { - "jar": "sha256-OS/TsJm9grEWyHcquPxBOZhKkRCKZD+N/J7ilkiBitg=", - "pom": "sha256-fN0zdkTVI/5gz7YyQQxrf7fZgu7FMnDdvt/xwmMzVF0=" + "com/android/tools/build#bundletool/1.17.2": { + "jar": "sha256-FmhVy4HhDyMoopMQBvSAH0Itj03l1xfsD38W/CBJoIk=", + "pom": "sha256-80LQa1GA5uq6B2oqGKjn/Waum18EiWSvtu9CoCP6N1I=" }, - "com/android/tools/build#gradle-api/8.7.3": { - "jar": "sha256-hprfdeqPW+dneFD05w8iGkB+fvKJNMWLHY0esh1/ukU=", - "module": "sha256-OepMCIspW44jS5K3k2t3dlDnH7wg2ofe94LZiC43nX8=", - "pom": "sha256-HIaQJiRJI7kZvi/yI0ViZ6oFbYuUwmA8VZ9TS8bmSyM=" + "com/android/tools/build#gradle-api/8.8.0": { + "jar": "sha256-7+yJ/SBRsZW2j/dRUNLNGnqBfCKs9kxgWr+eJ6QFkPM=", + "module": "sha256-rEU1ATiiIQryVcuu6M37nTqn2DO0VGc4w28gsWE2ux4=", + "pom": "sha256-/oje8aSXSLf/Qd8hlR/lTj3RZp41Vfo9PrzMPsyQHNI=" }, - "com/android/tools/build#gradle-settings-api/8.7.3": { - "jar": "sha256-iocRuifg6LclvUuSsWsI0Oo2QTM2T90v2ba+BfKqhDg=", - "module": "sha256-MYEyOZi0ef+3B9x3tSpRxNiC3dHrRUcN34OTcDjMrk8=", - "pom": "sha256-ZNLS4K6Z8yIA0Hlvd2SsPes2fC7YhuuA5D+4D8T9gHI=" + "com/android/tools/build#gradle-settings-api/8.8.0": { + "jar": "sha256-BZ3KSLQh2cHr4NrNbwqmIIHAodOFcBCnkSsF9DigVAs=", + "module": "sha256-5KioPI96QELtTU3/dUDeSyP3+8uJC3Jd4ONRWYMya3s=", + "pom": "sha256-0vlR+vagiI1DkgixLXmO03w99LSEMGxLuGX8h+2fADA=" }, - "com/android/tools/build#gradle/8.7.3": { - "jar": "sha256-q7T56SyYOL2ZiboFlo7IkhieFuI/Qq26LgY4Q9oEBw0=", - "module": "sha256-FvTIe08bezuZs9vCN9wP4sWmtqazFDukbko1sduZamU=", - "pom": "sha256-wQoZM9ibEaV1k9KGUw1/uYhPYq7Rr8Y5ChF7qmu3vkw=" + "com/android/tools/build#gradle/8.8.0": { + "jar": "sha256-Qao6gTxD25c0NkYSKg8aVr/p4RliZhrbs8bt9cAu3zw=", + "module": "sha256-MjzmXTGoWK5gMssL5qlbbJBOT4EIwq+E4Qs3CmYhzUk=", + "pom": "sha256-5s/9sI+zN1J1PWbtEkOuYJjtHeIkTpx5zT8sZJqdaD4=" }, - "com/android/tools/build#manifest-merger/31.7.3": { - "jar": "sha256-8ablatvVV9a/NER6Yv9GgGQseZw5ekvBSoEla9lh5qs=", - "module": "sha256-93zlOCbQOzqLzZQPDDqyx+XcTfQE8EhY/Icksmr+dhw=", - "pom": "sha256-P5EszR/cRhV/9beBBi5ZfrrBQ66t/li8NFYiaSYE/vk=" + "com/android/tools/build#manifest-merger/31.8.0": { + "jar": "sha256-u+4UcnAgQEBNnoAOv5qohMZx/ekl5OLvO95FrPW3mr0=", + "module": "sha256-MamGD2lNK59UVYKVr30tn9qKsmv+hJbX2sqUBP44ch8=", + "pom": "sha256-ay4p0TatKTj7w7j7XrQdfifi61rIjhcAGMWuopR3PaQ=" }, "com/android/tools/build#transform-api/2.0.0-deprecated-use-gradle-api": { "jar": "sha256-TeSj0F4cU0wtueRYi/NAgrsr0jLYq7lyfEMCkM4iV0A=", @@ -886,61 +882,61 @@ "module": "sha256-NsJVdrGZk982AXBSjMYrckbDd3bWFYFUpnzfj8LVjhM=", "pom": "sha256-M7F/OWmJQEpJF0dIVpvI7fTjmmKkKjXOk9ylwOS6CEI=" }, - "com/android/tools/ddms#ddmlib/31.7.3": { - "jar": "sha256-DX71OCP2ohuAfzmPDQOaXd4YS1jFWJYlYmykqj1hCO0=", - "pom": "sha256-0+dYGViVu1uhe0Br5b39hbk0V528U2szLRer/SgKmgY=" + "com/android/tools/ddms#ddmlib/31.8.0": { + "jar": "sha256-qxKI5uwQejd8uqPQxVgWD/+lgT9fJjwk3jJwpetzqpg=", + "pom": "sha256-qNKnwIvjfPZftAr9YXOgNxGYWc/xxEqUlLtv/Tu9Hjo=" }, - "com/android/tools/layoutlib#layoutlib-api/31.7.3": { - "jar": "sha256-mLrjb/BR4RTdTu9e/6gPvl5VKUT0IzzokhYNos2e6u0=", - "pom": "sha256-s9ld8hNWzmZtc826aillJMmv/zm9H/kVD9GdtYn5phI=" + "com/android/tools/layoutlib#layoutlib-api/31.8.0": { + "jar": "sha256-WlNmJ0cFQdG38fQaxvBq31Jp9lbtOqsj+QmqAgikc48=", + "pom": "sha256-U0BO8hVT2bx80THGWmMhlwrdaOiwN+c3tweUzVjvz9U=" }, - "com/android/tools/lint#lint-model/31.7.3": { - "jar": "sha256-n0wIehmRdFIdG8e4/wX/FIT3cPRRi3/Z9trmwmGILb0=", - "pom": "sha256-Lqpa42GJupKb53yniPVFmZQChfJdDBQiQa2Nf91EEio=" + "com/android/tools/lint#lint-model/31.8.0": { + "jar": "sha256-RN9TaHvhiR2GpSTVixunSp0GbMEyRds32XOe0Uhy8U0=", + "pom": "sha256-SicHUKL68bHO7cMNBojbV36Y+3CMC/cut4UVckTI43U=" }, - "com/android/tools/lint#lint-typedef-remover/31.7.3": { + "com/android/tools/lint#lint-typedef-remover/31.8.0": { "jar": "sha256-W09IUhXKTYbvIxn8OYtfIlHmL1RGvF/Q4AZTZI3d4xg=", - "pom": "sha256-ErBrHJ2XeHgf4jNo5yMXb2bw6XZBklWAougNL4cNLOk=" + "pom": "sha256-3Ye0nxN0O+Nw7/BPtMuPbq2KJGZbR+CkK1aejmDqERw=" }, - "com/android/tools/utp#android-device-provider-ddmlib-proto/31.7.3": { + "com/android/tools/utp#android-device-provider-ddmlib-proto/31.8.0": { "jar": "sha256-2p8/Pa4mVEyQZoVJWEdl1YVKh8Ql0s/ld80002AOoJc=", - "pom": "sha256-TKEqyOBl5PQAKdpLZoLIGZBEZOhStTqoF8yGhEJ5rko=" + "pom": "sha256-jnNVJ4NRc3iVK8BLyvrjREO17AH1rOCFcXKeBecv/mE=" }, - "com/android/tools/utp#android-device-provider-gradle-proto/31.7.3": { + "com/android/tools/utp#android-device-provider-gradle-proto/31.8.0": { "jar": "sha256-rSNCux1vlVY0AKMiST6hwinLk985RPEmG3OZ9xhJQEk=", - "pom": "sha256-89rOHUayZc2PgmTKeGFhIHPI22KZyZq9zmurrDn/dao=" + "pom": "sha256-CYeOjFfmBtUp1gYCp0JY6iosAzQvf7NbqHJjlvMG7hA=" }, - "com/android/tools/utp#android-device-provider-profile-proto/31.7.3": { + "com/android/tools/utp#android-device-provider-profile-proto/31.8.0": { "jar": "sha256-ENEAztXQg3FMHGi7uxC7N16FRvkqsOQhnA5KX/KYEV4=", - "pom": "sha256-ibF1CEo3zG84da9WhciII3T1bLbjvY3ET4l/XNxhQ+k=" + "pom": "sha256-0JAywtBF2yFtqYaxNwqhUKBPCtlNUGGtH+vNd3ZqhGY=" }, - "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.7.3": { + "com/android/tools/utp#android-test-plugin-host-additional-test-output-proto/31.8.0": { "jar": "sha256-OEUGlN5jKMLEy6aW+cBOzdXOaVI1X2jDoi+VQdHWVG8=", - "pom": "sha256-qodWHuOIALsRktVqPtxgRl2sbb+nOjRajMsUsPTolEc=" + "pom": "sha256-ZwQ/JnyojzPK4iUnsZbTZSZI9S2HAyyXY/Ihk0z/n0c=" }, - "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.7.3": { + "com/android/tools/utp#android-test-plugin-host-apk-installer-proto/31.8.0": { "jar": "sha256-VD62yNcrLtdFH46TnV2AiQVm8UvCa335yDR1BrJY164=", - "pom": "sha256-C40e2YLnqzbpWKY7yXXlsxqY9sa6b5L8r8IsaSu0oI8=" + "pom": "sha256-jkIHhklZ9W3FT25Utt2p/qYNs2ms4RnJZabP8Hk1MSs=" }, - "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.7.3": { + "com/android/tools/utp#android-test-plugin-host-coverage-proto/31.8.0": { "jar": "sha256-77TXAUqqc1UkagfC5DeiIx+yUlQP8bzmhyyI3I2onRI=", - "pom": "sha256-TdzGtt9MkgcQNa4T+YDgX5vS5uO2zAU+CecLHVNzsbM=" + "pom": "sha256-D0LV++wbzKjd8d08M1xWt5jF0ldcg0u87tEZINuwZ+c=" }, - "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.7.3": { + "com/android/tools/utp#android-test-plugin-host-emulator-control-proto/31.8.0": { "jar": "sha256-rt7F7EYn2JjMzfQtgDjbIOukSVdTxT0bCzeHNEkcr18=", - "pom": "sha256-ontLxj8vc/eltbV3XTgQg/rdHSD7/uBxKnEwuINJrt0=" + "pom": "sha256-RLr7+P7N6RiIsHv5SPoXlgpPErIQTWkegmPMBMgxzfc=" }, - "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.7.3": { + "com/android/tools/utp#android-test-plugin-host-logcat-proto/31.8.0": { "jar": "sha256-kSkCS9jjg1O8o+sm39jjYo4FjVfW6dhFH/w18BZ1HmM=", - "pom": "sha256-GuVOX5PNbg0Pj0/i5BzP7rP57Zlswh6ndJQg6/miPYM=" + "pom": "sha256-OD7ITDO07vcGWEoY6T1f7ZjSltcrDOHY2rKyrRxHeLg=" }, - "com/android/tools/utp#android-test-plugin-host-retention-proto/31.7.3": { + "com/android/tools/utp#android-test-plugin-host-retention-proto/31.8.0": { "jar": "sha256-PbjtOO9JtpTK6kZq4i47Ns7clVezWJ0OB8DN2DKUWRw=", - "pom": "sha256-02L49Q+9HN7o3JL3ny6QGrgpcNXU4JoZrheUbFbAiEw=" + "pom": "sha256-9DJUnQRDcqRaMsM5vG3QqgDqyGWAAHGnKiCen2ugcoU=" }, - "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.7.3": { + "com/android/tools/utp#android-test-plugin-result-listener-gradle-proto/31.8.0": { "jar": "sha256-y99xvKYOFMMOeyz0uQ8PCj6ME498rdh0sNnArgguAnQ=", - "pom": "sha256-Y+Uvd4WIRAvG2qmqMVia6fUrP6WyittRDHOfD/S40rw=" + "pom": "sha256-Xah95xty14p8cGehnfkYxNLUSx56czDFO60Y2VOTBvY=" }, "com/google/android/datatransport#transport-api/3.0.0": { "pom": "sha256-FTe+vUTaLrfjvnP8QlnhEW8qaKUwX0/iPGzqmm+E95E=" @@ -960,26 +956,29 @@ "com/google/android/gms#play-services-basement/18.4.0": { "pom": "sha256-Bcp8Cs4NYmCTH5ftMsYM5ZgHH/Vg0/pE9J5vBpXStoc=" }, + "com/google/android/gms#play-services-basement/18.5.0": { + "pom": "sha256-igHcjz3pQjlMULMBRdStmPALwZwam80I4RmbFn0pzoE=" + }, "com/google/android/gms#play-services-location/19.0.0": { "pom": "sha256-zOYKDEJQ5b5tM/RlBbpyaQSKaNR4hiyHv3Ycae+E2j4=" }, - "com/google/android/gms#play-services-measurement-api/22.1.2": { - "pom": "sha256-OAOiajA2vkH8usHvRD7tVc+CPDN9RF7mzsfRSh+BQAM=" + "com/google/android/gms#play-services-measurement-api/22.2.0": { + "pom": "sha256-VZgbzY+AVjiBkRAtUWyF8p8JIV2OcyL382QUK0rz0Gc=" }, - "com/google/android/gms#play-services-measurement-base/22.1.2": { - "pom": "sha256-SukophF1eLZW0FdQN5rnDPyXda8dUAaG6KVb3nwBNmQ=" + "com/google/android/gms#play-services-measurement-base/22.2.0": { + "pom": "sha256-r8WiaHBWy57XoUTwStIuogUkXn2lOF2nFDm9qKxbEIk=" }, - "com/google/android/gms#play-services-measurement-impl/22.1.2": { - "pom": "sha256-2VMnEFDAJ7iVSrb/kcnhu7FrFwUp/iAs9jJxenleIGA=" + "com/google/android/gms#play-services-measurement-impl/22.2.0": { + "pom": "sha256-N3lZ8uf1DaDU6KM0wL3ov7IZQ6Jnh4hylguQD8S8Yx8=" }, - "com/google/android/gms#play-services-measurement-sdk-api/22.1.2": { - "pom": "sha256-Jy8VYS3SdF8Kwar7/jyoUCGKBr/MiNftyiquaxQNiR8=" + "com/google/android/gms#play-services-measurement-sdk-api/22.2.0": { + "pom": "sha256-emeqcDMl5dHXaLXWko/Jgy2xqbmExPSDNhHKyeAbwms=" }, - "com/google/android/gms#play-services-measurement-sdk/22.1.2": { - "pom": "sha256-RvUplB9ds44OS5qYtTUenOFQJgWCThvAyzChfMqqeV8=" + "com/google/android/gms#play-services-measurement-sdk/22.2.0": { + "pom": "sha256-+UTKeF6cCONrcjX9le2rbXIKaXj0LqUbWwwNClA5jHU=" }, - "com/google/android/gms#play-services-measurement/22.1.2": { - "pom": "sha256-6Gockc+qjR1DR3kn1m9yFvt1k/UB7ScIIVjBgTFDDJ8=" + "com/google/android/gms#play-services-measurement/22.2.0": { + "pom": "sha256-iJ9ObEadRyN14RckWZbnONmXqr1iHu0qMUHOHqCN574=" }, "com/google/android/gms#play-services-mlkit-barcode-scanning/18.3.1": { "pom": "sha256-QbW2a8X1FAnADmJ/zDG1WSB2s09Xo2S9iaAcCtlpARE=" @@ -1010,17 +1009,17 @@ "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=" + "com/google/firebase#firebase-analytics-ktx/22.2.0": { + "pom": "sha256-Yf9AiabRHBVS0scI0UhquefptSCd9yilcVOjtS5251w=" }, - "com/google/firebase#firebase-analytics/22.1.2": { - "pom": "sha256-g3122yuCOJjc7xdfew0zdLR4RRIahYWz/NW6YpJZVAA=" + "com/google/firebase#firebase-analytics/22.2.0": { + "pom": "sha256-KU7/jcXkyy4PEs8bkdCL2eO52puqsEQzLg3WCq18EOw=" }, "com/google/firebase#firebase-annotations/16.2.0": { "pom": "sha256-CFsRHeSXHLO5OP+QAMyAeQEE/WmlE0doTftybmnoUko=" }, - "com/google/firebase#firebase-bom/33.7.0": { - "pom": "sha256-H7NV4LJtEBrZv2OJ8hT9I76JNYSiOEBakHzZoiSy670=" + "com/google/firebase#firebase-bom/33.8.0": { + "pom": "sha256-5rdkiyH4WXSbvvlBzppktI1rjAvsLkJwJwmaOpLWqSc=" }, "com/google/firebase#firebase-common-ktx/21.0.0": { "pom": "sha256-wn7MtIuViBFtb9MvRle8Wd+FUAJDIpNVjbuX6YeK3rg=" @@ -1046,11 +1045,11 @@ "module": "sha256-/vKMVYn+7ogZWmq5SylhBAL4dVQRoTUXbdXZSASY7gQ=", "pom": "sha256-1N7+UvJE/0C7+enGSoroyoocJs3y5lZ1fAY1CuUgeI4=" }, - "com/google/firebase#firebase-crashlytics-ktx/19.3.0": { - "pom": "sha256-5QV2A9i/q9GLgmhHHU8GsMm8Jd/PHnrJxbWAuwyvwHA=" + "com/google/firebase#firebase-crashlytics-ktx/19.4.0": { + "pom": "sha256-FGVrNRi1pBvDQNxcGRYj7iL9NjTzHtUL3oMAclzGiWI=" }, - "com/google/firebase#firebase-crashlytics/19.3.0": { - "pom": "sha256-OohozhqV7KEoGresnvfOWxPYfWZ/nhaBnDqarrToAQM=" + "com/google/firebase#firebase-crashlytics/19.4.0": { + "pom": "sha256-vE3KH+Rvm/eXQphwErkIwAOGBTvJgcBO360U/8R3tGo=" }, "com/google/firebase#firebase-encoders-json/17.1.0": { "pom": "sha256-yCPL7XoOdb8w/tu6Qv8cDIdS49wW7cz30PLl1stpx6g=" @@ -1076,8 +1075,8 @@ "com/google/firebase#firebase-measurement-connector/20.0.1": { "pom": "sha256-exiY9N12nBHKu6lwJUbWiAEV6B191v8ra+JI7hVtyLw=" }, - "com/google/firebase#firebase-sessions/2.0.7": { - "pom": "sha256-PDXwhw3gmljzk4Zl36y4QDougmT0fSao7cDlg302NHc=" + "com/google/firebase#firebase-sessions/2.0.8": { + "pom": "sha256-aGjh9P34PpNV3CdInK3p6cg4uAoCzOnAC93ZXAR7TQY=" }, "com/google/firebase/crashlytics#com.google.firebase.crashlytics.gradle.plugin/3.0.2": { "pom": "sha256-T51Vb0qwfPielD9NqD+p8nW4v02PZEKrG15fuwm5qdw=" @@ -1122,13 +1121,13 @@ "com/codingfeline/buildkonfig#com.codingfeline.buildkonfig.gradle.plugin/0.15.2": { "pom": "sha256-F3kkJXLMRPmjf4eyJdjrpkK7bA8lwk81I7veJ2STJOs=" }, - "com/github/ben-manes#gradle-versions-plugin/0.51.0": { - "jar": "sha256-hDFJ4yuRdmIcz38dtEOECMWp+bWM1XIQU32bc4BUAh4=", - "module": "sha256-vUrCdcs524F7R32ZqxzkZ+BGdOdck8bWiScY1L7PnG4=", - "pom": "sha256-gzhEJF79GHeytCHNoI7uv1zx5O8SBcMXEEe1QGbdkB8=" + "com/github/ben-manes#gradle-versions-plugin/0.52.0": { + "jar": "sha256-zuihUdLgvp86hcouXYeg2lyRpIHt8bx/e1e1Ywj9PA0=", + "module": "sha256-r6cL5O0h646QJ2hPFfpeKXXz0uRtIpN76jmhDkj3nd0=", + "pom": "sha256-WESi8/+pqARY0m7ex3EjeuYxXN3yBp1Qp+hUFj5A8Q0=" }, - "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.51.0": { - "pom": "sha256-oy92kCcy9iIN27EhlfozbDMfT2190MRscHcLOu4dR0E=" + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.52.0": { + "pom": "sha256-sLbWCz+UCuWgFAfwNJ6d86Ayph+FXkoXt9vakSprU3Y=" }, "com/google/code/gson#gson-parent/2.10.1": { "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" @@ -1547,25 +1546,25 @@ "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw=" }, - "com/github/skydoves#landscapist-android/2.4.4": { - "module": "sha256-KYr4/qKASck9x7zUbvc+TnQHM9Of5qG0dVa6e8c2XO8=", - "pom": "sha256-kIzk22stvOywJjyQkkBnWUQcw8NUCbcVQdkxtk86dBg=" + "com/github/skydoves#landscapist-android/2.4.6": { + "module": "sha256-Hm0v9+XNL2n4S1GgapSz6ilXxUQn8s/TClTJyQPTuEk=", + "pom": "sha256-wyavf7EBYCpFM+3ATwupx9QwIDAMPQ842dGU9/YATkY=" }, - "com/github/skydoves#landscapist-glide/2.4.4": { - "module": "sha256-ZXt0fkn5ONSOgyTWmFhacepsNVDyctJKMt6gB3B2LmA=", - "pom": "sha256-E9eK1i5Wb1SU8zW0DY0DttNEMo/3cugJt2QlXwPUpq8=" + "com/github/skydoves#landscapist-glide/2.4.6": { + "module": "sha256-tTFixlv+v84WDbKstTK9VtkqO2Qcuk1c7yAu5UyAEI0=", + "pom": "sha256-38vzkobO9DIXL1f0f7moyOGOQTKLma/dgYI1VoEUlpI=" }, - "com/github/skydoves#landscapist-placeholder-android/2.4.4": { - "module": "sha256-tCR4RpbmH2GB7hw/3+GXDjeM0jS7LsLpjHT9fkUyzag=", - "pom": "sha256-lfkQw6UuueW90udrftxRpDbBvyqnhiYiH2ZkuXb7Eu0=" + "com/github/skydoves#landscapist-placeholder-android/2.4.6": { + "module": "sha256-JV7Dm8+eGBPFarUqLa23xcH/FZGjOpOAZ6oG7o1CU+c=", + "pom": "sha256-Okq1eCgy2UwE0NJHdFn7WCijoIQqx5TPLmCc3+py/zs=" }, - "com/github/skydoves#landscapist-placeholder/2.4.4": { - "module": "sha256-ZU2RENHuDaZF7tEhyb4Q4NGtPmxIG8YgNOcTKzh1QaY=", - "pom": "sha256-Z0cHxr5xMPUtrO0YIt18miaEqcVZt7t4SJJKwENbQn0=" + "com/github/skydoves#landscapist-placeholder/2.4.6": { + "module": "sha256-OPpfzwAtN69/7tyBZCuaIJY4VigdPf1/OT3h/jMa5qM=", + "pom": "sha256-gDYtwsLlHj62Aw7ZZprifEXfmJ7c9Ys9MMmOXwTd0bg=" }, - "com/github/skydoves#landscapist/2.4.4": { - "module": "sha256-Z4tHpqL6dKLrcv4haOKhVvkyjzwwJJIbRut3YotGzxQ=", - "pom": "sha256-siaEup8HYGYESUkyQaI84uJRnWgK/9vb1JU0J7mrWi8=" + "com/github/skydoves#landscapist/2.4.6": { + "module": "sha256-98tTqi16sIVQNCybxbT7PdCnWWtfxkF+VppaiEEK+xg=", + "pom": "sha256-iv9od6CRhQazG3Z6uKDGwjUgBub4bF30QpJ5c2Pl/Yo=" }, "com/google/accompanist#accompanist-drawablepainter/0.36.0": { "module": "sha256-LR2pP7TwcbJ3xHuLD439Ie53v7BUsWpWeT/xjThB2A8=", @@ -1818,13 +1817,13 @@ "module": "sha256-X8dNSe1IImBLtiMbgqZoSnycSi5TAsB5SFbcnqL/4PA=", "pom": "sha256-WjUR8QbYW0UjQSY4346LURnS6EQCbRG1hzpqlenq8xA=" }, - "com/microsoft/signalr#signalr/8.0.11": { - "jar": "sha256-4RPS8VYoSyUXFXahLk26bj6Zh0/a4mX6v8OWCAnwtIc=", - "pom": "sha256-/QlmkJvO2DNu5kCZJB+Uf/rhsqKchlfTGFOZa9ARITQ=" + "com/microsoft/signalr#signalr/9.0.1": { + "jar": "sha256-cr4gqmmL9WypLgCL0/a3MKUe72wilnSUJb+BO5ReQnY=", + "pom": "sha256-IoWS4CWOuuR/CaFeCs0jOKk9DXMXy8Na9LrDEtEgq88=" }, - "com/microsoft/signalr/messagepack#signalr-messagepack/8.0.11": { - "jar": "sha256-zV0AHyUrj6UG7bz8rgUvL5aSnFt7GoCiYUSR0waxLM8=", - "pom": "sha256-IXOQUasONK1HtWtaEKJfFa2Bib8Y4S2Tefr1LC3C4vI=" + "com/microsoft/signalr/messagepack#signalr-messagepack/9.0.1": { + "jar": "sha256-MySl8zyXF56dyzcIRoTFUuLwYv79DdOpKepZU+yBJHs=", + "pom": "sha256-9t2FXH2GeCMaDTbraKHaB4BMhXvyK1yPU5gg621+Tug=" }, "com/nulab-inc#zxcvbn/1.9.0": { "jar": "sha256-OO+uurCRROsfTUyf9lDnnfh1qNbEU5wQWweaYGu32zQ=", @@ -1877,22 +1876,13 @@ "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=", - "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" - }, "com/squareup/okhttp3#okhttp/4.12.0": { "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" }, - "com/squareup/okio#okio-jvm/3.2.0": { - "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", - "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", - "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" - }, "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" }, @@ -1901,10 +1891,6 @@ "module": "sha256-sK+pGSxC18Rj3jjWMlk2xpAdnjtxSXNf/RihHfMQNKs=", "pom": "sha256-VXZInO8kBTNoAPxt6VhUU18zVxpO/lpa0OybmwkNIdU=" }, - "com/squareup/okio#okio/3.2.0": { - "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", - "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" - }, "com/squareup/okio#okio/3.6.0": { "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" @@ -1964,9 +1950,9 @@ "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" }, - "commons-codec#commons-codec/1.17.1": { - "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", - "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" + "commons-codec#commons-codec/1.17.2": { + "jar": "sha256-QUgzJyhJDO8Ssp2sTDhfRpgvBChRMsb6Ua1yZ9fceos=", + "pom": "sha256-4kAvuaYGA4TzK9T8aQKxBr/3r8e5UpuDGoUMrKqjJG4=" }, "commons-io#commons-io/2.13.0": { "jar": "sha256-Zx6qOWiNrC/6pGRbPJmAri0OokceSual2hmc0VriNmY=", @@ -2423,9 +2409,9 @@ "module": "sha256-faLXSUC3gTNAbabysCyh9o+WAK6wO7fOLvdxHTodonY=", "pom": "sha256-QXovGqqUSErVNV0ylHdRkhVC/TgIKtC7YWQLBEMMdWg=" }, - "net/harawata#appdirs/1.2.2": { - "jar": "sha256-wf0q5mJLk4+7/Cr4fTdlb6lTYRNW4lKOhN0EYor4B68=", - "pom": "sha256-B+NZycEfUgyvAn17z9nAlpNf6AEj0lC1vr+vw8HDdWw=" + "net/harawata#appdirs/1.3.0": { + "jar": "sha256-Ec/xhOuqapqAb+DB5yK+/L534Jm77hSRZ9loHCmdE5Y=", + "pom": "sha256-cprwhnStsBBPQm3avl4OLq+xzQvVSmEgdtlOdhlTf8A=" }, "net/java#jvnet-parent/1": { "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" @@ -2433,17 +2419,17 @@ "net/java#jvnet-parent/3": { "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" }, - "net/java/dev/jna#jna-platform/5.13.0": { - "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", - "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + "net/java/dev/jna#jna-platform/5.16.0": { + "jar": "sha256-5aeVI5ZFCXV1VXgrtgKD5JAmEQE/EH5GANyTKY9z84I=", + "pom": "sha256-R3eT3wLGgn3+Ab2wjwBqVXdeb6BS3ErN7aNMmTYopJY=" }, "net/java/dev/jna#jna-platform/5.6.0": { "jar": "sha256-ns6ovysbOZY5OdGLcEZO72DFCP7Ygg+dyroMNVGOq/c=", "pom": "sha256-G+s1y0GE5skGp+Murr2FLdPaCiY5YumRNKuUWDI5Tig=" }, - "net/java/dev/jna#jna/5.13.0": { - "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", - "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + "net/java/dev/jna#jna/5.16.0": { + "jar": "sha256-P1IzWJp5nrZtwpaa+jQz+1aFnT14fFi5vH3Z6G8KJQw=", + "pom": "sha256-9h/SxEqlg/Kiy8X8Z7DxmpIDyofV8OGNPVAwy+OQgIM=" }, "net/java/dev/jna#jna/5.6.0": { "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=", @@ -2503,9 +2489,6 @@ "org/apache#apache/29": { "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" }, - "org/apache#apache/32": { - "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" - }, "org/apache#apache/33": { "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, @@ -2532,12 +2515,12 @@ "org/apache/commons#commons-parent/58": { "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" }, - "org/apache/commons#commons-parent/71": { - "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" - }, "org/apache/commons#commons-parent/73": { "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o=" }, + "org/apache/commons#commons-parent/78": { + "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4=" + }, "org/apache/httpcomponents#httpclient/4.5.14": { "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" @@ -2602,29 +2585,36 @@ "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" }, - "org/bouncycastle#bcpkix-jdk18on/1.79": { - "jar": "sha256-NjmiTd+bpLfroGWbRHcOkeuoFkIYiOVx8oWq3v5TLNY=", - "pom": "sha256-NeSfQTTeKsMmw6UKJXYsu021bzgC+j9zDMhbZTrQmHs=" + "org/bouncycastle#bcpkix-jdk18on/1.80": { + "jar": "sha256-T0umqSYX6hncGD8PpdtJLu5Cb93ioKLWyUd3/9GvZBM=", + "pom": "sha256-pKEiETRntyjhjyb7DP1X8LGg18SlO4Zxis5wv4uG7Uc=" }, "org/bouncycastle#bcprov-jdk18on/1.77": { "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" }, - "org/bouncycastle#bcprov-jdk18on/1.79": { - "jar": "sha256-DYHswxJFNrU5vOmqP+liG3+Eyc7jcbY1pbMceLeasdo=", - "pom": "sha256-2PGgaxSddG6dmN5U4veqmy62E/s1ymfYrjls6qxmHuQ=" + "org/bouncycastle#bcprov-jdk18on/1.80": { + "jar": "sha256-6K0gn4xY0pGjfKl1Dp6frGBZaVbJg+Sd2Cgjgd2LMkk=", + "pom": "sha256-oKdcdtkcQh7qVtD2Bi+49j7ff6x+xyT9QgzNytcYHUM=" }, - "org/bouncycastle#bctls-jdk18on/1.79": { - "jar": "sha256-Sv6EeOVsB7vaRetA+omJjxPEf7mW77IDjz91ob2kS1o=", - "pom": "sha256-igGqMNhmTofBiuQ0VlTc28EtiT44bh+KBjmZj4QjeG0=" + "org/bouncycastle#bctls-jdk18on/1.80": { + "jar": "sha256-b4VsoT+L89geOVHARG8XWORCyxUpaObaf6qdFsxBoXo=", + "pom": "sha256-OS102D++dZke1/n/7tJX1XOU/3hj2vuomdlv0DnynJ8=" }, "org/bouncycastle#bcutil-jdk18on/1.77": { "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" }, - "org/bouncycastle#bcutil-jdk18on/1.79": { - "jar": "sha256-xwuIraWJOMvC8AXUAykFQHi8+hFJ5v/APpJC62qyGDY=", - "pom": "sha256-4kwftM8WBUBaaYjp5NbksuH0OT/HOompRSrmJe4xHQI=" + "org/bouncycastle#bcutil-jdk18on/1.80": { + "jar": "sha256-Iuymh/eVVBH0Vq8z5uqOaPxzzYDLizKqX3qLGCfXxng=", + "pom": "sha256-Qhp95L/rnFs4sfxHxCagh9kIeJVdQQf1t6gusde3R7Y=" + }, + "org/bouncycastle/bcutil-jdk18on/maven-metadata": { + "xml": { + "groupId": "org.bouncycastle", + "lastUpdated": "20250114201150", + "release": "1.80" + } }, "org/checkerframework#checker-qual/2.5.8": { "pom": "sha256-M6xqDxNBrpZkfH1EZfSqPST+l9Jpe87izq5vyLXvLDw=" @@ -2982,9 +2972,9 @@ "module": "sha256-dxHfWV3xbmaovg9ktldQ0VTjrrELEQmKAZMh273KXfY=", "pom": "sha256-Aq+FtSLM6fp+pdao5ph4d8vpOjVVvHCM6AThbceToeU=" }, - "org/jetbrains/compose/ui#ui/1.7.1": { - "module": "sha256-LpKRDBxZrLBjrmhWz5VWwlH9qMCtRsg6Tka/flenza4=", - "pom": "sha256-RWT33DQr7tal9G+RaxkLMe0rEgcK/ZfXXmNjSkQt9lc=" + "org/jetbrains/compose/ui#ui/1.7.3": { + "module": "sha256-J8FPurfduHkXlIICLhDqISQke00Ld75EiX1iR+2ISLs=", + "pom": "sha256-GU5fG2j9V814sN/SkSawoXEy/jGvL06EnvVQnSjzie0=" }, "org/jetbrains/compose/ui#ui/1.8.0-alpha01": { "jar": "sha256-fRdNrpn/4LTBKq4ecSTCRv6MwZ1RjDXmA1/C/huTO5A=", @@ -3006,6 +2996,9 @@ "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=", "pom": "sha256-rIU9chaJ+vEV8RiBCjU2/CcvE1to0CdFOqpW6eY79wc=" }, + "org/jetbrains/kotlin#kotlin-bom/2.0.21": { + "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g=" + }, "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" @@ -3215,14 +3208,14 @@ "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=", "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.20": { - "jar": "sha256-xUUdZ6J/M6/QmRPGfhzro4l65wiEsk7w/3EVflW2CGU=", - "pom": "sha256-AS4cVe1q3kF7y4JBEuvqaCrWJd++4WCFw3nM+hT68DM=" - }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.24": { "jar": "sha256-tmmbhQugeJ8ukEJ5zYvce+qRMP/RV826AB/HQl2KR7c=", "pom": "sha256-RYapN9W8vDqzBCwECaHHKWFLy6PHpylvJS1ibuNzh9Q=" }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": { + "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=", + "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224=" + }, "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.5.10": { "pom": "sha256-BtEZ8p4iMjNxAX2mfRDHShVrFfINnIIRalf+4UVMbGg=" }, @@ -3237,14 +3230,14 @@ "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=", "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.20": { - "jar": "sha256-+DP8yU8LscMbnni9S9p+oj9Xn/NAiuGpTi61dHCGoqs=", - "pom": "sha256-o7B96wkfKu1Z1lWYhPRPmc/135ufo1okvNa4sGnP9I0=" - }, "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.24": { "jar": "sha256-W1u/s+EYS14TMXw9QiN/okrdRDsud4GWHuozTbE2rbE=", "pom": "sha256-BuBt70n5aq9uXD7EKDauWdbi2mJUcAkUKBZ1Z53J8qU=" }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": { + "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=", + "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc=" + }, "org/jetbrains/kotlin#kotlin-stdlib/1.9.0": { "jar": "sha256-Na7/vi21qkRgcs7lD87ki3+p4vxRyjfAzH19C8OdlS4=", "pom": "sha256-N3UiY/Ysw+MlCFbiiO5Kc9QQLXJqd2JwNPlIBsjBCso=" @@ -3332,12 +3325,12 @@ "module": "sha256-mO+84WKQhF+zCN6UK5GjA4ZYuhUzoNL3eIO5bsqRQAI=", "pom": "sha256-3IVbPjOh9u/AP72/DZlRG3Swh+lplfAEUfvyyJrgpHc=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-android/1.10.0": { - "module": "sha256-yjbN/LU7sgDoM6cMuMoI9YdkdQrn4AipiJRbns1dk54=", - "pom": "sha256-K4OvqqmvJNoiSTdIgIaKO0s942JU+P3y5HEtKwexUHA=" + "org/jetbrains/kotlinx#kotlinx-coroutines-android/1.10.1": { + "module": "sha256-s3B9dQ+uCksEsJlRYNpqToTgImSRrHHY76MVzV+4nzM=", + "pom": "sha256-+iXkxvbo4sEV1mG8OSvlyASmUQ8kEVzu2JmUSKOEET0=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.0": { - "pom": "sha256-dbMLAYZs+ZkcJGKMo7cpxDffNQbNECmW9ZG4MYxBAS8=" + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.1": { + "pom": "sha256-nL0EumPnOZhWdFcT4xLS8hYaHUTtpQbe1HyNVtr4Rh8=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" @@ -3345,38 +3338,38 @@ "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.9.0": { "pom": "sha256-vqVRHpAB8sWTq1CA3xMbIZq14ghcxZec5YPqzUlG/Xg=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.0": { - "jar": "sha256-dfY6CZPfpiah7GVAQvffwDjrB0Wp2d0Xhjvc+fIsQpo=", - "module": "sha256-AlPMU9U11TqEYy8swiPJwc2PmrVh3G5mzZqoYYP4roQ=", - "pom": "sha256-5805hUsie4kbV3cnIhuFJI9lkmO6VbtjBSYGT4ny9Go=" + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.1": { + "jar": "sha256-BpxZiGMyMOB07A05Mh7DzapFR8SekLqTbGPY/JHIwA0=", + "module": "sha256-GN1lRl7IDQ5uXXGBi/EZLvSBfPXSASgrW5sbcTrHlpo=", + "pom": "sha256-f5AURlw6uheoNXqJZcqcnKjJ4aBEfHrqEXxkB4CKUtY=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.0": { - "jar": "sha256-TDSRGwGtPQNl4E0PH5891AHOdxM/KZyHhqNQ1wavKho=", - "module": "sha256-qyXrKTzuCr8c2NTpGRVJHKCOSPnwAhuS3Su0RgkyQeg=", - "pom": "sha256-zitzh9AwauefT2VSNlECa1qf5irNzR7+9bpcwF34BCQ=" + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.1": { + "jar": "sha256-+uR3HdmHz62rrhKd1/Ylr0DZ5PFKu3/8cuQtzLl7cBA=", + "module": "sha256-y/1tFz4KXCmGr5U/ixzPKYAqrQnqympOkRQQj4rKyLE=", + "pom": "sha256-Ip7SIxgcPK8nt6wwHIFp3KLYYxkbcQ5hNVGlh5XANlU=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-play-services/1.10.0": { - "module": "sha256-p1rr0Z0ZNpCPWp3zVTYnc9NvMWIZ+ZP5eTslv4aQQAQ=", - "pom": "sha256-q6TFhwsQh9whJeLqmj5XC33JEL+JNu+FIXTWGGY8OOo=" + "org/jetbrains/kotlinx#kotlinx-coroutines-play-services/1.10.1": { + "module": "sha256-sjuJ8jL9oMptmSneP78yuNRBFuT/t2OU/zF2DJ7L0Uc=", + "pom": "sha256-dZehHqXRHvuTz1eSBNEruqGVt0pJvLzB3dur1g6iI9g=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.10.0": { - "jar": "sha256-oJ5/gJV2VPK/j7i6J2fw862HkbHY4ckqyRw15ch2dwo=", - "module": "sha256-baJlmOzQL4emWGYq5lzaLbisZ0ydhxyd53bOFC5Ata4=", - "pom": "sha256-pg/d3T7mExBLMYe2WvGZDQAx8QIZ/j0EaAH2LN6rrIs=" + "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.10.1": { + "jar": "sha256-5fpnTj2mpw/hGI/A1l+GcFN5rto0xZy9ML0VwORlts8=", + "module": "sha256-Z53VZCkanbzH7lbmZCzzqdB7BXGWj9lN5BachzJ/i8U=", + "pom": "sha256-UqJfb2ZMxFkJQmTVEDOeVYOqyQJ/DqqqPXA1XHVQkkY=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-slf4j/1.9.0": { "module": "sha256-ki7Xf8+ELN0KiwAi3bcPQdynPhc/WU5r/VkrTQONY64=", "pom": "sha256-LSRGR7/SJOKyCV/J6RqLGoUCwIpbaU0O1tCHdNmVsLE=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-swing/1.10.0": { - "jar": "sha256-vXRYfM5sXTpC5ttkzW0dXz6z2HbpP/UlQa1lD3/yeTc=", - "module": "sha256-HTHnHSkD3Q/GR18R9lfhMtflG4g44EN8U+nLtKjbzkk=", - "pom": "sha256-z3wzqf2jEfhmKRFYMRzhW/lRnswpbRHBaPfrrep2S3k=" + "org/jetbrains/kotlinx#kotlinx-coroutines-swing/1.10.1": { + "jar": "sha256-qOh6sO902a8KkWo3y3UtfCrrYhHyXWI3mYI1nJZWHdo=", + "module": "sha256-P8dvci/OUdZsWememwHmFMozLBpiW1j1/7H/ZvoBGgA=", + "pom": "sha256-pxygooWV1T8YLSaT9FWC0KsuhQYYe4azqQWNMUR4Y2c=" }, "org/jetbrains/kotlinx#kotlinx-datetime-jvm/0.6.1": { "jar": "sha256-vJSw/LRGR0LwLPVKPo2557FBoaBSyo3a9mKmCv+iFTA=", @@ -3417,15 +3410,18 @@ "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.7.3": { "pom": "sha256-QiakkcW1nOkJ9ztlqpiUQZHI3Kw4JWN8a+EGnmtYmkY=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-cbor-jvm/1.7.3": { - "jar": "sha256-7EXXTiKT6svB+ATz7FXUkI+ZBaxQUzFrVl8bZjJvH3A=", - "module": "sha256-nbAgQ82Ddekdt5RhfrKqtjqRvanFDXxo66QnSV4KETs=", - "pom": "sha256-m449my3kM3A00Ia384ckleu+UiJGQ0UKrK8d5N+CEeE=" + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.8.0": { + "pom": "sha256-xD5IdSnM/RIJ66hlOrjolZggNGSq+/5fBEje2ZKHFQk=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-cbor/1.7.3": { - "jar": "sha256-YEYObrKX+TX1J1aVPMYKT1XP0LQcE700WF4hS9+Sd4A=", - "module": "sha256-m72FKNz7jIMHFSnkoN/LqG1GcLz6YXMUW+hd4epp5Lg=", - "pom": "sha256-jkEDZax+q44l9kI1UGxkr2aptG4NZw650qcIEjEXCRY=" + "org/jetbrains/kotlinx#kotlinx-serialization-cbor-jvm/1.8.0": { + "jar": "sha256-D56JH2baunPJe6bAlhr/WookE5n9ovDCRiYCHUGEhjo=", + "module": "sha256-dsMM25/9qBxALcXf5Ek/MKgUEeJs/Olu2M4L8ouqLSs=", + "pom": "sha256-uQbWssResfXU9COS6QjT2Mt0j6wR4zN0W0P88Q59+Fs=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-cbor/1.8.0": { + "jar": "sha256-Mk/AP1qf2M06NuJJZ/l0eYfdU7F2HRHFkgOXHJTiYzw=", + "module": "sha256-QNU2ssmaxDKDJ2CEh6l+M2r/NQztsYQ13p6lJJcVEmE=", + "pom": "sha256-dbdL6htrd8cJeNJiqfII8VRtWdOG+pyCmB2TRQrEokc=" }, "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.6.3": { "jar": "sha256-KcghqNTiXL/k8s6WzdRSb2H49OaaE1+WEqNKgdk7ZfE=", @@ -3437,6 +3433,11 @@ "module": "sha256-c7tMAnk/h8Ke9kvqS6AlgHb01Mlj/NpjPRJI7yS0tO8=", "pom": "sha256-c09fdJII3QvvPZjKpZTPkiKv3w/uW2hDNHqP5k4kBCc=" }, + "org/jetbrains/kotlinx#kotlinx-serialization-core-jvm/1.8.0": { + "jar": "sha256-08lOnYKbum4MTNOuR4pAhG3UnVR11nB4d76FOXav5BY=", + "module": "sha256-NzH80jhWGpCpdSs0hfHWNeAbRF5Kd4F9ewd/S50vQi0=", + "pom": "sha256-QVKRtvWbeTemcau136BLJyl811jLUQLNzHWUFJj5wDw=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-core/1.6.2": { "module": "sha256-arz0gTrJTfA3AS4xZzaKNEUHD9+OqyHQjYhtTtnC+2c=", "pom": "sha256-BibddZLIUwKToOPoHgiBltNRh3o422hHaTY3S6ZJ+S8=" @@ -3446,10 +3447,14 @@ "pom": "sha256-0tv2/BU2TIlp1qq24+zMdROZU/LMBXtzDjUmdGWztX4=" }, "org/jetbrains/kotlinx#kotlinx-serialization-core/1.7.3": { - "jar": "sha256-SFBoLg5ZdoYmlTMNhOuGmfHcXVCEn2JSY5lcyIvG83s=", "module": "sha256-OdCabgLfKzJVhECmTGKPnGBfroxPYJAyF5gzTIIXfmQ=", "pom": "sha256-MdERd2ua93fKFnED8tYfvuqjLa5t1mNZBrdtgni6VzA=" }, + "org/jetbrains/kotlinx#kotlinx-serialization-core/1.8.0": { + "jar": "sha256-hThiUkHBX0SBQAQyDq6l32fpRK3FKwDduDGY1mTpIlE=", + "module": "sha256-mE2aqabpvMONfoNuqNAAsThyCH/GZY0NjWIldjPzlfE=", + "pom": "sha256-nVbnQWLOQn4MSetsuXUSR0Mq3PwukTw4KWY+27qr7hM=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.6.3": { "jar": "sha256-0yNBebz/GIbVPWfBHspH9/PPe2PDSdFpZfbbUbfz3Zo=", "module": "sha256-InoqmtOMAQsQe8gFjNYVF32lqqhts399WNSdnJt/l9A=", @@ -3460,24 +3465,33 @@ "module": "sha256-D/cOITHypldYIvdhHAXig8SuCBczA/QQSUy0Eom9PvY=", "pom": "sha256-0zRdKAgXvgfpwnrNYHPUleF73/VxxHADTglmQgeGp90=" }, + "org/jetbrains/kotlinx#kotlinx-serialization-json-jvm/1.8.0": { + "jar": "sha256-e3xEWIDO+U3EZPRzPaGzO5S+54gFBB6giuBuhQfkYg4=", + "module": "sha256-l+NZl/6prZY63lv0wDko/lOXS4JlIdSwP7+zyrAgiqo=", + "pom": "sha256-4CSBj4YiByqIM8DTmVd3Uet3ZJymO9DA/AYATWaRd6Q=" + }, "org/jetbrains/kotlinx#kotlinx-serialization-json/1.6.3": { "module": "sha256-gNHYf6CmO/+Dleo5EL2oDQnw9YNQTd6o7QB7x6hrTNQ=", "pom": "sha256-KcIhdhjlMdfYMsyICupu0aj0B3PkN/WkHXC9FUaNPOM=" }, "org/jetbrains/kotlinx#kotlinx-serialization-json/1.7.3": { - "jar": "sha256-qpP6PJY5LLE5WTE0Qw3C1RNn9Z1VPl43R+vYAHsmPxs=", "module": "sha256-HPAiijWIcx1rrzvLvbCKMiUB9wQg1Q4pKrUB5V2Mz08=", "pom": "sha256-BaiftqSvoKHUB51YgsrTSaF/4IqYv5a30A0GplUh3H0=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.7.3": { - "jar": "sha256-fIX7BwVVg6Lljf3O6dwZ/vclWjIyhXB/gqCtyE8u6E0=", - "module": "sha256-eSlY/WcPJQAhOkSer+BGJb6zCOK7W9bNXoSqJtQQFIQ=", - "pom": "sha256-Sd0+5WMlWTMcvi6JxpT5EHmfb9K6eWJn3cBqdy3BHuo=" + "org/jetbrains/kotlinx#kotlinx-serialization-json/1.8.0": { + "jar": "sha256-+qvHPoVryerJe6GdPfT8Suh+FOKt0HZccEG8cupHobs=", + "module": "sha256-lK/eU8GRw+Hge5+AiqF3f4YryKlbxQtGYozQkhnVaFg=", + "pom": "sha256-WAgq+Zc0Ah1bjbKcQ1sR1FyhGxwP14bHhFIsnSxxeVg=" }, - "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.7.3": { - "jar": "sha256-dMdtR+VdhmvBjZ7Yia45y859sLd95acgENqx8kR5NXc=", - "module": "sha256-Mes2Fe5po0XkuEjgxBiDLAvNX8hGCk3gZsGG9Ss3oRA=", - "pom": "sha256-PIUWIFu9DIjtNXCwnGS+f7WvEMGapgJFBu/Su7WSrMk=" + "org/jetbrains/kotlinx#kotlinx-serialization-protobuf-jvm/1.8.0": { + "jar": "sha256-hWHBft8F4n6AKDDzuOnQrEoBhIxcM6eQMpMjgttxzjQ=", + "module": "sha256-wfxTEVd7TXf5mSZWiG2ZqcI6JfmoL8Ka1GkTai1e4fg=", + "pom": "sha256-c5L1fbU2xPK4BkfZQD9mho6mdHuoBFa9+0S/UNTdMY0=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-protobuf/1.8.0": { + "jar": "sha256-oT9rV/9DA3qCO0id0/wzku4eXQGJ1e2v/ZOPPVpWOQY=", + "module": "sha256-C2UuSc1eykX730eSf6dH4dgsU8l8IcBSaozSeSAvyLY=", + "pom": "sha256-FGqb0rgoDpxfshb2oI9pSq4OYaroqFVB9leDfqf7QcA=" }, "org/jetbrains/skiko#skiko-awt-runtime-linux-x64/0.8.18": { "jar": "sha256-jWPZLGbPlPtqixUoCQA51zQfoopQbx3xEytbS7St/dI=", @@ -3524,9 +3538,9 @@ "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" }, - "org/junit#junit-bom/5.11.0-M2": { - "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", - "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + "org/junit#junit-bom/5.11.2": { + "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", + "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" }, "org/junit#junit-bom/5.9.2": { "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", @@ -3613,25 +3627,25 @@ "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-analysis/9.6": { - "jar": "sha256-2Sgy18N+3AfGDiVZrGEYsx1kLjN6ZnHty3up+uaO27s=", - "pom": "sha256-+j+ZUCHP9PQTkwbmz/7uoHU5EGRA0psZzAanpjahOFA=" + "org/ow2/asm#asm-analysis/9.7": { + "jar": "sha256-e8a8vCE3mUigyMRn+w+GQgbluBj2vAtUaHL1yflBVW8=", + "pom": "sha256-nDMIDry2Ma5Pd+ti7We/xAy4cujP0Fishj5EXB3Zc98=" }, - "org/ow2/asm#asm-commons/9.6": { - "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=", - "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w=" + "org/ow2/asm#asm-commons/9.7": { + "jar": "sha256-OJvCR5WOBJ/JoECNOYySxtNwwYA1EgOV1Muh2dkwS3o=", + "pom": "sha256-Ws7j7nJS7ZC4B0x1XQInh0malfr/+YrEpoUQfE2kCbQ=" }, - "org/ow2/asm#asm-tree/9.6": { - "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", - "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + "org/ow2/asm#asm-tree/9.7": { + "jar": "sha256-YvSzvENgRcGstcO6LY7FVuwzaQk9f10Gx0frBLVtUrE=", + "pom": "sha256-o06h4+QSjAEDjbQ8aXbojHec9a+EsFBdombf5pZWaOw=" }, - "org/ow2/asm#asm-util/9.6": { - "jar": "sha256-xjWnQC9Kqb9msvQjDOpiAloP4c1j6HKa3vybGZT6xMM=", - "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4=" + "org/ow2/asm#asm-util/9.7": { + "jar": "sha256-N6ZBTTZkGXPxrxBJN8ldbZIbLdtNYSxmxanysT/BQhE=", + "pom": "sha256-XQFNjIcNSHGCW9LdtVZ7Ie9trI7Ei7uNu0ZbCzor9FI=" }, - "org/ow2/asm#asm/9.6": { - "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", - "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + "org/ow2/asm#asm/9.7": { + "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=", + "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA=" }, "org/reactivestreams#reactive-streams/1.0.3": { "jar": "sha256-He4EgQctGckptiPhVeFNL2CF3AEVKaCg2+/ITPVx2GU=", diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix index 52ff24ba4880..1cdfd8189c27 100644 --- a/pkgs/by-name/ke/keyguard/package.nix +++ b/pkgs/by-name/ke/keyguard/package.nix @@ -3,11 +3,8 @@ stdenv, fetchFromGitHub, gradle, - binutils, - fakeroot, jdk17, fontconfig, - autoPatchelfHook, libXinerama, libXrandr, file, @@ -19,40 +16,28 @@ makeDesktopItem, copyDesktopItems, }: + stdenv.mkDerivation (finalAttrs: { pname = "keyguard"; - version = "1.7.2"; + version = "1.7.6"; src = fetchFromGitHub { owner = "AChep"; repo = "keyguard-app"; - tag = "r20241223"; - hash = "sha256-7fMSpTKEEjSXfYotZ/qxX1m+i8GheCLboo+XoA3gTbc="; + tag = "r20250128"; + hash = "sha256-/z7ihmZecIc7Wjd2M9aHcSFYyg2YsWiC9Ia09Ey42qQ="; }; + postPatch = '' + substituteInPlace desktopLibJvm/build.gradle.kts \ + --replace-fail 'resources.srcDir(rootDir.resolve("desktopLibNative/build/bin/universal"))' "" \ + --replace-fail 'resourcesTask.dependsOn(":desktopLibNative:''${Tasks.compileNativeUniversal}")' "" + ''; + gradleBuildTask = ":desktopApp:createDistributable"; gradleUpdateTask = finalAttrs.gradleBuildTask; - desktopItems = [ - (makeDesktopItem { - name = "keyguard"; - exec = "Keyguard"; - icon = "keyguard"; - comment = "Keyguard"; - desktopName = "Keyguard"; - }) - ]; - - nativeBuildInputs = [ - gradle - binutils - fakeroot - jdk17 - autoPatchelfHook - copyDesktopItems - ]; - mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; data = ./deps.json; @@ -60,13 +45,15 @@ stdenv.mkDerivation (finalAttrs: { useBwrap = false; }; - passthru.updateScript = ./update.sh; - - doCheck = false; + env.JAVA_HOME = jdk17; gradleFlags = [ "-Dorg.gradle.java.home=${jdk17}" ]; - env.JAVA_HOME = jdk17; + nativeBuildInputs = [ + gradle + jdk17 + copyDesktopItems + ]; buildInputs = [ fontconfig @@ -80,15 +67,29 @@ stdenv.mkDerivation (finalAttrs: { alsa-lib ]; + doCheck = false; + + desktopItems = [ + (makeDesktopItem { + name = "keyguard"; + exec = "Keyguard"; + icon = "keyguard"; + comment = "Keyguard"; + desktopName = "Keyguard"; + }) + ]; + installPhase = '' runHook preInstall - cp -r ./desktopApp/build/compose/binaries/main/app/Keyguard $out + cp -r desktopApp/build/compose/binaries/main/app/Keyguard $out install -Dm0644 $out/lib/Keyguard.png $out/share/pixmaps/keyguard.png runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = { description = "Alternative client for the Bitwarden platform, created to provide the best user experience possible"; homepage = "https://github.com/AChep/keyguard-app"; diff --git a/pkgs/by-name/ke/keyguard/update.sh b/pkgs/by-name/ke/keyguard/update.sh index 57df067cd413..6e717c5df37b 100755 --- a/pkgs/by-name/ke/keyguard/update.sh +++ b/pkgs/by-name/ke/keyguard/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts +#!nix-shell -I nixpkgs=./. -i bash -p bash nix curl coreutils jq common-updater-scripts set -eou pipefail From e3655df788b90e1e97b9b3208955462ea84d99d8 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 16 Jan 2025 00:28:08 +0800 Subject: [PATCH 12/43] fritzing: fix ngspice path --- pkgs/applications/science/electronics/fritzing/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index f0d98e7a823c..ab0395d14b85 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -87,6 +87,9 @@ stdenv.mkDerivation { substituteInPlace phoenix.pro \ --replace-fail "6.5.10" "${qtbase.version}" + substituteInPlace src/simulation/ngspice_simulator.cpp \ + --replace-fail 'path + "/" + libName' '"${libngspice}/lib/libngspice.so"' + mkdir parts cp -a ${parts}/* parts/ ''; From 752cc5c3dec736bb3e143d78c8116cf64ca92e72 Mon Sep 17 00:00:00 2001 From: Ethan Carter Edwards Date: Fri, 31 Jan 2025 20:47:49 -0500 Subject: [PATCH 13/43] nixci: move nixci to by-name and modernize Signed-off-by: Ethan Carter Edwards --- .../ni/nixci/package.nix} | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) rename pkgs/{tools/nix/nixci/default.nix => by-name/ni/nixci/package.nix} (83%) diff --git a/pkgs/tools/nix/nixci/default.nix b/pkgs/by-name/ni/nixci/package.nix similarity index 83% rename from pkgs/tools/nix/nixci/default.nix rename to pkgs/by-name/ni/nixci/package.nix index 3e6866df79c7..7fb0e4879f13 100644 --- a/pkgs/tools/nix/nixci/default.nix +++ b/pkgs/by-name/ni/nixci/package.nix @@ -2,7 +2,6 @@ lib, stdenv, rustPlatform, - fetchCrate, fetchFromGitHub, openssl, pkg-config, @@ -17,10 +16,11 @@ rustPlatform.buildRustPackage rec { pname = "nixci"; version = "1.0.0"; - src = fetchCrate { - inherit version; - pname = "nixci"; - hash = "sha256-49I09hXYoVo6vzv1b6mkeiFwzfj6g1SkXTL/tCEdOYc="; + src = fetchFromGitHub { + owner = "srid"; + repo = "nixci"; + tag = version; + hash = "sha256-0VvZFclqwAcKN95eusQ3lgV0pp1NRUDcVXpVUC0P4QI="; }; cargoHash = "sha256-trmWeYJNev7jYJtGp9XR/emmQiiI94NM0cPFrAuD7m0="; @@ -53,15 +53,15 @@ rustPlatform.buildRustPackage rec { env.DEVOUR_FLAKE = fetchFromGitHub { owner = "srid"; repo = "devour-flake"; - rev = "v4"; + tag = "v4"; hash = "sha256-Vey9n9hIlWiSAZ6CCTpkrL6jt4r2JvT2ik9wa2bjeC0="; }; - meta = with lib; { + meta = { description = "Define and build CI for Nix projects anywhere"; homepage = "https://github.com/srid/nixci"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ srid shivaraj-bh rsrohitsingh682 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c16d3533f94e..f7c6be57a29f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17810,7 +17810,7 @@ with pkgs; nix-visualize = python3.pkgs.callPackage ../tools/package-management/nix-visualize { }; - nixci = callPackage ../tools/nix/nixci { + nixci = callPackage ../by-name/ni/nixci/package.nix { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration IOKit; }; From b4fb18e9d15877678b2fb3ace574084d20942a30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 02:28:33 +0000 Subject: [PATCH 14/43] fishPlugins.forgit: 25.01.0 -> 25.02.0 --- pkgs/shells/fish/plugins/forgit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 5c6886cba67f..e7c047508998 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -6,13 +6,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "25.01.0"; + version = "25.02.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-x+Y1o+K6I9DWbn202jNAr40vS71ZAXbS7ztsH+bPGBI="; + hash = "sha256-vVsJe/MycQrwHLJOlBFLCuKuVDwQfQSMp56Y7beEUyg="; }; postInstall = '' From e7f4275acec8d95a1bd0541f6b4c4239da37e4eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 03:11:21 +0000 Subject: [PATCH 15/43] pretender: 1.2.0 -> 1.3.0 --- pkgs/by-name/pr/pretender/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/pretender/package.nix b/pkgs/by-name/pr/pretender/package.nix index 1d7bb074112d..b60667f0be14 100644 --- a/pkgs/by-name/pr/pretender/package.nix +++ b/pkgs/by-name/pr/pretender/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "pretender"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = pname; tag = "v${version}"; - hash = "sha256-adWdUlsReRptSgRAjNH9bWy9dpwpuAWtVxlbDL2pMmk="; + hash = "sha256-msxGCQkF5u5sIjvy4GCRBIivzoiIDsOjesIf3d8goVI="; }; - vendorHash = "sha256-kDHRjd3Y90ocBGSJ0B2jAM9tO+iDSXoUOzLEWX2G0J4="; + vendorHash = "sha256-UzKprzkxqG7FOPWcFQGuZtn+gHMeMy4jqCLUSdyO2l0="; # Tests require network access doCheck = false; From 3f07e819c0d59ba37b633abce4c0a508e4be2bf7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 1 Feb 2025 11:20:50 +0100 Subject: [PATCH 16/43] ripunzip: 2.0.0 -> 2.0.1 https://github.com/google/ripunzip/releases/tag/v2.0.1 --- pkgs/by-name/ri/ripunzip/package.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix index 5071f03953dd..55414588e632 100644 --- a/pkgs/by-name/ri/ripunzip/package.nix +++ b/pkgs/by-name/ri/ripunzip/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "ripunzip"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "google"; repo = "ripunzip"; rev = "v${version}"; - hash = "sha256-O9R7SmhKQ6VB9TWbLsQmK/0tDWhJ1QWIPwW7VtibqAk="; + hash = "sha256-Y4p3CFE8MyEQJ/af0g2/EL4kto/VZABvD5OS0rRuo8g="; }; - cargoHash = "sha256-1ZHAbJIWRQh876rshMYeuCz7UMlwdqrScO0eIkGjZao="; + cargoHash = "sha256-5KHF5x4papscMFeXbFYQ+Qyso5YtMoIOO+cq8Omrbs8="; buildInputs = [ openssl ] @@ -35,6 +35,21 @@ rustPlatform.buildRustPackage rec { ); nativeBuildInputs = [ pkg-config ]; + checkFlags = [ + # Skip tests involving network + "--skip=unzip::http_range_reader::tests::test_with_accept_range" + "--skip=unzip::http_range_reader::tests::test_without_accept_range" + "--skip=unzip::seekable_http_reader::tests::test_big_readahead" + "--skip=unzip::seekable_http_reader::tests::test_random_access" + "--skip=unzip::seekable_http_reader::tests::test_small_readahead" + "--skip=unzip::seekable_http_reader::tests::test_unlimited_readahead" + "--skip=unzip::tests::test_extract_biggish_zip_from_ranges_server" + "--skip=unzip::tests::test_extract_from_server" + "--skip=unzip::tests::test_small_zip_from_no_content_length_server" + "--skip=unzip::tests::test_small_zip_from_no_range_server" + "--skip=unzip::tests::test_small_zip_from_ranges_server" + ]; + setupHook = ./setup-hook.sh; passthru.tests = { From 0c3e6825de0f1c4dc0e036a7862e7f2e14e553f8 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Feb 2025 11:49:12 +0100 Subject: [PATCH 17/43] zenoh-*: 1.1.1 -> 1.2.0 --- pkgs/by-name/ze/zenoh-backend-filesystem/package.nix | 12 ++++++------ pkgs/by-name/ze/zenoh-backend-influxdb/package.nix | 6 +++--- pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix | 12 ++++++------ pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix | 6 +++--- pkgs/by-name/ze/zenoh-plugin-webserver/package.nix | 6 +++--- pkgs/by-name/ze/zenoh/package.nix | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix index a6ba3a65a30a..8a75aa37a490 100644 --- a/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-filesystem/package.nix @@ -5,21 +5,21 @@ pkg-config, bzip2, zstd, - rocksdb_8_11, + rocksdb, }: rustPlatform.buildRustPackage rec { pname = "zenoh-backend-filesystem"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-filesystem"; tag = version; - hash = "sha256-V35nqrTUQb5Emn6kgGubvVkTHYQHDz82p3S7pk0Aagg="; + hash = "sha256-e7jVje4kI3/xRNk1s1z8WtpUIwPdMleyb0PvDz+vJ08="; }; - cargoHash = "sha256-qpubYs7JEdL1iSYrMQ2HXPXrkCmFLjHyC0+MhiolEFk="; + cargoHash = "sha256-PKwRGNZGv/vqogcotDudMF0IrzXMssPH2oDibAX/EEs="; nativeBuildInputs = [ pkg-config @@ -32,8 +32,8 @@ rustPlatform.buildRustPackage rec { ]; env = { - ROCKSDB_INCLUDE_DIR = "${rocksdb_8_11}/include"; - ROCKSDB_LIB_DIR = "${rocksdb_8_11}/lib"; + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; ZSTD_SYS_USE_PKG_CONFIG = true; }; diff --git a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix index aafd5a14b1c2..357a06d9f79e 100644 --- a/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-influxdb/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-backend-influxdb"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-influxdb"; tag = version; - hash = "sha256-X8COHoAf+VG5RXg6KLozxe39a/4oVuiEJLESnEKaCEE="; + hash = "sha256-npkQEr1tzY+CW9dDRe+JipXnWa5y38wv7J+kUMlcH54="; }; - cargoHash = "sha256-4V0blfTQ5plFD4MNJeIIuztVlhOlzOgtycsg8J/pZjQ="; + cargoHash = "sha256-AQNbiK7cn0R/DsW1RjKFX3hV3MBX9izPsljJU7yNDV0="; meta = { description = "Backend and Storages for zenoh using InfluxDB"; diff --git a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix index d119a40a61b9..9450cb9adb30 100644 --- a/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix +++ b/pkgs/by-name/ze/zenoh-backend-rocksdb/package.nix @@ -5,21 +5,21 @@ pkg-config, bzip2, zstd, - rocksdb_8_11, + rocksdb, }: rustPlatform.buildRustPackage rec { pname = "zenoh-backend-rocksdb"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-backend-rocksdb"; tag = version; - hash = "sha256-+dA/4VA1oHhTiMcSXful2Z1B+IYykPMC/2p0mjEbako="; + hash = "sha256-YZf3riWMzcyguZbfGheIbAlCijML7zPG+XAJso6ku9E="; }; - cargoHash = "sha256-bQQWewhKibUKmJ9sJGcgvsNJhdCu67qOwFTNsCkjlO0="; + cargoHash = "sha256-bzUY9iARGAXErYOH0S6q6JlfdFQJDDg5q1D2miMrzNE="; nativeBuildInputs = [ pkg-config @@ -32,8 +32,8 @@ rustPlatform.buildRustPackage rec { ]; env = { - ROCKSDB_INCLUDE_DIR = "${rocksdb_8_11}/include"; - ROCKSDB_LIB_DIR = "${rocksdb_8_11}/lib"; + ROCKSDB_INCLUDE_DIR = "${rocksdb}/include"; + ROCKSDB_LIB_DIR = "${rocksdb}/lib"; ZSTD_SYS_USE_PKG_CONFIG = true; }; diff --git a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix index 7a5953cbdad0..b5355deecff1 100644 --- a/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-mqtt/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-plugin-mqtt"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-plugin-mqtt"; tag = version; - hash = "sha256-boe4AI0U0JHNuChhHOlfCMlKJ0Zo5yUGG3xubR/Msrc="; + hash = "sha256-ath1RWr+5nU2GJY6rlWPPBKHX9K/92DFUhgQWVXoWb8="; }; - cargoHash = "sha256-uB/geIBpNStXx82zL2sX6e6sLsoWRkbUsx14xLvDdsw="; + cargoHash = "sha256-/Af4nANgFK23pZHA2wQvooF4s/raRQ7c2Xv2f4v+z74="; # Some test time out doCheck = false; diff --git a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix index 0b2360458f33..2fea1856639a 100644 --- a/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix +++ b/pkgs/by-name/ze/zenoh-plugin-webserver/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "zenoh-plugin-webserver"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-plugin-webserver"; tag = version; - hash = "sha256-DduYSy8jO0LtpEadhBhVFW5uht9LFmTbmSJ0jGTh/TQ="; + hash = "sha256-+2ta3LdT1YwRs62dyrbmJDCfKDhpWdig1bX0Qq8EoCY="; }; - cargoHash = "sha256-W1vmrKP4aS6O/+8sCzPb5Rs9kAm8ePnowtYEhcS7yMo="; + cargoHash = "sha256-4QFiCtAUABvu1663pKdP7foepy7yLoE8KhApiyuARlk="; meta = { description = "Implements an HTTP server mapping URLs to zenoh paths"; diff --git a/pkgs/by-name/ze/zenoh/package.nix b/pkgs/by-name/ze/zenoh/package.nix index 622acf3e180e..46d46a994187 100644 --- a/pkgs/by-name/ze/zenoh/package.nix +++ b/pkgs/by-name/ze/zenoh/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "zenoh"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh"; rev = version; - hash = "sha256-5lFs/t1Otmp8C0j5LQN/GV19ukfLq4alBpgwsA934FU="; + hash = "sha256-X/jUANTwuOHIA+m8LB4UuJDJ0PwZuMQHtSdgSPiPYNI="; }; - cargoHash = "sha256-NF131RKn3G5wINRMEkfgI5eE25gKlIsaZA98YN9ZWS8="; + cargoHash = "sha256-Dmx0iJ2vVl+6rXI1VLV8xZ+yt1xyljlML3W1h+9hLGc="; cargoBuildFlags = [ "--workspace" From bf2e5d59bf45a0206e1d7428c7872daf41e12c94 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Feb 2025 11:50:57 +0100 Subject: [PATCH 18/43] python3Packages.zenoh: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/zenoh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/zenoh/default.nix b/pkgs/development/python-modules/zenoh/default.nix index 981dd8ac6023..6566e08e0465 100644 --- a/pkgs/development/python-modules/zenoh/default.nix +++ b/pkgs/development/python-modules/zenoh/default.nix @@ -11,19 +11,19 @@ buildPythonPackage rec { pname = "zenoh"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "eclipse-zenoh"; repo = "zenoh-python"; rev = version; - hash = "sha256-pLdAlQBq/d9fohkPgGV/bR7rOl4RreenbHXYdde8q/0="; + hash = "sha256-N82KcLMYTOzkeFR6NLNR/g4MDjXk2aZRaAVMggXKwf0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src pname version; - hash = "sha256-R6Vux4cNL9/Fxi7UvItZT8E539cz5cAupT9X0UkdwR4="; + hash = "sha256-5JdqANf5roFY3J+iPxg+WhmAyTWARhgav+/jt7rttqg="; }; build-system = [ From 84c1c36a37bb7d186571a3366b3878615a0c74cc Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 1 Feb 2025 12:33:23 +0100 Subject: [PATCH 19/43] nixos/zenoh: fix test Avoid timing issues by starting the router first --- nixos/tests/zenohd.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/zenohd.nix b/nixos/tests/zenohd.nix index 7d99460d6ade..0aeca6b61818 100644 --- a/nixos/tests/zenohd.nix +++ b/nixos/tests/zenohd.nix @@ -82,7 +82,6 @@ import ./make-test-python.nix ( }; testScript = '' - start_all() router.wait_for_unit("zenohd.service") client.wait_for_unit("multi-user.target") From cab3383aa45467c50ff7f92cbe16cdacddc6b0b6 Mon Sep 17 00:00:00 2001 From: florianvazelle Date: Sat, 1 Feb 2025 12:29:12 +0100 Subject: [PATCH 20/43] gum: fix cross build --- pkgs/by-name/gu/gum/package.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix index 31e1d6462a6d..72e95817a892 100644 --- a/pkgs/by-name/gu/gum/package.nix +++ b/pkgs/by-name/gu/gum/package.nix @@ -29,17 +29,14 @@ buildGoModule rec { "-X=main.Version=${version}" ]; - postInstall = - '' - $out/bin/gum man > gum.1 - installManPage gum.1 - '' - + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd gum \ - --bash <($out/bin/gum completion bash) \ - --fish <($out/bin/gum completion fish) \ - --zsh <($out/bin/gum completion zsh) - ''; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + $out/bin/gum man > gum.1 + installManPage gum.1 + installShellCompletion --cmd gum \ + --bash <($out/bin/gum completion bash) \ + --fish <($out/bin/gum completion fish) \ + --zsh <($out/bin/gum completion zsh) + ''; meta = with lib; { description = "Tasty Bubble Gum for your shell"; From 4bf8cafc111ca8dfd6be449076927465e5c52b97 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sat, 1 Feb 2025 17:15:40 +0100 Subject: [PATCH 21/43] linux_xanmod: remove shawn8901 as maintainer --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index e8a291c5aeb1..d9c39f19eb27 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -76,7 +76,6 @@ let moni lovesegfault atemu - shawn8901 zzzsy eljamm ]; From 8a12cae321cdb8ee204fb42c38702fa86099abd8 Mon Sep 17 00:00:00 2001 From: nikstur Date: Sat, 1 Feb 2025 17:15:56 +0100 Subject: [PATCH 22/43] nixos/repart-image: support swap --- nixos/modules/image/repart-image.nix | 1 + nixos/tests/appliance-repart-image.nix | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/nixos/modules/image/repart-image.nix b/nixos/modules/image/repart-image.nix index 5669cd8826e4..e8924ec8519d 100644 --- a/nixos/modules/image/repart-image.nix +++ b/nixos/modules/image/repart-image.nix @@ -81,6 +81,7 @@ let "erofs" = [ erofs-utils ]; "btrfs" = [ btrfs-progs ]; "xfs" = [ xfsprogs ]; + "swap" = [ util-linux ]; }; fileSystemTools = builtins.concatMap (f: fileSystemToolMapping."${f}") fileSystems; diff --git a/nixos/tests/appliance-repart-image.nix b/nixos/tests/appliance-repart-image.nix index 9798ab4e79fa..11447cf8fa03 100644 --- a/nixos/tests/appliance-repart-image.nix +++ b/nixos/tests/appliance-repart-image.nix @@ -73,6 +73,14 @@ in SizeMinBytes = if config.nixpkgs.hostPlatform.isx86_64 then "64M" else "96M"; }; }; + "swap" = { + repartConfig = { + Type = "swap"; + Format = "swap"; + SizeMinBytes = "10M"; + SizeMaxBytes = "10M"; + }; + }; "root" = { storePaths = [ config.system.build.toplevel ]; repartConfig = { From dd6b1b7492657305f5e8539ec53a2d4ba812d64c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 19:17:55 +0000 Subject: [PATCH 23/43] cnspec: 11.37.1 -> 11.39.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 35becf6a2093..0d3a2448d0d1 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.37.1"; + version = "11.39.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-NZbNkqYAjtfF+XP1EcblsT8cLqJEDovQTOwc4JQUNQc="; + hash = "sha256-SnWKaQ/wH04HmqM6WhMIn7tRszIwDz9sQxqMXA4ux8k="; }; proxyVendor = true; - vendorHash = "sha256-N99aOt7SsyAUWnvfgsweLABmLX7obnepEvHSTKa/2hg="; + vendorHash = "sha256-uymDz+jlEO7AYurAUiUswZD2X7hjEFW6m2aQ73k/B3Q="; subPackages = [ "apps/cnspec" ]; From b3172852593f1edc1a5f3ca615326a1ffc3cac75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 19:18:08 +0000 Subject: [PATCH 24/43] cnquery: 11.37.1 -> 11.39.0 --- pkgs/by-name/cn/cnquery/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 36158765e733..9a90ade865ed 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnquery"; - version = "11.37.1"; + version = "11.39.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; tag = "v${version}"; - hash = "sha256-H8qilsIlXA9NdPrdJYmkX+Ccc5fJHcEZThzPUo6Vi4M="; + hash = "sha256-xTeN6VGMqgUEsce9nh5xm5bF0tWgug/xFiXcQehP9iE="; }; subPackages = [ "apps/cnquery" ]; - vendorHash = "sha256-rqWGaENzFoC4+VhH1FRX9veLOXxXEAxdhcvrd2OoZY8="; + vendorHash = "sha256-l293xIerCnsDe/mau/0+hePJ+CyDlQb1kHmB946a9Do="; ldflags = [ "-w" From d36643b1702c0f280688207c253ebba3a18073a7 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 22:24:57 +0300 Subject: [PATCH 25/43] linux_6_13: 6.13 -> 6.13.1 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index edbebb68b880..1183c150984e 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -32,7 +32,7 @@ "hash": "sha256:0jgczvy1kr55s4bs8n2vmxnxnfvp5rkm4yd54gqm78c7ppyp4la7" }, "6.13": { - "version": "6.13", - "hash": "sha256:0vhdz1as27kxav81rkf6fm85sqrbj5hjhz5hpyxcd5b6p1pcr7g7" + "version": "6.13.1", + "hash": "sha256:0smnalhyrgh5s3mw60q56r1jxj993ckfpldxvfrz27a7xb4gc4gh" } } From 10ee99962f833f31d66234327dbb591d483c11da Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 22:25:06 +0300 Subject: [PATCH 26/43] linux_6_12: 6.12.11 -> 6.12.12 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 1183c150984e..f0afb1729aee 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,8 +28,8 @@ "hash": "sha256:1z2913y38clnlmhvwj49h7p4pic24s4d8np7nmd4lk7m2xz8w532" }, "6.12": { - "version": "6.12.11", - "hash": "sha256:0jgczvy1kr55s4bs8n2vmxnxnfvp5rkm4yd54gqm78c7ppyp4la7" + "version": "6.12.12", + "hash": "sha256:1zwfw3lci3ihandx2cpq3h12x7l94jzr4xkd5lzkn1ppgv8l52g9" }, "6.13": { "version": "6.13.1", From 18733fd4bd319b1399412cd659a24faf5b99c4f7 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 22:25:12 +0300 Subject: [PATCH 27/43] linux_6_6: 6.6.74 -> 6.6.75 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index f0afb1729aee..bb95f2f4de58 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy" }, "6.6": { - "version": "6.6.74", - "hash": "sha256:0ka9snxl0y57fajy8vszwa4ggn48pid8m1879d4vl3mbicd2nppi" + "version": "6.6.75", + "hash": "sha256:1402g6qjk1242gsl6n8xlbg01m0nb19n30ac1ffi7fhnjzxb3pzp" }, "6.11": { "version": "6.11.11", From c51e33d672d234d60726ba7a03bdf5fe44808698 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 22:26:00 +0300 Subject: [PATCH 28/43] linux_6_1: 6.1.127 -> 6.1.128 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index bb95f2f4de58..c10d86d41aa3 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:12c9bd0ikppkdpqmvg7g2062s60ks9p0qxx1jis29wl9swr74120" }, "6.1": { - "version": "6.1.127", - "hash": "sha256:0xkqpwhvz6qhaxzg1j993lv1iyvb2zydgq6d8mhdbfkz38fx9c0q" + "version": "6.1.128", + "hash": "sha256:1wshgkgcxaf4mnm4ngngsj8gq1cg8kq56f5kqsdfcw0m339nfkc7" }, "5.15": { "version": "5.15.177", From 9be3c2ab3246e9c4d5c27d7458244e8dc933c191 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 22:26:08 +0300 Subject: [PATCH 29/43] linux_5_15: 5.15.177 -> 5.15.178 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c10d86d41aa3..edd3b7bde71f 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:1wshgkgcxaf4mnm4ngngsj8gq1cg8kq56f5kqsdfcw0m339nfkc7" }, "5.15": { - "version": "5.15.177", - "hash": "sha256:1q56w3lqwi3ynny6z7siqzv3h8nryksyw70r3fhghca2il4bi7pa" + "version": "5.15.178", + "hash": "sha256:0hkw2l4gr5m6jw2adxcgm2sb6kl0w51r6s4hcbn6rlm4bvmzgsgg" }, "5.10": { "version": "5.10.233", From 871fd360b77dc10b2b600b3d7e9e6882b5ac80c8 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 22:26:18 +0300 Subject: [PATCH 30/43] linux_5_10: 5.10.233 -> 5.10.234 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index edd3b7bde71f..81a29e80f72c 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:0hkw2l4gr5m6jw2adxcgm2sb6kl0w51r6s4hcbn6rlm4bvmzgsgg" }, "5.10": { - "version": "5.10.233", - "hash": "sha256:0lkz2g8r032f027j3gih3f7crx991mrpng9qgqc5k4cc1wl5g7i3" + "version": "5.10.234", + "hash": "sha256:1rgb4v6dvqlw1mgzsli0hxaj2d5d4m1nylgcrwm4bkpiwbzc95wm" }, "5.4": { "version": "5.4.289", From 69d1c21ef768aafea12eb66a7caf8974ea510e3a Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 22:27:09 +0300 Subject: [PATCH 31/43] linux_5_4: 5.4.289 -> 5.4.290 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 81a29e80f72c..5ab026e291b8 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -16,8 +16,8 @@ "hash": "sha256:1rgb4v6dvqlw1mgzsli0hxaj2d5d4m1nylgcrwm4bkpiwbzc95wm" }, "5.4": { - "version": "5.4.289", - "hash": "sha256:043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy" + "version": "5.4.290", + "hash": "sha256:0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc" }, "6.6": { "version": "6.6.75", From a84157d90746f2084ea2c2cddafb4e329f3773d1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 1 Feb 2025 22:23:49 +0300 Subject: [PATCH 32/43] grafana: fix build on aarch64, take 2 Supersedes #378593. --- pkgs/servers/monitoring/grafana/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c356fe023b58..9b87d7540547 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -60,7 +60,8 @@ buildGoModule rec { cacert jq moreutils - python3 + # required to run old node-gyp + (python3.withPackages (ps: [ ps.distutils ])) git # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild` ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ]; @@ -102,7 +103,8 @@ buildGoModule rec { jq moreutils removeReferencesTo - python3 + # required to run old node-gyp + (python3.withPackages (ps: [ ps.distutils ])) faketty ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcbuild ]; From 047b11322cfbb5e0a976cd3dec1cb7fa0b0ec9e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Feb 2025 20:22:08 +0100 Subject: [PATCH 33/43] python313Packages.branca: refactor --- pkgs/development/python-modules/branca/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 93ec028fb3e1..56cc4b068a88 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "branca"; version = "0.8.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-visualization"; - repo = pname; + repo = "branca"; tag = "v${version}"; hash = "sha256-Gnr3ONqWpUNOGiOlyq77d9PxcDT8TjqTHYBGxH+V+xc="; }; @@ -28,9 +28,9 @@ buildPythonPackage rec { rm setup.cfg ''; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ jinja2 ]; + dependencies = [ jinja2 ]; nativeCheckInputs = [ pytestCheckHook From 0bdfea059353c99a913f478d43faff10e6088afb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Feb 2025 20:23:40 +0100 Subject: [PATCH 34/43] python313Packages.branca: disable failing tests --- pkgs/development/python-modules/branca/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 56cc4b068a88..af8da029044f 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { disabledTestPaths = [ # Some tests require a browser "tests/test_utilities.py" + "tests/test_iframe.py" ]; disabledTests = [ From f654797d01431e6aa6df6074a9723c8a7ba85f42 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 1 Feb 2025 20:30:00 +0100 Subject: [PATCH 35/43] python313Packages.folium: disable failing tests --- pkgs/development/python-modules/folium/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 51f958e78f21..5a45f37e4100 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -16,7 +16,6 @@ selenium, setuptools, setuptools-scm, - wheel, xyzservices, }: @@ -34,13 +33,12 @@ buildPythonPackage rec { hash = "sha256-qTTJK12nHIhcMkPu4rb2IYWm96EjRafftacrlfeGqZg="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ + dependencies = [ branca jinja2 numpy @@ -55,7 +53,6 @@ buildPythonPackage rec { pandas pillow pytestCheckHook - selenium ]; disabledTests = [ @@ -71,6 +68,11 @@ buildPythonPackage rec { "test_timedynamic_geo_json" ]; + disabledTestPaths = [ + # Import issue with selenium.webdriver.common.fedcm + "tests/selenium" + ]; + pythonImportsCheck = [ "folium" ]; meta = { From 277e7814853e3ad5020d0f5f8323c83c4216fffa Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 1 Feb 2025 15:50:44 +0100 Subject: [PATCH 36/43] privatebin: refactor --- pkgs/by-name/pr/privatebin/package.nix | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix index 4f71ef5cf813..c8efe2675dd8 100644 --- a/pkgs/by-name/pr/privatebin/package.nix +++ b/pkgs/by-name/pr/privatebin/package.nix @@ -3,11 +3,13 @@ stdenvNoCC, fetchFromGitHub, nixosTests, + nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "privatebin"; version = "1.7.5"; + src = fetchFromGitHub { owner = "PrivateBin"; repo = "PrivateBin"; @@ -22,13 +24,28 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = nixosTests.privatebin; + passthru = { + tests = nixosTests.privatebin; + updateScript = nix-update-script { }; + }; meta = { changelog = "https://github.com/PrivateBin/PrivateBin/releases/tag/${finalAttrs.version}"; - description = "Minimalist, open source online pastebin where the server has zero knowledge of pasted data."; + description = "Minimalist, open source online pastebin where the server has zero knowledge of pasted data"; homepage = "https://privatebin.info"; - license = lib.licenses.gpl2; - maintainers = [ lib.maintainers.savyajha ]; + license = with lib.licenses; [ + # privatebin + zlib + # dependencies, see https://github.com/PrivateBin/PrivateBin/blob/master/LICENSE.md + gpl2Only + bsd3 + mit + asl20 + cc-by-40 + ]; + maintainers = with lib.maintainers; [ + savyajha + defelo + ]; }; }) From eaebf07e03290d6a25ce30cf1ac541d451139b4a Mon Sep 17 00:00:00 2001 From: Defelo Date: Sat, 1 Feb 2025 15:54:26 +0100 Subject: [PATCH 37/43] privatebin: 1.7.5 -> 1.7.6 --- pkgs/by-name/pr/privatebin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix index c8efe2675dd8..1c9f228d0376 100644 --- a/pkgs/by-name/pr/privatebin/package.nix +++ b/pkgs/by-name/pr/privatebin/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "privatebin"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "PrivateBin"; repo = "PrivateBin"; tag = finalAttrs.version; - hash = "sha256-LdTteUED/pq4Z4IOBttLPm3K9gx1xVqP24QQ48uvuyI="; + hash = "sha256-tKzuPpll1GOMlaIDfs5udXrHcTko6jmWJq4dPuPYy6Y="; }; installPhase = '' From 51f5f0d517c1d1040f11be6b829ac0825d178bc7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 19:52:09 +0000 Subject: [PATCH 38/43] rsop: 0.5.0 -> 0.6.0 --- pkgs/by-name/rs/rsop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix index 8138b111ef5a..db3a5f044ee5 100644 --- a/pkgs/by-name/rs/rsop/package.nix +++ b/pkgs/by-name/rs/rsop/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "rsop"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "heiko"; repo = "rsop"; rev = "rsop/v${version}"; - hash = "sha256-Jh2SrIyMduODr3e3War0jCwHH6UwfU8764txzrImCaA="; + hash = "sha256-IYL4xeP8Hd7atMPTgmgijg9jeKAfnHlqZrLGL5eCQO4="; }; - cargoHash = "sha256-OUJXQr3pQGCao0Ra5o9eZF0Jhp818/u5Pm1KJIoJV5w="; + cargoHash = "sha256-rWk9yy4l+Ps3PSiVDymzul6Cy7MeNO9pfDCGIFFEHmc="; nativeBuildInputs = [ pkg-config ]; From 0d9aa56bafbc82133571199f44928d733ae85091 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 31 Jan 2025 10:01:00 +0100 Subject: [PATCH 39/43] python312Packages.dunamai: 1.22.0 -> 1.23.0 Diff: https://github.com/mtkennerly/dunamai/compare/refs/tags/v1.22.0...v1.23.0 Changelog: https://github.com/mtkennerly/dunamai/blob/v1.23.0/CHANGELOG.md --- .../python-modules/dunamai/default.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/dunamai/default.nix b/pkgs/development/python-modules/dunamai/default.nix index 24e765cfb35b..105302ca0d3a 100644 --- a/pkgs/development/python-modules/dunamai/default.nix +++ b/pkgs/development/python-modules/dunamai/default.nix @@ -1,45 +1,47 @@ { lib, - poetry-core, buildPythonPackage, fetchFromGitHub, - pythonOlder, - importlib-metadata, + + # build-system + poetry-core, + + # dependencies packaging, + + # tests + addBinToPathHook, + gitMinimal, pytestCheckHook, - git, + writableTmpDirAsHomeHook, }: buildPythonPackage rec { pname = "dunamai"; - version = "1.22.0"; + version = "1.23.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "mtkennerly"; repo = "dunamai"; tag = "v${version}"; - hash = "sha256-oOchPGBRHf3PT1Ynci56CF/eW4TkRVPV9inVNX2QQrk="; + hash = "sha256-JuW/VL8kfzz5mSXRHtrg/hHykgcewaQYfDuO2PALbWc="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + dependencies = [ packaging ]; - # needs to be able to run dunami from PATH preCheck = '' - export PATH=$PATH:$out/bin - export HOME=$(mktemp -d) - git config --global user.email "nobody@example.com" git config --global user.name "Nobody" ''; nativeCheckInputs = [ - git + addBinToPathHook + gitMinimal pytestCheckHook + writableTmpDirAsHomeHook ]; disabledTests = [ @@ -49,12 +51,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "dunamai" ]; - meta = with lib; { + meta = { description = "Dynamic version generation"; mainProgram = "dunamai"; homepage = "https://github.com/mtkennerly/dunamai"; changelog = "https://github.com/mtkennerly/dunamai/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ jmgilman ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jmgilman ]; }; } From d1a4262abb790e97eb56f59290207ef974440b3e Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 30 Jan 2025 17:19:21 +0100 Subject: [PATCH 40/43] python312Packages.uv-dynamic-versioning: init at 0.4.0 --- .../uv-dynamic-versioning/default.nix | 71 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/python-modules/uv-dynamic-versioning/default.nix diff --git a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix new file mode 100644 index 000000000000..742b2891f45b --- /dev/null +++ b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix @@ -0,0 +1,71 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + dunamai, + eval-type-backport, + pydantic, + returns, + tomlkit, + + # tests + gitpython, + pytestCheckHook, + writableTmpDirAsHomeHook, +}: + +buildPythonPackage rec { + pname = "uv-dynamic-versioning"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ninoseki"; + repo = "uv-dynamic-versioning"; + tag = "v${version}"; + # Tests perform mock operations on the local repo + leaveDotGit = true; + hash = "sha256-5pc05yazeHyQvmNk0uy6XkLrmX4ZQF6Lj7fDDtVcpu4="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + dunamai + eval-type-backport + hatchling + pydantic + returns + tomlkit + ]; + + pythonImportsCheck = [ + "uv_dynamic_versioning" + ]; + + preCheck = '' + git config --global user.email "nobody@example.com" + git config --global user.name "Nobody" + ''; + + nativeCheckInputs = [ + gitpython + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + meta = { + description = "Dynamic versioning based on VCS tags for uv/hatch project"; + homepage = "https://github.com/ninoseki/uv-dynamic-versioning"; + changelog = "https://github.com/ninoseki/uv-dynamic-versioning/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a51a956972de..829f8b8e475d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17776,6 +17776,8 @@ self: super: with self; { uv = callPackage ../development/python-modules/uv { }; + uv-dynamic-versioning = callPackage ../development/python-modules/uv-dynamic-versioning { }; + uvcclient = callPackage ../development/python-modules/uvcclient { }; uvicorn = callPackage ../development/python-modules/uvicorn { }; From 295b03780caa349d63389568727c1a0c4c43d45c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 1 Feb 2025 20:56:50 +0100 Subject: [PATCH 41/43] python312Packages.rns: cleanup --- .../python-modules/rns/default.nix | 39 +++++++++++-------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 82e72af1446c..89dccd77fdb8 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -1,15 +1,21 @@ { lib, - bleak, buildPythonPackage, - cryptography, - esptool, fetchFromGitHub, + replaceVars, + esptool, + + # build-system + setuptools, + + # dependencies + bleak, + cryptography, netifaces, pyserial, - pythonOlder, - replaceVars, - setuptools, + + # tests + versionCheckHook, }: buildPythonPackage rec { @@ -17,8 +23,6 @@ buildPythonPackage rec { version = "0.9.1"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "markqvist"; repo = "Reticulum"; @@ -41,17 +45,20 @@ buildPythonPackage rec { pyserial ]; - # Module has no tests - doCheck = false; - pythonImportsCheck = [ "RNS" ]; - meta = with lib; { + nativeCheckInputs = [ + versionCheckHook + ]; + versionCheckProgram = "${placeholder "out"}/bin/rncp"; + versionCheckProgramArg = [ "--version" ]; + + meta = { description = "Cryptography-based networking stack for wide-area networks"; - homepage = "https://github.com/markqvist/Reticulum"; - changelog = "https://github.com/markqvist/Reticulum/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ + homepage = "https://reticulum.network"; + changelog = "https://github.com/markqvist/Reticulum/blob/${version}/Changelog.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab qbit ]; From 2bcf5954c2409064f15764fe4b8342883fe3e26f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 31 Jan 2025 23:14:37 +0100 Subject: [PATCH 42/43] rns: init at 0.9.1 --- pkgs/by-name/rn/rns/package.nix | 1 + 1 file changed, 1 insertion(+) create mode 100644 pkgs/by-name/rn/rns/package.nix diff --git a/pkgs/by-name/rn/rns/package.nix b/pkgs/by-name/rn/rns/package.nix new file mode 100644 index 000000000000..2392ffa84691 --- /dev/null +++ b/pkgs/by-name/rn/rns/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication rns From c67ddc5c74755983a6c0db51f318a0826e51cb81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Feb 2025 20:18:44 +0000 Subject: [PATCH 43/43] hyprls: 0.4.1 -> 0.5.0 --- pkgs/by-name/hy/hyprls/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix index 028448549742..05b7c0471d10 100644 --- a/pkgs/by-name/hy/hyprls/package.nix +++ b/pkgs/by-name/hy/hyprls/package.nix @@ -6,13 +6,13 @@ }: buildGoModule rec { pname = "hyprls"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprls"; rev = "v${version}"; - hash = "sha256-PW1AXt8swS86Ucxad8R4exKOJ0Kww23Q1UKBmsKlsc8="; + hash = "sha256-uMBy+R7PUBreRyOTMa0wPOiO8VSyLaRFzoIKYU6niU8="; }; vendorHash = "sha256-rG+oGJOABA9ee5nIpC5/U0mMsPhwvVtQvJBlQWfxi5Y=";