From 2c034c521677cf9429661f2565f58bda20f4ad50 Mon Sep 17 00:00:00 2001 From: detroyejr Date: Thu, 21 Nov 2024 21:03:19 -0500 Subject: [PATCH 01/47] haskellPackages.pandoc-cli_3_5: fix build --- .../haskell-modules/configuration-common.nix | 18 ++++++++++++++++++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 12 ++++++++++++ 3 files changed, 31 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bd174babd549..7b2f901b7e19 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1943,6 +1943,24 @@ self: super: { ) ]; + # Pandoc 3.5 improves the quality of PDF rendering in Quarto >=1.6.30. + # https://github.com/NixOS/nixpkgs/pull/349683 + pandoc-cli_3_5 = super.pandoc-cli_3_5.overrideScope ( + self: super: { + doclayout = self.doclayout_0_5; + hslua-module-doclayout = self.hslua-module-doclayout_1_2_0; + lpeg = self.lpeg_1_1_0; + pandoc = self.pandoc_3_5; + pandoc-lua-engine = self.pandoc-lua-engine_0_3_3; + pandoc-server = self.pandoc-server_0_1_0_9; + texmath = self.texmath_0_12_8_11; + tls = self.tls_2_0_6; + toml-parser = self.toml-parser_2_0_1_0; + typst = self.typst_0_6; + typst-symbols = self.typst-symbols_0_1_6; + } + ); + # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index b1dc2492f8b9..203c57c1fa65 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -109,6 +109,7 @@ extra-packages: - tls < 2.1.0 # 2024-07-19: requested by darcs == 2.18.3 - extensions == 0.1.0.2 # 2024-10-20: for GHC 9.10/Cabal 3.12 - network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.* + - typst-symbols >=0.1.6 && <0.1.7 # 2024-11-20: for pandoc 3.5 and quarto package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d51851b2c471..309fad3bdac7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -319329,6 +319329,18 @@ self: { license = lib.licenses.mit; }) {}; + "typst-symbols_0_1_6" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "typst-symbols"; + version = "0.1.6"; + sha256 = "17a2grflk67vs68b2pxygvk7p50rj9fb3ri7fcwa19j9jnhg4zwl"; + libraryHaskellDepends = [ base text ]; + description = "Symbol and emoji lookup for typst language"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "typst-symbols_0_1_7" = callPackage ({ mkDerivation, base, text }: mkDerivation { From 5c913007c6234133035e64048cbdf42764b5f723 Mon Sep 17 00:00:00 2001 From: detroyejr Date: Thu, 21 Nov 2024 21:05:06 -0500 Subject: [PATCH 02/47] pandoc: add version 3.5 --- pkgs/by-name/pa/pandoc/package.nix | 23 ++++++++++++++++------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pa/pandoc/package.nix b/pkgs/by-name/pa/pandoc/package.nix index 9d0c511f6479..341edadd2617 100644 --- a/pkgs/by-name/pa/pandoc/package.nix +++ b/pkgs/by-name/pa/pandoc/package.nix @@ -1,13 +1,22 @@ -{ stdenv, lib, haskellPackages, haskell, removeReferencesTo, installShellFiles }: +{ + stdenv, + lib, + haskellPackages, + haskell, + removeReferencesTo, + installShellFiles, + selectPandocCLI ? (p: p.pandoc-cli), # The version of pandoc-cli choosen from haskellPackages. +}: let # Since pandoc 3.0 the pandoc binary resides in the pandoc-cli package. - static = haskell.lib.compose.justStaticExecutables haskellPackages.pandoc-cli; + static = haskell.lib.compose.justStaticExecutables pandoc-cli; + pandoc-cli = selectPandocCLI haskellPackages; in (haskell.lib.compose.overrideCabal (drv: { configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; - buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; + buildDepends = drv.buildDepends or [] ++ [pandoc-cli.scope.file-embed]; buildTools = (drv.buildTools or []) ++ [ removeReferencesTo installShellFiles @@ -22,13 +31,13 @@ in # For details see: https://github.com/NixOS/nixpkgs/issues/34376 postInstall = drv.postInstall or "" + '' remove-references-to \ - -t ${haskellPackages.pandoc-types} \ + -t ${pandoc-cli.scope.pandoc-types} \ $out/bin/pandoc remove-references-to \ - -t ${haskellPackages.warp} \ + -t ${pandoc-cli.scope.warp} \ $out/bin/pandoc remove-references-to \ - -t ${haskellPackages.pandoc} \ + -t ${pandoc-cli.scope.pandoc} \ $out/bin/pandoc '' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) '' mkdir -p $out/share/bash-completion/completions @@ -44,5 +53,5 @@ in # lead to a transitive runtime dependency on the whole GHC distribution. # This should ideally be fixed in haskellPackages (or even Cabal), # but a minimal pandoc is important enough to patch it manually. - disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.warp haskellPackages.pandoc ]; + disallowedReferences = [ pandoc-cli.scope.pandoc-types pandoc-cli.scope.warp pandoc-cli.scope.pandoc ]; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ce2bde8f8cd..fb59e3c60a8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4850,6 +4850,8 @@ with pkgs; pakcs = callPackage ../development/compilers/pakcs { }; + pandoc_3_5 = callPackage ../by-name/pa/pandoc/package.nix { selectPandocCLI = (p: p.pandoc-cli_3_5); }; + paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { }; parallel = callPackage ../tools/misc/parallel { }; From 093558f82bdebddb4fa145a19fa6f3c56f1187d8 Mon Sep 17 00:00:00 2001 From: detroyejr Date: Thu, 21 Nov 2024 21:05:11 -0500 Subject: [PATCH 03/47] quarto: use pandoc 3.5 --- pkgs/development/libraries/quarto/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index acdb76cc52b2..4585f8dbcacd 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, pandoc +, pandoc_3_5 , typst , esbuild , deno @@ -16,7 +16,6 @@ , extraPythonPackages ? ps: [] , sysctl }: - stdenv.mkDerivation (final: { pname = "quarto"; version = "1.6.33"; @@ -39,7 +38,7 @@ stdenv.mkDerivation (final: { preFixup = '' wrapProgram $out/bin/quarto \ --prefix QUARTO_DENO : ${lib.getExe deno} \ - --prefix QUARTO_PANDOC : ${lib.getExe pandoc} \ + --prefix QUARTO_PANDOC : ${lib.getExe pandoc_3_5} \ --prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \ --prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} \ --prefix QUARTO_TYPST : ${lib.getExe typst} \ From 45691701c3810953020ce2df2de8db03f726b6d3 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Sat, 7 Dec 2024 04:46:39 +0000 Subject: [PATCH 04/47] pam: Use freebsd.pam on FreeBSD FreeBSD pam is based on openpam, but is not exactly the same. Use FreeBSD pam for better compatibility with existing FreeBSD configurations and code. --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eab95fa0321c..538c9c7da089 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12572,7 +12572,13 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - pam = if stdenv.hostPlatform.isLinux then linux-pam else openpam; + pam = + if stdenv.hostPlatform.isLinux then + linux-pam + else if stdenv.hostPlatform.isFreeBSD then + freebsd.libpam + else + openpam; # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader ) From 8d180bf83cdb67549e5b5fdb911d3ad5fbb87a3b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 05:19:43 +0000 Subject: [PATCH 05/47] opentelemetry-collector-builder: 0.114.0 -> 0.115.0 --- pkgs/tools/misc/opentelemetry-collector/builder.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/builder.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix index 1a9eb128bcf7..53b9cf658a38 100644 --- a/pkgs/tools/misc/opentelemetry-collector/builder.nix +++ b/pkgs/tools/misc/opentelemetry-collector/builder.nix @@ -7,17 +7,17 @@ buildGoModule rec { pname = "ocb"; # Also update `pkgs/tools/misc/opentelemetry-collector/releases.nix` # whenever that version changes. - version = "0.114.0"; + version = "0.115.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-zy+TWjh7janUhpxO9fOC8C9vz/tI0mbAyEsCo9zZ1j4="; + hash = "sha256-wl0ThYbDTVLuN9FkrsHF1prydrPMIaiK/9s2Ipeqfik="; }; sourceRoot = "${src.name}/cmd/builder"; - vendorHash = "sha256-dLNs9Vgn6f10hl5XuPzzE4eFNfvELWSKGsd7FbSiHkU="; + vendorHash = "sha256-8g/92NOCj/mH1szrKR04R+Yy9GBYNnQFMi9KhqGKelU="; CGO_ENABLED = 0; ldflags = [ From a241ed9843047244b11e1e0d6bab013961801c8a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 8 Dec 2024 12:15:39 +0100 Subject: [PATCH 06/47] vmware-workstation: fix fhsenv version --- pkgs/by-name/vm/vmware-workstation/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/vm/vmware-workstation/package.nix b/pkgs/by-name/vm/vmware-workstation/package.nix index 4aad879e7da0..49b634cee033 100644 --- a/pkgs/by-name/vm/vmware-workstation/package.nix +++ b/pkgs/by-name/vm/vmware-workstation/package.nix @@ -47,7 +47,8 @@ let }; vmware-unpack-env = buildFHSEnv rec { - name = "vmware-unpack-env"; + pname = "vmware-unpack-env"; + inherit version; targetPkgs = pkgs: [ zlib ]; }; From 75d31ebf553c72601082cfc00749612c177961e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Dec 2024 21:53:30 +0000 Subject: [PATCH 07/47] automatic-timezoned: 2.0.38 -> 2.0.40 --- pkgs/by-name/au/automatic-timezoned/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 756921022c6f..161fadd40811 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.38"; + version = "2.0.40"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yGDMH0MmC+jihbKfKwQ/CEflBo+/q/OPzsi+CiiRqfE="; + sha256 = "sha256-q7WEG5Y8YpRUwNgp+SLi2eV9Z/Ork6+QZmPqxpUf60I="; }; - cargoHash = "sha256-qUAst/goPhpJO26RLUPw6+q/FYHuGXaiFADOHIYmGZ8="; + cargoHash = "sha256-DJAQqPRcscYdrMYP0L09T6TtmDh3wuS89cWCvscyAak="; meta = with lib; { description = "Automatically update system timezone based on location"; From cd5f63c597b65688b5206d60e16a49da1f6214c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Dec 2024 16:05:50 -0800 Subject: [PATCH 08/47] python312Packages.dparse: 0.6.3 -> 0.6.4 Changelog: https://github.com/pyupio/dparse/blob/0.6.4/HISTORY.rst --- .../python-modules/dparse/default.nix | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/dparse/default.nix b/pkgs/development/python-modules/dparse/default.nix index cbe4b8518763..2229a094ec2a 100644 --- a/pkgs/development/python-modules/dparse/default.nix +++ b/pkgs/development/python-modules/dparse/default.nix @@ -2,9 +2,8 @@ lib, buildPythonPackage, pythonOlder, - fetchPypi, - fetchpatch2, - setuptools, + fetchFromGitHub, + hatchling, packaging, tomli, pyyaml, @@ -13,27 +12,21 @@ buildPythonPackage rec { pname = "dparse"; - version = "0.6.3"; + version = "0.6.4"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; - src = fetchPypi { - inherit pname version; - hash = "sha256-J7uLS8rv7DmXaXuj9uBrJEcgC6JzwLCFw9ASoEVxtSg="; + src = fetchFromGitHub { + owner = "pyupio"; + repo = "dparse"; + tag = version; + hash = "sha256-LnsmJtWLjV3xoSjacfR9sUwPlOjQTRBWirJVtIJSE8A="; }; - patches = [ - (fetchpatch2 { - name = "fix-configparser-deprecation-warning.patch"; - url = "https://github.com/pyupio/dparse/pull/69.patch"; - hash = "sha256-RolD6xDJpI8/UHgAdcsXoyxOGLok7AogLMOTl1ZPKvw="; - }) - ]; + build-system = [ hatchling ]; - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + dependencies = [ packaging ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; optional-dependencies = { # FIXME pipenv = [ pipenv ]; From 9b5895bdc95ed886e2047618b175e11c3c506b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Dec 2024 15:59:01 -0800 Subject: [PATCH 09/47] python312Packages.safety-schemas: 0.0.5 -> 0.0.10 --- pkgs/development/python-modules/safety-schemas/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/safety-schemas/default.nix b/pkgs/development/python-modules/safety-schemas/default.nix index 40e22736088d..6c1c42086b02 100644 --- a/pkgs/development/python-modules/safety-schemas/default.nix +++ b/pkgs/development/python-modules/safety-schemas/default.nix @@ -12,19 +12,17 @@ buildPythonPackage rec { pname = "safety-schemas"; - version = "0.0.5"; + version = "0.0.10"; pyproject = true; src = fetchPypi { pname = "safety_schemas"; inherit version; - hash = "sha256-DeX8mlPUQjZEqM6aF6LkdHFKon5X81BhRulaQXEP8QQ="; + hash = "sha256-Xsg7sZ4XADdI0qSxHkPh8rRHHJQ0Mp6aDYDRBplmuWw="; }; build-system = [ hatchling ]; - pythonRelaxDeps = [ "dparse" ]; - dependencies = [ dparse packaging From 3e973ae2ebc7bc05e23ba36e7324b5fe2c70abbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 Dec 2024 15:59:10 -0800 Subject: [PATCH 10/47] python312Packages.safety: 3.2.9 -> 3.2.11 Diff: https://github.com/pyupio/safety/compare/refs/tags/3.2.9...3.2.11 Changelog: https://github.com/pyupio/safety/blob/3.2.11/CHANGELOG.md --- pkgs/development/python-modules/safety/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix index 911ddc0d8936..84e7ea123084 100644 --- a/pkgs/development/python-modules/safety/default.nix +++ b/pkgs/development/python-modules/safety/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "safety"; - version = "3.2.9"; + version = "3.2.11"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "pyupio"; repo = "safety"; rev = "refs/tags/${version}"; - hash = "sha256-etA/S/i87w4ihsqQo5JJjt6hWC7Jt9/q8vhqyo+DTek="; + hash = "sha256-ekJ0o+KWS8Fih1M/scboGEjETX0/2Uh6h/zne4h+3wI="; }; postPatch = '' @@ -54,7 +54,6 @@ buildPythonPackage rec { build-system = [ setuptools ]; pythonRelaxDeps = [ - "dparse" "filelock" ]; From 81a0c13d148df17e3a23c93959a94189e3bbb523 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Dec 2024 03:23:19 +0000 Subject: [PATCH 11/47] ngtcp2: 1.8.1 -> 1.9.1 --- pkgs/development/libraries/ngtcp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix index 932728355d09..de21cf11fee2 100644 --- a/pkgs/development/libraries/ngtcp2/default.nix +++ b/pkgs/development/libraries/ngtcp2/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.8.1"; + version = "1.9.1"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - hash = "sha256-wNHaoZ6N9sJhsjlZEQ4iRHA3wvVxQE4cg8W2XeRx0LQ="; + hash = "sha256-NdqmmYAqCYCm1QAqf8K22HdMd0zO3zYds2cEbJutwPA="; fetchSubmodules = true; }; From de30f0aaefd1036e7313dd189390907403907a91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Dec 2024 08:52:48 +0000 Subject: [PATCH 12/47] cava: 0.10.2 -> 0.10.3 --- pkgs/by-name/ca/cava/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/cava/package.nix b/pkgs/by-name/ca/cava/package.nix index 7f09e13c9d17..c0a88df49de8 100644 --- a/pkgs/by-name/ca/cava/package.nix +++ b/pkgs/by-name/ca/cava/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "cava"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "karlstav"; repo = "cava"; rev = version; - hash = "sha256-y6RslsU/zmr0Ai/rnr73N3OtjuBcWa3JCwh9P5GkNss="; + hash = "sha256-qpQ1WFWqq4FzeN0Yy8ke3mOYtGXmK998yZAy9OTBGq4="; }; buildInputs = From a4803b6c4426a97d87155edd52f13006b67c9db0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Dec 2024 12:38:09 +0000 Subject: [PATCH 13/47] imgpkg: 0.43.1 -> 0.44.0 --- pkgs/by-name/im/imgpkg/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/imgpkg/package.nix b/pkgs/by-name/im/imgpkg/package.nix index 66b32695c212..f20a5e211bb8 100644 --- a/pkgs/by-name/im/imgpkg/package.nix +++ b/pkgs/by-name/im/imgpkg/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "imgpkg"; - version = "0.43.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "imgpkg"; rev = "v${version}"; - hash = "sha256-RjTVJjuzjNTZrg1VZ4NrDf1SZmS+CGzofYTBQEZNIag="; + hash = "sha256-M8OUeB2aigwlvGznByVEsDZnSQb0ggqQA73lXFwbY2c="; }; vendorHash = null; From 6b41e525a1ee6d9f3b32bd9ddd39d138a9202623 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Mon, 9 Dec 2024 17:34:58 +0200 Subject: [PATCH 14/47] mactracker: init at 7.13 --- pkgs/by-name/ma/mactracker/package.nix | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/ma/mactracker/package.nix diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix new file mode 100644 index 000000000000..faf8d004e70a --- /dev/null +++ b/pkgs/by-name/ma/mactracker/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenvNoCC, + fetchurl, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "mactracker"; + version = "7.13"; + + src = fetchurl { + url = "https://mactracker.ca/downloads/Mactracker_${finalAttrs.version}.zip"; + hash = "sha256-GbaGhYF9Pf3EpzoLQd9fkWYxHFwCkYdlRyy33lieUxM="; + }; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + sourceRoot = "Mactracker.app"; + + installPhase = '' + runHook preInstall + mkdir -p $out/Applications + unzip -d $out/Applications $src -x '__MACOSX/*' + runHook postInstall + ''; + + meta = { + description = "Mactracker provides detailed information on every Apple Macintosh, iPod, iPhone, iPad, and Apple Watch ever made"; + homepage = "https://mactracker.ca"; + changelog = "https://mactracker.ca/releasenotes-mac.html"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ DimitarNestorov ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + ]; + }; +}) From af67084ffee9cdf063596d25386033fbb59f9c34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Dec 2024 17:22:20 +0000 Subject: [PATCH 15/47] cynthion: 0.1.7 -> 0.1.8 --- pkgs/development/python-modules/cynthion/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cynthion/default.nix b/pkgs/development/python-modules/cynthion/default.nix index a3a4d9dde001..53df6a47a08d 100644 --- a/pkgs/development/python-modules/cynthion/default.nix +++ b/pkgs/development/python-modules/cynthion/default.nix @@ -28,15 +28,15 @@ }: buildPythonPackage rec { pname = "cynthion"; - version = "0.1.7"; + version = "0.1.8"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "cynthion"; - rev = "refs/tags/${version}"; - hash = "sha256-2nVfODAg4t5hoSKUEP4IN23R+JGe3lw/rpfjW/UIsYw="; + tag = version; + hash = "sha256-twkCv47Goob2cO7FeHegvab3asf8fqbY9qg97Vw4ZCo="; }; sourceRoot = "${src.name}/cynthion/python"; From bb50811bd3671ced2f33d2ed508915134d8a1b2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Dec 2024 20:16:49 +0000 Subject: [PATCH 16/47] gollama: 1.27.19 -> 1.28.0 --- pkgs/by-name/go/gollama/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix index 6c7ffa66eea2..e9e810f48e39 100644 --- a/pkgs/by-name/go/gollama/package.nix +++ b/pkgs/by-name/go/gollama/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gollama"; - version = "1.27.19"; + version = "1.28.0"; src = fetchFromGitHub { owner = "sammcj"; repo = "gollama"; rev = "refs/tags/v${version}"; - hash = "sha256-W+69Jt0mdwLIBHZ8zg3oK8d2DwwvYHtHj1oQUW3vt6M="; + hash = "sha256-nQrd0gpl6fjJ5wzDvDGpI01h7jeGEyB6uuObgoz7Uo8="; }; - vendorHash = "sha256-SYu2ITSZIVtDczBfWJ5pFw4l0mkb3b7YvMzIrEcpOa8="; + vendorHash = "sha256-vIqDYtdz799qm3vp8w293OLx1IoLNr5YjyNqYcvOkI0="; doCheck = false; From 038eb3d12b450f8b1616cbfbf12a208f749386aa Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Mon, 9 Dec 2024 21:54:29 +0100 Subject: [PATCH 17/47] tmuxPlugins.session-wizard: 1.3.1 -> 1.4.0 --- pkgs/misc/tmux-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 0a2aaa457931..2962b4d8df19 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -601,12 +601,12 @@ in rec { session-wizard = mkTmuxPlugin rec { pluginName = "session-wizard"; rtpFilePath = "session-wizard.tmux"; - version = "1.3.1"; + version = "1.4.0"; src = pkgs.fetchFromGitHub { owner = "27medkamal"; repo = "tmux-session-wizard"; rev = "V${version}"; - sha256 = "sha256-nJaC5aX+cR/+ks3I/lW/tUnVG0CrEYfsIjPDisgMrTE="; + sha256 = "sha256-mLpZQSo8nildawsPxGwkcETNwlRq6O1pfy/VusMNMaw="; }; meta = with lib; { homepage = "https://github.com/27medkamal/tmux-session-wizard"; From 15a83f8b26aed51a1f5ada5aef1efd8c4d792d3a Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Mon, 25 Nov 2024 07:23:15 +0000 Subject: [PATCH 18/47] freeplane: 1.11.14 -> 1.12.8 Changelog: https://github.com/freeplane/freeplane/blob/1.12.x/freeplane/doc/history_en.txt --- pkgs/by-name/fr/freeplane/deps.json | 1015 ++++++++++++++----------- pkgs/by-name/fr/freeplane/package.nix | 4 +- 2 files changed, 569 insertions(+), 450 deletions(-) diff --git a/pkgs/by-name/fr/freeplane/deps.json b/pkgs/by-name/fr/freeplane/deps.json index 335fa1d7f9f9..8026804546ce 100644 --- a/pkgs/by-name/fr/freeplane/deps.json +++ b/pkgs/by-name/fr/freeplane/deps.json @@ -2,22 +2,22 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://josm.openstreetmap.de": { - "nexus/content/groups/public/org/openstreetmap/jmapviewer#jmapviewer/2.18": { - "jar": "sha256-JYRmXTPOzesPfwRqrFpGtqzIfnVI9gsNzKVIIIVabuI=", - "pom": "sha256-PDVcm62fnI9tznvzKoeoQgtCXATF5WSj9cQZoDtWP4E=" + "nexus/content/groups/public/org/openstreetmap/jmapviewer#jmapviewer/2.22": { + "jar": "sha256-FVkCaot6iIw2P4VobvE6GysHJggIc2vzT+StZNdgf9c=", + "pom": "sha256-4Ry0w5AOSm6yjISq6f3WsMcYsRvtVx7MNM2/R98LawI=" } }, "https://plugins.gradle.org/m2": { - "com/github/ben-manes#gradle-versions-plugin/0.50.0": { - "jar": "sha256-zFOB8mASAO0kBdROqeqrghVgkEv9yfF/jwA1p3BqT7M=", - "module": "sha256-LayqzQFyrF0lj2rckzmdWwkbwgKduaPWZcTQDk5/a+w=", - "pom": "sha256-IV/1WVj0JCsv9Q65BkCtzrLaUxPcL6jLCgGOmrzXRHE=" + "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/versions#com.github.ben-manes.versions.gradle.plugin/0.50.0": { - "pom": "sha256-yP3sJnGeh1uqwkRdCtWZkUbntLwkF1FLRJlFY/0W9KU=" + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.51.0": { + "pom": "sha256-oy92kCcy9iIN27EhlfozbDMfT2190MRscHcLOu4dR0E=" }, - "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/11.6.0": { - "pom": "sha256-uDd5wYEKi4kQq2+H/Ypgz/rcIZUoEWbEqNKKCChmCF8=" + "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/11.10.0": { + "pom": "sha256-2CtlPq9xjbpM5uYMynsMik4IhQb+DLO+jCoU49cBhwc=" }, "de/jflex#cup-parent/11b": { "pom": "sha256-c4L5m+Pbb+Uh8E1+/XMZ/jlj2nnWXFaOfoofWRLpmHw=" @@ -48,12 +48,8 @@ "jar": "sha256-ml2+P18suRhUyGgsq4AXivpBKrNaWrcYvznOAbNDXZM=", "pom": "sha256-G5+9TzJacembJ5CA1jCE8S2ITUIIGvKY+eVT4f4M10o=" }, - "org/owasp#dependency-check-gradle/9.0.7": { - "jar": "sha256-uIQJZPTObUzGkNKfYD2vd1I0UEFfx0r+cnpOMfvzLMo=", - "pom": "sha256-HVfxVH/PYyQOOLSEUkyTVn7pehbGUz1G/s94ILwnwm8=" - }, - "org/owasp/dependencycheck#org.owasp.dependencycheck.gradle.plugin/9.0.7": { - "pom": "sha256-VZaHG3PXQG4kbgsyu1sfrfeG60wYJjodAoc+gxGHqu0=" + "org/owasp/dependencycheck#org.owasp.dependencycheck.gradle.plugin/9.2.0": { + "pom": "sha256-xnyI3UUHprQVq7gxtUZ7aJfWFW3O7KrBW7AjJUIpHDU=" }, "org/xbib/gradle/plugin/jflex#org.xbib.gradle.plugin.jflex.gradle.plugin/1.2.1": { "pom": "sha256-rdhfPghFWqbgA7rr8sZfkLsJ3vnoE6oH3TGltArns0w=" @@ -102,77 +98,116 @@ "com/fasterxml#oss-parent/56": { "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" }, - "com/fasterxml/jackson#jackson-base/2.16.0": { - "pom": "sha256-+bdHbsN5ihJfFMnaVG+nr4YerZOhmZssDTY7lZLCM24=" + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" }, - "com/fasterxml/jackson#jackson-bom/2.16.0": { - "pom": "sha256-Wqooh0QFvwT7qOLFcVkieCRGG6b31VKr246NOgum+L8=" + "com/fasterxml/jackson#jackson-base/2.16.1": { + "pom": "sha256-jiOFFhGXyf4S3JlltMi1fz0QMhdRIgW1tgudxnW86o0=" + }, + "com/fasterxml/jackson#jackson-base/2.17.2": { + "pom": "sha256-fPnFn70UyQVnRxN7kNcKleh3YN/huCRWufAjF9W1b68=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.1": { + "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" }, "com/fasterxml/jackson#jackson-parent/2.16": { "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" }, - "com/fasterxml/jackson/core#jackson-annotations/2.16.0": { - "jar": "sha256-xLkOoMAHTaF+/cOqI5c1JfJdbzRyVpIWl0j1KVRzNKY=", - "module": "sha256-2muqKZlx1AlmEZSpxtRocUgz60oRJ2xUQ6AwYDRXwHY=", - "pom": "sha256-I9/hBTAQeXluc77ntCRmGlYnIMd5BaxPepf1e3KUdVc=" + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" }, - "com/fasterxml/jackson/core#jackson-core/2.16.0": { - "jar": "sha256-ZuLN5Mx+Vl1fziopmLZOmRd3v5+tTSIHNcUl/Y0Bwxo=", - "module": "sha256-ftx2yi4pRF7yq+ARHF1nQ1yTT4+6rSF1cHNM8lM1LSw=", - "pom": "sha256-lbpouk0OA/SgzOZ7BkHqThDgtESD6drELII97HiWgG0=" + "com/fasterxml/jackson/core#jackson-annotations/2.16.1": { + "jar": "sha256-pHMHceakld03k6Qs24zmvduWx34V9AyY/Y2aeuCecoY=", + "module": "sha256-oBBBBbhXmkrFKxTH+2qLPxPfU9iPT8lCoZrJy/6E9Zo=", + "pom": "sha256-xt/2p4sBSYkppprzZObLeK73LSpFJUuS1klbKhmOwSk=" }, - "com/fasterxml/jackson/core#jackson-databind/2.16.0": { - "jar": "sha256-iq8XU4I75wt5gpDlgmq1v+AV01s6NqXTwuyfV9SwE4s=", - "module": "sha256-OQdNp2wUl4ioe+btq5eNC3WIIgK5J5TCSnpGmfkfc0s=", - "pom": "sha256-Mov1X2G38skAkYaIrdQBOAG6b6rVUnYAvzuiPg3IOP4=" + "com/fasterxml/jackson/core#jackson-annotations/2.17.2": { + "jar": "sha256-hzpgbiNQeWn5u76pOdXhknSoh3XqWhabp+LXlapRVuE=", + "module": "sha256-KMxD6Y54gYA+HoKFIeOKt67S+XejbCVR3ReQ9DDz688=", + "pom": "sha256-Q3gYTWCK3Nu7BKd4vGRmhj8HpFUqcgREZckQQD+ewLs=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.16.0": { - "jar": "sha256-fQpQIn9MvSmL55cYFVNGAL1ib5iHZZuNkcKGxi8XvQs=", - "module": "sha256-TLBgZ7zA2jx/nkzGh2q14GdqReSJb7S6zQqyGl6yiok=", - "pom": "sha256-olvftRudsqWS7lMPQRjgJ7QtdcyR3eQMNL8Juv4jrps=" + "com/fasterxml/jackson/core#jackson-core/2.16.1": { + "jar": "sha256-9fjvkGCeZP7ILrkI5JfcfYGy65g/5Qm4cCkqGTzeTfs=", + "module": "sha256-S6CAt7eaIxoJv7AoTCyURJ7OumQzJlWRwe2CDWBzpuI=", + "pom": "sha256-Hu0WEE2ArswTfEH+FuSj/1q5or+ossScV3L+Sl/S5s4=" }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.0": { - "pom": "sha256-VUFTMByvSyFND21W/AZF1zl2sHkQ4zrsdsv23Dxei20=" + "com/fasterxml/jackson/core#jackson-core/2.17.2": { + "jar": "sha256-choYkkHasFJdnoWOXLYE0+zA7eCB4t531vNPpXeaW0Y=", + "module": "sha256-OCgvt1xzPSOV3TTcC1nsy7Q6p8wxohomFrqqivy38jY=", + "pom": "sha256-F4IeGYjoMnB6tHGvGjBvSl7lATTyLY0nF7WNqFnrNbs=" }, - "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.16.0": { - "jar": "sha256-G1BqzqSGP0I7Z5arbyCbqzzDyeI6q07bZioxeEZlAoc=", - "module": "sha256-z9jtUlThaY0qypKNOreraru6nMq7vIhIKqPcPNhwFaU=", - "pom": "sha256-fx9oGz7+VaJXv0eSoavDqJF2ulY1blY/d0S4cDVnjhQ=" + "com/fasterxml/jackson/core#jackson-databind/2.16.1": { + "jar": "sha256-uvio6+6PRe9ozdXi3Tkjs+KWwJN7luwLSAaqOjG8zR0=", + "module": "sha256-tDy1vynzVFuW6QV0jyU5FpXGIHEwMnxFGT/R3DdI2f8=", + "pom": "sha256-fIprQo6kaI0BIGlWzMr7I6ySj8adcXp2vdd0M0jSjbg=" }, - "com/fasterxml/jackson/module#jackson-module-afterburner/2.16.0": { - "jar": "sha256-AH0J72ftkjmBDPyyxHFmn9aZvs9rVYxLRbozZOoo1Nw=", - "module": "sha256-BTDcUZwucFQiWj30pHrMObU+kwtKlM9OJHb/Me0OTQw=", - "pom": "sha256-mCgdXXlDI2AwLhUdGDG4PzsnCsBmtGX5S1uuJSGTk7k=" + "com/fasterxml/jackson/core#jackson-databind/2.17.2": { + "jar": "sha256-wEmT8zwPhFNCZTeE8U84Nz0AUoDmNZ21+AhwHPrnPAw=", + "module": "sha256-9HC96JRNV9axUMqov1O7mCqZ6x1lkecxr8uXKrPddx8=", + "pom": "sha256-0kUGmLrpC+M48rmfrtppTNRQrbUhJCE+elO0Ehm1QGI=" }, - "com/fasterxml/jackson/module#jackson-module-blackbird/2.16.0": { - "jar": "sha256-Xq9gCvlmWStkCam0Sqexv41JF08c8ooYC90lZSNX8o4=", - "module": "sha256-T799z+Samx1lg9ana9AY5+lAkxn1yS6A8cWqe6pHVHQ=", - "pom": "sha256-ZNjmjo9XmB7t3vjJZytzirf6RfdAlY4gGPrxSkJC4FI=" + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.16.1": { + "jar": "sha256-/Wfg+v42itPfwbVF64/ghKXGRij7ce9wvZSk2rJ67/8=", + "module": "sha256-JLJXlaKpoRm/n8FFmEv1nih/OXOV4BC608uGzCEJNiI=", + "pom": "sha256-8Itmf6NFnqLUzRm3lGlICUPtkyMR2gEeY8IFK7I7G/0=" }, - "com/fasterxml/jackson/module#jackson-modules-base/2.16.0": { - "pom": "sha256-AA3F5X97SXV0GPzRcFTrRtdOFZKpzIFyBmkSyitb5Sc=" + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.2": { + "jar": "sha256-lBvNixOBuzsNcm+rQWJPqOzg7nts8oYK2V6BV85nM3Y=", + "module": "sha256-snbSUVf4i+6mnT9ENGWFZLcfMazeHUsaFPiYS+lTw0M=", + "pom": "sha256-7eVVk8YoXTmdlgc6GQy5v/QlZ5WqjWO5AXcrsxI+SDs=" }, - "com/fasterxml/jackson/module#jackson-modules-java8/2.16.0": { - "pom": "sha256-n+TKeceUAqwcxUpI27ZeJ/uYannL99CvC8Dbx9Z0GLc=" + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.1": { + "pom": "sha256-1DusfWR8CD8XI4P8YinkAOSJY6TuCfTqD2LZAySVvJQ=" }, - "com/formdev#flatlaf/3.2.5": { - "jar": "sha256-v7FM73SLNkdhEV+mdWQJwZ+maKqMNkf6VZDtIG7PaY8=", - "module": "sha256-7nyjpAQHuvbZQKbnkvWJArhaS6OXBgPpp1/Cjt80OWM=", - "pom": "sha256-/juWnGbGpawfWP61nNMBbhvlTR+evAhtClgo1q4dEuE=" + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.2": { + "pom": "sha256-5pgyMzCpqCySDlqJtlsPciXI5zPBIqGPeWoEpuMfpcs=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.16.1": { + "jar": "sha256-YoGXBoKo2j3brFS7IDybrfHCb1B/PsqkjvEDGFebya0=", + "module": "sha256-kUcpUsDym3P6oCNeMXzrabXy+we+thRESrukR2sK+Yw=", + "pom": "sha256-yd4rhj3RPkYjfRhcHmYEmE9uY0cYWeoNot/E6fLwj/E=" + }, + "com/fasterxml/jackson/module#jackson-module-afterburner/2.16.1": { + "jar": "sha256-buo8ZzeKJoWnQtLvEdClrONqXbgQDzfa1jAWzkgbhrY=", + "module": "sha256-nxIY0qLO0zslwCGuAOKYVpOVkwBEAPfuoWXfxrjj32w=", + "pom": "sha256-0qJNBRxMST3WxUtss391H/WW2uG5+fCGCIr4ZIyWLb0=" + }, + "com/fasterxml/jackson/module#jackson-module-blackbird/2.16.1": { + "jar": "sha256-Y01e36Pm9BUH93r6dle/yGdQ/f3+3NtM2zM3WZ9RoGk=", + "module": "sha256-aNmb1R0/b/lUnynndwr1NdzBcHacKeoPC7N/9NaeTds=", + "pom": "sha256-DWQEPSlS6bDy91QMmhJ0rQGCjm3W3OhRVrzKC+6DX9E=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.16.1": { + "pom": "sha256-iv0eHmPCIXlw+WhHArnWX1F7ctlKxmUgFB3j7WgfAtM=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.16.1": { + "pom": "sha256-GIciU1hZ78rlq3XDBi3DLg3ejh6qbBgh9ZBSxCA8RKU=" + }, + "com/formdev#flatlaf/3.5.2": { + "jar": "sha256-XsqInA2lfqAnjEHycJKcc1TkNIy19pVttBevpthqklM=", + "module": "sha256-+wkD6Du4IpR7RR6HldWT740GFzDUm0YXJ/HoXDiuyDI=", + "pom": "sha256-IlmtYZtyWJZJWo4XYWmImhM8ncTUvv4HTau9C3ohBQw=" + }, + "com/formdev#svgSalamander/1.1.4": { + "jar": "sha256-4PGk2RzE9s4I6LRBsbMmuJjiUDZqn0xIk3EoTHhNMhE=", + "pom": "sha256-ndRWBiO6S1ETmg3EnarIjL5dJIzUgrPzoLJfYZutUvk=" }, "com/github/davidmoten#sonatype-parent/0.1": { "pom": "sha256-9Q5Goo6n4j+EMErZ/xsqWJskdSy0R9nq7eb1r4T56s4=" }, - "com/github/javaparser#javaparser-core/3.25.7": { - "jar": "sha256-FZ9eUCTQVI7GPPnSSIrUENZGFkWBVwI17QTu9pJC0tY=", - "pom": "sha256-jdKBeIjre3q8t6ddQnehrdw3hZKEvW3Sia+u5LM817M=" + "com/github/javaparser#javaparser-core/3.26.2": { + "jar": "sha256-Pj4MZdV9Enl9vq098euyjnWDc30M0fKomNum/r1Qq4g=", + "pom": "sha256-8xK6gXB9VttEhsH5rRpuA8Nqmazx4Imhhup0eKcTRLg=" }, - "com/github/javaparser#javaparser-parent/3.25.7": { - "pom": "sha256-zRy2l5P5Klq4hkQnrk26ZsHMLFMP3zkPC0awTLl3UxA=" + "com/github/javaparser#javaparser-parent/3.26.2": { + "pom": "sha256-nsnC41jTpp/cpT1S61iqrCnpC+D1ANEMme0rlbkQUDQ=" }, - "com/github/package-url#packageurl-java/1.4.1": { - "jar": "sha256-jiMoAiGv0eZWHUM9+xMyUs0ocWessOylqZFmcRj/EKI=", - "pom": "sha256-/avfpMfepjVMd/Jb3dGOSO4izUuYFcvsw3ow8lQs0TM=" + "com/github/package-url#packageurl-java/1.5.0": { + "jar": "sha256-5FVRcncHrMDFasYtVpZDMuoPE41sw2VtmIuTaRUPUkc=", + "pom": "sha256-Qv30bFNVvLmqCyQNUqydie5yj4yxOG5DEnWIr5FrPgY=" }, "com/github/robtimus#data-url/2.0.1": { "jar": "sha256-GlsCbIWuXlJQm700u2suLNjBQV2T7MDxJ3qngKIPxX4=", @@ -192,15 +227,15 @@ "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, - "com/google/code/gson#gson-parent/2.10.1": { - "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" }, "com/google/code/gson#gson-parent/2.9.0": { "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" }, - "com/google/code/gson#gson/2.10.1": { - "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", - "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" }, "com/google/code/gson#gson/2.3.1": { "pom": "sha256-gvqiGq/oQRqWwbvSKjDi1jnl9PxHFreWu3Dbw3n3Oec=" @@ -213,9 +248,16 @@ "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=", "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI=" }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, "com/google/errorprone#error_prone_parent/2.21.1": { "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw=" }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, "com/google/guava#failureaccess/1.0.1": { "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" @@ -235,10 +277,6 @@ "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" }, - "com/google/j2objc#j2objc-annotations/2.8": { - "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", - "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" - }, "com/h2database#h2/2.1.214": { "jar": "sha256-1iPNwPYdIYz1SajQnxw5H/kQlhFrIuJHVHX85PvnK9A=", "pom": "sha256-UX4aBXKZSVISML9WJlvaxaI5/bkOrWyqhfDGppzX+AM=" @@ -266,10 +304,10 @@ "jar": "sha256-9UdeY+fonl22IiNImux6Vr0wNUN3IHehfCy1TBnKOiA=", "pom": "sha256-W3YhZzfy2pODlTrMybpY9uc500Rnh5nm1NCCz24da9M=" }, - "com/netflix/nebula#gradle-ospackage-plugin/11.6.0": { - "jar": "sha256-SEeeOJoRhfq7FDXuIds1XR8z3hfpAagSkh3Y6EjJe30=", - "module": "sha256-UgkQbEdEMSsPf59Lnlua5pf8CJ+fiLyUmcHXhURgF60=", - "pom": "sha256-ev9oCcd0Ky5hw31rowuMaHJy3WRp2iKmq4ebp1qzGv8=" + "com/netflix/nebula#gradle-ospackage-plugin/11.10.0": { + "jar": "sha256-k8JksFhk+NuXmhaameS/qthMqjC4KXQ/ZyEDgt/4lhk=", + "module": "sha256-Ef8gYnVWXB04hmPUmjT73DnQ4OWvGiqO32HOtTtSyzA=", + "pom": "sha256-6hztETK2gdIShusXyuLdJHeGBR9mh/EiufxUWFaSUGQ=" }, "com/samskivert#jmustache/1.15": { "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", @@ -310,42 +348,42 @@ "jar": "sha256-IfuiL4MOkmjwfPSrLZnoGBq73LDLke4CKOs8uRjc3R0=", "pom": "sha256-xSpmFtBO+zDJ7eq57oKwWR5NBNOOAwv4HiUHdlUtIV0=" }, - "com/tngtech/archunit#archunit/1.2.1": { - "jar": "sha256-eLPLD4NQmPImSlnnkdiF+AitgNJCXvKY3Cz+0DPGueg=", - "pom": "sha256-GA8sOPoquiEKfyUHxdC1B1FghhfbFK/mvS8iqm/lDbU=" + "com/tngtech/archunit#archunit/1.3.0": { + "jar": "sha256-U2JATLWVsxvZKk0PrvQK3MS9Jz2gyIEavvf8yHnnyyY=", + "pom": "sha256-8xM35B4lX6BfWBsMtjpdmq6E6Udg4Qa5k7FcinF4fQo=" }, - "com/twelvemonkeys#twelvemonkeys/3.10.1": { - "pom": "sha256-k0AY2+dfgNCT9vl1ks+o2DGX70D36r0dfH9mqZ9R5eI=" + "com/twelvemonkeys#twelvemonkeys/3.12.0": { + "pom": "sha256-ttCYdPvd2bslDReBepMe+OCTvBjnQob/BrBAVBmAxzA=" }, - "com/twelvemonkeys/common#common-image/3.10.1": { - "jar": "sha256-lg6bzhQGlNDXuP6VjcmrBPjWJcQo96qem/odfZzUFtE=", - "pom": "sha256-t/zu2VnQ4PFqYdUo91bSHK49WQJnxHFt3b8ia1MKW7s=" + "com/twelvemonkeys/common#common-image/3.12.0": { + "jar": "sha256-YqOCHHJPrf2jRsHi2DsMUGoMQHS+JppSv04xksfdkrw=", + "pom": "sha256-Mvxj0YSlsUAz7Z6uKPTH91cL6IUMZ+80q1DIpb3qlX8=" }, - "com/twelvemonkeys/common#common-io/3.10.1": { - "jar": "sha256-VpH7etJAL4FV6XqXVTDBQ5eQNqvDQ2FknZO5ukHCzgE=", - "pom": "sha256-NuBRBgV8jwzhTiEVVLdloBBMx7RWCeq97nrErXZ2yk8=" + "com/twelvemonkeys/common#common-io/3.12.0": { + "jar": "sha256-v6z+sCrKxH2/0fqwAC6uymVUfQQklJi2VDIMng/fZkc=", + "pom": "sha256-X7G3pgrtAmv+FsK7u0MDlUfe3Q1OYT6AEnuTtKLFY1k=" }, - "com/twelvemonkeys/common#common-lang/3.10.1": { - "jar": "sha256-SdXsz3bfITxZgYlCnH03GmlqCzt3nlBSsPm7H9HtLxE=", - "pom": "sha256-15CiZZFWHhyk0I+N+3dHDZstsWYCK82yH2X60HcvVco=" + "com/twelvemonkeys/common#common-lang/3.12.0": { + "jar": "sha256-XGXlBLW2TYBoPg+nCh3RVN2D1N59o38h6VD1qcA7xm0=", + "pom": "sha256-nFFSKc9KTl73IdpjR/+hm5wCetXeEHmQWUBdf6MtjVI=" }, - "com/twelvemonkeys/common#common/3.10.1": { - "pom": "sha256-TIfgKQ3H+yFkJxkXuGnZ3Y+p4epC/eWfQPgF1Wkli+0=" + "com/twelvemonkeys/common#common/3.12.0": { + "pom": "sha256-2prJlYu3TvpH0EAuhjHAw4djh0qVMDcP9X8HMTLJVv8=" }, - "com/twelvemonkeys/imageio#imageio-core/3.10.1": { - "jar": "sha256-u5kr0a34nuP95oxzOOy6P50P7v6cwfaRaQizUNxiklQ=", - "pom": "sha256-wenZItSAc1DJNh3p3GZl61ImaZuJi5jZBnN5NNfBods=" + "com/twelvemonkeys/imageio#imageio-core/3.12.0": { + "jar": "sha256-NMb5G/OyF+0BFbzoKDI4+9AmRWKqaCtCJqOWDQ7emBU=", + "pom": "sha256-N9att80pHm9n9inza8bpGiV6VFjj7lgf7BJ/aZIYG3g=" }, - "com/twelvemonkeys/imageio#imageio-jpeg/3.10.1": { - "jar": "sha256-lsOMuoAmd3uDB77fcWsOqHlhQPTgWy/R2/UNXCZXK/U=", - "pom": "sha256-c07f2XbCK63LHUPMyh/tTwg+RrV60L0kTZOY8e/+23M=" + "com/twelvemonkeys/imageio#imageio-jpeg/3.12.0": { + "jar": "sha256-/GL1198E0a8n3H5bdOpfk8I7EBMGTd1OdIedcJqdhZ4=", + "pom": "sha256-wvUpr7RBT5ksNy7InUwRucYqluw6jegRgFos1y1kP/4=" }, - "com/twelvemonkeys/imageio#imageio-metadata/3.10.1": { - "jar": "sha256-Tq1OX6/zA/eBvI/vG4b0rv+PmzXRXy+C9g6gdqNk5gI=", - "pom": "sha256-SHHCLjmKuSvHXTBrpXbG76OxRrhnfLv43ATvkx5P8cQ=" + "com/twelvemonkeys/imageio#imageio-metadata/3.12.0": { + "jar": "sha256-eX0Ca2fQfm1esAoatTpVrKq2+Apxxe4yVXIJPrkMDKo=", + "pom": "sha256-kIUqjzz4kZBqjShwC8/EQ/EZd1iEbm7lZR1pHBNCrpw=" }, - "com/twelvemonkeys/imageio#imageio/3.10.1": { - "pom": "sha256-wmu6VU5gjjPJAYJeCJXW/uUfaC3ZBVn3TfpgFKgRSC4=" + "com/twelvemonkeys/imageio#imageio/3.12.0": { + "pom": "sha256-ZI62q9rpluXh0kjqy1Gk3LYD4uwnHK6Mjh8PnLpK+Pk=" }, "com/vaadin/external/google#android-json/0.0.20131108.vaadin1": { "jar": "sha256-37e64vQEz+C3K00jlEaYy3FrdmUXGBKgpND1kmwPrHk=", @@ -355,9 +393,13 @@ "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" }, - "commons-codec#commons-codec/1.16.0": { - "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", - "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + "commons-codec#commons-codec/1.16.1": { + "jar": "sha256-7Ie/tV8iy9GyHiGQ7toosrMS7SpDHuSfvcwBgS0EpeQ=", + "pom": "sha256-uCbd2S+dfMZDcaAvoIMMFU1nyYNw6lSi0ZbnLrWQrSg=" + }, + "commons-codec#commons-codec/1.17.1": { + "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", + "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" }, "commons-collections#commons-collections/3.2.2": { "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", @@ -371,16 +413,13 @@ "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" }, - "commons-io#commons-io/2.15.0": { - "jar": "sha256-oyja1zCSHRl7apsZXf+gDkHJdMLayP436E0xcGvKd5I=", - "pom": "sha256-KX6FthV950vWVQsa9fRpZTWy6nbYBenrIwDPBtzE+5w=" + "commons-io#commons-io/2.16.1": { + "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", + "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" }, - "commons-io#commons-io/2.15.1": { - "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", - "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" - }, - "commons-io#commons-io/2.6": { - "pom": "sha256-DCOGOJOiKR9aev29jRWSOzlIr9h+Vj+jQc3Pbq4zimA=" + "commons-io#commons-io/2.17.0": { + "jar": "sha256-SqTKSPPf0wt4Igt4gdjLk+rECT7JQ2G2vvqUh5mKVQs=", + "pom": "sha256-SEqTn/9TELjLXGuQKcLc8VXT+TuLjWKF8/VrsroJ/Ek=" }, "commons-lang#commons-lang/2.6": { "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", @@ -390,25 +429,25 @@ "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" }, - "commons-logging#commons-logging/1.2": { - "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", - "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + "commons-logging#commons-logging/1.3.0": { + "jar": "sha256-ZtPJgEcLmbDFEdrT38CueyZewfsUTpa8AlOooXX9NNk=", + "pom": "sha256-je/afOtIiP/k1OYyeJVqGjxRS3W4Nj1nFqG9Zv6WLH8=" }, - "commons-validator#commons-validator/1.7": { - "jar": "sha256-TXT0zk+2iyYX7a0Ibfbe/fkzhGfSN30sYuaQOOHE8C8=", - "pom": "sha256-UztBf2dHU/bHn6v7/vlqRj6pw8yj16g/8Ot9dmgpP8k=" + "commons-validator#commons-validator/1.8.0": { + "jar": "sha256-EpLkvZVpNkYaYJawlEAPXCqUYmfC4gMkUSrHUywMbrM=", + "pom": "sha256-rQh4fwxzi1BNdoDgb6acXRp0uWPbmADEjl8jJMH13h8=" }, "de/sciss#syntaxpane/1.3.0": { "jar": "sha256-aBm3LpRQ2u5e9WMeq1pHT2BFJo2MZjugKAzQZHMtsgM=", "pom": "sha256-aNbsZVtGv6PXgOzwYrww3uyoxJTFrptUgJmqMfddj/8=" }, - "info/picocli#picocli/4.7.5": { - "jar": "sha256-6DqQb7mbVwkdHWisEffD0lGL16ganHGyWeLADRVkyOg=", - "pom": "sha256-fk6LD0t8pgdSCyDS8eWN9Pk0ymNsseuoKJz/LylWv9g=" + "info/picocli#picocli/4.7.6": { + "jar": "sha256-7UQRg/MJuT8QTKngceMUpAYqiTGE4Yo8etcuycuhK6A=", + "pom": "sha256-LSJIzM9IetnOII3sdRdF3xXNHhkkpMw9NoQbXxmQxvs=" }, - "io/github/gitbucket#markedj/1.0.18": { - "jar": "sha256-/i87GMhoxSVQOQSywMMOE9JJwrZSLQGivL1xqemnsII=", - "pom": "sha256-bdJVS82u894pg8lI4TGzEk8tfXQr/0js5YZDYL5mfyw=" + "io/github/gitbucket#markedj/1.0.20": { + "jar": "sha256-Z3BPOOp0RFEHaX8AdkPawzNgI7uPsHKlEjtzUb0GlXQ=", + "pom": "sha256-XcuCLmmtpKshjbUaLmFkwTznC+jiO5ktMybBPoundgE=" }, "io/github/jeremylong#jcs3-slf4j/1.0.5": { "jar": "sha256-WyEpqRFdF8n7ZbFD83WrDBX4UCSP1aoPMwfSzGGN8Js=", @@ -416,10 +455,14 @@ "pom": "sha256-tF+wHKhQ/1dB/wIlu0G5zmwAHcvZh6X18ecEG5fh8vk=" }, "io/github/jeremylong#open-vulnerability-clients/5.1.1": { - "jar": "sha256-2BjdCmCabGVGsD9fr/fqAufNiZuYTIlGhkHhPYJoVxE=", "module": "sha256-aWu9vGm8th/wHqwnDyE1qc3QG5j653K6qgoP9NfGM2M=", "pom": "sha256-EFcbV6v8YBe++PYLY6+/sA8hgBhfOrhHslDmlZ1j4mc=" }, + "io/github/jeremylong#open-vulnerability-clients/6.0.1": { + "jar": "sha256-6TA0dSHcEeknJp3qGnHHQ9AJfj/oDTQZVGalkzr9teM=", + "module": "sha256-7y8OnQa6gpU0b3wVMzIPwp2ixArCLs0rZYEaHHjysVU=", + "pom": "sha256-ugtFQ66Bp78kPLRzsw5WVIwQe9NkKqktcW1wtg1mhmE=" + }, "jakarta/transaction#jakarta.transaction-api/1.3.3": { "jar": "sha256-CwKhlN0E7i4ZLcnalXnhCVXdborHB638kdkvEZsOZ6s=", "pom": "sha256-ODgmwQkvt2d/h9VgJWJFsPpbL5SolTAdMh8jad22DFU=" @@ -455,16 +498,16 @@ "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" }, - "net/bytebuddy#byte-buddy-agent/1.14.10": { - "jar": "sha256-Z5k6idR8pY/4aIAqREjd0VDl/k5aVkXe2ZDXtNVXprk=", - "pom": "sha256-U7yX6ca/fC0OX5y6x9Xeaykk2RbPS4F+ajo1kpx5a0o=" + "net/bytebuddy#byte-buddy-agent/1.15.4": { + "jar": "sha256-HXbe/RWaVkuct6lo0N6ic2e4tw6951qWjn7xkhvHXuQ=", + "pom": "sha256-UJEHS07O1v8WbjlDlHRk/0Lac5Y4BC34aDuj6MIJ51U=" }, - "net/bytebuddy#byte-buddy-parent/1.14.10": { - "pom": "sha256-xpghkGD7DlZaDyyWCU6Ssg7+FG/WFjayyeTAO9m6Sns=" + "net/bytebuddy#byte-buddy-parent/1.15.4": { + "pom": "sha256-lwLCIT4/23CHv9M0tjQ80F9EUIqT64+Uqn2mVKwftI8=" }, - "net/bytebuddy#byte-buddy/1.14.10": { - "jar": "sha256-MObgRGQ3pn2zfit/fTP1B4fd/ZcDWTGd/QVGnaoty84=", - "pom": "sha256-zVh4KEX/ju3y7YOgw+30Xu65nhTAWvii6QGGDqCAzq8=" + "net/bytebuddy#byte-buddy/1.15.4": { + "jar": "sha256-Smg9g/8hnyDUTzXKMC2CHgxoQuP6j58e6RPrFvSc7Gw=", + "pom": "sha256-L7uet+1bcChb8EOXvnjcKoUdDcLnSGXYFJfGGomOIb0=" }, "net/gpedro/integrations/slack#slack-webhook/1.4.0": { "jar": "sha256-uaZg4gvqtDOShH2SLBMEXFMZ7Mq/QpK5b/kadO6NmGU=", @@ -490,9 +533,6 @@ "org/apache#apache/16": { "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" }, - "org/apache#apache/18": { - "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" - }, "org/apache#apache/19": { "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" }, @@ -517,39 +557,62 @@ "org/apache#apache/31": { "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, "org/apache#apache/7": { "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" }, - "org/apache/ant#ant-antlr/1.10.14": { - "jar": "sha256-1zfetbCZL2kb/+lAdmlad1I+HjtdUktGX5DZPi2O16I=", - "pom": "sha256-W9EwNnEP7b03cFBS+57G7RNI3lchm6ulyVNXWERrgQM=" + "org/apache/ant#ant-antlr/1.10.15": { + "jar": "sha256-YZ42FgnURv5qtn0dRbhlbmhkTL18RbvtXCyIFkCNjdU=", + "pom": "sha256-9wbsXFMyAPbqHbl+TH+kdtny8l0GFi0cqXEGoauExz0=" }, - "org/apache/ant#ant-junit/1.10.14": { - "jar": "sha256-o7U109VJ8YUKiRenwr/fNk//t51ScmfbMKEpR1yi+vg=", - "pom": "sha256-ZFiOW9XE89jIh5NFpsNQoxzIp5qovBJjGNytBL4/Pno=" + "org/apache/ant#ant-junit/1.10.15": { + "jar": "sha256-mkVe60vtwdi81LgJnUsfGPG/G8l3zW44mhBv4M82ZxE=", + "pom": "sha256-XhzWXJvDP0PBC1AL66RHhn1qc3AyvJNlWD0xgQ+O0jQ=" }, - "org/apache/ant#ant-launcher/1.10.11": { - "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", - "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" + "org/apache/ant#ant-launcher/1.10.12": { + "jar": "sha256-QqfKfnu3d/5+51pe1MxSnHZrxDSGNn/arQq0oy7pwkk=", + "pom": "sha256-EbhxKkzpqAkSrpUFpGq8Wy0Gz9GIksndJo6zBpBW5Mk=" }, "org/apache/ant#ant-launcher/1.10.14": { "jar": "sha256-8JCXJaeiTjk4iPP7tVg0er9QbOL368WB/yYzG5TZUaU=", "pom": "sha256-nJ2qQSPp63BzVnk2UsOIo1UQqqWm0UW0T4VdCN1LK7w=" }, + "org/apache/ant#ant-launcher/1.10.15": { + "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", + "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" + }, "org/apache/ant#ant-parent/1.10.11": { "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" }, + "org/apache/ant#ant-parent/1.10.12": { + "pom": "sha256-xRn01Hu/nN/Q0BHsaFQpX8qB5aCeOLhfluJvdtgOX4g=" + }, "org/apache/ant#ant-parent/1.10.14": { "pom": "sha256-CBYQamBniMJw767yFWLPy9j0uvfafBG85RSetWYbMx8=" }, + "org/apache/ant#ant-parent/1.10.15": { + "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" + }, "org/apache/ant#ant/1.10.11": { - "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=", "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M=" }, + "org/apache/ant#ant/1.10.12": { + "jar": "sha256-XGpDjD6+ejBuukUrCfowew5gMUkmF3kgvKiWxKUE6vY=", + "pom": "sha256-p3Tv7ZNYkCcKzNRg5dRl0vRaAZx4oOeCF8Qryc9vZdA=" + }, "org/apache/ant#ant/1.10.14": { "jar": "sha256-TLvZJD3kwQQtYdmhXbTEPJD/k7FteLOUgdoclWyOlnE=", "pom": "sha256-L6QmnmscRXI6iojmnZhKdm27IEzQ/pgUlMzfP+469lw=" }, + "org/apache/ant#ant/1.10.15": { + "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", + "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" + }, "org/apache/commons#commons-collections4/4.4": { "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" @@ -557,13 +620,13 @@ "org/apache/commons#commons-compress/1.21": { "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" }, - "org/apache/commons#commons-compress/1.25.0": { - "jar": "sha256-0OyAFOu7B0n0cYAxIrIXlq/d8umOGU5DdGIuX7r2n0k=", - "pom": "sha256-ulzaSWZDqQb8t3sfE8XH3oFxM8l3pBfoqDX+KKZRjs4=" + "org/apache/commons#commons-compress/1.26.1": { + "jar": "sha256-J7tdQPN8O7cgW0oFQCR98FdxXp9su9l9Ymq4tQMYuwQ=", + "pom": "sha256-X0SKAh2IyW84QN/mGRKNYuXPticSzW5m3KincElFsG4=" }, - "org/apache/commons#commons-dbcp2/2.11.0": { - "jar": "sha256-WNFE1jJ7SgVMoOcaRDhFa9ZsDKjQwap5n1nc+w7Fmcw=", - "pom": "sha256-pLgH5TzLgZtfxibS/e9q36ysfePzpHGliPbfBUJUldc=" + "org/apache/commons#commons-dbcp2/2.12.0": { + "jar": "sha256-m4HqZjudslW87GsIqSRe3QW92xVcSTQ+7wm22BVY7T4=", + "pom": "sha256-ewxOiJzDxlZnuXrGhVO/m+iqPcMDR8d4LIATPk1l4Q8=" }, "org/apache/commons#commons-jcs3-core/3.2": { "jar": "sha256-dH899tksRdZAndnVT08omOyvGkgpXDj4dsdUKasRxzA=", @@ -572,9 +635,9 @@ "org/apache/commons#commons-jcs3/3.2": { "pom": "sha256-kTQ8zHM2CXfNRPthnJ7aJjyocYUlF554r+4LvE3AjkY=" }, - "org/apache/commons#commons-lang3/3.13.0": { - "jar": "sha256-gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=", - "pom": "sha256-/3zqTrI53WIRdRDavlGo1fDJ5MxCa8PowsIhpxj4ZIQ=" + "org/apache/commons#commons-lang3/3.14.0": { + "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" }, "org/apache/commons#commons-lang3/3.9": { "pom": "sha256-pAIkKbmEJbQwGBkVchJ5pS9hDzRki9rEh9TKy76N/rU=" @@ -582,24 +645,15 @@ "org/apache/commons#commons-parent/17": { "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" }, - "org/apache/commons#commons-parent/34": { - "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" - }, "org/apache/commons#commons-parent/39": { "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" }, - "org/apache/commons#commons-parent/42": { - "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" - }, "org/apache/commons#commons-parent/47": { "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" }, "org/apache/commons#commons-parent/48": { "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" }, - "org/apache/commons#commons-parent/51": { - "pom": "sha256-m3edGLItjeVZYFVY57sKCjGz8Awqu5yHgRfDmKrKvso=" - }, "org/apache/commons#commons-parent/52": { "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" }, @@ -615,131 +669,143 @@ "org/apache/commons#commons-parent/65": { "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" }, + "org/apache/commons#commons-parent/66": { + "pom": "sha256-SP1tyEblax9AhmDRY+dTAPnjhLtjvkgqgIKiHXKo25w=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-parent/71": { + "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" + }, + "org/apache/commons#commons-parent/74": { + "pom": "sha256-gOthsMh/3YJqBpMTsotnLaPxiFgy2kR7Uebophl+fss=" + }, "org/apache/commons#commons-pool2/2.12.0": { "jar": "sha256-bTvRjfhBDz4xsDGspYLMEJNCNYpionWevQxM3zDQb4s=", "pom": "sha256-Nw08lR5xtA48XKda+XK14fD4ms24UwsUYncYq0pEIwA=" }, - "org/apache/commons#commons-text/1.11.0": { - "jar": "sha256-Ks8woHCxkWPVpIDq5BGigTQehwAg41NMbV1MhHJznjA=", - "pom": "sha256-O0AZecBkEoXYUM8Ri04Y8EmsIj3Hherk0LNXKPxTTRE=" + "org/apache/commons#commons-text/1.12.0": { + "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=", + "pom": "sha256-stQ0HJIZgcs11VcPT8lzKgijSxUo3uhMBQfH8nGaM08=" }, - "org/apache/groovy#groovy-all/4.0.17": { - "module": "sha256-YtWD309HvS6BJsyMuZpiHMP08XGOYqi0PqWcjeHcPfE=", - "pom": "sha256-qfqDYNMMVc7UmDZzDV03N1ZZq69QVN4XlmC/E50Hxww=" + "org/apache/groovy#groovy-all/4.0.23": { + "module": "sha256-hpx0QnCDmcotEJnjHCOa+6kF5vsDSNbBuIzsuJFVPmk=", + "pom": "sha256-LTljViEu/Hlu58ZxpeTnXTEaTtzsJSUUgWzQWy6HHJM=" }, - "org/apache/groovy#groovy-ant/4.0.17": { - "jar": "sha256-dBrReQ2hGVIvjMyAjWGQMnMEx3/22xNegSW4lY9ebi0=", - "module": "sha256-bhcXqI577ugREvtP3qZ/Jyddlb3xBGd8unz4KjxaYFQ=", - "pom": "sha256-v4W0/5zMSC3Ge9yM71d1TG+YNDIuoT8O11zZqxPYGEY=" + "org/apache/groovy#groovy-ant/4.0.23": { + "jar": "sha256-03osKmTq6WRb2D6/DTF4cCEBObNWJsIJaWrbqmm+AOY=", + "module": "sha256-lZ+tIuFAWUDhWWQF48rHF2LteVLAW8WHKP8TbfdYoW8=", + "pom": "sha256-DOcZiRRmChDhLufxaW/XR/2OCdm3pNx+szil5i60ZrQ=" }, - "org/apache/groovy#groovy-bom/4.0.17": { - "module": "sha256-mzIfOgQTEwXGkJ/SI2f0F45Fvfl6xtakiVSmB/4zdx8=", - "pom": "sha256-0VKgJGW/lNrN1YNbFq1UYsPn/G7HXuDDVDDI6/vKUZk=" + "org/apache/groovy#groovy-bom/4.0.23": { + "module": "sha256-hKLVj9vLqhYHW25d82DnxJbP7Q8XRrG9Cz+rCY0+ZrU=", + "pom": "sha256-+HaQcnrSGjDHQJeRopw7Wl1b6pYah9E52JnTCrQlIag=" }, - "org/apache/groovy#groovy-cli-picocli/4.0.17": { - "jar": "sha256-YVIvNFrYwWhQ/m2s1ZpGPZ0mWGcCTtum1RIj+A2Mok0=", - "module": "sha256-OZR/kLjnaxcpAfkt5G4jnUms5lOSvEVBOrVG6FmmzvM=", - "pom": "sha256-iVtv/qX2WZtQTUP25FkEKP59SFzAeE6GfYNzTDkD7Ko=" + "org/apache/groovy#groovy-cli-picocli/4.0.23": { + "jar": "sha256-d2JJtw6gnkyS3o0kh3b9HHQsa7VdNDMJM/r0Z5kV6Xg=", + "module": "sha256-wsM0T69gv9+sMuT+8HDwUY9M4XQFRISy5qzIPZRM9JY=", + "pom": "sha256-Sci08myKHebrRHUOmfeQYwwPt0gQwctCY6i9cicUnBI=" }, - "org/apache/groovy#groovy-console/4.0.17": { - "jar": "sha256-+sXN8nNhqmh5uLXq9zfaimvh8Vfy6WLG1mHKfdIsy40=", - "module": "sha256-vHTZDAV4MicCyA83QKHvXbXr+c4Up1qMPhpqs4p+pOs=", - "pom": "sha256-326wZvgPeOjCm44LgOhkazK7Xgq+ljVcWkfcVf6skio=" + "org/apache/groovy#groovy-console/4.0.23": { + "jar": "sha256-AekG7RLy7+3gHHR+RylKSN5Ymy4AjN5CIsA7vO/8/pQ=", + "module": "sha256-bv/0ptQp3A5Xg868Qm1eTrcBSO4Z+ta2ZtbdtwcYWEQ=", + "pom": "sha256-Np6HrFhplmaohJijUETnesmhmfOlxINJytXynNDO6Cw=" }, - "org/apache/groovy#groovy-datetime/4.0.17": { - "jar": "sha256-2fDgwWVM3REqb7yYwjJiIw3WWLoqagKpHwp/kNtddY4=", - "module": "sha256-BBIxzENsPUQ9OKeTUlMVpfiYmurF9it4bFxgHkyKYzQ=", - "pom": "sha256-x5zAmAk6YuaOzOuL2zXEoL3o/oX44eJdBg0M+9YOHD4=" + "org/apache/groovy#groovy-datetime/4.0.23": { + "jar": "sha256-lEYpeJWNyH6mzhD5Ut013RBcV+I4IVPwtgZeCYYpAzQ=", + "module": "sha256-CsDYrF7CQz0WKLMJ3Jeb/cGKRmOHajCVDAZUjUPsySU=", + "pom": "sha256-5vjMMrjFqjBrZvZcSffomWo3Rko+8rtkmGsgHEj2JUs=" }, - "org/apache/groovy#groovy-dateutil/4.0.17": { - "jar": "sha256-lkCoL2dLCpWbwLtNEL1G1bjg4NXH0KXgddTqaUTG5vo=", - "module": "sha256-cZZ99El3vieCQzdejWHD5ggruoQGhSy9gxJydETQzZk=", - "pom": "sha256-i1NJh3/MVBfO5mJNORtRDx9y4VWd4LWDwS+2yp/ieps=" + "org/apache/groovy#groovy-dateutil/4.0.23": { + "jar": "sha256-PF3nVBm1uaITN/qaYLfso4ZFiJKQrasHbByvH48+Lgc=", + "module": "sha256-Qz325heiod7xQ4rvT3IJJrvKd4VFuhzGV0D8g+i/w54=", + "pom": "sha256-7t/DG8DOYOusX/1MtqHkuvQBXt+J1SW9aem3fS6Md88=" }, - "org/apache/groovy#groovy-docgenerator/4.0.17": { - "jar": "sha256-WEsdq21DBuA0W/H8eKH3qzcEMsu0tXPeCCn6M0Dc/gY=", - "module": "sha256-YdPdFrhB5ta8RUWJdHldjSEVt5dLbM7sDi5eOzaD2OU=", - "pom": "sha256-OImPtG2F/5f4fQhGSH6Ed8DKbx/TUwOyYOlTMohaKRs=" + "org/apache/groovy#groovy-docgenerator/4.0.23": { + "jar": "sha256-7CHYZzHdNksc+K2dOZtEHzcmry5SGatftw3SgMXVfiA=", + "module": "sha256-pkRSDL42yTBlUlJkTA+GXVr8FhMeZuTLA+Jt8PNG8K0=", + "pom": "sha256-lo2giiFmN6FvzJRDDIfpnnn5xOy2jvma7c+FevKqAdw=" }, - "org/apache/groovy#groovy-groovydoc/4.0.17": { - "jar": "sha256-5mxKRRTDDKyQHJC0uZ6yJnD7JiL5mRnfwHhFmkYYlxs=", - "module": "sha256-qufwIJqU6g+KwQwwmGmzja8oFJ0TcwAS0H4fys4FF/Y=", - "pom": "sha256-3DuMN4ZLAJtHFn+8JDBdhlAO3ltkRRwMpcNkKx7WV4I=" + "org/apache/groovy#groovy-groovydoc/4.0.23": { + "jar": "sha256-TyXQyGJA9MYnajVHF6XAv4iJQZZlEnO/vd7iCzGnX3E=", + "module": "sha256-dEsci/1trLvklmgmIVXb3ABijc3NSiJVpRkZFV+wGBU=", + "pom": "sha256-UD+8eHefEL42BajfvgI0dG+1NckBEY9BPkn0pSknkh8=" }, - "org/apache/groovy#groovy-groovysh/4.0.17": { - "jar": "sha256-s0sZ9MpZkg1m5tqUnh8wjLBk5xs5FxJHmWK8Sc3aiks=", - "module": "sha256-M7Prs0L30ddt9BV3KljQ4G8iTy9s5VwztULVKaRK7eM=", - "pom": "sha256-ozFVRhxK4Yoi/dkd8VbB2fganavLjq3KfVQtgdDDOGo=" + "org/apache/groovy#groovy-groovysh/4.0.23": { + "jar": "sha256-g56btLaf4j98Z8Z8zzSWT2actDCQ1v7cBjY7ncDgq4c=", + "module": "sha256-5/531vXJWGcAHQ7aStPeho8cEcWY2pUDAWOHL3SyiEc=", + "pom": "sha256-l7VFjIsLtFSwOhSwbYFcQy3PB1gHcgrKO++hL8DkzK8=" }, - "org/apache/groovy#groovy-jmx/4.0.17": { - "jar": "sha256-jkprSs+gyWU9+DBqqbzB7LKugqW1d9i+Rg1RWpI4Ns8=", - "module": "sha256-8K1bACxtCti15NedkLWVb0N9JrAi5ZDAQdyJnl1+wdI=", - "pom": "sha256-CNaFN1g/oP78PTgrqewYiyNveozUk2LFSAM66LuIJcw=" + "org/apache/groovy#groovy-jmx/4.0.23": { + "jar": "sha256-wgsQ3U93zxIis2xvXH27wyWZVGHPrJipJug0HWobBz4=", + "module": "sha256-kMuXrTWkpyo07Ze9tbikvlp2xCQDSP7/eM30WJhgkGs=", + "pom": "sha256-GePMp9qyslTSpV7PXXaNbwbW401ZREaunrqFNleiJHI=" }, - "org/apache/groovy#groovy-json/4.0.17": { - "jar": "sha256-5/ZoGstuGNz6Di/zcygceVdNt3KVGwGu2etCLJLV1aQ=", - "module": "sha256-z1iX5xuWFRq7vEAHZFT3XrQS75VNbB6s63xHsD4KegI=", - "pom": "sha256-/ytkljka23x8GDyOmPCx5tLLc+xCGB9RCb6KGg2ofj8=" + "org/apache/groovy#groovy-json/4.0.23": { + "jar": "sha256-w4yz4w/vpJdopCSrxcxrf+TM3lJplqdYNvoClad5ois=", + "module": "sha256-zlGjNH9GW0gYJ/rj07VYxi3/TTiAi/9gJMPYfcsEfyY=", + "pom": "sha256-5YjKEramXrR2BxO54jaH9HUpyguSHsSg/juHKf7YweY=" }, - "org/apache/groovy#groovy-jsr223/4.0.17": { - "jar": "sha256-jjeeZWPeg8DGgMNzeydWJhNuQHDn7+VmSceMEpKreew=", - "module": "sha256-3fmsPmnZ9la/Vut8I6tZ3eNOqmj5YreBP3PA7lAa/z8=", - "pom": "sha256-knXR2jusvyqQuT+Vb87Z9QlWKZpWZYW2xVqQU0sfWG4=" + "org/apache/groovy#groovy-jsr223/4.0.23": { + "jar": "sha256-3IW4JgG6wfVsmnomTalu3VNCawBCPovCn4XeGv/Kw+g=", + "module": "sha256-P0iGDCscq2puqp/jz6SmRurEPzwkVVBoz8rHdwaZ86s=", + "pom": "sha256-f/+9XOFZa81DNLuFIUcCbBGhhFHRUNOqRV+b/OZrn+M=" }, - "org/apache/groovy#groovy-macro/4.0.17": { - "jar": "sha256-DHkrtje+4hYQRYSg+MIWbMqLJe651lobQfSwfq6k3A4=", - "module": "sha256-j+dkU6DUFwbSmpi46w75RZGzNJUxiXhjSzHCmPlPoCQ=", - "pom": "sha256-szh2EBtSSGNs09PvpvZfhM5x86Cj6TzA4szD4y7pP28=" + "org/apache/groovy#groovy-macro/4.0.23": { + "jar": "sha256-eAPesddhnC8lvYknkV1DxlcfhVn7niyeAK5Y4A2AEgE=", + "module": "sha256-IIf93SW+C5snwVtsB1XKARUhTn5lFPPZWwE/fpsbQZs=", + "pom": "sha256-AOuTO0P5QdiJHukcP0sOfK3WiKQavxzmjDQCq1ru+60=" }, - "org/apache/groovy#groovy-nio/4.0.17": { - "jar": "sha256-Wlx4ro3DWYDvSudwrV3qthr7lIeORsHCTvK2xpqjeIU=", - "module": "sha256-4hTwf+grb1uLikopkzOUYAdUrJV8YEkWCgfhqZr/NeQ=", - "pom": "sha256-S/hAZAxRVa/ELN1y2avyXWkjyjAr+VplmwF97/XP9Lo=" + "org/apache/groovy#groovy-nio/4.0.23": { + "jar": "sha256-8EQJOfl07dRsBQYJgAwffV2JlfhtVf78/6ADSVql1rs=", + "module": "sha256-wHnD1ZFV0jbe01TqNBVwgd6eLhpsu7VoB6atNYAuX1w=", + "pom": "sha256-ThPnTKiVbe8hm9ptr0Gcl/jng3lDN6I5zEXqbkmDdHg=" }, - "org/apache/groovy#groovy-servlet/4.0.17": { - "jar": "sha256-aStIomYhl6reHTvBHZKCz8hgd0HbkojY2SyZZERD4jM=", - "module": "sha256-e5q5JbYbLBZYIPAJ68PyQxyW/fauZnsP+YL6EKUPqMc=", - "pom": "sha256-uIHtlhWEnJwu6vKFby0PjeuOaOfcxX65VFUgfY8V6lM=" + "org/apache/groovy#groovy-servlet/4.0.23": { + "jar": "sha256-iTKM0knZeBFBUKlgpeu+kw4NBL1IHm7JwYIRDWHj7AY=", + "module": "sha256-CecR1jdDyCyyXfhKT7KAv3OjKFFxYxH1NwDH9XkBhHY=", + "pom": "sha256-ZAangH7RTUIle+fNFM6K08li7m4BALKMZNkBSWiT4NU=" }, - "org/apache/groovy#groovy-sql/4.0.17": { - "jar": "sha256-ZdriAquQXI0OhvrGwZ3gd+gFamzEs3aWb7SGq7GpMUQ=", - "module": "sha256-NwtkYaP3hmuQYDGJgR/9QfN3tb6fOJhdW6EdS2avwyY=", - "pom": "sha256-TCWjsZnOJFMhSXnbdRgcF9sb/w0oTTDRvxxyLBUGvIA=" + "org/apache/groovy#groovy-sql/4.0.23": { + "jar": "sha256-cFF2VyVG6g3Fs3E6tnzJuh59DpUAHSPbsa5zNDrSpBM=", + "module": "sha256-4+GHMKJ8wlrsTUhzhKpZybvnhktb2HIph9hziaBlSI0=", + "pom": "sha256-gCNijuw6Sknep12Ouke6HsSLhbPpCuHMfHs1Y1SdbBQ=" }, - "org/apache/groovy#groovy-swing/4.0.17": { - "jar": "sha256-ezyRLg682DA1RY1yA+GEbUuHboNZ+Vk6y65SNPpk0W4=", - "module": "sha256-M2HxfVCfKWJVjGLf+SA8hrt+BC4DDB58XveXxETNjlU=", - "pom": "sha256-YGIp3Tq6mu5Gy0FOkzvYFQEEIp56838aJiItIoqSFHc=" + "org/apache/groovy#groovy-swing/4.0.23": { + "jar": "sha256-yo9JKDxW+sPXUNhoXbttVq87YN8w7GnqlOia3Q+GjXA=", + "module": "sha256-8PHaHN1nG53un3+ThTf982J73jmIGlK8W6w5RYPppmc=", + "pom": "sha256-O4PAXXih6CLIZQfZMTaNJfrDcp0ZhlcbXFIQkBqKkRk=" }, - "org/apache/groovy#groovy-templates/4.0.17": { - "jar": "sha256-1oF+OjDmRfzmCSz4684nMTSsJK1iP5er3lU+bYtDPB0=", - "module": "sha256-3K5vWxfaC+2hY4I8aPQHhFPruKpmwfvBnIMjwbEdkWc=", - "pom": "sha256-iz+wHVOlhD/8+K8bqwQhugSbt98iyxRYCLcnNHyXqd8=" + "org/apache/groovy#groovy-templates/4.0.23": { + "jar": "sha256-q8ib75YQLQf3l0ASlfTwdM+qFRepASBOsqX8fPHMVD0=", + "module": "sha256-PnO4P81hfw2K64bM+Mnlo3fW97S24M/8xgdVcsfiiA0=", + "pom": "sha256-qKuf2eefBfVRvOEVhcWErcwXiam05CPy042yzDz29cE=" }, - "org/apache/groovy#groovy-test-junit5/4.0.17": { - "jar": "sha256-WxLWTWpbzkYJoT03WszsklzlJAb+BsIVyPuKcNXR4hs=", - "module": "sha256-DXyYrom2dJYCH9z4UR2H0uZW1Yiyc7VbQFwTBvDLXNs=", - "pom": "sha256-Il9nKD1jAjZhEKxRBe5t42VLAcqXzvez0Ea4n5gjYfI=" + "org/apache/groovy#groovy-test-junit5/4.0.23": { + "jar": "sha256-WDuxJPyVAAZgV4N3vh8Rs8Ob7WNQE3fUu4KwBadTSz8=", + "module": "sha256-M49r7WuBfPeI/dRvP31TambDw+SPLlCRSJ/ELrQZfsc=", + "pom": "sha256-ZnVM1+hGBjSriSCV92Dia4rqD9bOHypryd8YWnVj1iw=" }, - "org/apache/groovy#groovy-test/4.0.17": { - "jar": "sha256-4BODn/xw4k4JMyLlcMX4aF9CB7UYWTm3mzXnnlDZktk=", - "module": "sha256-Hm40SCtyEh0QfqtalJqZqs7qNoFO0LSVLHIweHKZD+c=", - "pom": "sha256-DQElTOV2JB6Su2gZfGbQ4AJApGkWOo9jEsEGi+GpRps=" + "org/apache/groovy#groovy-test/4.0.23": { + "jar": "sha256-aLxU0hlMPDOtkgwukUCyEVwYI+bZxEsE+u4qZIyVoPU=", + "module": "sha256-zG0Y9sxey/kba70Jbycb0QvdD2ZM/9ke0tzR0cbq+Zg=", + "pom": "sha256-fZekDhFMv4JM/UqbO9DWNw45NDH5EJAwl6/PXbdYT/o=" }, - "org/apache/groovy#groovy-xml/4.0.17": { - "jar": "sha256-d55jbIE7rWe+TCAEuGB7oZlMYvxJU37FQI8o5Yh3YLY=", - "module": "sha256-upuTtiJVZkWISbBoDVQ6veMWQytldsKXExP440b9vsg=", - "pom": "sha256-jjCHeCS0a/hbNHIUkSWzL4MiHfHAOSeJs1PlgeF67FU=" + "org/apache/groovy#groovy-xml/4.0.23": { + "jar": "sha256-waichweoxOn3FLcZvJp6fCD9XxWJyPtyA/D/iWAt1fs=", + "module": "sha256-iiEvvS1D/PRx0/aJwv5hHisWggyDB9k4NoouV+juJDU=", + "pom": "sha256-Cs6gRJ5WQ4+XdmY0e+9MNX78GR8zWvMMdYrHe+gv/jc=" }, - "org/apache/groovy#groovy-yaml/4.0.17": { - "jar": "sha256-inBY+ruua2pJyec/h3UgV8fnUV0rMWce+FAKrjeuMOw=", - "module": "sha256-mmuqMMKB9COnjcJFl83YZkAKu+Cqm74AzbzE+av97nc=", - "pom": "sha256-KXJjwIhCwFAnDRIJyejAvNszjPGJ+PmE4DfmjMsrLiU=" + "org/apache/groovy#groovy-yaml/4.0.23": { + "jar": "sha256-x5/JXJLAzbQmzDGZX2alEIi2/OwvaRDoZqdIb6WMzTQ=", + "module": "sha256-V6i23/V+ky2pCWemRxsjSI8TU2r9GGmOMYLleSHcVyM=", + "pom": "sha256-WjMH8Ri5Eol8WUd9+L8kxkxtxt5PmE64+Atw5TTC6bc=" }, - "org/apache/groovy#groovy/4.0.17": { - "jar": "sha256-UaKoWX8ocU50tAiIYMJw15shhh3RMIQdY2jYngIg10Y=", - "module": "sha256-H2fmwVACypI0euSI5kMvqKirpAdYfFsw0wZH4S6T9pM=", - "pom": "sha256-aRZKKtWmpKBLdGcEwwMNH0Z3QC+l89DvkOZaQMf+GzQ=" + "org/apache/groovy#groovy/4.0.23": { + "jar": "sha256-sm7pBQf+zajG2m0/2+uLLJmXmsi4qiRZpIE+a+565uY=", + "module": "sha256-zRKdl1rlI8lsiQIrZ0qeOeLU0JuqDFtWnPHW6XpRGJQ=", + "pom": "sha256-6QZWWlD5nptlBh38D2zLYkLuQn8SIvvI04O2rCjdg10=" }, "org/apache/httpcomponents#httpcomponents-parent/13": { "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M=" @@ -766,38 +832,62 @@ "jar": "sha256-mEKNVF6mPNmgqvJVyvQsuMtk/kMNu15wmu1TbU2u7QQ=", "pom": "sha256-SrIWH63j2EHp2H8iVfdgfLiHCcbISPf7JdBmkd2VbkQ=" }, - "org/apache/lucene#lucene-analyzers-common/8.11.2": { - "jar": "sha256-097wT30NLIkc8sfj38FMO1NUW+wcuHMq4DPyUWTlyTE=", - "pom": "sha256-zodQaJ1qy5V5aaW3Z2iqVh2HEA3B6ErDYnfhweswA8Q=" + "org/apache/lucene#lucene-analyzers-common/8.11.3": { + "jar": "sha256-mTkvLYrLmp6GdpUflrDBkWBMVB0/K/Yjxg8YAd+isbk=", + "pom": "sha256-e4O1sIhXd8zHh+wNOamjyWtJM/8RjtEAincD8gNgrMU=" }, - "org/apache/lucene#lucene-core/8.11.2": { - "jar": "sha256-iXCSX0PXiacCR+NsG6WiYHuvQZXDWv0M2HhkLJXDdAk=", - "pom": "sha256-ri4+eBO+bTd4uTPCfG0aAxwJxk+JURgMAE9vFI0nG10=" + "org/apache/lucene#lucene-core/8.11.3": { + "jar": "sha256-ooqyQNGJSAbcfSbfwZYGBluvDzmwgjP9nteJjzjlX0g=", + "pom": "sha256-jh5elWPH3xD8ORFQ9ZKGTbdjM+oMgAxtR1U9P6shEFk=" }, - "org/apache/lucene#lucene-parent/8.11.2": { - "pom": "sha256-2KiRciKjtdDGjnmn+Bb8zM77bHvbuQf6FwsJ5HIJUuA=" + "org/apache/lucene#lucene-parent/8.11.3": { + "pom": "sha256-TvlzkeM6R/0GrqDHQCsCvXUSuETdb0p6fHOaDI6zjYY=" }, - "org/apache/lucene#lucene-queries/8.11.2": { - "jar": "sha256-D5MRnX0xbO8T/euqZo5xaxl+uGy+jns0XA6tJjIOY8g=", - "pom": "sha256-urVlf5EpC/zVrdDBDdto+p6AMR7o8Diloc84itrE8dM=" + "org/apache/lucene#lucene-queries/8.11.3": { + "jar": "sha256-pRv5XohQe7hV3OYuY0kCv6Tvtrji6eZzo7uFwUb47iU=", + "pom": "sha256-HFM2jieSGd9sr1KeIDneQQ44rmFiwc7jTXfgqkdLx94=" }, - "org/apache/lucene#lucene-queryparser/8.11.2": { - "jar": "sha256-0s9RG6072nuRWHy6TCJ/iWSk6NoEM9BadAQ56iG7GuQ=", - "pom": "sha256-4fhknAaqtrtUJNdnrxWgUGLWM7zyVJB7I2/4AGtXytE=" + "org/apache/lucene#lucene-queryparser/8.11.3": { + "jar": "sha256-Wi//TLw+prDf4btmA03cmHXnp4oVzA+77Kl1JuyFcTY=", + "pom": "sha256-nUFO+q44UE97RJ6IeNU9tUwB+hQGPfXnUc7VjSMZVTo=" }, - "org/apache/lucene#lucene-sandbox/8.11.2": { - "jar": "sha256-/qZMMQLiGhwjOpXr7Y5wIeZfguUX2o2LFEZ3Y1ZwW7c=", - "pom": "sha256-M+S6VEvQv8U33WHboeMXvQ75DzU9yvp9ACePJYlApjs=" + "org/apache/lucene#lucene-sandbox/8.11.3": { + "jar": "sha256-qm2kQPAtizaRXPVtKuxtajHO512UdtoWVnsEbuNi7K4=", + "pom": "sha256-TbFPDhLzCEKbUNcMV9vlLoHmMJ8UPiOY7xMF6nBD0eg=" }, - "org/apache/lucene#lucene-solr-grandparent/8.11.2": { - "pom": "sha256-0ShbeRyB734Rqb7fbt8Yh2C8Q/MJPkT0nygSvA8QAHE=" + "org/apache/lucene#lucene-solr-grandparent/8.11.3": { + "pom": "sha256-+2LLyPLcYfE+IRtn0/+spi0SOkV98gn2v3yVR+oEGxk=" }, - "org/apache/pdfbox#fontbox/3.0.1": { - "jar": "sha256-nSwtOESSmc0Nghovb2VnFDMlFEjT31efr/0PhzYcfH4=", - "pom": "sha256-dtkbZg8MqSYqfIEqvny+OdvHNNc68yiWpZ7omXG3aQ4=" + "org/apache/maven#maven-archiver/3.5.1": { + "jar": "sha256-0GdEafjm+8hm28XJVUY9dim3dVrHyHojW5Rp2CV9a4w=", + "pom": "sha256-J3Pt8H2b3AFaEQCVeTHHN0XyQWmwrLX5pbHbt1lZ1Uk=" }, - "org/apache/pdfbox#pdfbox-parent/3.0.1": { - "pom": "sha256-7WhRk3AwJFzoTmKS65oUgKoSltrSwy7fVIZickTXdio=" + "org/apache/maven#maven-model/3.1.1": { + "jar": "sha256-5xutI1rxgsQ9/KqbZJAyNSz4WfnQn3nh9Tcmg4QXbeE=", + "pom": "sha256-bIzqCxiSyxHuJC3fj/xvDt91epk0kpRdEE2i0QGi7/I=" + }, + "org/apache/maven#maven-parent/23": { + "pom": "sha256-VCVQHt2eC9ewHspTzJLgaDbSSFEVEwT5xnWeFxNUFoU=" + }, + "org/apache/maven#maven-parent/34": { + "pom": "sha256-Go+vemorhIrLJqlZlU7hFcDXnb51piBvs7jHwvRaI38=" + }, + "org/apache/maven#maven/3.1.1": { + "pom": "sha256-lnwvC1UebxG/+ARsu4suIFz/J0kHtia2DRPZ+WxTvgc=" + }, + "org/apache/maven/shared#maven-shared-components/34": { + "pom": "sha256-ZNDttfIc//YAscOrfUX5dUzRi6X7+Ds9G7fEhJQ32OM=" + }, + "org/apache/maven/shared#maven-shared-utils/3.3.3": { + "jar": "sha256-RKYMYQ9OMVJLA9gaaYsezOuhFjIOpRC6v4WVdbLqcjM=", + "pom": "sha256-NFZNRisHTeJlC4Vb5yPej1WT5ZDLkTK6402dsd/7W+c=" + }, + "org/apache/pdfbox#fontbox/2.0.27": { + "jar": "sha256-3HQphoqvPTE8Ukuaq4RqQF6Jykkn81diyk0aYLzh1/Q=", + "pom": "sha256-q/mNDGhURYJaBs5q6wDrs1qRkgrhnO1GEl1afhAoMQY=" + }, + "org/apache/pdfbox#pdfbox-parent/2.0.27": { + "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po=" }, "org/apache/velocity#velocity-engine-core/2.3": { "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=", @@ -809,107 +899,107 @@ "org/apache/velocity#velocity-master/4": { "pom": "sha256-eirHPJDdEEtaB+bizQPpXsKNKfO4ME891//87LBJcS4=" }, - "org/apache/xmlgraphics#batik-anim/1.17": { - "jar": "sha256-Z9nWkezshXrDYo+9IWfCAZQNPEtlq3OGSErHMMuM+eo=", - "pom": "sha256-SNpMQT2e8VZ6EKLn7UNPpbuOzrfolW9jxLlw42/avxw=" + "org/apache/xmlgraphics#batik-anim/1.18": { + "jar": "sha256-1Ky3ATHr55WDGrJcIQyklh4CK8gHFbIN1b0Vd8alUK4=", + "pom": "sha256-udAdQ/cIP4b9v7SfCQYA0enOWcz9xAOiMIlop91w9Pw=" }, - "org/apache/xmlgraphics#batik-awt-util/1.17": { - "jar": "sha256-f+OPlFHrlFdSFDIyYcgZK2Px39JhBlklX7u7/elKKmY=", - "pom": "sha256-K0uhvyKqtiKmdyIXZTnRlWJ92KVfggGRq0udbh/PrgI=" + "org/apache/xmlgraphics#batik-awt-util/1.18": { + "jar": "sha256-gHudVOah6Ch3KjCdde9R/i3WiB10yKTTmy+35OGq9r4=", + "pom": "sha256-3QO+OHceZriPI43skUg5Uc5OOelBUXgI36c4KC3ZrtM=" }, - "org/apache/xmlgraphics#batik-bridge/1.17": { - "jar": "sha256-O9An4ZoL4klsLDlQFSUlyRRhp9CB7b2Ci7PS0mnsWHA=", - "pom": "sha256-SfOQORML7tSikG1DGOSpv8l+yRax0bo+trqK9BigvVc=" + "org/apache/xmlgraphics#batik-bridge/1.18": { + "jar": "sha256-cz7uASO8cpWZTQD9Y+KO12T3PyI+zFgJXuuy6D5vSlA=", + "pom": "sha256-X4dFz9NTpUkGVp4csr88DFPrwMTiMR8lxbDmcofFN2I=" }, - "org/apache/xmlgraphics#batik-codec/1.17": { - "jar": "sha256-ZDSkhxe2nwWYaGZlPnXVKED4Es0rwnpb9diK7pXkEh8=", - "pom": "sha256-cfyOmfGNajQC9Dtl+R9OwtkiHy22pzTOvohmAUKOhJ4=" + "org/apache/xmlgraphics#batik-codec/1.18": { + "jar": "sha256-rVOyu7iIPWQmjkL/Q8BiChC+QsZXtxl/qUuihUdBmTU=", + "pom": "sha256-8IeV/WG1MUkdNS4utjSumdqN2Jjv69cbiq9QZlGHcSk=" }, - "org/apache/xmlgraphics#batik-constants/1.17": { - "jar": "sha256-ddsAGAveTvXK7jkW1vZeUEUFHVnPUdV+ZzwDlp17u80=", - "pom": "sha256-BtbvBrb+NCkKDiopaz95YejFX18VgvCVIcguAAt5Px8=" + "org/apache/xmlgraphics#batik-constants/1.18": { + "jar": "sha256-ug1pkL0VzG3FwwMgq9nep9IB55QEurFcSC7bwi+Vg1g=", + "pom": "sha256-DZP4insLCgkw/CWc7SV7dHRyxGGXyRjyC3hbv47esM0=" }, - "org/apache/xmlgraphics#batik-css/1.17": { - "jar": "sha256-3PmpAr0MSxqErAVh17ZgUryTOBxJI6W8VgIpDByCt3k=", - "pom": "sha256-kt6q1WROf4uqA6h0YZwha2eEc02elByJYnkzsKmxUTs=" + "org/apache/xmlgraphics#batik-css/1.18": { + "jar": "sha256-PWKpsfSS/qRLNumUc2fuIlAQCdomLYGN9aM7GAix4J8=", + "pom": "sha256-S2BUJ7CQNDHQC8ca+u7Zx585YzteIfzPfYXNl2Ob4Ak=" }, - "org/apache/xmlgraphics#batik-dom/1.17": { - "jar": "sha256-8kLdsFsmixX/BV0dGq8tycNBjoQrqAZzFAiphNTjJAw=", - "pom": "sha256-5j2XE/BJoPrXcWpbixROVgr7L4Opygbe0mi0QlRTjyY=" + "org/apache/xmlgraphics#batik-dom/1.18": { + "jar": "sha256-FcAXuz00Im1vNPT2PfYMLqn4CoGearvaG0kzXVmB2YM=", + "pom": "sha256-v/fJZplTYJxRTna0ZyITMgM6YhiZYOyX/LlK9hWE8OU=" }, - "org/apache/xmlgraphics#batik-ext/1.17": { - "jar": "sha256-gmf8YLSlsPKvp9z9rUC+sOcj1qGbZrjiS8N8LsbcVFA=", - "pom": "sha256-SIjUiOkeJB9Apenz6xS3eg+/tGK29U7i4krFp0NYh94=" + "org/apache/xmlgraphics#batik-ext/1.18": { + "jar": "sha256-97G0Ff0OTioMQ4sVY5XEA24DK06R1Qj9WyFnRPNinQo=", + "pom": "sha256-qpSJUUtRr0f0eDJEmPjyjW62CvSmvJ2jST+GVF+OMbs=" }, - "org/apache/xmlgraphics#batik-gui-util/1.17": { - "jar": "sha256-2ZNr5tv3rvofNRe4YE7CE/4VTR1lTy7Gcjq1Jn3VXnc=", - "pom": "sha256-1WEFYc2SyU/fnXXAuY3Su0kHldxUaC/qZEQZgdcB/jo=" + "org/apache/xmlgraphics#batik-gui-util/1.18": { + "jar": "sha256-zEuUCX2/YWa4Fki1lT5tRRGEuU0IzoK6oKu7zYLO+gw=", + "pom": "sha256-d5ZNO0fCxICHbmBZ/UAMP8qsbbgN13EG0dSwXErk9Fk=" }, - "org/apache/xmlgraphics#batik-gvt/1.17": { - "jar": "sha256-k/TkqETK/Fs9VzGimbwAzxRAQCbdyx10nSnKeUhrS5A=", - "pom": "sha256-zIhrsEtaMpUrKgtYmx3XNZNoZg/ysqxcBJ5MNkdSmpE=" + "org/apache/xmlgraphics#batik-gvt/1.18": { + "jar": "sha256-KT9KwjZmtK5BJE1MKfBZysMG20qFspOqKMOCFHIZANM=", + "pom": "sha256-ecnw8VsewBT3IRnYaQCw5Irxu7B1gwRvyTS9UedNvW4=" }, - "org/apache/xmlgraphics#batik-i18n/1.17": { - "jar": "sha256-1aZGgDY+ezaz8ow0o6U2126Ef3fOwHQKq3x5mme1LYs=", - "pom": "sha256-LczXNOp8Pf3cOQDcrOgYGIsUZsAq6dqK4wpwj3Tw9MI=" + "org/apache/xmlgraphics#batik-i18n/1.18": { + "jar": "sha256-zEoqUDgKbmKV9Z72Ro01Hmdx4632jBLXnGAH5LHLJcw=", + "pom": "sha256-cNMSQGEu/uXg76TBhB3KmGWp0R79AlgkVb7ZJMdDadE=" }, - "org/apache/xmlgraphics#batik-parser/1.17": { - "jar": "sha256-XkSLv69hJ1Z/QfaY7iWtebhENjBxwS0RdYlseIkXF9c=", - "pom": "sha256-O4WKAV0DzUCF+HnRF81IbyijM3IIG0oRL/w5OjPzMOs=" + "org/apache/xmlgraphics#batik-parser/1.18": { + "jar": "sha256-wQCWLWYKCkFdTCorunuwLGxirbMKrHBs0YXN+e1wpyw=", + "pom": "sha256-crP9DJSt6dGyEusqMsLkCEHWM1PI3GUbwOOrMPpuocM=" }, - "org/apache/xmlgraphics#batik-script/1.17": { - "jar": "sha256-LMu0vW1aYw+30m8N0xGNR0L3uuDpcu5nITDoA/ZylQw=", - "pom": "sha256-cev1FjXjwA1UnPAc/HxAZXssvZOCUVkUf73N0U83xqI=" + "org/apache/xmlgraphics#batik-script/1.18": { + "jar": "sha256-ibbCDMf+W0Hpz4j+lNTePXh83i1WJWe126FVjCedUDk=", + "pom": "sha256-/ZEB+jVDU0nkHbK13DerFiWvtalUWiU62hTschGA2gY=" }, - "org/apache/xmlgraphics#batik-shared-resources/1.17": { - "jar": "sha256-XXQYK5yhns2NSBTy/0tCpK7qbhiXfpBcyE6Kb4GUDJ8=", - "pom": "sha256-ut4U1rq9//BiLBjNPCUf9flZN4MFieL2jgO92nu1RxE=" + "org/apache/xmlgraphics#batik-shared-resources/1.18": { + "jar": "sha256-SPR1NHLW5oBaEkMHmE0GNXSstTn4itqSPx+nV6RBZl4=", + "pom": "sha256-Svoz4ZynMPkHL99wGf2Xl2Jek37Yb2v5vVhLj5+c/8Q=" }, - "org/apache/xmlgraphics#batik-svg-dom/1.17": { - "jar": "sha256-GTRyGKSQZwxLnSzRWkUVXBr59B539+rameuU27kL6OM=", - "pom": "sha256-BRKX2S6SjPAcAWqpNp8zhw7EEBQ0j30C6avoVZKIvlA=" + "org/apache/xmlgraphics#batik-svg-dom/1.18": { + "jar": "sha256-3rnGUtoLZt1hsdMjv8o8cDTbythVpeQ15gft3Yqs4c0=", + "pom": "sha256-H1/fOAl8z+KGPXRRANSBtix5z+nGMAjQmoakpJUItYE=" }, - "org/apache/xmlgraphics#batik-svggen/1.17": { - "jar": "sha256-EI9yX/4TXcpWbZJfOs4mpfgDmfKIyhkFYYBd7CgAXWM=", - "pom": "sha256-3HgOLwRWFTzXBP+zLhjGababh+ZW77ku3KNv7tIz1DA=" + "org/apache/xmlgraphics#batik-svggen/1.18": { + "jar": "sha256-PxgadLzQHmaI2YgIDWPsiOrfjkpR2LTFqj0ZUutCA7M=", + "pom": "sha256-cbJdqAfL2FF33vMyLSFqktPIAVRxssZUcObSKRGoN/g=" }, - "org/apache/xmlgraphics#batik-swing/1.17": { - "jar": "sha256-ejNy6y/pO8CKE2kK7HyiY6Lt1j5n2Qtliy3qLG8L6Tk=", - "pom": "sha256-UJz+WAJ4NGTjWRypIO5OGmsgwHFsoVAj3xbnxpsagv8=" + "org/apache/xmlgraphics#batik-swing/1.18": { + "jar": "sha256-3cDt6rsd0C7PyLajkC01xPFP0+8AD7Vmpa1uIaYaVSY=", + "pom": "sha256-JjH0WiYrDTCc7B4Bljwd3C1NTVb8QTHbujfEwz19kn8=" }, - "org/apache/xmlgraphics#batik-transcoder/1.17": { - "jar": "sha256-H2nphrRukfcHzxMUP04ukwufYKaXhY26vbq1y4bNWg8=", - "pom": "sha256-4UQOu5q+0Ev3RDbBkVOFeGNE4iFBaooCLHGO2oY8al0=" + "org/apache/xmlgraphics#batik-transcoder/1.18": { + "jar": "sha256-dejwwCr8ZspQn8Wfzaf8necT8Bz4xgwuTIwle1j4XFo=", + "pom": "sha256-QPKtgBE2mKPrPGPd44iCQO+sJyVLbh3MPUtGPDQMmSA=" }, - "org/apache/xmlgraphics#batik-util/1.17": { - "jar": "sha256-oeT3Q8i4CsaC7dSzl/qkrELeWRNDA2MkyA7o8ilzyXY=", - "pom": "sha256-gtWFfUG9TeWskX7sgSoz0zKXN04UOAew4KYt7KBVofk=" + "org/apache/xmlgraphics#batik-util/1.18": { + "jar": "sha256-DH5P3YC+i6MSAuqvDr6F7CzVH5yx8htgLRcDWqqEhRw=", + "pom": "sha256-CbXNcfjce/yrlkfTwGf+46GvEzOOXJwZyZHQLmR4bEc=" }, - "org/apache/xmlgraphics#batik-xml/1.17": { - "jar": "sha256-+8wjAAZqxAQodsUsMnrN8LUVli8WkEAO16eO0sDUwbQ=", - "pom": "sha256-0ypeBt4LkxxN2ebgS/oSQHwkNwmmmNdpZ7TnkYoPLn0=" + "org/apache/xmlgraphics#batik-xml/1.18": { + "jar": "sha256-Ps55UwCtJ2L5vNToM4ZX86rG7X1R/3HQULxPNQ/4ZT8=", + "pom": "sha256-gDbYCBft+fe8Sd8n+gCZfFbJokqvkjH8/K5ZL/YDXKk=" }, - "org/apache/xmlgraphics#batik/1.17": { - "pom": "sha256-D9ZlDtWtkmuw6X2xx/yMJqQOOmtrShOxR2XryjKvsTo=" + "org/apache/xmlgraphics#batik/1.18": { + "pom": "sha256-xaC/+m0aTRYFs5xhIsy/8ImD0qdF+q9hwMi/V9u8xTg=" }, - "org/apache/xmlgraphics#fop-core/2.9": { - "jar": "sha256-G6o/84uWbL+7FXcEXNsMOdou857zN/SCZC+Jwy6E7Qw=", - "pom": "sha256-gYLc9qvzM/JWGIGtG+4ebnaGB5EhIDIrXhbAY1EjPQo=" + "org/apache/xmlgraphics#fop-core/2.10": { + "jar": "sha256-Yx8P2iNK30RTMdRG3fB4l/fOTT1mZ5CvQKgBfeZqF4w=", + "pom": "sha256-NAj1YW1vWtnIlieJjNVdce3wDsz5NWTqDUCSerng4Q4=" }, - "org/apache/xmlgraphics#fop-events/2.9": { - "jar": "sha256-4ddBM2p6q3z9fwYTxwPewOkxyx/gt3OAqXSM9EX1zrY=", - "pom": "sha256-qz74ZmlV0FKvUYeZFfwv85mXymheJaPJIuuKuDU0sH0=" + "org/apache/xmlgraphics#fop-events/2.10": { + "jar": "sha256-qGOQIsQhtArsmRy1vzWfkoLssX9I4wu5jk9LNyspoe8=", + "pom": "sha256-NHAIdopBgumAb/zKyv6HINRJrfbNLgy2t86jHO3ekGE=" }, - "org/apache/xmlgraphics#fop-parent/2.9": { - "pom": "sha256-Oq9QCzomfEmzCdoCziBOirxzojRmry4kK7mJRPdL0d0=" + "org/apache/xmlgraphics#fop-parent/2.10": { + "pom": "sha256-aGqCV9li/F1E+S2GNUvIQYN3htXo3psh/6QMpl0HztY=" }, - "org/apache/xmlgraphics#fop-util/2.9": { - "jar": "sha256-fJzwPh48KvR5QxIlYHCCnhPyRRu2TJcpk8YFl5k9BD8=", - "pom": "sha256-HfUlsA3xpY3CzLcju3IiMhWhCmbrdl7++PhW+xAZAJw=" + "org/apache/xmlgraphics#fop-util/2.10": { + "jar": "sha256-0hj6i3fPVkhBg/7CfopEHR0lINdxCFRB28FZ8HV4/p4=", + "pom": "sha256-oahMnSiW2qQP94szlM4hzpaorMRiOIpjfCI/NoavXCQ=" }, - "org/apache/xmlgraphics#xmlgraphics-commons/2.9": { - "jar": "sha256-Lr0zOrKmJFFHk8M2468IZghnMob+N7oeY54Kw+G1i+I=", - "pom": "sha256-CS1SCmHKS4pFkEN0JMQhzbDPQOeYrs7PKwUm8q+PH4g=" + "org/apache/xmlgraphics#xmlgraphics-commons/2.10": { + "jar": "sha256-hXry0G0ALOIXUyUEJE6o7oMa6wlP6wpHsml/GUlnEeo=", + "pom": "sha256-mD18XYcB8GYOiVw7TET0ORjDGaOi/Tas+TNwEJnTUgk=" }, "org/apfloat#apfloat-parent/1.10.1": { "pom": "sha256-rHDBL+cJtXDurKOZT4NbpGnnJaWbvjYRDTpBImHgUt8=" @@ -918,15 +1008,9 @@ "jar": "sha256-oUgPVg83NV9sBFjFI72kZljaTNPiPMZOMJ/tzXsHgro=", "pom": "sha256-hhppAMWT7SJoYA3RdxPseJHZM8oBnTlQm0bzGBJ0Xcs=" }, - "org/assertj#assertj-build/3.24.2": { - "pom": "sha256-1/yMSqgAWDsmxGfrD67eCvXnynkMS+TU0jVDFYPSbq0=" - }, - "org/assertj#assertj-core/3.24.2": { - "jar": "sha256-3z0LNI8f6Aa93csQ+krmPGZ56YiNS8cFXwmEhReXaqM=", - "pom": "sha256-f7mxojdOtQ7SubWYRcaScxEeoYOaQpj5QAqA4rLFyA4=" - }, - "org/assertj#assertj-parent/3.24.2": { - "pom": "sha256-DFAETrW96ehEI7yhOv9dX0PTdSqzxj9zva5p/EqxoKw=" + "org/assertj#assertj-core/3.26.3": { + "jar": "sha256-TC+GQY/0fua2f7xq2xlOgCGbeTKBs72ih5nUQlvJoL0=", + "pom": "sha256-fXXFEKu7fcuR+zXOLxQG6AAP+rnuGPqpqt8xXxlzgWY=" }, "org/bouncycastle#bcpg-jdk15on/1.69": { "jar": "sha256-o5hP9/2VGNAAlONPPT5xSkgj8lBa2hwZs1wSnib2OTQ=", @@ -952,6 +1036,24 @@ "org/codehaus#codehaus-parent/4": { "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8=" }, + "org/codehaus/plexus#plexus-archiver/4.2.3": { + "jar": "sha256-//gVe/s9bx8JnH2n3j4Uv9BhrUqylZmvp7vwJxNo10g=", + "pom": "sha256-Nag4HsjtwO+s3Z+H2TSHwvzn6V9L4EUOhab5TfSdZ2k=" + }, + "org/codehaus/plexus#plexus-interpolation/1.26": { + "jar": "sha256-s7VBLOF4iRA+pWS838+fs9+lQDRP/qxrU4pzydcYJmI=", + "pom": "sha256-4cELOmM1ZB63SmaNqp7oauSrBmEBdOWboHyMaAQjJ/c=" + }, + "org/codehaus/plexus#plexus-io/3.2.0": { + "jar": "sha256-Fc+MvZ4BS3FWSCu7SOUVYTFYvdm0uQjSHmuQD3h29v8=", + "pom": "sha256-cmsHgD566p4DzB2hZrfF2Q1oG1sMKS9XqTz1sH6vf4A=" + }, + "org/codehaus/plexus#plexus/5.1": { + "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k=" + }, + "org/codehaus/plexus#plexus/6.4": { + "pom": "sha256-mgR80/2toNaAjUUpjkkZFTAY1oJvk/BA5ROHdYzMJVI=" + }, "org/eclipse/ee4j#project/1.0.5": { "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" }, @@ -966,9 +1068,9 @@ "org/eclipse/packager#packager/0.19.0": { "pom": "sha256-K/IL31F8Q7tH/GSAnqKOwOQuMQnUbRPQ/miGquputXE=" }, - "org/freeplane/archunit#freeplane-archunit-extension/0.0.1": { - "jar": "sha256-XxRdb0LDT8XWt4OfhoSrJb8LAVhPFAO7m2DjEuJ8MuA=", - "pom": "sha256-pwd9Md/wt+QVs7mvzWfg7f3worN8xYPfAegXBGIdtr0=" + "org/freeplane/archunit#freeplane-archunit-extension/0.0.2": { + "jar": "sha256-12vNLrrjlHXNSUtDJqu1CZcDsaRBKNht8gCRL2BYSxs=", + "pom": "sha256-Wdfkoc+AN4SDL0FE+JjuLlladMnHW7UOgULzV0UznI0=" }, "org/freeplane/dpolivaev/mnemonicsetter#mnemonicsetter/0.6": { "jar": "sha256-tm1Hrc7hdzU8YWFZhOJvG8Fj48VPTvfWo6nwkw5bnKo=", @@ -1001,6 +1103,10 @@ "org/hamcrest#hamcrest-parent/1.3": { "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" }, + "org/iq80/snappy#snappy/0.4": { + "jar": "sha256-RqDIfVBM6dYGPh/25NIHOP60nYq/hbUHGn0Y308Rusk=", + "pom": "sha256-pwnOFxEeQUnZt5pSlWRODNWoNVrsSy70wENqunsl0Io=" + }, "org/jetbrains#annotations/13.0": { "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" @@ -1036,13 +1142,9 @@ "jar": "sha256-SamJjaN1hlk4jxMzxTzK22+9FCp9GKp7GjNXcJBoQnk=", "pom": "sha256-Fge2IOHytOGg9IkQELNJCx+0qD5xOsTTiwjcLGf6PlE=" }, - "org/jsoup#jsoup/1.16.1": { - "jar": "sha256-HxFXJlQN33GVjBS8UX6/xJz0gekc2Rew+s6E8BJy6QE=", - "pom": "sha256-bMUH9jBTbyBb3iwbOMPFkHUR3i17GkRL6dY41GFPJDw=" - }, - "org/jsoup#jsoup/1.16.2": { - "jar": "sha256-pzoetdArUUkFR8RkheMPTxTmivNiSEC1er6MRYCgC4M=", - "pom": "sha256-CDt/BhxojeonbVV3j/Ijw7rcJmmdX9u4n4Gv9VOGsaY=" + "org/jsoup#jsoup/1.17.2": { + "jar": "sha256-9gszs46desk+qqaKbHD3BruZA2SUsuKt0r/uEdCaxvU=", + "pom": "sha256-ejSdIXeQw3ML4wjO0eqe4yxOdPcgWOg8K2DloolU3Q0=" }, "org/junit#junit-bom/5.10.0": { "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", @@ -1052,6 +1154,18 @@ "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.11.0": { + "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.7.2": { "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" @@ -1072,37 +1186,34 @@ "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" }, - "org/junit/jupiter#junit-jupiter-api/5.10.1": { - "jar": "sha256-YNXDmMMtxwObmSglFK1gZAYdhBfPlZofa9IDjMkHyRM=", - "module": "sha256-+H9zEVSfSf4k5igqEWXpB+AXqR6XnK2r/fm/VMP3EG8=", - "pom": "sha256-PK9ZSxPa5xB1EN2Zj02en6J3MFzcohMh/dWRmdyHzz0=" + "org/junit/jupiter#junit-jupiter-api/5.11.0": { + "jar": "sha256-QqogL8hi92zFr2W0exwLGWHN15zSIWQFpt+ivSCyCXQ=", + "module": "sha256-8FlIEOl1rpHe3OqeHiIP8hlcSvnQMyJ6C2VkxsX1m4U=", + "pom": "sha256-cTmgP0mFrJoYz6iUyYHkmfDkw3IFGTaMomTqhkc2Te0=" }, - "org/junit/jupiter#junit-jupiter-engine/5.10.1": { - "jar": "sha256-ApMN/klfk/5wsmVQrOOij34bkAyEQmwuRibOAgxygtY=", - "module": "sha256-VBIeWCzLLUYl7J+lRnlDbJA/oFPHQJe75F/fud22f7g=", - "pom": "sha256-MHCG3F5wjLdZAQhoXAQOCOCK3g7UlUkwsvM8BttT6l4=" + "org/junit/jupiter#junit-jupiter-engine/5.11.0": { + "jar": "sha256-cBJCM4PQx50DR8XPK9GZbDChIkD7cp4M36lUhS7Gk8w=", + "module": "sha256-KHwllg0eUqQFPj8ksY8eG6tM6K7us8eY3Z+N8p4yNFM=", + "pom": "sha256-wiNKZ/6wxv6pFlbG5ovSaeJGolN0jE+NBQyTj+MKn8A=" }, - "org/junit/platform#junit-platform-commons/1.10.1": { - "jar": "sha256-fZhV7j8/cfAV6xR5VZv5I3gyQ8JPv72LKb7Y6AmbVnI=", - "module": "sha256-VtNwYvzicEHwtaNfOTxoyK0jr+NLLTDvjgewT8EZ1N0=", - "pom": "sha256-Su81pl6VGRWhPZ920fr/CaeMND5SJC+vNSBDtwx/bzA=" + "org/junit/platform#junit-platform-commons/1.11.0": { + "jar": "sha256-YJMzpFRfkBjrDFkHHv0wZjqen9zlKBIbZaBMJ+X8Jqc=", + "module": "sha256-AjF2P88IOaIFJjYqtOEKJ8ZuvA+yICgexBweQV50vC0=", + "pom": "sha256-DJ/cUOXGT0LhF5+q+aYFRXOJqC6/6Ah9us1Kgglf0LE=" }, - "org/junit/platform#junit-platform-engine/1.10.1": { - "jar": "sha256-uqSORw1t7nNpoKiCDFHaicFGMnntpuE6ME0R9Fkix2A=", - "module": "sha256-KXiTcRuSz0lfdH41o6rLSDELHRNBpFzYTSP5QxxS4p0=", - "pom": "sha256-3X1k/Zr2eJywPFDCWGyRW7hrHizIwH+5dPHbDvhhZA0=" + "org/junit/platform#junit-platform-engine/1.11.0": { + "jar": "sha256-p+ZyecZRxRaUlRK1BpFkdabZ4oTNT0ww0Cm0rXOpRNg=", + "module": "sha256-pdV2XcmtClTaDff0ggiEgxUt0JQsq1n14WqWCO5DmBI=", + "pom": "sha256-uL18viaZMQUQSho0jL3Rfqmcewb4fJc4971vW7e/bPI=" }, - "org/junit/platform#junit-platform-launcher/1.10.1": { - "jar": "sha256-3tQUxQTojQInAzEHGWkIThsv2bz4RD811E2ixuMwG8I=", - "module": "sha256-3ZcDx0TqC54Vv4yeP+vM/B40cBalXXHvf/qbC8TEBRI=", - "pom": "sha256-unroFwQMcqPCbTY6R/wTZIoc0MZOmjgYDd6YGKG1DjM=" + "org/junit/platform#junit-platform-launcher/1.11.0": { + "jar": "sha256-pEU15jmBQjaETiJHIE+JJH0Trwzr3qU6QjFBAN/eGc4=", + "module": "sha256-A9Flx6iZgkDQQUU/YQZExuheR1W5WdlPZgt7hl3nQlM=", + "pom": "sha256-SzmIKleb316Z7TySABcUdnG47OsT3laQlR/hx8vBpd8=" }, - "org/mockito#mockito-bom/4.11.0": { - "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" - }, - "org/mockito#mockito-core/5.8.0": { - "jar": "sha256-wyD2YqA8KVHtzFGkS2TXmo6ZQ3P/VIRTtf2vad6+RoI=", - "pom": "sha256-dJWKzd4UjzC/ox/8CFi2L3H2PMws602KjGfX9CjUOi0=" + "org/mockito#mockito-core/5.14.2": { + "jar": "sha256-IpYUHB4fLhrjXAjTapq0Vj7NZuA1M/6CYwp2TnqkkYI=", + "pom": "sha256-Y45Wpo9JaHm8ig9Tz735xMw5pFtuQ4ozOl6oPAnunP0=" }, "org/objenesis#objenesis-parent/3.3": { "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" @@ -1163,32 +1274,37 @@ "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-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/owasp#dependency-check-core/9.0.7": { - "jar": "sha256-yhlVOSFWYKUSdUlxFj9kDALwPnnBdL0EvhcbksBnl8U=", - "pom": "sha256-GI2Umv65MFI7SOl7FQDigRdEBOqIVpc01HMub3sH7yM=" + "org/owasp#dependency-check-core/9.2.0": { + "jar": "sha256-S3txW4QXlIA5LxkYlTQ8w4B/9lutYnj3KfLhtxGGjC8=", + "pom": "sha256-FZDgZyjQVFzpWRt1csudDWVgZ6YqpKCG33nG9/JGzi0=" }, - "org/owasp#dependency-check-parent/9.0.7": { - "pom": "sha256-tC3i7MCzf4xVwha5dvk6tkhNu+ZoVcf2EtqlsIFfGE0=" + "org/owasp#dependency-check-gradle/9.2.0": { + "jar": "sha256-Iznqka4FX8UtBoVccXME/XGhEWNy8pSxlVUQ/SXLPE4=", + "module": "sha256-TCRgfkiOnZ3yt2snS+uDTl+w+dn7xoPi8c/1m8MhYGA=", + "pom": "sha256-p702oZtsaUAMSYwt5mJaCBpNT3imMlSmJ6UXA42UUaE=" }, - "org/owasp#dependency-check-utils/9.0.7": { - "jar": "sha256-wATn3kAc3d+o07BeQaTt1V5kNRDnIctyTbDwZw9hrkQ=", - "pom": "sha256-0gNTZJ4/NK7UpjuOnKT+dLa0H28PXnQ2gWTtHIt6nu4=" + "org/owasp#dependency-check-parent/9.2.0": { + "pom": "sha256-bn3uFhVlL0dJzt7/LwLQ1+fZMdmcunON1x2L8vTd0d4=" + }, + "org/owasp#dependency-check-utils/9.2.0": { + "jar": "sha256-SeNWuGmwqutpf/9O0QoRvwHPPbyrNPTXrpslwGddBEE=", + "pom": "sha256-0bnOEiKl4X1X4soxGeFOfDAPNIxgLXNPx+cVUdRVUv4=" }, "org/redline-rpm#redline/1.2.10": { "jar": "sha256-LgdOe9QhdOrqyYzrx4Lw17zI3CpBYXkyrJx51WvIbs0=", @@ -1209,9 +1325,9 @@ "jar": "sha256-bQTDhD/JjS7qm6TP8L57gFQMp1xaTgs0Y/0SGcSMxl0=", "pom": "sha256-w7H6Icz/7VRUA6U8EPte8MoMrT+ZCLIASoIjaItyLcg=" }, - "org/semver4j#semver4j/5.2.2": { - "jar": "sha256-zShWFivevNE9TiePyhcLWMqpgjk+fGdKTO2rF7Fj7v4=", - "pom": "sha256-1M+xsnGz86pzi88F0lk5d9zLh+UnIQfwy6NhanC5aHc=" + "org/semver4j#semver4j/5.3.0": { + "jar": "sha256-3s4MlHqOEPYuH0pBfUYub+acGiD+B6yNTgz+SVzcPbo=", + "pom": "sha256-4bSaSe78wjrAapw3clMEPmKjO/K2f8Go72mszhT5YHo=" }, "org/slf4j#jcl-over-slf4j/1.7.28": { "jar": "sha256-uB9fkQ2pcIx6ane3IKfeIBVMztQGW1bzMwGUXASqrXA=", @@ -1224,9 +1340,12 @@ "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" }, - "org/slf4j#slf4j-api/2.0.9": { - "jar": "sha256-CBiTDcjX3rtAMgRhFpHaWOSdQsULb/z9zgLa23w8K2w=", - "pom": "sha256-nDplT50KoaNLMXjr5TqJx2eS4dgfwelznL6bFhBSM4U=" + "org/slf4j#slf4j-api/2.0.12": { + "jar": "sha256-p5UCuKvfvXIoRqJ2kSJqQIhoLW01ZU+bgOKpzKz37Uc=", + "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM=" + }, + "org/slf4j#slf4j-bom/2.0.12": { + "pom": "sha256-SH70mE1wFY9Yw3zodmkxukx+VzdYZYhLdWORv9bQDDk=" }, "org/slf4j#slf4j-bom/2.0.9": { "pom": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM=" @@ -1244,6 +1363,9 @@ "org/slf4j#slf4j-parent/1.7.36": { "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" }, + "org/slf4j#slf4j-parent/2.0.12": { + "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4=" + }, "org/slf4j#slf4j-parent/2.0.9": { "pom": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U=" }, @@ -1286,16 +1408,13 @@ "org/tukaani#xz/1.4": { "pom": "sha256-/kqLT1R/okQ0L7r0pOgPDEg3HYXMQBtYUViRKENiWJI=" }, - "org/tukaani#xz/1.8": { - "pom": "sha256-8p51y4jrSsv35apcCe1V6sLLrmAdY6nzdSMfRUUsEBM=" - }, "org/tukaani#xz/1.9": { "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" }, - "org/vafer#jdeb/1.8": { - "jar": "sha256-N0/gKgkxTabsghngBVmOdgMjoavktxXMM84+KpvNqTI=", - "pom": "sha256-MQdFSRqXEzi0XcwhFMRt6GWvNOWLI96d2JJfEGFewBY=" + "org/vafer#jdeb/1.10": { + "jar": "sha256-JUy7BS9xjzbuKnWulb0uAlGwUT/HbQOLbbvPCUL8wR8=", + "pom": "sha256-MHrEvPUPrNLQSbQxhRmWqNJ3JKWE/LPu5Nk9GNa1Ls4=" }, "org/violetlib#jnr/13": { "jar": "sha256-Rlyk/6Q2LHssoGLvuY13yo/6ceWCp5VN50hBn72/ERA=", @@ -1317,9 +1436,9 @@ "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" }, - "us/springett#cpe-parser/2.0.3": { - "jar": "sha256-xmnSer5OmFsIMkXW8zKEsECJ+zKOdmAnYN5bQLcrqAo=", - "pom": "sha256-m1CINhAtmutHKGcerDe2yRWwaMjJO7B1xL0GIkQ2IDU=" + "us/springett#cpe-parser/2.1.0": { + "jar": "sha256-I2VjRR8JI+4OntCvDOty0oEzAABP1MslsS6sEoxWxHY=", + "pom": "sha256-WQfZBRFMPRM15jPy3An0J4PMtTQ29mUzsU+C+12oOtM=" }, "xml-apis#xml-apis-ext/1.3.04": { "jar": "sha256-0LSIfcNNV95JB0pYr/rUOaAT0Lr/oagDT47ypeoZFkY=", diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix index 28c8f589a99f..1d9a60984dfe 100644 --- a/pkgs/by-name/fr/freeplane/package.nix +++ b/pkgs/by-name/fr/freeplane/package.nix @@ -11,7 +11,7 @@ let pname = "freeplane"; - version = "1.11.14"; + version = "1.12.8"; jdk = jdk17; gradle = gradle_7; @@ -20,7 +20,7 @@ let owner = "freeplane"; repo = "freeplane"; rev = "release-${version}"; - hash = "sha256-zEQjB57iiKVQnH8VtynpEGKNAa2e+WpqnGt6fnv5Rjs="; + hash = "sha256-yzjzaobXuQH8CHz183ditL2LsCXU5xLh4+3El4Ffu20="; }; in From 033d2e3a6a0a6aba729b71d73213acc5cbbac30c Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Mon, 25 Nov 2024 07:29:46 +0000 Subject: [PATCH 19/47] freeplane: use Gradle 8 Upgraded upstream in https://github.com/freeplane/freeplane/commit/dc4421370c8e17b9a79f2218a579a1b8b7afd650. "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." --- pkgs/by-name/fr/freeplane/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix index 1d9a60984dfe..a92d25976e3f 100644 --- a/pkgs/by-name/fr/freeplane/package.nix +++ b/pkgs/by-name/fr/freeplane/package.nix @@ -5,7 +5,7 @@ makeBinaryWrapper, makeDesktopItem, jdk17, - gradle_7, + gradle_8, which, }: @@ -14,7 +14,7 @@ let version = "1.12.8"; jdk = jdk17; - gradle = gradle_7; + gradle = gradle_8; src = fetchFromGitHub { owner = "freeplane"; From fd12a39f61f720f0ca7ba10814eed20dfe10aede Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Dec 2024 21:57:54 +0000 Subject: [PATCH 20/47] kora-icon-theme: 1.6.1 -> 1.6.2 --- pkgs/data/icons/kora-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/kora-icon-theme/default.nix b/pkgs/data/icons/kora-icon-theme/default.nix index 15132fac785e..486f06b614b0 100644 --- a/pkgs/data/icons/kora-icon-theme/default.nix +++ b/pkgs/data/icons/kora-icon-theme/default.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-cWfQiJeyH/bkvASoe2nl4efHQdMpYFh587d5yycs31k="; + sha256 = "sha256-FBUOmiw3Ak1QVUrpj0+pfFqG/oKNnEXMRNlVKVNzK2I="; }; nativeBuildInputs = [ From 3477e197381e87ea5d6e3e03cea4212db5595a00 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 9 Dec 2024 19:32:35 -0700 Subject: [PATCH 21/47] scrcpy: 3.0.2 -> 3.1 https://github.com/Genymobile/scrcpy/releases/tag/v3.1 --- pkgs/by-name/sc/scrcpy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix index afe4147f1930..d2315a53d150 100644 --- a/pkgs/by-name/sc/scrcpy/package.nix +++ b/pkgs/by-name/sc/scrcpy/package.nix @@ -16,12 +16,12 @@ }: let - version = "3.0.2"; + version = "3.1"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-4Z/gJL+jNngJSUQHrWyoCab2532slemfhbp1FE4Lo10="; + hash = "sha256-lY8JRKYvI7HzOhbp6xSETBoEuILKF1pzjBbSPLIrhsA="; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = "scrcpy"; rev = "refs/tags/v${version}"; - hash = "sha256-6CViFgQuazvKGPHGpityEI/mpgOmIBA6LTEHobWybV0="; + hash = "sha256-XxvlwF3vqtkew+P1yuIwBJxYetD+D+v8OKaETU3qVkk="; }; # display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. From af682f39a7dd6e3f700457f412c0d5c83ce49500 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sat, 7 Dec 2024 21:13:07 +0000 Subject: [PATCH 22/47] team-list: establish categorization team Per RFC 146: https://github.com/NixOS/rfcs/blob/master/rfcs/0146-meta-categories.md#categorization-team > "a team entrusted with authority to manage issues related to categorization and carry their corresponding duties" --- maintainers/team-list.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index fe798e939a52..69ef2da68f01 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -134,6 +134,24 @@ with lib.maintainers; shortName = "c3d2"; }; + categorization = { + members = [ + aleksana + fgaz + getpsyched + lyndeno + natsukium + philiptaron + pyrotelekinetic + raskin + sigmasquadron + tomodachi94 + ]; + githubTeams = [ "categorization" ]; + scope = "Maintain the categorization system in Nixpkgs, per RFC 146. This team has authority over all categorization issues in Nixpkgs."; + shortName = "Categorization"; + }; + cinnamon = { members = [ bobby285271 From 41a475a07bc6953a6e48763dc75e3434ccb4b328 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Dec 2024 03:46:00 +0000 Subject: [PATCH 23/47] buffybox: 3.2.0-unstable-2024-11-10 -> 3.2.0-unstable-2024-12-09 --- pkgs/by-name/bu/buffybox/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/buffybox/package.nix b/pkgs/by-name/bu/buffybox/package.nix index 8dcef1f1f0f4..e264825e97fe 100644 --- a/pkgs/by-name/bu/buffybox/package.nix +++ b/pkgs/by-name/bu/buffybox/package.nix @@ -15,15 +15,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "buffybox"; - version = "3.2.0-unstable-2024-11-10"; + version = "3.2.0-unstable-2024-12-09"; src = fetchFromGitLab { domain = "gitlab.postmarketos.org"; owner = "postmarketOS"; repo = "buffybox"; fetchSubmodules = true; # to use its vendored lvgl - rev = "07e324c17564cb9aab573259a8e0824a6806a751"; - hash = "sha256-JY9WqtRjDsQf1UVFnM6oTwyAuhlJvrhcSNJdEZ0zIus="; + rev = "32f4837e836fbb0b820d68c74c3278c925369b04"; + hash = "sha256-d9fa/Zqbm/+WMRmO0hBW83PCTDgaVOAxyRuSTItr9Xs="; }; depsBuildBuild = [ From 2e1411dc2f28a175567e505d41c318aa56680ea7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Dec 2024 11:15:33 +0000 Subject: [PATCH 24/47] s7: 11.2-unstable-2024-11-02 -> 11.2-unstable-2024-12-10 --- pkgs/by-name/s7/s7/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index acc989e0283a..4338358ed1af 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.2-unstable-2024-11-02"; + version = "11.2-unstable-2024-12-10"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "6b6651de318c3360aa2711a445659f372ffe894e"; - hash = "sha256-9x1u60jflESAHgP0gwIDVFwhI5XU5gsAiXaic8zdW2U="; + rev = "9228fbb69835a8b414cba028d56ee7ddf4479e14"; + hash = "sha256-qvkkRc3UivsAAu9b48K+6dpl91MDnTsU/zyN4hfKUCo="; }; buildInputs = [ From ed151d25a0292535cacc5fceec78f6a1bad33bdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Dec 2024 13:43:50 +0000 Subject: [PATCH 25/47] par2cmdline-turbo: 1.1.1 -> 1.2.0 --- pkgs/by-name/pa/par2cmdline-turbo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/par2cmdline-turbo/package.nix b/pkgs/by-name/pa/par2cmdline-turbo/package.nix index c5f2bbde63f5..8b8831dddb83 100644 --- a/pkgs/by-name/pa/par2cmdline-turbo/package.nix +++ b/pkgs/by-name/pa/par2cmdline-turbo/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "par2cmdline-turbo"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "animetosho"; repo = "par2cmdline-turbo"; rev = "v${version}"; - hash = "sha256-EJ6gBja5tPrfsfbqYs8pZDEPmJ6mCPfkUYOTTMFaKG8="; + hash = "sha256-GFMFqHiKoQByD8ZYgGm36ehfMP4CvC2F+u2Va20RSNI="; }; nativeBuildInputs = [ autoreconfHook ]; From 6e180e8e5c890b772c6170b347b7ee4a9ee869f2 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 8 Dec 2024 22:00:32 -0400 Subject: [PATCH 26/47] dotnet/wrapper: don't inherit meta from unwrapped --- pkgs/development/compilers/dotnet/wrapper.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index fe09151fb8fe..90b520519f94 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -22,7 +22,18 @@ type: unwrapped: stdenvNoCC.mkDerivation (finalAttrs: { pname = "${unwrapped.pname}-wrapped"; - inherit (unwrapped) version meta; + inherit (unwrapped) version; + + meta = { + description = "${unwrapped.meta.description or "dotnet"} (wrapper)"; + mainProgram = "dotnet"; + inherit (unwrapped.meta) + homepage + license + maintainers + platforms + ; + }; src = unwrapped; dontUnpack = true; From a5d767c91d7b7d1b3935cdea20ecfd9b762aae2b Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 8 Dec 2024 22:05:47 -0400 Subject: [PATCH 27/47] dotnet/combine-packages: don't inherit meta from cli --- .../development/compilers/dotnet/combine-packages.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dotnet/combine-packages.nix b/pkgs/development/compilers/dotnet/combine-packages.nix index b745a40e878f..6528fb3d56a1 100644 --- a/pkgs/development/compilers/dotnet/combine-packages.nix +++ b/pkgs/development/compilers/dotnet/combine-packages.nix @@ -56,5 +56,14 @@ mkWrapper "sdk" (buildEnv { ); }; - inherit (cli) meta; + meta = { + description = "${cli.meta.description or "dotnet"} (combined)"; + inherit (cli.meta) + homepage + license + mainProgram + maintainers + platforms + ; + }; }) From b5f1e7667d64935243bd5c568856cf9581d71d1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Dec 2024 20:01:26 +0000 Subject: [PATCH 28/47] simplex-chat-desktop: 6.1.1 -> 6.2.0 --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 5fe138d19420..76bb637218cd 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -6,11 +6,11 @@ let pname = "simplex-chat-desktop"; - version = "6.1.1"; + version = "6.2.0"; src = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-FHkZqbbJTQz+gIOgpMiak9u4ZOY/7r+1+if74LHLw/c="; + hash = "sha256-2Ng77oggjdePDNeB0NdC8vkRY4duwzUdde22Hp6dXyM="; }; appimageContents = appimageTools.extract { From f5e50b74a0d797dec009c9f41a712b11f1b55c04 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 10 Dec 2024 20:08:40 +0000 Subject: [PATCH 29/47] treewide: rename python3Packages.debian -> python3Packages.python-debian --- pkgs/by-name/mi/microsoft-edge/update.py | 2 +- pkgs/by-name/sn/snapcraft/package.nix | 2 +- pkgs/development/python-modules/craft-archives/default.nix | 2 ++ .../python-modules/{debian => python-debian}/default.nix | 0 pkgs/development/python-modules/reuse/default.nix | 4 ++-- pkgs/development/tools/click/default.nix | 4 ++-- pkgs/tools/misc/diffoscope/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 9 files changed, 12 insertions(+), 9 deletions(-) rename pkgs/development/python-modules/{debian => python-debian}/default.nix (100%) diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py index c9a048d504c8..e0d007c12f17 100755 --- a/pkgs/by-name/mi/microsoft-edge/update.py +++ b/pkgs/by-name/mi/microsoft-edge/update.py @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python3 -p python3Packages.packaging python3Packages.debian common-updater-scripts +#! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts import base64 import textwrap diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix index 93469dd546ef..963dcdb21e64 100644 --- a/pkgs/by-name/sn/snapcraft/package.nix +++ b/pkgs/by-name/sn/snapcraft/package.nix @@ -82,7 +82,7 @@ python3Packages.buildPythonApplication rec { craft-platforms craft-providers craft-store - debian + python-debian docutils jsonschema launchpadlib diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index f401b5fb5294..c0d72355263d 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -8,6 +8,7 @@ overrides, pydantic, setuptools, + python-debian, setuptools-scm, tabulate, pytest-check, @@ -44,6 +45,7 @@ buildPythonPackage rec { overrides pydantic tabulate + python-debian ]; pythonImportsCheck = [ "craft_archives" ]; diff --git a/pkgs/development/python-modules/debian/default.nix b/pkgs/development/python-modules/python-debian/default.nix similarity index 100% rename from pkgs/development/python-modules/debian/default.nix rename to pkgs/development/python-modules/python-debian/default.nix diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix index 19ce6386b45e..2048406fd23f 100644 --- a/pkgs/development/python-modules/reuse/default.nix +++ b/pkgs/development/python-modules/reuse/default.nix @@ -14,7 +14,7 @@ binaryornot, boolean-py, click, - debian, + python-debian, jinja2, license-expression, tomlkit, @@ -56,7 +56,7 @@ buildPythonPackage rec { binaryornot boolean-py click - debian + python-debian jinja2 license-expression tomlkit diff --git a/pkgs/development/tools/click/default.nix b/pkgs/development/tools/click/default.nix index b703b2a4eb63..97950147254c 100644 --- a/pkgs/development/tools/click/default.nix +++ b/pkgs/development/tools/click/default.nix @@ -3,7 +3,7 @@ fetchFromGitLab, buildPythonApplication, autoreconfHook, - debian, + python-debian, perl, vala, pkg-config, @@ -78,7 +78,7 @@ buildPythonApplication { ]; propagatedBuildInputs = [ - debian + python-debian pygobject3 setuptools ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index b71bf958f32b..e7ff78a8a542 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -190,7 +190,7 @@ python.pkgs.buildPythonApplication rec { ] ++ (with python.pkgs; [ argcomplete - debian + python-debian defusedxml jsbeautifier jsondiff diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7c18c3d69dd2..5d188743792e 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -136,6 +136,7 @@ mapAliases ({ d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 dateutil = python-dateutil; # added 2021-07-03 + debian = python-debian; # added 2024-12-10 deep_merge = throw "deep_merge has been removed, since it is no longer maintained and may be broken."; # added 2023-10-09 demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 descartes = throw "descartes has been removed, since it is abandoned and broken"; # added 2023-06-21 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 635c2d2ac947..e8b241bfcd40 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3058,8 +3058,6 @@ self: super: with self; { deap = callPackage ../development/python-modules/deap { }; - debian = callPackage ../development/python-modules/debian { }; - debianbts = callPackage ../development/python-modules/debianbts { }; debian-inspector = callPackage ../development/python-modules/debian-inspector { }; @@ -9362,6 +9360,8 @@ self: super: with self; { python-bugzilla = callPackage ../development/python-modules/python-bugzilla { }; + python-debian = callPackage ../development/python-modules/python-debian { }; + python-hcl2 = callPackage ../development/python-modules/python-hcl2 { }; python-lorem = callPackage ../development/python-modules/python-lorem { }; From 800a740ea8437feec6c4814fe25318f6112e4e5c Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 10 Dec 2024 17:45:54 +0000 Subject: [PATCH 30/47] python3Packages.craft-archives: 2.0.0 -> 2.0.2 --- .../python-modules/craft-archives/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/craft-archives/default.nix b/pkgs/development/python-modules/craft-archives/default.nix index c0d72355263d..efa3965a4128 100644 --- a/pkgs/development/python-modules/craft-archives/default.nix +++ b/pkgs/development/python-modules/craft-archives/default.nix @@ -5,12 +5,12 @@ nix-update-script, launchpadlib, lazr-restfulclient, + lazr-uri, overrides, pydantic, - setuptools, python-debian, + distro, setuptools-scm, - tabulate, pytest-check, pytest-mock, pytestCheckHook, @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "craft-archives"; - version = "2.0.0"; + version = "2.0.2"; pyproject = true; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-archives"; rev = "refs/tags/${version}"; - hash = "sha256-BrKyOdfbwt9qU5Bt/kX/+GgxH7LCFmmFg4mevBWVp2I="; + hash = "sha256-1HEz4d1WLQDDHga7X+V/37n8E7JK/k0z+UDeNEiLOHs="; }; postPatch = '' @@ -40,11 +40,12 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; dependencies = [ + distro launchpadlib lazr-restfulclient + lazr-uri overrides pydantic - tabulate python-debian ]; From 778e494d9eb13e5e9270181ffb46c11ba3ff5258 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 10 Dec 2024 17:50:30 +0000 Subject: [PATCH 31/47] python3Packages.craft-parts: 2.1.3 -> 2.1.4 --- pkgs/development/python-modules/craft-parts/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/craft-parts/default.nix b/pkgs/development/python-modules/craft-parts/default.nix index 2edba40f9465..bececc2a50de 100644 --- a/pkgs/development/python-modules/craft-parts/default.nix +++ b/pkgs/development/python-modules/craft-parts/default.nix @@ -9,7 +9,6 @@ pyyaml, requests, requests-unixsocket, - urllib3, pytestCheckHook, pytest-check, pytest-mock, @@ -25,7 +24,7 @@ buildPythonPackage rec { pname = "craft-parts"; - version = "2.1.3"; + version = "2.1.4"; pyproject = true; @@ -33,7 +32,7 @@ buildPythonPackage rec { owner = "canonical"; repo = "craft-parts"; rev = "refs/tags/${version}"; - hash = "sha256-ouvl4mIDIWHWp84E1I41g/XnP22kCV55CqsVLit5yb4="; + hash = "sha256-z0Om1/0Y6fDFHXB0GKFelmYwNwTH7loTtRjXtmjsjkY="; }; patches = [ ./bash-path.patch ]; @@ -53,7 +52,6 @@ buildPythonPackage rec { pyyaml requests requests-unixsocket - urllib3 ]; pythonImportsCheck = [ "craft_parts" ]; From e6c72076b497a6361b43876f17c121efe7fb86c9 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 10 Dec 2024 19:49:56 +0000 Subject: [PATCH 32/47] rockcraft: add tabulate to check inputs --- pkgs/by-name/ro/rockcraft/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ro/rockcraft/package.nix b/pkgs/by-name/ro/rockcraft/package.nix index aff67bc26408..4b544879a611 100644 --- a/pkgs/by-name/ro/rockcraft/package.nix +++ b/pkgs/by-name/ro/rockcraft/package.nix @@ -42,6 +42,7 @@ python3Packages.buildPythonApplication rec { pytest-mock pytest-subprocess pytestCheckHook + tabulate ] ++ [ dpkg ]; From 2928dcaf2918fea68fd5b1fd4fae5b06738cedf5 Mon Sep 17 00:00:00 2001 From: x123 Date: Sat, 26 Oct 2024 20:37:31 +0200 Subject: [PATCH 33/47] inkscape: refactor meta --- pkgs/applications/graphics/inkscape/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index d80b7e820261..9a08f876a1df 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -184,12 +184,14 @@ stdenv.mkDerivation rec { passthru.tests.ps2pdf-plugin = callPackage ./test-ps2pdf-plugin.nix { }; - meta = with lib; { + meta = { description = "Vector graphics editor"; homepage = "https://www.inkscape.org"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.jtojnar ]; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + jtojnar + ]; + platforms = lib.platforms.all; mainProgram = "inkscape"; longDescription = '' Inkscape is a feature-rich vector graphics editor that edits From 989f87745ba2ba6225ca200a1820756cd4b96656 Mon Sep 17 00:00:00 2001 From: x123 Date: Sat, 26 Oct 2024 20:38:40 +0200 Subject: [PATCH 34/47] inkscape: add x123 as maintainer --- pkgs/applications/graphics/inkscape/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 9a08f876a1df..01d3c01398be 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -190,6 +190,7 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ jtojnar + x123 ]; platforms = lib.platforms.all; mainProgram = "inkscape"; From d4b61ee6e351ef4ae2eaa5584f12c9890bd0f885 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 10 Dec 2024 16:19:03 +0100 Subject: [PATCH 35/47] inkscape: add Luflosi as maintainer --- pkgs/applications/graphics/inkscape/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 01d3c01398be..f1484ca36974 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -191,6 +191,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ jtojnar x123 + Luflosi ]; platforms = lib.platforms.all; mainProgram = "inkscape"; From b31ee5c7e268c71b559df70f5ea3455c0c4deaef Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 12 Jul 2024 22:35:53 +0200 Subject: [PATCH 36/47] =?UTF-8?q?lib2geom:=201.3=20=E2=86=92=201.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.com/inkscape/lib2geom/-/compare/1.3...1.4 Also migrate to pkgs/by-name. The `stdenv` override is no longer necessary. --- .../li/lib2geom/package.nix} | 40 ++++++------------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 13 insertions(+), 31 deletions(-) rename pkgs/{development/libraries/lib2geom/default.nix => by-name/li/lib2geom/package.nix} (58%) diff --git a/pkgs/development/libraries/lib2geom/default.nix b/pkgs/by-name/li/lib2geom/package.nix similarity index 58% rename from pkgs/development/libraries/lib2geom/default.nix rename to pkgs/by-name/li/lib2geom/package.nix index 9548ee49408a..13e9219537fa 100644 --- a/pkgs/development/libraries/lib2geom/default.nix +++ b/pkgs/by-name/li/lib2geom/package.nix @@ -1,6 +1,5 @@ { stdenv, - fetchpatch, fetchFromGitLab, cmake, ninja, @@ -16,7 +15,7 @@ stdenv.mkDerivation rec { pname = "lib2geom"; - version = "1.3"; + version = "1.4"; outputs = [ "out" @@ -27,33 +26,9 @@ stdenv.mkDerivation rec { owner = "inkscape"; repo = "lib2geom"; rev = "refs/tags/${version}"; - hash = "sha256-llUpW8VRBD8RKaGfyedzsMbLRb8DIo0ePt6m2T2w7Po="; + hash = "sha256-kbcnefzNhUj/ZKZaB9r19bpI68vxUKOLVAwUXSr/zz0="; }; - patches = [ - # Fix compilation with Clang. - # https://gitlab.com/inkscape/lib2geom/-/merge_requests/102 - (fetchpatch { - url = "https://gitlab.com/inkscape/lib2geom/-/commit/a5b5ac7d992023f8a80535ede60421e73ecd8e20.patch"; - hash = "sha256-WJYkk3WRYVyPSvyTbKDUrYvUwFgKA9mmTiEWtYQqM4Q="; - }) - (fetchpatch { - url = "https://gitlab.com/inkscape/lib2geom/-/commit/23d9393af4bee17aeb66a3c13bdad5dbed982d08.patch"; - hash = "sha256-LAaGMIXpDI/Wzv5E2LasW1Y2/G4ukhuEzDmFu3AzZOA="; - }) - - # Fix ellipses rendering near page corners. - # https://gitlab.com/inkscape/lib2geom/-/issues/66 - (fetchpatch { - url = "https://gitlab.com/inkscape/lib2geom/-/commit/039ce8d4af23a0a2a9d48eb970b321d9795dcc08.patch"; - hash = "sha256-JfgGrqBcYSYKcdl4Bt7vGZ4aTBPSHM6JjZ95IlzxPwI="; - }) - (fetchpatch { - url = "https://gitlab.com/inkscape/lib2geom/-/commit/cf523857e48c87f9f6a09217bdf935fff457823d.patch"; - hash = "sha256-BRg8ANHMSgoi6vt9PNbhwG1fRkzEPXb4gPTPO3sY0XE="; - }) - ]; - nativeBuildInputs = [ cmake ninja @@ -91,6 +66,17 @@ stdenv.mkDerivation rec { # Fails due to rounding differences # https://gitlab.com/inkscape/lib2geom/-/issues/70 "circle-test" + ] + ++ lib.optionals (stdenv.hostPlatform.system != "x86_64-linux") [ + # https://gitlab.com/inkscape/lib2geom/-/issues/69 + "polynomial-test" + + # https://gitlab.com/inkscape/lib2geom/-/issues/75 + "line-test" + + # Failure observed on aarch64-darwin + "bezier-test" + "ellipse-test" ]; in '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 643a1e65738a..4e4444f66d4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9626,10 +9626,6 @@ with pkgs; lcms = lcms2; - lib2geom = callPackage ../development/libraries/lib2geom { - stdenv = if stdenv.cc.isClang then llvmPackages_13.stdenv else stdenv; - }; - libacr38u = callPackage ../tools/security/libacr38u { inherit (darwin.apple_sdk.frameworks) IOKit; }; From 5a072ae0ed1f073226cec73ce2bd61e3ddb838f3 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 13 Oct 2024 13:30:24 +0200 Subject: [PATCH 37/47] inkscape: 1.3.2 -> 1.4 https://gitlab.com/inkscape/inkscape/-/releases/INKSCAPE_1_4 --- .../graphics/inkscape/default.nix | 73 ++++++++++--------- .../python-modules/inkex/default.nix | 17 +---- 2 files changed, 40 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index f1484ca36974..566b92eda2d0 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -7,7 +7,7 @@ , cmake , desktopToDarwinBundle , fetchurl -, fetchpatch +, fd , gettext , ghostscript , glib @@ -27,7 +27,6 @@ , librevenge , librsvg , libsigcxx -, libsoup_2_4 , libvisio , libwpg , libXft @@ -40,40 +39,43 @@ , popt , potrace , python3 +, runCommand , substituteAll , wrapGAppsHook3 , libepoxy , zlib +, yq }: let python3Env = python3.withPackages (ps: with ps; [ + # List taken almost verbatim from the output of nix-build -A inkscape.passthru.pythonDependencies appdirs beautifulsoup4 cachecontrol - ] - # CacheControl requires extra runtime dependencies for FileCache - # https://gitlab.com/inkscape/extras/extension-manager/-/commit/9a4acde6c1c028725187ff5972e29e0dbfa99b06 - ++ cachecontrol.optional-dependencies.filecache - ++ [ - numpy + cssselect + filelock + inkex lxml + numpy packaging pillow - scour + pygobject3 pyparsing pyserial requests - pygobject3 - ] ++ inkex.propagatedBuildInputs); + scour + tinycss2 + zstandard + ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "inkscape"; - version = "1.3.2"; + version = "1.4"; src = fetchurl { - url = "https://inkscape.org/release/inkscape-${version}/source/archive/xz/dl/inkscape-${version}.tar.xz"; - sha256 = "sha256-29GETcRD/l4Q0+mohxROX7ciOFL/8ZHPte963qsOCGs="; + url = "https://inkscape.org/release/inkscape-${finalAttrs.version}/source/archive/xz/dl/inkscape-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-xZqFRTtpmt3rzVHB3AdoTdlqEMiuxxaxlVHbUFYuE/U="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be @@ -87,29 +89,13 @@ stdenv.mkDerivation rec { src = ./fix-python-paths.patch; # Python is used at run-time to execute scripts, # e.g., those from the "Effects" menu. - python3 = "${python3Env}/bin/python"; + python3 = lib.getExe python3Env; }) (substituteAll { # Fix path to ps2pdf binary src = ./fix-ps2pdf-path.patch; inherit ghostscript; }) - - # Fix build with libxml2 2.12 - # https://gitlab.com/inkscape/inkscape/-/merge_requests/6089 - (fetchpatch { - url = "https://gitlab.com/inkscape/inkscape/-/commit/694d8ae43d06efff21adebf377ce614d660b24cd.patch"; - hash = "sha256-9IXJzpZbNU5fnt7XKgqCzUDrwr08qxGwo8TqnL+xc6E="; - }) - - # Improve distribute along path precision - # https://gitlab.com/inkscape/extensions/-/issues/580 - (fetchpatch { - url = "https://gitlab.com/inkscape/extensions/-/commit/c576043c195cd044bdfc975e6367afb9b655eb14.patch"; - extraPrefix = "share/extensions/"; - stripLen = 1; - hash = "sha256-D9HxBx8RNkD7hHuExJqdu3oqlrXX6IOUw9m9Gx6+Dr8="; - }) ]; postPatch = '' @@ -119,7 +105,7 @@ stdenv.mkDerivation rec { # double-conversion is a dependency of 2geom substituteInPlace CMakeScripts/DefineDependsandFlags.cmake \ - --replace 'find_package(DoubleConversion REQUIRED)' "" + --replace-fail 'find_package(DoubleConversion REQUIRED)' "" ''; nativeBuildInputs = [ @@ -155,7 +141,6 @@ stdenv.mkDerivation rec { librevenge librsvg # for loading icons libsigcxx - libsoup_2_4 libvisio libwpg libXft @@ -182,7 +167,23 @@ stdenv.mkDerivation rec { done ''; - passthru.tests.ps2pdf-plugin = callPackage ./test-ps2pdf-plugin.nix { }; + passthru = { + tests = { + ps2pdf-plugin = callPackage ./test-ps2pdf-plugin.nix { }; + inherit (python3.pkgs) inkex; + }; + + pythonDependencies = runCommand "python-dependency-list" { + nativeBuildInputs = [ + fd + yq + ]; + inherit (finalAttrs) src; + } '' + unpackPhase + tomlq --slurp 'map(.tool.poetry.dependencies | to_entries | map(.key)) | flatten | map(ascii_downcase) | unique' $(fd pyproject.toml) > "$out" + ''; + }; meta = { description = "Vector graphics editor"; @@ -202,4 +203,4 @@ stdenv.mkDerivation rec { If you want to import .eps files install ps2edit. ''; }; -} +}) diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix index 2435c7e46786..c3c65ae3184f 100644 --- a/pkgs/development/python-modules/inkex/default.nix +++ b/pkgs/development/python-modules/inkex/default.nix @@ -3,7 +3,6 @@ stdenv, buildPythonPackage, inkscape, - fetchpatch, poetry-core, cssselect, lxml, @@ -14,6 +13,7 @@ pyparsing, pyserial, scour, + tinycss2, gobject-introspection, pytestCheckHook, gtk3, @@ -27,17 +27,6 @@ buildPythonPackage { inherit (inkscape) src; - patches = [ - # Fix “distribute along path” test with Python 3.12. - # https://gitlab.com/inkscape/extensions/-/issues/580 - (fetchpatch { - url = "https://gitlab.com/inkscape/extensions/-/commit/c576043c195cd044bdfc975e6367afb9b655eb14.patch"; - extraPrefix = "share/extensions/"; - stripLen = 1; - hash = "sha256-D9HxBx8RNkD7hHuExJqdu3oqlrXX6IOUw9m9Gx6+Dr8="; - }) - ]; - nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ @@ -46,6 +35,7 @@ buildPythonPackage { numpy pygobject3 pyserial + tinycss2 ]; pythonImportsCheck = [ "inkex" ]; @@ -87,8 +77,7 @@ buildPythonPackage { cd share/extensions substituteInPlace pyproject.toml \ - --replace-fail 'scour = "^0.37"' 'scour = ">=0.37"' \ - --replace-fail 'lxml = "^4.5.0"' 'lxml = "^4.5.0 || ^5.0.0"' + --replace-fail 'scour = "^0.37"' 'scour = ">=0.37"' ''; meta = { From 368ac90b38e442bcfa49eb7bdc98a7183b182dc2 Mon Sep 17 00:00:00 2001 From: x123 Date: Sat, 26 Oct 2024 21:39:36 +0200 Subject: [PATCH 38/47] svg2tikz: mark as broken --- pkgs/development/python-modules/svg2tikz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index d079222d53ad..5ef700eadc17 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -50,5 +50,6 @@ buildPythonPackage rec { dotlambda gal_bolle ]; + broken = true; }; } From e8df65937267c2bc06bc7c562410fae84f4d7329 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 10 Dec 2024 15:10:15 -0400 Subject: [PATCH 39/47] dotnet: force evaluation of sdk nuget packages This causes evaluation of the nuget packages to fail when the SDK is insecure, without requiring the individual packages to be permitted. --- .../compilers/dotnet/build-dotnet.nix | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index ede86ad04eb4..5a7418709aec 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -98,7 +98,7 @@ let in mkWrapper type ( - stdenv.mkDerivation rec { + stdenv.mkDerivation (finalAttrs: { inherit pname version; # Some of these dependencies are `dlopen()`ed. @@ -194,19 +194,29 @@ mkWrapper type ( { inherit icu hasILCompiler; } - // lib.optionalAttrs (type == "sdk") { - packages = commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid}; - inherit targetPackages runtime aspnetcore; + // lib.optionalAttrs (type == "sdk") ( + let + # force evaluation of the SDK package to ensure evaluation failures + # (e.g. due to vulnerabilities) propagate to the nuget packages + forceSDKEval = builtins.seq finalAttrs.finalPackage.drvPath; + in + { + packages = map forceSDKEval ( + commonPackages ++ hostPackages.${hostRid} ++ targetPackages.${targetRid} + ); + targetPackages = lib.mapAttrs (_: map forceSDKEval) targetPackages; + inherit runtime aspnetcore; - updateScript = - let - majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); - in - [ - ./update.sh - majorVersion - ]; - }; + updateScript = + let + majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); + in + [ + ./update.sh + majorVersion + ]; + } + ); meta = with lib; { description = builtins.getAttr type descriptions; @@ -239,5 +249,5 @@ mkWrapper type ( "Dotnet SDK ${version} is EOL, please use 8.0 (LTS) or 9.0 (Current)" ]; }; - } + }) ) From ac5082f8e44e234a0e32af00542c2705d0c244dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Dec 2024 23:35:45 +0000 Subject: [PATCH 40/47] syshud: 0-unstable-2024-11-12 -> 0-unstable-2024-11-25 --- pkgs/by-name/sy/syshud/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix index 46a1a32ad387..8702978a8602 100644 --- a/pkgs/by-name/sy/syshud/package.nix +++ b/pkgs/by-name/sy/syshud/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "syshud"; - version = "0-unstable-2024-11-12"; + version = "0-unstable-2024-11-25"; src = fetchFromGitHub { owner = "System64fumo"; repo = "syshud"; - rev = "734d632ca0665a288d1308f883d974462fa2d349"; - hash = "sha256-Rk0q/veBEJh8BHZZoFcGZ+Beh8mWGGi2OiuGlM0NEgs="; + rev = "922d3fbc811644cb14d0f11cff91f8e8f97eca56"; + hash = "sha256-ubsmkC/mjDe/6AH/2Y6e9CmhBX3CxtOW2xOhvPJiAqg="; }; postPatch = '' From 45344f2de4dde33632736b62e24ae9613460a5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Wed, 11 Dec 2024 01:54:58 +0100 Subject: [PATCH 41/47] houdini: fix fhsenv version (#363168) --- pkgs/by-name/ho/houdini/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/houdini/package.nix b/pkgs/by-name/ho/houdini/package.nix index 4a0a24239a0b..bfe0ba6e057f 100644 --- a/pkgs/by-name/ho/houdini/package.nix +++ b/pkgs/by-name/ho/houdini/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, writeScript, ncurses5, callPackage, buildFHSEnv, unwrapped ? callPackage ./runtime.nix {} }: buildFHSEnv rec { - name = "houdini-${unwrapped.version}"; + inherit (unwrapped) pname version; # houdini spawns hserver (and other license tools) that is supposed to live beyond the lifespan of houdini process dieWithParent = false; @@ -76,7 +76,7 @@ buildFHSEnv rec { "houdini/sbin/sesinetd" ]; in '' - WRAPPER=$out/bin/${name} + WRAPPER=$out/bin/houdini EXECUTABLES="${lib.concatStringsSep " " executables}" for executable in $EXECUTABLES; do mkdir -p $out/$(dirname $executable) @@ -94,7 +94,7 @@ buildFHSEnv rec { "--ro-bind-try /etc/OpenCL/vendors /etc/OpenCL/vendors" # this is the case of not NixOS ]; - runScript = writeScript "${name}-wrapper" '' + runScript = writeScript "houdini-wrapper" '' # ncurses5 is needed by hfs ocl backend # workaround for this issue: https://github.com/NixOS/nixpkgs/issues/89769 export LD_LIBRARY_PATH=${lib.makeLibraryPath [ncurses5]}:$LD_LIBRARY_PATH From 0fc40be15941fe3ac1d01e379b61907d8770fede Mon Sep 17 00:00:00 2001 From: ob7 Date: Tue, 10 Dec 2024 15:57:57 -0900 Subject: [PATCH 42/47] tenere: init at 0.11.2 (#363556) * maintainers: add ob7 * tenere: init at 0.11.2-0f3181a Terminal interface for large language models (LLMs). Adds a new package that provides a TUI for interacting with LLM services like Ollama. https://github.com/pythops/tenere --- maintainers/maintainer-list.nix | 7 +++++++ pkgs/by-name/te/tenere/package.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/by-name/te/tenere/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e0cf67ab44f2..cdbf962fb4ec 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16348,6 +16348,13 @@ github = "oaksoaj"; githubId = 103952141; }; + ob7 = { + name = "ob7"; + email = "dev@ob7.us"; + github = "ob7"; + githubId = 6877929; + keys = [ { fingerprint = "5C1C 0251 FA85 8C62 0E96 7AC5 2766 5625 0571 34E4"; } ]; + }; obadz = { email = "obadz-nixos@obadz.com"; github = "obadz"; diff --git a/pkgs/by-name/te/tenere/package.nix b/pkgs/by-name/te/tenere/package.nix new file mode 100644 index 000000000000..fd2a56b74331 --- /dev/null +++ b/pkgs/by-name/te/tenere/package.nix @@ -0,0 +1,26 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "tenere"; + version = "0.11.2-unstable-2024-12-05"; + src = fetchFromGitHub { + owner = "pythops"; + repo = "tenere"; + rev = "0f3181ab23066aa69aa4fec387a7e16578078179"; + hash = "sha256-HKPCX0bmXkB3LwvgE1li3dlWTgpW5CXuWZNq3mFY6FY="; + }; + cargoHash = "sha256-u6QCs3RaLeRoVfhRzUG7wwx7kd0O3KyiC5vhZ3mE7UM="; + + requiredSystemFeatures = [ "big-parallel" ]; # for fat LTO from upstream + + meta = { + description = "Terminal interface for large language models (LLMs)"; + homepage = "https://github.com/pythops/tenere"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ob7 ]; + mainProgram = "tenere"; + }; +} From e812c28e811b53479f60ec4f4a4a0450dfb5a5ac Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 10 Dec 2024 05:44:28 +0100 Subject: [PATCH 43/47] =?UTF-8?q?networkmanager-vpnc:=201.2.8=20=E2=86=92?= =?UTF-8?q?=201.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/-/compare/1.2.8...1.4.0 --- pkgs/by-name/ne/networkmanager-vpnc/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix index a63039b2dea9..aa8899151753 100644 --- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix +++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix @@ -3,7 +3,6 @@ , fetchurl , substituteAll , vpnc -, intltool , pkg-config , networkmanager , libsecret @@ -20,11 +19,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-vpnc"; - version = "1.2.8"; + version = "1.4.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager-vpnc/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1l4xqlPI/cP95++EpNqpeaYFwj/THO/2R79+qqma+8w="; + sha256 = "47KpiIAnWht1FUvDF6eGQ8/fnqfnDfTu2WSPKeolNzA="; }; patches = [ @@ -35,7 +34,6 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - intltool pkg-config file ]; From de031286612961febfb0ef0fd76a4608eff64b0c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 3 Dec 2024 21:49:16 +0100 Subject: [PATCH 44/47] =?UTF-8?q?ocamlPackages.utop:=202.14.0=20=E2=86=92?= =?UTF-8?q?=202.15.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/utop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 7c92c1acdd22..29c44bb08bbc 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -6,14 +6,14 @@ buildDunePackage rec { pname = "utop"; - version = "2.14.0"; + version = "2.15.0"; propagatedBuildInputs = [ findlib lambda-term xdg zed logs ]; minimalOCamlVersion = "4.11"; src = fetchurl { - url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "sha256-D9WpvFtFhSSnFGOh/gzRb5t74TZzrjAxGLchbg0nO6k="; + url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tar.gz"; + hash = "sha256-dlneoKf3pbFuMAJO5oFEUXn4wPh2MOXNrlVCgNrNb6w="; }; nativeBuildInputs = [ makeWrapper cppo ]; From d6af3b31b3da139f960cd80fd1ad3631f28c563e Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Tue, 10 Dec 2024 22:36:41 -0700 Subject: [PATCH 45/47] spotdl: 4.2.8 -> 4.2.10 --- pkgs/by-name/sp/spotdl/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix index e7ced0c1e9d4..579f986ea8cd 100644 --- a/pkgs/by-name/sp/spotdl/package.nix +++ b/pkgs/by-name/sp/spotdl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.8"; + version = "4.2.10"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "refs/tags/v${version}"; - hash = "sha256-1NPYMyiYWWpiGlr80IcILcC1nI8zkmf7+aA+mqwSAU0="; + hash = "sha256-F97g5AhyXXYEICb/0RcfVPype8PVfFAKFEX0Xyg1QoI="; }; build-system = with python3.pkgs; [ poetry-core ]; @@ -36,6 +36,7 @@ python3.pkgs.buildPythonApplication rec { spotipy syncedlyrics uvicorn + websockets yt-dlp ytmusicapi ] ++ python-slugify.optional-dependencies.unidecode; From 83b3052499b2ca1ed26a2f1cbfc4ab64b0025fbe Mon Sep 17 00:00:00 2001 From: David Thievon <131907205+DOD-101@users.noreply.github.com> Date: Wed, 11 Dec 2024 06:58:49 +0100 Subject: [PATCH 46/47] config-store: init at 1.0.0 (#363701) * maintainers: add dod-101 * config-store: init at 1.0.0 Co-authored-by: seth --------- Co-authored-by: David Thievon Co-authored-by: seth --- maintainers/maintainer-list.nix | 6 +++++ pkgs/by-name/co/config-store/package.nix | 30 ++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/by-name/co/config-store/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cdbf962fb4ec..013cf15b614f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5829,6 +5829,12 @@ githubId = 129093; name = "Desmond O. Chang"; }; + dod-101 = { + email = "david.thievon@proton.me"; + github = "DOD-101"; + githubId = 131907205; + name = "David Thievon"; + }; domenkozar = { email = "domen@dev.si"; github = "domenkozar"; diff --git a/pkgs/by-name/co/config-store/package.nix b/pkgs/by-name/co/config-store/package.nix new file mode 100644 index 000000000000..af50410e378d --- /dev/null +++ b/pkgs/by-name/co/config-store/package.nix @@ -0,0 +1,30 @@ +{ + rustPlatform, + fetchFromGitHub, + lib, +}: +rustPlatform.buildRustPackage rec { + pname = "config-store"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "DOD-101"; + repo = "config-store"; + tag = "v${version}"; + hash = "sha256-dmFIB9tVI5/hnI+VKeawFzKi6UJrRis0tpeQE5a5dGU="; + }; + + cargoHash = "sha256-tEhk6vDan5uaP1vvKanB+juKsGJndrJPP67kudds24s="; + + meta = { + description = "Simple key-value store designed to be used from shell scripts written in Rust"; + homepage = "https://github.com/DOD-101/config-store"; + mainProgram = "config-store"; + license = with lib.licenses; [ + mit + asl20 + ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ dod-101 ]; + }; +} From d87246a418a9aefd553fc2ae48380aedef90bdfb Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Wed, 11 Dec 2024 13:59:24 +0800 Subject: [PATCH 47/47] conda: fix aarch64-linux (#363620) --- pkgs/by-name/co/conda/package.nix | 37 +++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix index 00b55b26ab5c..9fbfa31b90ca 100644 --- a/pkgs/by-name/co/conda/package.nix +++ b/pkgs/by-name/co/conda/package.nix @@ -44,10 +44,26 @@ # $ conda install spyder let version = "24.9.2"; - src = fetchurl { - url = "https://repo.anaconda.com/miniconda/Miniconda3-py312_${version}-0-Linux-x86_64.sh"; - hash = "sha256-jZNrpgAwDgjso9h03uiMYcbzkwNZeytmuu5Ur097QSI="; - }; + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} + or (throw "conda: ${stdenv.hostPlatform.system} is not supported"); + src = + let + arch = selectSystem { + x86_64-linux = "x86_64"; + aarch64-linux = "aarch64"; + }; + hash = selectSystem { + x86_64-linux = "sha256-jZNrpgAwDgjso9h03uiMYcbzkwNZeytmuu5Ur097QSI="; + aarch64-linux = "sha256-hrjfdIFkbPh+d4c+l4mtt1abWCSNOqYp6y2jXm8uLu0="; + }; + in + fetchurl { + url = "https://repo.anaconda.com/miniconda/Miniconda3-py312_${version}-0-Linux-${arch}.sh"; + inherit hash; + }; + conda = ( let libPath = lib.makeLibraryPath [ @@ -99,7 +115,7 @@ buildFHSEnv { # Some other required environment variables export FONTCONFIG_FILE=/etc/fonts/fonts.conf export QTCOMPOSE=${xorg.libX11}/share/X11/locale - export LIBARCHIVE=${libarchive.lib}/lib/libarchive.so + export LIBARCHIVE=${lib.getLib libarchive}/lib/libarchive.so # Allows `conda activate` to work properly condaSh=${installationPath}/etc/profile.d/conda.sh if [ ! -f $condaSh ]; then @@ -111,11 +127,14 @@ buildFHSEnv { runScript = "bash -l"; meta = { - description = "Conda is a package manager for Python"; + description = "Package manager for Python"; mainProgram = "conda-shell"; - homepage = "https://conda.io/"; - platforms = lib.platforms.linux; - license = lib.licenses.bsd3; + homepage = "https://conda.io"; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; + license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ jluttine ]; }; }