From d5c9f4b273aae04aa38a53a4794dc107ee4fed97 Mon Sep 17 00:00:00 2001 From: Scott Dier Date: Mon, 27 May 2024 00:32:15 +0200 Subject: [PATCH 001/227] timescaledb_toolkit: Fix license metadata to TSL license. --- pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix index 96bff3fe20b3..eb2f5750059e 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix @@ -40,7 +40,7 @@ homepage = "https://github.com/timescale/timescaledb-toolkit"; maintainers = with maintainers; [ typetetris ]; platforms = postgresql.meta.platforms; - license = licenses.asl20; + license = licenses.tsl; # as it needs to be used with timescaledb, simply use the condition from there broken = stdenv.isDarwin; From 952b1a3d96976364fef3ebf239829dda5436151c Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Mon, 10 Jun 2024 12:00:00 +0000 Subject: [PATCH 002/227] nixos/btrbk: undeprecate extraPackages it is required on systems where ssh access is configured for lz4-compressed btrfs send, but no instances are present. fixes https://github.com/NixOS/nixpkgs/issues/316676 --- nixos/doc/manual/release-notes/rl-2405.section.md | 4 +--- nixos/modules/services/backup/btrbk.nix | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 165e3e13a78e..01af034700af 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -680,9 +680,7 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi The previous native backends remain available but are now minimally maintained. Refer to [upstream documentation](https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend) for further details about each platform. - `services.btrbk` now automatically selects and provides required compression - program depending on the configured `stream_compress` option. Since this - replaces the need for the `extraPackages` option, this option will be - deprecated in future releases. + program depending on the configured `stream_compress` option. - `services.github-runner` module has been removed. To configure a single GitHub Actions Runner refer to `services.github-runners.*`. Note that this will trigger a new runner registration. diff --git a/nixos/modules/services/backup/btrbk.nix b/nixos/modules/services/backup/btrbk.nix index 06ca4236eaf2..fa6c67ff7cbf 100644 --- a/nixos/modules/services/backup/btrbk.nix +++ b/nixos/modules/services/backup/btrbk.nix @@ -204,10 +204,6 @@ in }; config = mkIf (sshEnabled || serviceEnabled) { - warnings = optional (cfg.extraPackages != []) '' - extraPackages option will be deprecated in future releases. Programs required for compression are now automatically selected depending on services.btrbk.instances..settings.stream_compress option. - ''; - environment.systemPackages = [ pkgs.btrbk ] ++ cfg.extraPackages; security.sudo.extraRules = mkIf (sudo_doas == "sudo") [ sudoRule ]; From 206d55763bb43c9644b181397881a58139fe2f9c Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Fri, 14 Jun 2024 14:20:55 -0400 Subject: [PATCH 003/227] peertube: limit threads used for compression step --- pkgs/servers/peertube/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/peertube/default.nix b/pkgs/servers/peertube/default.nix index 3c46db2f34b3..837d26682c63 100644 --- a/pkgs/servers/peertube/default.nix +++ b/pkgs/servers/peertube/default.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation rec { # Create static gzip and brotli files fd -e css -e eot -e html -e js -e json -e svg -e webmanifest -e xlf \ - --type file --search-path $out/client/dist \ + --type file --search-path $out/client/dist --threads $NIX_BUILD_CORES \ --exec gzip -9 -n -c {} > {}.gz \;\ --exec brotli --best -f {} -o {}.br ''; From 94750008787d0a406b2ef2868f09081fc8d16dcf Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Sun, 16 Jun 2024 10:14:02 +0200 Subject: [PATCH 004/227] nixos-rebuild: reverse some conditionals and factor out getNixDrv in "building nix" section, removes indent clutter --- .../linux/nixos-rebuild/nixos-rebuild.sh | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index fb7c8b2322a7..364c3dc4c003 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -490,31 +490,35 @@ prebuiltNix() { fi } -if [[ -n $buildNix && -z $flake ]]; then - log "building Nix..." +getNixDrv() { nixDrv= - if ! nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then - if ! nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then - if ! nixStorePath="$(runCmd nix-instantiate --eval '' -A "$(nixSystem)" | sed -e 's/^"//' -e 's/"$//')"; then - nixStorePath="$(prebuiltNix "$(uname -m)")" - fi - if ! runCmd nix-store -r "$nixStorePath" --add-root "${tmpDir}/nix" --indirect \ - --option extra-binary-caches https://cache.nixos.org/; then - log "warning: don't know how to get latest Nix" - fi - # Older version of nix-store -r don't support --add-root. - [ -e "$tmpDir/nix" ] || ln -sf "$nixStorePath" "$tmpDir/nix" - if [ -n "$buildHost" ]; then - remoteNixStorePath="$(runCmd prebuiltNix "$(buildHostCmd uname -m)")" - remoteNix="$remoteNixStorePath/bin" - if ! buildHostCmd nix-store -r "$remoteNixStorePath" \ - --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then - remoteNix= - log "warning: don't know how to get latest Nix" - fi - fi + + if nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then return; fi + if nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then return; fi + + if ! nixStorePath="$(runCmd nix-instantiate --eval '' -A "$(nixSystem)" | sed -e 's/^"//' -e 's/"$//')"; then + nixStorePath="$(prebuiltNix "$(uname -m)")" + fi + if ! runCmd nix-store -r "$nixStorePath" --add-root "${tmpDir}/nix" --indirect \ + --option extra-binary-caches https://cache.nixos.org/; then + log "warning: don't know how to get latest Nix" + fi + # Older version of nix-store -r don't support --add-root. + [ -e "$tmpDir/nix" ] || ln -sf "$nixStorePath" "$tmpDir/nix" + if [ -n "$buildHost" ]; then + remoteNixStorePath="$(runCmd prebuiltNix "$(buildHostCmd uname -m)")" + remoteNix="$remoteNixStorePath/bin" + if ! buildHostCmd nix-store -r "$remoteNixStorePath" \ + --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then + remoteNix= + log "warning: don't know how to get latest Nix" fi fi +} + +if [[ -n $buildNix && -z $flake ]]; then + log "building Nix..." + getNixDrv if [ -a "$nixDrv" ]; then nix-store -r "$nixDrv"'!'"out" --add-root "$tmpDir/nix" --indirect >/dev/null if [ -n "$buildHost" ]; then From 58d100778bded884dcbaefe3c03fd95449afe2f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 21 Jun 2024 09:07:26 -0700 Subject: [PATCH 005/227] udiskie: 2.5.2 -> 2.5.3 Diff: https://github.com/coldfix/udiskie/compare/v2.5.2...v2.5.3 Changelog: https://github.com/coldfix/udiskie/blob/v2.5.3/CHANGES.rst --- pkgs/applications/misc/udiskie/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 7df3f1d23b9c..0041d5153d54 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { pname = "udiskie"; - version = "2.5.2"; + version = "2.5.3"; pyproject = true; @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { owner = "coldfix"; repo = "udiskie"; rev = "v${version}"; - hash = "sha256-r9ppuWYY3e2thsfFh4ooOgfqNvmCVw7fS0SpJCJcysQ="; + hash = "sha256-asrVQR0d+5l76COsXp88srtGZQHU+AwbP3HwDiwRlnE="; }; patches = [ @@ -39,10 +39,13 @@ python3.pkgs.buildPythonApplication rec { asciidoc # Man page gobject-introspection installShellFiles - python3.pkgs.setuptools wrapGAppsHook3 ]; + build-system = with python3.pkgs; [ + setuptools + ]; + dontWrapGApps = true; buildInputs = [ @@ -53,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { udisks2 ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ docopt keyutils pygobject3 From 0bf9c7660fbcd2d2a75730cc442b232d090275b4 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Fri, 14 Jun 2024 23:16:20 +0900 Subject: [PATCH 006/227] bpftrace: fix tcp*.bt/runqlat.bt scripts tcp*.bt scripts tried to include glibc headers, which didn't work on nixos because bpftrace tried to call clang-major with some options to get the paths, but we never told it where to find it. Give bpftrace the path directly instead of giving it a path to clang. runqlat.bt doesn't work with glibc headers and requires kernel headers which are no longer extracted, just provide its value. Note the default clang output also had some clang-internal headers, but these seem to be included anyway through libclang API without having to give them here, so we only pass the glibc ones. While here: - also backport another bpftrace patch that made the tcp*.bt tools to actually not require these includes - and add tests that we can include these. Co-authored-by: Arian van Putten --- nixos/tests/bpf.nix | 7 +- .../bp/bpftrace/override-system-headers.patch | 94 +++++++++++++++ pkgs/by-name/bp/bpftrace/package.nix | 12 +- .../bp/bpftrace/runqlat-bt-no-includes.patch | 45 +++++++ .../bp/bpftrace/tcp-bt-no-includes.patch | 114 ++++++++++++++++++ 5 files changed, 268 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/bp/bpftrace/override-system-headers.patch create mode 100644 pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch create mode 100644 pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch diff --git a/nixos/tests/bpf.nix b/nixos/tests/bpf.nix index 150ed0958862..0020c7ee2d69 100644 --- a/nixos/tests/bpf.nix +++ b/nixos/tests/bpf.nix @@ -16,14 +16,14 @@ import ./make-test-python.nix ({ pkgs, ... }: { # list probes machine.succeed("bpftrace -l") # simple BEGIN probe (user probe on bpftrace itself) - print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\"); exit(); }'")) + print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\\n\"); exit(); }'")) # tracepoint print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'")) # kprobe print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'")) # BTF print(machine.succeed("bpftrace -e 'kprobe:schedule { " - " printf(\"tgid: %d\", ((struct task_struct*) curtask)->tgid); exit() " + " printf(\"tgid: %d\\n\", ((struct task_struct*) curtask)->tgid); exit() " "}'")) # module BTF (bpftrace >= 0.17) # test is currently disabled on aarch64 as kfunc does not work there yet @@ -32,5 +32,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { "bpftrace -e 'kfunc:nft_trans_alloc_gfp { " " printf(\"portid: %d\\n\", args->ctx->portid); " "} BEGIN { exit() }'")) + # glibc includes + print(machine.succeed("bpftrace -e '#include \n" + "BEGIN { printf(\"ok %d\\n\", EINVAL); exit(); }'")) ''; }) diff --git a/pkgs/by-name/bp/bpftrace/override-system-headers.patch b/pkgs/by-name/bp/bpftrace/override-system-headers.patch new file mode 100644 index 000000000000..624c4d6c7eff --- /dev/null +++ b/pkgs/by-name/bp/bpftrace/override-system-headers.patch @@ -0,0 +1,94 @@ +From c1737d4ab6ab263932caa9e3ac170ebe3e28d404 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 14 Jun 2024 21:56:46 +0900 +Subject: [PATCH] clang_parser system_include_paths: allow overriding at + compile time + +While bpftrace depends on libclang it can be installed without a clang +frontend, so some distributions might want to make these paths fixed as +they are unlikely to change. + +In particular, this is necessary to include system libraries as used by +older versions of tcpaccept.bt (they now no longer require these since +#3152, but that illustrate this was a recurring problem) + +(cherry picked from commit 5bf5f86313600b16c8c23e03b31337941cbefdd0) +--- + CMakeLists.txt | 2 ++ + src/CMakeLists.txt | 4 +++- + src/clang_parser.cpp | 19 +++++++++++++++---- + 3 files changed, 20 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cd620d0e56e5..ade33c503efb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,6 +21,8 @@ set(VENDOR_GTEST OFF CACHE BOOL "Clone gtest from github") + set(BUILD_FUZZ OFF CACHE BOOL "Build bpftrace for fuzzing") + set(USE_LIBFUZZER OFF CACHE BOOL "Use libfuzzer for fuzzing") + set(FUZZ_TARGET "codegen" CACHE STRING "Fuzzing target") ++set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory") ++set(SYSTEM_INCLUDE_PATHS "auto" CACHE STRING "Hard-code system include paths (colon separated, the default value \"auto\" queries clang at runtime)") + + set(ENABLE_SKB_OUTPUT ON CACHE BOOL "Enable skb_output, will include libpcap") + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 88f5928c8a75..eadb11207052 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -88,11 +88,13 @@ endif() + + # compile definitions + +-set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory") + if (KERNEL_HEADERS_DIR) + MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}") + target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") + endif() ++if (NOT SYSTEM_INCLUDE_PATHS EQUAL "auto") ++ MESSAGE(STATUS "Using SYSTEM_INCLUDE_PATHS=${SYSTEM_INCLUDE_PATHS}") ++endif() + + execute_process( + COMMAND git describe --abbrev=4 --dirty --tags +diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp +index 8b6689454267..9367e6692eb0 100644 +--- a/src/clang_parser.cpp ++++ b/src/clang_parser.cpp +@@ -882,11 +882,9 @@ std::string ClangParser::get_arch_include_path() + return "/usr/include/" + std::string(utsname.machine) + "-linux-gnu"; + } + +-std::vector ClangParser::system_include_paths() ++static void query_clang_include_dirs(std::vector &result) + { +- std::vector result; +- try +- { ++ try { + auto clang = "clang-" + std::to_string(LLVM_VERSION_MAJOR); + auto cmd = clang + " -Wp,-v -x c -fsyntax-only /dev/null 2>&1"; + auto check = exec_system(cmd.c_str()); +@@ -902,6 +900,19 @@ std::vector ClangParser::system_include_paths() + catch (std::runtime_error &) + { // If exec_system fails, just ignore it + } ++} ++ ++std::vector ClangParser::system_include_paths() ++{ ++ std::vector result; ++ std::istringstream lines(SYSTEM_INCLUDE_PATHS); ++ std::string line; ++ while (std::getline(lines, line, ':')) { ++ if (line == "auto") ++ query_clang_include_dirs(result); ++ else ++ result.push_back(trim(line)); ++ } + + if (result.empty()) + result = { "/usr/local/include", "/usr/include" }; +-- +2.45.2 + diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index bc5aab6a9406..8b1eb42d9a2a 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , llvmPackages, elfutils, bcc -, libbpf, libbfd, libopcodes +, libbpf, libbfd, libopcodes, glibc , cereal, asciidoctor , cmake, pkg-config, flex, bison , util-linux @@ -41,9 +41,17 @@ stdenv.mkDerivation rec { "-DBUILD_TESTING=FALSE" "-DLIBBCC_INCLUDE_DIRS=${bcc}/include" "-DINSTALL_TOOL_DOCS=OFF" - "-DUSE_SYSTEM_BPF_BCC=ON" + "-DSYSTEM_INCLUDE_PATHS=${glibc.dev}/include" ]; + patches = [ + # https://github.com/bpftrace/bpftrace/pull/3243 (merged) + ./override-system-headers.patch + # https://github.com/bpftrace/bpftrace/pull/3152 (merged) + ./tcp-bt-no-includes.patch + # https://github.com/bpftrace/bpftrace/pull/3262 (merged) + ./runqlat-bt-no-includes.patch + ]; # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do # not move them to keep `${pkgs.bpftrace}/share/bpftrace/tools/...` working. diff --git a/pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch b/pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch new file mode 100644 index 000000000000..659e4bc4bbfd --- /dev/null +++ b/pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch @@ -0,0 +1,45 @@ +From 9b5f22854297aabb924969c25af66461d8d2fcb9 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 21 Jun 2024 21:02:09 +0900 +Subject: [PATCH] tools/runqlat: provide TASK_RUNNING as a define + +runqlat requires kernel headers to run even with BTF, just because of a +define. +TASK_RUNNING isn't part of the stable API but it's never changed in all +of the linux git history so let's pretend it's stable and just define +it. + +If we find a way to handle kheaders again in the future we might want to +consider reverting this. + +Fixes: #3255 +(cherry picked from commit aa041d9d85f9ec11235c39fdcb5833412ec27083) +--- + tools/runqlat.bt | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/tools/runqlat.bt b/tools/runqlat.bt +index 3d71b76062eb..1298f399aee7 100755 +--- a/tools/runqlat.bt ++++ b/tools/runqlat.bt +@@ -11,7 +11,17 @@ + * 17-Sep-2018 Brendan Gregg Created this. + */ + ++#ifndef BPFTRACE_HAVE_BTF + #include ++#else ++/* ++ * With BTF providing types, full headers are not needed. ++ * We only need to supply the preprocessor defines used in this script. ++ * TASK_RUNNING is not arch-dependant and has not changed in the linux ++ * git history (it is not part of the stable API though) ++ */ ++#define TASK_RUNNING 0 ++#endif + + BEGIN + { +-- +2.45.2 + diff --git a/pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch b/pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch new file mode 100644 index 000000000000..fa2052358103 --- /dev/null +++ b/pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch @@ -0,0 +1,114 @@ +From ebb12512f6ea0a1113ad8ddf30db26128f7a3426 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Sun, 23 Jun 2024 20:41:01 +0900 +Subject: [PATCH] With BTF, users do not need libc headers installed for + AF_INET/AF_INET6 + +Signed-off-by: Bernhard Kaindl +(cherry picked from commit c0b9d252a43f99b9091245dedb178a6874803306) +--- + tools/tcpaccept.bt | 8 +++++++- + tools/tcpconnect.bt | 8 +++++++- + tools/tcpdrop.bt | 8 +++++++- + tools/tcplife.bt | 8 +++++++- + tools/tcpretrans.bt | 8 +++++++- + 5 files changed, 35 insertions(+), 5 deletions(-) + +diff --git a/tools/tcpaccept.bt b/tools/tcpaccept.bt +index 08e6af0158fc..cbffe36889ee 100755 +--- a/tools/tcpaccept.bt ++++ b/tools/tcpaccept.bt +@@ -20,7 +20,13 @@ + #include + #include + #else +-#include ++/* ++ * With BTF providing types, socket headers are not needed. ++ * We only need to supply the preprocessor defines in this script. ++ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI ++ */ ++#define AF_INET 2 ++#define AF_INET6 10 + #endif + + BEGIN +diff --git a/tools/tcpconnect.bt b/tools/tcpconnect.bt +index 1ac1eb99e9ad..636337275cd8 100755 +--- a/tools/tcpconnect.bt ++++ b/tools/tcpconnect.bt +@@ -22,7 +22,13 @@ + #include + #include + #else +-#include ++/* ++ * BTF provides the types, we just need to define AF_INET and AF_INET6. ++ * These are Linux ABI defines, and are not architecture-specific. ++ * With BTF, this allows tcpconnect.bt to work without glibc headers: ++ */ ++#define AF_INET 2 /* IPv4 */ ++#define AF_INET6 10 /* IPv6 */ + #endif + + BEGIN +diff --git a/tools/tcpdrop.bt b/tools/tcpdrop.bt +index fd3e55f490bf..a56bf69fcc6c 100755 +--- a/tools/tcpdrop.bt ++++ b/tools/tcpdrop.bt +@@ -24,7 +24,13 @@ + #include + #include + #else +-#include ++/* ++ * With BTF providing types, socket headers are not needed. ++ * We only need to supply the preprocessor defines in this script. ++ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI ++ */ ++#define AF_INET 2 ++#define AF_INET6 10 + #endif + + BEGIN +diff --git a/tools/tcplife.bt b/tools/tcplife.bt +index dd4c1d68284e..d5a09c4e5da9 100755 +--- a/tools/tcplife.bt ++++ b/tools/tcplife.bt +@@ -19,7 +19,13 @@ + #include + #include + #else +-#include ++/* ++ * With BTF providing types, socket headers are not needed. ++ * We only need to supply the preprocessor defines in this script. ++ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI ++ */ ++#define AF_INET 2 ++#define AF_INET6 10 + #endif + + BEGIN +diff --git a/tools/tcpretrans.bt b/tools/tcpretrans.bt +index ee2975d6e545..32a11bfa81b2 100755 +--- a/tools/tcpretrans.bt ++++ b/tools/tcpretrans.bt +@@ -21,7 +21,13 @@ + #include + #include + #else +-#include ++/* ++ * With BTF providing types, socket headers are not needed. ++ * We only need to supply the preprocessor defines in this script. ++ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI ++ */ ++#define AF_INET 2 ++#define AF_INET6 10 + #endif + + BEGIN +-- +2.45.2 + From 75316f49bbfc4a99c33f00a342e9931fbd22667a Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sun, 23 Jun 2024 21:09:52 +0900 Subject: [PATCH 007/227] bpftrace: only print kernel headers cannot be found warning on error need more time to figure how to deal with kheaders cleanly --- .../kheaders-not-found-message-fix.patch | 59 +++++ ...ders-not-found-message-only-on-error.patch | 220 ++++++++++++++++++ pkgs/by-name/bp/bpftrace/package.nix | 4 + 3 files changed, 283 insertions(+) create mode 100644 pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch create mode 100644 pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch diff --git a/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch b/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch new file mode 100644 index 000000000000..31d99c420386 --- /dev/null +++ b/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch @@ -0,0 +1,59 @@ +From 76950d08a3da13dd9e51b2fbef3532c3de79265b Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 14 Jun 2024 23:19:05 +0900 +Subject: [PATCH] utils: fix kernel headers not found warning (#3242) + +The code would make ksrc and kobj empty then try to print them, +this would always print empty strings. +Store is_dir() checks as bool instead and use these, the strings +cannot be empty if the check passed. + +(cherry picked from commit f937803c2ad156ab90b9194965dbfb62bef1ff80) +--- +(mostly to avoid conflicts with the next patch) + src/utils.cpp | 21 +++++++-------------- + 1 file changed, 7 insertions(+), 14 deletions(-) + +diff --git a/src/utils.cpp b/src/utils.cpp +index bda722136588..c358a401fc83 100644 +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -738,15 +738,11 @@ std::tuple get_kernel_dirs( + auto ksrc = kdir + "/source"; + auto kobj = kdir + "/build"; + +- // if one of source/ or build/ is not present - try to use the other one for both. +- if (!is_dir(ksrc)) { +- ksrc = ""; +- } +- if (!is_dir(kobj)) { +- kobj = ""; +- } +- if (ksrc.empty() && kobj.empty()) +- { ++ // if one of source/ or build/ is not present - try to use the other one for ++ // both. ++ auto has_ksrc = is_dir(ksrc); ++ auto has_kobj = is_dir(kobj); ++ if (!has_ksrc && !has_kobj) { + LOG(WARNING) << "Could not find kernel headers in " << ksrc << " or " + << kobj + << ". To specify a particular path to kernel headers, set the " +@@ -757,12 +753,9 @@ std::tuple get_kernel_dirs( + "file at /sys/kernel/kheaders.tar.xz"; + return std::make_tuple("", ""); + } +- if (ksrc.empty()) +- { ++ if (!has_ksrc) { + ksrc = kobj; +- } +- else if (kobj.empty()) +- { ++ } else if (!has_kobj) { + kobj = ksrc; + } + +-- +2.45.2 + diff --git a/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch b/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch new file mode 100644 index 000000000000..38eb34be5b98 --- /dev/null +++ b/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch @@ -0,0 +1,220 @@ +From 5208c6275e65d94d0ed169ca2b253602c78c15a8 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 14 Jun 2024 22:32:43 +0900 +Subject: [PATCH] kernel headers: only print kheaders not found warning if + parsing failed + +Current code would print kheaders not found as soon as the code has any +include, even if the include worked. + +This delays printing the warning until we know if parsing succeeded or +not, and only prints it if parsing failed. + +Also update the message to give clearer extraction instructions +--- + CHANGELOG.md | 2 ++ + src/CMakeLists.txt | 3 ++- + src/main.cpp | 40 ++++++++++++++++++++++++---------------- + src/utils.cpp | 45 +++++++++++++++++++++------------------------ + src/utils.h | 5 +++-- + 5 files changed, 52 insertions(+), 43 deletions(-) + +diff --git a/CHANGELOG.md b/CHANGELOG.md +index a4aca8b6c85d..181c1bffc9f3 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -10,6 +10,8 @@ ## Unreleased + + #### Added + #### Changed ++- Only print kernel headers not found message if parsing fails ++ - [#3265](https://github.com/bpftrace/bpftrace/pull/3265) + #### Deprecated + #### Removed + #### Fixed +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index eadb11207052..7b637835afd9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -90,11 +90,12 @@ endif() + + if (KERNEL_HEADERS_DIR) + MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}") +- target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") + endif() ++target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}") + if (NOT SYSTEM_INCLUDE_PATHS EQUAL "auto") + MESSAGE(STATUS "Using SYSTEM_INCLUDE_PATHS=${SYSTEM_INCLUDE_PATHS}") + endif() ++target_compile_definitions(runtime PUBLIC SYSTEM_INCLUDE_PATHS="${SYSTEM_INCLUDE_PATHS}") + + execute_process( + COMMAND git describe --abbrev=4 --dirty --tags +diff --git a/src/main.cpp b/src/main.cpp +index 3c532b3aa767..7918f90b90ab 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -420,24 +420,20 @@ static std::optional get_delta_taitime() + + bool should_clang_parse = !(driver.root.get()->c_definitions.empty() && + bpftrace.btf_set_.empty()); +- +- if (should_clang_parse) +- { ++ if (should_clang_parse) { + ClangParser clang; ++ bool found_kernel_headers; ++ std::string ksrc, kobj; ++ struct utsname utsname; + std::vector extra_flags; +- { +- struct utsname utsname; +- uname(&utsname); +- std::string ksrc, kobj; +- auto kdirs = get_kernel_dirs(utsname); +- ksrc = std::get<0>(kdirs); +- kobj = std::get<1>(kdirs); ++ uname(&utsname); ++ found_kernel_headers = get_kernel_dirs(utsname, ksrc, kobj); + +- if (ksrc != "") +- { +- extra_flags = get_kernel_cflags( +- utsname.machine, ksrc, kobj, bpftrace.kconfig); +- } ++ if (found_kernel_headers) ++ { ++ extra_flags = get_kernel_cflags( ++ utsname.machine, ksrc, kobj, bpftrace.kconfig); ++ found_kernel_headers = true; + } + extra_flags.push_back("-include"); + extra_flags.push_back(CLANG_WORKAROUNDS_H); +@@ -453,8 +449,20 @@ static std::optional get_delta_taitime() + extra_flags.push_back(file); + } + +- if (!clang.parse(driver.root.get(), bpftrace, extra_flags)) ++ if (!clang.parse(driver.root.get(), bpftrace, extra_flags)) { ++ if (!found_kernel_headers) { ++ LOG(WARNING) ++ << "Could not find kernel headers in " << ksrc << " / " << kobj ++ << ". To specify a particular path to kernel headers, set the env " ++ << "variables BPFTRACE_KERNEL_SOURCE and, optionally, " ++ << "BPFTRACE_KERNEL_BUILD if the kernel was built in a different " ++ << "directory than its source. You can also point the variable to " ++ << "a directory with built-in headers extracted from the following " ++ << "snippet:\nmodprobe kheaders && tar -C -xf " ++ << "/sys/kernel/kheaders.tar.xz"; ++ } + return nullptr; ++ } + } + + err = driver.parse(); +diff --git a/src/utils.cpp b/src/utils.cpp +index c358a401fc83..06d7fa95ff6e 100644 +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -700,8 +700,8 @@ bool is_dir(const std::string& path) + return std_filesystem::is_directory(buf, ec); + } + +-// get_kernel_dirs returns {ksrc, kobj} - directories for pristine and +-// generated kernel sources. ++// get_kernel_dirs fills {ksrc, kobj} - directories for pristine and ++// generated kernel sources - and returns if they were found. + // + // When the kernel was built in its source tree ksrc == kobj, however when + // the kernel was build in a different directory than its source, ksrc != kobj. +@@ -714,44 +714,41 @@ bool is_dir(const std::string& path) + // + // /lib/modules/`uname -r`/build/ + // +-// {"", ""} is returned if no trace of kernel headers was found at all. +-// Both ksrc and kobj are guaranteed to be != "", if at least some trace of kernel sources was found. +-std::tuple get_kernel_dirs( +- const struct utsname &utsname) ++// false is returned if no trace of kernel headers was found at all, with the guessed ++// location set anyway for later warning. ++// Both ksrc and kobj are guaranteed to be != "" ++bool get_kernel_dirs(const struct utsname &utsname, ++ std::string &ksrc, ++ std::string &kobj) + { +-#ifdef KERNEL_HEADERS_DIR +- return {KERNEL_HEADERS_DIR, KERNEL_HEADERS_DIR}; +-#endif ++ ksrc = kobj = std::string(KERNEL_HEADERS_DIR); ++ if (!ksrc.empty()) ++ return true; + + const char *kpath_env = ::getenv("BPFTRACE_KERNEL_SOURCE"); + if (kpath_env) + { ++ ksrc = std::string(kpath_env); + const char *kpath_build_env = ::getenv("BPFTRACE_KERNEL_BUILD"); +- if (!kpath_build_env) ++ if (kpath_build_env) + { +- kpath_build_env = kpath_env; ++ kobj = std::string(kpath_build_env); ++ } else { ++ kobj = ksrc; + } +- return std::make_tuple(kpath_env, kpath_build_env); ++ return true; + } + + std::string kdir = std::string("/lib/modules/") + utsname.release; +- auto ksrc = kdir + "/source"; +- auto kobj = kdir + "/build"; ++ ksrc = kdir + "/source"; ++ kobj = kdir + "/build"; + + // if one of source/ or build/ is not present - try to use the other one for + // both. + auto has_ksrc = is_dir(ksrc); + auto has_kobj = is_dir(kobj); + if (!has_ksrc && !has_kobj) { +- LOG(WARNING) << "Could not find kernel headers in " << ksrc << " or " +- << kobj +- << ". To specify a particular path to kernel headers, set the " +- "env variables BPFTRACE_KERNEL_SOURCE and, optionally, " +- "BPFTRACE_KERNEL_BUILD if the kernel was built in a " +- "different directory than its source. To create kernel " +- "headers run 'modprobe kheaders', which will create a tar " +- "file at /sys/kernel/kheaders.tar.xz"; +- return std::make_tuple("", ""); ++ return false; + } + if (!has_ksrc) { + ksrc = kobj; +@@ -759,7 +756,7 @@ std::tuple get_kernel_dirs( + kobj = ksrc; + } + +- return std::make_tuple(ksrc, kobj); ++ return true; + } + + const std::string &is_deprecated(const std::string &str) +diff --git a/src/utils.h b/src/utils.h +index bc78bd2176b5..9bd5395eab22 100644 +--- a/src/utils.h ++++ b/src/utils.h +@@ -186,8 +186,9 @@ std::vector get_online_cpus(); + std::vector get_possible_cpus(); + bool is_dir(const std::string &path); + bool file_exists_and_ownedby_root(const char *f); +-std::tuple get_kernel_dirs( +- const struct utsname &utsname); ++bool get_kernel_dirs(const struct utsname &utsname, ++ std::string &ksrc, ++ std::string &kobj); + std::vector get_kernel_cflags(const char *uname_machine, + const std::string &ksrc, + const std::string &kobj, +-- +2.45.2 + diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 8b1eb42d9a2a..654e379f2ec5 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -51,6 +51,10 @@ stdenv.mkDerivation rec { ./tcp-bt-no-includes.patch # https://github.com/bpftrace/bpftrace/pull/3262 (merged) ./runqlat-bt-no-includes.patch + # https://github.com/bpftrace/bpftrace/pull/3242 (merged) + ./kheaders-not-found-message-fix.patch + # https://github.com/bpftrace/bpftrace/pull/3265 + ./kheaders-not-found-message-only-on-error.patch ]; # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do From ed8078b92dcefa7b8e499b877546ab21adddf9fa Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sun, 30 Jun 2024 00:24:36 -0700 Subject: [PATCH 008/227] sanjuuni: move to pkgs/by-name --- .../sanjuuni/default.nix => by-name/sa/sanjuuni/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/graphics/sanjuuni/default.nix => by-name/sa/sanjuuni/package.nix} (100%) diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/by-name/sa/sanjuuni/package.nix similarity index 100% rename from pkgs/tools/graphics/sanjuuni/default.nix rename to pkgs/by-name/sa/sanjuuni/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4227b56896a1..cfefbf58b46c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12615,8 +12615,6 @@ with pkgs; sanctity = callPackage ../tools/misc/sanctity { }; - sanjuuni = callPackage ../tools/graphics/sanjuuni { }; - sasquatch = callPackage ../tools/filesystems/sasquatch { }; sasview = libsForQt5.callPackage ../applications/science/misc/sasview { }; From 4e3a06726aa784543af54d86d88ef19ded01c378 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sun, 30 Jun 2024 00:25:21 -0700 Subject: [PATCH 009/227] sanjuuni: format with nixfmt-rfc-style --- pkgs/by-name/sa/sanjuuni/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index 023492cbf1cd..18dd1b11486f 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, pkg-config -, autoreconfHook -, ffmpeg -, poco -, ocl-icd -, opencl-clhpp +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + pkg-config, + autoreconfHook, + ffmpeg, + poco, + ocl-icd, + opencl-clhpp, }: stdenv.mkDerivation rec { From ff931a64add1e5b442cfa543336f1b6e60558125 Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Sun, 30 Jun 2024 00:26:10 -0700 Subject: [PATCH 010/227] sanjuuni: 0.4 -> 0.5 Changelog: https://github.com/MCJack123/sanjuuni/releases/tag/0.5 --- pkgs/by-name/sa/sanjuuni/package.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/sa/sanjuuni/package.nix b/pkgs/by-name/sa/sanjuuni/package.nix index 18dd1b11486f..e43efa771b57 100644 --- a/pkgs/by-name/sa/sanjuuni/package.nix +++ b/pkgs/by-name/sa/sanjuuni/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, fetchpatch, pkg-config, - autoreconfHook, ffmpeg, poco, ocl-icd, @@ -13,28 +12,16 @@ stdenv.mkDerivation rec { pname = "sanjuuni"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "MCJack123"; repo = "sanjuuni"; rev = version; - sha256 = "sha256-wgtyrik4Z5AXd8MHkiMuxMpGh/xcEtNqivyhvL68aac="; + sha256 = "sha256-wJRPD4OWOTPiyDr9dYseRA7BI942HPfHONVJGTc/+wU="; }; - patches = [ - (fetchpatch { - name = "build-with-cxx17.patch"; - url = "https://github.com/MCJack123/sanjuuni/commit/f2164bc18935bcf63ee5b0a82087bc91f7fd258d.patch"; - hash = "sha256-MjDeAiB3WkemCRYzgOHzHlbPUoI4DHEYe28xIIC+c7I="; - excludes = [ "configure" ]; # conflicts with release tarball; we manually regenerate this - }) - ]; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg From 7837dcbf6f61725936b8e15bc737f80f19bc9e6d Mon Sep 17 00:00:00 2001 From: Vasissualiyp Date: Mon, 1 Jul 2024 14:32:08 -0400 Subject: [PATCH 011/227] tmpi: init at 1.0.0 --- pkgs/by-name/tm/tmpi/package.nix | 48 ++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 pkgs/by-name/tm/tmpi/package.nix diff --git a/pkgs/by-name/tm/tmpi/package.nix b/pkgs/by-name/tm/tmpi/package.nix new file mode 100644 index 000000000000..f61af72dc0f2 --- /dev/null +++ b/pkgs/by-name/tm/tmpi/package.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchFromGitHub +, mpi +, mpich +, tmux +, reptyr +, autoconf +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "tmpi"; + version = "0-unstable-2022-02-22"; + + src = fetchFromGitHub { + owner = "Azrael3000"; + repo = "tmpi"; + rev = "f5a0fd8848b5c87b301edc8a23de9bfcfbd41918"; + hash = "sha256-BaOaMpsF8ho8EIVuHfu4+CiVV3yLoC3tDkLq4R8BYBA="; + }; + + propagatedBuildInputs = [ mpi mpich reptyr tmux ]; + + buildInputs = [ autoconf makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + install -m755 tmpi $out/bin/tmpi + + wrapProgram $out/bin/tmpi \ + --prefix PATH : ${lib.makeBinPath [ mpi mpich tmux reptyr ]} + + runHook postInstall + ''; + + meta = { + description = "Run a parallel command inside a split tmux window"; + mainProgram = "tmpi"; + homepage = "https://github.com/Azrael3000/tmpi"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ vasissualiyp ]; + platforms = reptyr.meta.platforms; + }; +} From b55ffeecb810e4a3555ba109727fcc86167fc855 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jul 2024 07:27:35 +0000 Subject: [PATCH 012/227] python311Packages.oslo-db: 15.1.0 -> 16.0.0 --- pkgs/development/python-modules/oslo-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index 6b2c64de5d0c..ad4e2a99b195 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "15.1.0"; + version = "16.0.0"; pyproject = true; src = fetchPypi { pname = "oslo.db"; inherit version; - hash = "sha256-FqvjqOYf52zaLwPZx9xZEITRnvYU8xiHvylp7fsg6E4="; + hash = "sha256-8bNUjR8eEfLYEZfBwXix0lO2A474iDYdMQp2Aa7BfoE="; }; nativeBuildInputs = [ From 839bbc17005282555430aee82e2e8f454649cb2a Mon Sep 17 00:00:00 2001 From: Yu Ishii Date: Thu, 6 Jun 2024 00:53:56 +0900 Subject: [PATCH 013/227] nixos/prometheus-snmp-exporter: add environmentFile option Prometheus snmp-exporter has support to pass sensitive data as environment variables. Since other exporter configurations for NixOS have environmentFile option, the same option is added to snmp-exporter. --- .../monitoring/prometheus/exporters/snmp.nix | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index dc10a9a2f92e..804fa6fdaceb 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -81,6 +81,32 @@ in Only log messages with the given severity or above. ''; }; + + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/root/prometheus-snmp-exporter.env"; + description = '' + EnvironmentFile as defined in {manpage}`systemd.exec(5)`. + + Secrets may be passed to the service without adding them to the + world-readable Nix store, by specifying placeholder variables as + the option value in Nix and setting these variables accordingly in the + environment file. + + Environment variables from this file will be interpolated into the + config file using envsubst with this syntax: + `$ENVIRONMENT ''${VARIABLE}` + + For variables to use see [Prometheus Configuration](https://github.com/prometheus/snmp_exporter#prometheus-configuration). + + Besides setting the filepath for this option, you also need to add + flag `--config.expand-environment-variables` to `extraFlags`. + + Note that this file needs to be available on the host on which + this exporter is running. + ''; + }; }; serviceOpts = let uncheckedConfigFile = if cfg.configurationPath != null @@ -92,6 +118,7 @@ in uncheckedConfigFile; in { serviceConfig = { + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; ExecStart = '' ${pkgs.prometheus-snmp-exporter}/bin/snmp_exporter \ --config.file=${escapeShellArg configFile} \ From f210aaf4ca0036adbff08b968227f27fd3481212 Mon Sep 17 00:00:00 2001 From: Yu Ishii Date: Sun, 7 Jul 2024 16:49:31 +0900 Subject: [PATCH 014/227] nixos/prometheus-snmp-exporter: add a parameter implicitly Change to adding `--config.expand-environment-variables` parameter to `ExecStart` if `environmentFile` option is set. --- .../services/monitoring/prometheus/exporters/snmp.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index 804fa6fdaceb..c647aba95499 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -100,8 +100,9 @@ in For variables to use see [Prometheus Configuration](https://github.com/prometheus/snmp_exporter#prometheus-configuration). - Besides setting the filepath for this option, you also need to add - flag `--config.expand-environment-variables` to `extraFlags`. + If the file path is set to this option, the parameter + `--config.expand-environment-variables` is implicitly added to + `ExecStart`. Note that this file needs to be available on the host on which this exporter is running. @@ -122,6 +123,8 @@ in ExecStart = '' ${pkgs.prometheus-snmp-exporter}/bin/snmp_exporter \ --config.file=${escapeShellArg configFile} \ + ${lib.optionalString (cfg.environmentFile != null) + "--config.expand-environment-variables"} \ --log.format=${escapeShellArg cfg.logFormat} \ --log.level=${cfg.logLevel} \ --web.listen-address=${cfg.listenAddress}:${toString cfg.port} \ From b52c9d3125c8e5402d74495816fd07eccfb8f3f5 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Thu, 6 Jun 2024 20:07:37 +0200 Subject: [PATCH 015/227] siyuan: migrate to use pnpm and add missed kernel info --- pkgs/by-name/si/siyuan/package-lock.json | 7762 ---------------------- pkgs/by-name/si/siyuan/package.nix | 64 +- 2 files changed, 45 insertions(+), 7781 deletions(-) delete mode 100644 pkgs/by-name/si/siyuan/package-lock.json diff --git a/pkgs/by-name/si/siyuan/package-lock.json b/pkgs/by-name/si/siyuan/package-lock.json deleted file mode 100644 index 0efb71901c15..000000000000 --- a/pkgs/by-name/si/siyuan/package-lock.json +++ /dev/null @@ -1,7762 +0,0 @@ -{ - "name": "SiYuan", - "version": "3.0.11", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "SiYuan", - "version": "3.0.11", - "dependencies": { - "@electron/remote": "^2.1.2" - }, - "devDependencies": { - "@types/node": "^18.13.0", - "@typescript-eslint/eslint-plugin": "^5.30.6", - "@typescript-eslint/parser": "^5.30.6", - "blueimp-md5": "^2.19.0", - "clean-webpack-plugin": "^4.0.0", - "css-loader": "^6.7.1", - "dayjs": "^1.11.5", - "electron": "28.2.10", - "electron-builder": "^24.13.3", - "encoding": "^0.1.13", - "esbuild-loader": "^3.0.1", - "eslint": "^8.19.0", - "file-loader": "^6.2.0", - "html-loader": "^2.1.2", - "html-webpack-plugin": "^5.5.0", - "iconv-lite": "^0.6.3", - "ifdef-loader": "^2.3.2", - "mini-css-extract-plugin": "2.7.6", - "path-browserify": "^1.0.1", - "safer-buffer": "^2.1.2", - "sass": "^1.53.0", - "sass-loader": "^12.6.0", - "typescript": "^4.7.4", - "webpack": "^5.76.0", - "webpack-bundle-analyzer": "^4.5.0", - "webpack-cli": "^4.10.0" - } - }, - "node_modules/@develar/schema-utils": { - "version": "2.6.5", - "resolved": "https://registry.npmjs.org/@develar/schema-utils/-/schema-utils-2.6.5.tgz", - "integrity": "sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig==", - "dev": true, - "dependencies": { - "ajv": "^6.12.0", - "ajv-keywords": "^3.4.1" - }, - "engines": { - "node": ">= 8.9.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/@discoveryjs/json-ext": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", - "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", - "dev": true, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/@electron/asar": { - "version": "3.2.10", - "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.10.tgz", - "integrity": "sha512-mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw==", - "dev": true, - "dependencies": { - "commander": "^5.0.0", - "glob": "^7.1.6", - "minimatch": "^3.0.4" - }, - "bin": { - "asar": "bin/asar.js" - }, - "engines": { - "node": ">=10.12.0" - } - }, - "node_modules/@electron/asar/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@electron/asar/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@electron/get": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", - "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", - "dependencies": { - "debug": "^4.1.1", - "env-paths": "^2.2.0", - "fs-extra": "^8.1.0", - "got": "^11.8.5", - "progress": "^2.0.3", - "semver": "^6.2.0", - "sumchecker": "^3.0.1" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "global-agent": "^3.0.0" - } - }, - "node_modules/@electron/get/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/@electron/notarize": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.2.1.tgz", - "integrity": "sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "fs-extra": "^9.0.1", - "promise-retry": "^2.0.1" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron/notarize/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@electron/notarize/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/notarize/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron/osx-sign": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz", - "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==", - "dev": true, - "dependencies": { - "compare-version": "^0.1.2", - "debug": "^4.3.4", - "fs-extra": "^10.0.0", - "isbinaryfile": "^4.0.8", - "minimist": "^1.2.6", - "plist": "^3.0.5" - }, - "bin": { - "electron-osx-flat": "bin/electron-osx-flat.js", - "electron-osx-sign": "bin/electron-osx-sign.js" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/@electron/osx-sign/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@electron/osx-sign/node_modules/isbinaryfile": { - "version": "4.0.10", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz", - "integrity": "sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==", - "dev": true, - "engines": { - "node": ">= 8.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/gjtorikian/" - } - }, - "node_modules/@electron/osx-sign/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/osx-sign/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@electron/remote": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-2.1.2.tgz", - "integrity": "sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==", - "peerDependencies": { - "electron": ">= 13.0.0" - } - }, - "node_modules/@electron/universal": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.5.1.tgz", - "integrity": "sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==", - "dev": true, - "dependencies": { - "@electron/asar": "^3.2.1", - "@malept/cross-spawn-promise": "^1.1.0", - "debug": "^4.3.1", - "dir-compare": "^3.0.0", - "fs-extra": "^9.0.1", - "minimatch": "^3.0.4", - "plist": "^3.0.4" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/@electron/universal/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@electron/universal/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@electron/universal/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/universal/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@electron/universal/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", - "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", - "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", - "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", - "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", - "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", - "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", - "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", - "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", - "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", - "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", - "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", - "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", - "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", - "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", - "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", - "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", - "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", - "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", - "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", - "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", - "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", - "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", - "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", - "dev": true, - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "dev": true, - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@eslint/eslintrc/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@eslint/js": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", - "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - } - }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.11.14", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", - "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", - "dev": true, - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.2", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, - "engines": { - "node": ">=10.10.0" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, - "engines": { - "node": ">=12.22" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "dev": true - }, - "node_modules/@isaacs/cliui": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, - "dependencies": { - "string-width": "^5.1.2", - "string-width-cjs": "npm:string-width@^4.2.0", - "strip-ansi": "^7.0.1", - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", - "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/ansi-styles": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", - "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, - "dependencies": { - "eastasianwidth": "^0.2.0", - "emoji-regex": "^9.2.2", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", - "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, - "dependencies": { - "ansi-regex": "^6.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" - } - }, - "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^6.1.0", - "string-width": "^5.0.1", - "strip-ansi": "^7.0.1" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", - "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", - "dev": true, - "dependencies": { - "@jridgewell/set-array": "^1.2.1", - "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/set-array": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", - "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", - "dev": true, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/source-map": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", - "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", - "dev": true, - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.25" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.25", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", - "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", - "dev": true, - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@malept/cross-spawn-promise": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", - "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", - "dev": true, - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/malept" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" - } - ], - "dependencies": { - "cross-spawn": "^7.0.1" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@malept/flatpak-bundler": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz", - "integrity": "sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q==", - "dev": true, - "dependencies": { - "debug": "^4.1.1", - "fs-extra": "^9.0.0", - "lodash": "^4.17.15", - "tmp-promise": "^3.0.2" - }, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@malept/flatpak-bundler/node_modules/fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "dependencies": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@malept/flatpak-bundler/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@pkgjs/parseargs": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, - "optional": true, - "engines": { - "node": ">=14" - } - }, - "node_modules/@polka/url": { - "version": "1.0.0-next.25", - "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.25.tgz", - "integrity": "sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==", - "dev": true - }, - "node_modules/@sindresorhus/is": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz", - "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sindresorhus/is?sponsor=1" - } - }, - "node_modules/@szmarczak/http-timer": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", - "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", - "dependencies": { - "defer-to-connect": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@tootallnate/once": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@types/cacheable-request": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz", - "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==", - "dependencies": { - "@types/http-cache-semantics": "*", - "@types/keyv": "^3.1.4", - "@types/node": "*", - "@types/responselike": "^1.0.0" - } - }, - "node_modules/@types/debug": { - "version": "4.1.12", - "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz", - "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==", - "dev": true, - "dependencies": { - "@types/ms": "*" - } - }, - "node_modules/@types/eslint": { - "version": "8.56.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz", - "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==", - "dev": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, - "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", - "dev": true - }, - "node_modules/@types/fs-extra": { - "version": "9.0.13", - "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz", - "integrity": "sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==", - "dev": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/glob": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", - "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", - "dev": true, - "dependencies": { - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "node_modules/@types/html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==", - "dev": true - }, - "node_modules/@types/http-cache-semantics": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", - "integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==" - }, - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true - }, - "node_modules/@types/keyv": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz", - "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/minimatch": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", - "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", - "dev": true - }, - "node_modules/@types/ms": { - "version": "0.7.34", - "resolved": "https://registry.npmjs.org/@types/ms/-/ms-0.7.34.tgz", - "integrity": "sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==", - "dev": true - }, - "node_modules/@types/node": { - "version": "18.19.31", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz", - "integrity": "sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==", - "dependencies": { - "undici-types": "~5.26.4" - } - }, - "node_modules/@types/plist": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/plist/-/plist-3.0.5.tgz", - "integrity": "sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA==", - "dev": true, - "optional": true, - "dependencies": { - "@types/node": "*", - "xmlbuilder": ">=11.0.1" - } - }, - "node_modules/@types/responselike": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz", - "integrity": "sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==", - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", - "dev": true - }, - "node_modules/@types/verror": { - "version": "1.10.10", - "resolved": "https://registry.npmjs.org/@types/verror/-/verror-1.10.10.tgz", - "integrity": "sha512-l4MM0Jppn18hb9xmM6wwD1uTdShpf9Pn80aXTStnK1C94gtPvJcV2FrDmbOQUAQfJ1cKZHktkQUDwEqaAKXMMg==", - "dev": true, - "optional": true - }, - "node_modules/@types/yauzl": { - "version": "2.10.3", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", - "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", - "optional": true, - "dependencies": { - "@types/node": "*" - } - }, - "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", - "dev": true, - "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", - "dev": true, - "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "debug": "^4.3.4" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", - "dev": true, - "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", - "debug": "^4.3.4", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "*" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", - "dev": true, - "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/@ungap/structured-clone": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true - }, - "node_modules/@webassemblyjs/ast": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", - "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", - "dev": true, - "dependencies": { - "@webassemblyjs/helper-numbers": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6" - } - }, - "node_modules/@webassemblyjs/floating-point-hex-parser": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", - "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-api-error": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", - "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-buffer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", - "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-numbers": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", - "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", - "dev": true, - "dependencies": { - "@webassemblyjs/floating-point-hex-parser": "1.11.6", - "@webassemblyjs/helper-api-error": "1.11.6", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/helper-wasm-bytecode": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", - "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", - "dev": true - }, - "node_modules/@webassemblyjs/helper-wasm-section": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", - "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/wasm-gen": "1.12.1" - } - }, - "node_modules/@webassemblyjs/ieee754": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", - "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", - "dev": true, - "dependencies": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "node_modules/@webassemblyjs/leb128": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", - "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", - "dev": true, - "dependencies": { - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webassemblyjs/utf8": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", - "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", - "dev": true - }, - "node_modules/@webassemblyjs/wasm-edit": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", - "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/helper-wasm-section": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-opt": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1", - "@webassemblyjs/wast-printer": "1.12.1" - } - }, - "node_modules/@webassemblyjs/wasm-gen": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", - "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wasm-opt": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", - "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-buffer": "1.12.1", - "@webassemblyjs/wasm-gen": "1.12.1", - "@webassemblyjs/wasm-parser": "1.12.1" - } - }, - "node_modules/@webassemblyjs/wasm-parser": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", - "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@webassemblyjs/helper-api-error": "1.11.6", - "@webassemblyjs/helper-wasm-bytecode": "1.11.6", - "@webassemblyjs/ieee754": "1.11.6", - "@webassemblyjs/leb128": "1.11.6", - "@webassemblyjs/utf8": "1.11.6" - } - }, - "node_modules/@webassemblyjs/wast-printer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", - "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", - "dev": true, - "dependencies": { - "@webassemblyjs/ast": "1.12.1", - "@xtuc/long": "4.2.2" - } - }, - "node_modules/@webpack-cli/configtest": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", - "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", - "dev": true, - "peerDependencies": { - "webpack": "4.x.x || 5.x.x", - "webpack-cli": "4.x.x" - } - }, - "node_modules/@webpack-cli/info": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", - "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", - "dev": true, - "dependencies": { - "envinfo": "^7.7.3" - }, - "peerDependencies": { - "webpack-cli": "4.x.x" - } - }, - "node_modules/@webpack-cli/serve": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", - "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", - "dev": true, - "peerDependencies": { - "webpack-cli": "4.x.x" - }, - "peerDependenciesMeta": { - "webpack-dev-server": { - "optional": true - } - } - }, - "node_modules/@xmldom/xmldom": { - "version": "0.8.10", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", - "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", - "dev": true, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true - }, - "node_modules/@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true - }, - "node_modules/7zip-bin": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.2.0.tgz", - "integrity": "sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A==", - "dev": true - }, - "node_modules/acorn": { - "version": "8.11.3", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", - "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", - "dev": true, - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", - "dev": true, - "peerDependencies": { - "acorn": "^8" - } - }, - "node_modules/acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "peerDependencies": { - "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" - } - }, - "node_modules/acorn-walk": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", - "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/agent-base": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "dev": true, - "dependencies": { - "debug": "4" - }, - "engines": { - "node": ">= 6.0.0" - } - }, - "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-formats": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", - "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", - "dev": true, - "dependencies": { - "ajv": "^8.0.0" - }, - "peerDependencies": { - "ajv": "^8.0.0" - }, - "peerDependenciesMeta": { - "ajv": { - "optional": true - } - } - }, - "node_modules/ajv-formats/node_modules/ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.3", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/ajv-formats/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/ajv-keywords": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", - "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", - "dev": true, - "peerDependencies": { - "ajv": "^6.9.1" - } - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/app-builder-bin": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-4.0.0.tgz", - "integrity": "sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==", - "dev": true - }, - "node_modules/app-builder-lib": { - "version": "24.13.3", - "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.13.3.tgz", - "integrity": "sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig==", - "dev": true, - "dependencies": { - "@develar/schema-utils": "~2.6.5", - "@electron/notarize": "2.2.1", - "@electron/osx-sign": "1.0.5", - "@electron/universal": "1.5.1", - "@malept/flatpak-bundler": "^0.4.0", - "@types/fs-extra": "9.0.13", - "async-exit-hook": "^2.0.1", - "bluebird-lst": "^1.0.9", - "builder-util": "24.13.1", - "builder-util-runtime": "9.2.4", - "chromium-pickle-js": "^0.2.0", - "debug": "^4.3.4", - "ejs": "^3.1.8", - "electron-publish": "24.13.1", - "form-data": "^4.0.0", - "fs-extra": "^10.1.0", - "hosted-git-info": "^4.1.0", - "is-ci": "^3.0.0", - "isbinaryfile": "^5.0.0", - "js-yaml": "^4.1.0", - "lazy-val": "^1.0.5", - "minimatch": "^5.1.1", - "read-config-file": "6.3.2", - "sanitize-filename": "^1.6.3", - "semver": "^7.3.8", - "tar": "^6.1.12", - "temp-file": "^3.4.0" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "dmg-builder": "24.13.3", - "electron-builder-squirrel-windows": "24.13.3" - } - }, - "node_modules/app-builder-lib/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/app-builder-lib/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/app-builder-lib/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/archiver": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz", - "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==", - "dev": true, - "peer": true, - "dependencies": { - "archiver-utils": "^2.1.0", - "async": "^3.2.4", - "buffer-crc32": "^0.2.1", - "readable-stream": "^3.6.0", - "readdir-glob": "^1.1.2", - "tar-stream": "^2.2.0", - "zip-stream": "^4.1.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/archiver-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", - "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", - "dev": true, - "peer": true, - "dependencies": { - "glob": "^7.1.4", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^2.0.0" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/archiver-utils/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "peer": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/archiver-utils/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "peer": true - }, - "node_modules/archiver-utils/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "peer": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", - "dev": true, - "optional": true, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true, - "optional": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/async": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", - "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", - "dev": true - }, - "node_modules/async-exit-hook": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", - "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true - }, - "node_modules/at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true, - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true, - "engines": { - "node": "*" - } - }, - "node_modules/binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dev": true, - "peer": true, - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, - "node_modules/bluebird-lst": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.9.tgz", - "integrity": "sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==", - "dev": true, - "dependencies": { - "bluebird": "^3.5.5" - } - }, - "node_modules/blueimp-md5": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz", - "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==", - "dev": true - }, - "node_modules/boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true - }, - "node_modules/boolean": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz", - "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", - "optional": true - }, - "node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "dependencies": { - "fill-range": "^7.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/browserslist": { - "version": "4.23.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", - "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "caniuse-lite": "^1.0.30001587", - "electron-to-chromium": "^1.4.668", - "node-releases": "^2.0.14", - "update-browserslist-db": "^1.0.13" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "node_modules/buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "engines": { - "node": "*" - } - }, - "node_modules/buffer-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz", - "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==", - "dev": true, - "engines": { - "node": ">=0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/buffer-from": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", - "dev": true - }, - "node_modules/builder-util": { - "version": "24.13.1", - "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.13.1.tgz", - "integrity": "sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA==", - "dev": true, - "dependencies": { - "@types/debug": "^4.1.6", - "7zip-bin": "~5.2.0", - "app-builder-bin": "4.0.0", - "bluebird-lst": "^1.0.9", - "builder-util-runtime": "9.2.4", - "chalk": "^4.1.2", - "cross-spawn": "^7.0.3", - "debug": "^4.3.4", - "fs-extra": "^10.1.0", - "http-proxy-agent": "^5.0.0", - "https-proxy-agent": "^5.0.1", - "is-ci": "^3.0.0", - "js-yaml": "^4.1.0", - "source-map-support": "^0.5.19", - "stat-mode": "^1.0.0", - "temp-file": "^3.4.0" - } - }, - "node_modules/builder-util-runtime": { - "version": "9.2.4", - "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz", - "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==", - "dev": true, - "dependencies": { - "debug": "^4.3.4", - "sax": "^1.2.4" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/builder-util/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/builder-util/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/builder-util/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/cacheable-lookup": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", - "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", - "engines": { - "node": ">=10.6.0" - } - }, - "node_modules/cacheable-request": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz", - "integrity": "sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==", - "dependencies": { - "clone-response": "^1.0.2", - "get-stream": "^5.1.0", - "http-cache-semantics": "^4.0.0", - "keyv": "^4.0.0", - "lowercase-keys": "^2.0.0", - "normalize-url": "^6.0.1", - "responselike": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/camel-case": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", - "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", - "dev": true, - "dependencies": { - "pascal-case": "^3.1.2", - "tslib": "^2.0.3" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001616", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz", - "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ] - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chokidar/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/chrome-trace-event": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz", - "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==", - "dev": true, - "engines": { - "node": ">=6.0" - } - }, - "node_modules/chromium-pickle-js": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", - "integrity": "sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==", - "dev": true - }, - "node_modules/ci-info": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", - "integrity": "sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/sibiraj-s" - } - ], - "engines": { - "node": ">=8" - } - }, - "node_modules/clean-css": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz", - "integrity": "sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==", - "dev": true, - "dependencies": { - "source-map": "~0.6.0" - }, - "engines": { - "node": ">= 4.0" - } - }, - "node_modules/clean-webpack-plugin": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz", - "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==", - "dev": true, - "dependencies": { - "del": "^4.1.1" - }, - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "webpack": ">=4.0.0 <6.0.0" - } - }, - "node_modules/cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "dev": true, - "optional": true, - "dependencies": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/clone-deep": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", - "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", - "dev": true, - "dependencies": { - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.2", - "shallow-clone": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/clone-response": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz", - "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==", - "dependencies": { - "mimic-response": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/colorette": { - "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true - }, - "node_modules/combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "dependencies": { - "delayed-stream": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/commander": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", - "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/compare-version": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", - "integrity": "sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/compress-commons": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", - "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", - "dev": true, - "peer": true, - "dependencies": { - "buffer-crc32": "^0.2.13", - "crc32-stream": "^4.0.2", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "node_modules/config-file-ts": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.6.tgz", - "integrity": "sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==", - "dev": true, - "dependencies": { - "glob": "^10.3.10", - "typescript": "^5.3.3" - } - }, - "node_modules/config-file-ts/node_modules/glob": { - "version": "10.3.12", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz", - "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==", - "dev": true, - "dependencies": { - "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", - "minimatch": "^9.0.1", - "minipass": "^7.0.4", - "path-scurry": "^1.10.2" - }, - "bin": { - "glob": "dist/esm/bin.mjs" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/config-file-ts/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/config-file-ts/node_modules/minipass": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.0.tgz", - "integrity": "sha512-oGZRv2OT1lO2UF1zUcwdTb3wqUwI0kBGTgt/T7OdSj6M6N5m3o5uPf0AIW6lVxGGoiWUR7e2AwTE+xiwK8WQig==", - "dev": true, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/config-file-ts/node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", - "dev": true - }, - "node_modules/crc": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz", - "integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==", - "dev": true, - "optional": true, - "dependencies": { - "buffer": "^5.1.0" - } - }, - "node_modules/crc-32": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", - "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", - "dev": true, - "peer": true, - "bin": { - "crc32": "bin/crc32.njs" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/crc32-stream": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz", - "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", - "dev": true, - "peer": true, - "dependencies": { - "crc-32": "^1.2.0", - "readable-stream": "^3.4.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "dependencies": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/css-loader": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz", - "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==", - "dev": true, - "dependencies": { - "icss-utils": "^5.1.0", - "postcss": "^8.4.33", - "postcss-modules-extract-imports": "^3.1.0", - "postcss-modules-local-by-default": "^4.0.5", - "postcss-modules-scope": "^3.2.0", - "postcss-modules-values": "^4.0.0", - "postcss-value-parser": "^4.2.0", - "semver": "^7.5.4" - }, - "engines": { - "node": ">= 12.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "@rspack/core": "0.x || 1.x", - "webpack": "^5.0.0" - }, - "peerDependenciesMeta": { - "@rspack/core": { - "optional": true - }, - "webpack": { - "optional": true - } - } - }, - "node_modules/css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "dev": true, - "dependencies": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true, - "engines": { - "node": ">= 6" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true, - "bin": { - "cssesc": "bin/cssesc" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/dayjs": { - "version": "1.11.11", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz", - "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==", - "dev": true - }, - "node_modules/debounce": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz", - "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==", - "dev": true - }, - "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dependencies": { - "ms": "2.1.2" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/decompress-response": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", - "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", - "dependencies": { - "mimic-response": "^3.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/decompress-response/node_modules/mimic-response": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", - "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "node_modules/defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "engines": { - "node": ">=10" - } - }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "optional": true, - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/define-properties": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "optional": true, - "dependencies": { - "define-data-property": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/del": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", - "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", - "dev": true, - "dependencies": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/del/node_modules/array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==", - "dev": true, - "dependencies": { - "array-uniq": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/del/node_modules/globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==", - "dev": true, - "dependencies": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/del/node_modules/globby/node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/detect-node": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", - "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", - "optional": true - }, - "node_modules/dir-compare": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-3.3.0.tgz", - "integrity": "sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==", - "dev": true, - "dependencies": { - "buffer-equal": "^1.0.0", - "minimatch": "^3.0.4" - } - }, - "node_modules/dir-compare/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/dir-compare/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/dmg-builder": { - "version": "24.13.3", - "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.13.3.tgz", - "integrity": "sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==", - "dev": true, - "dependencies": { - "app-builder-lib": "24.13.3", - "builder-util": "24.13.1", - "builder-util-runtime": "9.2.4", - "fs-extra": "^10.1.0", - "iconv-lite": "^0.6.2", - "js-yaml": "^4.1.0" - }, - "optionalDependencies": { - "dmg-license": "^1.0.11" - } - }, - "node_modules/dmg-builder/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/dmg-builder/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/dmg-builder/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/dmg-license": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.11.tgz", - "integrity": "sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==", - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "@types/plist": "^3.0.1", - "@types/verror": "^1.10.3", - "ajv": "^6.10.0", - "crc": "^3.8.0", - "iconv-corefoundation": "^1.1.7", - "plist": "^3.0.4", - "smart-buffer": "^4.0.2", - "verror": "^1.10.0" - }, - "bin": { - "dmg-license": "bin/dmg-license.js" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/dom-converter": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz", - "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==", - "dev": true, - "dependencies": { - "utila": "~0.4" - } - }, - "node_modules/dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "dev": true, - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" - } - }, - "node_modules/domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ] - }, - "node_modules/domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "dev": true, - "dependencies": { - "domelementtype": "^2.2.0" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } - }, - "node_modules/domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dev": true, - "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" - } - }, - "node_modules/dot-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", - "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", - "dev": true, - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/dotenv": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz", - "integrity": "sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/dotenv-expand": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz", - "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==", - "dev": true - }, - "node_modules/duplexer": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", - "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", - "dev": true - }, - "node_modules/eastasianwidth": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true - }, - "node_modules/ejs": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", - "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", - "dev": true, - "dependencies": { - "jake": "^10.8.5" - }, - "bin": { - "ejs": "bin/cli.js" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/electron": { - "version": "28.2.10", - "resolved": "https://registry.npmjs.org/electron/-/electron-28.2.10.tgz", - "integrity": "sha512-0rGBJNogcl2FIRxGRUv9zuMaBP78nSBJW+Bd1U7OGeg8IEkSIbHOhfn71XoGxgbOUSCEXjjyftq4mtAAVbUsZQ==", - "hasInstallScript": true, - "dependencies": { - "@electron/get": "^2.0.0", - "@types/node": "^18.11.18", - "extract-zip": "^2.0.1" - }, - "bin": { - "electron": "cli.js" - }, - "engines": { - "node": ">= 12.20.55" - } - }, - "node_modules/electron-builder": { - "version": "24.13.3", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.13.3.tgz", - "integrity": "sha512-yZSgVHft5dNVlo31qmJAe4BVKQfFdwpRw7sFp1iQglDRCDD6r22zfRJuZlhtB5gp9FHUxCMEoWGq10SkCnMAIg==", - "dev": true, - "dependencies": { - "app-builder-lib": "24.13.3", - "builder-util": "24.13.1", - "builder-util-runtime": "9.2.4", - "chalk": "^4.1.2", - "dmg-builder": "24.13.3", - "fs-extra": "^10.1.0", - "is-ci": "^3.0.0", - "lazy-val": "^1.0.5", - "read-config-file": "6.3.2", - "simple-update-notifier": "2.0.0", - "yargs": "^17.6.2" - }, - "bin": { - "electron-builder": "cli.js", - "install-app-deps": "install-app-deps.js" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/electron-builder-squirrel-windows": { - "version": "24.13.3", - "resolved": "https://registry.npmjs.org/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-24.13.3.tgz", - "integrity": "sha512-oHkV0iogWfyK+ah9ZIvMDpei1m9ZRpdXcvde1wTpra2U8AFDNNpqJdnin5z+PM1GbQ5BoaKCWas2HSjtR0HwMg==", - "dev": true, - "peer": true, - "dependencies": { - "app-builder-lib": "24.13.3", - "archiver": "^5.3.1", - "builder-util": "24.13.1", - "fs-extra": "^10.1.0" - } - }, - "node_modules/electron-builder-squirrel-windows/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "peer": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-builder-squirrel-windows/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "peer": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/electron-builder-squirrel-windows/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "peer": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/electron-builder/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-builder/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/electron-builder/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/electron-publish": { - "version": "24.13.1", - "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz", - "integrity": "sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==", - "dev": true, - "dependencies": { - "@types/fs-extra": "^9.0.11", - "builder-util": "24.13.1", - "builder-util-runtime": "9.2.4", - "chalk": "^4.1.2", - "fs-extra": "^10.1.0", - "lazy-val": "^1.0.5", - "mime": "^2.5.2" - } - }, - "node_modules/electron-publish/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/electron-publish/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/electron-publish/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/electron-to-chromium": { - "version": "1.4.756", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.756.tgz", - "integrity": "sha512-RJKZ9+vEBMeiPAvKNWyZjuYyUqMndcP1f335oHqn3BEQbs2NFtVrnK5+6Xg5wSM9TknNNpWghGDUCKGYF+xWXw==", - "dev": true - }, - "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "node_modules/emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/encoding": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", - "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", - "dev": true, - "dependencies": { - "iconv-lite": "^0.6.2" - } - }, - "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/enhanced-resolve": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz", - "integrity": "sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.2.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, - "node_modules/env-paths": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", - "engines": { - "node": ">=6" - } - }, - "node_modules/envinfo": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz", - "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==", - "dev": true, - "bin": { - "envinfo": "dist/cli.js" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/err-code": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true - }, - "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "optional": true, - "dependencies": { - "get-intrinsic": "^1.2.4" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "optional": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/es-module-lexer": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.2.tgz", - "integrity": "sha512-l60ETUTmLqbVbVHv1J4/qj+M8nq7AwMzEcg3kmJDt9dCNrTk+yHcYFf/Kw75pMDwd9mPcIGCG5LcS20SxYRzFA==", - "dev": true - }, - "node_modules/es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "optional": true - }, - "node_modules/esbuild": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", - "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", - "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.12", - "@esbuild/android-arm": "0.19.12", - "@esbuild/android-arm64": "0.19.12", - "@esbuild/android-x64": "0.19.12", - "@esbuild/darwin-arm64": "0.19.12", - "@esbuild/darwin-x64": "0.19.12", - "@esbuild/freebsd-arm64": "0.19.12", - "@esbuild/freebsd-x64": "0.19.12", - "@esbuild/linux-arm": "0.19.12", - "@esbuild/linux-arm64": "0.19.12", - "@esbuild/linux-ia32": "0.19.12", - "@esbuild/linux-loong64": "0.19.12", - "@esbuild/linux-mips64el": "0.19.12", - "@esbuild/linux-ppc64": "0.19.12", - "@esbuild/linux-riscv64": "0.19.12", - "@esbuild/linux-s390x": "0.19.12", - "@esbuild/linux-x64": "0.19.12", - "@esbuild/netbsd-x64": "0.19.12", - "@esbuild/openbsd-x64": "0.19.12", - "@esbuild/sunos-x64": "0.19.12", - "@esbuild/win32-arm64": "0.19.12", - "@esbuild/win32-ia32": "0.19.12", - "@esbuild/win32-x64": "0.19.12" - } - }, - "node_modules/esbuild-loader": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/esbuild-loader/-/esbuild-loader-3.2.0.tgz", - "integrity": "sha512-lnIdRMQpk50alCa0QoW0ozc0D3rjJXl02mtMsk9INIcW25RPZhDja332bu85ixwVNbhQ7VfBRcQyZ/qza8mWiA==", - "dev": true, - "dependencies": { - "esbuild": "^0.19.0", - "get-tsconfig": "^4.6.2", - "loader-utils": "^2.0.4", - "webpack-sources": "^1.4.3" - }, - "funding": { - "url": "https://github.com/esbuild-kit/esbuild-loader?sponsor=1" - }, - "peerDependencies": { - "webpack": "^4.40.0 || ^5.0.0" - } - }, - "node_modules/escalade": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", - "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "devOptional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint": { - "version": "8.57.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", - "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", - "dev": true, - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.0", - "@humanwhocodes/config-array": "^0.11.14", - "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", - "debug": "^4.3.2", - "doctrine": "^3.0.0", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" - }, - "bin": { - "eslint": "bin/eslint.js" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint-scope": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", - "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^4.1.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/eslint/node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, - "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/eslint/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, - "dependencies": { - "acorn": "^8.9.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, - "dependencies": { - "estraverse": "^5.1.0" - }, - "engines": { - "node": ">=0.10" - } - }, - "node_modules/esquery/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "dependencies": { - "estraverse": "^5.2.0" - }, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esrecurse/node_modules/estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true, - "engines": { - "node": ">=4.0" - } - }, - "node_modules/esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", - "dev": true, - "engines": { - "node": ">=0.8.x" - } - }, - "node_modules/extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dependencies": { - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "bin": { - "extract-zip": "cli.js" - }, - "engines": { - "node": ">= 10.17.0" - }, - "optionalDependencies": { - "@types/yauzl": "^2.9.1" - } - }, - "node_modules/extsprintf": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", - "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", - "dev": true, - "engines": [ - "node >=0.6.0" - ], - "optional": true - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "node_modules/fast-glob": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", - "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.4" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "node_modules/fastest-levenshtein": { - "version": "1.0.16", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", - "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", - "dev": true, - "engines": { - "node": ">= 4.9.1" - } - }, - "node_modules/fastq": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", - "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, - "node_modules/fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "dependencies": { - "pend": "~1.2.0" - } - }, - "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "dependencies": { - "flat-cache": "^3.0.4" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/file-loader": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-6.2.0.tgz", - "integrity": "sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==", - "dev": true, - "dependencies": { - "loader-utils": "^2.0.0", - "schema-utils": "^3.0.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^4.0.0 || ^5.0.0" - } - }, - "node_modules/filelist": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", - "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", - "dev": true, - "dependencies": { - "minimatch": "^5.0.1" - } - }, - "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/flat": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", - "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "dev": true, - "bin": { - "flat": "cli.js" - } - }, - "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" - }, - "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flat-cache/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/flatted": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true - }, - "node_modules/foreground-child": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz", - "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==", - "dev": true, - "dependencies": { - "cross-spawn": "^7.0.0", - "signal-exit": "^4.0.1" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/fs-constants": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "dev": true, - "peer": true - }, - "node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/fs-minipass": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/fs-minipass/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "devOptional": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, - "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", - "optional": true, - "dependencies": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/get-tsconfig": { - "version": "4.7.3", - "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.3.tgz", - "integrity": "sha512-ZvkrzoUA0PQZM6fy6+/Hce561s+faD1rsNwhnO5FelNjyy7EMGJ3Rz1AQ8GYDWjhRs/7dBLOEJvhK8MiEJOAFg==", - "dev": true, - "dependencies": { - "resolve-pkg-maps": "^1.0.0" - }, - "funding": { - "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" - } - }, - "node_modules/glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "dependencies": { - "is-glob": "^4.0.3" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true - }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/glob/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/global-agent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", - "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", - "optional": true, - "dependencies": { - "boolean": "^3.0.1", - "es6-error": "^4.1.1", - "matcher": "^3.0.0", - "roarr": "^2.15.3", - "semver": "^7.3.2", - "serialize-error": "^7.0.1" - }, - "engines": { - "node": ">=10.0" - } - }, - "node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, - "dependencies": { - "type-fest": "^0.20.2" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/globalthis": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", - "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", - "optional": true, - "dependencies": { - "define-properties": "^1.2.1", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "optional": true, - "dependencies": { - "get-intrinsic": "^1.1.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/got": { - "version": "11.8.6", - "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz", - "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==", - "dependencies": { - "@sindresorhus/is": "^4.0.0", - "@szmarczak/http-timer": "^4.0.5", - "@types/cacheable-request": "^6.0.1", - "@types/responselike": "^1.0.0", - "cacheable-lookup": "^5.0.3", - "cacheable-request": "^7.0.2", - "decompress-response": "^6.0.0", - "http2-wrapper": "^1.0.0-beta.5.2", - "lowercase-keys": "^2.0.0", - "p-cancelable": "^2.0.0", - "responselike": "^2.0.0" - }, - "engines": { - "node": ">=10.19.0" - }, - "funding": { - "url": "https://github.com/sindresorhus/got?sponsor=1" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "node_modules/graphemer": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true - }, - "node_modules/gzip-size": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", - "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==", - "dev": true, - "dependencies": { - "duplexer": "^0.1.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "optional": true, - "dependencies": { - "es-define-property": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", - "optional": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "optional": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "devOptional": true, - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/he": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", - "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", - "dev": true, - "bin": { - "he": "bin/he" - } - }, - "node_modules/hosted-git-info": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", - "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/html-escaper": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", - "dev": true - }, - "node_modules/html-loader": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-2.1.2.tgz", - "integrity": "sha512-XB4O1+6mpLp4qy/3qg5+1QPZ/uXvWtO64hNAX87sKHwcHkp1LJGU7V3sJ9iVmRACElAZXQ4YOO/Lbkx5kYfl9A==", - "dev": true, - "dependencies": { - "html-minifier-terser": "^5.1.1", - "parse5": "^6.0.1" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.0.0" - } - }, - "node_modules/html-minifier-terser": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz", - "integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==", - "dev": true, - "dependencies": { - "camel-case": "^4.1.1", - "clean-css": "^4.2.3", - "commander": "^4.1.1", - "he": "^1.2.0", - "param-case": "^3.0.3", - "relateurl": "^0.2.7", - "terser": "^4.6.3" - }, - "bin": { - "html-minifier-terser": "cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/html-minifier-terser/node_modules/commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/html-webpack-plugin": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz", - "integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==", - "dev": true, - "dependencies": { - "@types/html-minifier-terser": "^6.0.0", - "html-minifier-terser": "^6.0.2", - "lodash": "^4.17.21", - "pretty-error": "^4.0.0", - "tapable": "^2.0.0" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/html-webpack-plugin" - }, - "peerDependencies": { - "@rspack/core": "0.x || 1.x", - "webpack": "^5.20.0" - }, - "peerDependenciesMeta": { - "@rspack/core": { - "optional": true - }, - "webpack": { - "optional": true - } - } - }, - "node_modules/html-webpack-plugin/node_modules/clean-css": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz", - "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==", - "dev": true, - "dependencies": { - "source-map": "~0.6.0" - }, - "engines": { - "node": ">= 10.0" - } - }, - "node_modules/html-webpack-plugin/node_modules/commander": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", - "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", - "dev": true, - "engines": { - "node": ">= 12" - } - }, - "node_modules/html-webpack-plugin/node_modules/html-minifier-terser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz", - "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==", - "dev": true, - "dependencies": { - "camel-case": "^4.1.2", - "clean-css": "^5.2.2", - "commander": "^8.3.0", - "he": "^1.2.0", - "param-case": "^3.0.4", - "relateurl": "^0.2.7", - "terser": "^5.10.0" - }, - "bin": { - "html-minifier-terser": "cli.js" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/html-webpack-plugin/node_modules/terser": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz", - "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==", - "dev": true, - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/html-webpack-plugin/node_modules/terser/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "node_modules/htmlparser2": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz", - "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==", - "dev": true, - "funding": [ - "https://github.com/fb55/htmlparser2?sponsor=1", - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.0.0", - "domutils": "^2.5.2", - "entities": "^2.0.0" - } - }, - "node_modules/http-cache-semantics": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", - "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==" - }, - "node_modules/http-proxy-agent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", - "dev": true, - "dependencies": { - "@tootallnate/once": "2", - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/http2-wrapper": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", - "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", - "dependencies": { - "quick-lru": "^5.1.1", - "resolve-alpn": "^1.0.0" - }, - "engines": { - "node": ">=10.19.0" - } - }, - "node_modules/https-proxy-agent": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", - "dev": true, - "dependencies": { - "agent-base": "6", - "debug": "4" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/iconv-corefoundation": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz", - "integrity": "sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ==", - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "dependencies": { - "cli-truncate": "^2.1.0", - "node-addon-api": "^1.6.3" - }, - "engines": { - "node": "^8.11.2 || >=10" - } - }, - "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/icss-utils": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", - "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", - "dev": true, - "engines": { - "node": "^10 || ^12 || >= 14" - }, - "peerDependencies": { - "postcss": "^8.1.0" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/ifdef-loader": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/ifdef-loader/-/ifdef-loader-2.3.2.tgz", - "integrity": "sha512-kH9bHPrfIFxLpq3XEruJqSlHXch2nOljKIDRS/6MU5LDZTyHeaSWVf04wNYX+8RT+NDmeS8Vm5HwZ7akkXo8ig==", - "dev": true, - "dependencies": { - "loader-utils": "^1.1.0" - } - }, - "node_modules/ifdef-loader/node_modules/json5": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", - "dev": true, - "dependencies": { - "minimist": "^1.2.0" - }, - "bin": { - "json5": "lib/cli.js" - } - }, - "node_modules/ifdef-loader/node_modules/loader-utils": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", - "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", - "dev": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^1.0.1" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/ignore": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", - "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/immutable": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz", - "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==", - "dev": true - }, - "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/import-local": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", - "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==", - "dev": true, - "dependencies": { - "pkg-dir": "^4.2.0", - "resolve-cwd": "^3.0.0" - }, - "bin": { - "import-local-fixture": "fixtures/cli.js" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, - "engines": { - "node": ">=0.8.19" - } - }, - "node_modules/inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "node_modules/inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "node_modules/interpret": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", - "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", - "dev": true, - "dependencies": { - "ci-info": "^3.2.0" - }, - "bin": { - "is-ci": "bin.js" - } - }, - "node_modules/is-core-module": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", - "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", - "dev": true, - "dependencies": { - "hasown": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "dependencies": { - "is-extglob": "^2.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, - "engines": { - "node": ">=0.12.0" - } - }, - "node_modules/is-path-cwd": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", - "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/is-path-in-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", - "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", - "dev": true, - "dependencies": { - "is-path-inside": "^2.1.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/is-path-in-cwd/node_modules/is-path-inside": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", - "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", - "dev": true, - "dependencies": { - "path-is-inside": "^1.0.2" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true, - "peer": true - }, - "node_modules/isbinaryfile": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-5.0.2.tgz", - "integrity": "sha512-GvcjojwonMjWbTkfMpnVHVqXW/wKMYDfEpY94/8zy8HFMOqb/VL6oeONq9v87q4ttVlaTLnGXnJD4B5B1OTGIg==", - "dev": true, - "engines": { - "node": ">= 18.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/gjtorikian/" - } - }, - "node_modules/isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "node_modules/isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", - "dev": true, - "dependencies": { - "@isaacs/cliui": "^8.0.2" - }, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" - } - }, - "node_modules/jake": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz", - "integrity": "sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==", - "dev": true, - "dependencies": { - "async": "^3.2.3", - "chalk": "^4.0.2", - "filelist": "^1.0.4", - "minimatch": "^3.1.2" - }, - "bin": { - "jake": "bin/cli.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/jake/node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/jake/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "engines": { - "node": "*" - } - }, - "node_modules/jest-worker": { - "version": "27.5.1", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", - "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", - "dev": true, - "dependencies": { - "@types/node": "*", - "merge-stream": "^2.0.0", - "supports-color": "^8.0.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/jest-worker/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, - "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "dependencies": { - "argparse": "^2.0.1" - }, - "bin": { - "js-yaml": "bin/js-yaml.js" - } - }, - "node_modules/json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" - }, - "node_modules/json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "node_modules/json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true - }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "optional": true - }, - "node_modules/json5": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "dev": true, - "bin": { - "json5": "lib/cli.js" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dependencies": { - "json-buffer": "3.0.1" - } - }, - "node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/lazy-val": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz", - "integrity": "sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q==", - "dev": true - }, - "node_modules/lazystream": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", - "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", - "dev": true, - "peer": true, - "dependencies": { - "readable-stream": "^2.0.5" - }, - "engines": { - "node": ">= 0.6.3" - } - }, - "node_modules/lazystream/node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "peer": true, - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/lazystream/node_modules/safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "peer": true - }, - "node_modules/lazystream/node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "peer": true, - "dependencies": { - "safe-buffer": "~5.1.0" - } - }, - "node_modules/levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/loader-runner": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", - "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", - "dev": true, - "engines": { - "node": ">=6.11.5" - } - }, - "node_modules/loader-utils": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", - "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", - "dev": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, - "node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "node_modules/lodash.defaults": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", - "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", - "dev": true, - "peer": true - }, - "node_modules/lodash.difference": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", - "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==", - "dev": true, - "peer": true - }, - "node_modules/lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==", - "dev": true, - "peer": true - }, - "node_modules/lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", - "dev": true, - "peer": true - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "node_modules/lodash.union": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", - "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==", - "dev": true, - "peer": true - }, - "node_modules/lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", - "dev": true, - "dependencies": { - "tslib": "^2.0.3" - } - }, - "node_modules/lowercase-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", - "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", - "engines": { - "node": ">=8" - } - }, - "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "devOptional": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/matcher": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", - "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", - "optional": true, - "dependencies": { - "escape-string-regexp": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", - "dev": true, - "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/mime": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", - "dev": true, - "bin": { - "mime": "cli.js" - }, - "engines": { - "node": ">=4.0.0" - } - }, - "node_modules/mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "dependencies": { - "mime-db": "1.52.0" - }, - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/mimic-response": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", - "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", - "engines": { - "node": ">=4" - } - }, - "node_modules/mini-css-extract-plugin": { - "version": "2.7.6", - "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz", - "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==", - "dev": true, - "dependencies": { - "schema-utils": "^4.0.0" - }, - "engines": { - "node": ">= 12.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.0.0" - } - }, - "node_modules/mini-css-extract-plugin/node_modules/ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.3", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", - "dev": true, - "dependencies": { - "fast-deep-equal": "^3.1.3" - }, - "peerDependencies": { - "ajv": "^8.8.2" - } - }, - "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - }, - "node_modules/mini-css-extract-plugin/node_modules/schema-utils": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", - "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.9", - "ajv": "^8.9.0", - "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.1.0" - }, - "engines": { - "node": ">= 12.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/minipass": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/minizlib": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "dev": true, - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/minizlib/node_modules/minipass": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "dev": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/mrmime": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz", - "integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/nanoid": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", - "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true - }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, - "node_modules/neo-async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", - "dev": true - }, - "node_modules/no-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", - "dev": true, - "dependencies": { - "lower-case": "^2.0.2", - "tslib": "^2.0.3" - } - }, - "node_modules/node-addon-api": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", - "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==", - "dev": true, - "optional": true - }, - "node_modules/node-releases": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", - "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", - "dev": true - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/normalize-url": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "dependencies": { - "boolbase": "^1.0.0" - }, - "funding": { - "url": "https://github.com/fb55/nth-check?sponsor=1" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "optional": true, - "engines": { - "node": ">= 0.4" - } - }, - "node_modules/once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dependencies": { - "wrappy": "1" - } - }, - "node_modules/opener": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz", - "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==", - "dev": true, - "bin": { - "opener": "bin/opener-bin.js" - } - }, - "node_modules/optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "dev": true, - "dependencies": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/p-cancelable": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", - "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", - "engines": { - "node": ">=8" - } - }, - "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/p-map": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz", - "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/param-case": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", - "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", - "dev": true, - "dependencies": { - "dot-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse5": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", - "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", - "dev": true - }, - "node_modules/pascal-case": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", - "dev": true, - "dependencies": { - "no-case": "^3.0.4", - "tslib": "^2.0.3" - } - }, - "node_modules/path-browserify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz", - "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==", - "dev": true - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==", - "dev": true - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "node_modules/path-scurry": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz", - "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==", - "dev": true, - "dependencies": { - "lru-cache": "^10.2.0", - "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", - "dev": true, - "engines": { - "node": "14 || >=16.14" - } - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==" - }, - "node_modules/picocolors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", - "dev": true, - "dependencies": { - "pinkie": "^2.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pkg-dir": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", - "dev": true, - "dependencies": { - "find-up": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "dependencies": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "dependencies": { - "p-locate": "^4.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/pkg-dir/node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "dependencies": { - "p-try": "^2.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/pkg-dir/node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "dependencies": { - "p-limit": "^2.2.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/plist": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz", - "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==", - "dev": true, - "dependencies": { - "@xmldom/xmldom": "^0.8.8", - "base64-js": "^1.5.1", - "xmlbuilder": "^15.1.1" - }, - "engines": { - "node": ">=10.4.0" - } - }, - "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "nanoid": "^3.3.7", - "picocolors": "^1.0.0", - "source-map-js": "^1.2.0" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/postcss-modules-extract-imports": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", - "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==", - "dev": true, - "engines": { - "node": "^10 || ^12 || >= 14" - }, - "peerDependencies": { - "postcss": "^8.1.0" - } - }, - "node_modules/postcss-modules-local-by-default": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", - "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", - "dev": true, - "dependencies": { - "icss-utils": "^5.0.0", - "postcss-selector-parser": "^6.0.2", - "postcss-value-parser": "^4.1.0" - }, - "engines": { - "node": "^10 || ^12 || >= 14" - }, - "peerDependencies": { - "postcss": "^8.1.0" - } - }, - "node_modules/postcss-modules-scope": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", - "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", - "dev": true, - "dependencies": { - "postcss-selector-parser": "^6.0.4" - }, - "engines": { - "node": "^10 || ^12 || >= 14" - }, - "peerDependencies": { - "postcss": "^8.1.0" - } - }, - "node_modules/postcss-modules-values": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", - "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", - "dev": true, - "dependencies": { - "icss-utils": "^5.0.0" - }, - "engines": { - "node": "^10 || ^12 || >= 14" - }, - "peerDependencies": { - "postcss": "^8.1.0" - } - }, - "node_modules/postcss-selector-parser": { - "version": "6.0.16", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz", - "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==", - "dev": true, - "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true - }, - "node_modules/prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/pretty-error": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz", - "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==", - "dev": true, - "dependencies": { - "lodash": "^4.17.20", - "renderkid": "^3.0.0" - } - }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true, - "peer": true - }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/promise-retry": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", - "dev": true, - "dependencies": { - "err-code": "^2.0.2", - "retry": "^0.12.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dependencies": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "node_modules/punycode": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/randombytes": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", - "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", - "dev": true, - "dependencies": { - "safe-buffer": "^5.1.0" - } - }, - "node_modules/read-config-file": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz", - "integrity": "sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==", - "dev": true, - "dependencies": { - "config-file-ts": "^0.2.4", - "dotenv": "^9.0.2", - "dotenv-expand": "^5.1.0", - "js-yaml": "^4.1.0", - "json5": "^2.2.0", - "lazy-val": "^1.0.4" - }, - "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "peer": true, - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/readdir-glob": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", - "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", - "dev": true, - "peer": true, - "dependencies": { - "minimatch": "^5.1.0" - } - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/rechoir": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", - "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", - "dev": true, - "dependencies": { - "resolve": "^1.9.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/renderkid": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz", - "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==", - "dev": true, - "dependencies": { - "css-select": "^4.1.3", - "dom-converter": "^0.2.0", - "htmlparser2": "^6.1.0", - "lodash": "^4.17.21", - "strip-ansi": "^6.0.1" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/resolve": { - "version": "1.22.8", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", - "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", - "dev": true, - "dependencies": { - "is-core-module": "^2.13.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-alpn": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", - "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==" - }, - "node_modules/resolve-cwd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", - "dev": true, - "dependencies": { - "resolve-from": "^5.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/resolve-cwd/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, - "engines": { - "node": ">=4" - } - }, - "node_modules/resolve-pkg-maps": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", - "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", - "dev": true, - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" - } - }, - "node_modules/responselike": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz", - "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==", - "dependencies": { - "lowercase-keys": "^2.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, - "node_modules/rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - } - }, - "node_modules/roarr": { - "version": "2.15.4", - "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", - "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", - "optional": true, - "dependencies": { - "boolean": "^3.0.1", - "detect-node": "^2.0.4", - "globalthis": "^1.0.1", - "json-stringify-safe": "^5.0.1", - "semver-compare": "^1.0.0", - "sprintf-js": "^1.1.2" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, - "node_modules/safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "node_modules/sanitize-filename": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.3.tgz", - "integrity": "sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==", - "dev": true, - "dependencies": { - "truncate-utf8-bytes": "^1.0.0" - } - }, - "node_modules/sass": { - "version": "1.76.0", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.76.0.tgz", - "integrity": "sha512-nc3LeqvF2FNW5xGF1zxZifdW3ffIz5aBb7I7tSvOoNu7z1RQ6pFt9MBuiPtjgaI62YWrM/txjWlOCFiGtf2xpw==", - "dev": true, - "dependencies": { - "chokidar": ">=3.0.0 <4.0.0", - "immutable": "^4.0.0", - "source-map-js": ">=0.6.2 <2.0.0" - }, - "bin": { - "sass": "sass.js" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/sass-loader": { - "version": "12.6.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz", - "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==", - "dev": true, - "dependencies": { - "klona": "^2.0.4", - "neo-async": "^2.6.2" - }, - "engines": { - "node": ">= 12.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "fibers": ">= 3.1.0", - "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", - "sass": "^1.3.0", - "sass-embedded": "*", - "webpack": "^5.0.0" - }, - "peerDependenciesMeta": { - "fibers": { - "optional": true - }, - "node-sass": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-embedded": { - "optional": true - } - } - }, - "node_modules/sax": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz", - "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==", - "dev": true - }, - "node_modules/schema-utils": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", - "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", - "dev": true, - "dependencies": { - "@types/json-schema": "^7.0.8", - "ajv": "^6.12.5", - "ajv-keywords": "^3.5.2" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "devOptional": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", - "optional": true - }, - "node_modules/serialize-error": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", - "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", - "optional": true, - "dependencies": { - "type-fest": "^0.13.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/serialize-error/node_modules/type-fest": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", - "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/serialize-javascript": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", - "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", - "dev": true, - "dependencies": { - "randombytes": "^2.1.0" - } - }, - "node_modules/shallow-clone": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", - "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", - "dev": true, - "dependencies": { - "kind-of": "^6.0.2" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "dependencies": { - "shebang-regex": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/signal-exit": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, - "node_modules/simple-update-notifier": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz", - "integrity": "sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==", - "dev": true, - "dependencies": { - "semver": "^7.5.3" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/sirv": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz", - "integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==", - "dev": true, - "dependencies": { - "@polka/url": "^1.0.0-next.24", - "mrmime": "^2.0.0", - "totalist": "^3.0.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "dev": true, - "optional": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/smart-buffer": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", - "dev": true, - "optional": true, - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - } - }, - "node_modules/source-list-map": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", - "dev": true - }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-js": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", - "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", - "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } - }, - "node_modules/sprintf-js": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", - "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==", - "optional": true - }, - "node_modules/stat-mode": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-1.0.0.tgz", - "integrity": "sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg==", - "dev": true, - "engines": { - "node": ">= 6" - } - }, - "node_modules/string_decoder": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "dev": true, - "peer": true, - "dependencies": { - "safe-buffer": "~5.2.0" - } - }, - "node_modules/string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/string-width-cjs": { - "name": "string-width", - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "dependencies": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/sumchecker": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", - "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", - "dependencies": { - "debug": "^4.1.0" - }, - "engines": { - "node": ">= 8.0" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/tapable": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", - "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/tar": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "dev": true, - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^5.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/tar-stream": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", - "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "dev": true, - "peer": true, - "dependencies": { - "bl": "^4.0.3", - "end-of-stream": "^1.4.1", - "fs-constants": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^3.1.1" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/temp-file": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz", - "integrity": "sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==", - "dev": true, - "dependencies": { - "async-exit-hook": "^2.0.1", - "fs-extra": "^10.0.0" - } - }, - "node_modules/temp-file/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/temp-file/node_modules/jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "dependencies": { - "universalify": "^2.0.0" - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/temp-file/node_modules/universalify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", - "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", - "dev": true, - "engines": { - "node": ">= 10.0.0" - } - }, - "node_modules/terser": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz", - "integrity": "sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==", - "dev": true, - "dependencies": { - "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/terser-webpack-plugin": { - "version": "5.3.10", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", - "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", - "dev": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.20", - "jest-worker": "^27.4.5", - "schema-utils": "^3.1.1", - "serialize-javascript": "^6.0.1", - "terser": "^5.26.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "uglify-js": { - "optional": true - } - } - }, - "node_modules/terser-webpack-plugin/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "node_modules/terser-webpack-plugin/node_modules/terser": { - "version": "5.31.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.0.tgz", - "integrity": "sha512-Q1JFAoUKE5IMfI4Z/lkE/E6+SwgzO+x4tq4v1AyBLRj8VSYvRO6A/rQrPg1yud4g0En9EKI1TvFRF2tQFcoUkg==", - "dev": true, - "dependencies": { - "@jridgewell/source-map": "^0.3.3", - "acorn": "^8.8.2", - "commander": "^2.20.0", - "source-map-support": "~0.5.20" - }, - "bin": { - "terser": "bin/terser" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/terser/node_modules/commander": { - "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", - "dev": true - }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true - }, - "node_modules/tmp": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", - "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", - "dev": true, - "engines": { - "node": ">=14.14" - } - }, - "node_modules/tmp-promise": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", - "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", - "dev": true, - "dependencies": { - "tmp": "^0.2.0" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "dependencies": { - "is-number": "^7.0.0" - }, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/totalist": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz", - "integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==", - "dev": true, - "engines": { - "node": ">=6" - } - }, - "node_modules/truncate-utf8-bytes": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", - "integrity": "sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ==", - "dev": true, - "dependencies": { - "utf8-byte-length": "^1.0.1" - } - }, - "node_modules/tslib": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", - "dev": true - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, - "node_modules/tsutils/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "dependencies": { - "prelude-ls": "^1.2.1" - }, - "engines": { - "node": ">= 0.8.0" - } - }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=4.2.0" - } - }, - "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" - }, - "node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "engines": { - "node": ">= 4.0.0" - } - }, - "node_modules/update-browserslist-db": { - "version": "1.0.15", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.15.tgz", - "integrity": "sha512-K9HWH62x3/EalU1U6sjSZiylm9C8tgq2mSvshZpqc7QE69RaA2qjhkW2HlNA0tFpEbtyFz7HTqbSdN4MSwUodA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "dependencies": { - "escalade": "^3.1.2", - "picocolors": "^1.0.0" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "dependencies": { - "punycode": "^2.1.0" - } - }, - "node_modules/utf8-byte-length": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", - "integrity": "sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA==", - "dev": true - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "node_modules/utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==", - "dev": true - }, - "node_modules/verror": { - "version": "1.10.1", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", - "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", - "dev": true, - "optional": true, - "dependencies": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - }, - "engines": { - "node": ">=0.6.0" - } - }, - "node_modules/watchpack": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.1.tgz", - "integrity": "sha512-8wrBCMtVhqcXP2Sup1ctSkga6uc2Bx0IIvKyT7yTFier5AXHooSI+QyQQAtTb7+E0IUCCKyTFmXqdqgum2XWGg==", - "dev": true, - "dependencies": { - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.1.2" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/webpack": { - "version": "5.91.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz", - "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==", - "dev": true, - "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.5", - "@webassemblyjs/ast": "^1.12.1", - "@webassemblyjs/wasm-edit": "^1.12.1", - "@webassemblyjs/wasm-parser": "^1.12.1", - "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.21.10", - "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.16.0", - "es-module-lexer": "^1.2.1", - "eslint-scope": "5.1.1", - "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.11", - "json-parse-even-better-errors": "^2.3.1", - "loader-runner": "^4.2.0", - "mime-types": "^2.1.27", - "neo-async": "^2.6.2", - "schema-utils": "^3.2.0", - "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.10", - "watchpack": "^2.4.1", - "webpack-sources": "^3.2.3" - }, - "bin": { - "webpack": "bin/webpack.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependenciesMeta": { - "webpack-cli": { - "optional": true - } - } - }, - "node_modules/webpack-bundle-analyzer": { - "version": "4.10.2", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz", - "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==", - "dev": true, - "dependencies": { - "@discoveryjs/json-ext": "0.5.7", - "acorn": "^8.0.4", - "acorn-walk": "^8.0.0", - "commander": "^7.2.0", - "debounce": "^1.2.1", - "escape-string-regexp": "^4.0.0", - "gzip-size": "^6.0.0", - "html-escaper": "^2.0.2", - "opener": "^1.5.2", - "picocolors": "^1.0.0", - "sirv": "^2.0.3", - "ws": "^7.3.1" - }, - "bin": { - "webpack-bundle-analyzer": "lib/bin/analyzer.js" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/webpack-bundle-analyzer/node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/webpack-cli": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", - "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", - "dev": true, - "dependencies": { - "@discoveryjs/json-ext": "^0.5.0", - "@webpack-cli/configtest": "^1.2.0", - "@webpack-cli/info": "^1.5.0", - "@webpack-cli/serve": "^1.7.0", - "colorette": "^2.0.14", - "commander": "^7.0.0", - "cross-spawn": "^7.0.3", - "fastest-levenshtein": "^1.0.12", - "import-local": "^3.0.2", - "interpret": "^2.2.0", - "rechoir": "^0.7.0", - "webpack-merge": "^5.7.3" - }, - "bin": { - "webpack-cli": "bin/cli.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "4.x.x || 5.x.x" - }, - "peerDependenciesMeta": { - "@webpack-cli/generators": { - "optional": true - }, - "@webpack-cli/migrate": { - "optional": true - }, - "webpack-bundle-analyzer": { - "optional": true - }, - "webpack-dev-server": { - "optional": true - } - } - }, - "node_modules/webpack-cli/node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/webpack-merge": { - "version": "5.10.0", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", - "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", - "dev": true, - "dependencies": { - "clone-deep": "^4.0.1", - "flat": "^5.0.2", - "wildcard": "^2.0.0" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/webpack-sources": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz", - "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==", - "dev": true, - "dependencies": { - "source-list-map": "^2.0.0", - "source-map": "~0.6.1" - } - }, - "node_modules/webpack/node_modules/webpack-sources": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", - "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", - "dev": true, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "node-which": "bin/node-which" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/wildcard": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", - "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", - "dev": true - }, - "node_modules/word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, - "node_modules/wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/ws": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", - "dev": true, - "engines": { - "node": ">=8.3.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xmlbuilder": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", - "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", - "dev": true, - "engines": { - "node": ">=8.0" - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "devOptional": true - }, - "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "dev": true, - "dependencies": { - "cliui": "^8.0.1", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.3", - "y18n": "^5.0.5", - "yargs-parser": "^21.1.1" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "engines": { - "node": ">=12" - } - }, - "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, - "node_modules/yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/zip-stream": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz", - "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", - "dev": true, - "peer": true, - "dependencies": { - "archiver-utils": "^3.0.4", - "compress-commons": "^4.1.2", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/zip-stream/node_modules/archiver-utils": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz", - "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", - "dev": true, - "peer": true, - "dependencies": { - "glob": "^7.2.3", - "graceful-fs": "^4.2.0", - "lazystream": "^1.0.0", - "lodash.defaults": "^4.2.0", - "lodash.difference": "^4.5.0", - "lodash.flatten": "^4.4.0", - "lodash.isplainobject": "^4.0.6", - "lodash.union": "^4.6.0", - "normalize-path": "^3.0.0", - "readable-stream": "^3.6.0" - }, - "engines": { - "node": ">= 10" - } - } - } -} diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix index e019f507ccea..9f52ab47095b 100644 --- a/pkgs/by-name/si/siyuan/package.nix +++ b/pkgs/by-name/si/siyuan/package.nix @@ -1,28 +1,34 @@ { lib, + stdenv, fetchFromGitHub, buildGoModule, - buildNpmPackage, substituteAll, pandoc, + nodejs, + pnpm_9, electron, + makeWrapper, }: -buildNpmPackage rec { +let + pnpm = pnpm_9; +in +stdenv.mkDerivation (finalAttrs: { pname = "siyuan"; version = "3.0.11"; src = fetchFromGitHub { owner = "siyuan-note"; repo = "siyuan"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-s82g5os944us85V2TBnm+HNd37vVzNjaOJYrbBrgLSI="; }; kernel = buildGoModule { - name = "${pname}-${version}-kernel"; - inherit src; - sourceRoot = "${src.name}/kernel"; + name = "${finalAttrs.pname}-${finalAttrs.version}-kernel"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/kernel"; vendorHash = "sha256-onZBrw0fDsjqXgQF06C40ArxNmsbFDIwD57fJ0jB0ls="; patches = [ @@ -40,24 +46,42 @@ buildNpmPackage rec { substituteInPlace vendor/github.com/88250/gulu/file.go \ --replace-fail "os.Chmod(dest, sourceinfo.Mode())" "os.Chmod(dest, 0644)" ''; + + # Set flags and tags as per upstream's Dockerfile + ldflags = [ + "-s" + "-w" + "-X" + "github.com/siyuan-note/siyuan/kernel/util.Mode=prod" + ]; + tags = [ "fts5" ]; }; - sourceRoot = "${src.name}/app"; + nativeBuildInputs = [ + nodejs + pnpm.configHook + makeWrapper + ]; - postPatch = '' - ln -s ${./package-lock.json} package-lock.json - # for some reason the default page is broken, use the redirection link automatically - substituteInPlace electron/main.js \ - --replace-fail ' "/stage/build/app/index.html?v=" + new Date().getTime()' '"/stage/build/desktop"' - ''; + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) + pname + version + src + sourceRoot + ; + hash = "sha256-9+4pAEka6+tymkh6calacjPbcJ++HuNTA6qBEAQ7zPg="; + }; - npmDepsHash = "sha256-Yv/iOCyry3CNeKPxS206Y5y5mvzPU873PJdi0UQkVLs="; + sourceRoot = "${finalAttrs.src.name}/app"; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - npmBuildScript = "build:desktop"; + buildPhase = '' + runHook preBuild + + pnpm build - postBuild = '' substituteInPlace electron-builder-linux.yml \ --replace-fail '- target: "AppImage"' "" \ --replace-fail '- target: "tar.gz"' '- target: "dir"' @@ -67,7 +91,9 @@ buildNpmPackage rec { -e 1i'electronVersion: ${electron.version}' \ -i electron-builder-linux.yml - npm run dist-linux + pnpm run dist-linux + + runHook postBuild ''; installPhase = '' @@ -77,7 +103,7 @@ buildNpmPackage rec { cp -r build/*-unpacked/{locales,resources{,.pak}} $out/share/siyuan mkdir $out/share/siyuan/resources/kernel - ln -s ${kernel}/bin/kernel $out/share/siyuan/resources/kernel/SiYuan-Kernel + ln -s ${finalAttrs.kernel}/bin/kernel $out/share/siyuan/resources/kernel/SiYuan-Kernel makeWrapper ${lib.getExe electron} $out/bin/siyuan \ --chdir $out/share/siyuan/resources \ @@ -97,4 +123,4 @@ buildNpmPackage rec { maintainers = with lib.maintainers; [ tomasajt ]; platforms = lib.platforms.linux; }; -} +}) From c5da1f1164962d2d91d33f70de71990220db16d3 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sun, 7 Jul 2024 23:21:14 +0300 Subject: [PATCH 016/227] koboldcpp: use python3 instead of python311 Reason: https://github.com/NixOS/nixpkgs/pull/314450#discussion_r1617133115 --- pkgs/by-name/ko/koboldcpp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index b8ae2e0b6ea1..36ecdab4eac1 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -4,7 +4,7 @@ stdenv, makeWrapper, gitUpdater, - python311Packages, + python3Packages, tk, darwin, @@ -56,10 +56,10 @@ effectiveStdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper - python311Packages.wrapPython + python3Packages.wrapPython ]; - pythonInputs = builtins.attrValues { inherit (python311Packages) tkinter customtkinter packaging; }; + pythonInputs = builtins.attrValues { inherit (python3Packages) tkinter customtkinter packaging; }; buildInputs = [ tk ] From d2111b0cbb97e07d7f3f30b663d02448657dbe14 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 3 Jun 2024 23:10:37 -0700 Subject: [PATCH 017/227] dfhack: 50.13-r1.1 -> 50.13-r2.1 --- pkgs/games/dwarf-fortress/dfhack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 96a5dac52540..31cc277e770c 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -90,9 +90,9 @@ let xmlRev = "980b1af13acc31660dce632f913c968f52e2b275"; }; "50.13" = { - dfHackRelease = "50.13-r1.1"; - hash = "sha256-FiXanXflszTr4ogz+EoDAUxzE2U9ODeZIJJ1u6Xm4Mo="; - xmlRev = "3507715fd07340de5a6c47064220f6e17343e5d5"; + dfHackRelease = "50.13-r2.1"; + hash = "sha256-IcjDDZX9YSLzympNc++1Xl85cK/0ASVDvzeNaebYNTQ="; + xmlRev = "c5debb15f696c3d1cb3706e2eb201eccef64f61a"; }; }; From 880bea37bdba456116086eacb045cf914bda9008 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Mon, 3 Jun 2024 23:24:09 -0700 Subject: [PATCH 018/227] dwarf-fortress: fix eval on darwin --- pkgs/games/dwarf-fortress/default.nix | 6 ++++-- pkgs/games/dwarf-fortress/game.nix | 4 ++-- pkgs/games/dwarf-fortress/wrapper/default.nix | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index acf50d650c49..e5bbf60e1550 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -49,7 +49,9 @@ let # The latest Dwarf Fortress version. Maintainers: when a new version comes # out, ensure that (unfuck|dfhack|twbt) are all up to date before changing # this. Note that unfuck and twbt are not required for 50. - latestVersion = "50.13"; + latestVersion = if stdenv.isLinux then "50.13" + else if stdenv.isDarwin then "0.47.05" + else throw "Unsupported system"; # Converts a version to a package name. versionToName = version: "dwarf-fortress_${replaceStrings ["."] ["_"] version}"; @@ -62,7 +64,7 @@ let let isAtLeast50 = versionAtLeast dfVersion "50.0"; - dwarf-fortress-unfuck = optionalAttrs (!isAtLeast50) (callPackage ./unfuck.nix { inherit dfVersion; }); + dwarf-fortress-unfuck = optionalAttrs (!isAtLeast50 && stdenv.isLinux) (callPackage ./unfuck.nix { inherit dfVersion; }); dwarf-fortress = callPackage ./game.nix { inherit dfVersion; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 6e8467e55df9..121091c5f216 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -53,7 +53,7 @@ let patchVersion = elemAt dfVersionTuple (dfVersionBaseIndex + 1); isAtLeast50 = baseVersion >= 50; - enableUnfuck = !isAtLeast50 && dwarf-fortress-unfuck != null; + enableUnfuck = !isAtLeast50 && dwarf-fortress-unfuck != null && (dwarf-fortress-unfuck.dfVersion or null) == dfVersion; game = if hasAttr dfVersion df-hashes @@ -95,7 +95,7 @@ stdenv.mkDerivation { fi ''; - nativeBuildInputs = [ autoPatchelfHook ]; + nativeBuildInputs = optional stdenv.isLinux autoPatchelfHook; buildInputs = optionals isAtLeast50 [ SDL2 SDL2_image SDL2_mixer ] ++ optional (!isAtLeast50) SDL ++ optional enableUnfuck dwarf-fortress-unfuck diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix index 2dd771ee922d..daa27ce5dc00 100644 --- a/pkgs/games/dwarf-fortress/wrapper/default.nix +++ b/pkgs/games/dwarf-fortress/wrapper/default.nix @@ -197,8 +197,8 @@ stdenv.mkDerivation rec { chmod 755 $out/bin/soundsense ''; - doInstallCheck = true; - nativeInstallCheckInputs = [ expect xvfb-run ]; + doInstallCheck = stdenv.isLinux; + nativeInstallCheckInputs = lib.optionals stdenv.isLinux [ expect xvfb-run ]; installCheckPhase = let commonExpectStatements = fmod: lib.optionalString isAtLeast50 '' From 3b7edb3eed3f4e38a3890bcae352bd02e988d03b Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Thu, 6 Jun 2024 13:07:21 -0700 Subject: [PATCH 019/227] dwarf-fortress: run postUnpack on darwin --- pkgs/games/dwarf-fortress/game.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 121091c5f216..80d3056aae95 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { sourceRoot = "."; - postUnpack = optionalString stdenv.isLinux '' + postUnpack = '' directory=${ if stdenv.isLinux then "df_linux" else if stdenv.isDarwin then "df_osx" @@ -108,6 +108,9 @@ stdenv.mkDerivation { mkdir -p $out cp -r * $out + # Clean up OS X detritus in the tarball. + find $out -type f -name '._*' -exec rm -rf {} \; + # Lots of files are +x in the newer releases... find $out -type d -exec chmod 0755 {} \; find $out -type f -exec chmod 0644 {} \; @@ -116,7 +119,7 @@ stdenv.mkDerivation { [ -f $out/run_df ] && chmod +x $out/run_df # We don't need any of these since they will just break autoPatchelf on $out/hash.md5.orig From b0cf365258c849cb8823db8bacff6d87ece898ab Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Fri, 7 Jun 2024 15:09:42 -0700 Subject: [PATCH 020/227] dwarf-fortress: wrapper: fix Darwin compatibility --- .../wrapper/dwarf-fortress-init.in | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in index 61b1b4da6168..1c739a1afbbf 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in +++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in @@ -4,18 +4,6 @@ shopt -s extglob export NIXPKGS_DF_ENV="@env@" -if [[ -v DF_DIR ]] && [ -n "$DF_DIR" ] && { [[ ! -v NIXPKGS_DF_HOME ]] || [ -z "$NIXPKGS_DF_HOME" ]; }; then - # Compatibility for users that were using DF_DIR, since the dfhack script clobbers this variable. - export NIXPKGS_DF_HOME="$DF_DIR" -fi - -if [[ ! -v NIXPKGS_DF_HOME ]] || [ -z "$NIXPKGS_DF_HOME" ]; then - export NIXPKGS_DF_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux" -fi - -# Compatibility. -export DF_DIR="$NIXPKGS_DF_HOME" - ### BEGIN: Default DF options declare -A _NIXPKGS_DF_OPTS _NIXPKGS_DF_OPTS[fmod]=0 # Don't use fmod by default. @@ -131,6 +119,30 @@ go() { exit 1 } +os_name="$(@uname@)" +os_rev="$(@uname@ -r)" + +if [ "$os_name" == Linux ]; then + df_dir="df_linux" +elif [ "$os_name" == Darwin ]; then + df_dir="df_osx" +else + log "Unknown platform: $os_name" + exit 1 +fi + +if [[ -v DF_DIR ]] && [ -n "$DF_DIR" ] && { [[ ! -v NIXPKGS_DF_HOME ]] || [ -z "$NIXPKGS_DF_HOME" ]; }; then + # Compatibility for users that were using DF_DIR, since the dfhack script clobbers this variable. + export NIXPKGS_DF_HOME="$DF_DIR" +fi + +if [[ ! -v NIXPKGS_DF_HOME ]] || [ -z "$NIXPKGS_DF_HOME" ]; then + export NIXPKGS_DF_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/$df_dir" +fi + +# Compatibility. +export DF_DIR="$NIXPKGS_DF_HOME" + @mkdir@ -p "$NIXPKGS_DF_HOME" @cat@ <&2 @@ -156,7 +168,7 @@ EOF cd "$NIXPKGS_DF_ENV" # All potential important files in DF 50 and below. -for path in dwarfort *.so libs raw data/init/* data/!(init|index|announcement); do +for path in dwarfort dwarfort.exe df *.so libs raw data/init/* data/!(init|index|announcement); do force_delete=0 if [[ "$path" == libfmod*.so* ]] && [ "${_NIXPKGS_DF_OPTS[fmod]}" -eq 0 ]; then force_delete=1 @@ -175,7 +187,12 @@ for path in index announcement help dipscript; do done # Handle library paths on Darwin. -if [ "$(@uname@)" == Darwin ]; then - export DYLD_LIBRARY_PATH="$NIXPKGS_DF_ENV/libs" - export DYLD_FRAMEWORK_PATH="$NIXPKGS_DF_ENV/libs" +if [ "$os_name" == Darwin ]; then + if [ "${os_rev%%.*}" -ge 11 ]; then + export DYLD_LIBRARY_PATH="$NIXPKGS_DF_ENV/libs" + export DYLD_FRAMEWORK_PATH="$NIXPKGS_DF_ENV/libs" + else + export DYLD_FALLBACK_LIBRARY_PATH="$NIXPKGS_DF_ENV/libs" + export DYLD_FALLBACK_FRAMEWORK_PATH="$NIXPKGS_DF_ENV/libs" + fi fi From bcde7a9d681a44873272fa3edb1ccd598621ef88 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 15 Jun 2024 18:54:53 -0700 Subject: [PATCH 021/227] dwarf-fortress: darwin libs --- pkgs/games/dwarf-fortress/game.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 80d3056aae95..42b68356020f 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -2,6 +2,8 @@ , lib , fetchurl , SDL +, SDL_image +, SDL_ttf , SDL2 , SDL2_image , SDL2_mixer @@ -119,7 +121,7 @@ stdenv.mkDerivation { [ -f $out/run_df ] && chmod +x $out/run_df # We don't need any of these since they will just break autoPatchelf on $out/hash.md5.orig @@ -132,6 +134,7 @@ stdenv.mkDerivation { ln -s ${getLib ncurses}/lib/libncurses.dylib $out/libs ln -s ${getLib gcc.cc}/lib/libstdc++.6.dylib $out/libs + ln -s ${getLib gcc.cc}/lib/libgcc_s.1.dylib $out/libs ln -s ${getLib fmodex}/lib/libfmodex.dylib $out/libs install_name_tool \ From 37cd3a3f20ffba3666b3dba31a8efb01b1e24c54 Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sat, 15 Jun 2024 22:43:25 -0700 Subject: [PATCH 022/227] dwarf-fortress: remove unused dependencies --- pkgs/games/dwarf-fortress/game.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 42b68356020f..95a4ff06e570 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -2,8 +2,6 @@ , lib , fetchurl , SDL -, SDL_image -, SDL_ttf , SDL2 , SDL2_image , SDL2_mixer From 12789d65591dbb7d73fe6f07b55fbb64cb392baa Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 7 Jul 2024 15:44:21 -0700 Subject: [PATCH 023/227] dfhack: 50.13-r2.1 -> 50.13-r3 --- pkgs/games/dwarf-fortress/dfhack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 31cc277e770c..cb0e1e529637 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -90,9 +90,9 @@ let xmlRev = "980b1af13acc31660dce632f913c968f52e2b275"; }; "50.13" = { - dfHackRelease = "50.13-r2.1"; - hash = "sha256-IcjDDZX9YSLzympNc++1Xl85cK/0ASVDvzeNaebYNTQ="; - xmlRev = "c5debb15f696c3d1cb3706e2eb201eccef64f61a"; + dfHackRelease = "50.13-r3"; + hash = "sha256-WbkJ8HmLT5GdZgDmcuFh+1uzhloKM9um0b9YO//uR7Y="; + xmlRev = "f0530a22149606596e97e3e17d941df3aafe29b9"; }; }; From 9891f68ac358fbf11facaca26b16af8d653488df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jul 2024 12:21:58 +0000 Subject: [PATCH 024/227] asn: 0.76.1 -> 0.77.0 --- pkgs/by-name/as/asn/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index 6a8ec939cb33..ea730ba62230 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "asn"; - version = "0.76.1"; + version = "0.77.0"; src = fetchFromGitHub { owner = "nitefood"; repo = "asn"; rev = "refs/tags/v${version}"; - hash = "sha256-9UDd0tgRKEFC1V1+1s9Ghev0I48L8UR9/YbZKX3F1MU="; + hash = "sha256-A2Z6xNoC6X6ZDL8jecRE3MkW7EmNQ6EHyCBIlNlBoxA="; }; nativeBuildInputs = [ From ab46acdbdadd1ea182af4bbc87882638e5dfdcf2 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:52:28 +0300 Subject: [PATCH 025/227] koboldcpp: fix CUDA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix CUDA lib linkage - Add new optional option `arches` Refs: https://github.com/NixOS/nixpkgs/pull/314450#issuecomment-2170543384 Refs: https://github.com/NixOS/nixpkgs/pull/314450#issuecomment-2208635912 Refs: https://github.com/NixOS/nixpkgs/pull/325540#discussion_r1669900645 Co-authored-by: 百地 希留耶 <65301509+KiruyaMomochi@users.noreply.github.com> Co-authored-by: mirrexagon Co-authored-by: SomeoneSerge --- pkgs/by-name/ko/koboldcpp/package.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 36ecdab4eac1..ba95550b08bf 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -6,6 +6,7 @@ gitUpdater, python3Packages, tk, + addDriverRunpath, darwin, @@ -28,6 +29,10 @@ metalSupport ? stdenv.isDarwin && stdenv.isAarch64, + # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ + # For example if you're on an GTX 1080 that means you're using "Pascal" and you need to pass "sm_60" + arches ? cudaPackages.cudaFlags.arches or [ ], + # You can find list of x86_64 options here: https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html # For ARM here: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html # If you set "march" to "native", specify "mtune" as well; otherwise, it will be set to "generic". (credit to: https://lemire.me/blog/2018/07/25/it-is-more-complicated-than-i-thought-mtune-march-in-gcc/) @@ -39,6 +44,10 @@ let makeBool = option: bool: (if bool then "${option}=1" else ""); + makeWrapperArgs = lib.optionalString config.cudaSupport '' + --prefix LD_LIBRARY_PATH: "${lib.makeLibraryPath [ addDriverRunpath.driverLink ]}" + ''; + effectiveStdenv = if cublasSupport then cudaPackages.backendStdenv else stdenv; in effectiveStdenv.mkDerivation (finalAttrs: { @@ -114,6 +123,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (makeBool "LLAMA_CLBLAST" clblastSupport) (makeBool "LLAMA_VULKAN" vulkanSupport) (makeBool "LLAMA_METAL" metalSupport) + (lib.optionalString cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head arches}") ]; installPhase = '' @@ -136,7 +146,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { postFixup = '' wrapPythonProgramsIn "$out/bin" "$pythonPath" makeWrapper "$out/bin/koboldcpp.unwrapped" "$out/bin/koboldcpp" \ - --prefix PATH ${lib.makeBinPath [ tk ]} + --prefix PATH ${lib.makeBinPath [ tk ]} ${makeWrapperArgs} ''; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; From 734c0294c3ac1beea9326bf14cdf9e5eecbe40de Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Mon, 8 Jul 2024 16:03:14 +0300 Subject: [PATCH 026/227] koboldcpp: 1.68 -> 1.69.1 Diff: https://github.com/LostRuins/koboldcpp/compare/v1.68...v1.69.1 Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.69.1 --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index ba95550b08bf..1975feafe919 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -52,13 +52,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "koboldcpp"; - version = "1.68"; + version = "1.69.1"; src = fetchFromGitHub { owner = "LostRuins"; repo = "koboldcpp"; rev = "refs/tags/v${finalAttrs.version}"; - sha256 = "sha256-zqRlQ8HgT4fmGHD6uxxa2duZrx9Vhxd+gm1XQ7w9ay0="; + sha256 = "sha256-808HyqrB9/cFJU7nq7Cm5Fm4OFPML4oQtnv0hystwAg="; }; enableParallelBuilding = true; From 0e806f5f143675671e4045e12393c9c934929166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 8 Jul 2024 10:13:06 -0700 Subject: [PATCH 027/227] udiskie: use python3Packages python3.pkgs is not spliced --- pkgs/applications/misc/udiskie/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 0041d5153d54..58fa8054c67d 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -7,14 +7,14 @@ , libappindicator-gtk3 , libnotify , librsvg -, python3 +, python3Packages , udisks2 , wrapGAppsHook3 , testers , udiskie }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "udiskie"; version = "2.5.3"; @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook3 ]; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ setuptools ]; @@ -56,7 +56,7 @@ python3.pkgs.buildPythonApplication rec { udisks2 ]; - dependencies = with python3.pkgs; [ + dependencies = with python3Packages; [ docopt keyutils pygobject3 @@ -79,7 +79,7 @@ python3.pkgs.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; From b8d4ed97da962a128cdf2415ad297f9b2e5a6bde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jul 2024 21:20:24 +0000 Subject: [PATCH 028/227] python312Packages.google-re2: 1.1.20240601 -> 1.1.20240702 --- pkgs/development/python-modules/google-re2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-re2/default.nix b/pkgs/development/python-modules/google-re2/default.nix index bcfbd6744dd6..dea16732f29a 100644 --- a/pkgs/development/python-modules/google-re2/default.nix +++ b/pkgs/development/python-modules/google-re2/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "google-re2"; - version = "1.1.20240601"; + version = "1.1.20240702"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_re2"; inherit version; - hash = "sha256-MYf2iFUwd1TUnzmOWDhT1bCNeD0/5mL2kWuZkHX34JU="; + hash = "sha256-h4jbafbJPLIp32LHSy2aqOZL91TpSVcA+FgSr6Mu/Ss="; }; build-system = [ setuptools ]; From 9ee8ed57ae235c7eaeeb99c4f22d4f5acf2e67b8 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 4 Jul 2024 20:56:12 +0800 Subject: [PATCH 029/227] jami: format --- .../instant-messengers/jami/default.nix | 150 +++++++++--------- 1 file changed, 72 insertions(+), 78 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index c16f8d4c2aa5..efbfad191c95 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -1,65 +1,66 @@ -{ stdenv -, lib -, pkg-config -, fetchFromGitLab -, gitUpdater -, ffmpeg_6 +{ + stdenv, + lib, + pkg-config, + fetchFromGitLab, + gitUpdater, + ffmpeg_6, # for daemon -, autoreconfHook -, perl # for pod2man -, alsa-lib -, asio -, dbus -, sdbus-cpp -, fmt -, gmp -, gnutls -, http-parser -, jack -, jsoncpp -, libarchive -, libgit2 -, libnatpmp -, libpulseaudio -, libupnp -, yaml-cpp -, msgpack-cxx -, openssl -, restinio -, secp256k1 -, speex -, udev -, webrtc-audio-processing -, zlib + autoreconfHook, + perl, # for pod2man + alsa-lib, + asio, + dbus, + sdbus-cpp, + fmt, + gmp, + gnutls, + http-parser, + jack, + jsoncpp, + libarchive, + libgit2, + libnatpmp, + libpulseaudio, + libupnp, + yaml-cpp, + msgpack-cxx, + openssl, + restinio, + secp256k1, + speex, + udev, + webrtc-audio-processing, + zlib, # for client -, cmake -, git -, networkmanager # for libnm -, python3 -, qttools # for translations -, wrapQtAppsHook -, libnotify -, qt5compat -, qtbase -, qtdeclarative -, qrencode -, qtmultimedia -, qtnetworkauth -, qtpositioning -, qtsvg -, qtwebengine -, qtwebchannel -, wrapGAppsHook3 -, withWebengine ? true + cmake, + git, + networkmanager, # for libnm + python3, + qttools, # for translations + wrapQtAppsHook, + libnotify, + qt5compat, + qtbase, + qtdeclarative, + qrencode, + qtmultimedia, + qtnetworkauth, + qtpositioning, + qtsvg, + qtwebengine, + qtwebchannel, + wrapGAppsHook3, + withWebengine ? true, # for pjsip -, fetchFromGitHub -, pjsip + fetchFromGitHub, + pjsip, # for opendht -, opendht + opendht, }: stdenv.mkDerivation rec { @@ -106,25 +107,24 @@ stdenv.mkDerivation rec { "--disable-resample" "--disable-libwebrtc" "--with-gnutls=yes" - ] - ++ lib.optionals stdenv.isLinux [ - "--enable-epoll" - ]; + ] ++ lib.optionals stdenv.isLinux [ "--enable-epoll" ]; buildInputs = old.buildInputs ++ [ gnutls ]; }); - opendht-jami = (opendht.overrideAttrs { - src = fetchFromGitHub { - owner = "savoirfairelinux"; - repo = "opendht"; - rev = "f2cee8e9ce24746caa7dee1847829c526d340284"; - hash = "sha256-ZnIrlybF3MCiXxxv80tRzCJ5CJ54S42prGUjq1suJNA="; - }; - }).override { - enableProxyServerAndClient = true; - enablePushNotifications = true; - }; + opendht-jami = + (opendht.overrideAttrs { + src = fetchFromGitHub { + owner = "savoirfairelinux"; + repo = "opendht"; + rev = "f2cee8e9ce24746caa7dee1847829c526d340284"; + hash = "sha256-ZnIrlybF3MCiXxxv80tRzCJ5CJ54S42prGUjq1suJNA="; + }; + }).override + { + enableProxyServerAndClient = true; + enablePushNotifications = true; + }; dhtnet = stdenv.mkDerivation { pname = "dhtnet"; @@ -265,13 +265,9 @@ stdenv.mkDerivation rec { qtpositioning qtsvg qtwebchannel - ] ++ lib.optionals withWebengine [ - qtwebengine - ]; + ] ++ lib.optionals withWebengine [ qtwebengine ]; - cmakeFlags = lib.optionals (!withWebengine) [ - "-DWITH_WEBENGINE=false" - ]; + cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ]; qtWrapperArgs = [ # With wayland the titlebar is not themed and the wmclass is wrong. @@ -282,9 +278,7 @@ stdenv.mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; - passthru.updateScript = gitUpdater { - rev-prefix = "stable/"; - }; + passthru.updateScript = gitUpdater { rev-prefix = "stable/"; }; meta = with lib; { homepage = "https://jami.net/"; From 2e249d6015970252a66c26dd0eaf57a4957a8e74 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 4 Jul 2024 22:37:36 +0800 Subject: [PATCH 030/227] opendht: build with restinio 0.7.2 --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d48e0156367b..c66be68a5ffb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11154,7 +11154,6 @@ with pkgs; opendht = callPackage ../development/libraries/opendht { inherit (darwin.apple_sdk.frameworks) Security; - restinio = restinio_0_6; }; opendkim = callPackage ../development/libraries/opendkim { }; From 7e7eefd27c35bf37da54450171a26bfa69131b1d Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 4 Jul 2024 22:38:19 +0800 Subject: [PATCH 031/227] jami: 20240529.0 -> 20240627.0 --- .../instant-messengers/jami/default.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix index efbfad191c95..d893bc8bca66 100644 --- a/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -16,7 +16,7 @@ fmt, gmp, gnutls, - http-parser, + llhttp, jack, jsoncpp, libarchive, @@ -65,25 +65,25 @@ stdenv.mkDerivation rec { pname = "jami"; - version = "20240529.0"; + version = "20240627.0"; src = fetchFromGitLab { domain = "git.jami.net"; owner = "savoirfairelinux"; repo = "jami-client-qt"; rev = "stable/${version}"; - hash = "sha256-v2GFvgHHJ2EMoayZ+//OZ0U+P1fh5Mgp5fAoqtZts7U="; + hash = "sha256-aePF1c99ju9y7JEgC+F2BPfpSAZlLd5OI5Jm6i9VlQQ="; fetchSubmodules = true; }; pjsip-jami = pjsip.overrideAttrs (old: rec { - version = "797f1a38cc1066acc4adc9561aa1288afabe72d5"; + version = "8fc165b833eea6e3c88d67a541385424b129fd3f"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "pjproject"; rev = version; - hash = "sha256-lTDbJF09R2G+EIkMj1YyKa4XokH9LlcIG+RhRJhzUes="; + hash = "sha256-uA6ZJYUgAu3cK4CKCGtqaI0KPM/0szExPS2pCOflz5A="; }; configureFlags = [ @@ -117,8 +117,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; - rev = "f2cee8e9ce24746caa7dee1847829c526d340284"; - hash = "sha256-ZnIrlybF3MCiXxxv80tRzCJ5CJ54S42prGUjq1suJNA="; + rev = "074e05cc3254d5d73b0d96ee772a6e01bb3113e5"; + hash = "sha256-WuaURlC7eDDxvnM3YuyU9CNrwnE4WBQUIEw3z/0zjN8="; }; }).override { @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { asio fmt gnutls - http-parser + llhttp jsoncpp libupnp msgpack-cxx @@ -194,7 +194,7 @@ stdenv.mkDerivation rec { ffmpeg_6 gmp gnutls - http-parser + llhttp jack jsoncpp libarchive diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c66be68a5ffb..76d54f5c9a44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40490,7 +40490,6 @@ with pkgs; # TODO: remove once `udev` is `systemdMinimal` everywhere. udev = systemdMinimal; jack = libjack2; - restinio = restinio_0_6; }; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; From 37a00568d920ad9a6c1e06e240dae5ff531012e6 Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 4 Jul 2024 22:38:43 +0800 Subject: [PATCH 032/227] restinio_0_6: remove --- pkgs/by-name/re/restinio_0_6/package.nix | 30 ------------------------ pkgs/top-level/aliases.nix | 1 + 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/by-name/re/restinio_0_6/package.nix diff --git a/pkgs/by-name/re/restinio_0_6/package.nix b/pkgs/by-name/re/restinio_0_6/package.nix deleted file mode 100644 index 91b83060ecbe..000000000000 --- a/pkgs/by-name/re/restinio_0_6/package.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenvNoCC, fetchurl }: - -stdenvNoCC.mkDerivation rec { - pname = "restinio"; - version = "0.6.19"; - - src = fetchurl { - url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-fyHuvrlm4XDWq1TpsZiskn1DkJASFzngN8D6O7NnskA="; - }; - - sourceRoot = "."; - - installPhase = '' - runHook preInstall - - mkdir -p $out/include - mv restinio-*/dev/restinio $out/include - - runHook postInstall - ''; - - meta = with lib; { - description = "Cross-platform, efficient, customizable, and robust asynchronous HTTP/WebSocket server C++14 library"; - homepage = "https://github.com/Stiffstream/restinio"; - changelog = "https://github.com/Stiffstream/restinio/releases/tag/v.${version}"; - license = licenses.bsd3; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5871a61f155e..f51bbb63ced8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1186,6 +1186,7 @@ mapAliases ({ redocly-cli = redocly; # Added 2024-04-14 redpanda = redpanda-client; # Added 2023-10-14 redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10 + restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04 restya-board = throw "'restya-board' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-01-22 retdec-full = throw "'retdec-full' is no longer needed, please use 'retdec'"; # Added 2024-02-05 retroshare06 = retroshare; From c458862baf3923250e29b7f8e9062f1514a795c7 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Tue, 9 Jul 2024 19:25:10 +0400 Subject: [PATCH 033/227] atlauncher: format with nixfmt --- pkgs/by-name/at/atlauncher/package.nix | 59 ++++++++++++++------------ 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index a4223aa3a096..7a5dffc16b5d 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -1,22 +1,23 @@ -{ copyDesktopItems -, fetchurl -, jre -, lib -, makeDesktopItem -, makeWrapper -, stdenvNoCC +{ + copyDesktopItems, + fetchurl, + jre, + lib, + makeDesktopItem, + makeWrapper, + stdenvNoCC, -, gamemodeSupport ? stdenvNoCC.isLinux -, textToSpeechSupport ? stdenvNoCC.isLinux -, additionalLibs ? [ ] + gamemodeSupport ? stdenvNoCC.isLinux, + textToSpeechSupport ? stdenvNoCC.isLinux, + additionalLibs ? [ ], -, # dependencies - flite -, gamemode -, libglvnd -, libpulseaudio -, udev -, xorg + # dependencies + flite, + gamemode, + libglvnd, + libpulseaudio, + udev, + xorg, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -35,19 +36,23 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontUnpack = true; - nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; installPhase = let - runtimeLibraries = [ - libglvnd - libpulseaudio - udev - xorg.libXxf86vm - ] - ++ lib.optional gamemodeSupport gamemode.lib - ++ lib.optional textToSpeechSupport flite - ++ additionalLibs; + runtimeLibraries = + [ + libglvnd + libpulseaudio + udev + xorg.libXxf86vm + ] + ++ lib.optional gamemodeSupport gamemode.lib + ++ lib.optional textToSpeechSupport flite + ++ additionalLibs; in '' runHook preInstall From 863c65e63df8b213a6d93199e5ff3a970fb38ba4 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Tue, 9 Jul 2024 19:25:48 +0400 Subject: [PATCH 034/227] atlauncher: add missing libraries --- pkgs/by-name/at/atlauncher/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 7a5dffc16b5d..876b68fa86a1 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -48,6 +48,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { libglvnd libpulseaudio udev + xorg.libX11 + xorg.libXcursor xorg.libXxf86vm ] ++ lib.optional gamemodeSupport gamemode.lib From c035424c74f744dfe36b652fcdb12ad4445ce9f0 Mon Sep 17 00:00:00 2001 From: wskeele Date: Mon, 8 Jul 2024 15:27:09 +0200 Subject: [PATCH 035/227] duplicity: Add paramiko optional dependency 'invoke' to pythonPath Fixes #325551 --- pkgs/tools/backup/duplicity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index fd5c7c60f0c9..169b143fbe81 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -84,7 +84,7 @@ let self = python3.pkgs.buildPythonApplication rec { pycrypto pydrive2 future - ]; + ] ++ paramiko.optional-dependencies.invoke; nativeCheckInputs = [ gnupg # Add 'gpg' to PATH. From a4a7433921ddb19932dc7564d3820223b268289c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jul 2024 02:43:19 +0000 Subject: [PATCH 036/227] python312Packages.pyvex: 9.2.109 -> 9.2.110 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 790c8fbabc2c..0e9eccd0cbb5 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.109"; + version = "9.2.110"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-GdKU+SbZbc81WSnqsxdiEuGUoBjmDPTrBfHs6zxehkg="; + hash = "sha256-odUalRvkRkS6rqh+x/qjCor629nIQNZnXiHJ4wYxDFU="; }; build-system = [ setuptools ]; From aa2df5836c4c6d7d2c295719e906a1104a9ba8a2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 4 Jul 2024 10:49:48 +0200 Subject: [PATCH 037/227] python311Packages.pytensor: 2.23.0 -> 2.25.1 Diff: https://github.com/pymc-devs/pytensor/compare/rel-2.23.0...rel-2.25.1 Changelog: https://github.com/pymc-devs/pytensor/releases/tag/rel-2.25.1 --- pkgs/development/python-modules/pytensor/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix index bad53e61dfa5..171f71dfbe8b 100644 --- a/pkgs/development/python-modules/pytensor/default.nix +++ b/pkgs/development/python-modules/pytensor/default.nix @@ -15,7 +15,6 @@ minikanren, numpy, scipy, - typing-extensions, # checks jax, @@ -29,7 +28,7 @@ buildPythonPackage rec { pname = "pytensor"; - version = "2.23.0"; + version = "2.25.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -38,7 +37,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pytensor"; rev = "refs/tags/rel-${version}"; - hash = "sha256-r7ooPwZSEsypYAf+oWu7leuoIK39gFfHZACrxsbcIV0="; + hash = "sha256-Z0PQtuADqXiVnDcLoy+R5Mrg6KMGWILbLdMM5fNBqaM="; }; postPatch = '' @@ -46,6 +45,10 @@ buildPythonPackage rec { --replace "versioneer[toml]==0.28" "versioneer[toml]" ''; + pythonRelaxDeps = [ + "scipy" + ]; + build-system = [ cython versioneer @@ -59,7 +62,6 @@ buildPythonPackage rec { minikanren numpy scipy - typing-extensions ]; nativeCheckInputs = [ From 1640973c97597a185960c02f44fa1f45b60e6c15 Mon Sep 17 00:00:00 2001 From: Bintang Adiputra Pratama Date: Wed, 10 Jul 2024 15:35:51 +0700 Subject: [PATCH 038/227] keymapper: 4.4.1 -> 4.4.2 --- pkgs/tools/inputmethods/keymapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/keymapper/default.nix b/pkgs/tools/inputmethods/keymapper/default.nix index a9124086bf9f..984cc9724c55 100644 --- a/pkgs/tools/inputmethods/keymapper/default.nix +++ b/pkgs/tools/inputmethods/keymapper/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "4.4.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; rev = finalAttrs.version; - hash = "sha256-pM273Ma8ELFVQV8zxCmtEvhBz5HLiIBtPtRv9Hh5dGY="; + hash = "sha256-JMDUsWjzqe7JaOqowMmgG3sVJt54YSM75uS9TeF7bsc="; }; # all the following must be in nativeBuildInputs From 8f44b9286ac0816070b05c549a736b33a05e2e3b Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 10 Jul 2024 13:45:44 +0200 Subject: [PATCH 039/227] python312Packages.skorch: fix build --- pkgs/development/python-modules/skorch/default.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index 19048dfc9ca8..413e0cfb563e 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -28,15 +28,6 @@ buildPythonPackage rec { hash = "sha256-JcplwaeYlGRAJXRNac1Ya/hgWoHE+NWjZhCU9eaSyRQ="; }; - # Remove at next skorch release: - patches = [ - (fetchpatch { - name = "unbreak-tests-with-sklearn-1.4"; - url = "https://github.com/skorch-dev/skorch/commit/1f7a779d0aa78589e17262c206f5775f2fcd75f8.diff"; - hash = "sha256-X3SgjgDeq3PlBI13cC56LIL1dV1e+Z3tsBj9sz5pizo="; - }) - ]; - disabled = pythonOlder "3.8"; propagatedBuildInputs = [ From 9581c3fad8dab5d1ae4a541a5823a5704042f180 Mon Sep 17 00:00:00 2001 From: Ryan Gibb Date: Wed, 10 Jul 2024 09:37:22 +0100 Subject: [PATCH 040/227] stig: 0.12.8a0 -> 0.12.10a0 --- pkgs/applications/networking/p2p/stig/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index b36ad59194d2..b5db5573ab87 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , python310Packages , testers @@ -10,13 +9,13 @@ python310Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig - version = "0.12.8a0"; + version = "0.12.10a0"; src = fetchFromGitHub { owner = "rndusr"; repo = "stig"; rev = "v${version}"; - sha256 = "sha256-vfmuA6DqWvAygcS6N+qX1h+Ag+P4eOwm41DhAFZR3r8="; + sha256 = "sha256-lSFI4/DxWl17KFgLXZ7c5nW/e5IUGN7s8Gm6wTM5ZWg="; }; propagatedBuildInputs = with python310Packages; [ @@ -58,12 +57,13 @@ python310Packages.buildPythonApplication rec { version = "stig version ${version}"; }; + # https://github.com/rndusr/stig/issues/214#issuecomment-1995651219 + dontUsePytestCheck = true; + meta = with lib; { description = "TUI and CLI for the BitTorrent client Transmission"; homepage = "https://github.com/rndusr/stig"; license = licenses.gpl3Plus; - # Too many broken tests, and it fails to launch - broken = true; maintainers = with maintainers; [ ]; }; } From 61c719e473a460597918be38a2fa7247495ae08f Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Mon, 17 Jun 2024 08:08:01 +0200 Subject: [PATCH 041/227] nixos-rebuild: add support for --file and --attr flags adds support of building system from nix file and attrPath directly these are --file and --attr flags in nix-build respectfully --- .../linux/nixos-rebuild/nixos-rebuild.8 | 42 +++++++++++-- .../linux/nixos-rebuild/nixos-rebuild.sh | 60 ++++++++++++++++--- 2 files changed, 90 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 index 8df05f9310f2..546818f5ce72 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 @@ -20,6 +20,8 @@ .Op Fl -rollback .Op Fl -builders Ar builder-spec .br +.Op Fl -file | f Ar path +.Op Fl -attr | A Ar attrPath .Op Fl -flake Ar flake-uri .Op Fl -no-flake .Op Fl -override-input Ar input-name flake-uri @@ -45,11 +47,15 @@ .Sh DESCRIPTION This command updates the system so that it corresponds to the configuration specified in -.Pa /etc/nixos/configuration.nix -or -.Pa /etc/nixos/flake.nix Ns -\&. Thus, every time you modify the configuration or any other NixOS module, you -must run +.Pa /etc/nixos/configuration.nix Ns +, +.Pa /etc/nixos/flake.nix +or the file and attribute specified by the +.Fl -file +and/or +.Fl -attr +options. Thus, every time you modify the configuration or any other NixOS +module, you must run .Nm to make the changes take effect. It builds the new system in .Pa /nix/store Ns @@ -369,6 +375,32 @@ system with .Ic sudo Ns \&. Setting this option allows deploying as a non-root user. . +.It Fl -file Ar path , Fl f Ar path +Enable and build the NixOS system from the specified file. The file must +evaluate to an attribute set, and it must contain a valid NixOS configuration +at attribute +.Va attrPath Ns +\&. This is useful for building a NixOS system from a nix file that is not +a flake or a NixOS configuration module. Attribute set a with valid NixOS +configuration can be made using +.Va nixos +function in nixpkgs or importing and calling +.Pa nixos/lib/eval-config.nix +from nixpkgs. If specified without +.Fl -attr +option, builds the configuration from the top-level +attribute of the file. +. +.It Fl -attr Ar attrPath , Fl A Ar attrPath +Enable and build the NixOS system from nix file and use the specified attribute +path from file specified by the +.Fl -file +option. If specified without +.Fl -file +option, uses +.Pa default.nix +in current directory. +. .It Fl -flake Va flake-uri Ns Op Va #name Build the NixOS system from the specified flake. It defaults to the directory containing the target of the symlink diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 364c3dc4c003..03b2dbfbeb66 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -34,6 +34,9 @@ targetHost= remoteSudo= verboseScript= noFlake= +attr= +buildFile=default.nix +buildingAttribute=1 installBootloader= json= @@ -58,6 +61,24 @@ while [ "$#" -gt 0 ]; do if [ -n "$action" ]; then showSyntax; fi action="$i" ;; + --file|-f) + if [ -z "$1" ]; then + log "$0: '$i' requires an argument" + exit 1 + fi + buildFile="$1" + buildingAttribute= + shift 1 + ;; + --attr|-A) + if [ -z "$1" ]; then + log "$0: '$i' requires an argument" + exit 1 + fi + attr="$1" + buildingAttribute= + shift 1 + ;; --install-grub) log "$0: --install-grub deprecated, use --install-bootloader instead" installBootloader=1 @@ -345,6 +366,12 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test ]]; then canRun=1 fi +# Verify that user is not trying to use attribute building and flake +# at the same time +if [[ -z $buildingAttribute && -n $flake ]]; then + log "error: '--flake' cannot be used with '--file' or '--attr'" + exit 1 +fi # If ‘--upgrade’ or `--upgrade-all` is given, # run ‘nix-channel --update nixos’. @@ -426,7 +453,10 @@ trap cleanup EXIT # Re-execute nixos-rebuild from the Nixpkgs tree. if [[ -z $_NIXOS_REBUILD_REEXEC && -n $canRun && -z $fast ]]; then - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + p=$(runCmd nix-build --no-out-link $buildFile -A "${attr:+$attr.}config.system.build.nixos-rebuild" "${extraBuildFlags[@]}") + SHOULD_REEXEC=1 + elif [[ -z $flake ]]; then if p=$(runCmd nix-build --no-out-link --expr 'with import {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then SHOULD_REEXEC=1 fi @@ -448,7 +478,10 @@ fi # Find configuration.nix and open editor instead of building. if [ "$action" = edit ]; then - if [[ -z $flake ]]; then + if [[ -n $attr || -n $buildFile ]]; then + log "error: '--file' and '--attr' are not supported with 'edit'" + exit 1 + elif [[ -z $flake ]]; then NIXOS_CONFIG=${NIXOS_CONFIG:-$(runCmd nix-instantiate --find-file nixos-config)} if [[ -d $NIXOS_CONFIG ]]; then NIXOS_CONFIG=$NIXOS_CONFIG/default.nix @@ -493,6 +526,9 @@ prebuiltNix() { getNixDrv() { nixDrv= + if [[ -z $buildingAttribute ]]; then + if nixDrv="$(runCmd nix-instantiate $buildFile --add-root "$tmpDir/nix.drv" --indirect -A ${attr:+$attr.}config.nix.package.out "${extraBuildFlags[@]}")"; then return; fi + fi if nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then return; fi if nixDrv="$(runCmd nix-instantiate '' --add-root "$tmpDir/nix.drv" --indirect -A nix "${extraBuildFlags[@]}")"; then return; fi @@ -553,7 +589,9 @@ if [ "$action" = repl ]; then # This is a very end user command, implemented using sub-optimal means. # You should feel free to improve its behavior, as well as resolve tech # debt in "breaking" ways. Humans adapt quite well. - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + exec nix repl --file $buildFile $attr "${extraBuildFlags[@]}" + elif [[ -z $flake ]]; then exec nix repl '' "${extraBuildFlags[@]}" else if [[ -n "${lockFlags[0]}" ]]; then @@ -706,7 +744,9 @@ fi if [ -z "$rollback" ]; then log "building the system configuration..." if [[ "$action" = switch || "$action" = boot ]]; then - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + pathToConfig="$(nixBuild $buildFile -A "${attr:+$attr.}config.system.build.toplevel" "${extraBuildFlags[@]}")" + elif [[ -z $flake ]]; then pathToConfig="$(nixBuild '' --no-out-link -A system "${extraBuildFlags[@]}")" else pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" @@ -714,19 +754,25 @@ if [ -z "$rollback" ]; then copyToTarget "$pathToConfig" targetHostSudoCmd nix-env -p "$profile" --set "$pathToConfig" elif [[ "$action" = test || "$action" = build || "$action" = dry-build || "$action" = dry-activate ]]; then - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + pathToConfig="$(nixBuild $buildFile -A "${attr:+$attr.}config.system.build.toplevel" "${extraBuildFlags[@]}")" + elif [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A system -k "${extraBuildFlags[@]}")" else pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.toplevel" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi elif [ "$action" = build-vm ]; then - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + pathToConfig="$(nixBuild $buildFile -A "${attr:+$attr.}config.system.build.vm" "${extraBuildFlags[@]}")" + elif [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vm -k "${extraBuildFlags[@]}")" else pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vm" "${extraBuildFlags[@]}" "${lockFlags[@]}")" fi elif [ "$action" = build-vm-with-bootloader ]; then - if [[ -z $flake ]]; then + if [[ -z $buildingAttribute ]]; then + pathToConfig="$(nixBuild $buildFile -A "${attr:+$attr.}config.system.build.vmWithBootLoader" "${extraBuildFlags[@]}")" + elif [[ -z $flake ]]; then pathToConfig="$(nixBuild '' -A vmWithBootLoader -k "${extraBuildFlags[@]}")" else pathToConfig="$(nixFlakeBuild "$flake#$flakeAttr.config.system.build.vmWithBootLoader" "${extraBuildFlags[@]}" "${lockFlags[@]}")" From c7b66353bfa82536bc780ada22fef5f069319eef Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Wed, 10 Jul 2024 15:06:52 +0200 Subject: [PATCH 042/227] nixos/tests/installer: rename "flake" argument in makeConfig and reverse meaning to "withTestInstrumentation", which reflects what this argument does --- nixos/tests/installer.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 3f57a64333dd..1269463d8ef5 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -11,7 +11,7 @@ let # The configuration to install. makeConfig = { bootLoader, grubDevice, grubIdentifier, grubUseEfi - , extraConfig, forceGrubReinstallCount ? 0, flake ? false + , extraConfig, forceGrubReinstallCount ? 0, withTestInstrumentation ? true , clevisTest }: pkgs.writeText "configuration.nix" '' @@ -19,7 +19,7 @@ let { imports = [ ./hardware-configuration.nix - ${if flake + ${if !withTestInstrumentation then "" # Still included, but via installer/flake.nix else ""} ]; @@ -330,7 +330,7 @@ let "${makeConfig { inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig clevisTest; forceGrubReinstallCount = 1; - flake = true; + withTestInstrumentation = false; }}", "/root/my-config/configuration.nix", ) From d77469c442478e13859ec9cf7ae009924701dc0e Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Wed, 10 Jul 2024 17:49:55 +0200 Subject: [PATCH 043/227] nixos/tests/installer: add testByAttrSwitch --- nixos/tests/installer.nix | 131 +++++++++++++++++++- nixos/tests/installer/byAttrNoChannel.nix | 18 +++ nixos/tests/installer/byAttrWithChannel.nix | 10 ++ 3 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/installer/byAttrNoChannel.nix create mode 100644 nixos/tests/installer/byAttrWithChannel.nix diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 1269463d8ef5..ac333d2e9ea1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -81,7 +81,7 @@ let # partitions and filesystems. testScriptFun = { bootLoader, createPartitions, grubDevice, grubUseEfi, grubIdentifier , postInstallCommands, postBootCommands, extraConfig - , testSpecialisationConfig, testFlakeSwitch, clevisTest, clevisFallbackTest + , testSpecialisationConfig, testFlakeSwitch, testByAttrSwitch, clevisTest, clevisFallbackTest , disableFileSystems }: let @@ -316,6 +316,119 @@ let target.shutdown() '' + + optionalString testByAttrSwitch '' + with subtest("Configure system with attribute set"): + target.succeed(""" + mkdir /root/my-config + mv /etc/nixos/hardware-configuration.nix /root/my-config/ + rm /etc/nixos/configuration.nix + """) + target.copy_from_host_via_shell( + "${makeConfig { + inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig clevisTest; + forceGrubReinstallCount = 1; + withTestInstrumentation = false; + }}", + "/root/my-config/configuration.nix", + ) + target.copy_from_host_via_shell( + "${./installer/byAttrWithChannel.nix}", + "/root/my-config/default.nix", + ) + with subtest("Switch to attribute set based config with channels"): + target.succeed("nixos-rebuild switch --file /root/my-config/default.nix") + + target.shutdown() + + ${startTarget} + + target.succeed(""" + rm /root/my-config/default.nix + """) + target.copy_from_host_via_shell( + "${./installer/byAttrNoChannel.nix}", + "/root/my-config/default.nix", + ) + + target.succeed(""" + pkgs=$(readlink -f /nix/var/nix/profiles/per-user/root/channels)/nixos + if ! [[ -e $pkgs/pkgs/top-level/default.nix ]]; then + echo 1>&2 "$pkgs does not seem to be a nixpkgs source. Please fix the test so that pkgs points to a nixpkgs source."; + exit 1; + fi + sed -e s^@nixpkgs@^$pkgs^ -i /root/my-config/default.nix + + """) + + with subtest("Switch to attribute set based config without channels"): + target.succeed("nixos-rebuild switch --file /root/my-config/default.nix") + + target.shutdown() + + ${startTarget} + + with subtest("nix-channel command is not available anymore"): + target.succeed("! which nix-channel") + + with subtest("builtins.nixPath is now empty"): + target.succeed(""" + [[ "[ ]" == "$(nix-instantiate builtins.nixPath --eval --expr)" ]] + """) + + with subtest(" does not resolve"): + target.succeed(""" + ! nix-instantiate '' --eval --expr + """) + + with subtest("Evaluate attribute set based config in fresh env without nix-channel"): + target.succeed("nixos-rebuild switch --file /root/my-config/default.nix") + + with subtest("Evaluate attribute set based config in fresh env without channel profiles"): + target.succeed(""" + ( + exec 1>&2 + mkdir -p /root/restore + mv -v /root/.nix-channels /root/restore/ + mv -v ~/.nix-defexpr /root/restore/ + mkdir -p /root/restore/channels + mv -v /nix/var/nix/profiles/per-user/root/channels* /root/restore/channels/ + ) + """) + target.succeed("nixos-rebuild switch --file /root/my-config/default.nix") + '' + + optionalString (testByAttrSwitch && testFlakeSwitch) '' + with subtest("Restore channel profiles"): + target.succeed(""" + ( + exec 1>&2 + mv -v /root/restore/.nix-channels /root/ + mv -v /root/restore/.nix-defexpr ~/.nix-defexpr + mv -v /root/restore/channels/* /nix/var/nix/profiles/per-user/root/ + rm -vrf /root/restore + ) + """) + + with subtest("Restore /etc/nixos"): + target.succeed(""" + mv -v /root/my-config/hardware-configuration.nix /etc/nixos/ + """) + target.copy_from_host_via_shell( + "${makeConfig { + inherit bootLoader grubDevice grubIdentifier grubUseEfi extraConfig clevisTest; + forceGrubReinstallCount = 1; + }}", + "/etc/nixos/configuration.nix", + ) + + with subtest("Restore /root/my-config"): + target.succeed(""" + rm -vrf /root/my-config + """) + + '' + + optionalString (testByAttrSwitch && !testFlakeSwitch) '' + target.shutdown() + '' + optionalString testFlakeSwitch '' ${startTarget} @@ -399,6 +512,7 @@ let , enableOCR ? false, meta ? {} , testSpecialisationConfig ? false , testFlakeSwitch ? false + , testByAttrSwitch ? false , clevisTest ? false , clevisFallbackTest ? false , disableFileSystems ? false @@ -533,7 +647,7 @@ let testScript = testScriptFun { inherit bootLoader createPartitions postInstallCommands postBootCommands grubDevice grubIdentifier grubUseEfi extraConfig - testSpecialisationConfig testFlakeSwitch clevisTest clevisFallbackTest + testSpecialisationConfig testFlakeSwitch testByAttrSwitch clevisTest clevisFallbackTest disableFileSystems; }; }; @@ -589,6 +703,15 @@ let testFlakeSwitch = true; }; + simple-test-config-by-attr = simple-test-config // { + testByAttrSwitch = true; + }; + + simple-test-config-from-by-attr-to-flake = simple-test-config // { + testByAttrSwitch = true; + testFlakeSwitch = true; + }; + simple-uefi-grub-config = { createPartitions = '' installer.succeed( @@ -772,6 +895,10 @@ in { switchToFlake = makeInstallerTest "switch-to-flake" simple-test-config-flake; + switchToByAttr = makeInstallerTest "switch-to-by-attr" simple-test-config-by-attr; + + switchFromByAttrToFlake = makeInstallerTest "switch-from-by-attr-to-flake" simple-test-config-from-by-attr-to-flake; + # Test cloned configurations with the simple grub configuration simpleSpecialised = makeInstallerTest "simpleSpecialised" (simple-test-config // specialisation-test-extraconfig); diff --git a/nixos/tests/installer/byAttrNoChannel.nix b/nixos/tests/installer/byAttrNoChannel.nix new file mode 100644 index 000000000000..03293cd4a0e3 --- /dev/null +++ b/nixos/tests/installer/byAttrNoChannel.nix @@ -0,0 +1,18 @@ +# This file gets copied into the installation + +let + nixpkgs = "@nixpkgs@"; +in + +{ evalConfig ? import "${nixpkgs}/nixos/lib/eval-config.nix" }: + +evalConfig { + modules = [ + ./configuration.nix + ( import "${nixpkgs}/nixos/modules/testing/test-instrumentation.nix" ) + { + # Disable nix channels + nix.channel.enable = false; + } + ]; +} diff --git a/nixos/tests/installer/byAttrWithChannel.nix b/nixos/tests/installer/byAttrWithChannel.nix new file mode 100644 index 000000000000..951231dcba3e --- /dev/null +++ b/nixos/tests/installer/byAttrWithChannel.nix @@ -0,0 +1,10 @@ +# This file gets copied into the installation + +{ evalConfig ? import }: + +evalConfig { + modules = [ + ./configuration.nix + ( import ) + ]; +} From c39f1864ba03dd7c4f986b66a0c60b0527a4899d Mon Sep 17 00:00:00 2001 From: Simon Menke Date: Fri, 5 Jul 2024 14:56:27 +0200 Subject: [PATCH 044/227] shopify-cli: v2.34.0 -> v3.63.2 --- .../web => by-name/sh}/shopify-cli/Gemfile | 2 +- .../sh}/shopify-cli/Gemfile.lock | 27 +- .../web => by-name/sh}/shopify-cli/gemset.nix | 42 +- pkgs/by-name/sh/shopify-cli/package-lock.json | 886 ++++++++++++++++++ pkgs/by-name/sh/shopify-cli/package.json | 11 + pkgs/by-name/sh/shopify-cli/package.nix | 57 ++ pkgs/by-name/sh/shopify-cli/update.sh | 42 + pkgs/development/web/shopify-cli/default.nix | 36 - pkgs/top-level/all-packages.nix | 2 - 9 files changed, 1032 insertions(+), 73 deletions(-) rename pkgs/{development/web => by-name/sh}/shopify-cli/Gemfile (51%) rename pkgs/{development/web => by-name/sh}/shopify-cli/Gemfile.lock (62%) rename pkgs/{development/web => by-name/sh}/shopify-cli/gemset.nix (73%) create mode 100644 pkgs/by-name/sh/shopify-cli/package-lock.json create mode 100644 pkgs/by-name/sh/shopify-cli/package.json create mode 100644 pkgs/by-name/sh/shopify-cli/package.nix create mode 100755 pkgs/by-name/sh/shopify-cli/update.sh delete mode 100644 pkgs/development/web/shopify-cli/default.nix diff --git a/pkgs/development/web/shopify-cli/Gemfile b/pkgs/by-name/sh/shopify-cli/Gemfile similarity index 51% rename from pkgs/development/web/shopify-cli/Gemfile rename to pkgs/by-name/sh/shopify-cli/Gemfile index ec10d4a03468..fb447611a746 100644 --- a/pkgs/development/web/shopify-cli/Gemfile +++ b/pkgs/by-name/sh/shopify-cli/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gem 'shopify-cli' +gem 'shopify-cli', '2.35.0' diff --git a/pkgs/development/web/shopify-cli/Gemfile.lock b/pkgs/by-name/sh/shopify-cli/Gemfile.lock similarity index 62% rename from pkgs/development/web/shopify-cli/Gemfile.lock rename to pkgs/by-name/sh/shopify-cli/Gemfile.lock index 79a4220d4ac2..65a8819fd4a3 100644 --- a/pkgs/development/web/shopify-cli/Gemfile.lock +++ b/pkgs/by-name/sh/shopify-cli/Gemfile.lock @@ -2,25 +2,26 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.2) - bugsnag (6.25.1) + bugsnag (6.27.1) concurrent-ruby (~> 1.0) - concurrent-ruby (1.1.10) - ffi (1.15.5) - liquid (5.4.0) + concurrent-ruby (1.3.3) + ffi (1.17.0) + liquid (5.5.0) listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mini_portile2 (2.8.1) - nokogiri (1.14.0) - mini_portile2 (~> 2.8.0) + mini_portile2 (2.8.7) + nokogiri (1.16.6) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - parser (3.2.0.0) + parser (3.3.3.0) ast (~> 2.4.1) - racc (1.6.2) + racc + racc (1.8.0) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - shopify-cli (2.34.0) + shopify-cli (2.35.0) bugsnag (~> 6.22) listen (~> 3.7.0) theme-check (~> 1.14.0) @@ -33,7 +34,7 @@ PLATFORMS ruby DEPENDENCIES - shopify-cli + shopify-cli (= 2.35.0) BUNDLED WITH - 2.4.3 + 2.3.27 diff --git a/pkgs/development/web/shopify-cli/gemset.nix b/pkgs/by-name/sh/shopify-cli/gemset.nix similarity index 73% rename from pkgs/development/web/shopify-cli/gemset.nix rename to pkgs/by-name/sh/shopify-cli/gemset.nix index 3bc3e2edef4b..00c8cc759db4 100644 --- a/pkgs/development/web/shopify-cli/gemset.nix +++ b/pkgs/by-name/sh/shopify-cli/gemset.nix @@ -15,40 +15,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "108q00vcx3vkr85mpayns3ini6ids807bmhl8nfham9900ric27y"; + sha256 = "09bz3sahhv5ngnfmms8z4lbbssk558wykzvvvacysvkc20zffacn"; type = "gem"; }; - version = "6.25.1"; + version = "6.27.1"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; + sha256 = "0skwdasxq7mnlcccn6aqabl7n9r3jd7k19ryzlzzip64cn4x572g"; type = "gem"; }; - version = "1.1.10"; + version = "1.3.3"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi"; type = "gem"; }; - version = "1.15.5"; + version = "1.17.0"; }; liquid = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h0d0ghdf01lkv4x0mzp6zdkrnj7gsfq3widkhyni26bf6648qp3"; + sha256 = "0f4fn62ba8ivabwcpa0fpg6yi1j3z7fdskb57v8zfaacg8gmky5k"; type = "gem"; }; - version = "5.4.0"; + version = "5.5.0"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.7"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -77,31 +77,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fqld4wnamj7awdr1lwdifpylqdrrg5adm8xj2jl9sc5ms3nxjjm"; + sha256 = "1vz1ychq2fhfqjgqdrx8bqkaxg5dzcgwnah00m57ydylczfy8pwk"; type = "gem"; }; - version = "1.14.0"; + version = "1.16.6"; }; parser = { - dependencies = ["ast"]; + dependencies = ["ast" "racc"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zk8mdyr0322r11d63rcp5jhz4lakxilhvyvdv0ql5dw4lb83623"; + sha256 = "1sryynf3iws1b2ffba1gvmlpf8jzhfva5p0qdf37x6wdj683rqm2"; type = "gem"; }; - version = "3.2.0.0"; + version = "3.3.3.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + sha256 = "021s7maw0c4d9a6s07vbmllrzqsj2sgmrwimlh8ffkvwqdjrld09"; type = "gem"; }; - version = "1.6.2"; + version = "1.8.0"; }; rb-fsevent = { groups = ["default"]; @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + sha256 = "0vmy8xgahixcz6hzwy4zdcyn2y6d6ri8dqv5xccgzc1r292019x0"; type = "gem"; }; - version = "0.10.1"; + version = "0.11.1"; }; shopify-cli = { dependencies = ["bugsnag" "listen" "theme-check"]; @@ -130,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zzg2vv58s7ylbk35vfb3gj9q6wr59m18gb8sw9f2rnsgsmkivbr"; + sha256 = "1krlrds1fawlavk05a5ydibndxmg33f17sm2qrccji0rm434qdxx"; type = "gem"; }; - version = "2.34.0"; + version = "2.35.0"; }; theme-check = { dependencies = ["liquid" "nokogiri" "parser"]; diff --git a/pkgs/by-name/sh/shopify-cli/package-lock.json b/pkgs/by-name/sh/shopify-cli/package-lock.json new file mode 100644 index 000000000000..340bd62ccc89 --- /dev/null +++ b/pkgs/by-name/sh/shopify-cli/package-lock.json @@ -0,0 +1,886 @@ +{ + "name": "shopify", + "version": "3.63.2", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "shopify", + "version": "3.63.2", + "dependencies": { + "@shopify/cli": "3.63.2" + }, + "bin": { + "shopify": "node_modules/@shopify/cli/bin/run.js" + } + }, + "node_modules/@ast-grep/napi": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@ast-grep/napi/-/napi-0.11.0.tgz", + "integrity": "sha512-b+R8h20+ClsYZBJqcyguLy4THfGmg2a54HgfZ0a1vdCkfe9ftjblALiZf2DsOc0+Si8BDWd09TMNn2psUuibJA==", + "engines": { + "node": ">= 10" + }, + "optionalDependencies": { + "@ast-grep/napi-darwin-arm64": "0.11.0", + "@ast-grep/napi-darwin-x64": "0.11.0", + "@ast-grep/napi-linux-x64-gnu": "0.11.0", + "@ast-grep/napi-win32-arm64-msvc": "0.11.0", + "@ast-grep/napi-win32-ia32-msvc": "0.11.0", + "@ast-grep/napi-win32-x64-msvc": "0.11.0" + } + }, + "node_modules/@ast-grep/napi-darwin-arm64": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@ast-grep/napi-darwin-arm64/-/napi-darwin-arm64-0.11.0.tgz", + "integrity": "sha512-IxY3b102tNNm+cYLngZvUKzM1fNKCpDDWz69Yt+QnKCZNx10Hvd7mqrYE2aXTtkaNalmg/p1n6kMA8KmshGgCA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@ast-grep/napi-darwin-x64": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@ast-grep/napi-darwin-x64/-/napi-darwin-x64-0.11.0.tgz", + "integrity": "sha512-6afu1fNUwTkyE7tknVx8+d+BPKVL3623QLI9uJbJ0SZQShzSb1+dRegT4NpzPaPtFdPkflh6KfvOQ4chTw8hUg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@ast-grep/napi-linux-x64-gnu": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@ast-grep/napi-linux-x64-gnu/-/napi-linux-x64-gnu-0.11.0.tgz", + "integrity": "sha512-Rm0biBfIxg14tL9yAMxW6RngAEA2vYLIq1guff6Uc9Vb7yQ3HE8dnW8WAysyieIqXdVkraTTV2ZwfoUqeKfc1Q==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@ast-grep/napi-win32-arm64-msvc": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-arm64-msvc/-/napi-win32-arm64-msvc-0.11.0.tgz", + "integrity": "sha512-TfX6KXxtXGQS/sWzJ1wWwWbpm3OJWpqiWGttpifSGs6DJmzfwuK0b63yX5JlhNXeUVqXkZyfYqIh5RPIPOtXSA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@ast-grep/napi-win32-ia32-msvc": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-ia32-msvc/-/napi-win32-ia32-msvc-0.11.0.tgz", + "integrity": "sha512-oQGbxYYfQn6LPbMKQ1T2cjQ+DelYDO06w/gFPmdWrE6M/YUIv+KfKdEscBkr3ehJyvXZW5h3vmxuApiMuCyfAQ==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@ast-grep/napi-win32-x64-msvc": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@ast-grep/napi-win32-x64-msvc/-/napi-win32-x64-msvc-0.11.0.tgz", + "integrity": "sha512-qrXI4+S8W7IF6e1nlDYX2KfdzxGHyAOj5kGvWk+TqBuAnA0rWQ513hJzdviiGpbB5VPnJkEhOVsDets8acKd6w==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.8.tgz", + "integrity": "sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.8.tgz", + "integrity": "sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.8.tgz", + "integrity": "sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.8.tgz", + "integrity": "sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.8.tgz", + "integrity": "sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.8.tgz", + "integrity": "sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.8.tgz", + "integrity": "sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.8.tgz", + "integrity": "sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.8.tgz", + "integrity": "sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.8.tgz", + "integrity": "sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.8.tgz", + "integrity": "sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==", + "cpu": [ + "loong64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.8.tgz", + "integrity": "sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==", + "cpu": [ + "mips64el" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.8.tgz", + "integrity": "sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==", + "cpu": [ + "ppc64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.8.tgz", + "integrity": "sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==", + "cpu": [ + "riscv64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.8.tgz", + "integrity": "sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==", + "cpu": [ + "s390x" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.8.tgz", + "integrity": "sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.8.tgz", + "integrity": "sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.8.tgz", + "integrity": "sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.8.tgz", + "integrity": "sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.8.tgz", + "integrity": "sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.8.tgz", + "integrity": "sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.8.tgz", + "integrity": "sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@parcel/watcher": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz", + "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==", + "optional": true, + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.4.1", + "@parcel/watcher-darwin-arm64": "2.4.1", + "@parcel/watcher-darwin-x64": "2.4.1", + "@parcel/watcher-freebsd-x64": "2.4.1", + "@parcel/watcher-linux-arm-glibc": "2.4.1", + "@parcel/watcher-linux-arm64-glibc": "2.4.1", + "@parcel/watcher-linux-arm64-musl": "2.4.1", + "@parcel/watcher-linux-x64-glibc": "2.4.1", + "@parcel/watcher-linux-x64-musl": "2.4.1", + "@parcel/watcher-win32-arm64": "2.4.1", + "@parcel/watcher-win32-ia32": "2.4.1", + "@parcel/watcher-win32-x64": "2.4.1" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz", + "integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz", + "integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz", + "integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz", + "integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz", + "integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==", + "cpu": [ + "arm" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz", + "integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz", + "integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz", + "integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz", + "integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz", + "integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==", + "cpu": [ + "arm64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-ia32": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz", + "integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==", + "cpu": [ + "ia32" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz", + "integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==", + "cpu": [ + "x64" + ], + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@shopify/cli": { + "version": "3.63.2", + "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.63.2.tgz", + "integrity": "sha512-bkUUxA3r9G6DfMyhfuA0YalCA5GHqnQ/18pD9H7ppV43646iMpZrAEi0MtiyrFwerLZ//1Ic3NgMMKqkcmOQxg==", + "os": [ + "darwin", + "linux", + "win32" + ], + "dependencies": { + "@ast-grep/napi": "0.11.0", + "esbuild": "0.19.8" + }, + "bin": { + "shopify": "bin/run.js" + }, + "engines": { + "node": "^18.20.0 || >=20.10.0" + }, + "optionalDependencies": { + "@parcel/watcher": "2.4.1" + } + }, + "node_modules/braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "optional": true, + "dependencies": { + "fill-range": "^7.1.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", + "optional": true, + "bin": { + "detect-libc": "bin/detect-libc.js" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esbuild": { + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.8.tgz", + "integrity": "sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==", + "hasInstallScript": true, + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/android-arm": "0.19.8", + "@esbuild/android-arm64": "0.19.8", + "@esbuild/android-x64": "0.19.8", + "@esbuild/darwin-arm64": "0.19.8", + "@esbuild/darwin-x64": "0.19.8", + "@esbuild/freebsd-arm64": "0.19.8", + "@esbuild/freebsd-x64": "0.19.8", + "@esbuild/linux-arm": "0.19.8", + "@esbuild/linux-arm64": "0.19.8", + "@esbuild/linux-ia32": "0.19.8", + "@esbuild/linux-loong64": "0.19.8", + "@esbuild/linux-mips64el": "0.19.8", + "@esbuild/linux-ppc64": "0.19.8", + "@esbuild/linux-riscv64": "0.19.8", + "@esbuild/linux-s390x": "0.19.8", + "@esbuild/linux-x64": "0.19.8", + "@esbuild/netbsd-x64": "0.19.8", + "@esbuild/openbsd-x64": "0.19.8", + "@esbuild/sunos-x64": "0.19.8", + "@esbuild/win32-arm64": "0.19.8", + "@esbuild/win32-ia32": "0.19.8", + "@esbuild/win32-x64": "0.19.8" + } + }, + "node_modules/fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "optional": true, + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "optional": true, + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "optional": true, + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/micromatch": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "optional": true, + "dependencies": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/node-addon-api": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", + "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", + "optional": true, + "engines": { + "node": "^16 || ^18 || >= 20" + } + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "optional": true, + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "optional": true, + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + } + } +} diff --git a/pkgs/by-name/sh/shopify-cli/package.json b/pkgs/by-name/sh/shopify-cli/package.json new file mode 100644 index 000000000000..092b9e8f8bf8 --- /dev/null +++ b/pkgs/by-name/sh/shopify-cli/package.json @@ -0,0 +1,11 @@ +{ + "name": "shopify", + "version": "3.63.2", + "private": true, + "bin": { + "shopify": "node_modules/@shopify/cli/bin/run.js" + }, + "dependencies": { + "@shopify/cli": "3.63.2" + } +} diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix new file mode 100644 index 000000000000..c850d4740b80 --- /dev/null +++ b/pkgs/by-name/sh/shopify-cli/package.nix @@ -0,0 +1,57 @@ +{ buildNpmPackage, lib, makeWrapper, bundlerEnv, testers, shopify-cli }: +let + version = "3.63.2"; + + # Package the legacy ruby CLI. + rubyGems = bundlerEnv { + name = "shopify-cli-legacy"; + gemdir = ./.; + }; +in +buildNpmPackage { + pname = "shopify"; + version = version; + + src = lib.fileset.toSource { + root = ./.; + fileset = with lib.fileset; unions [ + ./package.json + ./package-lock.json + ]; + }; + + npmDepsHash = "sha256-6CEDcWXZXYHFrT2xpbj5NwMrbDZXH6HclgTGkfKDlJs="; + dontNpmBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { + package = shopify-cli; + command = "shopify version"; + }; + }; + + postInstall = '' + # Disable the installCLIDependencies function. + substituteInPlace $(grep -r -l 'await installCLIDependencies' $out/lib/node_modules/shopify/node_modules/@shopify/cli/dist) \ + --replace-fail 'await installCLIDependencies' '// await installCLIDependencies' + + wrapProgram $out/bin/shopify \ + --set SHOPIFY_RUBY_BINDIR ${rubyGems.wrappedRuby}/bin \ + --prefix PATH : ${rubyGems}/bin \ + --set SHOPIFY_CLI_VERSION ${version} \ + --set SHOPIFY_CLI_BUNDLED_THEME_CLI 0 + ''; + + meta = { + platforms = lib.platforms.all; + mainProgram = "shopify"; + description = "CLI which helps you build against the Shopify platform faster"; + homepage = "https://github.com/Shopify/cli"; + changelog = "https://github.com/Shopify/cli/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fd onny ]; + }; +} diff --git a/pkgs/by-name/sh/shopify-cli/update.sh b/pkgs/by-name/sh/shopify-cli/update.sh new file mode 100755 index 000000000000..db63e4ce1915 --- /dev/null +++ b/pkgs/by-name/sh/shopify-cli/update.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl nix-update prefetch-npm-deps nodejs jq gnused ruby bundix + +set -eu -o pipefail + +# Make a temporary directory and make sure it's removed when the script exits +tmp=$(mktemp -d) +trap "rm -rf $tmp" EXIT + +package_dir="$(dirname "${BASH_SOURCE[0]}")" +pushd "$package_dir" + +curl -sfL ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/Shopify/cli/releases/latest > $tmp/latest.json +version=$(cat $tmp/latest.json | jq -r '.tag_name') + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +# Update the package.json +sed -i "s|$UPDATE_NIX_OLD_VERSION|$version|g" package.json + +# Update the package-lock.json +rm -f package-lock.json +npm i --package-lock-only +npm_hash=$(prefetch-npm-deps package-lock.json) +sed -i "s|npmDepsHash = \".*\";|npmDepsHash = \"$npm_hash\";|" package.nix + +# Update the Gemfile +curl -sf "https://raw.githubusercontent.com/Shopify/cli/$version/packages/cli-kit/src/public/node/ruby.ts" > $tmp/ruby.ts +ruby_version=$(cat $tmp/ruby.ts | grep -oP "RubyCLIVersion = '\K[^']*") +sed -i "s|gem 'shopify-cli', '.*'|gem 'shopify-cli', '$ruby_version'|" Gemfile + +# Update Gemfile.lock +rm -f Gemfile.lock gemset.nix +BUNDLE_FORCE_RUBY_PLATFORM=true bundle lock +bundix + +popd + +nix-update shopify-cli --version $version diff --git a/pkgs/development/web/shopify-cli/default.nix b/pkgs/development/web/shopify-cli/default.nix deleted file mode 100644 index ae6e6b82df9b..000000000000 --- a/pkgs/development/web/shopify-cli/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, lib, bundlerEnv, bundlerUpdateScript, makeWrapper, ruby }: - -let - rubyEnv = bundlerEnv { - name = "shopify-cli"; - gemdir = ./.; - ruby = ruby; - }; -in -stdenv.mkDerivation rec { - pname = "shopify-cli"; - version = (import ./gemset.nix).shopify-cli.version; - - nativeBuildInputs = [ makeWrapper ]; - - dontUnpack = true; - - installPhase = '' - mkdir -p $out/bin - makeWrapper ${rubyEnv}/bin/shopify $out/bin/shopify - wrapProgram $out/bin/shopify \ - --prefix PATH : ${lib.makeBinPath [ ruby ]} - ''; - - passthru.updateScript = bundlerUpdateScript "shopify-cli"; - - meta = with lib; { - description = "CLI which helps you build against the Shopify platform faster"; - homepage = "https://github.com/Shopify/shopify-cli"; - license = licenses.mit; - maintainers = with maintainers; [ onny ]; - mainProgram = "shopify"; - platforms = ruby.meta.platforms; - }; -} - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 115091224df1..d0c39c73d961 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12729,8 +12729,6 @@ with pkgs; shocco = callPackage ../tools/text/shocco { }; - shopify-cli = callPackage ../development/web/shopify-cli { }; - shopify-themekit = callPackage ../development/web/shopify-themekit { }; shorewall = callPackage ../tools/networking/shorewall { }; From fb49cbe49bb2070f9af98b973d6c1d7e0298ff26 Mon Sep 17 00:00:00 2001 From: undefined Date: Thu, 11 Jul 2024 18:21:15 +0800 Subject: [PATCH 045/227] esbuild: 0.22.0 -> 0.23.0 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 565ef850863e..60aec66919d1 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-I+NJFWnjsXgfIlzIv6hGXj9VF0JcF/ck7g88Td6jLw0="; + hash = "sha256-AH4Y5ELPicAdJZY5CBf2byOxTzOyQFRh4XoqRUQiAQw="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From 12a45cecebc169caabaae75979ddc8f11677140d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 11 Jul 2024 16:39:35 +0300 Subject: [PATCH 046/227] ayatana-webmail: 22.12.15 -> 24.5.17 Diff: https://github.com/AyatanaIndicators/ayatana-webmail/compare/22.12.15...24.5.17 Python312 fix was landed according to https://github.com/AyatanaIndicators/ayatana-webmail/issues/38 --- .../networking/mailreaders/ayatana-webmail/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix index 4c8cdab32b7d..fcc5aa838585 100644 --- a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix +++ b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gettext , gtk3 -, python311Packages +, python3Packages , gdk-pixbuf , libnotify , glib @@ -16,19 +16,15 @@ , libcanberra-gtk3 }: -let - # https://github.com/AyatanaIndicators/ayatana-webmail/issues/38 - python3Packages = python311Packages; -in python3Packages.buildPythonApplication rec { pname = "ayatana-webmail"; - version = "22.12.15"; + version = "24.5.17"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-webmail"; rev = version; - hash = "sha256-K2jqCWrY1i1wYdZVpjN/3TcVyWariOQQ4slZf6sEPRU="; + hash = "sha256-k557FWKGq2MXODVxVzOetC5kkwTNYOoLO8msCOabais="; }; postConfigure = '' # Fix fhs paths From d039f2be55869fff1b72984ad4c6588ca511f86e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 11 Jul 2024 16:50:56 +0300 Subject: [PATCH 047/227] ayatana-webmail: use --replace-fail in fhs substitution --- .../networking/mailreaders/ayatana-webmail/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix index fcc5aa838585..f76bf10c5267 100644 --- a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix +++ b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { ayatanawebmail/accounts.py \ ayatanawebmail/actions.py \ ayatanawebmail/dialog.py \ - --replace /usr/share $out/share + --replace-fail /usr/share $out/share ''; buildInputs = [ From 2acb9b5cdaf7969552232b3164ca5e6ade1dec8d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 11 Jul 2024 16:53:03 +0300 Subject: [PATCH 048/227] ayatana-webmail: RFC 166 formatting and more --- .../mailreaders/ayatana-webmail/default.nix | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix index f76bf10c5267..1c99ef0427e3 100644 --- a/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix +++ b/pkgs/applications/networking/mailreaders/ayatana-webmail/default.nix @@ -1,19 +1,20 @@ -{ lib -, fetchFromGitHub -, gettext -, gtk3 -, python3Packages -, gdk-pixbuf -, libnotify -, glib -, gobject-introspection -, wrapGAppsHook3 -# BTW libappindicator is also supported, but upstream recommends their -# implementation, see: -# https://github.com/AyatanaIndicators/ayatana-webmail/issues/24#issuecomment-1050352862 -, libayatana-appindicator -, gsettings-desktop-schemas -, libcanberra-gtk3 +{ + lib, + fetchFromGitHub, + gettext, + gtk3, + python3Packages, + gdk-pixbuf, + libnotify, + glib, + gobject-introspection, + wrapGAppsHook3, + # BTW libappindicator is also supported, but upstream recommends their + # implementation, see: + # https://github.com/AyatanaIndicators/ayatana-webmail/issues/24#issuecomment-1050352862 + libayatana-appindicator, + gsettings-desktop-schemas, + libcanberra-gtk3, }: python3Packages.buildPythonApplication rec { @@ -23,7 +24,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-webmail"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-k557FWKGq2MXODVxVzOetC5kkwTNYOoLO8msCOabais="; }; postConfigure = '' @@ -80,11 +81,11 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ libcanberra-gtk3 ]}) ''; - meta = with lib; { + meta = { description = "Webmail notifications and actions for any desktop"; homepage = "https://github.com/AyatanaIndicators/ayatana-webmail"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ doronbehar ]; }; } From eeb1dffd02a19b35e0f3877166c3b05a23aa823e Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Tue, 9 Jul 2024 13:21:49 +0200 Subject: [PATCH 049/227] nixos/nixos-install: add support for --file and --attr flags --- .../installer/tools/manpages/nixos-install.8 | 28 ++++++++ .../modules/installer/tools/nixos-install.sh | 68 ++++++++++++++++--- 2 files changed, 86 insertions(+), 10 deletions(-) diff --git a/nixos/modules/installer/tools/manpages/nixos-install.8 b/nixos/modules/installer/tools/manpages/nixos-install.8 index c6c8ed15224d..e1af90a37d76 100644 --- a/nixos/modules/installer/tools/manpages/nixos-install.8 +++ b/nixos/modules/installer/tools/manpages/nixos-install.8 @@ -14,6 +14,8 @@ .Op Fl -root Ar root .Op Fl -system Ar path .Op Fl -flake Ar flake-uri +.Op Fl -file | f Ar path +.Op Fl -attr | A Ar attrPath .Op Fl -impure .Op Fl -channel Ar channel .Op Fl -no-channel-copy @@ -111,6 +113,32 @@ output named .Ql nixosConfigurations. Ns Ar name Ns \&. . +.It Fl -file Ar path , Fl f Ar path +Enable and build the NixOS system from the specified file. The file must +evaluate to an attribute set, and it must contain a valid NixOS configuration +at attribute +.Va attrPath Ns +\&. This is useful for building a NixOS system from a nix file that is not +a flake or a NixOS configuration module. Attribute set a with valid NixOS +configuration can be made using +.Va nixos +function in nixpkgs or importing and calling +.Pa nixos/lib/eval-config.nix +from nixpkgs. If specified without +.Fl -attr +option, builds the configuration from the top-level +attribute of the file. +. +.It Fl -attr Ar attrPath , Fl A Ar attrPath +Enable and build the NixOS system from nix file and use the specified attribute +path from file specified by the +.Fl -file +option. If specified without +.Fl -file +option, uses +.Va [root] Ns Pa /etc/nixos/default.nix Ns +\&. +. .It Fl -channel Ar channel If this option is provided, do not copy the current .Dq nixos diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 4e42875c0365..a76b4ffb4444 100755 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -17,6 +17,9 @@ mountPoint=/mnt channelPath= system= verbosity=() +attr= +buildFile= +buildingAttribute=1 while [ "$#" -gt 0 ]; do i="$1"; shift 1 @@ -41,6 +44,24 @@ while [ "$#" -gt 0 ]; do flakeFlags=(--experimental-features 'nix-command flakes') shift 1 ;; + --file|-f) + if [ -z "$1" ]; then + log "$0: '$i' requires an argument" + exit 1 + fi + buildFile="$1" + buildingAttribute= + shift 1 + ;; + --attr|-A) + if [ -z "$1" ]; then + log "$0: '$i' requires an argument" + exit 1 + fi + attr="$1" + buildingAttribute= + shift 1 + ;; --recreate-lock-file|--no-update-lock-file|--no-write-lock-file|--no-registries|--commit-lock-file) lockFlags+=("$i") ;; @@ -101,17 +122,30 @@ while [[ "$checkPath" != "/" ]]; do checkPath="$(dirname "$checkPath")" done -# Get the path of the NixOS configuration file. -if [[ -z $NIXOS_CONFIG ]]; then - NIXOS_CONFIG=$mountPoint/etc/nixos/configuration.nix -fi - -if [[ ${NIXOS_CONFIG:0:1} != / ]]; then - echo "$0: \$NIXOS_CONFIG is not an absolute path" +# Verify that user is not trying to use attribute building and flake +# at the same time +if [[ -z $buildingAttribute && -n $flake ]]; then + echo "$0: '--flake' cannot be used with '--file' or '--attr'" exit 1 fi -if [[ -n $flake ]]; then +# Get the path of the NixOS configuration file. +if [[ -z $flake && -n $buildingAttribute ]]; then + if [[ -z $NIXOS_CONFIG ]]; then + NIXOS_CONFIG=$mountPoint/etc/nixos/configuration.nix + fi + + if [[ ${NIXOS_CONFIG:0:1} != / ]]; then + echo "$0: \$NIXOS_CONFIG is not an absolute path" + exit 1 + fi +elif [[ -z $buildingAttribute ]]; then + if [[ -z $buildFile ]]; then + buildFile="$mountPoint/etc/nixos/default.nix" + elif [[ -d $buildFile ]]; then + buildFile="$buildFile/default.nix" + fi +elif [[ -n $flake ]]; then if [[ $flake =~ ^(.*)\#([^\#\"]*)$ ]]; then flake="${BASH_REMATCH[1]}" flakeAttr="${BASH_REMATCH[2]}" @@ -129,11 +163,16 @@ if [[ -n $flake ]]; then flake=$(nix "${flakeFlags[@]}" flake metadata --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url) fi -if [[ ! -e $NIXOS_CONFIG && -z $system && -z $flake ]]; then +if [[ ! -e $NIXOS_CONFIG && -z $system && -z $flake && -n $buildingAttribute ]]; then echo "configuration file $NIXOS_CONFIG doesn't exist" exit 1 fi +if [[ ! -z $buildingAttribute && -e $buildFile && -z $system ]]; then + echo "configuration file $buildFile doesn't exist" + exit 1 +fi + # A place to drop temporary stuff. tmpdir="$(mktemp -d -p "$mountPoint")" trap 'rm -rf $tmpdir' EXIT @@ -163,11 +202,20 @@ fi # Build the system configuration in the target filesystem. if [[ -z $system ]]; then outLink="$tmpdir/system" - if [[ -z $flake ]]; then + if [[ -z $flake && -n $buildingAttribute ]]; then echo "building the configuration in $NIXOS_CONFIG..." nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ --extra-substituters "$sub" \ '' -A system -I "nixos-config=$NIXOS_CONFIG" "${verbosity[@]}" + elif [[ -z $buildingAttribute ]]; then + if [[ -n $attr ]]; then + echo "building the configuration in $buildFile and attribute $attr..." + else + echo "building the configuration in $buildFile..." + fi + nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ + --extra-substituters "$sub" \ + "$buildFile" -A "${attr:+$attr.}config.system.build.toplevel" "${verbosity[@]}" else echo "building the flake in $flake..." nix "${flakeFlags[@]}" build "$flake#$flakeAttr.config.system.build.toplevel" \ From 4a10d41b5d72bb900e94f57d3ec27529aa38bc54 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 11 Jul 2024 23:45:34 +0300 Subject: [PATCH 050/227] koboldcpp: add postPatch for Darwin - Add `postPatch` deleting an unused argument for Darwin --- pkgs/by-name/ko/koboldcpp/package.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 1975feafe919..decf34d27694 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -36,9 +36,11 @@ # You can find list of x86_64 options here: https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html # For ARM here: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html # If you set "march" to "native", specify "mtune" as well; otherwise, it will be set to "generic". (credit to: https://lemire.me/blog/2018/07/25/it-is-more-complicated-than-i-thought-mtune-march-in-gcc/) - # For example, if you have an AMD Ryzen CPU, you will set "march" to "x86-64" and "mtune" to "znver2" march ? "", + # Apple Silicon Chips (M1, M2, M3 and so on DO NOT use mtune) + # For example, if you have an AMD Ryzen CPU, you will set "mtune" to "znver2" mtune ? "", + mcpu ? "", }: let @@ -114,8 +116,11 @@ effectiveStdenv.mkDerivation (finalAttrs: { env.NIX_LDFLAGS = lib.concatStringsSep " " (finalAttrs.darwinLdFlags ++ finalAttrs.metalLdFlags); - env.NIX_CFLAGS_COMPILE = - lib.optionalString (march != "") "-march=${march}" + lib.optionalString (mtune != "") "-mtune=${mtune}"; + env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ + (lib.optionalString (march != "") "-march=${march}") + (lib.optionalString (mtune != "") "-mtune=${mtune}") + (lib.optionalString (mcpu != "") "-mcpu=${mcpu}") + ]; makeFlags = [ (makeBool "LLAMA_OPENBLAS" openblasSupport) @@ -143,6 +148,12 @@ effectiveStdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + # Remove an unused argument, mainly intended for Darwin to reduce warnings + postPatch = '' + substituteInPlace Makefile \ + --replace-warn " -s " " " + ''; + postFixup = '' wrapPythonProgramsIn "$out/bin" "$pythonPath" makeWrapper "$out/bin/koboldcpp.unwrapped" "$out/bin/koboldcpp" \ From 4a9647c7e11fad55ac4597a7442369817be98e1d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Jul 2024 00:51:29 +0200 Subject: [PATCH 051/227] mbuffer: 20240107 -> 20240707 --- pkgs/tools/misc/mbuffer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 177e70dd574c..a4c934e9a6a4 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mbuffer"; - version = "20240107"; + version = "20240707"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "sha256-14YG4X3ZAmpTI21ezAenAgLSZC0X49kHRxzbWKBFiBQ="; + sha256 = "sha256-fzkm6S+qgblqMkIPgCiLVfGFBIDyoDLBbtYbUyZ8rgk="; }; buildInputs = [ From 9cd16b5e0143adcef1e8f710fcda4ffecf1ddd3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 02:24:21 +0000 Subject: [PATCH 052/227] nanoflann: 1.5.5 -> 1.6.0 --- pkgs/development/libraries/nanoflann/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 24b4a18c7088..811f86b8b749 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.5"; + version = "1.6.0"; pname = "nanoflann"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${finalAttrs.version}"; - hash = "sha256-a1XX1tvXfrPCar9EGMXzxLg2bXJaK85t2Bd8CworwFk="; + hash = "sha256-oAy9/PjYTtnhD+zrMGgYPhjHwE5O7nB0j+1obbAymq8="; }; nativeBuildInputs = [ cmake ]; From 573bd55e6be6c70794ac6c272db0e47cacdee208 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 05:04:37 +0000 Subject: [PATCH 053/227] python312Packages.rtree: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/rtree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rtree/default.nix b/pkgs/development/python-modules/rtree/default.nix index fee90dff358f..296d141d564a 100644 --- a/pkgs/development/python-modules/rtree/default.nix +++ b/pkgs/development/python-modules/rtree/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rtree"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Toblerity"; repo = "rtree"; rev = "refs/tags/${version}"; - hash = "sha256-RmAiyYrkUMBN/ebmo27WvFcRmYlKkywuQHLLUbluTTw="; + hash = "sha256-yuSPRb8SRz+FRmwFCKDx+gtp9IWaneQ84jDuZP7TX0A="; }; postPatch = '' From 42209ee3fe90f88a81eecfdd7ed72b5d8ee6955f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 12 Jul 2024 07:52:34 +0200 Subject: [PATCH 054/227] python311Packages.pymc: 5.16.1 -> 5.16.2 Diff: https://github.com/pymc-devs/pymc/compare/refs/tags/v5.16.1...v5.16.2 Changelog: https://github.com/pymc-devs/pymc/releases/tag/v5.16.2 --- pkgs/development/python-modules/pymc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix index d1cced8ea507..30161191dd59 100644 --- a/pkgs/development/python-modules/pymc/default.nix +++ b/pkgs/development/python-modules/pymc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "5.16.1"; + version = "5.16.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-C3D07uouV8QZLplIonmViZoCXb4AAEN+uGvNly2hcMc="; + hash = "sha256-vOU5P45AJPULGWj9lscZKP3JqfSpkPDnq1Fyq9lIawc="; }; postPatch = '' From a68af291d934588b893787dd641c7546d824f685 Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Fri, 12 Jul 2024 18:13:48 +0800 Subject: [PATCH 055/227] linux_xanmod: 6.6.37 -> 6.6.39 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index efba7c47741d..6675c91ef6d5 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,8 +6,8 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.37"; - hash = "sha256-EoGRWCa0nqokUzhq+WcmY1RRFv9uDvmrGdXCqZxTJ/U="; + version = "6.6.39"; + hash = "sha256-s8rE92YVz+0SC/VRvItakp7Q6whFzskFkalqku6j43Y="; variant = "lts"; }; From 43c4add75f4fde92bf98db8c589cca181f31cd10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 10:20:24 +0000 Subject: [PATCH 056/227] python312Packages.ansible-compat: 24.6.1 -> 24.7.0 --- pkgs/development/python-modules/ansible-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 493204c86738..e37247afee9e 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "24.6.1"; + version = "24.7.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ansible_compat"; inherit version; - hash = "sha256-+T1MNH2OGQPCkkSUQcCamH1wNm+crfmv5eMtyKAZPKw="; + hash = "sha256-e8egwgpQWh62/5h3Bx/iAzATBCkIfaKY4lCZoU9w0C8="; }; nativeBuildInputs = [ From 08fa40b6aa741097880326919f946501fa4de998 Mon Sep 17 00:00:00 2001 From: zzzsyyy Date: Fri, 12 Jul 2024 18:39:35 +0800 Subject: [PATCH 057/227] linux_xanmod_latest: 6.9.8 -> 6.9.9 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 6675c91ef6d5..cb7054f07c4a 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -12,8 +12,8 @@ let }; mainVariant = { - version = "6.9.8"; - hash = "sha256-rSwvVt+DW7rc//aY6Ho8mllUy/3MKuAs/71UG+p07Iw="; + version = "6.9.9"; + hash = "sha256-ZEU1RIgJ0ckyITFWZndEzXYwnTF39OviLxL9S5dEea4="; variant = "main"; }; From 62d13413f4281a8d5b092101f706c04a44e0ddd4 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Mon, 4 Dec 2023 23:18:06 +0700 Subject: [PATCH 058/227] mitm-cache: init at 0.1.1 --- pkgs/build-support/mitm-cache/default.nix | 44 ++++++++++++++++++ pkgs/build-support/mitm-cache/fetch.nix | 49 +++++++++++++++++++++ pkgs/build-support/mitm-cache/setup-hook.sh | 21 +++++++++ pkgs/top-level/all-packages.nix | 4 ++ 4 files changed, 118 insertions(+) create mode 100644 pkgs/build-support/mitm-cache/default.nix create mode 100644 pkgs/build-support/mitm-cache/fetch.nix create mode 100644 pkgs/build-support/mitm-cache/setup-hook.sh diff --git a/pkgs/build-support/mitm-cache/default.nix b/pkgs/build-support/mitm-cache/default.nix new file mode 100644 index 000000000000..dd44a7ddca9a --- /dev/null +++ b/pkgs/build-support/mitm-cache/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, callPackage +, rustPlatform +, substituteAll +, openssl +, Security +, python3Packages +}: + +rustPlatform.buildRustPackage rec { + pname = "mitm-cache"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "chayleaf"; + repo = "mitm-cache"; + rev = "v${version}"; + hash = "sha256-l9dnyA4Zo4jlbiCMRzUqW3NkiploVpmvxz9i896JkXU="; + }; + + buildInputs = lib.optionals stdenv.isDarwin [ + Security + ]; + + cargoHash = "sha256-6eYOSSlswJGR2IrFo17qVnwI+h2FkyTjLFvwf62nG2c="; + + setupHook = substituteAll { + src = ./setup-hook.sh; + inherit openssl; + ephemeral_port_reserve = python3Packages.ephemeral-port-reserve; + }; + + passthru.fetch = callPackage ./fetch.nix { }; + + meta = with lib; { + description = "A MITM caching proxy for use in nixpkgs"; + homepage = "https://github.com/chayleaf/mitm-cache#readme"; + license = licenses.mit; + maintainers = with maintainers; [ chayleaf ]; + mainProgram = "mitm-cache"; + }; +} diff --git a/pkgs/build-support/mitm-cache/fetch.nix b/pkgs/build-support/mitm-cache/fetch.nix new file mode 100644 index 000000000000..4e1f24ae7d7b --- /dev/null +++ b/pkgs/build-support/mitm-cache/fetch.nix @@ -0,0 +1,49 @@ +{ lib +, fetchurl +, runCommand +, writeText +}: + +{ name ? "deps" +, data +, dontFixup ? true +, ... +} +@ attrs: + +let + data' = builtins.removeAttrs + (if builtins.isPath data then lib.importJSON data else data) + [ "!version" ]; + + urlToPath = url: + if lib.hasPrefix "https://" url then ( + let + url' = lib.drop 2 (lib.splitString "/" url); + in "https/${builtins.concatStringsSep "/" url'}" + ) + else builtins.replaceStrings ["://"] ["/"] url; + code = '' + mkdir -p "$out" + cd "$out" + '' + builtins.concatStringsSep "" (lib.mapAttrsToList (url: info: + let + key = builtins.head (builtins.attrNames info); + val = info.${key}; + path = urlToPath url; + name = baseNameOf path; + source = { + redirect = "$out/${urlToPath val}"; + hash = fetchurl { inherit url; hash = val; }; + text = writeText name val; + }.${key} or (throw "Unknown key: ${url}"); + in '' + mkdir -p "${dirOf path}" + ln -s "${source}" "${path}" + '') data'); +in + runCommand name (builtins.removeAttrs attrs [ "name" "data" ] // { + passthru = (attrs.passthru or {}) // { + data = writeText "deps.json" (builtins.toJSON data); + }; + }) code diff --git a/pkgs/build-support/mitm-cache/setup-hook.sh b/pkgs/build-support/mitm-cache/setup-hook.sh new file mode 100644 index 000000000000..219674eb9ea4 --- /dev/null +++ b/pkgs/build-support/mitm-cache/setup-hook.sh @@ -0,0 +1,21 @@ +mitmCacheConfigureHook() { + if [ -d "$mitmCache" ] && [ -z "$MITM_CACHE_CERT_DIR" ]; then + MITM_CACHE_CERT_DIR="$(mktemp -d)" + pushd "$MITM_CACHE_CERT_DIR" + MITM_CACHE_CA="$MITM_CACHE_CERT_DIR/ca.cer" + @openssl@/bin/openssl genrsa -out ca.key 2048 + @openssl@/bin/openssl req -x509 -new -nodes -key ca.key -sha256 -days 1 -out ca.cer -subj "/C=AL/ST=a/L=a/O=a/OU=a/CN=example.org" + MITM_CACHE_HOST="127.0.0.1" + MITM_CACHE_PORT="${mitmCachePort:-$(@ephemeral_port_reserve@/bin/ephemeral-port-reserve "$MITM_CACHE_HOST")}" + MITM_CACHE_ADDRESS="$MITM_CACHE_HOST:$MITM_CACHE_PORT" + export http_proxy="$MITM_CACHE_ADDRESS" + export https_proxy="$MITM_CACHE_ADDRESS" + export SSL_CERT_FILE="$MITM_CACHE_CA" + export NIX_SSL_CERT_FILE="$MITM_CACHE_CA" + mitm-cache -l"$MITM_CACHE_ADDRESS" replay "$mitmCache" >/dev/null 2>/dev/null & + popd + fi +} + +# prepend it so any other configure hooks can use the generated root CA +preConfigureHooks=(mitmCacheConfigureHook "${preConfigureHooks[@]}") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27412bbac617..d26f1cdcd4af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1391,6 +1391,10 @@ with pkgs; makeHardcodeGsettingsPatch = callPackage ../build-support/make-hardcode-gsettings-patch { }; + mitm-cache = callPackage ../build-support/mitm-cache { + inherit (darwin.apple_sdk.frameworks) Security; + }; + # intended to be used like nix-build -E 'with import { }; enableDebugging fooPackage' enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; From a631bac3f9b244a1344ea21ea85cea04f3e57b84 Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sat, 29 Jun 2024 11:11:24 +0200 Subject: [PATCH 059/227] pdal: 2.7.1 -> 2.7.2 --- pkgs/development/libraries/pdal/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/pdal/default.nix b/pkgs/development/libraries/pdal/default.nix index c035460fafae..38ee44892534 100644 --- a/pkgs/development/libraries/pdal/default.nix +++ b/pkgs/development/libraries/pdal/default.nix @@ -19,6 +19,7 @@ , pkg-config , postgresql , proj +, sqlite , tiledb , xercesc , zlib @@ -27,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pdal"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "PDAL"; repo = "PDAL"; rev = finalAttrs.version; - sha256 = "sha256-JoHBxJ0hCWH7ZhmeJk4huT2k0AK5CzIV58NWCjWj5T0="; + sha256 = "sha256-ukBZLr/iyYQ68sv9JWrR4YP0ahHfGhytgcWKPzrF3Ps="; }; nativeBuildInputs = [ @@ -52,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { openscenegraph postgresql proj + sqlite tiledb xercesc zlib @@ -87,12 +89,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; disabledTests = [ - # Failing due to GDAL 3.9 change in coordinates precision. - # See: https://github.com/PDAL/PDAL/issues/4403 - # This test should be re-enabled once https://github.com/PDAL/PDAL/pull/4411 - # is merged ! - "pdal_io_ogr_writer_test" - # Tests failing due to TileDB library implementation, disabled also # by upstream CI. # See: https://github.com/PDAL/PDAL/blob/bc46bc77f595add4a6d568a1ff923d7fe20f7e74/.github/workflows/linux.yml#L81 From 38fcc7e428b80898faab29de951067bb8e973969 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Fri, 12 Jul 2024 09:34:04 -0500 Subject: [PATCH 060/227] aws-sso-cli: 1.16.1 -> 1.17.0 --- pkgs/tools/admin/aws-sso-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index 8d2b7d54c4dd..9866bffb07dc 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -8,15 +8,15 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-jFeF/nxJMUO0tH8kgLgV6DIvN9KbcTy19LEvu4Paq8M="; + hash = "sha256-VEI+vCNeNoFOE+2j/OUjRszXsUQP2E1iUdPUW9X3tHk="; }; - vendorHash = "sha256-0ji2i2MSEqd3xxos96FHn9srDOtpvX3mFlaNoiTEa/U="; + vendorHash = "sha256-a57RtK8PxwaRrSA6W6R//GacZ+pK8mBi4ZASS5NvShE="; nativeBuildInputs = [ makeWrapper ]; From 680ea6fcb7233793d7430802bd2c88e779b05197 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Jul 2024 16:34:28 +0200 Subject: [PATCH 061/227] python312Packages.puremagic: 1.25 -> 1.26 Diff: https://github.com/cdgriffith/puremagic/compare/refs/tags/1.25...1.26 Changelog: https://github.com/cdgriffith/puremagic/blob/1.26/CHANGELOG.md --- pkgs/development/python-modules/puremagic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index 52e6abb8047c..2d373362fb4f 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.25"; + version = "1.26"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "puremagic"; rev = "refs/tags/${version}"; - hash = "sha256-l97ZK9VT+kU9Hos91C7Q9Zhv3Dge3kyF7N//j4sZ5Kc="; + hash = "sha256-0lnMLlW/cwP0tOM0oZEl5M5k5ZDssnZejGt3+ctW1qg="; }; build-system = [ setuptools ]; From 7a05d8aab0a940ac9c107639dff75e0f11476a3e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Jul 2024 16:34:51 +0200 Subject: [PATCH 062/227] python312Packages.playwrightcapture: 1.25.4 -> 1.25.4 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.25.4...v1.25.4 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.25.4 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index 07f6f6813f1c..7304c79a8741 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.25.0"; + version = "1.25.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-Sm6FfwUxW3t7gLwWd+ZJPyp0VSMPgGpuT3lrMurWOa0="; + hash = "sha256-PKox2vfmqyjdsvV7O/exPu7Y7ArzpiywfkTHucRTudo="; }; pythonRelaxDeps = [ From c12b2a0b196a42a20949cf648c86acfbe6418ad3 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Wed, 6 Dec 2023 06:24:17 +0700 Subject: [PATCH 063/227] gradle: add setup hook --- doc/languages-frameworks/gradle.section.md | 189 ++++++++++++++ .../tools/build-managers/gradle/README.md | 245 ++++++++++++++++++ .../gradle/compress-deps-json.py | 163 ++++++++++++ .../tools/build-managers/gradle/default.nix | 40 +++ .../build-managers/gradle/fetch-deps.nix | 222 ++++++++++++++++ .../build-managers/gradle/init-build.gradle | 8 + .../build-managers/gradle/init-deps.gradle | 10 + .../tools/build-managers/gradle/setup-hook.sh | 70 +++++ .../build-managers/gradle/update-deps.nix | 122 +++++++++ pkgs/top-level/all-packages.nix | 15 +- 10 files changed, 1080 insertions(+), 4 deletions(-) create mode 100644 doc/languages-frameworks/gradle.section.md create mode 100644 pkgs/development/tools/build-managers/gradle/README.md create mode 100644 pkgs/development/tools/build-managers/gradle/compress-deps-json.py create mode 100644 pkgs/development/tools/build-managers/gradle/fetch-deps.nix create mode 100644 pkgs/development/tools/build-managers/gradle/init-build.gradle create mode 100644 pkgs/development/tools/build-managers/gradle/init-deps.gradle create mode 100644 pkgs/development/tools/build-managers/gradle/setup-hook.sh create mode 100644 pkgs/development/tools/build-managers/gradle/update-deps.nix diff --git a/doc/languages-frameworks/gradle.section.md b/doc/languages-frameworks/gradle.section.md new file mode 100644 index 000000000000..b2058ef87491 --- /dev/null +++ b/doc/languages-frameworks/gradle.section.md @@ -0,0 +1,189 @@ +# Gradle {#gradle} + +Gradle is a popular build tool for Java/Kotlin. Gradle itself doesn't +currently provide tools to make dependency resolution reproducible, so +nixpkgs has a proxy designed for intercepting Gradle web requests to +record dependencies so they can be restored in a reproducible fashion. + +## Building a Gradle package {#building-a-gradle-package} + +Here's how a typical derivation will look like: + +```nix +stdenv.mkDerivation (finalAttrs: { + pname = "pdftk"; + version = "3.3.3"; + + src = fetchFromGitLab { + owner = "pdftk-java"; + repo = "pdftk"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ciKotTHSEcITfQYKFZ6sY2LZnXGChBJy0+eno8B3YHY="; + }; + + nativeBuildInputs = [ gradle ]; + + # if the package has dependencies, mitmCache must be set + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; + + # this is required for using mitm-cache on Darwin + __darwinAllowLocalNetworking = true; + + gradleFlags = [ "-Dfile.encoding=utf-8" ]; + + # defaults to "assemble" + gradleBuildTask = "shadowJar"; + + # will run the gradleCheckTask (defaults to "test") + doCheck = true; + + installPhase = '' + mkdir -p $out/{bin,share/pdftk} + cp build/libs/pdftk-all.jar $out/share/pdftk + + makeWrapper ${jre}/bin/java $out/bin/pdftk \ + --add-flags "-jar $out/share/pdftk/pdftk-all.jar" + + cp ${finalAttrs.src}/pdftk.1 $out/share/man/man1 + ''; + + meta.sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; +}) +``` + +To update (or initialize) dependencies, run the update script via +something like `$(nix-build -A .mitmCache.updateScript)` +(`nix-build` builds the `updateScript`, `$(...)` runs the script at the +path printed by `nix-build`). + +If your package can't be evaluated using a simple `pkgs.` +expression (for example, if your package isn't located in nixpkgs, or if +you want to override some of its attributes), you will usually have to +pass `pkg` instead of `pname` to `gradle.fetchDeps`. There are two ways +of doing it. + +The first is to add the derivation arguments required for getting the +package. Using the pdftk example above: + +```nix +{ lib +, stdenv +# ... +, pdftk +}: + +stdenv.mkDerivation (finalAttrs: { + # ... + mitmCache = gradle.fetchDeps { + pkg = pdftk; + data = ./deps.json; + }; +}) +``` + +This allows you to `override` any arguments of the `pkg` used for +the update script (for example, `pkg = pdftk.override { enableSomeFlag = +true };`), so this is the preferred way. + +The second is to create a `let` binding for the package, like this: + +```nix +let self = stdenv.mkDerivation { + # ... + mitmCache = gradle.fetchDeps { + pkg = self; + data = ./deps.json; + }; +}; in self +``` + +This is useful if you can't easily pass the derivation as its own +argument, or if your `mkDerivation` call is responsible for building +multiple packages. + +In the former case, the update script will stay the same even if the +derivation is called with different arguments. In the latter case, the +update script will change depending on the derivation arguments. It's up +to you to decide which one would work best for your derivation. + +## Update Script {#gradle-update-script} + +The update script does the following: + +- Build the derivation's source via `pkgs.srcOnly` +- Enter a `nix-shell` for the derivation in a `bwrap` sandbox (the + sandbox is only used on Linux) +- Set the `IN_GRADLE_UPDATE_DEPS` environment variable to `1` +- Run the derivation's `unpackPhase`, `patchPhase`, `configurePhase` +- Run the derivation's `gradleUpdateScript` (the Gradle setup hook sets + a default value for it, which runs `preBuild`, `preGradleUpdate` + hooks, fetches the dependencies using `gradleUpdateTask`, and finally + runs the `postGradleUpdate` hook) +- Finally, store all of the fetched files' hashes in the lockfile. They + may be `.jar`/`.pom` files from Maven repositories, or they may be + files otherwise used for building the package. + +`fetchDeps` takes the following arguments: + +- `attrPath` - the path to the package in nixpkgs (for example, + `"javaPackages.openjfx22"`). Used for update script metadata. +- `pname` - an alias for `attrPath` for convenience. This is what you + will generally use instead of `pkg` or `attrPath`. +- `pkg` - the package to be used for fetching the dependencies. Defaults + to `getAttrFromPath (splitString "." attrPath) pkgs`. +- `bwrapFlags` - allows you to override bwrap flags (only relevant for + downstream, non-nixpkgs projects) +- `data` - path to the dependencies lockfile (can be relative to the + package, can be absolute). In nixpkgs, it's discouraged to have the + lockfiles be named anything other `deps.json`, consider creating + subdirectories if your package requires multiple `deps.json` files. + +## Environment {#gradle-environment} + +The Gradle setup hook accepts the following environment variables: + +- `mitmCache` - the MITM proxy cache imported using `gradle.fetchDeps` +- `gradleFlags` - command-line flags to be used for every Gradle + invocation (this simply registers a function that uses the necessary + flags). + - You can't use `gradleFlags` for flags that contain spaces, in that + case you must add `gradleFlagsArray+=("-flag with spaces")` to the + derivation's bash code instead. + - If you want to build the package using a specific Java version, you + can pass `"-Dorg.gradle.java.home=${jdk}"` as one of the flags. +- `gradleBuildTask` - the Gradle task (or tasks) to be used for building + the package. Defaults to `assemble`. +- `gradleCheckTask` - the Gradle task (or tasks) to be used for checking + the package if `doCheck` is set to `true`. Defaults to `test`. +- `gradleUpdateTask` - the Gradle task (or tasks) to be used for + fetching all of the package's dependencies in + `mitmCache.updateScript`. Defaults to `nixDownloadDeps`. +- `gradleUpdateScript` - the code to run for fetching all of the + package's dependencies in `mitmCache.updateScript`. Defaults to + running the `preBuild` and `preGradleUpdate` hooks, running the + `gradleUpdateTask`, and finally running the `postGradleUpdate` hook. +- `gradleInitScript` - path to the `--init-script` to pass to Gradle. By + default, a simple init script that enables reproducible archive + creation is used. + - Note that reproducible archives might break some builds. One example + of an error caused by it is `Could not create task ':jar'. Replacing + an existing task that may have already been used by other plugins is + not supported`. If you get such an error, the easiest "fix" is + disabling reproducible archives altogether by setting + `gradleInitScript` to something like `writeText + "empty-init-script.gradle" ""` +- `enableParallelBuilding` / `enableParallelChecking` / + `enableParallelUpdating` - pass `--parallel` to Gradle in the + build/check phase or in the update script. Defaults to true. If the + build fails for mysterious reasons, consider setting this to false. +- `dontUseGradleConfigure` / `dontUseGradleBuild` / `dontUseGradleCheck` + \- force disable the Gradle setup hook for certain phases. + - Note that if you disable the configure hook, you may face issues + such as `Failed to load native library 'libnative-platform.so'`, + because the configure hook is responsible for initializing Gradle. diff --git a/pkgs/development/tools/build-managers/gradle/README.md b/pkgs/development/tools/build-managers/gradle/README.md new file mode 100644 index 000000000000..f52779132c81 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/README.md @@ -0,0 +1,245 @@ +# Gradle Setup Hook + +## Introduction + +Gradle build scripts are written in a DSL, computing the list of Gradle +dependencies is a turing-complete task, not just in theory but in +practice. Fetching all of the dependencies often requires building some +native code, running some commands to check the host platform, or just +fetching some files using either JVM code or commands like `curl` or +`wget`. + +This practice is widespread and isn't considered a bad practice in the +Java world, so all we can do is run Gradle to check what dependencies +end up being fetched, and allow derivation authors to apply workarounds +so they can run the code necessary for fetching the dependencies our +script doesn't fetch. + +"Run Gradle to check what dependencies end up being fetched" isn't a +straightforward task. For example, Gradle usually uses Maven +repositories, which have features such as "snapshots", a way to always +use the latest version of a dependency as opposed to a fixed version. +Obviously, this is horrible for reproducibility. Additionally, Gradle +doesn't offer a way to export the list of dependency URLs and hashes (it +does in a way, but it's far from being complete, and as such is useless +for nixpkgs). Even if did, it would be annoying to use considering +fetching non-Gradle dependendencies in Gradle scripts is commonplace. + +That's why the setup hook uses mitm-cache, a program designed for +intercepting all HTTP requests, recording all the files that were +accessed, creating a Nix derivation with all of them, and then allowing +the Gradle derivation to access these files. + +## Maven Repositories + +(Reference: [Repository +Layout](https://cwiki.apache.org/confluence/display/MAVENOLD/Repository+Layout+-+Final)) + +Most of Gradle dependencies are fetched from Maven repositories. For +each dependency, Gradle finds the first repo where it can successfully +fetch that dependency, and uses that repo for it. Different repos might +actually return different files for the same artifact because of e.g. +pom normalization. Different repos may be used for the same artifact +even across a single package (for example, if two build scripts define +repositories in a different order). + +The artifact metadata is specified in a .pom file, and the artifacts +themselves are typically .jar files. The URL format is as follows: + +`////-[-].` + +For example: + +- `https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.pom` +- `https://oss.sonatype.org/content/groups/public/com/tobiasdiez/easybind/2.2.1-SNAPSHOT/easybind-2.2.1-20230117.075740-16.pom` + +Where: + +- `` is the repo base (`https://repo.maven.apache.org/maven2`) +- `` is the group ID with dots replaced with slashes + (`org.slf4j` -> `org/slf4j`) +- `` is the artifact ID (`slf4j-api`) +- `` is the artifact version (`2.0.9` for normal + artifacts, `2.2.1-SNAPSHOT` for snapshots) +- `` is the artifact version - can be either `` + or `--` (`2.0.9` for normal + artifacts, and either `2.2.1-SNAPSHOT` or `2.2.1-20230117.075740-16` + for snapshots) + - `` - `` without the `-SNAPSHOT` suffix + - `` - artifact build timestamp in the `YYYYMMDD.HHMMSS` + format (UTC) + - `` - a counter that's incremented by 1 for each new + snapshot build +- `` is an optional classifier for allowing a single .pom to + refer to multiple .jar files. .pom files don't have classifiers, as + they describe metadata. +- `` is the extension. .pom + +Note that the artifact ID can contain `-`, so you can't extract the +artifact ID and version from just the file name. + +Additionally, the files in the repository may have associated signature +files, formed by appending `.asc` to the filename, and hashsum files, +formed by appending `.md5` or `.sha1` to the filename. The signatures +are harmless, but the `.md5`/`.sha1` files are rejected. + +The reasoning is as follows - consider two files `a.jar` and `b.jar`, +that have the same hash. Gradle will fetch `a.jar.sha1`, find out that +it hasn't yet downloaded a file with this hash, and then fetch `a.jar`, +and finally download `b.jar.sha1`, locate it in its cache, and then +*not* download `b.jar`. This means `b.jar` won't be stored in the MITM +cache. Then, consider that on a later invocation, the fetching order +changed, whether it was because of a running on different system, +changed behavior after a Gradle update, or any other source of +nondeterminism - `b.jar` is fetched before `a.jar`. Gradle will first +fetch `b.jar.sha1`, not find it in its cache, attempt to fetch `b.jar`, +and fail, as the cache doesn't have that file. + +For the same reason, the proxy strips all checksum/etag headers. An +alternative would be to make the proxy remember previous checksums and +etags, but that would complicate the implementation - however, such a +feature can be implemented if necessary. Note that checksum/etag header +stripping is hardcoded, but `.md5/.sha1` file rejection is configured +via CLI arguments. + +**Caveat**: Gradle .module files also contain file hashes, in md5, sha1, +sha256, sha512 formats. It posed no problem as of yet, but it might in +the future. If it does pose problems, the deps derivation code can be +extended to find all checksums in .module files and copy existing files +there if their hash matches. + +## Snapshots + +Snapshots are a way to publish the very latest, unstable version of a +dependency that constantly changes. Any project that depends on a +snapshot will depend on this rolling version, rather than a fixed +version. It's easy to understand why this is a bad idea for reproducible +builds. Still, they can be dealt with by the logic in `gradle.fetchDeps` +and `gradle.updateDeps`. + +First, as you can see above, while normal artifacts have the same +`base-version` and `version`, for snapshots it usually (but not +necessarily) differs. + +Second, for figuring out where to download the snapshot, Gradle consults +`maven-metadata.xml`. With that in mind... + +## Maven Metadata + +(Reference: [Maven +Metadata](https://maven.apache.org/repositories/metadata.html), +[Metadata](https://maven.apache.org/ref/3.9.8/maven-repository-metadata/repository-metadata.html) + +Maven metadata files are called `maven-metadata.xml`. + +There are three levels of metadata: "G level", "A level", "V level", +representing group, artifact, or version metadata. + +G level metadata is currently unsupported. It's only used for Maven +plugins, which Gradle presumably doesn't use. + +A level metadata is used for getting the version list for an artifact. +It's an xml with the following items: + +- `` - group ID +- `` - artifact ID +- `` + - `` - the very latest base version (e.g. `2.2.1-SNAPSHOT`) + - `` - the latest non-snapshot version + - `` - the version list, each in a `` tag + - `` - the metadata update timestamp (UTC, + `YYYYMMDDHHMMSS`) + +V level metadata is used for listing the snapshot versions. It has the +following items: + +- `` - group ID +- `` - artifact ID +- `` + - `` - the metadata update timestamp (UTC, + `YYYYMMDDHHMMSS`) + - `` - info about the latest snapshot version + - `` - build timestamp (UTC, `YYYYMMDD.HHMMSS`) + - `` - build number + - `` - the list of all available snapshot file info, + each info is enclosed in a `` + - `` - classifier (optional) + - `` - file extension + - `` - snapshot version (as opposed to base version) + - `` - snapshot build timestamp (UTC, `YYYYMMDDHHMMSS`) + +## Lockfile Format + +The mitm-cache lockfile format is described in the [mitm-cache +README](https://github.com/chayleaf/mitm-cache#readme). + +The nixpkgs Gradle lockfile format is more complicated: + +```json +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames/gdx-controllers": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + } + } +} +``` + +`!comment` is a human-readable description explaining what the file is, +`!version` is the lockfile version (note that while it shares the name +with mitm-cache's `!version`, they don't actually have to be in sync and +can be bumped separately). + +The other keys are parts of a URL. Each URL is split into three parts. +They are joined like this: `/.`. + +Some URLs may have a `#` in them. In that case, the part after `#` is +parsed as `#/[/SNAPSHOT][/].` and +expanded into +`//-[-].`. + +Each URL has a value associated with it. The value may be: + +- an SRI hash (string) +- for `maven-metadata.xml` - an attrset containing the parts of the + metadata that can't be generated in Nix code (e.g. `groupId`, which is + challenging to parse from a URL because it's not always possible to + discern where the repo base ends and the group ID begins). + +`compress-deps-json.py` converts the JSON from mitm-cache format into +nixpkgs Gradle lockfile format. `fetch.nix` does the opposite. + +## Security Considerations + +Lockfiles won't be human-reviewed. They must be tampering-resistant. +That's why it's imperative that nobody can inject their own contents +into the lockfiles. + +This is achieved in a very simple way - the `deps.json` only contains +the following: + +- `maven-metadata.xml` URLs and small pieces of the contained metadata + (most of it will be generated in Nix, i.e. the area of injection is + minimal, and the parts that aren't generated in Nix are validated). +- artifact/other file URLs and associated hashes (Nix will complain if + the hash doesn't match, and Gradle won't even access the URL if it + doesn't match) + +Please be mindful of the above when working on Gradle support for +nixpkgs. diff --git a/pkgs/development/tools/build-managers/gradle/compress-deps-json.py b/pkgs/development/tools/build-managers/gradle/compress-deps-json.py new file mode 100644 index 000000000000..6397892835ad --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/compress-deps-json.py @@ -0,0 +1,163 @@ +import json +import sys + +from typing import Dict, Set + +# this compresses MITM URL lists with Gradle-specific optimizations +# specifically, it splits each url into up to 3 parts - they will be +# concatenated like part1/part2.part3 or part1.part2 +# part3 is simply always the file extension, but part1 and part2 is +# optimized using special heuristics +# additionally, if part2 ends with /a/b/{a}-{b}, the all occurences of +# /{a}/{b}/ are replaced with # +# finally, anything that ends with = is considered SHA256, anything that +# starts with http is considered a redirect URL, anything else is +# considered text + +with open(sys.argv[1], "rt") as f: + data: dict = json.load(f) + +new_data: Dict[str, Dict[str, Dict[str, dict]]] = {} + +for url, info in data.items(): + if url == "!version": + continue + ext, base = map(lambda x: x[::-1], url[::-1].split(".", 1)) + if base.endswith(".tar"): + base = base[:-4] + ext = "tar." + ext + # special logic for Maven repos + if ext in ["jar", "pom", "module"]: + comps = base.split("/") + if "-" in comps[-1]: + # convert base/name/ver/name-ver into base#name/ver + + filename = comps[-1] + name = comps[-3] + basever = comps[-2] + ver = basever + is_snapshot = ver.endswith("-SNAPSHOT") + if is_snapshot: + ver = ver.removesuffix("-SNAPSHOT") + if filename.startswith(f"{name}-{ver}"): + if is_snapshot: + if filename.startswith(f"{name}-{ver}-SNAPSHOT"): + ver += "-SNAPSHOT" + else: + ver += "-".join( + filename.removeprefix(f"{name}-{ver}").split("-")[:3] + ) + comp_end = comps[-1].removeprefix(f"{name}-{ver}") + else: + ver, name, comp_end = None, None, None + if name and ver and (not comp_end or comp_end.startswith("-")): + base = "/".join(comps[:-1]) + "/" + base = base.replace(f"/{name}/{basever}/", "#") + base += f"{name}/{ver}" + if is_snapshot: + base += "/SNAPSHOT" + if comp_end: + base += "/" + comp_end[1:] + scheme, rest = base.split("/", 1) + if scheme not in new_data.keys(): + new_data[scheme] = {} + if rest not in new_data[scheme].keys(): + new_data[scheme][rest] = {} + if "hash" in info.keys(): + new_data[scheme][rest][ext] = info["hash"] + elif "text" in info.keys() and ext == "xml": + # nix code in fetch-deps.nix will autogenerate metadata xml files groupId + # is part of the URL, but it can be tricky to parse as we don't know the + # exact repo base, so take it from the xml and pass it to nix + xml = "".join(info["text"].split()) + new_data[scheme][rest][ext] = { + "groupId": xml.split("")[1].split("")[0], + } + if "" in xml: + new_data[scheme][rest][ext]["release"] = xml.split("")[1].split( + "" + )[0] + if "" in xml: + latest = xml.split("")[1].split("")[0] + if latest != new_data[scheme][rest][ext].get("release"): + new_data[scheme][rest][ext]["latest"] = latest + if "" in xml: + new_data[scheme][rest][ext]["lastUpdated"] = xml.split("")[ + 1 + ].split("")[0] + else: + raise Exception("Unsupported key: " + repr(info)) + +# At this point, we have a map by part1 (initially the scheme), part2 (initially a +# slash-separated string without the scheme and with potential # substitution as +# seen above), extension. +# Now, push some segments from "part2" into "part1" like this: +# https # part1 +# domain1/b # part2 +# domain1/c +# domain2/a +# domain2/c +# -> +# https/domain1 # part1 +# b # part2 +# c +# https/domain2 # part1 +# a # part2 +# c +# This helps reduce the lockfile size because a Gradle project will usually use lots +# of files from a single Maven repo + +data = new_data +changed = True +while changed: + changed = False + new_data = {} + for part1, info1 in data.items(): + starts: Set[str] = set() + # by how many bytes the file size will be increased (roughly) + lose = 0 + # by how many bytes the file size will be reduced (roughly) + win = 0 + # how many different initial part2 segments there are + count = 0 + for part2, info2 in info1.items(): + if "/" not in part2: + # can't push a segment from part2 into part1 + count = 0 + break + st = part2.split("/", 1)[0] + if st not in starts: + lose += len(st) + 1 + count += 1 + starts.add(st) + win += len(st) + 1 + if count == 0: + new_data[part1] = info1 + continue + # only allow pushing part2 segments into path1 if *either*: + # - the domain isn't yet part of part1 + # - the initial part2 segment is always the same + if count != 1 and "." in part1: + new_data[part1] = info1 + continue + # some heuristics that may or may not work well (originally this was + # used when the above if wasn't here, but perhaps it's useless now) + lose += (count - 1) * max(0, len(part1) - 4) + if win > lose or ("." not in part1 and win >= lose): + changed = True + for part2, info2 in info1.items(): + st, part3 = part2.split("/", 1) + new_part1 = part1 + "/" + st + if new_part1 not in new_data.keys(): + new_data[new_part1] = {} + new_data[new_part1][part3] = info2 + else: + new_data[part1] = info1 + data = new_data + +new_data["!comment"] = "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual." # type: ignore +new_data["!version"] = 1 # type: ignore + +with open(sys.argv[2], "wt") as f: + json.dump(new_data, f, sort_keys=True, indent=1) + f.write("\n") diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 32bd64d2f0e3..7567b3e3dba1 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -130,6 +130,7 @@ rec { ''; }; }; + passthru.jdk = defaultJava; meta = with lib; { inherit platforms; @@ -179,4 +180,43 @@ rec { hash = "sha256-PiQCKFON6fGHcqV06ZoLqVnoPW7zUQFDgazZYxeBOJo="; defaultJava = jdk11; }; + + wrapGradle = { + lib, callPackage, mitm-cache, substituteAll, symlinkJoin, concatTextFile, makeSetupHook + }: + gradle-unwrapped: + lib.makeOverridable (args: + let + gradle = gradle-unwrapped.override args; + in symlinkJoin { + name = "gradle-${gradle.version}"; + + paths = [ + (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile { + name = "setup-hook.sh"; + files = [ + (mitm-cache.setupHook) + (substituteAll { + src = ./setup-hook.sh; + # jdk used for keytool + inherit (gradle) jdk; + init_script = ./init-build.gradle; + }) + ]; + })) + gradle + mitm-cache + ]; + + passthru = { + fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; }; + inherit (gradle) jdk; + }; + + meta = gradle.meta // { + # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook + # and passthru + priority = (gradle.meta.priority or 0) + 1; + }; + }) { }; } diff --git a/pkgs/development/tools/build-managers/gradle/fetch-deps.nix b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix new file mode 100644 index 000000000000..f4485609f65f --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/fetch-deps.nix @@ -0,0 +1,222 @@ +{ mitm-cache +, lib +, pkgs +, stdenv +, callPackage +}: + +let + getPkg = attrPath: + lib.getAttrFromPath + (lib.splitString "." (toString attrPath)) + pkgs; +in +# the derivation to fetch/update deps for +{ pkg ? getPkg attrPath +, pname ? null +, attrPath ? pname +# bwrap flags for the update script (this will be put in bash as-is) +# this is relevant for downstream users +, bwrapFlags ? "--ro-bind \"$PWD\" \"$PWD\"" +# deps path (relative to the package directory, or absolute) +, data +# redirect stdout to stderr to allow the update script to be used with update script combinators +, silent ? true +, useBwrap ? stdenv.isLinux +} @ attrs: + +let + data' = builtins.removeAttrs + (if builtins.isPath data then lib.importJSON data + else if builtins.isString data then lib.importJSON "${dirOf pkg.meta.position}/${data}" + else data) + [ "!comment" "!version" ]; + + parseArtifactUrl = url: let + extension = lib.last (lib.splitString "." url); + splitUrl = lib.splitString "/" url; + artifactId = builtins.elemAt splitUrl (builtins.length splitUrl - 3); + baseVer = builtins.elemAt splitUrl (builtins.length splitUrl - 2); + filename = builtins.elemAt splitUrl (builtins.length splitUrl - 1); + filenameNoExt = lib.removeSuffix ".${extension}" filename; + verCls = lib.removePrefix "${artifactId}-" filenameNoExt; + in rec { + inherit artifactId baseVer filename extension; + isSnapshot = lib.hasSuffix "-SNAPSHOT" baseVer; + version = + if isSnapshot && !lib.hasPrefix "SNAPSHOT" verCls + then builtins.concatStringsSep "-" (lib.take 3 (lib.splitString "-" verCls)) + else baseVer; + classifier = + if verCls == version then null + else lib.removePrefix "${version}-" verCls; + # for snapshots + timestamp = builtins.elemAt (lib.splitString "-" version) 1; + buildNum = builtins.elemAt (lib.splitString "-" version) 2; + }; + + parseMetadataUrl = url: let + xmlBase = lib.removeSuffix "/maven-metadata.xml" url; + vMeta = lib.hasSuffix "-SNAPSHOT" xmlBase; + splitBase = lib.splitString "/" xmlBase; + in + if vMeta then { + vMeta = true; + baseVer = builtins.elemAt splitBase (builtins.length splitBase - 1); + artifactId = builtins.elemAt splitBase (builtins.length splitBase - 2); + } else { + vMeta = false; + baseVer = null; + artifactId = builtins.elemAt splitBase (builtins.length splitBase - 1); + }; + + extractHashArtifact = afterHash: let + nameVer = builtins.match "([^/]*)/([^/]*)(/SNAPSHOT)?(/.*)?" afterHash; + artifactId = builtins.elemAt nameVer 0; + version = builtins.elemAt nameVer 1; + isSnapshot = builtins.elemAt nameVer 2 != null; + cls = builtins.elemAt nameVer 3; + in rec { + inherit artifactId version isSnapshot; + baseVer = + if !isSnapshot then version + else builtins.head (builtins.match "(.*)-([^-]*)-([^-]*)" version) + "-SNAPSHOT"; + classifier = + if cls == null then null + else lib.removePrefix "/" cls; + clsSuf = + if classifier == null then "" + else "-${classifier}"; + }; + + # replace base#name/ver with base/name/ver/name-ver + decompressNameVer = prefix: let + splitHash = lib.splitString "#" (builtins.concatStringsSep "/" prefix); + inherit (extractHashArtifact (lib.last splitHash)) artifactId baseVer version clsSuf; + in + if builtins.length splitHash == 1 then builtins.head splitHash + else builtins.concatStringsSep "/${artifactId}/${baseVer}/" (lib.init splitHash ++ [ "${artifactId}-${version}${clsSuf}" ]); + + # `visit` all elements in attrs and merge into a set + # attrs will be passed as parent1, parent1 will be passed as parent2 + visitAttrs = parent1: prefix: attrs: + builtins.foldl' + (a: b: a // b) + {} + (lib.mapAttrsToList (visit parent1 attrs prefix) attrs); + + # convert a compressed deps.json into an uncompressed json used for mitm-cache.fetch + visit = parent2: parent1: prefix: k: v: + # groupId being present means this is a metadata xml "leaf" and we shouldn't descend further + if builtins.isAttrs v && !v?groupId + then visitAttrs parent1 (prefix ++ [k]) v + else let + url = "${decompressNameVer prefix}.${k}"; + in { + ${url} = + if builtins.isString v then { hash = v; } + else { + text = let + xmlBase = lib.removeSuffix "/maven-metadata.xml" url; + meta = parseMetadataUrl url // v; + inherit (meta) groupId vMeta artifactId baseVer; + + fileList = builtins.filter (x: lib.hasPrefix xmlBase x && x != url) (builtins.attrNames finalData); + jarPomList = map parseArtifactUrl fileList; + sortedJarPomList = + lib.sort + (a: b: lib.splitVersion a.version < lib.splitVersion b.version) + jarPomList; + + uniqueVersionFiles = + builtins.map ({ i, x }: x) + (builtins.filter ({ i, x }: i == 0 || (builtins.elemAt sortedJarPomList (i - 1)).version != x.version) + (lib.imap0 (i: x: { inherit i x; }) sortedJarPomList)); + uniqueVersions' = map (x: x.version) uniqueVersionFiles; + releaseVersions = map (x: x.version) (builtins.filter (x: !x.isSnapshot) uniqueVersionFiles); + latestVer = v.latest or v.release or (lib.last uniqueVersions'); + releaseVer = v.release or (lib.last releaseVersions); + + # The very latest version isn't necessarily used by Gradle, so it may not be present in the MITM data. + # In order to generate better metadata xml, if the latest version is known but wasn't fetched by Gradle, + # add it anyway. + uniqueVersions = + uniqueVersions' + ++ lib.optional (!builtins.elem releaseVer uniqueVersions') releaseVer + ++ lib.optional (!builtins.elem latestVer uniqueVersions' && releaseVer != latestVer) latestVer; + + lastUpdated = v.lastUpdated or + (if vMeta then builtins.replaceStrings ["."] [""] snapshotTs + else "20240101123456"); + + # the following are only used for snapshots + snapshotTsAndNum = lib.splitString "-" latestVer; + snapshotTs = builtins.elemAt snapshotTsAndNum 1; + snapshotNum = lib.last snapshotTsAndNum; + + indent = x: s: builtins.concatStringsSep "\n" (map (s: x + s) (lib.splitString "\n" s)); + containsSpecialXmlChars = s: builtins.match ''.*[<>"'&].*'' s != null; + in + # make sure all user-provided data is safe + assert lib.hasInfix "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}" url; + assert !containsSpecialXmlChars groupId; + assert !containsSpecialXmlChars lastUpdated; + if vMeta then '' + + + ${groupId} + ${artifactId} + ${baseVer} + + + ${snapshotTs} + ${snapshotNum} + + ${lastUpdated} + + ${builtins.concatStringsSep "\n" (map (x: indent " " '' + ${ + lib.optionalString + (x.classifier != null) + "\n ${x.classifier}" + } + ${x.extension} + ${x.version} + ${builtins.replaceStrings ["."] [""] x.timestamp} + '') sortedJarPomList)} + + + + '' + else + assert !containsSpecialXmlChars latestVer; + assert !containsSpecialXmlChars releaseVer; + '' + + + ${groupId} + ${artifactId} + + ${latestVer} + ${releaseVer} + + ${builtins.concatStringsSep "\n" (map (x: " ${x}") uniqueVersions)} + + ${lastUpdated} + + + ''; + }; + }; + + finalData = visitAttrs {} [] data'; +in + mitm-cache.fetch { + name = "${pkg.pname or pkg.name}-deps"; + data = finalData // { "!version" = 1; }; + passthru = lib.optionalAttrs (!builtins.isAttrs data) { + updateScript = callPackage ./update-deps.nix { } { + inherit pkg pname attrPath bwrapFlags data silent useBwrap; + }; + }; + } diff --git a/pkgs/development/tools/build-managers/gradle/init-build.gradle b/pkgs/development/tools/build-managers/gradle/init-build.gradle new file mode 100644 index 000000000000..3c3ee8162449 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/init-build.gradle @@ -0,0 +1,8 @@ +gradle.projectsLoaded { + rootProject.allprojects { + tasks.withType(AbstractArchiveTask) { + preserveFileTimestamps = false + reproducibleFileOrder = true + } + } +} diff --git a/pkgs/development/tools/build-managers/gradle/init-deps.gradle b/pkgs/development/tools/build-managers/gradle/init-deps.gradle new file mode 100644 index 000000000000..2cb577efaec9 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/init-deps.gradle @@ -0,0 +1,10 @@ +gradle.projectsLoaded { + rootProject.allprojects { + task nixDownloadDeps { + doLast { + configurations.findAll{it.canBeResolved}.each{it.resolve()} + buildscript.configurations.findAll{it.canBeResolved}.each{it.resolve()} + } + } + } +} diff --git a/pkgs/development/tools/build-managers/gradle/setup-hook.sh b/pkgs/development/tools/build-managers/gradle/setup-hook.sh new file mode 100644 index 000000000000..a16742414b12 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/setup-hook.sh @@ -0,0 +1,70 @@ +gradleConfigureHook() { + if [ -z "${GRADLE_USER_HOME-}" ]; then + GRADLE_USER_HOME="$(mktemp -d)" + fi + export GRADLE_USER_HOME + export TERM=dumb + gradleFlagsArray+=(--no-daemon --console plain --init-script "${gradleInitScript:-@init_script@}") + if [ -n "${MITM_CACHE_CA-}" ]; then + if [ -z "${MITM_CACHE_KEYSTORE-}" ]; then + MITM_CACHE_KEYSTORE="$MITM_CACHE_CERT_DIR/keystore" + MITM_CACHE_KS_PWD="$(head -c10 /dev/random | base32)" + echo y | @jdk@/bin/keytool -importcert -file "$MITM_CACHE_CA" -alias alias -keystore "$MITM_CACHE_KEYSTORE" -storepass "$MITM_CACHE_KS_PWD" + fi + gradleFlagsArray+=(-Dhttp.proxyHost="$MITM_CACHE_HOST" -Dhttp.proxyPort="$MITM_CACHE_PORT") + gradleFlagsArray+=(-Dhttps.proxyHost="$MITM_CACHE_HOST" -Dhttps.proxyPort="$MITM_CACHE_PORT") + gradleFlagsArray+=(-Djavax.net.ssl.trustStore="$MITM_CACHE_KEYSTORE" -Djavax.net.ssl.trustStorePassword="$MITM_CACHE_KS_PWD") + else + gradleFlagsArray+=(--offline) + fi + if ! [[ -v enableParallelBuilding ]]; then + enableParallelBuilding=1 + fi + if ! [[ -v enableParallelChecking ]]; then + enableParallelChecking=1 + fi + if ! [[ -v enableParallelUpdating ]]; then + enableParallelUpdating=1 + fi +} + +gradle() { + command gradle $gradleFlags "${gradleFlagsArray[@]}" "$@" +} + +gradleBuildPhase() { + runHook preBuild + + gradle ${enableParallelBuilding:+--parallel} ${gradleBuildTask:-assemble} + + runHook postBuild +} + +gradleCheckPhase() { + runHook preCheck + + gradle ${enableParallelChecking:+--parallel} ${gradleCheckTask:-test} + + runHook postCheck +} + +gradleUpdateScript() { + runHook preBuild + runHook preGradleUpdate + + gradle ${enableParallelUpdating:+--parallel} ${gradleUpdateTask:-nixDownloadDeps} + + runHook postGradleUpdate +} + +if [ -z "${dontUseGradleConfigure-}" ]; then + preConfigureHooks+=(gradleConfigureHook) +fi + +if [ -z "${dontUseGradleBuild-}" ] && [ -z "${buildPhase-}" ]; then + buildPhase=gradleBuildPhase +fi + +if [ -z "${dontUseGradleCheck-}" ] && [ -z "${checkPhase-}" ]; then + checkPhase=gradleCheckPhase +fi diff --git a/pkgs/development/tools/build-managers/gradle/update-deps.nix b/pkgs/development/tools/build-managers/gradle/update-deps.nix new file mode 100644 index 000000000000..5d6222fb11c4 --- /dev/null +++ b/pkgs/development/tools/build-managers/gradle/update-deps.nix @@ -0,0 +1,122 @@ +{ lib +, runtimeShell +, srcOnly +, writeTextFile +, writeShellScript +, path +, bubblewrap +, coreutils +, curl +, jq +, mitm-cache +, nix +, openssl +, procps +, python3 +}: + +lib.makeOverridable +({ pkg, pname, attrPath, bwrapFlags, data, silent, useBwrap }: +let + keep = [ "MITM_CACHE_HOST" "MITM_CACHE_PORT" "MITM_CACHE_ADDRESS" "MITM_CACHE_CA" "MITM_CACHE_CERT_DIR" ]; + gradleScript = writeShellScript "gradle-commands.sh" '' + set -eo pipefail + export http_proxy="$MITM_CACHE_ADDRESS" + export https_proxy="$MITM_CACHE_ADDRESS" + export SSL_CERT_FILE="$MITM_CACHE_CA" + export NIX_SSL_CERT_FILE="$MITM_CACHE_CA" + export GRADLE_USER_HOME="$(${coreutils}/bin/mktemp -d)" + export IN_GRADLE_UPDATE_DEPS=1 + trap "${coreutils}/bin/rm -rf '$GRADLE_USER_HOME'" SIGINT SIGTERM ERR EXIT + cd "$(${coreutils}/bin/mktemp -d)" + ${coreutils}/bin/mkdir out + export out="$PWD/out" + trap "${coreutils}/bin/rm -rf '$PWD'" SIGINT SIGTERM ERR EXIT + source "$stdenv/setup" + phases="''${prePhases[*]:-} unpackPhase patchPhase ''${preConfigurePhases[*]:-} configurePhase gradleUpdateScript" genericBuild + ''; + source = srcOnly (pkg.overrideAttrs (old: { + mitmCache = ""; + gradleInitScript = ./init-deps.gradle; + })); + sourceDrvPath = builtins.unsafeDiscardOutputDependency source.drvPath; + nixShellKeep = lib.concatMapStringsSep " " (x: "--keep ${x}") keep; +in +writeTextFile { + name = "fetch-deps.sh"; + executable = true; + # see pkgs/common-updater/combinators.nix + derivationArgs.passthru = + { supportedFeatures = lib.optional silent "silent"; } + // lib.optionalAttrs (attrPath != null) { inherit attrPath; }; + text = '' + #!${runtimeShell} + set -eo pipefail + export PATH="${lib.makeBinPath [ + bubblewrap coreutils curl jq mitm-cache openssl + procps python3.pkgs.ephemeral-port-reserve + ]}:$PATH" + outPath="${ + # if this is an absolute path in nix store, use path relative to the store path + if lib.hasPrefix "${builtins.storeDir}/" (toString data) + then builtins.concatStringsSep "/" (lib.drop 1 (lib.splitString "/" (lib.removePrefix "${builtins.storeDir}/" (toString data)))) + # if this is an absolute path anywhere else, just use that path + else if lib.hasPrefix "/" (toString data) + then toString data + # otherwise, use a path relative to the package + else "${dirOf pkg.meta.position}/${data}" + }" + + pushd "$(mktemp -d)" >/dev/null + MITM_CACHE_DIR="$PWD" + trap "rm -rf '$MITM_CACHE_DIR'" SIGINT SIGTERM ERR EXIT + openssl genrsa -out ca.key 2048 + openssl req -x509 -new -nodes -key ca.key -sha256 -days 1 -out ca.cer -subj "/C=AL/ST=a/L=a/O=a/OU=a/CN=example.org" + export MITM_CACHE_HOST=127.0.0.1 + export MITM_CACHE_PORT="''${mitmCachePort:-$(ephemeral-port-reserve "$MITM_CACHE_HOST")}" + export MITM_CACHE_ADDRESS="$MITM_CACHE_HOST:$MITM_CACHE_PORT" + # forget all redirects - this makes the lockfiles predictable + # not only does this strip CDN URLs, but it also improves security - since the redirects aren't + # stored in the lockfile, a malicious actor can't change the redirect URL stored in the lockfile + mitm-cache \ + -l"$MITM_CACHE_ADDRESS" \ + record \ + --reject '\.(md5|sha(1|256|512:?):?)$' \ + --forget-redirects-from '.*' \ + --record-text '/maven-metadata\.xml$' >/dev/null 2>/dev/null & + MITM_CACHE_PID="$!" + # wait for mitm-cache to fully start + for i in {0..20}; do + ps -p "$MITM_CACHE_PID" >/dev/null || (echo "Failed to start mitm-cache" && exit 1) + curl -so/dev/null "$MITM_CACHE_ADDRESS" && break + [[ "$i" -eq 20 ]] && (echo "Failed to start mitm-cache" && exit 1) + sleep 0.5 + done + trap "kill '$MITM_CACHE_PID'" SIGINT SIGTERM ERR EXIT + export MITM_CACHE_CERT_DIR="$PWD" + export MITM_CACHE_CA="$MITM_CACHE_CERT_DIR/ca.cer" + popd >/dev/null + useBwrap="''${USE_BWRAP:-${toString useBwrap}}" + if [ -n "$useBwrap" ]; then + # bwrap isn't necessary, it's only used to prevent messy build scripts from touching ~ + bwrap \ + --unshare-all --share-net --clearenv --chdir / --setenv HOME /homeless-shelter \ + --tmpfs /home --bind /tmp /tmp --ro-bind /nix /nix --ro-bind /run /run --proc /proc --dev /dev \ + --ro-bind ${toString path} ${toString path} --bind "$MITM_CACHE_CERT_DIR" "$MITM_CACHE_CERT_DIR" \ + ${builtins.concatStringsSep " " (map (x: "--setenv ${x} \"\$${x}\"") keep)} \ + --setenv NIX_BUILD_SHELL bash ${bwrapFlags} ''${BWRAP_FLAGS:-} \ + -- ${nix}/bin/nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath} + else + NIX_BUILD_SHELL=bash nix-shell --pure --run ${gradleScript} ${nixShellKeep} ${sourceDrvPath} + fi${lib.optionalString silent " >&2"} + kill -s SIGINT "$MITM_CACHE_PID" + for i in {0..20}; do + # check for valid json + if jq -e 1 "$MITM_CACHE_DIR/out.json" >/dev/null 2>/dev/null; then + exec ${python3.interpreter} ${./compress-deps-json.py} "$MITM_CACHE_DIR/out.json" "$outPath" + fi + sleep 1 + done + exit 1 + ''; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d26f1cdcd4af..1f6c9df2fc42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18575,10 +18575,17 @@ with pkgs; inherit jdk11 jdk17 jdk21; }; gradleGen = gradle-packages.gen; - gradle_6 = callPackage gradle-packages.gradle_6 { }; - gradle_7 = callPackage gradle-packages.gradle_7 { }; - gradle_8 = callPackage gradle-packages.gradle_8 { }; - gradle = gradle_8; + wrapGradle = callPackage gradle-packages.wrapGradle { }; + + gradle_6-unwrapped = callPackage gradle-packages.gradle_6 { }; + gradle_7-unwrapped = callPackage gradle-packages.gradle_7 { }; + gradle_8-unwrapped = callPackage gradle-packages.gradle_8 { }; + gradle-unwrapped = gradle_8-unwrapped; + + gradle_6 = wrapGradle gradle_6-unwrapped; + gradle_7 = wrapGradle gradle_7-unwrapped; + gradle_8 = wrapGradle gradle_8-unwrapped; + gradle = wrapGradle gradle-unwrapped; grcov = callPackage ../development/tools/misc/grcov { }; From 27d8261b6d9e72d6fbaad5e18c87b9ba394e4e39 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sun, 30 Jun 2024 13:06:26 +0700 Subject: [PATCH 064/227] openjfx: move derivations into separate dirs --- .../openjdk/openjfx/{11.nix => 11/default.nix} | 0 .../openjdk/openjfx/{15.nix => 15/default.nix} | 0 .../openjdk/openjfx/{17.nix => 17/default.nix} | 0 .../openjdk/openjfx/{19.nix => 19/default.nix} | 0 .../openjdk/openjfx/{20.nix => 20/default.nix} | 0 .../openjdk/openjfx/{21.nix => 21/default.nix} | 0 .../openjdk/openjfx/{22.nix => 22/default.nix} | 0 pkgs/top-level/java-packages.nix | 14 +++++++------- 8 files changed, 7 insertions(+), 7 deletions(-) rename pkgs/development/compilers/openjdk/openjfx/{11.nix => 11/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{15.nix => 15/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{17.nix => 17/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{19.nix => 19/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{20.nix => 20/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{21.nix => 21/default.nix} (100%) rename pkgs/development/compilers/openjdk/openjfx/{22.nix => 22/default.nix} (100%) diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/11.nix rename to pkgs/development/compilers/openjdk/openjfx/11/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/15.nix rename to pkgs/development/compilers/openjdk/openjfx/15/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/17.nix rename to pkgs/development/compilers/openjdk/openjfx/17/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/19.nix b/pkgs/development/compilers/openjdk/openjfx/19/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/19.nix rename to pkgs/development/compilers/openjdk/openjfx/19/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/20.nix b/pkgs/development/compilers/openjdk/openjfx/20/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/20.nix rename to pkgs/development/compilers/openjdk/openjfx/20/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/21.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/21.nix rename to pkgs/development/compilers/openjdk/openjfx/21/default.nix diff --git a/pkgs/development/compilers/openjdk/openjfx/22.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix similarity index 100% rename from pkgs/development/compilers/openjdk/openjfx/22.nix rename to pkgs/development/compilers/openjdk/openjfx/22/default.nix diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index c80d6c28f840..fcea99ac50f9 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -3,13 +3,13 @@ with pkgs; let - openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11.nix { }; - openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15.nix { }; - openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17.nix { }; - openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19.nix { }; - openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20.nix { }; - openjfx21 = callPackage ../development/compilers/openjdk/openjfx/21.nix { }; - openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22.nix { }; + openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11 { }; + openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15 { }; + openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17 { }; + openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19 { }; + openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20 { }; + openjfx21 = callPackage ../development/compilers/openjdk/openjfx/21 { }; + openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22 { }; in { inherit openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22; From e6f8a3babaadc3e1560e5143610cf1098fee4a77 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sun, 30 Jun 2024 13:07:05 +0700 Subject: [PATCH 065/227] openjfx: convert to gradle setup hook --- .../compilers/openjdk/openjfx/11/default.nix | 138 ++++++--------- .../compilers/openjdk/openjfx/11/deps.json | 152 +++++++++++++++++ .../compilers/openjdk/openjfx/15/default.nix | 127 +++++--------- .../compilers/openjdk/openjfx/15/deps.json | 92 ++++++++++ .../compilers/openjdk/openjfx/17/default.nix | 130 +++++--------- .../compilers/openjdk/openjfx/17/deps.json | 152 +++++++++++++++++ .../compilers/openjdk/openjfx/19/default.nix | 160 +++++++----------- .../compilers/openjdk/openjfx/19/deps.json | 152 +++++++++++++++++ .../compilers/openjdk/openjfx/20/default.nix | 134 +++++---------- .../compilers/openjdk/openjfx/20/deps.json | 152 +++++++++++++++++ .../compilers/openjdk/openjfx/21/default.nix | 134 +++++---------- .../compilers/openjdk/openjfx/21/deps.json | 152 +++++++++++++++++ .../compilers/openjdk/openjfx/22/default.nix | 114 +++++-------- .../compilers/openjdk/openjfx/22/deps.json | 152 +++++++++++++++++ 14 files changed, 1336 insertions(+), 605 deletions(-) create mode 100644 pkgs/development/compilers/openjdk/openjfx/11/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/15/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/17/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/19/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/20/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/21/deps.json create mode 100644 pkgs/development/compilers/openjdk/openjfx/22/deps.json diff --git a/pkgs/development/compilers/openjdk/openjfx/11/default.nix b/pkgs/development/compilers/openjdk/openjfx/11/default.nix index 22b844bb1d67..58bd8678c0de 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11/default.nix @@ -1,107 +1,71 @@ -{ stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand +{ stdenv, lib, pkgs, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby , openjdk11-bootstrap , withMedia ? true , withWebKit ? false }: let + pname = "openjfx-modular-sdk"; major = "11"; update = ".0.20"; build = "1"; repover = "${major}${update}+${build}"; - gradle_ = (gradle_7.override { - java = openjdk11-bootstrap; - }); + jdk = openjdk11-bootstrap; + gradle = gradle_7; - icuVersionWithSep = s: "71${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}-${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}-${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx${major}u"; - rev = repover; - sha256 = "sha256-BbBP2DiPZTSn1SBYMCgyiNdF9GD+NqR6YjeVNOQHHn4="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - substituteInPlace buildSrc/linux.gradle \ - --replace ', "-Werror=implicit-function-declaration"' "" - - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include ' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk11-bootstrap.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa9="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx${major}u"; + rev = repover; + sha256 = "sha256-BbBP2DiPZTSn1SBYMCgyiNdF9GD+NqR6YjeVNOQHHn4="; }; -in makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + substituteInPlace buildSrc/linux.gradle \ + --replace ', "-Werror=implicit-function-declaration"' "" + + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -110,18 +74,16 @@ in makePackage { postFixup = '' # Remove references to bootstrap. + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11-bootstrap}[^:]*,,')" + new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done - # Remove licenses, otherwise they may conflict with the ones included in the openjdk rm -rf $out/modules_legal/* ''; - disallowedReferences = [ openjdk11-bootstrap ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; # Uses a lot of RAM, OOMs otherwise requiredSystemFeatures = [ "big-parallel" ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/11/deps.json b/pkgs/development/compilers/openjdk/openjfx/11/deps.json new file mode 100644 index 000000000000..7c8167124430 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/11/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { + "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.1.0": { + "jar": "sha256-vG3+7tCrp0MCqSCBH/1snkVlvviTzMOvg2Iz36s8UTo=", + "pom": "sha256-d7ysnMSDKiKSGJgng2ASB8yYvldcyIRDNtWuBzkbPuE=" + }, + "org/apache/lucene#lucene-grouping/7.1.0": { + "jar": "sha256-5wh/sGDRWa1xvW7p6W8BYGpaM1OgxJofHQ49oPUaTlo=", + "pom": "sha256-738k/3YjlZSfxMiDl1npJhD8mx8Nifmbtw+haHNh2Ec=" + }, + "org/apache/lucene#lucene-parent/7.1.0": { + "pom": "sha256-l7M9mcedTRIoIuWDY0cGvGmfRCvp3tksZiKdEn+WoAc=" + }, + "org/apache/lucene#lucene-queries/7.1.0": { + "jar": "sha256-qamOR/ueclsDerV+wZts4QVBIoTLXl2aGs99Xv8TSTY=", + "pom": "sha256-pvMWrRvMdKy3f3mP/AIKy9aD3nx5OUrFNgAdE6vktVY=" + }, + "org/apache/lucene#lucene-queryparser/7.1.0": { + "jar": "sha256-HNuCsiqq3bGJW9OjSVinyaOgb/0NZ6sskNvDegRshlQ=", + "pom": "sha256-K7m67AcL6g3a5aj1rrDOZlJpBeA4THS+18OrIJ52hdM=" + }, + "org/apache/lucene#lucene-sandbox/7.1.0": { + "jar": "sha256-wZA9Xag+IIZp2NkzdJeeFAIUNYsq32c1sa488kkJW+E=", + "pom": "sha256-WL5E6wSMD0If6eul+30xhr7gk7g72F4w5EKbbctVZMU=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.1.0": { + "pom": "sha256-3NW0Q/KK2QPk/wfTMigGxTF4BWuctNQU+2gMyArhGsU=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/15/default.nix b/pkgs/development/compilers/openjdk/openjfx/15/default.nix index 77c8e4678d6c..bc032a349a76 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_6 +{ stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk11_headless, gradle_6 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib , ffmpeg_4-headless, python3, ruby , withMedia ? true @@ -6,115 +6,80 @@ }: let + pname = "openjfx-modular-sdk"; major = "15"; update = ".0.1"; build = "+1"; repover = "${major}${update}${build}"; - gradle_ = (gradle_6.override { - java = openjdk11_headless; - }); + jdk = openjdk11_headless; + gradle = gradle_6; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx"; - rev = repover; - sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk11_headless.home} - '' + args.gradleProperties or ""); - - env.NIX_CFLAGS_COMPILE = toString [ - #avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. - "-DGLIB_DISABLE_DEPRECATION_WARNINGS" - - # gstreamer workaround for -fno-common toolchains: - # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of - # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here - "-fcommon" - ]; - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-fGLTMM9s/Vn7eMzn6OQR3tL0cGbAYc7c4J4/aW3JvkI="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + sha256 = "019glq8rhn6amy3n5jc17vi2wpf1pxpmmywvyz1ga8n09w7xscq1"; }; -in makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + # avoids errors about deprecation of GTypeDebugFlags, GTimeVal, etc. + export NIX_CFLAGS_COMPILE="-DGLIB_DISABLE_DEPRECATION_WARNINGS $NIX_CFLAGS_COMPILE" + # gstreamer workaround for -fno-common toolchains: + # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of + # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here + export NIX_CFLAGS_COMPILE="-fcommon $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; - # glib-2.62 deprecations - # -fcommon: gstreamer workaround for -fno-common toolchains: - # ld: gsttypefindelement.o:(.bss._gst_disable_registry_cache+0x0): multiple definition of - # `_gst_disable_registry_cache'; gst.o:(.bss._gst_disable_registry_cache+0x0): first defined here - env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS -fcommon"; - stripDebugList = [ "." ]; postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk11_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk11_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/15/deps.json b/pkgs/development/compilers/openjdk/openjfx/15/deps.json new file mode 100644 index 000000000000..efc8ffa4331f --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/15/deps.json @@ -0,0 +1,92 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.8.2": { + "jar": "sha256-oqosO7K3LadsPmpxUx8e79w1BJSBm68rHYDXFG4CD54=", + "pom": "sha256-3znTTR9YMLLYqSeQxmtXmDWLCz4BRS3IWzciqIGtkj4=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.2": { + "jar": "sha256-gUOKydZ4BQxUbSqEEsxyg6XSD9hcNxQhhEfHWBZZT10=", + "pom": "sha256-MPuqRu1exVS+3nILqReeEqTnQVHh+IaSBJbYREuwVZE=" + }, + "org/apache/lucene#lucene-grouping/7.7.2": { + "jar": "sha256-nKhrWw/YSbq50xpk7RvP8cdTGrHP1z/E/tJDBmX7rUo=", + "pom": "sha256-UezgO9APIm2uObABf5OZPPfXbSju8LQl+MzborrBs3w=" + }, + "org/apache/lucene#lucene-parent/7.7.2": { + "pom": "sha256-fXiTJSgZw4Sx0lvUA6Go85DYUF+VQOHigRcZymjP7zQ=" + }, + "org/apache/lucene#lucene-queries/7.7.2": { + "jar": "sha256-n8XsO17OwtKV0/xM+Dc5LfuWntYegaMr0/3SH4DbfHk=", + "pom": "sha256-D4rAB9QDQb6gD3/s7m1Ewu7ZXQTi66KEf2CBJJLOcoQ=" + }, + "org/apache/lucene#lucene-queryparser/7.7.2": { + "jar": "sha256-v9lKUL8FAf0H5prk9J28FJzjaUoFZrsWTXxui+VeK9Q=", + "pom": "sha256-DmVV70KT9yjEqJhOuuNUK+N7KThK/gcQjPy+R/AS3Us=" + }, + "org/apache/lucene#lucene-sandbox/7.7.2": { + "jar": "sha256-dqY72JMAjr7tJJeePyUIXIkJ/0vEEv33iAJfntoKvhE=", + "pom": "sha256-zwJCiBB2rdYRwEPZZPtrduPRnAQn7/r/Qhc6ZQ+Bk5s=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.2": { + "pom": "sha256-a0oZeEo3uKoSdf5mCEZKHZvSlLVv6WgRIgfkDEKETqc=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/17/default.nix b/pkgs/development/compilers/openjdk/openjfx/17/default.nix index 00fa6af725e5..b61ad29c4a85 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17/default.nix @@ -1,104 +1,68 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 +{ stdenv, lib, pkgs, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4-headless, python3, ruby, fetchurl, runCommand +, ffmpeg_4-headless, python3, ruby , withMedia ? true , withWebKit ? false }: let + pname = "openjfx-modular-sdk"; major = "17"; update = ".0.11"; build = "-ga"; repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - java = openjdk17_headless; - }); + jdk = openjdk17_headless; + gradle = gradle_7; - icuVersionWithSep = s: "71${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx${major}u"; - rev = repover; - sha256 = "sha256-WV8NHlYlt7buGbirLSorLnS2TnyBD17zUquFfwSL3xE="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include ' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk17_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx${major}u"; + rev = repover; + sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="; }; -in makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -107,16 +71,14 @@ in makePackage { postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk17_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk17_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "http://openjdk.java.net/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/17/deps.json b/pkgs/development/compilers/openjdk/openjfx/17/deps.json new file mode 100644 index 000000000000..a9fa40a91be1 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/17/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { + "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/19/default.nix b/pkgs/development/compilers/openjdk/openjfx/19/default.nix index 38720efaba54..4aaf71114f59 100644 --- a/pkgs/development/compilers/openjdk/openjfx/19/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/19/default.nix @@ -1,121 +1,81 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, writeText, openjdk17_headless +{ stdenv, lib, pkgs, fetchFromGitHub, fetchpatch, writeText , openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby , withMedia ? true , withWebKit ? false }: let + pname = "openjfx-modular-sdk"; major = "19"; update = ".0.2.1"; build = "+1"; repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - # note: gradle does not yet support running on 19 - java = openjdk17_headless; - }); + jdk = openjdk19_headless; + gradle = gradle_7; - icuVersionWithSep = s: "68${s}2"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "."}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-ieQCLBTNrskuf8j3IUQS3QLIAQzLom/O58muMP363Lw="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx"; - rev = repover; - hash = "sha256-A08GhCGpzWlUG1+f6mcjvkJmMNaOReacQKPEmNpUvLs="; - }; - - patches = [ - # 8295962: Reference to State in Task.java is ambiguous when building with JDK 19 - (fetchpatch { - url = "https://github.com/openjdk/jfx/pull/933/commits/cfaee2a52350eff39dd4352484c892716076d3de.patch"; - hash = "sha256-hzJMenhvtmHs/6BJj8GfaLp14myV8VCXCLLC8n32yEw="; - }) - # ditto - (fetchpatch { - url = "https://github.com/openjdk/jfx/pull/933/commits/bd46ce12df0a93a56fe0d58d3653d08e58409b7f.patch"; - hash = "sha256-o9908uw9vYvULmAh/lbfyHhgxz6jpgPq2fcAltWsYoU="; - }) - ]; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include ' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk19_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # suspiciously the same as for openjfx 17 ... - # could they really not have changed any of their dependencies? - # or did we miss changing another upstream hash when copy-pasting? - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx"; + rev = repover; + hash = "sha256-A08GhCGpzWlUG1+f6mcjvkJmMNaOReacQKPEmNpUvLs="; }; -in makePackage { - pname = "openjfx-modular-sdk"; + patches = [ + # 8295962: Reference to State in Task.java is ambiguous when building with JDK 19 + (fetchpatch { + url = "https://github.com/openjdk/jfx/pull/933/commits/cfaee2a52350eff39dd4352484c892716076d3de.patch"; + hash = "sha256-hzJMenhvtmHs/6BJj8GfaLp14myV8VCXCLLC8n32yEw="; + }) + # ditto + (fetchpatch { + url = "https://github.com/openjdk/jfx/pull/933/commits/bd46ce12df0a93a56fe0d58d3653d08e58409b7f.patch"; + hash = "sha256-o9908uw9vYvULmAh/lbfyHhgxz6jpgPq2fcAltWsYoU="; + }) + ]; - gradleProperties = '' + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; + + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -124,16 +84,14 @@ in makePackage { postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk19_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk17_headless openjdk19_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "https://openjdk.org/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/19/deps.json b/pkgs/development/compilers/openjdk/openjfx/19/deps.json new file mode 100644 index 000000000000..04a58b347da9 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/19/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-68-2/icu4c-68.2-data-bin-l": { + "zip": "sha256-ieQCLBTNrskuf8j3IUQS3QLIAQzLom/O58muMP363Lw=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/20/default.nix b/pkgs/development/compilers/openjdk/openjfx/20/default.nix index 0aa7b262e834..277ee7ad70c4 100644 --- a/pkgs/development/compilers/openjdk/openjfx/20/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/20/default.nix @@ -1,108 +1,68 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless +{ stdenv, lib, pkgs, fetchFromGitHub, writeText , openjdk20_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby , withMedia ? true , withWebKit ? false }: let + pname = "openjfx-modular-sdk"; major = "20"; update = ".0.2"; build = "-ga"; repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - # note: gradle does not yet support running on 19 - java = openjdk17_headless; - }); + jdk = openjdk20_headless; + gradle = gradle_7; - icuVersionWithSep = s: "71${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx20u"; - rev = repover; - hash = "sha256-3Hhz4i8fPU2yowb4roylCXzuO9HkW7ZWF9TMA3HIH9o="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include ' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk20_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # suspiciously the same as for openjfx 17 ... - # could they really not have changed any of their dependencies? - # or did we miss changing another upstream hash when copy-pasting? - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx20u"; + rev = repover; + hash = "sha256-3Hhz4i8fPU2yowb4roylCXzuO9HkW7ZWF9TMA3HIH9o="; }; -in makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -111,16 +71,14 @@ in makePackage { postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk20_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk17_headless openjdk20_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "https://openjdk.org/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/20/deps.json b/pkgs/development/compilers/openjdk/openjfx/20/deps.json new file mode 100644 index 000000000000..a9fa40a91be1 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/20/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": { + "zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/21/default.nix b/pkgs/development/compilers/openjdk/openjfx/21/default.nix index ee262eb8b950..dfb1a76b6976 100644 --- a/pkgs/development/compilers/openjdk/openjfx/21/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/21/default.nix @@ -1,108 +1,68 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless +{ stdenv, lib, pkgs, fetchFromGitHub, writeText , openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst -, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand +, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby , withMedia ? true , withWebKit ? false }: let + pname = "openjfx-modular-sdk"; major = "21"; update = ".0.3"; build = "-ga"; repover = "${major}${update}${build}"; - gradle_ = (gradle_7.override { - # note: gradle does not yet support running on 19 - java = openjdk17_headless; - }); + jdk = openjdk21_headless; + gradle = gradle_7; - icuVersionWithSep = s: "73${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx21u"; - rev = repover; - hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - postPatch = '' - # Add missing includes for gcc-13 for webkit build: - sed -e '1i #include ' \ - -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ - modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h - ''; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk21_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # suspiciously the same as for openjfx 17 ... - # could they really not have changed any of their dependencies? - # or did we miss changing another upstream hash when copy-pasting? - outputHash = "sha256-dV7/U5GpFxhI13smZ587C6cVE4FRNPY0zexZkYK4Yqo="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx21u"; + rev = repover; + hash = "sha256-7z0GIbkQwG9mXY9dssaicqaKpMo3FkNEpyAvkswoQQ4="; }; -in makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + # Add missing includes for gcc-13 for webkit build: + sed -e '1i #include ' \ + -i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \ + modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h + + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -111,16 +71,14 @@ in makePackage { postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk21_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk17_headless openjdk21_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "https://openjdk.org/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/21/deps.json b/pkgs/development/compilers/openjdk/openjfx/21/deps.json new file mode 100644 index 000000000000..ec1816339f40 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/21/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": { + "jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": { + "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/development/compilers/openjdk/openjfx/22/default.nix b/pkgs/development/compilers/openjdk/openjfx/22/default.nix index c34ff0466895..ce9d49c14bbb 100644 --- a/pkgs/development/compilers/openjdk/openjfx/22/default.nix +++ b/pkgs/development/compilers/openjdk/openjfx/22/default.nix @@ -1,8 +1,7 @@ { stdenv , lib +, pkgs , fetchFromGitHub -, fetchurl -, runCommand , writeText , openjdk21_headless , gradle @@ -24,90 +23,57 @@ }: let + pname = "openjfx-modular-sdk"; major = "22"; update = ".0.1"; build = "-ga"; repover = "${major}${update}${build}"; + jdk = openjdk21_headless; - icuVersionWithSep = s: "73${s}1"; - icuPath = "download/release-${icuVersionWithSep "-"}/icu4c-${icuVersionWithSep "_"}-data-bin-l.zip"; - icuData = fetchurl { - url = "https://github.com/unicode-org/icu/releases/${icuPath}"; - hash = "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA="; - }; - icuFakeRepository = runCommand "icu-data-repository" {} '' - install -Dm644 ${icuData} $out/${icuPath} - ''; +in stdenv.mkDerivation { + inherit pname; + version = "${major}${update}${build}"; - makePackage = args: stdenv.mkDerivation ({ - version = "${major}${update}${build}"; - - src = fetchFromGitHub { - owner = "openjdk"; - repo = "jfx22u"; - rev = repover; - hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q="; - }; - - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; - nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - - dontUseCmakeConfigure = true; - - config = writeText "gradle.properties" ('' - CONF = Release - JDK_HOME = ${openjdk21_headless.home} - '' + args.gradleProperties or ""); - - buildPhase = '' - runHook preBuild - - export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES - export GRADLE_USER_HOME=$(mktemp -d) - ln -s $config gradle.properties - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" - gradle --no-daemon --console=plain $gradleFlags sdk - - runHook postBuild - ''; - } // args); - - # Fake build to pre-download deps into fixed-output derivation. - # We run nearly full build because I see no other way to download everything that's needed. - # Anyone who knows a better way? - deps = makePackage { - pname = "openjfx-deps"; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*/modules.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-2I7LvYcudlB4DKJ/wEiTjY6nICUxUY52euosUqOA+Bs="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx22u"; + rev = repover; + hash = "sha256-VoEufSO+LciUCvoAM86MG1iMjCA3FSb60Ik4OP2Rk/Q="; }; -in -makePackage { - pname = "openjfx-modular-sdk"; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4 ]; + nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ]; - gradleProperties = '' + dontUseCmakeConfigure = true; + + config = writeText "gradle.properties" '' + CONF = Release + JDK_HOME = ${jdk.home} COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} - ${lib.optionalString withWebKit "icuRepositoryURL = file://${icuFakeRepository}"} ''; - preBuild = '' - swtJar="$(find ${deps} -name org.eclipse.swt\*.jar)" - substituteInPlace build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' \ - --replace 'name: SWT_FILE_NAME' "files('$swtJar')" + postPatch = '' + ln -s $config gradle.properties ''; + mitmCache = gradle.fetchDeps { + attrPath = "openjfx${major}"; + pkg = pkgs."openjfx${major}".override { withWebKit = true; }; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + preBuild = '' + export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES + export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE" + ''; + + enableParallelBuilding = false; + + gradleBuildTask = "sdk"; + installPhase = '' cp -r build/modular-sdk $out ''; @@ -116,16 +82,14 @@ makePackage { postFixup = '' # Remove references to bootstrap. - export openjdkOutPath='${openjdk21_headless.outPath}' + export openjdkOutPath='${jdk.outPath}' find "$out" -name \*.so | while read lib; do new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; - disallowedReferences = [ openjdk21_headless openjdk21_headless ]; - - passthru.deps = deps; + disallowedReferences = [ jdk gradle.jdk ]; meta = with lib; { homepage = "https://openjdk.org/projects/openjfx/"; diff --git a/pkgs/development/compilers/openjdk/openjfx/22/deps.json b/pkgs/development/compilers/openjdk/openjfx/22/deps.json new file mode 100644 index 000000000000..9ce577967ae2 --- /dev/null +++ b/pkgs/development/compilers/openjdk/openjfx/22/deps.json @@ -0,0 +1,152 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.eclipse.org": { + "eclipse/updates/4.30/R-4.30-202312010110/plugins/org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355": { + "jar": "sha256-Q048o4oWnZ9Y33AxXiSxbxEeayfbWOf1HoxtoLS4SIs=" + } + }, + "https://github.com": { + "unicode-org/icu/releases/download/release-73-1/icu4c-73_1-data-bin-l": { + "zip": "sha256-QDgpjuAqDDiRcYXvj/Tr3pyLVSx3f9A+TfbGtLGCXiA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/61.1": { + "jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=", + "pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.1": { + "jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=", + "pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/antlr#antlr4/4.7.2": { + "pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E=" + }, + "org/antlr#antlr4/4.7.2/complete": { + "jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache/lucene#lucene-core/7.7.3": { + "jar": "sha256-jrAzNcGjxqixiN9012G6qDVplTWCq0QLU0yIRJ6o4N4=", + "pom": "sha256-gvilIoHGyLp5dKy6rESzLXbiYAgvP0u+FlwPbkuJFCo=" + }, + "org/apache/lucene#lucene-grouping/7.7.3": { + "jar": "sha256-L1vNY7JXQ9MMMTmGIk0Qf3XFKThxSVQlNRDFfT9nvrg=", + "pom": "sha256-HwStk+IETUCP2SXu4K6ktKHvjAdXe0Jme7U2BgKCImU=" + }, + "org/apache/lucene#lucene-parent/7.7.3": { + "pom": "sha256-6PrdU9XwBMQN3SNdQ4ZI5yxyVZn+4VQ+ViTV+1AQcwU=" + }, + "org/apache/lucene#lucene-queries/7.7.3": { + "jar": "sha256-PLWS2wpulWnGrMvbiKmtex2nQo28p5Ia0cWlhl1bQiY=", + "pom": "sha256-rkBsiiuw12SllERCefRiihl2vQlB551CzmTgmHxYnFA=" + }, + "org/apache/lucene#lucene-queryparser/7.7.3": { + "jar": "sha256-F3XJ/o7dlobTt6ZHd4+kTqqW8cwMSZMVCHEz4amDnoQ=", + "pom": "sha256-z2klkhWscjC5+tYKXInKDp9bm6rM7dFGlY/76Q9OsNI=" + }, + "org/apache/lucene#lucene-sandbox/7.7.3": { + "jar": "sha256-VfG38J2uKwytMhw00Vw8/FmgIRviM/Yp0EbEK/FwErc=", + "pom": "sha256-1vbdxsz1xvymRH1HD1BJ4WN6xje/HbWuDV8WaP34EiI=" + }, + "org/apache/lucene#lucene-solr-grandparent/7.7.3": { + "pom": "sha256-Oig3WAynavNq99/i3B0zT8b/XybRDySJnbd3CtfP2f4=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/junit#junit-bom/5.8.1": { + "module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=", + "pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM=" + }, + "org/junit/jupiter#junit-jupiter-api/5.8.1": { + "jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=", + "module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=", + "pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.8.1": { + "jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=", + "module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=", + "pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4=" + }, + "org/junit/jupiter#junit-jupiter-params/5.8.1": { + "jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=", + "module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=", + "pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws=" + }, + "org/junit/jupiter#junit-jupiter/5.8.1": { + "jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=", + "module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=", + "pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU=" + }, + "org/junit/platform#junit-platform-commons/1.8.1": { + "jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=", + "module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=", + "pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ=" + }, + "org/junit/platform#junit-platform-engine/1.8.1": { + "jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=", + "module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=", + "pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI=" + }, + "org/junit/vintage#junit-vintage-engine/5.8.1": { + "jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=", + "module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=", + "pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} From 89cb3894ffa6b4548b792d403188d9c1d9fa4297 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 28 Jun 2024 10:49:44 +0700 Subject: [PATCH 066/227] ghidra: convert to gradle setup hook --- .../tools/security/ghidra/build-extension.nix | 14 +- pkgs/tools/security/ghidra/build.nix | 84 +- pkgs/tools/security/ghidra/deps.json | 754 ++++++++++++++++++ 3 files changed, 767 insertions(+), 85 deletions(-) create mode 100644 pkgs/tools/security/ghidra/deps.json diff --git a/pkgs/tools/security/ghidra/build-extension.nix b/pkgs/tools/security/ghidra/build-extension.nix index 373f35784e54..ce84287a8bd6 100644 --- a/pkgs/tools/security/ghidra/build-extension.nix +++ b/pkgs/tools/security/ghidra/build-extension.nix @@ -23,21 +23,13 @@ let gradle ]; - buildPhase = args.buildPhase or '' - runHook preBuild - + preBuild = '' # Set project name, otherwise defaults to directory name echo -e '\nrootProject.name = "${pname}"' >> settings.gradle - - export GRADLE_USER_HOME=$(mktemp -d) - gradle \ - --offline \ - --no-daemon \ - -PGHIDRA_INSTALL_DIR=${ghidra}/lib/ghidra - - runHook postBuild ''; + gradleFlags = [ "-PGHIDRA_INSTALL_DIR=${ghidra}/lib/ghidra" ]; + installPhase = args.installPhase or '' runHook preInstall diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 3c739602514c..3a1fca3c393b 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -4,7 +4,6 @@ lib, callPackage, gradle_7, - perl, makeBinaryWrapper, openjdk17, unzip, @@ -76,69 +75,6 @@ let HERE ''; - # Adds a gradle step that downloads all the dependencies to the gradle cache. - addResolveStep = '' - cat >>build.gradle < - subProject.buildscript.configurations.each { configuration -> - resolveConfiguration(subProject, configuration, "buildscript config \''${configuration.name}") - } - subProject.configurations.each { configuration -> - resolveConfiguration(subProject, configuration, "config \''${configuration.name}") - } - } - } - } - void resolveConfiguration(subProject, configuration, name) { - if (configuration.canBeResolved) { - logger.info("Resolving project {} {}", subProject.name, name) - configuration.resolve() - } - } - HERE - ''; - - # fake build to pre-download deps into fixed-output derivation - # Taken from mindustry derivation. - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src patches; - - postPatch = addResolveStep; - - nativeBuildInputs = [ - gradle - perl - ] ++ lib.optional stdenv.isDarwin xcbuild; - buildPhase = '' - runHook preBuild - export HOME="$NIX_BUILD_TOP/home" - mkdir -p "$HOME" - export JAVA_TOOL_OPTIONS="-Duser.home='$HOME'" - export GRADLE_USER_HOME="$HOME/.gradle" - - # First, fetch the static dependencies. - gradle --no-daemon --info -Dorg.gradle.java.home=${openjdk17} -I gradle/support/fetchDependencies.gradle init - - # Then, fetch the maven dependencies. - gradle --no-daemon --info -Dorg.gradle.java.home=${openjdk17} resolveDependencies - runHook postBuild - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - runHook preInstall - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/maven/$x/$3/$4/$5" #e' \ - | sh - cp -r dependencies $out/dependencies - runHook postInstall - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-66gL4UFlBUo2JIEOXoF6tFvXtBdEX4b2MeSrV1b6Vg4="; - }; in stdenv.mkDerivation (finalAttrs: { inherit @@ -187,20 +123,20 @@ stdenv.mkDerivation (finalAttrs: { __darwinAllowLocalNetworking = true; - buildPhase = '' - runHook preBuild - export HOME="$NIX_BUILD_TOP/home" - mkdir -p "$HOME" - export JAVA_TOOL_OPTIONS="-Duser.home='$HOME'" + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - ln -s ${deps}/dependencies dependencies + gradleFlags = [ "-Dorg.gradle.java.home=${openjdk17}" ]; - sed -i "s#mavenLocal()#mavenLocal(); maven { url '${deps}/maven' }#g" build.gradle - - gradle --offline --no-daemon --info -Dorg.gradle.java.home=${openjdk17} buildGhidra - runHook postBuild + preBuild = '' + export JAVA_TOOL_OPTIONS="-Duser.home=$NIX_BUILD_TOP/home" + gradle -I gradle/support/fetchDependencies.gradle init ''; + gradleBuildTask = "buildGhidra"; + installPhase = '' runHook preInstall diff --git a/pkgs/tools/security/ghidra/deps.json b/pkgs/tools/security/ghidra/deps.json new file mode 100644 index 000000000000..994b25ef434e --- /dev/null +++ b/pkgs/tools/security/ghidra/deps.json @@ -0,0 +1,754 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://archive.eclipse.org": { + "tools/cdt/releases/8.6/cdt-8.6.0": { + "zip": "sha256-gbfRnVfEowCfR2FpmnLo1kK14dklHSu5jfQ4seKPi6k=" + } + }, + "https://files.pythonhosted.org/packages": { + "27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/wheel-0.37.1-py2.py3-none-any": { + "whl": "sha256-S9zX2EATgIYSbNCSVNxhlftPxvAcBQodcjbyYw2x0io=" + }, + "2d/e0/f877c91e036fcaed2a827f80d6cbdf1d26cffc3333c9ebda31c55c45f050/Pybag-2.2.10-py3-none-any": { + "whl": "sha256-gc8eM91mfdIX3FahIzJnluZ5m4Vp8sbvt4wWN1yvmys=" + }, + "50/8f/518a37381e55a8857a638afa86143efa5508434613541402d20611a1b322/comtypes-1.4.1-py3-none-any": { + "whl": "sha256-ogig48ocClNic12g/2YYIoAdzocxK4lNfXUq3QEKIbA=" + }, + "83/1c/25b79fc3ec99b19b0a0730cc47356f7e2959863bf9f3cd314332bddb4f68/pywin32-306-cp312-cp312-win_amd64": { + "whl": "sha256-NyV3lMGtOe6b5lLaBGLcLjlMgVnf2ROopOjrb9NG2g4=" + }, + "8d/14/619e24a4c70df2901e1f4dbc50a6291eb63a759172558df326347dce1f0d/protobuf-3.20.3-py2.py3-none-any": { + "whl": "sha256-p8ptSIqo/38ynUxUWy262KwxRk8dixyHrRNGcXcx5Ns=" + }, + "90/c7/6dc0a455d111f68ee43f27793971cf03fe29b6ef972042549db29eec39a2/psutil-5.9.8": { + "tar.gz": "sha256-a+Em4yJUht/yhqj7mgYkalJT9MfFO0depfWsk05kGUw=" + }, + "c7/42/be1c7bbdd83e1bfb160c94b9cafd8e25efc7400346cf7ccdbdb452c467fa/setuptools-68.0.0-py3-none-any": { + "whl": "sha256-EeUsZ0FaOB0Q1rRiztnPuXBmF58OhxOZ4AbEqxAfyF8=" + }, + "d0/dd/b28df50316ca193dd1275a4c47115a720796d9e1501c1888c4bfa5dc2260/capstone-5.0.1-py3-none-win_amd64": { + "whl": "sha256-G/pcgeaIDK9BoxlGzW0tBpwEi8wi7fEhJUtQGgSN5nU=" + } + }, + "https://ftp.postgresql.org": { + "pub/source/v15.3/postgresql-15.3": { + "tar.gz": "sha256-CG04Uz4odHlmpNXx546kMuM6ePIdy5EzAQ7LUYn62Yw=" + } + }, + "https://github.com": { + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2012_x64": { + "fidb": "sha256-1OmKs/eQuDF5MhhDC7oNiySl+/TaZbDB/6jLDPvrDNw=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2012_x86": { + "fidb": "sha256-pJDtfi7SHlh0Wf6urOcDa37eTOhOcuEN/YxXQ0ppGLY=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2015_x64": { + "fidb": "sha256-4E6eQPnstgHIX02E7Zv2a0U2O+HR6CwWLkyZArjLUI8=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2015_x86": { + "fidb": "sha256-tm7mlmU+LtNlkZ3qrviFEDEgx5LiLnmvcNEgnX4dhkQ=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2017_x64": { + "fidb": "sha256-1fpfaXKYF0+lPSR9NZnmoSiEYFrRgce5VOI4DsHwvYk=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2017_x86": { + "fidb": "sha256-04nLjXb/SlnKNfiRuFIccq1fDfluJTlzotIahhSkzIE=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2019_x64": { + "fidb": "sha256-FQAHeW/DakBpZgrWJEmq2q890Rs4ZKXvIeeYMcnOkRg=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vs2019_x86": { + "fidb": "sha256-62MKNvqlhqNx63NNwLvY0TzK72l/PbWHJZY1jz3SQyo=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vsOlder_x64": { + "fidb": "sha256-jDtR9GYM0n4aDWEKnz8tX7yDOmasnuQ5PuLySB6FWGY=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/FunctionID/vsOlder_x86": { + "fidb": "sha256-mGBca2uSFKlF2ETkHIWGDVRkmkW8p4c+9pkcDpNyB4c=" + }, + "NationalSecurityAgency/ghidra-data/raw/Ghidra_11.1.1/lib/java-sarif-2.1-modified": { + "jar": "sha256-f3NlZklHVtJxql5LGvbIncUNB0qxxjdKR9+CImQiawE=" + }, + "pxb1988/dex2jar/releases/download/v2.1/dex2jar-2.1": { + "zip": "sha256-epvfhD1D3k0elOwue29VglAXsMSn7jn/gmYOJJOkbwg=" + } + }, + "https://repo.maven.apache.org/maven2": { + "biz/aQute/bnd#biz.aQute.bnd.util/7.0.0": { + "jar": "sha256-OVddFQJJliqcbUbM5+Zy53fIqGIKHS0iDH8sCnmediM=", + "pom": "sha256-+dgDJLl2Hp3ipFoP6naPWZRH9AxuQZ8gje2MrxIYAMU=" + }, + "biz/aQute/bnd#biz.aQute.bndlib/7.0.0": { + "jar": "sha256-gKVp0AbzLpJc7kzor5Jrfm/aqqtcy/1f5MnN/5xN0t8=", + "pom": "sha256-mOuywO2iBtxb79bFJsjCAneApDvymekXyzwDXwOYp9I=" + }, + "com/beust#jcommander/1.64": { + "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=", + "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg=" + }, + "com/formdev#flatlaf/3.2.1": { + "jar": "sha256-fYMX/hOyYIiZTWZmOvjofBI5DugIf3unS2hjj0pV9EA=", + "module": "sha256-kU7FLZBJj8ctFju0F1UhHnW7yfy3ip5wTZn/Mvfzywg=", + "pom": "sha256-uKf+YYO269HIAaqwdGnF2UFRQFSftLdpkqyALuJeGtE=" + }, + "com/github/rotty3000#phidias/0.3.7": { + "jar": "sha256-yNB2DOOw7RRT1DW83THjTwvjrAkCTn4amLijzr9Ka7U=", + "pom": "sha256-FY+kDQZfFCR5B7aSIiRY152eFjsTz1tfrHvgIkLMK60=" + }, + "com/github/tomnelson#jungrapht-layout/1.4": { + "jar": "sha256-owQBKdw57SMms2yhXGNEIu5XmkYXhmj5lELjiz5gcJk=", + "pom": "sha256-TO0lLb8YrUWTvoW6bWycCdvB7tZEjZtZneziavTnyN4=" + }, + "com/github/tomnelson#jungrapht-visualization-parent/1.4": { + "pom": "sha256-s5gyFq8VA62ryVOkKXKO1kpORbvDj++2wgOiiUPCq+w=" + }, + "com/github/tomnelson#jungrapht-visualization/1.4": { + "jar": "sha256-lwU6HdLNqyY/tWEfG8grhiswmflR480FZOPiPRk/Tdg=", + "pom": "sha256-YE8saHqHsq0L90QETPJmynWuKdPPCa383C5WEjDOtoY=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.9.0": { + "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" + }, + "com/google/code/gson#gson/2.9.0": { + "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", + "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" + }, + "com/google/errorprone#error_prone_annotations/2.2.0": { + "jar": "sha256-br0iyhudjsBtQd6NZOBZaYHZYHtCA1+e03T53icaSBo=", + "pom": "sha256-XgJY6huk5RoTN0JoC8IkSPerIUvkBz6GGfZF7xvkLdU=" + }, + "com/google/errorprone#error_prone_annotations/2.21.1": { + "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=", + "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI=" + }, + "com/google/errorprone#error_prone_parent/2.2.0": { + "pom": "sha256-xGCQLd9ezmiDLGsnHOUqCSiwXPOmrIGo9UjHPL1UETg=" + }, + "com/google/errorprone#error_prone_parent/2.21.1": { + "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.7.0": { + "jar": "sha256-29oheMFO1rk6GEsay/ONchBwAiUmaMERz0EeyjfkHKY=", + "pom": "sha256-6BYywu6apI5+zwVHUSwcOGVgwNRqlY7lBVD3693xNRc=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/19.0": { + "pom": "sha256-O3b/Q+zfEPdNo25KritHDJ0GPgU8XKAm9VEq6U8cPhA=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/27.0.1-jre": { + "pom": "sha256-MX6IKRJi4M8oBelWwYhQ8dRWXIXC4REvXZ0Iqxcy5pY=" + }, + "com/google/guava#guava-parent/27.1-android": { + "pom": "sha256-1oF79aZ2AKOTpoA9UfR8159KXth1cqg3K++S4nNRgXI=" + }, + "com/google/guava#guava-parent/32.1.3-jre": { + "pom": "sha256-8oPB8EiXqaiKP6T/RoBOZeghFICaCc0ECUv33gGxhXs=" + }, + "com/google/guava#guava/19.0": { + "pom": "sha256-rdwGTafxB3/fTckOWqqIfNeQhQ0bdP4ubiXV94VRrGM=" + }, + "com/google/guava#guava/27.0.1-jre": { + "jar": "sha256-4cgU/QRJKifDjgMX6r6qGz6VDsgBAjnkAP6QrWyRB7Q=", + "pom": "sha256-ao3QQfI6a7FKhuRA/MuZNTe2InE1eg2sCjyw/zkVjzY=" + }, + "com/google/guava#guava/27.1-android": { + "pom": "sha256-KUYNJundBml2Ak+RJoMlzxHzkScNiPi1MewGQqNbwNw=" + }, + "com/google/guava#guava/32.1.3-jre": { + "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=", + "module": "sha256-9f/3ZCwS52J7wUKJ/SZ+JgLBf5WQ4jUiw+YxB/YcKUI=", + "pom": "sha256-cA5tRudbWTmiKkHCXsK7Ei88vvTv7UXjMS/dy+mT2zM=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.1": { + "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", + "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/google/protobuf#protobuf-bom/3.17.3": { + "pom": "sha256-bf431vImF9VqQUzNrf+NmFhaH3kXEr6HbCYWZxDR2N0=" + }, + "com/google/protobuf#protobuf-bom/3.21.8": { + "pom": "sha256-+7Ds/DyjGFddtifjOuRUwT1qTcp68UXRTT9m4IY8PPo=" + }, + "com/google/protobuf#protobuf-gradle-plugin/0.8.18": { + "jar": "sha256-RP2JrzepsvHdQcCUqbtzPAe/f8eg4jhooQuvbjUfpeA=", + "pom": "sha256-Gwqekab09LYqWmB4wibudwqo3FdnueRzwvwY8KOImAQ=" + }, + "com/google/protobuf#protobuf-java/3.17.3": { + "jar": "sha256-SsVJsZJpQUGVgEnwYKHIJqMzQvYZ4QjO2MF9mHf14+0=", + "pom": "sha256-Km8izVJli4uxTBANs+F5NT+MNR0ENzo79voKOzlGStw=" + }, + "com/google/protobuf#protobuf-java/3.21.8": { + "jar": "sha256-C4WBrYENLfrv0Nz78VabFFBEhlAjjX4v1rF2yTLQjJU=", + "pom": "sha256-OJBUBuApx6MYaW8O4RnFXM7HizN+oR5MMZWfDgardAg=" + }, + "com/google/protobuf#protobuf-parent/3.17.3": { + "pom": "sha256-T09Q5moqvM/o7SCbU/q3C4k+NfQ77FqB98GESbY+hrE=" + }, + "com/google/protobuf#protobuf-parent/3.21.8": { + "pom": "sha256-bHKyrDl1sAnR5FdQlVnp+onyV4vShD3LTWo+XPgRFws=" + }, + "com/googlecode/json-simple#json-simple/1.1.1": { + "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=", + "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M=" + }, + "com/h2database#h2/2.2.220": { + "jar": "sha256-l4q4YwGNP5ZeOIgFccNik+qLEKgIYZQVnE1dILUPClc=", + "pom": "sha256-tbp8XBcINbyupnWMWfo8EOvNepx5LiWzm4a559X72Mo=" + }, + "com/jcraft#jsch/0.1.55": { + "jar": "sha256-1JKxWm0uo/HMOcQiyVPEDBIokHPb6DYNmMD2+ex0/EQ=", + "pom": "sha256-dHx0jR8BBx6j0PhHb2jUqCOjE7dycB2FUck+qqV/n5k=" + }, + "com/opencsv#opencsv/5.4": { + "jar": "sha256-n94e8+VEQE406u4V5L97p0uANV15gJOwUk1jpZk2JCs=", + "pom": "sha256-uGQpmn0KIQIKgxaZQ499P4VAirJKNOkR+qmf9oTrdv0=" + }, + "com/oracle/labs/olcut#olcut-config-protobuf/5.2.0": { + "jar": "sha256-xmqG5GT9gi9xzu6JuSU3l8Pc/fZWxNsr+W2kceuXs8o=", + "pom": "sha256-JCBA8xgQ+I6pnGF7RUBrhmdtOvJa7jzZIoysQpd0zmk=" + }, + "com/oracle/labs/olcut#olcut-core/5.2.0": { + "jar": "sha256-5T6OCQrUJo0iqlPgaCu76rHIHiyoRBP6Q2AqQWP2vhk=", + "pom": "sha256-G912ta/r+7rg+FHQjJ46WmgwP40cMHY4rxuChHVvCgM=" + }, + "com/oracle/labs/olcut#olcut/5.2.0": { + "pom": "sha256-SRIriefVQhUkr5IsQrsnF0x7vhL2oKKWwiEJgIUW/B4=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "javax/help#javahelp/2.0.05": { + "jar": "sha256-/PSSLTj/hRhPHSMoMXu2CCbhTalIq9YG7j1bjGpw3r0=", + "pom": "sha256-uIEr4lGsoTl/S2pCO/Tt06KERONFOyIDtTSTNrmVgik=" + }, + "junit#junit/4.10": { + "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=", + "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "kr/motd/maven#os-maven-plugin/1.7.0": { + "jar": "sha256-lDBTUBpCnlPRxNYhUu7BJfo2Yg4NxmtzkKiVCXz96s4=", + "pom": "sha256-xPVqjuqlJp76BdsB4xMJBf9b24frKuPnZhVOmuoYO6Y=" + }, + "msv#isorelax/20050913": { + "jar": "sha256-NCcVJDHPf5Z/kuaeXKwWFHxdj7S05ainL1KReI78/4w=", + "pom": "sha256-u54IxYm/b2BxTQ+dMcLtdwPK9nf+muOSFrzKt3SkfNk=" + }, + "msv#msv/20050913": { + "jar": "sha256-FL46VQ5QhDO0/hB3XVQOnrWLPvBO10Vrx8fShckMh6I=", + "pom": "sha256-eoaknOHugXmjgCLiMZHkjPW1fkEEr2tXSJ3bjN7GoNY=" + }, + "msv#relaxngDatatype/20050913": { + "jar": "sha256-TUWpPrXNwyYxlmZzyVS4P8m2CgaBu93O+ixJdtBM3fI=", + "pom": "sha256-F/kF72gZZRismj53oNXlGY1g9D/8kEsiCcoEZhfyLfk=" + }, + "msv#xsdlib/20050913": { + "jar": "sha256-a476GP9XDAkW2nAsRpBrnooTnhwF2/Hk2L3rokTBsrM=", + "pom": "sha256-Ti8Z4AifVdrd/gOXbyhwCXvAaJcWVQ/p3r10KwrKZ5Y=" + }, + "net/java/dev/javacc#javacc/5.0": { + "jar": "sha256-cRExYbyM9mQVFVQcKBgCi4fHjsLo/6p1MXaG7giWe4k=", + "pom": "sha256-lBZg1Hgi+cDYDUDqBtSYH83CuHzGJTgbVF79fmtEnO8=" + }, + "net/java/dev/jna#jna-platform/5.14.0": { + "jar": "sha256-rkys6zhAcwwlN/m3+1WgG6ulgChrQSKVFIi87lWMJEk=", + "pom": "sha256-bLoOBPnuyxZIYAB5O7J+EDsPTQSF4FVOK0wK7RPS7RY=" + }, + "net/java/dev/jna#jna/5.14.0": { + "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=", + "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0=" + }, + "net/java/dev/timingframework#timingframework/1.0": { + "jar": "sha256-dGHpJGw7BRkWRaf5TBBGgMwxhlu02RIIKsAv93Egz0s=", + "pom": "sha256-EHm33r9dRb/PyG6euBCvHRhqN11glaDpHKKM2a8pwtA=" + }, + "net/sf/jung#jung-algorithms/2.1.1": { + "jar": "sha256-7ROOL2srLxOvYaE/F4i85vHeiFjELucKfUHmKDk3owo=", + "pom": "sha256-INw/C+7taPkCw/AtO6qJ8eI0xNSWeyIS15HBjw/a6Qs=" + }, + "net/sf/jung#jung-api/2.1.1": { + "jar": "sha256-bLc1ljw21RVdDeXxmgNIW5om5nVQ4WCz3YkAmm9RaU4=", + "pom": "sha256-3vtMVoVkg6Trdxnh4WiqYKtjnkPJJRKGZYNzLyPxOgs=" + }, + "net/sf/jung#jung-graph-impl/2.1.1": { + "jar": "sha256-SRHaBNd7T3u0ZaZa48w6AAyuTVK1h5EePAtMS2Q0k8E=", + "pom": "sha256-DXLiLd6PiBAEu7aagzjuxtnpGTlg9BRDOBlhYPhJqLQ=" + }, + "net/sf/jung#jung-parent/2.1.1": { + "pom": "sha256-os5T0/ynH/HQQ3FfmhowSo5KrhwGRa2QOMrkxSE2i+Q=" + }, + "net/sf/jung#jung-visualization/2.1.1": { + "jar": "sha256-kzuibCMIw79FZsOCiXm2itdCJyRXFxLlrw3odr3/oq4=", + "pom": "sha256-ayUROtpk+JgoOQmGsyWE0nNsBE+7iVz1Bo6BQWo9l+w=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding-all-platforms/16.02-2.01": { + "jar": "sha256-cvq1Op0x4W1lP+H0AAEdAqf2vGqR6GNLXPrVzhXUZ7s=", + "pom": "sha256-u3FCxepITF/phCbcFezhuYu/3UZTRWqI2idCHXJnAmU=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding/16.02-2.01": { + "jar": "sha256-Ezyj9pyMc12Jl8CUd1BPSKny5h6ntwSzcUqQZrHvuI4=", + "pom": "sha256-pdF4WGwNvc4V3cKlKBaE04ek8jW10bklWzls7TaWhcE=" + }, + "org/antlr#ST4/4.0.8": { + "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", + "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr/3.5.2": { + "jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=", + "pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/commons#commons-collections4/4.1": { + "jar": "sha256-sf6LWWi1fYRlQlNX7S2dxpVQRRi+0t9bVlxLjmjByKU=", + "pom": "sha256-wK1C6RA1N5YNmnTaWOzCTdGjehPR5MSPCWm+k+QBg2k=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-compress/1.21": { + "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=", + "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" + }, + "org/apache/commons#commons-dbcp2/2.9.0": { + "jar": "sha256-iHcgkSxcu83/bg4h1QNJN1Vfj/xZc4Hv+Pp38zzm1k4=", + "pom": "sha256-XtPwH1ee+0xru81m9VnpwV6ZwUCVeeAZG7pUHF/meYY=" + }, + "org/apache/commons#commons-lang3/3.11": { + "pom": "sha256-mA1mXYP+0EZlE08FeOUHRCoOdQaRBzeEORsKeYhySnU=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-lang3/3.9": { + "pom": "sha256-pAIkKbmEJbQwGBkVchJ5pS9hDzRki9rEh9TKy76N/rU=" + }, + "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/38": { + "pom": "sha256-VY2WF0Xrrcxdw5HP3n1HQIbUyq7iTdPm35Me2fa1tJU=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "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=" + }, + "org/apache/commons#commons-parent/54": { + "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" + }, + "org/apache/commons#commons-pool2/2.11.1": { + "jar": "sha256-6gUF7nUV5YsawOaG5NGl2ffYCOJRphvDcaoFlbmWP4M=", + "pom": "sha256-wbsCmUpK34loDfepitujPFUnaDAUJy1liFuzA27NSMM=" + }, + "org/apache/commons#commons-text/1.10.0": { + "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=", + "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" + }, + "org/apache/commons#commons-text/1.8": { + "pom": "sha256-9s/bqlnHCtfj/r5xTgkRmQFWrAkFKV2PKjt1HgXlmhI=" + }, + "org/apache/commons#commons-text/1.9": { + "pom": "sha256-n5IWz8lE3KeC5jEdYnV/13Fk/mfaKbWPAVaH+gn0QFA=" + }, + "org/apache/felix#felix-parent/6": { + "pom": "sha256-Ngi2sgD2yPSIx3zBWYR9UV5pZugzO4XY4E45Sgk7VZU=" + }, + "org/apache/felix#org.apache.felix.framework/7.0.5": { + "jar": "sha256-q6cpMsX/5S0a6ftzVBVHS8gwX9BPBQ6FHzqPZ9oYNP0=", + "pom": "sha256-CBAm1JP4dt+OsPPxyPhdpyy+N99VeDPpaLQMMNrL/Kk=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging/log4j#log4j-api/2.17.1": { + "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", + "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + }, + "org/apache/logging/log4j#log4j-core/2.17.1": { + "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", + "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" + }, + "org/apache/logging/log4j#log4j/2.17.1": { + "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + }, + "org/bouncycastle#bcpkix-jdk15on/1.69": { + "jar": "sha256-QIN20Xqqh4nnrNBV/kBCiaEfozX9fGinUykEn7fSjtI=", + "pom": "sha256-WrvkytLCMJR0ZvsgmiJn48xqDTgKajGRWVnTqtm4F2w=" + }, + "org/bouncycastle#bcprov-jdk15on/1.69": { + "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", + "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" + }, + "org/bouncycastle#bcutil-jdk15on/1.69": { + "jar": "sha256-KeQOJGbQQNgqbw6ZY10LwrujqUJRz3k5zwtpMhyu/Ak=", + "pom": "sha256-p2e8fzQtGTKJfso8i6zHAEygOAv6dSnyOpc0VJZcffw=" + }, + "org/checkerframework#checker-compat-qual/2.5.2": { + "pom": "sha256-da9ztewybj29yUayH9RoAtXafGEsO/Hlh1N0yY1+pP0=" + }, + "org/checkerframework#checker-qual/2.5.2": { + "jar": "sha256-ZLAmkci51OdwD47i50Lc5+osboHmYrdSLJ7jv1aMBAo=", + "pom": "sha256-3EzUOKNkYtATwjOMjiBtECoyKgDzNynolV7iGYWcnt4=" + }, + "org/checkerframework#checker-qual/3.31.0": { + "module": "sha256-UYkl4iqnmMH71voXwYN0aR8f57G+fdNw1Omv7us7Ds8=", + "pom": "sha256-Q1ecPr5H54NYp/MvlnN471YXWyKUszUYNYTwvSNZUjE=" + }, + "org/checkerframework#checker-qual/3.37.0": { + "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=", + "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=", + "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA=" + }, + "org/codehaus#codehaus-parent/3": { + "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.17": { + "jar": "sha256-kmVPST7P7FIILnY1Tw6/h2SNw9XOwuPDzblHwBZ0elM=", + "pom": "sha256-6VarXS60j6uuEjANDNLTKU1KKkGrwgaMI8tNYK12y+U=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.9": { + "jar": "sha256-zZb+60fzSyVZcEcV23sXmgOjch+dxAksNFxxjim0LeQ=", + "pom": "sha256-/nEJDiNXjdGapqj+9Rhvz6WPSPgHBnKprIlFhis7fz0=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.17": { + "pom": "sha256-GKA98W4qGExYLbexJWM8Fft3FAJ6hMG1MtcpM9wIuB8=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.9": { + "pom": "sha256-nyDSRN5e5OZQmbJ3tpiE7xr4EROcAJcl3TzPqPsaxjs=" + }, + "org/codehaus/mojo#mojo-parent/28": { + "pom": "sha256-WrbfH5JfxhOX3y0XNSu8mK8UZOhT7SF+CeU9IKMm9wc=" + }, + "org/codehaus/mojo#mojo-parent/40": { + "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.3.2": { + "jar": "sha256-+dWXnFx7oxN8d/QYR16wIYn4/Ip1+nP/w/8dEv6UVWc=", + "pom": "sha256-ywU3vsxjUsFUcz22+v0JAPlYRgOgsLnPjyJFVjEs2+E=" + }, + "org/hamcrest#hamcrest-core/1.1": { + "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=", + "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.1": { + "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "org/jacoco#org.jacoco.agent/0.8.11": { + "jar": "sha256-0+2F3qeKntVYRqdzjjoMoVxwLGYe5LyMv+Aqi59KmcA=", + "pom": "sha256-FuBen0liG4fFPmk1AUDzxG1C2WbGepM730sGOiscj8U=" + }, + "org/jacoco#org.jacoco.ant/0.8.11": { + "jar": "sha256-gdfriJDZvjCpOWEsKVYDVBBjUpzdA6UyZaunRHS3C3w=", + "pom": "sha256-ftED2VnQzue6v7Ewf6bkUbFpb/01JwYVU7VQ3lUgHYU=" + }, + "org/jacoco#org.jacoco.build/0.8.11": { + "pom": "sha256-W4SxXPLu8+WeuRvCJ4SDMQCwnfmRHjMZAww7xki9iws=" + }, + "org/jacoco#org.jacoco.core/0.8.11": { + "jar": "sha256-/NGIxohHP8jcwMbKrzVeeziVAiQ1J8M7lZej7Ch5H0c=", + "pom": "sha256-u2E18Qo2NJy4SlYA/Yz3P8EpahNbLxStzYPejPJMq7E=" + }, + "org/jacoco#org.jacoco.report/0.8.11": { + "jar": "sha256-g5MpWuJGgO0QytgzOQcED5KLhxMySRWBylvHhOLLT74=", + "pom": "sha256-jjtzR3nV4/1oPsAVQT1S+WGYTFDLkEX9orI7/160I4E=" + }, + "org/jdom#jdom-legacy/1.1.3": { + "jar": "sha256-Ar1hpyXor5sBdrQ78pgW0MdIuKuVE4W9EnvjdIkyWgo=", + "pom": "sha256-bWWTi3CxFyMBy0LY5l7gVzpXHtOfOvEBOp5ukp/flow=" + }, + "org/jgrapht#jgrapht-core/1.5.1": { + "jar": "sha256-pNgQy2Pgp3p1PRRwlP6p3ULoLPxXqiifn4UinyYEO7Q=", + "pom": "sha256-KknxKWxTwJ4OCiVdogMgVq3fKlu6WFyAF3Eg/IELQRM=" + }, + "org/jgrapht#jgrapht-io/1.5.1": { + "jar": "sha256-hsf8ZswZB7/CazZtTdKSzQ2ihr3h/QiKEcDZcp1tzFw=", + "pom": "sha256-jMvAH5otyMV0llX6FSck3dJ8FIIpxWeV+CC7V6GEp4g=" + }, + "org/jgrapht#jgrapht/1.5.1": { + "pom": "sha256-X9k28p0qw4blfbTL+JtZLFth3GpA03qhUw9eVLNQx9I=" + }, + "org/jheaps#jheaps/0.13": { + "jar": "sha256-Y0FCkMNJf4rA8QIgkgcIjexG/UdH4PVqJsaTCOhcZBU=", + "pom": "sha256-SH2xJbFxCY4/qDOFNaxZR2kirCxFK1ehTTz2YfIohDA=" + }, + "org/jline#jline-builtins/3.20.0": { + "jar": "sha256-prFPiYOXb7Sd67PZ6KFb+V9yTXFp8TFaYu+lin+omeI=", + "pom": "sha256-9T2EkbSNrQfnIR8M5BIhS5un25YmYZAxsqhvgMgrZrE=" + }, + "org/jline#jline-parent/3.20.0": { + "pom": "sha256-cXjGACAsS8Jux6S2IlXu829wVsrSpeYjnFdL7qXCEMo=" + }, + "org/jline#jline-reader/3.20.0": { + "jar": "sha256-rNHJTR4iiqe3li9psh7Tqf2CjrOmPkuvkIaVTmJq8fA=", + "pom": "sha256-2fF+3XIcAqExcgN21sB4eHgutrb6/rX/QkBKtXFD4TY=" + }, + "org/jline#jline-style/3.20.0": { + "jar": "sha256-C7ERYF4BAM6E05YfMLQNqgiOnC7FxnHn75D0L2rdBrY=", + "pom": "sha256-48nFXt7Ob0ru5jplYjiaS++NA1j6iq3GdKPeZR4w4ao=" + }, + "org/jline#jline-terminal-jansi/3.20.0": { + "jar": "sha256-wX/++o8GDa79OPJXRAcOQI9LrFPD6BOuoZKMxgcmD+Q=", + "pom": "sha256-Q3JhhBr0j5oZT9WygHJSCKds+jzKFgBAx6QoDrAn2+s=" + }, + "org/jline#jline-terminal/3.20.0": { + "jar": "sha256-EhJRcOeVUZum3IAQwHC1PHaq6StIXB43Uw5Uq13QjUM=", + "pom": "sha256-EMo7z1F48YUH8hCmOtljeJaFM0OtHBKRoBmhFvIWpUg=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.8.0-M1": { + "module": "sha256-vgUUcTA6UD9MIkZwdbJ0kEE3fd1tWoywc53tZ9kW2C0=", + "pom": "sha256-dxREMv/Gi9mKeQqxBpYZ2RAyz8Dk4TwIFjqgPaNv1uI=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/osgi#org.osgi.core/5.0.0": { + "jar": "sha256-tEDGv/KGMyr89crgZ7YGli52HA3wDl/Yp0bwsxJlYZs=", + "pom": "sha256-4AHZl0MYUeq4uTOLW32f5eaOGutDpYV5JLChWIbuNjk=" + }, + "org/osgi#org.osgi.util.promise/1.3.0": { + "jar": "sha256-cFPFfn19iP7GuQl5o68SXh0ruEcmijKKLx7WWtCkwYU=", + "pom": "sha256-rcyK9ce+Z7BSEF4Mncq43ibaxvGbxamrcpRqMydscQA=" + }, + "org/ow2#ow2/1.3": { + "pom": "sha256-USFcZ9LAaNi30vb4D1E3KgmAdd7MxEjUvde5h7qDKPs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-bom/9.6": { + "pom": "sha256-ig5fYk/ikwt6jWmVb0OORe9TKZa01kQJthbErvSxrE4=" + }, + "org/ow2/asm#asm-commons/9.6": { + "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=", + "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w=" + }, + "org/ow2/asm#asm-debug-all/5.0.3": { + "jar": "sha256-KWk1asHkD+QUGUjFY2kCOPXXnXaux/2HNTaGejMe3oE=", + "pom": "sha256-nJnXpVVyW8L4N5l3k1zboW1ofZyTtuByXhlhgNSQyZU=" + }, + "org/ow2/asm#asm-parent/5.0.3": { + "pom": "sha256-wu2r9BKKU030uLSwubVi6U8kK6lawk3GFIVDK4oYjjI=" + }, + "org/ow2/asm#asm-tree/9.6": { + "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/postgresql#postgresql/42.6.2": { + "jar": "sha256-gmKXVPMJwLVx0dQLp0+wU4VfhjdSpGyjB8ez5YYMSy4=", + "pom": "sha256-/5dcZtbZSN/YKp6SbsER7eldPkyRo6DYaQ8xox45NMY=" + }, + "org/python#jython-standalone/2.7.3": { + "jar": "sha256-2n89gpsUi8+oawWdyWTjqFVv7bAhCWyNsH4wxm+qubQ=", + "pom": "sha256-moD1I2PkBVnKxMjaKsX4uil3ksbpEmN7dIUfKjMHDNI=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-nop/1.7.25": { + "jar": "sha256-bLEnE49Btahp+ezdBhrRd5mg4/5yBGAHlxVOsEMu6xI=", + "pom": "sha256-ogpNV7z++b2sp9EVliwN58lEa+TUZre9MNXxmkWc9Jk=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/smali#baksmali/2.5.2": { + "jar": "sha256-HtI2Jm19xJB6reCxmjT3fvrCU0K2PIrOUuV5A5lBs4k=", + "module": "sha256-g+59x3oek4+5BtaNfUPiRX8s+Im7HecuqtcJJDVfpbU=", + "pom": "sha256-8FzZiasE/SboahreXCGauEgovqfebryA/Bd7YtJ1k4g=" + }, + "org/smali#dexlib2/2.5.2": { + "jar": "sha256-WlyJgti9fW47saBxMEnjx4txnsMrIPa2GYhc7DCg3WE=", + "module": "sha256-5XDKZe/asrKMAq2P34W9hSIGZrkkuJXKW+r1fXKGiDw=", + "pom": "sha256-BWB6NSDN841drl0MQZZRKjhWpA3rlTny/OCGNalut44=" + }, + "org/smali#util/2.5.2": { + "jar": "sha256-T1gKnP8+u4PLP9IL7Ijjfk8YN5bKZScymSYRYgKC2uo=", + "module": "sha256-rRt+JSAWcAXJFp2Gv8z/JvXF+b8Ls/qyRMtIIWU9wmE=", + "pom": "sha256-IKx+12/5cPUQB6IPrIvbon7IeUT9Kb2oxnQJZ5LJFFE=" + }, + "org/sonatype/oss#oss-parent/6": { + "pom": "sha256-tDBtE+j1OSRYobMIZvHP8WGz0uaZmojQWe6jkyyKhJk=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/tribuo#tribuo-classification-core/4.2.0": { + "jar": "sha256-+vv5OnIrmrVC7oeaX09lF5bkyuobZ5gNVWL+jdjbqeY=", + "pom": "sha256-gLgGCPTPN93HLmioPGBRyupwvqF+96hTCfWeqdpzBPE=" + }, + "org/tribuo#tribuo-classification-tree/4.2.0": { + "jar": "sha256-uVozLZJI7RKVgxdkTNQ9cubdit4KJPnKTlLaB72sY6c=", + "pom": "sha256-OrTlGe48n3lzd3MirS7EaR5j1kovRxiR4A1BGQdY2jw=" + }, + "org/tribuo#tribuo-classification/4.2.0": { + "pom": "sha256-SqINxWFbgU86wjq3xB+s+LpCKbPuzSwa/KeL3/kntcU=" + }, + "org/tribuo#tribuo-common-tree/4.2.0": { + "jar": "sha256-34iqIWT+X60ITLIxl7LgodbBPk7QbuXCGXausNuVfOk=", + "pom": "sha256-DbCNldwWEPdn/AehmZqXlhVxALozjH4JA2jMVN5NIHU=" + }, + "org/tribuo#tribuo-common/4.2.0": { + "pom": "sha256-GAZzLdQd51aq3tY2v7qZSD00J72diyAvEEJcr84iykk=" + }, + "org/tribuo#tribuo-core/4.2.0": { + "jar": "sha256-NFwzfcKHjsdQJJgqqwZycZtznnGOc9eisu/ottXQCb8=", + "pom": "sha256-XkjLxuPn9x+wYPSWdPTXbCLcKEe9flflVCY7+5gYpZ0=" + }, + "org/tribuo#tribuo-data/4.2.0": { + "jar": "sha256-m8EQCFnODOBCDNbfbOdna25DxSKEXUKGz5FIUmgtYz0=", + "pom": "sha256-SMm4+bX7Nd5toLwWhuMLStMkS6UWMCNw1fqGd1ixruA=" + }, + "org/tribuo#tribuo-math/4.2.0": { + "jar": "sha256-7NZdhI/2SIAXBLm6D3CmRtQDAgy97SYf1zVIGkeWVRI=", + "pom": "sha256-iCAlohj3F9hakTNsztSg+08CsjFcppZy0oqCc3uWhVE=" + }, + "org/tribuo#tribuo-util-onnx/4.2.0": { + "jar": "sha256-ohcAq4nLB1/OT8UkA1n5HMj4t/JCiS1lsD+oda0s3Vs=", + "pom": "sha256-Q19d8ELZieF6QHPjcFa++ChKUrw3zIZeF5Xvi7U5KUw=" + }, + "org/tribuo#tribuo-util-tokenization/4.2.0": { + "jar": "sha256-b0TzDZ0g6amwscMHAbcrPeXtofbXbZXanWkHQmVXdoI=", + "pom": "sha256-6GAT6tT7c0apQghWqMAX/g7aAlhmu0w935AK2JLi/Tg=" + }, + "org/tribuo#tribuo-util/4.2.0": { + "pom": "sha256-saxG0eBU4acgcz0cMeBMaIxxJb+mIN7RpEQ9BdNMma8=" + }, + "org/tribuo#tribuo/4.2.0": { + "pom": "sha256-mMQFMwnY7vg2fAbCAmyDHkqwS3nOny0hrGrrKE2dNZQ=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + } + }, + "https://sourceforge.net/projects": { + "pydev/files/pydev/PyDev%206.3.1/PyDev%206.3.1": { + "zip": "sha256-TYH+nYr+dmW46iCETT9RB/RGdCknxZlz6t5PKYCbBpk=" + }, + "yajsw/files/yajsw/yajsw-stable-13.09/yajsw-stable-13.09": { + "zip": "sha256-Ta5zKlNYRq5d+rdT6CpNX5OtmgWgZeIXK7l3ShsVRTo=" + } + }, + "https://storage.googleapis.com": { + "google-code-archive-downloads/v2/code.google.com/android4me/AXMLPrinter2": { + "jar": "sha256-AO0Djrarr23eyNICo+16gbUhRY9M1FmUgRXP0C/1nW0=" + } + } +} From 6d3d9669766d4ea0af819de52d20708386456565 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Wed, 6 Dec 2023 06:28:22 +0700 Subject: [PATCH 067/227] jabref: convert to gradle setup hook --- pkgs/applications/office/jabref/default.nix | 88 +- pkgs/applications/office/jabref/deps.json | 2143 +++++++++++++++++++ 2 files changed, 2159 insertions(+), 72 deletions(-) create mode 100644 pkgs/applications/office/jabref/deps.json diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 286ab63cbd0a..96ff199f964d 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -9,18 +9,9 @@ , gtk3 , jdk , gradle -, perl , python3 }: -let - versionReplace = { - easybind = { - snapshot = "2.2.1-SNAPSHOT"; - pin = "2.2.1-20230117.075740-16"; - }; - }; -in stdenv.mkDerivation rec { version = "5.13"; pname = "jabref"; @@ -47,36 +38,12 @@ stdenv.mkDerivation rec { }) ]; - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version postPatch; - - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon downloadDependencies -Dos.arch=amd64 - gradle --no-daemon downloadDependencies -Dos.arch=aarch64 - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2/ -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ - | sh - mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ - $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - outputHash = "sha256-lpFIhvPgkzIsHR6IVnn+oPhdSjo0yOIw7USo2+SJCVQ="; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; postPatch = '' - # Pin the version - substituteInPlace build.gradle \ - --replace 'com.tobiasdiez:easybind:${versionReplace.easybind.snapshot}' \ - 'com.tobiasdiez:easybind:${versionReplace.easybind.pin}' - # Disable update check substituteInPlace src/main/java/org/jabref/preferences/JabRefPreferences.java \ --replace 'VERSION_CHECK_ENABLED, Boolean.TRUE' \ @@ -85,30 +52,6 @@ stdenv.mkDerivation rec { # Find OpenOffice/LibreOffice binary substituteInPlace src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java \ --replace '/usr' '/run/current-system/sw' - - # Add back downloadDependencies task for deps download which is removed upstream in https://github.com/JabRef/jabref/pull/10326 - cat <> build.gradle - task downloadDependencies { - description "Pre-downloads *most* dependencies" - doLast { - configurations.getAsMap().each { name, config -> - println "Retrieving dependencies for $name" - try { - config.files - } catch (e) { - // some cannot be resolved, just log them - project.logger.info e.message - } - } - } - } - EOF - ''; - - preBuild = '' - # Use the local packages from -deps - sed -i -e '/repositories {/a maven { url uri("${deps}") }' build.gradle - sed -i -e '1i pluginManagement { repositories { maven { url uri("${deps}") } } }' settings.gradle ''; nativeBuildInputs = [ @@ -124,19 +67,13 @@ stdenv.mkDerivation rec { python3 ]; - buildPhase = '' - runHook preBuild + gradleFlags = [ + "-PprojVersion=${version}" + "-Dorg.gradle.java.home=${jdk}" + ]; - export GRADLE_USER_HOME=$(mktemp -d) - gradle \ - --offline \ - --no-daemon \ - -PprojVersion="${version}" \ - -PprojVersionInfo="${version} NixOS" \ - -Dorg.gradle.java.home=${jdk} \ - assemble - - runHook postBuild + preBuild = '' + gradleFlagsArray+=(-PprojVersionInfo="${version} NixOS") ''; dontWrapGApps = true; @@ -178,6 +115,13 @@ stdenv.mkDerivation rec { ln -sf $out/bin/JabRef $out/bin/jabref ''; + gradleUpdateScript = '' + runHook preBuild + + gradle nixDownloadDeps -Dos.arch=amd64 + gradle nixDownloadDeps -Dos.arch=aarch64 + ''; + meta = with lib; { description = "Open source bibliography reference manager"; homepage = "https://www.jabref.org"; diff --git a/pkgs/applications/office/jabref/deps.json b/pkgs/applications/office/jabref/deps.json new file mode 100644 index 000000000000..6b510245eb29 --- /dev/null +++ b/pkgs/applications/office/jabref/deps.json @@ -0,0 +1,2143 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jitpack.io/com/github/sialcasa": { + "mvvmFX#mvvmfx-parent/f195849ca9": { + "pom": "sha256-5nTE66pGjgRswUpwK3guGpZb5iI4/2kmYy+wtGIsSz0=" + }, + "mvvmFX#mvvmfx-validation/f195849ca9": { + "jar": "sha256-Q3dcLohYshPQP3jWb0/Wh6IENg4CGn9Tl8tVvRHVhO0=", + "pom": "sha256-MplYnkdrZQ8ptd0PuUqUcWe6SwKaoM4VdOOV1KMAPvs=" + } + }, + "https://oss.sonatype.org/content/groups/public/com": { + "tobiasdiez#easybind/2.2.1-20230117.075740-16/SNAPSHOT": { + "jar": "sha256-eubEgC/aixBe3Ho3QWBsJltPkWwmSRFGdlpx/0dl158=", + "module": "sha256-tgPZPbaK5Hy7JDPg3Yo5dh/zn+av+bgvbmklypPYZqc=", + "pom": "sha256-NudbADyHMI49AKmZi2KOYbTzRW/uuPdiYDDJcwEEPhA=" + }, + "tobiasdiez/easybind/2.2.1-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.tobiasdiez", + "lastUpdated": "20230117075740" + } + } + }, + "https://plugins.gradle.org/m2": { + "com/adarshr#gradle-test-logger-plugin/4.0.0": { + "jar": "sha256-5nhoOjPSvINWcb3U5YcQAErR2TFqqfmlTP4iQZpPbvk=", + "module": "sha256-jERLLH/UQgDNSrMYJyJwHCCXWkOyPH6e35sCJgSavcI=", + "pom": "sha256-ienBpTqmJS2mx9fZscN/t/j8qQuysaNq+Ti8cNni3GE=" + }, + "com/adarshr/test-logger#com.adarshr.test-logger.gradle.plugin/4.0.0": { + "pom": "sha256-sobTcqzS2uG4vHsg/ouoT49kiXMdiBpB83NqYCCFotc=" + }, + "com/github/andygoossens#gradle-modernizer-plugin/1.9.2": { + "jar": "sha256-PTzh7ej2aFWPPQCOs+nbNiAcYgbDlZDmciyr1XlHnBk=", + "module": "sha256-fpPjWPi71bCrOGIfkBU2QZfSguUT85C+oWjfvKqfbss=", + "pom": "sha256-/jLkdoa/L/1ARpoP52+JmSmawj38yVpzyzDGf/hsKr4=" + }, + "com/github/andygoossens/modernizer#com.github.andygoossens.modernizer.gradle.plugin/1.9.2": { + "pom": "sha256-d45Z81rXBHHqcW+H8U+oFW1SuaUyJ4MlEFG6DnrRSy0=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "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/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.7.3": { + "jar": "sha256-a0aS+ROiGx+2Axae54uo8+SrKvnXYq+cqIt5EmwcCtE=", + "pom": "sha256-hGDJUBJ8o1mHZhYeOLT/jWO01p+4MQoW4As1E1ABDBE=" + }, + "kr/motd/maven#os-maven-plugin/1.7.1": { + "jar": "sha256-9Hru+Ggh5SsrGHWJeL0EXwPXIikuMudHCCEixiKJUuA=", + "pom": "sha256-S3WABEIrljPdMY8p54Tx0YC9ilkgzVCvGTCGH21qVHY=" + }, + "me/champeau/jmh#jmh-gradle-plugin/0.7.2": { + "jar": "sha256-2Wcgmf+Pw/m/PU0BWGThWG8H7L0qihd6ZhhO8LaKumU=", + "module": "sha256-bYSa50VKs5Fxjl/HDicWQY7z7SZEcjRb2Axt5k4AtsQ=", + "pom": "sha256-FdkdAH98O7wCJseQSM3cRf/BJPoegAgu//jhAwxoSg8=" + }, + "me/champeau/jmh#me.champeau.jmh.gradle.plugin/0.7.2": { + "pom": "sha256-V+DCOsYJRa77WgxKkzm+poopU2TKR8epB5oDL3kBOrs=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache/commons#commons-math3/3.6.1": { + "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=", + "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/beryx#badass-jlink-plugin/3.0.1": { + "jar": "sha256-dgjXY18yKiLff//d+IiBuTngqBDuUmoqTFPFN7/WT4Y=", + "module": "sha256-b3ksJpweGUNdCWcOtY12cyOFm2Hpt9YcZLPMdHK8Qgo=", + "pom": "sha256-OwPpihIF17Spe7jcvlkCs6AW4D+FACDzkjuIWomh2zM=" + }, + "org/beryx/jlink#org.beryx.jlink.gradle.plugin/3.0.1": { + "pom": "sha256-MRg/jaYel0ILAf4NarvkrGfgYY5PxAEyfBu8HvoBCqw=" + }, + "org/fusesource#fusesource-pom/1.12": { + "pom": "sha256-xA2WDarc73sBwbHGZXr7rE//teUxaPj8sLKLhOb9zKE=" + }, + "org/fusesource/jansi#jansi/2.4.0": { + "jar": "sha256-bNkZkTI917L7KMqT16wSr1qGovUyeeKzWCezAxP9C58=", + "pom": "sha256-rECp8tDB7mMfw7CO+OLwvRS6IgEcp2/xvPZftWnq3zU=" + }, + "org/gradle/toolchains#foojay-resolver/0.8.0": { + "jar": "sha256-+Q5pNRY46QueyYSOdZ0hhjWQfAklQRkRUAN7CyLlFAw=", + "module": "sha256-jDzPVNoHLGSkDgaIKqplIzbLKe7C6iMPBtaEOrs4TVE=", + "pom": "sha256-pxZyrK0MCu4576V1P1yU+aSjWh2sBl4ii8rDQt6nxUg=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.8.0": { + "pom": "sha256-O2ciN72cwejoyobvWnkgpnj2nQTS9L+9DFouedRcXLU=" + }, + "org/javamodularity#moduleplugin/1.8.15": { + "jar": "sha256-TtYKjxlMndPuoesswP//5xo9gr+lr6YYszce8WDEdGI=", + "module": "sha256-rVmC0YlFvQQqTzjgQ+m2X90tdaek+LtlZ8ivt57NSPo=", + "pom": "sha256-BH+RV4mcE+kqwL9wlgswRdu77RoUOL6Y34YGIcjgk3A=" + }, + "org/javamodularity/moduleplugin#org.javamodularity.moduleplugin.gradle.plugin/1.8.15": { + "pom": "sha256-FL6DuFvFUx4otorZSr54f4wPPdBGThV0XPJc9Nbjc1k=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.0": { + "jar": "sha256-KDJ0IEvXwCB4nsRvj45yr0JE1/VQszkqV+XKAGrXqiw=", + "pom": "sha256-NmDTanD+s6vknxG5BjPkHTYnNXbwcbDhCdqbOg3wgqU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.0": { + "jar": "sha256-t5eaeqyUBV8Nnx/TtHzl/+HLYDKoQrqfvnGG8IUokXg=", + "pom": "sha256-wRB08MiYqYuGPGFEcdQ409+Soewzgqbjf5NdfXGVS1o=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.0": { + "jar": "sha256-pZ+iT98f+1lLrs2/D9EAEPl3zqECNtSH/jRkl3pzd/o=", + "pom": "sha256-ZNWY3YjiUEZnMeIDBKtvBsu7urfuMitHA7a1n4gcT5I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.0": { + "jar": "sha256-Na7/vi21qkRgcs7lD87ki3+p4vxRyjfAzH19C8OdlS4=", + "pom": "sha256-N3UiY/Ysw+MlCFbiiO5Kc9QQLXJqd2JwNPlIBsjBCso=" + }, + "org/openjdk/jmh#jmh-core/1.37": { + "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=", + "pom": "sha256-BEU74Abwb4bXxD88SS97TrM2JoDK5PHugLpl2yM3P1o=" + }, + "org/openjdk/jmh#jmh-parent/1.37": { + "pom": "sha256-DCTyFvNjfd52ORFPcCc6aX+FRvekxtWs1Mxtrum+9Mk=" + }, + "org/openjfx#javafx-plugin/0.1.0": { + "jar": "sha256-Xq7sB5m0QGRrDKTP2iGaMttr4rpXktAyoNpKOlw4j6s=", + "module": "sha256-rf+3RA0kntF8BJOD1nBp+UU7F3gncMAFtoKkNBbYNmE=", + "pom": "sha256-NMjfVSfrWjXl8AmjzeH3oInEzkoOclgC8uy+UDu9PLY=" + }, + "org/openjfx/javafxplugin#org.openjfx.javafxplugin.gradle.plugin/0.1.0": { + "pom": "sha256-1tASf/Q2PQAXPDV6mByec+/wPDCl0Ohq2CtgVPrvqEE=" + }, + "org/openrewrite#plugin/6.11.2": { + "jar": "sha256-dAt66QGZroKUlK4Jfib2q09UNzq0d3eC9yAUMyfL9fs=", + "module": "sha256-iA8IW7839ZimMSQz43weQHNo+4bEU9yqx6kC8n6u6n0=", + "pom": "sha256-RimWO6LSfL3l71E84EzahIQGwql6NevGzjV13W2fCYM=" + }, + "org/openrewrite#rewrite-bom/8.23.1": { + "pom": "sha256-8u0Wv2wmF542ps1nOlVp7peJ4Mrqlf0LCiEtVKJcTyI=" + }, + "org/openrewrite/rewrite#org.openrewrite.rewrite.gradle.plugin/6.11.2": { + "pom": "sha256-bWFob6WyvE+GbjsVgCm5iv3ZYtn6iw3k5xG+e10m4H4=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://repo.maven.apache.org/maven2": { + "at/favre/lib#hkdf/1.1.0": { + "jar": "sha256-gexMVudA1EC8lCb6YAyu5Ku26fTO/1dunOznw4F8WgY=", + "pom": "sha256-HCRX381QzRlXEdO38sd7YLFf+8YukrOvxTujzKawfHg=" + }, + "com/dlsc#dlsc-maven-parent/1.2.0": { + "pom": "sha256-p8CBi7FQmIk6zmfeQXEziZyrn6ANUKNxDMQFmdaoQyA=" + }, + "com/dlsc/gemsfx#gemsfx/2.6.0": { + "jar": "sha256-aquYe1ejruKNQJPgtvxrm9RSicErcfs6qiYL//9zk24=", + "pom": "sha256-edvfx3x1xd6lOE8D6aJDizzq1e5ZJBCtls2Q2TzmZ8M=" + }, + "com/dlsc/gemsfx#parent/2.6.0": { + "pom": "sha256-nSHYQq+N0GgUmQ06p5Vtnsu+3BAua3y5Rser3CqNOZ8=" + }, + "com/dlsc/pickerfx#parent/1.2.0": { + "pom": "sha256-4lUHLdlg6zdXzIFKUCAi2JZ6qsn/65YQVIi1nVn6Bz4=" + }, + "com/dlsc/pickerfx#pickerfx/1.2.0": { + "jar": "sha256-Bb9i2x4nDgVrgCvnEgA2USFljBvuotFqgTGE8H9ZLSU=", + "pom": "sha256-9+Gvj6sKVXhyzq9XmHKtd4E3hsvr15iqGS8QD0BV6VQ=" + }, + "com/dlsc/unitfx#unitfx-parent/1.0.10": { + "pom": "sha256-z1bPD/5QLEIs94RW+7gVoiZHEnArhkw4YuLNaubj5wo=" + }, + "com/dlsc/unitfx#unitfx/1.0.10": { + "jar": "sha256-Sxhrmeu47j3uesKeevLS+/dkeQQ8cj+q1Zaad+WhnBg=", + "pom": "sha256-6v50YYv2uOH3NAVfC75ayZ7hfLkWxfW8AJppE0uCOb8=" + }, + "com/fasterxml#aalto-xml/1.3.2": { + "jar": "sha256-3PLV9FMFbDzoSMr/QXkCG/uDte+zo9d5Qzxb1wl2Bos=", + "pom": "sha256-5G98AijEtoWJ2njFJgySfvR5nydr9g5sGqxDOpjK9hw=" + }, + "com/fasterxml#oss-parent/35": { + "pom": "sha256-r8Be0hBk6srI3jACUwyxkiCL0RTrJIQX2tGIbL9UBW4=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml#oss-parent/43": { + "pom": "sha256-5VhcwcNwebLjgXqJl5RXNvFYgxhE1Z0OTTpFsnYR+SY=" + }, + "com/fasterxml#oss-parent/44": { + "pom": "sha256-PplVTpaDtHlO11OM10Rsk4wZtswb8F+dFIBzkGuQ/iI=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" + }, + "com/fasterxml/jackson#jackson-base/2.16.1": { + "pom": "sha256-jiOFFhGXyf4S3JlltMi1fz0QMhdRIgW1tgudxnW86o0=" + }, + "com/fasterxml/jackson#jackson-base/2.17.0": { + "pom": "sha256-w9lEq1Kiy2/0VJ3O6wTUIajeYyo8yl3UVPq8f1KsMeI=" + }, + "com/fasterxml/jackson#jackson-bom/2.13.4.20221013": { + "pom": "sha256-y2P4/5jHzL5THjdkviyR0nW4/P4pcs1nqn8KeBojmjY=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.1": { + "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" + }, + "com/fasterxml/jackson#jackson-bom/2.17.0": { + "pom": "sha256-SWSsYtWw5Ne/Vuz4sscC+pkUGCpfwtLnZvTPdoZP0qU=" + }, + "com/fasterxml/jackson#jackson-parent/2.13": { + "pom": "sha256-K7qJl4Fyrx7/y00UPQmSGj8wgspNzxIrHe2Yv1WyrVc=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" + }, + "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-annotations/2.17.0": { + "jar": "sha256-hWJWmgAdRuhOojgCJX4zyPaLJOtHweDv0TOgNyxRKVk=", + "module": "sha256-RkPjPFKL6kG0/F7A4vivbBzVlQAr4voTzE+pF2JXf7w=", + "pom": "sha256-yHz4sMhDRDpM7E5pp4kTM10OR7FqGdI8IcI4JuCS+Mk=" + }, + "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/core#jackson-core/2.17.0": { + "jar": "sha256-Vb4TD2poA4CIomGFbE44POeZV6D8GinsshOp79bvQ4k=", + "module": "sha256-PSDo4ew+imyoB/J3vL2UM//DSs27X9PcJIWs8lKXlIc=", + "pom": "sha256-lR2zV/nEmlyId8CJYMSoroa9jJqohwYmZL0E96/+6pU=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.16.1": { + "jar": "sha256-uvio6+6PRe9ozdXi3Tkjs+KWwJN7luwLSAaqOjG8zR0=", + "module": "sha256-tDy1vynzVFuW6QV0jyU5FpXGIHEwMnxFGT/R3DdI2f8=", + "pom": "sha256-fIprQo6kaI0BIGlWzMr7I6ySj8adcXp2vdd0M0jSjbg=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.17.0": { + "jar": "sha256-0O1bVMsbC7sIKOJM51KkOgBtwYizTjpK4yOKzHtjdBg=", + "module": "sha256-fHs6Ikpqvls4uhoi/kVMCyVh80uyfnI8FwkluK0Akhs=", + "pom": "sha256-itZM7RCQyt5O90sVYbmWOkUeM/Sc8/oCp4y7LaCvzxc=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-csv/2.16.1": { + "jar": "sha256-7aBbHqTiDzaafnPVGbA8SFSX7HzJJDYiaPBvvXr3ob0=", + "module": "sha256-wlMG3ZnsfpOimIdHqKgy+8UNxwm8NDxyzndbzQ8/h3U=", + "pom": "sha256-nsHgPUHXk2//3LgE0sHQXCyDul7npvXYWwm0PkmH9Fs=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-smile/2.16.1": { + "jar": "sha256-N2d0Ty435uZyw6mBdOaFZ5B9GOpcRRsgOhnnsK2TQ1Q=", + "module": "sha256-Gstdx7Rb/kYEdBemRyijrWm2FsdTIcFpwGPD0CvhK0I=", + "pom": "sha256-vWoXuvgb1M2uGZBp+MoPm7JGwV3YtkzsdDIBxtz+9qk=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-xml/2.16.1": { + "jar": "sha256-uOc/oXHRJ2gyq78g67TfWX43dAX4de05gIzumsyj06w=", + "module": "sha256-1w5SJRr2K5qfp47uA3tqJu4ZmTAphVNh8+EQKN5aR68=", + "pom": "sha256-khKEVzDdd22UE76t2JQRSQ9UG4/a7wMdIL380dRH0uA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.17.0": { + "jar": "sha256-RrZazgNrAXQ3ELz8nn8EHt7S/IK6DT2D4ZsyyBjBi0w=", + "module": "sha256-IT9a3fdRMt9CITThwUAswirxt0EiJfk/f1TuDlrt0Jc=", + "pom": "sha256-eGjm/vOpdpC6N9WO4lfw5PejOaU1BHPwhI5scuRh2Mk=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.16.1": { + "pom": "sha256-2o7LvtR1bqPGKjNOR734F+omCJ8l2otbxdxcKZ6YCSs=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.1": { + "pom": "sha256-1DusfWR8CD8XI4P8YinkAOSJY6TuCfTqD2LZAySVvJQ=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.17.0": { + "pom": "sha256-xjxXKeuXzo1Qwi/kmg09d/89qYr4WHk4qeES3dGthQI=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.16.1": { + "jar": "sha256-qapcgPjdp3rY8DUApcAhq/cgrNYKrk4pOp6MKIXW3Cs=", + "module": "sha256-ixUB9M569HwUmHZVBPzhXhaUduYJr1DnxpxmLMPk+ZI=", + "pom": "sha256-8s/ApppgZcY1xfzBr2GTy/HQqrqljrTK2k0u1lrGFBU=" + }, + "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/datatype#jackson-datatype-jsr310/2.17.0": { + "jar": "sha256-lOovIk42YywC2x5mgSfDAYysuFmvwV3fb0xYWRepM5Y=", + "module": "sha256-DXg7+bYOzm6sjx8tuukW4HsxVYQX9y/OPkqrL4yW1MM=", + "pom": "sha256-amzpD+KlIb5thcfoIh9k0eP4jxwaDwl67LZXRLFdypk=" + }, + "com/fasterxml/jackson/module#jackson-module-jaxb-annotations/2.16.1": { + "jar": "sha256-YJYSSYlrXkm+pFZex7hgEA/zhyruHY5Bat4vgS8/yjY=", + "module": "sha256-0pECVhl8P5iyv7Lk9OGSDyjab+Xe2ng/1FXeMZ7QMfI=", + "pom": "sha256-zdtENElgsf6mNk1EYmApfXTO3fDhL2NjmWP0ci83HQQ=" + }, + "com/fasterxml/jackson/module#jackson-module-parameter-names/2.16.1": { + "jar": "sha256-mzM+fmkFOAf0Kp2S/B5dpAWTjsxGgxRrix65xpZ/6o4=", + "module": "sha256-WY9Np7a+PbFBVD4KBS25ZROVBDlrxP/Sy41H4XKzLuM=", + "pom": "sha256-D2U6eU8WV+XpMaADp6NLfP+xlbXv07OcqfrEh0yPcsU=" + }, + "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/fasterxml/jackson/module#jackson-modules-java8/2.17.0": { + "pom": "sha256-3AfGDsVkRInNBomkZKm5ap3V9qP7WePRyjPUbR2iv08=" + }, + "com/fasterxml/woodstox#woodstox-core/6.5.1": { + "jar": "sha256-ySjWBmXGQV+xw5d1z5XPxE9/RYDPWrAbHDgOv/12iH8=", + "pom": "sha256-SDllThaxcU509Rq8s3jYNWgUq49NUnPR3S8c6KOQrdw=" + }, + "com/github/ben-manes/caffeine#caffeine/2.9.3": { + "jar": "sha256-Hgp7vvHdeRZTFD8/BdDkiZNL9UgeWKh8nmGc1Gtocps=", + "module": "sha256-J9/TStZlaZDTxzF2NEsJkfLIJwn6swcJs93qj6MAMHA=", + "pom": "sha256-b6TxwQGSgG+O8FtdS+e9n1zli4dvZDZNTpDD/AkjI9w=" + }, + "com/github/docker-java#docker-java-api/3.3.6": { + "jar": "sha256-OoHkFFKR//tn68dcDhmlZBaTPpEtjyF8N4lAQk0jKbE=", + "pom": "sha256-XeM/4+u6ofcEmOMLFKkS2eD1eZpIGhevE10a5snqmyk=" + }, + "com/github/docker-java#docker-java-parent/3.3.6": { + "pom": "sha256-jdqBOGg4fuv3fOS/85xmT8ggtSDUHTOksZByq9bLWnI=" + }, + "com/github/docker-java#docker-java-transport-zerodep/3.3.6": { + "jar": "sha256-/f1MfYHq+GWebOa9u5hiKGGdnHtlTb1chavQRPHeAzA=", + "pom": "sha256-D7UCE9aHUCOHnIts1pH1ZR5ynFBiSXipDrmhQYq8Tpc=" + }, + "com/github/docker-java#docker-java-transport/3.3.6": { + "jar": "sha256-MhUpuq96t/UMPppW83ttvNnvSgothGYRDiAqbgf4hZg=", + "pom": "sha256-8HHKdfDnP5fCS/rKO+385yPOEa2FEk3I0eGDBv7T0qQ=" + }, + "com/github/hypfvieh#dbus-java-core/4.2.1": { + "jar": "sha256-Onuf1UOhvpTemQCcNqwYA/CNbRI1dwbI9QQIVTFUadE=", + "pom": "sha256-IXRgXAmRRZPObYk10FKvENIo1SuN2V1IYRhnE1zsjIY=" + }, + "com/github/hypfvieh#dbus-java-parent/4.2.1": { + "pom": "sha256-eeJ6xZ6OgExWBdEMu45x2CHxorciTuc4B4LcV14Cdds=" + }, + "com/github/hypfvieh#dbus-java-transport-native-unixsocket/4.2.1": { + "jar": "sha256-u2fem9CBSBI7kYRY78eAVRRr1a4VOEh89KAY3Q9kSDc=", + "pom": "sha256-MnkIfkz4UMIYm8dSl7nnBVBSgRC+ML6Nb/eFxmGVpkU=" + }, + "com/github/javakeyring#java-keyring-parent/1.0.4": { + "pom": "sha256-bByWW9rbWaDYGa9MtdDFiZ2GBt6bgtgRt9NWcGxTv0k=" + }, + "com/github/javakeyring#java-keyring/1.0.4": { + "jar": "sha256-7c0NsZ5aIWJl2gNGFbi+8TgBaNSJFT85CtxIRJPJqlo=", + "pom": "sha256-/wQyxT//a1/dcnAG08orA7lEUjl7g4+PFUby92u0OSM=" + }, + "com/github/tomtung#latex2unicode_2.13/0.3.2": { + "jar": "sha256-sOJRyPXdNuZ1TOunDNRjBZ4pfgy9Iw3Jcc/bG1BY89Q=", + "pom": "sha256-wRAxRUgycqScz7gHpv5MuKR31ENvyQT2kRoLUEvieAo=" + }, + "com/github/vatbub#mslinks/1.0.6.2": { + "jar": "sha256-ue5zrbUjLnWQDg//nc7Cbzj+puROqxPbbudzEh9oRCA=", + "pom": "sha256-hdVzY9II1Vxt0ZWTsws8qLZIAW3h2/sNsfcEz9dxNzU=" + }, + "com/github/weisj#jsvg/1.2.0": { + "jar": "sha256-kS832F3qr1t0dwD1vTdhqTsUpRYZAOdDbP84a2F2EYo=", + "pom": "sha256-L1qCkk25xJTbGD3ukkL1S2/TI6/bd0oX5GMlHfPle2A=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10": { + "pom": "sha256-+1OsCwbBkRbKYaw0S03+inwpzE+Bs1POiJSTpQOQBPs=" + }, + "com/google/code/gson#gson/2.10": { + "jar": "sha256-DN0WPONZiiD8BO7nGxQLJPbyo7NfCkmdu92YUug/v68=", + "pom": "sha256-rGnZ8lQmDK6rOZjqrWDzVVmcJRIeGVFWv9/8ijVfxr0=" + }, + "com/google/errorprone#error_prone_annotations/2.10.0": { + "jar": "sha256-oknU0l37htQebIL8M131gBifDJ/uq9xTIz/B5QYHJKE=", + "pom": "sha256-1oDcn1eKd6bc2ZKywyUOsWinIUzyf48MrB8GUmcQwMw=" + }, + "com/google/errorprone#error_prone_annotations/2.26.1": { + "jar": "sha256-3iXy2aIVZSm9dl9R2O/fwN+nMB4E77nMdbfxDPXQ4Ps=", + "pom": "sha256-rqfpkeLf3LR/X71QhYdTX3gCvLni/C1Ou1C+QbaE2p8=" + }, + "com/google/errorprone#error_prone_parent/2.10.0": { + "pom": "sha256-B4kah8SQ+QDBIJe+6V7By24HHIp9+BBmY4fgx3Lwifo=" + }, + "com/google/errorprone#error_prone_parent/2.26.1": { + "pom": "sha256-SmrQDTGwpa3Nmk9gUGXVtEX65KBMv4J+XRrBB34vgU0=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/33.1.0-jre": { + "pom": "sha256-D73wcsyo4Fa6MVQrt18MFJCRRABYbUukIuz8fR38ecY=" + }, + "com/google/guava#guava/33.1.0-jre": { + "jar": "sha256-NGrsDrjImHNgyKJk5w/xDC+6dgRG6yfoqwfnjnh6df4=", + "module": "sha256-6qUNmCgORsANUYq/FUgp3pm1lm0bb+KLffHVvZB+dKg=", + "pom": "sha256-VXQa0W+Yzubm3Ard3UOAacxeP/KaJuMXXU/qKHaSVLc=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/googlecode/plist#dd-plist/1.28": { + "jar": "sha256-iO2Ocw9zhil0hRdsQ4cUbGkUo4wOWPwpbooBzcO2IeE=", + "pom": "sha256-64AZrY6Ql2ztM0sYOyPxPxnQi9uuteSrKEpFoos4aIs=" + }, + "com/h2database#h2-mvstore/2.2.224": { + "jar": "sha256-EMeCk8sHu+6zewzCyRmnkJ6VyeTu8EZ/Ib+WGySSIUw=", + "pom": "sha256-csQffdVNSrUhROTkmFBYBJZfpifX6UYnqjN8RUtD9KY=" + }, + "com/ibm/icu#icu4j/72.1": { + "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=", + "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug=" + }, + "com/konghq#unirest-java-parent/3.14.5": { + "pom": "sha256-LMc4Plsi7+Umtd0r7KhgCYl2G4jebQffDBf+a7UPJ8A=" + }, + "com/konghq#unirest-java/3.14.5": { + "jar": "sha256-8MwzkiHp51loG9FDX1kY9GC+rexHRcJ6hxmvbaJtReU=", + "pom": "sha256-qIJBno0orj+m1wqfldT6jQH4IicdBcI1egKu6r6v6pE=" + }, + "com/oracle/ojdbc#ojdbc10/19.3.0.0": { + "jar": "sha256-+iJonNP7sDf07IZBJevngyXzgR/FDPGUxr1w/n5RRWg=", + "pom": "sha256-pfJtJo9fU2k9CvaVIXdzZ1/ktv5lXFVm+gZihXltP9Y=" + }, + "com/oracle/ojdbc#ons/19.3.0.0": { + "jar": "sha256-bj8kNwBxbE+i6d36oIyTlK1v2jpkDTvvA5Qfe1c9+dc=", + "pom": "sha256-iS3lC3HfR+jb7pTomhpPLDYC+7rk/LFu+sxtdq6LnlI=" + }, + "com/oracle/ojdbc#osdt_cert/19.3.0.0": { + "jar": "sha256-+qDMpZTTVNW7H16sPa+hVoOHonV2gTqb1yPW/YdEvow=", + "pom": "sha256-7BCuWrL03nbJmeAWpivQ4f49t9YwMLE1FQ6/ZzOWuog=" + }, + "com/oracle/ojdbc#osdt_core/19.3.0.0": { + "jar": "sha256-x6kMB6Euc9A8Ht1qAuaZABIT5pj+D1IloncczUarC2M=", + "pom": "sha256-8ydgabF5+h8t8AXptZtyzyQp2Sfcke7yDKOuMEGKeZw=" + }, + "com/oracle/ojdbc#simplefan/19.3.0.0": { + "jar": "sha256-UTjWWO3/DgEG8FWfaMcvuQ8c00OBSSmVt10AEuqeEvI=", + "pom": "sha256-8kMWnRLNjdURbYO+vsySNSiNGGFySLkjOa3FIX/W5wE=" + }, + "com/oracle/ojdbc#ucp/19.3.0.0": { + "jar": "sha256-I9jevkCnZN901e2n6MHOmywZCjT3OcpNdR6qlBFNMcw=", + "pom": "sha256-+SvQTVeVmp5ZlqjFSYluZRJ5ucW5VAE2EMpjN1zbItU=" + }, + "com/puppycrawl/tools#checkstyle/10.15.0": { + "jar": "sha256-RI7oAzg3HwsbSuEhPw7bJI0rYEJnpb75l+ARDVxP8aE=", + "pom": "sha256-UMoBscqFa2DqEzp9dA2RLUYqIhTpjpCzkBU5hf14K1A=" + }, + "com/salesforce/maven#MavenBase/1.0.19": { + "pom": "sha256-K6DjALx2Etaz4MDWYiw7Jv0M1s2s2JmuRWsyaw6F8c8=" + }, + "com/salesforce/maven#MavenParent/1.0.19": { + "pom": "sha256-3OlrnKlw7dinNuI9yiDal9CakdYh1mzNzGylQAdehoU=" + }, + "com/squareup/okhttp3#okhttp/3.12.0": { + "jar": "sha256-cXh/LFmeBEHHpEE5g7/dk9QLVuG63F4EE9akxIW6PzU=", + "pom": "sha256-mklEjyDeMUc8RtcixQDFXhIPp4mCm7Sv3Aa7syzOqag=" + }, + "com/squareup/okhttp3#parent/3.12.0": { + "pom": "sha256-hkeC3bfMW1sPSzZ04ChLv+jVVbXVlozkN+epQvLpDKc=" + }, + "com/squareup/okio#okio-parent/1.15.0": { + "pom": "sha256-NOCaPqKqzXId85lHDQWkeuza2AEmmiEhlf+/nSEFbbI=" + }, + "com/squareup/okio#okio/1.15.0": { + "jar": "sha256-aT+jGafohDMAYCsgQCO3Z08Qbry1d/LdWAchK2YRi9I=", + "pom": "sha256-8cELFIDRq3X7BRoHsnPjfNolJel+Fgfug+aDO3Dhv84=" + }, + "com/squareup/retrofit2#parent/2.6.1": { + "pom": "sha256-hrrYjK2fQEK3mI3+nR5e8t6Uh4FK8sPDB6ilhdSmAp4=" + }, + "com/squareup/retrofit2#retrofit/2.6.1": { + "jar": "sha256-b+36izjQWs9OUt3ku9dK7W2+A0h8XSZ/4Ehteih+lxI=", + "pom": "sha256-6rtyWWf0U2/HGFSh5UW2EBKnbbnxSM/S/rTBLH6a3Xg=" + }, + "com/sun/activation#all/1.2.2": { + "pom": "sha256-GXPUmcwsEmSv8tbQUqHHFq5hPQGK4cL2EN1qTRwkV44=" + }, + "com/sun/activation#all/2.0.1": { + "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw=" + }, + "com/sun/activation#jakarta.activation/2.0.1": { + "jar": "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=", + "pom": "sha256-igaFktsI5oUyBP8LYlowFDjjw26l8a5lur/tIIUCeBo=" + }, + "com/sun/istack#istack-commons-runtime/4.0.1": { + "jar": "sha256-n5ERX0SThIhvVyvWLIgS7hAEJz1LXIXKxlF5rUwWmQ8=", + "pom": "sha256-OPtqwbPZtUmt8h99yEzRXBu3x1zOtYEm6b0Wy+bd7u8=" + }, + "com/sun/istack#istack-commons-runtime/4.1.2": { + "jar": "sha256-f9Z5I2H03QD4xWr0ogzswAZt7qSo897Dg0ivI/wilu4=", + "pom": "sha256-EiKikL7dtvbpK8mZvOvDaW/NbXIhWFbSJHJ6e8LcOso=" + }, + "com/sun/istack#istack-commons-tools/4.0.1": { + "jar": "sha256-NEhuoD6CKWZ9cS4RLhZK3u11NMqBcYuw5lMHK362B4Y=", + "pom": "sha256-doe2Z9DL1OB5n8wqq9N64pJ7ORg4AATZR79eHV172M4=" + }, + "com/sun/istack#istack-commons/4.0.1": { + "pom": "sha256-zDvPJtQsLgI6SpDkfzMXk+DZR2uvJyetndyLvnNSFsI=" + }, + "com/sun/istack#istack-commons/4.1.2": { + "pom": "sha256-2Ig+twNkcB2uDjdEnIj9knUResPYYEDonxvj6dR+nJ0=" + }, + "com/sun/xml/bind#jaxb-bom-ext/3.0.2": { + "pom": "sha256-jUSIUplsdYMRpbs9oecjTGqGefTRO1InWxSp9RevjBA=" + }, + "com/sun/xml/bind#jaxb-bom-ext/4.0.3": { + "pom": "sha256-SkQftgU/yfRooSve6hy48Efq9kNzA34/BJrUMEJ/0PA=" + }, + "com/sun/xml/bind/external#relaxng-datatype/3.0.2": { + "jar": "sha256-wYsnDxQPFerIy77dRsx3cn4C92haLi237BIgSZkNFms=", + "pom": "sha256-8jwf3cYFxiEYtS/1SkTfU9CP4ypQSPtWKfn/yZ9bQQI=" + }, + "com/sun/xml/bind/external#rngom/3.0.2": { + "jar": "sha256-qo64ztOBV2dT3QBxZXliuNjmDmMnYwmmb1TPn4o80xM=", + "pom": "sha256-twSdFXrnU0PYywdBPmPIV4Q9TXsBXokXv0H5S7dP4ro=" + }, + "com/sun/xml/bind/mvn#jaxb-codemodel-parent/3.0.2": { + "pom": "sha256-sMPbw6G+mLHxcPIoNWNEFzSKK+S0oDwLtNu7hD2Dt2o=" + }, + "com/sun/xml/bind/mvn#jaxb-external-parent/3.0.2": { + "pom": "sha256-ExwRX0kx+YQ8rtDHeOD0Rb75zr+WvtiZNXh1DoyVYoE=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/3.0.2": { + "pom": "sha256-HfAhd4Qlf3/Dq0XIzuIU7CBYrnbEH7zZz4OU1emMlnM=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/4.0.3": { + "pom": "sha256-6WIwlX8fVlh/nP25dKNr7XcH6JYWtakKknss99NHZ28=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/3.0.2": { + "pom": "sha256-mFAJ3lm0JVXoj+4X8tRGfYT2widkb4Pm/Bsx80a4690=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/4.0.3": { + "pom": "sha256-PjQHp7FdgRMzJfEsVXN8xGeoyhGh5DsTotS9+HBW2no=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/3.0.2": { + "pom": "sha256-DVq8zIBaLrvyXD8uwbPkLc3rFuqckFuYVnRiAWjBoKs=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.3": { + "pom": "sha256-hU4ErXwT/9tlUbKQ6apsCN10JQdTvMgB4HZVB9EYfXw=" + }, + "com/sun/xml/dtd-parser#dtd-parser/1.4.5": { + "jar": "sha256-pM1q3c7ULi+HDcyhcW9FnaUfBvL+SUMNLRKPFHyOkp0=", + "pom": "sha256-sKYTLhmm4ALSU5VPat87YaJjVvz3f16PzEOpz9senUA=" + }, + "com/tngtech/archunit#archunit-junit5-api/1.2.1": { + "jar": "sha256-zAxo/vGa3fpBwaGDYIsQdd6+/iueLzzcAfQJYZT2u0g=", + "pom": "sha256-jpvGRO2Ygl/Jv1w/+Shsg2OMODLXAs+TcsZkhhQO3IU=" + }, + "com/tngtech/archunit#archunit-junit5-engine-api/1.2.1": { + "jar": "sha256-60XLhCUj2ne8DlDQRPvWftuwaEwAjsApGJGzTBSCqPc=", + "pom": "sha256-fBFqW8OgjDIiAIYwBl6aFQH/5GMMYXx53Ljmtp4ySWI=" + }, + "com/tngtech/archunit#archunit-junit5-engine/1.2.1": { + "jar": "sha256-bGwGyDAtt5rkq9xKpWEPqZURFfaTgbNCy2O3qBmgefQ=", + "pom": "sha256-LW4u2WZKQaaZxS5vbhjZpcojmXAOUjR6f6nAS3IMwDg=" + }, + "com/tngtech/archunit#archunit/1.2.1": { + "jar": "sha256-eLPLD4NQmPImSlnnkdiF+AitgNJCXvKY3Cz+0DPGueg=", + "pom": "sha256-GA8sOPoquiEKfyUHxdC1B1FghhfbFK/mvS8iqm/lDbU=" + }, + "com/vladsch/flexmark#flexmark-ext-emoji/0.64.8": { + "jar": "sha256-AS0ttRRjr9hHAmJ+ST/tzkLrfesbrjCd3O/RgasoPL4=", + "pom": "sha256-N1dSYA7KUGOae9HyFnK282sDFbYCoOcKDzoGRZZxQKk=" + }, + "com/vladsch/flexmark#flexmark-ext-gfm-strikethrough/0.64.8": { + "jar": "sha256-/GytAm+9A2s//QRIJkNgpfG1cnVu80J/8CJxW3/F8cM=", + "pom": "sha256-29iSNA0WNyOaf2bF5SGSELfNQX0f13HOk6llsD9xgog=" + }, + "com/vladsch/flexmark#flexmark-ext-ins/0.64.8": { + "jar": "sha256-W2G4PDHLC9MnPL8SrtOIe2O4vcbfoXsD7PR5zxzhdr0=", + "pom": "sha256-TPZAzDnlBtzCvF7Sk0ZOiet9u3X8chhlgre2M8ziWyE=" + }, + "com/vladsch/flexmark#flexmark-ext-superscript/0.64.8": { + "jar": "sha256-RXkzMk0cqfKDvBWhhCd3xt8DhfMY/M6t5N5BYhOV5AI=", + "pom": "sha256-+JfvOutkMsN/uIgBcgUxFtEa84rkcJyQiqcBVM0mGh4=" + }, + "com/vladsch/flexmark#flexmark-ext-tables/0.64.8": { + "jar": "sha256-zfgtJuES6WrefjcBOK6xaSC34tQR0gxsFcsaz6zR7x8=", + "pom": "sha256-+Lnuh0FZExL8I1PkfMjMbZIud2RInYOrrX0V8zU33PU=" + }, + "com/vladsch/flexmark#flexmark-ext-wikilink/0.64.8": { + "jar": "sha256-8y73ee77TDuA1b6/PEt61yBvxG4IOlkBz1Hbe0U1/3k=", + "pom": "sha256-Vr+s6mEz9k+F30Ir6iY/9USKNWCxfSIXw8LSvJRPtbo=" + }, + "com/vladsch/flexmark#flexmark-html2md-converter/0.64.8": { + "jar": "sha256-PySpCo/t1nCPBr5yu8n19SEavEnDXulZGM57C0FlHmI=", + "pom": "sha256-UrrKRFXJePTvC0NK2oOfmHQy9JaQFS7yDkxvHmYb7TA=" + }, + "com/vladsch/flexmark#flexmark-java/0.64.8": { + "pom": "sha256-QHv3UvN2KqkIxfxNZkuJOZTRt4OqIKKWakP4bBVetDM=" + }, + "com/vladsch/flexmark#flexmark-jira-converter/0.64.8": { + "jar": "sha256-zMHDqWWaEEt1pTojIenB1M7bBazYZ9Q2bYuOFke9N90=", + "pom": "sha256-aO668VQ27ex78DMIQgcN0iOqcXQcaX17yQKVEdlG4II=" + }, + "com/vladsch/flexmark#flexmark-util-ast/0.64.8": { + "jar": "sha256-pTQvZExqXzfVAvIlw6DLaZwmNiHILnINnAjrpanzuNM=", + "pom": "sha256-M5IPcD8naQ/qq7CKQ07O8g073bpMbcF9m1EYACUHITM=" + }, + "com/vladsch/flexmark#flexmark-util-builder/0.64.8": { + "jar": "sha256-r7nIjZ9lJFHnXxqwaa193XkdcS6yEcUdjSqDSUJAh10=", + "pom": "sha256-ERKthdmLh0tJeVT6eySR9AXb4B2kso0x9XVMzFtqL6E=" + }, + "com/vladsch/flexmark#flexmark-util-collection/0.64.8": { + "jar": "sha256-Ax/wFAjQ9UxiNdsY1FHcbmsVuFmw7B5A/zQpqCN1CCo=", + "pom": "sha256-xHLCQN7mFbkqISQcG0Lzm/44ZYlcMChulWI82UBecms=" + }, + "com/vladsch/flexmark#flexmark-util-data/0.64.8": { + "jar": "sha256-g861mJqwIFBUvxtCRG9Vy22hTBCqfCvaBdaiUEZw81M=", + "pom": "sha256-26l1Ca96vWwSBNwLP2K0hpzxqON8np1mNW4QqyTkhfE=" + }, + "com/vladsch/flexmark#flexmark-util-dependency/0.64.8": { + "jar": "sha256-5BrbXoFEaZtht41Q6wBO633oT5DExjYmYJ5s7l6ii0I=", + "pom": "sha256-0EkP+0Tt80pQprn6nrXD3XPT9weOH03oruUhmyIURVY=" + }, + "com/vladsch/flexmark#flexmark-util-format/0.64.8": { + "jar": "sha256-bJrIdoZHTt8BF7P4ONncs7ll+nK+SZjSF3tZgBNnn3M=", + "pom": "sha256-q+B6AP/rbr+L6DoCzOTSdpHnRUlRvnatteV9qmJiSOE=" + }, + "com/vladsch/flexmark#flexmark-util-html/0.64.8": { + "jar": "sha256-WxnmUGr/eRPHStclr3wrip8jlY5jJL8HEMWmRaRmMBc=", + "pom": "sha256-QSOT8DUt+GmWg4KaaRDOIX7RtSyaucYZIg1OM9W0n7o=" + }, + "com/vladsch/flexmark#flexmark-util-misc/0.64.8": { + "jar": "sha256-dEcsqBqQgOUeoaTxHCcImOPWwkLJInX6tH65k4Bsjys=", + "pom": "sha256-7kzBaZZgo0M+YJAy20ar+0yTTlGmP3pYOewfi2qVwOE=" + }, + "com/vladsch/flexmark#flexmark-util-options/0.64.8": { + "jar": "sha256-JIn0HpyvHZ+AYYM7MRslQDkly7Yx//K4wGkZKATW/Ig=", + "pom": "sha256-GA5DN4dxzcVhlDhgQ8XX9Dsq7EW9N9CJwmYV0As5i2A=" + }, + "com/vladsch/flexmark#flexmark-util-sequence/0.64.8": { + "jar": "sha256-biKXb+TpuN6U/VKZkeyy15zEgqrZSYU2dHCpO+HYJjE=", + "pom": "sha256-bOq0Eg9oVbt9IeVyDhVuogqWkeURN9ZGj0uQZzUvg+8=" + }, + "com/vladsch/flexmark#flexmark-util-visitor/0.64.8": { + "jar": "sha256-2bMAKoM6B4xF4TlWizBtqwrBF/+QRsah+eGAwBVFY/w=", + "pom": "sha256-+kWiyg+uR7+nw6GXwiuhe2QiNZhZTDimzlknPlOQwXY=" + }, + "com/vladsch/flexmark#flexmark-util/0.64.8": { + "jar": "sha256-HiTIkdrJUyu3Ir5xIscCb7R4aMPeNsAkAO7Y6a1TVyc=", + "pom": "sha256-g4Eg9qTozQub7BiGcCnXjxFNV3zcvOppRr65fsmM5/g=" + }, + "com/vladsch/flexmark#flexmark/0.64.8": { + "jar": "sha256-MTOHjRCPDhlk19Qn83mnQz4bcaRfnzwfq37QrAMB07A=", + "pom": "sha256-wwO7cco5tSiAann47wLaSpTxklt11Bh3ojRNsbwiWpI=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-cli#commons-cli/1.6.0": { + "jar": "sha256-aeEjcFms1W8PhlTc3gnYoUEu7oKRi+9VZNUfj7J1cRs=", + "pom": "sha256-x3AmC5U07xOUD6CHpbAZasVKZNDc1IXermbErapsF1g=" + }, + "commons-codec#commons-codec/1.15": { + "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=", + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "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-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-digester#commons-digester/2.1": { + "jar": "sha256-4LK5gKhPxlM8XOKR8ZF7MsUH9ivK1kGY//RDaMIZaj0=", + "pom": "sha256-FaWcDnV8bAfD0baJ1zXI46nsVpXWzrapQdQGKrIpAbc=" + }, + "commons-io#commons-io/2.15.1": { + "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "commons-validator#commons-validator/1.7": { + "jar": "sha256-TXT0zk+2iyYX7a0Ibfbe/fkzhGfSN30sYuaQOOHE8C8=", + "pom": "sha256-UztBf2dHU/bHn6v7/vlqRj6pw8yj16g/8Ot9dmgpP8k=" + }, + "de/rototor/jeuclid#jeuclid-core/3.1.11": { + "jar": "sha256-YQbzzUZZnxpEzHn2z937hwY8CpX4z2+Z3g4uUIO/Opk=", + "pom": "sha256-vS3A6dN1Fn8TOTnQdApdXprF/gWGTWGs4RJxfYC4vG4=" + }, + "de/rototor/jeuclid#jeuclid-parent/3.1.11": { + "pom": "sha256-+T/FFx4EcsyDQLfOyXomFjolaNMpCEQFthjooVF1sNE=" + }, + "de/rototor/snuggletex#snuggletex-core/1.3.0": { + "jar": "sha256-7w3dJvbdYAa7KBc+GclddBNORETGdloYAG4L05LcKxs=", + "pom": "sha256-5ydOkNQLsH8QV1/YDte8jAhqgRA+HVhMALqxrjKphbs=" + }, + "de/rototor/snuggletex#snuggletex-jeuclid/1.3.0": { + "jar": "sha256-XALsqU5bJFi/oQuYVVZQ443GGlUauebI5JN0v76dlhk=", + "pom": "sha256-IbGfKgTq1ykaBhEdpQ8OmkmcyOtNY361+AOhCrYhP/I=" + }, + "de/rototor/snuggletex#snuggletex/1.3.0": { + "pom": "sha256-9oYkdlBlNa7G36UyTmJQk8fYwY47yqx1nvlDDbeK/0Q=" + }, + "de/sandec#JMemoryBuddy/0.5.1": { + "jar": "sha256-4Exc1XGjH2m7lnM0bQYhA9SPVJ/6wVu/bFyuqBhFOb4=", + "pom": "sha256-2Iq74jW0dpXz85Q9xT1rkh3MJXDqZgw3PuOTc4XL8bE=" + }, + "de/saxsys#mvvmfx-parent/1.8.0": { + "pom": "sha256-tp0rfN1IaPX4/rFgaV7mvP/PsIf7LYGeXXW7o1AjbJs=" + }, + "de/saxsys#mvvmfx/1.8.0": { + "jar": "sha256-BCQbjfnK7uHeBTsMRi/m4cLeMXLw6fVCsDh5CsUJHV4=", + "pom": "sha256-mASw53q9WQLcBOAT5LhQETFo2rjEV0kEZNK3XBud9JM=" + }, + "de/swiesend#secret-service/1.8.1-jdk17": { + "jar": "sha256-A7ouzaiq01ipF9I23oVP10b25szZp0ti98UkdzMwo0Y=", + "pom": "sha256-29pS9ELRHsCI5GAHXeBCgn0JEB93W8IoQoAZAtM3z+Y=" + }, + "de/undercouch#citeproc-java/3.0.0": { + "jar": "sha256-ah2CFCjGIXZiGS9pLR3sgs25vWTFz7O+R5V+Luo/EPk=", + "module": "sha256-0WU5hgCyIOsiGiDXydX+yX3ZBOO7p5hBVuhfWOv4mbo=", + "pom": "sha256-0LpxAQH7jCteBQxlLPYr+KmZT+6PBv+jzi2BLdkABMk=" + }, + "dev/failsafe#failsafe-parent/3.3.2": { + "pom": "sha256-52onlGrLqFePJthfAjPMDzlGiw58KYXcbXxs4BBVLYQ=" + }, + "dev/failsafe#failsafe/3.3.2": { + "jar": "sha256-LF3Ieabax+o6eynXleJ71JuOeQiwXC8+VgU8GdeYUPU=", + "pom": "sha256-elPaR8MAdPlyXIyfzWg8a/gTZ9QnO9+653PzPDR8aCs=" + }, + "eu/lestard#doc-annotations/0.2": { + "jar": "sha256-Yl5U0tQDYG0hdD/PbYsHJD7yhEQ9pNwvpBKUQX34Glw=", + "pom": "sha256-YT1F0/kGPP++cdD0u1U1yHa+JOOkeWTXEFWqCDRBJI4=" + }, + "info/debatty#java-string-similarity/2.0.0": { + "jar": "sha256-h2dZheY30jG1eD0f6gvZR+cSZ79VetyTzj2uyKUZvSI=", + "pom": "sha256-dgQpbIuuApGPJvekSKGwnzjluw2W1XhuTi3yF2B+9No=" + }, + "info/picocli#picocli/4.7.5": { + "jar": "sha256-6DqQb7mbVwkdHWisEffD0lGL16ganHGyWeLADRVkyOg=", + "pom": "sha256-fk6LD0t8pgdSCyDS8eWN9Pk0ymNsseuoKJz/LylWv9g=" + }, + "io/fabric8#kubernetes-client-bom/5.12.4": { + "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A=" + }, + "io/github/classgraph#classgraph/4.8.168": { + "jar": "sha256-IjPyDp2MY0qa8oQkYQAEHGdnDdb+OzWroXKHWACWWmg=", + "pom": "sha256-98UQqlWYvLu+nMT8dqy/mnD0Z3rQkaJy46weuS31zvw=" + }, + "io/github/fastfilter#fastfilter/1.0.2": { + "jar": "sha256-OPiCTQfIyTL6UMwBdfMsD/8vr7ORPNL5VxrDScljEUk=", + "pom": "sha256-Z+W0AfZs90NI+mBkUbg7wuoYwrWGEKikE23e0Y6IeT4=" + }, + "io/github/fastfilter#fastfilter_java/1.0.2": { + "pom": "sha256-YEBDeouTEBGJJsGgqK4aRWTisn1dFfM+jF6XgGGTGAw=" + }, + "io/github/java-diff-utils#java-diff-utils-parent/4.12": { + "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk=" + }, + "io/github/java-diff-utils#java-diff-utils/4.12": { + "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=", + "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw=" + }, + "io/micrometer#micrometer-core/1.9.17": { + "jar": "sha256-w1DP3HbAg1bxKmDoQPLb6u6nVAcS1YtUvs1sMCqGFHo=", + "pom": "sha256-A5aSALpYr0jxc6v17OILwK8Ic1BF+/4zAl9P2aiGqxY=" + }, + "io/netty#netty-bom/4.1.107.Final": { + "pom": "sha256-w2mXVYv7ThHyAN2m7i5BpF8t+eGu9njtoI553Yk4whA=" + }, + "io/quarkus/gizmo#gizmo/1.0.11.Final": { + "jar": "sha256-pUv7ttzOkpgTRZWzzR35YbxzJGiCXybuUpbytfiMC5k=", + "pom": "sha256-/9w5IIbOwtuB0m4uvTYDRxHokpwoQ1uUdpGWCFNrOP0=" + }, + "jakarta/activation#jakarta.activation-api/1.2.2": { + "jar": "sha256-oYepORA671hJp6+EvX4nvi0SDEEK8pFDc3X/4GH08J0=", + "pom": "sha256-XlD+k4BoRx9QSn78QHGCNCW1IOq8b4DHLZNevVRoMJE=" + }, + "jakarta/activation#jakarta.activation-api/2.1.3": { + "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", + "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" + }, + "jakarta/annotation#jakarta.annotation-api/2.1.1": { + "jar": "sha256-X2X9r0JO7itV4diCupuzdr6T+wmze4CL5uIuiFHJCf4=", + "pom": "sha256-r2UOyh3huYdBAGrNglB+RAjP/t0v7jOg6kY9YVCNt+w=" + }, + "jakarta/inject#jakarta.inject-api/2.0.1": { + "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", + "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/servlet#jakarta.servlet-api/6.0.0": { + "jar": "sha256-wDTrGvsViYfbtTpf6gyt9hHI2ujardWcRNnVq3ASnO8=", + "pom": "sha256-PVolnfvSuUDklcMFy6K2BhWSPcgXjgMrfvYMuyQThDk=" + }, + "jakarta/validation#jakarta.validation-api/3.0.2": { + "jar": "sha256-KRwl5pEMxqfr2W1Ma66/bXw3Z2xUgsLZYUbpAbYsH8k=", + "pom": "sha256-CnucYyeWiv4NgvfPT6y9p+FXloxYCNaby4AZhjspjcQ=" + }, + "jakarta/ws/rs#all/3.1.0": { + "pom": "sha256-1P3UF4DgZarNWsCZzQSQFxk3zFEi3CyO8biKh7PJQkw=" + }, + "jakarta/ws/rs#jakarta.ws.rs-api/3.1.0": { + "jar": "sha256-azs2KLi0rt2g0kwzVDNemFSX2O88UQuPMCjpINW4Zj0=", + "pom": "sha256-xpejA+n/wxlj6xwnW793pYOn1IKWWsTxuybckeWV/78=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/2.3.3": { + "pom": "sha256-KA2lMXYBZtRBI2jQ3Yme9K6/0KfYK/IzUC4phWgGrak=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": { + "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.2": { + "pom": "sha256-SCzbRtTdL1r33IhMim3nPd/+ba9UnvNqbAd/1uQe7Qg=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/2.3.3": { + "jar": "sha256-wEU59HLppt0MdoXqgtZ3KCJpq457rKLhRQDjgeDGzsU=", + "pom": "sha256-f+LKXc5LFKZGu/kh0TykLK8qLAZU2hVcdWOGXJiTlv0=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": { + "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=", + "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/4.0.2": { + "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", + "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" + }, + "javax/measure#unit-api/2.1.2": { + "jar": "sha256-XZ8donteeopyNap7V0jbSjSa0D0poaIAKaiFqYni9jo=", + "pom": "sha256-Iwbk9m8ncc0FSEyu2lnyfIWPbl3kHVuFCOlzo2mBUHY=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "net/bytebuddy#byte-buddy-agent/1.14.12": { + "jar": "sha256-KzCakwAJLgtpb3xHH9UdmWkAHfeEyKufB5l0N9dXrW0=", + "pom": "sha256-ZpifcNNV1gD9TZJtiDXke30b7/Z47r7FnRljY7XNTCw=" + }, + "net/bytebuddy#byte-buddy-parent/1.14.12": { + "pom": "sha256-m3/SvyklMayw6XTZVeSjbKQTMt0Nr+icJNj+Q5uuV7A=" + }, + "net/bytebuddy#byte-buddy-parent/1.14.9": { + "pom": "sha256-Zrg0IlHTXyBj5pMW9juvywVjQv516SHA9GXC2WWTU14=" + }, + "net/bytebuddy#byte-buddy/1.14.12": { + "jar": "sha256-lwY2E01hwYOxn49Y+mMeMNLyq8o0SzeEijk8rHhj3XA=", + "pom": "sha256-XamVxw3nt/SoSKhUN8fd7oA9GrfKwtfY33GUw9XicU0=" + }, + "net/bytebuddy#byte-buddy/1.14.9": { + "jar": "sha256-N3NS4lMoK/hvcxrJDtiDSOj0CmPOAzwAqFmC3n55Dm8=", + "pom": "sha256-LWdykQ0WFpvUySKeijZc9U4ZK8Ygy8+n+EJx9dEV6BU=" + }, + "net/harawata#appdirs/1.2.2": { + "jar": "sha256-wf0q5mJLk4+7/Cr4fTdlb6lTYRNW4lKOhN0EYor4B68=", + "pom": "sha256-B+NZycEfUgyvAn17z9nAlpNf6AEj0lC1vr+vw8HDdWw=" + }, + "net/java/dev/jna#jna-platform/5.13.0": { + "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", + "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + }, + "net/java/dev/jna#jna-platform/5.14.0": { + "jar": "sha256-rkys6zhAcwwlN/m3+1WgG6ulgChrQSKVFIi87lWMJEk=", + "pom": "sha256-bLoOBPnuyxZIYAB5O7J+EDsPTQSF4FVOK0wK7RPS7RY=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/java/dev/jna#jna/5.14.0": { + "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=", + "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0=" + }, + "net/jcip#jcip-annotations/1.0": { + "jar": "sha256-vlgFOSBgxxR0v2yaZ6CZRxJ00wuD7vhL/E4IiaTx3MA=", + "pom": "sha256-XBnmhIzFUKlWZPsIIwS8X5/Pe2cvrwOvFjXw6TwmgXc=" + }, + "net/jodah#typetools/0.6.1": { + "jar": "sha256-7+iqots4OhUeMYgQQAgEw5kr3lQ+dKTXLeon7VR0yvo=", + "pom": "sha256-HxvbdkwDDZ3Q3MGAxHfDKgtwRuK6GDmAsSJXVeLegZ8=" + }, + "net/sf/jopt-simple#jopt-simple/5.0.4": { + "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=", + "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU=" + }, + "net/sf/saxon#Saxon-HE/12.4": { + "jar": "sha256-V1+LaW47b5qno78BYRuL8bhFdrVc4pvBZlalOhR+9EE=", + "pom": "sha256-op6LTcFteBhLSANZRkoazPbahWpP31vyugKtTistHBs=" + }, + "net/synedra#validatorfx/0.5.0": { + "jar": "sha256-XfN+TrBpGSzyguSXe8pCcbaitVuzIhhUbsHzB/YlxgY=", + "module": "sha256-/Tug0IOZVKYfG8oVdC20pC7lKUQngFYyF4Q5HjNcUo8=", + "pom": "sha256-nEf1KmxKSozF0fdU1cQuGIyRvoiA9PxUb50jG6FE70E=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.3.4": { + "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", + "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" + }, + "org/antlr#antlr-master/3.5.3": { + "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" + }, + "org/antlr#antlr-runtime/3.5.3": { + "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", + "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" + }, + "org/antlr#antlr4-master/4.11.1": { + "pom": "sha256-cupd6Nq7ZhV4X9D+qqur1T3NrnD+FrzXx7lobApuAK0=" + }, + "org/antlr#antlr4-master/4.13.1": { + "pom": "sha256-28/JebgFKPwMtFP8to28nSsGA6e+LNzpmrL8aHFGnRg=" + }, + "org/antlr#antlr4-runtime/4.11.1": { + "jar": "sha256-4GxlU8HMwU02BS7EsPxvE7gIz5V7Wx3D9hv0AZlq2lk=", + "pom": "sha256-xFbsKVkHjFkfvX72mtlACnJ5IAaNdGmJx0q4BO1oGzQ=" + }, + "org/antlr#antlr4-runtime/4.13.1": { + "jar": "sha256-VGZdKDjMZkWDQ0aO/FOeRU/JW0aooEsTxqxD/JvmNQU=", + "pom": "sha256-GSJrF7+jj5nqImsi6XQg4qjt4JqXQg+xrPGG2a2kZXE=" + }, + "org/antlr#antlr4/4.13.1": { + "jar": "sha256-ziYdzmlSWDmqn8W9IyzhuBOnpAp1AwcTzEqA74Fw89U=", + "pom": "sha256-ahWaEs/WYoqnNuw//ZM/qUEuXLy3zn7FIXo/9CDGapk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/6": { + "pom": "sha256-Eu21CW4T9Aw2LQvUCQJYn6lYZQUSP6Jnmc5QsRb6W7M=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/commons#commons-compress/1.24.0": { + "pom": "sha256-g1qmZTLHql7G6F+FKJ2NP6raDGmLmLmxpBC4pUmcMMU=" + }, + "org/apache/commons#commons-compress/1.26.1": { + "jar": "sha256-J7tdQPN8O7cgW0oFQCR98FdxXp9su9l9Ymq4tQMYuwQ=", + "pom": "sha256-X0SKAh2IyW84QN/mGRKNYuXPticSzW5m3KincElFsG4=" + }, + "org/apache/commons#commons-csv/1.10.0": { + "jar": "sha256-LQbmoHpja693etjmWSVvIRkQnd4jVRybgMVCLUJLgIw=", + "pom": "sha256-JDVBrVAeQ+8Jus96hsh/fD7QGNNKgj/19U5ajFgRCU8=" + }, + "org/apache/commons#commons-lang3/3.14.0": { + "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" + }, + "org/apache/commons#commons-lang3/3.8.1": { + "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=", + "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU=" + }, + "org/apache/commons#commons-math3/3.2": { + "jar": "sha256-YmipoOo+dp/Ek6IURmZMDvZo5IyT0SZ5H28/dXl4/uI=", + "pom": "sha256-LNDbe843DBQEAlzAE8Efj9SfPzw0Cm0tz5nTY9eUimk=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/apache/commons#commons-parent/28": { + "pom": "sha256-FHM6aOixILad5gzZbSIhRtzzLwPBxsxqdQsSabr+hsc=" + }, + "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/45": { + "pom": "sha256-nIhiPs+pHwEsZz7kYiwO60Nn5eDSItlg92zSCLGk/aY=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/51": { + "pom": "sha256-m3edGLItjeVZYFVY57sKCjGz8Awqu5yHgRfDmKrKvso=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/56": { + "pom": "sha256-VgxwUd3HaOE3LkCHlwdk5MATkDxdxutSwph3Nw2uJpQ=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/commons#commons-parent/61": { + "pom": "sha256-0+wtNYSB/lEmDBNbtg+lIRwvXhhaFOp/eNA6Fr2QmNc=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "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-text/1.11.0": { + "jar": "sha256-Ks8woHCxkWPVpIDq5BGigTQehwAg41NMbV1MhHJznjA=", + "pom": "sha256-O0AZecBkEoXYUM8Ri04Y8EmsIj3Hherk0LNXKPxTTRE=" + }, + "org/apache/commons#commons-text/1.3": { + "jar": "sha256-gYWzpTEQktg+0fGEwtCTsxBdcmu9doZ8MrNRFUK7mag=", + "pom": "sha256-3usrqXAeSV3DHTJjPrhrlLJLCpbg3Gf7h+cGLxUwJ6o=" + }, + "org/apache/geronimo/genesis#genesis-default-flava/2.0": { + "pom": "sha256-CObhRvTiRSZt/53YALEodd0jZ9P2ejSrZgoSbIESFfg=" + }, + "org/apache/geronimo/genesis#genesis-java5-flava/2.0": { + "pom": "sha256-58U1i7u8J9qlsyf2O8EmUKdd3J+axtS/oSeJvh8sKds=" + }, + "org/apache/geronimo/genesis#genesis/2.0": { + "pom": "sha256-ue0vndQ0YxFY13MI7lZIYiwinM7OFyLF43ekKWkj2uY=" + }, + "org/apache/httpcomponents#httpasyncclient/4.1.5": { + "jar": "sha256-DBh3SJqdG6T6UPbPyrEdESNhiFjLMdVq+qta/dUGTZk=", + "pom": "sha256-beSudsiSFXUj62TD2bFNvHSnWGNrQO5MxkVqwRmYKXU=" + }, + "org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "org/apache/httpcomponents#httpcomponents-asyncclient/4.1.5": { + "pom": "sha256-6QGB4oDAJx/zE3QTQ+bwVAX66IJwL0WkzibewBbNnJ8=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.13": { + "pom": "sha256-xVTnAI5FF8fvVOAFzIt09Mh6VKDqLG9Xvl0Fad9Rk2s=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.14": { + "pom": "sha256-IJ7ZMctXmYJS3+AnyqnAOtpiBhNkIylnkTEWX4scutE=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcomponents-parent/12": { + "pom": "sha256-QgnwlZMhKYfCnWgBkXMJ3V5vcbU7Kx0ODw77mErRH6E=" + }, + "org/apache/httpcomponents#httpcore-nio/4.4.13": { + "jar": "sha256-cfz76GkALEhWPMWXn8c0VxyNDRZ8zOQpcMky8zeYHxk=", + "pom": "sha256-8yDynYbZgAPg8NxA1UNj3vuLpGJr5RoNMVhbyXYqFsw=" + }, + "org/apache/httpcomponents#httpcore/4.4.13": { + "jar": "sha256-4G6J1AlDJF/Po57FN82/zjdirs3o+cWXeA0rAMK0NCQ=", + "pom": "sha256-j4Etn6e3Kj1Kp/glJ4kypd80S0Km2DmJBYeUMaG/mpc=" + }, + "org/apache/httpcomponents#httpcore/4.4.14": { + "jar": "sha256-+VYgnkUMsdDFF3bfvSPlPp3Y25oSmO1itwvwlEumOyg=", + "pom": "sha256-VXFjmKl48QID+eJciu/AWA2vfwkHxu0K6tgexftrf9g=" + }, + "org/apache/httpcomponents#httpmime/4.5.13": { + "jar": "sha256-BudU2ZJFuY3MKGDctD0g5zfWUNor8gd6EF9orMvVxcw=", + "pom": "sha256-k0GN8hCu7VBQJUjbzysXwPHZFEMDDnL+++7RZSscKN0=" + }, + "org/apache/httpcomponents/client5#httpclient5-parent/5.1.3": { + "pom": "sha256-onsUE67OkqOqR3SRX3WJ4MYXnXKNKsailddY7k+iTMU=" + }, + "org/apache/httpcomponents/client5#httpclient5/5.1.3": { + "jar": "sha256-KMdZJU9ONTGeB4u2/+p1Z2YI3BLLJDsk+zyHMlIpd/4=", + "pom": "sha256-GYirPRva4PUfIsg9yXuI+gdWGttiRGedi49xRs3ROq8=" + }, + "org/apache/httpcomponents/core5#httpcore5-h2/5.1.3": { + "jar": "sha256-0OeLoVqo6+d5grZgrEsJqV1uA129vqdiV33ByOKTWAc=", + "pom": "sha256-K8AxehSO3Jrv6j7BU1OU787T0TfWL3/1ZW0LA/lMB4Y=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.1.3": { + "pom": "sha256-pnU4hlrg83RLIekcpH1GEFRzfFUtH/KdpxTIYMmS1bs=" + }, + "org/apache/httpcomponents/core5#httpcore5/5.1.3": { + "jar": "sha256-8r8vLHdyFpyeMGmXGWZ60w+bRsTp14QZB96y0S2ZI/4=", + "pom": "sha256-f8K4BFgJ8/J6ydTZ6ZudNGIbY3HPk8cxPs2Epa8Om64=" + }, + "org/apache/logging#logging-parent/10.6.0": { + "pom": "sha256-+CdHWECmQIO1heyNu/cJO2/QJiQpPOw31W7fn8NUEJ4=" + }, + "org/apache/logging/log4j#log4j-api/2.23.1": { + "jar": "sha256-kuwf02qzvAneYZjS18CRRoXA9xJ+qTGswy/S7N2C6ok=", + "pom": "sha256-tnzD0JgJJwSaO+sA1Qbs4oh0ZzKw3sgSJFxZ9FP7HKE=" + }, + "org/apache/logging/log4j#log4j-bom/2.23.1": { + "pom": "sha256-NyOW4EWNTNMsCWytq+DMkzDsEPT1f6O+LnT3m14XijU=" + }, + "org/apache/logging/log4j#log4j-to-slf4j/2.23.1": { + "jar": "sha256-eTeoQFUVaRAjTjtCho9V5o/0t77Ltv/RAUb3L1v1TdU=", + "pom": "sha256-BVZJuX0nP8asOjx61a/Y3tPA/OAEeyur7RKZ3Bpzk4I=" + }, + "org/apache/logging/log4j#log4j/2.23.1": { + "pom": "sha256-bOFUBFU2S1PqIqGDQssSamOBYz9lPwlUZ/KqGYURps4=" + }, + "org/apache/lucene#lucene-analysis-common/9.10.0": { + "jar": "sha256-vOhhPw3pPYblt1Z+ulUb5K+Ac3ObC9mpvXpCJc/cQk0=", + "pom": "sha256-Srvab0oxxV8FIKvqyytdhZ9wBJzavpC6fkFeEpFtMS4=" + }, + "org/apache/lucene#lucene-core/9.10.0": { + "jar": "sha256-r8GtQCslhKfBx86SjYu0bLuAD1xmzuiqhrdIGrF/sLU=", + "pom": "sha256-PJXUTXgwFjqAngE5GonrCS0gQUnZ0k4t3JsatJsKBHQ=" + }, + "org/apache/lucene#lucene-highlighter/9.10.0": { + "jar": "sha256-7ybMHN8UOfqqIE6Vy522/GnBet2umIRyJtWINNKn8Do=", + "pom": "sha256-2dp1xDusYvIVdF1tMe07XAw4Zs+crm0HfEHBxrbbs+Y=" + }, + "org/apache/lucene#lucene-memory/9.10.0": { + "jar": "sha256-OKPssbAQnWHOet9MFp3TZIXhqZP/2bMXiPjG9wTZQbk=", + "pom": "sha256-PXwz38GDkdhWHYDEGhKbYd2dJw5OAbQL593wtjsuvvM=" + }, + "org/apache/lucene#lucene-queries/9.10.0": { + "jar": "sha256-BkR8kzqupa4toz6JPM/RpBy0GgACueUi48UTO8E/nBE=", + "pom": "sha256-9KRvTeo+5jnkr/uWw+ptSlC9IF7T94+I7b0mjF4jNAk=" + }, + "org/apache/lucene#lucene-queryparser/9.10.0": { + "jar": "sha256-4vDlFZm22vZcQrhQ7xs5thfXlLYXasgdP/hZchHL7Ig=", + "pom": "sha256-EB74pcAiq+IzQtQCU+nVmjfacjBTydGi4GO5AELX2b8=" + }, + "org/apache/lucene#lucene-sandbox/9.10.0": { + "jar": "sha256-/VdPTmheCtOC7wdUYNLg4hFp8fr/gVeaMqWf3IIxl5U=", + "pom": "sha256-0hLxwbL4qXWtYp8nvFg61n3mBTTT6d8zyCAg9ep88ok=" + }, + "org/apache/maven#maven-parent/34": { + "pom": "sha256-Go+vemorhIrLJqlZlU7hFcDXnb51piBvs7jHwvRaI38=" + }, + "org/apache/maven/doxia#doxia-core/1.12.0": { + "jar": "sha256-XknNgnvrvOpYKdOziD0XrRzhXr1jlK61CtUNff2Tn80=", + "pom": "sha256-sDiPdIoIheE+fCxFOSH4u53U+1sZBb50VoVHbPNFbqM=" + }, + "org/apache/maven/doxia#doxia-logging-api/1.12.0": { + "jar": "sha256-mFMGFiwKn0wwnUYQlEfzDwK/b8m8FqPgOdWeHavQGS8=", + "pom": "sha256-ndmbQ1AiOEZYUxBpTERjGLFpK6dG7XFzdtWWGaJxI7Q=" + }, + "org/apache/maven/doxia#doxia-module-xdoc/1.12.0": { + "jar": "sha256-6HMboApO3TSyDv+eSnKcIEXGLLeWw+SRaSYH3kR2qwE=", + "pom": "sha256-+2nZW+S1WvLzsKm2jj6OYgY+aVlMH86+cFpaTbCZbSU=" + }, + "org/apache/maven/doxia#doxia-modules/1.12.0": { + "pom": "sha256-q4/2u0eTz7pZsU+zg/81GjSbEJHQccZrH8vKco1QW9w=" + }, + "org/apache/maven/doxia#doxia-sink-api/1.12.0": { + "jar": "sha256-XcpqqqnnDYoHZuFD3c+dsJ3l/eD7zHjLY11052TfzKU=", + "pom": "sha256-JrUf3babXKbgRM2ii40cGje2+v0M+5v7FakZ3lfGcdU=" + }, + "org/apache/maven/doxia#doxia/1.12.0": { + "pom": "sha256-LQKgvWTzMbdnzudFWzGTxvuCEQFDoRmFiryWh5il/Ck=" + }, + "org/apache/pdfbox#fontbox/3.0.2": { + "jar": "sha256-ds8EEOkD49txQDKvu0WNWiO5IlO5/fiAA18J6orTraw=", + "pom": "sha256-hthT5W8q+Yb6c1s/kH6jh6KXNCLH0F8TwDasuRNal90=" + }, + "org/apache/pdfbox#pdfbox-io/3.0.2": { + "jar": "sha256-nW535C437zaC53aBEpwxRRXog9UKvB3aljguejHnDjg=", + "pom": "sha256-yD3gYR+UMN4W2dakjfXJEPgrkfHgU1xB9Woy9iYwz0c=" + }, + "org/apache/pdfbox#pdfbox-parent/3.0.2": { + "pom": "sha256-kN6rEjTjkUu8B07Ax3Y7+kFHgICziISpOwtVVxnWY0g=" + }, + "org/apache/pdfbox#pdfbox/3.0.2": { + "jar": "sha256-yv4sysEB6ao63z9+p23/AuWIWislWLdfr/l0dvBIfuI=", + "pom": "sha256-wMNAwn6AF2V+Y81PaJUG8U03Y10NFebRpAjysZFGax8=" + }, + "org/apache/pdfbox#xmpbox/3.0.2": { + "jar": "sha256-GJLj3icM8GdIRgZW0G0/sNFfScVLfRs4hB5sl0WwGuQ=", + "pom": "sha256-LOPcpcHUKiZOJw5rOrIcR5Dd0f2Vg3ZOkjfGoYqKkXc=" + }, + "org/apache/xbean#xbean-reflect/3.7": { + "jar": "sha256-EE5em7WmafhnIvMigZYHAPfsjjIJ71GyPrm20j0WKcs=", + "pom": "sha256-l5XBUyLF0ZrzNu69nhZPp9WJfEsASn1m4hY1oXPnSKk=" + }, + "org/apache/xbean#xbean/3.7": { + "pom": "sha256-6nFxMt6EBLYvyQl6HzIVxwXVJdRXvppfEmU63GjDOrc=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/assertj#assertj-core/3.13.2": { + "jar": "sha256-2LaYBfg9lmaqZ9vjqbk3RoFgdo30B6I9eHR1LyzFuKw=", + "pom": "sha256-aMUxi7Y+vrPoWy/olYk5tQBiVfjxG7JEL4gH7DvSZ6c=" + }, + "org/assertj#assertj-parent-pom/2.2.5": { + "pom": "sha256-TeW1pTWrd9GKtRYTfuTfTKVQlYCSpb+VqkefdSIEBkY=" + }, + "org/bouncycastle#bcprov-jdk18on/1.77": { + "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", + "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + }, + "org/checkerframework#checker-qual/3.19.0": { + "jar": "sha256-qCfEkYPzpjInfSegpGc2hss0FQdEe51XAmEJS9dIqmg=", + "module": "sha256-U+GJnd48UTyh79N2q/+sDmkH6OhKvV+WYkJjTJXk0Vc=", + "pom": "sha256-KbqcXOGpS3AL2CPE7WEvWCe1kPGaSXdf1+uPmX+Ko3E=" + }, + "org/checkerframework#checker-qual/3.42.0": { + "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=", + "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=", + "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo=" + }, + "org/codehaus/groovy#groovy-bom/3.0.21": { + "pom": "sha256-ksw2r/0g9Wi1CSwLlOz1hd3rCigbbIunJWVwuxhdZTQ=" + }, + "org/codehaus/groovy#groovy/3.0.21": { + "jar": "sha256-XPNzDAwsFcKT93UN1xFO0npnH8lAFlu64DeKKB9bLV4=", + "pom": "sha256-uOnopeJGLS/MFGzkHalgebiTHnDbPqudWdaJhj0Jaxc=" + }, + "org/codehaus/plexus#plexus-classworlds/2.6.0": { + "jar": "sha256-Uvd8XsSfeHycQX6+1dbv2ZIvRKIC8hc3bk+UwNdPNUk=", + "pom": "sha256-RppsWfku/6YsB5fOfVLSwDz47hA0uSPDYN14qfUFp7o=" + }, + "org/codehaus/plexus#plexus-component-annotations/2.1.0": { + "jar": "sha256-veNhfOm1vPlYQSYEYIAEOvaks7rqQKOxU/Aue7wyrKw=", + "pom": "sha256-BnC2BSVffcmkVNqux5EpGMzxtUdcv8o3Q2O1H8/U6gA=" + }, + "org/codehaus/plexus#plexus-container-default/2.1.0": { + "jar": "sha256-bc6xJGsYgVO9y2+WLVQ9Ud22csygfK2Up4+6vJ7fCjk=", + "pom": "sha256-i4wg5jC9zHlcyYUCTEwQRcFHvhFgUsLJdeMMYI9/O0U=" + }, + "org/codehaus/plexus#plexus-containers/2.1.0": { + "pom": "sha256-lNWu2zxGAjJlOWUnz4zn/JRLe9eeTrq5BzhkGOtaCNc=" + }, + "org/codehaus/plexus#plexus-utils/3.3.0": { + "jar": "sha256-dtF0eSVA4nda+U0D0Q+y08d24s0KwOv0J9PlcAcruc4=", + "pom": "sha256-ecl5IHP97jzb69YadrqMLdEWJKn4XRKLrla9oZ4gR1w=" + }, + "org/codehaus/plexus#plexus/5.1": { + "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k=" + }, + "org/codehaus/woodstox#stax2-api/4.2": { + "jar": "sha256-ut9ggaC7Um/SwBlR3++tkbaEa23Q6wBIWH4w0d0zTmg=", + "pom": "sha256-YhW0dL03FPG5z0216ig39LqvO42vkSEOh+qM6mWlCXw=" + }, + "org/codehaus/woodstox#stax2-api/4.2.1": { + "jar": "sha256-Z4Vn5ItRpCxlxpnyZlOa09Z21LGlsK19iezoudV3JXk=", + "pom": "sha256-edpBDIwPRqP46K2zDWwkzNYGW272v96HvZfpiB6gouc=" + }, + "org/controlsfx#controlsfx/11.2.1": { + "jar": "sha256-63VY0JTDa4Yw6oqab40k+K9F0ak6N14R4gbXbAgiFDA=", + "pom": "sha256-veC6xL8EPqp19uTOEbpXfHneak+5Mfd1e93Y36MwKTc=" + }, + "org/eclipse/angus#angus-activation-project/2.0.1": { + "pom": "sha256-wxdtWY0dwW67QG/aGoexTEUBqjNfBa584+Rq6p6NsbU=" + }, + "org/eclipse/angus#angus-activation/2.0.1": { + "jar": "sha256-siZ2GBWGjt+JZMHXHm0tVKsjjCeIUHBhtOBjOTO0wTE=", + "pom": "sha256-Z8XrD/f1JeoaGY8C2v7nfg0qUxudkIBxvEBhOGrgQO8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.8": { + "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jetty#jetty-bom/9.4.54.v20240208": { + "pom": "sha256-00QQSm7mGdplmEA8JdA6qqrw9U6WRv01EkWN9Xyarrg=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.9.0.202403050737-r": { + "pom": "sha256-RLRxOI58JtkpSnpPJNmX7DTzaSFvMjVInkAbKlUdS1U=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.9.0.202403050737-r": { + "jar": "sha256-YgmsZpG+KgYyDwIADYm+1z7fBfRdZe+aFVFHURq3fzw=", + "pom": "sha256-d5jTR1SE+88OZAOlETeAHPEey2CRi2+vtyIRUiU5Ews=" + }, + "org/functionaljava#functionaljava/5.0": { + "jar": "sha256-N3rRQOfSa6BPrfIZsJ1+HHS8AjL6QBCyDBx52xH5Zw4=", + "pom": "sha256-R9OA2YVT2vdCc5tRC/3ElIp0GHftyypTlvwpGZaJzgk=" + }, + "org/fxmisc/flowless#flowless/0.7.2": { + "jar": "sha256-VsrfwuST8d5gGZhYCx7WJW/BWO+MWjN55KRdwGckzw8=", + "module": "sha256-l0+zKTCi9FClhhTqRgzUDE/UV25NKK6Ca8YTk6hMZjE=", + "pom": "sha256-CouO13pqSfjRGZIu1DGJ+Uh3swjL1fQf5GIh3ucsi7Y=" + }, + "org/fxmisc/richtext#richtextfx/0.11.2": { + "jar": "sha256-jeYtdfz5uFsvvp6ONe/GZAjIxdC1n6bcB/uLSBsoJCE=", + "module": "sha256-V2XP/R3VuYQkk0Xpet9SwCiRewJwzji40UE77kLOz6A=", + "pom": "sha256-Vahb2I6AB9CPU/POrDa9wNxLJPruAmqXwraXmfklEzw=" + }, + "org/fxmisc/undo#undofx/2.1.1": { + "jar": "sha256-25cIxYqOLbRX+9Z/BRXkqVlVygsLj06no9y7/L0Z0tc=", + "pom": "sha256-t2MMyZwGJaE4Mvzmb+wLKb0OmuwHD76DO461Jy3BhHU=" + }, + "org/fxmisc/wellbehaved#wellbehavedfx/0.3.3": { + "jar": "sha256-4pEAWo4yM7A2RQ0SbLzScNW0Ujl3GZSVGcM8i6CeJXw=", + "pom": "sha256-RxdpNVcNIb1oX5VaJavPbwFwmrtaN3Wsj6iVA3fKSZ0=" + }, + "org/gaul#modernizer-maven-annotations/2.7.0": { + "jar": "sha256-noNA0HwiJuKKj10RVBiy4qsCE58vOWbc2RY/pZAuJn8=", + "pom": "sha256-yoJ5IPQ10QCcug70IeWcw5F0GoYJ/vV0nTZgG/D2k7Q=" + }, + "org/gaul#modernizer-maven-parent/2.7.0": { + "pom": "sha256-gAUSdml5uc61hhNSs3ZhZDJ/HNSPc2skbJX/x3U+Eo0=" + }, + "org/gaul#modernizer-maven-plugin/2.7.0": { + "jar": "sha256-QcjLKxfxDnw79Q50lq1L/nMEp/3ZFERxhWChsr5EZPc=", + "pom": "sha256-RjjOCZYGJo+Joi0e4qgp3FOg/Z9NtiYBjca5EKDSO+k=" + }, + "org/glassfish/grizzly#grizzly-bom/4.0.1": { + "pom": "sha256-mm2yNlYQGV49O4GXFx4OVMM5gUNX5vmaJPW8QGP9uwQ=" + }, + "org/glassfish/grizzly#grizzly-framework/4.0.1": { + "jar": "sha256-9vSRqXbwNZL2hsao4PxPIFRgXR0wF/t9j/Sd6aL7dp0=", + "pom": "sha256-2dwKWG7j+v93SUXK9+wVK8QXzBxUD4w5mPLESqMNCaE=" + }, + "org/glassfish/grizzly#grizzly-http-server/4.0.1": { + "jar": "sha256-gLG79NRUkndw789LIfoy0y2M2ugJKMK5b+gkCwttFcQ=", + "pom": "sha256-m6yXc7fb67qrxiRBjoloRX5SEdwBTGbhjMsN4y7+P0Y=" + }, + "org/glassfish/grizzly#grizzly-http-servlet/4.0.1": { + "jar": "sha256-1ZEIjRLmYpUNHCul35Hi2t0/k/HCPdkCJkEvwlBY8Xw=", + "pom": "sha256-fqD4CtPGql+VUxdrv5GLN76A4CHMeqo9LkuV2ySvXmk=" + }, + "org/glassfish/grizzly#grizzly-http/4.0.1": { + "jar": "sha256-SPcpFdeqWmqaaIMJPCnS/poMGz0MwJkJQtGV4ZiDqA8=", + "pom": "sha256-2lhHmLixD4gckYv9UsHWb2U1hN4xEcNzNshf3sGheGc=" + }, + "org/glassfish/grizzly#grizzly-project/4.0.1": { + "pom": "sha256-1bwcO6NciLv/9nlRP8YlLya9crqSrzzSseLvq7kbjGg=" + }, + "org/glassfish/hk2#external/3.1.0": { + "pom": "sha256-oh3tpD6bZO1uigyuzMX6dGyOcLU2bkRx+McV2r7j/Zw=" + }, + "org/glassfish/hk2#hk2-api/3.1.0": { + "jar": "sha256-kgJ30r2mEOLMU6BKT1s4+0hLAwzenI6MXAoS8SbW/5k=", + "pom": "sha256-I+ad5ZlFefvsnR1FOKI12knh2rfMwXPcTZymGcRs+Jo=" + }, + "org/glassfish/hk2#hk2-locator/3.0.5": { + "jar": "sha256-sFInfb3K74EPG0KxDpQWwj58z6DBlbClNE2AzBeGMew=", + "pom": "sha256-fbjs2dCxJgwgfvn0l6mzoGnYJSMxN6BAThJFWeH7PQw=" + }, + "org/glassfish/hk2#hk2-parent/3.0.5": { + "pom": "sha256-4wc+GDpLY13Hl4Q2wq1v9Xl+CK+8nB+jLTMpHMqcVuk=" + }, + "org/glassfish/hk2#hk2-parent/3.1.0": { + "pom": "sha256-yOhpECjfgN2wyP5MGb7QmL/XVRF5VQemBeN/uEVr7e4=" + }, + "org/glassfish/hk2#hk2-utils/3.1.0": { + "jar": "sha256-17fKc3GmdocxY+B/e1CMFzKkA2unAep/6CNJ+EnvuOc=", + "pom": "sha256-KC/8KZjCw5ScuWuRABq1WMXQg8vf6eS9HG8s8elYKC4=" + }, + "org/glassfish/hk2#osgi-resource-locator/1.0.3": { + "jar": "sha256-qrXXhJ98/Nosx8VBuhvTZRUdQidvFRyCU4ckXf3j3XQ=", + "pom": "sha256-i2Yi64HlVymfvZqoVLxax20wf3rl53BYZImli7Uziyo=" + }, + "org/glassfish/hk2/external#aopalliance-repackaged/3.1.0": { + "jar": "sha256-RMv2jdXiSe/CJK18RWwdiYtx0ISvvC0hfoQ2RLlrp5s=", + "pom": "sha256-I+QCQveDcaQIPtCaMpEUPM21vRwbpVP9iEDlEMjPBwA=" + }, + "org/glassfish/jaxb#codemodel/3.0.2": { + "jar": "sha256-aTwDgiR2QDufy2V4z2sHsgx/nQ02otJ8zPDAjcWH7ic=", + "pom": "sha256-5osyFiDUZnkRXhg3kAvguBEK5FTzjguChwtcj9mYErk=" + }, + "org/glassfish/jaxb#jaxb-bom/3.0.2": { + "pom": "sha256-BioTMvjLS+0N2c1Yu0zAdQH6RMkNqhf+wQefRQudVwM=" + }, + "org/glassfish/jaxb#jaxb-bom/4.0.3": { + "pom": "sha256-Zg8EhAYlliYXiumpcrA86VFmXDPDM8q0U7EXi40NJBU=" + }, + "org/glassfish/jaxb#jaxb-core/3.0.2": { + "jar": "sha256-+aNguTlZdkOyZ241/El6+1YdIOilExKKXABwNm2xG70=", + "pom": "sha256-YMLhqbt6sWupylJsRx4DMNtXyHOeLAutDZkOntbHzo4=" + }, + "org/glassfish/jaxb#jaxb-core/4.0.3": { + "jar": "sha256-1tdcQidSaE+/BN10ohaY/q4OSkBsKJK1rwLSPcl7KsY=", + "pom": "sha256-crhKVGcO3sRAUgH3Heo7C/aYJbrkFjNtfzFAbGnHoyc=" + }, + "org/glassfish/jaxb#jaxb-runtime/3.0.2": { + "jar": "sha256-ezo3hLnG40Oo04/BCGArqBAXfwPy2NHnJYsc73/Z1Mc=", + "pom": "sha256-AY2B8CPynufFVdb1lyBuLUwvuAttvBhUWuite6+LGQc=" + }, + "org/glassfish/jaxb#jaxb-runtime/4.0.3": { + "jar": "sha256-eV4tvdPmTIun5TLjX4MTZgOTGo6aO1/+sF+fSDratuA=", + "pom": "sha256-sloOI7PxuK4yG6wnNyC3TCIqN0DdHj3h6W1ItF8ukW0=" + }, + "org/glassfish/jaxb#jaxb-xjc/3.0.2": { + "jar": "sha256-qLkrrDG2MaGQwgzh9qDutnKVUjP/dAIe/lCcph0nO3c=", + "pom": "sha256-2tovgbYhAbOknTPrHeF+KQZCBo7uk5bzS7XDZ4p7qKk=" + }, + "org/glassfish/jaxb#txw2/3.0.2": { + "jar": "sha256-tLz5T7CnWUVuJSFyRRO67JS3jpMSdUSvFi48/wjZM0M=", + "pom": "sha256-aZ+oKsMHb9ZNujfkw8DSJValP4R1ALK+EN/HKUI+eLk=" + }, + "org/glassfish/jaxb#txw2/4.0.3": { + "jar": "sha256-3welGAG5leRK7JqV74ddlfu43ih0QX3mBm2E9zHLnpw=", + "pom": "sha256-i4TetIZ5zAQrPL7GjXA9+c6May+SOdqKKOPKqp7a1Nk=" + }, + "org/glassfish/jaxb#xsom/3.0.2": { + "jar": "sha256-RXBjIzVKYGMj/xEwy1deRMbU16rEQ5VkF018ys5syQo=", + "pom": "sha256-4WK6+AKxr6D6VE2rOuYoVvK7AvnoWVvAwYjrfaatfoM=" + }, + "org/glassfish/jersey#project/3.1.5": { + "pom": "sha256-qG4HZUqPTqHoQgJUPobD7SafpkgyqXLO2C08p5JkCek=" + }, + "org/glassfish/jersey/containers#jersey-container-grizzly2-http/3.1.5": { + "jar": "sha256-CRUFmLl8UkVc5WpQbdEL5TbM6uEgrbYKUZFBVhkbSvE=", + "pom": "sha256-YO+rDTz6F6XsD7Tq2FkbRjhM1KgJhwuIkpWKsJ7IziM=" + }, + "org/glassfish/jersey/containers#jersey-container-grizzly2-servlet/3.1.5": { + "jar": "sha256-NmJ3F780m9H9NbOSPFvUBEyRNQL9UPE/vw6dnqTBvDQ=", + "pom": "sha256-PN56Lc1NRb9jJmpPSMAtHP23D8eOUAa/MKaNOJhSeOo=" + }, + "org/glassfish/jersey/containers#jersey-container-servlet-core/3.1.5": { + "jar": "sha256-0HhdH6ximojUY358LM52rhvfhWnT6MFWJaDCsn+r53k=", + "pom": "sha256-S8Rp8T3VEcgew+RO5FmhKSNSf993i62d7GU1cYNWiSc=" + }, + "org/glassfish/jersey/containers#jersey-container-servlet/3.1.5": { + "jar": "sha256-GDEXWGACsiKhBXGo3twMaIlWXGboQmH8nktnPXCv7OQ=", + "pom": "sha256-bYYCMI286FDIaQVca8hy56G75XJ+cpkPDZitrkAh5cI=" + }, + "org/glassfish/jersey/containers#project/3.1.5": { + "pom": "sha256-w0lqpSIlKKZlfbQpB8W21Xic+vEgpLAM8vMj7AiynZg=" + }, + "org/glassfish/jersey/core#jersey-client/3.1.5": { + "jar": "sha256-4muCTOuB4MpLc8eBBEj7VWbvDBeshxrdk6ksKR5QUkM=", + "pom": "sha256-5Ij1g6kL9sbEMHOPxl2vcu6tzDLiKtP7e8lKYv0C3Ew=" + }, + "org/glassfish/jersey/core#jersey-common/3.1.5": { + "jar": "sha256-xyWPN0Qz31g+ULvlWD/W1mlDk6MikVAk9xnSGiGNwBI=", + "pom": "sha256-/knk2CpaOF6H9YzdvJKUG+MWpOhfnorIlUORB9yuyho=" + }, + "org/glassfish/jersey/core#jersey-server/3.1.5": { + "jar": "sha256-qbleTsxoqwZCycSmUEgmMO3smVvRp0DWIjYWooKwXnY=", + "pom": "sha256-M24ILdVc0GTsiV42nLKSbawHHDwrva37cQCGCHuY4aI=" + }, + "org/glassfish/jersey/inject#jersey-hk2/3.1.5": { + "jar": "sha256-DJSWz8a0+bIjxEyDtN8+3qeSTOTVK/+1XPGA6exLTus=", + "pom": "sha256-3jrHm4cU7g1lUp0Cp62C5duJ52Runw7sq+2tNenvad4=" + }, + "org/glassfish/jersey/inject#project/3.1.5": { + "pom": "sha256-aRrGuMI0wACq6GFyQwpKF6sLZlzSHGijpf+13gg0SEU=" + }, + "org/glassfish/jersey/media#jersey-media-jaxb/3.1.5": { + "jar": "sha256-2Iuyf13SKPAPBh76KOkQvK5V7SdqPWhGSntF34Rj9s0=", + "pom": "sha256-jWmzTdb7VDDtvUIP3/3tU/n7fBCm4tloba213xBqtfw=" + }, + "org/glassfish/jersey/media#project/3.1.5": { + "pom": "sha256-B3StBF40WyM4BI1aabYx1qBEkSWqO3EIFTCny6WY5x8=" + }, + "org/glassfish/jersey/test-framework#jersey-test-framework-core/3.1.5": { + "jar": "sha256-GmwP8JuRO4+DFQjA3d8k+pg+2XVFdYEXWBf3DLGGCTs=", + "pom": "sha256-RL34Nhr024shPxcP1pRA+UVp4PxlbFrEDJJGU2HT/PQ=" + }, + "org/glassfish/jersey/test-framework#project/3.1.5": { + "pom": "sha256-tR7CLcyzmCwMtbZPWIi7XRZBpRex1ukrHs0GlrXWiAM=" + }, + "org/glassfish/jersey/test-framework/providers#jersey-test-framework-provider-grizzly2/3.1.5": { + "jar": "sha256-BFgys+mtbHeTEeUEW0WOWOFoNesKi2k+sT9jeDx7xL4=", + "pom": "sha256-vSgHhW2X3Ybj7N5tOAyKuFtmbvhfxLQ9SpakI9DQT6g=" + }, + "org/glassfish/jersey/test-framework/providers#project/3.1.5": { + "pom": "sha256-+wR6Cq8ol1omU6F9ut6avXmwygNpXG0eNONob5qdnHg=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-core/2.2": { + "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=", + "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" + }, + "org/hamcrest#hamcrest-library/2.2": { + "jar": "sha256-OFFSOiAaDUglwlphpu3FBxKCWjm9PQM5G5jEjKPLOWw=", + "pom": "sha256-9YrYNdJCZDElnYbk/jpPUWHmcdkWxcvs81c4vN6C/P8=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "org/hdrhistogram#HdrHistogram/2.1.12": { + "jar": "sha256-m0f7rkRP6qxLfgTw6ilFaeS8KCvGnYws4qw/I1dygeI=", + "pom": "sha256-f7PnkMFU0bXiMXC7jL9/cO8ICa8XIp8dywENd5llEIA=" + }, + "org/jabref#afterburner.fx/2.0.0": { + "jar": "sha256-PhxWSKv8xpaYIdi3BnPwxMV5qp8IBP/9/gwn1UTZDIM=", + "module": "sha256-j0p3hue1SGir/mBWqjTFp/vJ7uk9vWg8B07GwyBIjm0=", + "pom": "sha256-b1tEN8KM1NC5yV5HQ6wNwU9fQPQzpbHCqMJNxvnDH14=" + }, + "org/jacoco#org.jacoco.agent/0.8.10": { + "jar": "sha256-MtYiEcCjI/UIIqdQpkfBIrKxtVn2NTPqLjJMAyQ4E3A=", + "pom": "sha256-8Dj11h4Ka6MZsFBzsoShXIa7d0fko0lrJ/N6cRgLHNc=" + }, + "org/jacoco#org.jacoco.ant/0.8.10": { + "jar": "sha256-p8jdZ0GsszfMB3GpvxdqpnwJpSpt4BHreg9eeMm9WHI=", + "pom": "sha256-8J92Wz8N61zalBSG1r4ldS+XhC4/4yVTfWnoG7wTey8=" + }, + "org/jacoco#org.jacoco.build/0.8.10": { + "pom": "sha256-49ew2Y3rqhRTOTwiA4GSEsUofrvEZ90LSiKtBGa9bDs=" + }, + "org/jacoco#org.jacoco.core/0.8.10": { + "jar": "sha256-54lmfZOnUDk47peK5Pu8mhvM2jtUYpmyTYVQ2BbYDgg=", + "pom": "sha256-k6Dt1RSc77OOYvS+NIF5FJBoCbxPM7shEoPcQ31x6ok=" + }, + "org/jacoco#org.jacoco.report/0.8.10": { + "jar": "sha256-PjXBT3hTx8iNvgTPCG7gU6Vzn0GemACZCbvt7N3d1Qw=", + "pom": "sha256-aoWwNquHV1jv3g+Y30EAhum51X2CYYiosUVgVC3yuuI=" + }, + "org/javassist#javassist/3.28.0-GA": { + "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", + "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" + }, + "org/javassist#javassist/3.29.2-GA": { + "jar": "sha256-qQ3bJRNd+eV+qb1OIk4hlVSSl1j5uumWXyn4HWCjKT8=", + "pom": "sha256-Ehu5fA3qc0LXSJInrCe/8J2hJ6TkS14Vy09YyeccbIk=" + }, + "org/jbibtex#jbibtex/1.0.20": { + "jar": "sha256-sOqDZn2darH89q2EieF6pRsA18CGRUrsNQFuL7Ucm7U=", + "pom": "sha256-ZMsdu8KSZgmcYTnVsq8NXKfUxgVV/gABoBePhGjfnCo=" + }, + "org/jboss#jandex/2.4.2.Final": { + "jar": "sha256-PyzlXH1x50RYFIjcUQWAaqgITAjm6RagGbq4+GmJlPA=", + "pom": "sha256-6l4By7dQ+V1+DkR9PLk0NadCgZU9ldZTKzyEgHwo10c=" + }, + "org/jboss#jboss-parent/12": { + "pom": "sha256-nlb1shiYpucR6FdiGsHvts88PeFlpKowfbmYgmrU/98=" + }, + "org/jboss#jboss-parent/39": { + "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ=" + }, + "org/jetbrains#annotations/24.0.1": { + "jar": "sha256-YWZtvOfkLmyFtDwE/PuCk6Idy1WzyA6GknDOQsAaazU=", + "pom": "sha256-mb7eKcAzHBlS7uBL+ZeN5TWpDJfi3v/6XgCTNRcZJbA=" + }, + "org/jetbrains#annotations/24.1.0": { + "jar": "sha256-J6dw3HzlBQCRi7jDwGYMmCkGMOx5a1489rkPQDswM8Y=", + "pom": "sha256-Ljf9cCCkNkueXZ93xbZ0Kjvqkn3VYMoeOQ3IFcnFCCA=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-bom/1.9.22": { + "pom": "sha256-GICVqDQdZtIs9LSZRMAFThWpS7j7m06rL2YabLjD4X4=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.22": { + "jar": "sha256-K/6t7lmrGYjDNtvW5l2ZH3Zq4d2Gg/Km3tX6oCefDKA=", + "pom": "sha256-s9o0u29ClqzzoPRDRm8FBsbJnaXNliTW4LdFsiKHhOs=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.22": { + "jar": "sha256-kqV4ExcUR9U0Rh+hP+N9yM07f4bYPpsfe7GwvjBUH4s=", + "pom": "sha256-9uo9z2v7Og0GmER8SKa88I2Oqs+D/JX+nUGBpeXjwrE=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { + "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", + "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.9.22": { + "jar": "sha256-uAZwV59/ktRz2NWDTwsST3dVxFmP6UskQYOwKDSDRXQ=", + "pom": "sha256-/ra0ns9pEG1MEoXnH5ob2noSfO9oMC4+n9yCmKTjR5U=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.22": { + "jar": "sha256-ar4UbCeGQTi4dMzM/l9TTj65I8maG3tdRUlO5WlPPgo=", + "module": "sha256-9IIxS1B5wUVfb7DUJXp0XRAcYSTOlhUiuob53JCQHkc=", + "pom": "sha256-zOLxUoXsgHijd0a1cwigVAQt1cwlQgxD9zt4V8JGjwM=" + }, + "org/jooq#jool/0.9.15": { + "jar": "sha256-ow2WcZCZ603oewgVL5etsLo8/vmX2tys6LLk3NwZf4Q=", + "pom": "sha256-/mCqsovG1YbUq0u/zSPc9KFXa/gzK2lEwhxaehS8x4M=" + }, + "org/jsoup#jsoup/1.17.2": { + "jar": "sha256-9gszs46desk+qqaKbHD3BruZA2SUsuKt0r/uEdCaxvU=", + "pom": "sha256-ejSdIXeQw3ML4wjO0eqe4yxOdPcgWOg8K2DloolU3Q0=" + }, + "org/jspecify#jspecify/0.3.0": { + "jar": "sha256-4cfhgytglfz8vldIVwDHMw1T1OV+LFu/nHGBmwLpeL4=", + "module": "sha256-M7jCLyQkwpAyQaf+olj8QasMTWiJd2V2xRkEdWLuQ6U=", + "pom": "sha256-9LGyrWHKF/KNBjxWEJ0+g5g5oQswG8lzSVQ+zu5X8xY=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.5.1": { + "pom": "sha256-eHThBkE5sx4sWkZrPcEClwk2IWK98B8PSqq3OKuTLTM=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.2": { + "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=", + "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=", + "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.2": { + "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=", + "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=", + "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM=" + }, + "org/junit/jupiter#junit-jupiter-params/5.10.2": { + "jar": "sha256-7bHkP/C4BnYm/7VeXp7sodmrJHgUGnx/JT0RWynMfPI=", + "module": "sha256-IMLmXVKjnIVJbo4XDgjG7Sk1x/NeZRAT2WTcG7dcgns=", + "pom": "sha256-8n19CW20igXW56/YQalUVEJOVcUj167RZoF4szpjy9c=" + }, + "org/junit/jupiter#junit-jupiter/5.10.2": { + "jar": "sha256-Jj5DRH9LQPEmrWsdy9ffN5RIQTve244NJAxby7p8ek8=", + "module": "sha256-cjF2bPGyuJLGehQsljkU5rc/u1BhpschROt/jnJ3DsE=", + "pom": "sha256-1bcMXC10Ui2mEM04d28iW6wDSsJZGEO+6Xl6urOIDqs=" + }, + "org/junit/platform#junit-platform-commons/1.10.2": { + "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=", + "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=", + "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c=" + }, + "org/junit/platform#junit-platform-engine/1.10.2": { + "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=", + "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=", + "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728=" + }, + "org/junit/platform#junit-platform-launcher/1.10.2": { + "jar": "sha256-rtT0L7kK2ps0fCMfE2VvwJEhuiDattxkamvZ1Nox5Ko=", + "module": "sha256-/1YhIQJQJSv9rbYiu+LqZuzsMahnc2zqSz1K3yGcp/8=", + "pom": "sha256-WjEXCOeQa7l0YpwayHC8EWV0ZbmJ2koHfkVBa9mHJeQ=" + }, + "org/kohsuke#pom/21": { + "pom": "sha256-C8qSPq0O1GSp1AglUITbhghxsjIMrdDduczkbkwFvi4=" + }, + "org/kohsuke#wordnet-random-name/1.5": { + "jar": "sha256-AgxW1yGfqdgrfi/Puj0kyX8HYYsqaVfZMIetcHK5khA=", + "pom": "sha256-RG4Gql8gAlAWNo2W9yX5sXUss+w6sp4WzLydoyMZpwA=" + }, + "org/kordamp/ikonli#ikonli-bootstrapicons-pack/12.3.1": { + "jar": "sha256-OgLyfRuGyubrnLgLOarbBmxaD9H+ppi5ce3nK9BdMe4=", + "pom": "sha256-d0wPeMVNPKNg7wDAltsvKlndf7EV5RqC2c7cfGAgRxM=" + }, + "org/kordamp/ikonli#ikonli-core/12.3.1": { + "jar": "sha256-GN0LOvW716ZKvvWvdGzkm71mvYDx+4l0PR46D4sP5Ws=", + "pom": "sha256-MXGJdHSQH1Jt2wccCwJQtouDW3A73/Src5rEJEObYWo=" + }, + "org/kordamp/ikonli#ikonli-javafx/12.3.1": { + "jar": "sha256-tx7z81LDaeDn8IwU74nKv4hC9JWh5smUkDfZXvSpDYo=", + "pom": "sha256-7dl4yXjxkoOOVUh0EJibs/8oxpX70JBPNsT0E2GXzEQ=" + }, + "org/kordamp/ikonli#ikonli-material-pack/12.3.1": { + "jar": "sha256-G8TzVs+yhQv6nEGB2qLb8zcI505bZGNRUIJpMs5hxVA=", + "pom": "sha256-gAcPK4qbi/U63F7pO7qDGY5TL0PE8UhVEi0yFE66Sj8=" + }, + "org/kordamp/ikonli#ikonli-materialdesign-pack/12.3.1": { + "jar": "sha256-FeIubWaDNfbf3LTQ5KqJix+/uD3AMxvvRXoe2kJggtE=", + "pom": "sha256-j/6Z8wpYyG7I7ihokW5DMLRQ7kGJQcRn0K9t9phGlsA=" + }, + "org/kordamp/ikonli#ikonli-materialdesign2-pack/12.3.1": { + "jar": "sha256-1Qfh07ZoZNeiol957eMgvssfduFtIAsGdW9KzmWCEMQ=", + "pom": "sha256-GkIkc7zZStCyfgXp8HNHJPjcCXtbdAKBE8Bug1+/0OM=" + }, + "org/latencyutils#LatencyUtils/2.0.3": { + "jar": "sha256-oyqf+gay9OAcU2D4+d97xdlFSl03PNjzYTR/paVxZew=", + "pom": "sha256-jwwBU3kLhK9sCTFtVpvRBu4PAIuTk+gLpHj1v2Vziig=" + }, + "org/libreoffice#libreoffice/7.6.4": { + "jar": "sha256-mTOuf6lh4qeFo1Iat1cVdyuuNUA2zeigI5mnc4OeGDY=", + "pom": "sha256-fNpYEKQpmEYPgNrKCZ6YAJtcY0bqKgVJLsE7NPQZQbU=" + }, + "org/libreoffice#unoloader/7.6.4": { + "jar": "sha256-1j+kVLLB04iy9GZeJhEpHZ8/YxWzy1QPA1sBzzUMbXQ=", + "pom": "sha256-0Agwh7BhqHsyN8Q+dMWdNDgv5EoioiCbf/mmdfLX55s=" + }, + "org/mariadb/jdbc#mariadb-java-client/2.7.9": { + "jar": "sha256-8siZYGTKh2mS9ZDXjqJfbE+siK0pdt/0cp2BbrrNbsU=", + "pom": "sha256-Dh+6B9VnA7GEygOL/cvLxOMHeOUC52dF9fRB/SASFBg=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-core/5.11.0": { + "jar": "sha256-8HbJax9JuNm8QuRrCWmq9WhMQMi1tnnUAOXYgAc6DgA=", + "pom": "sha256-ugsbXXA1CUlPmo5EWCIjh54zSKTElmfwx35odG5IHHg=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/openjdk/jmh#jmh-core/1.36": { + "jar": "sha256-+Ql0430NqIhrXAXm4+fiBVaQDXR8WkHBAjtHwzAepzw=", + "pom": "sha256-mBI0JlrAQfFmsXxa3GsdRZ6JTKv/6vawnAB08PQDguQ=" + }, + "org/openjdk/jmh#jmh-generator-asm/1.36": { + "jar": "sha256-dGCxG4I97nSz4ZYX011ZEbASRTA9bjHDD4NBfPwvVLU=", + "pom": "sha256-V7u+h4OU+LP8G4DEEWHdSItCwNez1wpeR09CcbHqOkk=" + }, + "org/openjdk/jmh#jmh-generator-bytecode/1.36": { + "jar": "sha256-M3ZUL4lQvNcGxRbOBiDR34IjCecJK4+TOJFygxgdWF0=", + "pom": "sha256-URABHSX7lGay8Am/99fsCmLop6uvBomb+2tjBbBOKUQ=" + }, + "org/openjdk/jmh#jmh-generator-reflection/1.36": { + "jar": "sha256-qccnYOEsGZ4qLCjxoSbr8MxbUcC1jUZHJZb8Mvf5JTQ=", + "pom": "sha256-msCIMyyp0UcTCJk55zzaHn/0Q8fIx3usiFsIo7eHUUY=" + }, + "org/openjdk/jmh#jmh-parent/1.36": { + "pom": "sha256-O2PObo/vrLMgN24F6fuzuuhqiJI5AIdZGJoLDVylxdY=" + }, + "org/openjfx#javafx-base/19": { + "pom": "sha256-Aey9z45qdPR7FVUFTzHW8Vsh7yUi+IC47nVoMCG4e5U=" + }, + "org/openjfx#javafx-base/22": { + "pom": "sha256-XPr4AKyei29O5+mOaRZvN0PAo+xyLhx8idLaEzmgQIE=" + }, + "org/openjfx#javafx-base/22/linux": { + "jar": "sha256-guS1JYZGAz4MvYzoYKBZWGDIwNeOrfXKWQ9FNps7PQ8=" + }, + "org/openjfx#javafx-base/22/linux-aarch64": { + "jar": "sha256-V/RTupEwEyrt1pOsAzUdsTU/869RxG/7lUUnp71Jygk=" + }, + "org/openjfx#javafx-controls/22": { + "pom": "sha256-8AZSRCn/IPdz+tfjwXq9/qkkzMeqGamSoeQZPl/kCA8=" + }, + "org/openjfx#javafx-controls/22/linux": { + "jar": "sha256-4E5POGe18PR56yKJsDgwPOn7TR3vImvJHCkYlpvzW2s=" + }, + "org/openjfx#javafx-controls/22/linux-aarch64": { + "jar": "sha256-lrubCX8JhvuuwvMnReQ2C5s81ACnFGtJYwpoQtrks3E=" + }, + "org/openjfx#javafx-fxml/22": { + "pom": "sha256-N2R+Lpsq+3hcJKu2GjjD5p02av/TUyv6J+jIrm92tPI=" + }, + "org/openjfx#javafx-fxml/22/linux": { + "jar": "sha256-K5X/HQ+4GUIrIU2Xs423Bc2alyMK41P0kr3UiJujqdY=" + }, + "org/openjfx#javafx-fxml/22/linux-aarch64": { + "jar": "sha256-6O1DY40U+OTRIkabO7E4SP8WJpgQ+HzeAgwEQstngZc=" + }, + "org/openjfx#javafx-graphics/22": { + "pom": "sha256-snXDI9Pbr1/anOegMkG/JEvfeJ5GFON+pMPjww4P858=" + }, + "org/openjfx#javafx-graphics/22/linux": { + "jar": "sha256-ACrpnQ8ML2Clh72fkRaP7lvZ2AJ4H0eXV1lWz0icJLs=" + }, + "org/openjfx#javafx-graphics/22/linux-aarch64": { + "jar": "sha256-+9uVZeikBGWUwCjtAHX/UIU2XW8K5a855qOlV+InMWo=" + }, + "org/openjfx#javafx-media/22": { + "pom": "sha256-vEijYpt55oTHD6hTfzwpQh5HX2+r0TObedWHcpMN5XA=" + }, + "org/openjfx#javafx-media/22/linux": { + "jar": "sha256-kVG0rkkTRjBQ2WvTTIQOov6iPaJ471BRyvDn8ldkTRo=" + }, + "org/openjfx#javafx-media/22/linux-aarch64": { + "jar": "sha256-ijZAJ9fOc6n4rfSkkxf86PNqTndJGJPmaYmpZt2PHjY=" + }, + "org/openjfx#javafx-swing/22": { + "pom": "sha256-wPQryYkBk3076g85BuQT1HvgXNsaWu7FbRw5JD2DM5w=" + }, + "org/openjfx#javafx-swing/22/linux": { + "jar": "sha256-JTdrxDkPNwbv3wlfQLGAZt9DWkNlufS99GGOWFZexZA=" + }, + "org/openjfx#javafx-swing/22/linux-aarch64": { + "jar": "sha256-4VmmNrLKX0uia0YqDEg/5OUXHIrp8HYcHk1Nml9ZhbQ=" + }, + "org/openjfx#javafx-web/22": { + "pom": "sha256-iart37SyLvVtJt/pOmmrx1NXNSxi1Y+1EkMPWM/q0BU=" + }, + "org/openjfx#javafx-web/22/linux": { + "jar": "sha256-aodN6LOSTA7EKlLTUfIxBgAmwAjLKG8vCqy4PHc/KBk=" + }, + "org/openjfx#javafx-web/22/linux-aarch64": { + "jar": "sha256-kZ35kB0DE4sbhHFpQl4JkHO/1HKexPGy1GKdecJtSqc=" + }, + "org/openjfx#javafx/19": { + "pom": "sha256-3uMYnD1+670gSRMKUACQBOKE7GIJ5pDv/UhQAgcDMVs=" + }, + "org/openjfx#javafx/22": { + "pom": "sha256-ZO+kxQXukz+S0/4hqQ7RVKKs1Dhif6hKHYG7jRZWN58=" + }, + "org/openrewrite#rewrite-bom/8.21.0": { + "pom": "sha256-Azkt40r0B5flheYgsf23SFMWWIlmazmzaDVw1FLuew8=" + }, + "org/openrewrite#rewrite-core/8.21.0": { + "jar": "sha256-6GSDE7y3VWH6HJz3LwkdsFniahLoImye+8+nuRsI76k=", + "pom": "sha256-A/ew4svumksQ5JEhZ0b7LuijjcUa/JkjlA+d/kcSJBo=" + }, + "org/openrewrite#rewrite-gradle/8.21.0": { + "jar": "sha256-XTHPQ9DTaKc4TnQiagPCyBFQTaLfCXOH2z5i9qObeXc=", + "pom": "sha256-Y1eifRHVGfN6a6H/zd4RkoBc+U4sF10ozzespNEpJvs=" + }, + "org/openrewrite#rewrite-groovy/8.21.0": { + "jar": "sha256-DdOshMdDc28F8L33l/WcSHOJGD2HMTE7uaK2/L/b5NQ=", + "pom": "sha256-i/8dIEtMZ/b13X/xrzg1tWYevCpsEq6MteAQTpQE7VU=" + }, + "org/openrewrite#rewrite-java-11/8.21.0": { + "jar": "sha256-63noiYXGCPXvh5C63ZFgE+X0DvI0ep2R0N28MNOrrcs=", + "pom": "sha256-qux8ai9mgiRqmpAAVg71TGZtbwJyownpOglc9dOfIv0=" + }, + "org/openrewrite#rewrite-java-17/8.21.0": { + "jar": "sha256-YYmKR/DtaGPZwkVE2FgoBpuQ3t3BXVgrjYBnYL6hWaw=", + "pom": "sha256-yDjkf7A+AjW8nEw6Iib2ItX9tNbHhhz6XY8qqDov21g=" + }, + "org/openrewrite#rewrite-java-21/8.21.0": { + "jar": "sha256-vzeB1BuAq69JMnA14hGapmmRpFSczMH0nlnoCTRy9ow=", + "pom": "sha256-r6aBMHJ1c+5ylW0IOBqOMDfsa/32V4ZwpVrAWcuWHKY=" + }, + "org/openrewrite#rewrite-java-8/8.21.0": { + "jar": "sha256-z6Of1uCO1N/o3P067MMmN4XJ8pg+Z2DA30eSUs3LF7U=", + "pom": "sha256-7IQKBZa1bUslZiP/yByco2SfqixQoQVq12orrFHPDqk=" + }, + "org/openrewrite#rewrite-java/8.21.0": { + "jar": "sha256-4zpbtRptMY7tffzefDhMW8tFv16SnZz0o+EGgMeWoZE=", + "pom": "sha256-uylbeYK6uPlJwhN+EOrJbqvT0EorJmX+tg6kFfmHyv8=" + }, + "org/openrewrite#rewrite-kotlin/1.13.0": { + "jar": "sha256-RaOAjSzUP0bDYILxlv3vM3WMWDO0+LXIHoFwIRvGGJU=", + "pom": "sha256-n3bzjLFeL0EgpMIyWKbm15pLtd8yLbrc6VhZszsRJOQ=" + }, + "org/openrewrite#rewrite-maven/8.21.0": { + "jar": "sha256-8SfV+EbDpE4Fd3OygACuHm4g4YRosHMdtBuoZkbNl3Q=", + "pom": "sha256-kBLtw6s/7iHpVsBeu+CNjzQhSZgCz35bGQqJ8nLjbf4=" + }, + "org/openrewrite#rewrite-properties/8.21.0": { + "jar": "sha256-xKVI0BqeyFYGiZHDg5V2PAk56idauyEPmvcqmfmEqTU=", + "pom": "sha256-Q+MMeQxF+rOUx/urik29d7MVO5n3DTifk1WDaxg+4bM=" + }, + "org/openrewrite#rewrite-templating/1.6.3": { + "jar": "sha256-gUQATASLXMbZTtHoGAAxH5A+zHydEcZSubaIgMgRHE4=", + "module": "sha256-srYqszmlwMhSsBOwQgXg2tLxanpkleLg+L5JTItfyQ8=", + "pom": "sha256-JlYrXvlmF1b3jE5wQlhMPXqo3UCazWYIF2DfVsPA69Y=" + }, + "org/openrewrite#rewrite-xml/8.21.0": { + "jar": "sha256-vyVYEE7bPfGbrUZ5Tb6zBRDUqKsyQjsWCvcn/cxW+w4=", + "pom": "sha256-Ed1qEe2ACbkIwi76pitZNljilzTTq2JAMLZBRQdBVPs=" + }, + "org/openrewrite#rewrite-yaml/8.21.0": { + "jar": "sha256-C8j00wnD4IHxPpPz8m+ckOtKS+o4jn+GcQcfCDbSBa4=", + "pom": "sha256-l/ku9K9CAgKXwrB/7npvHsSZ3yBQoYK34GP0LIxtUQE=" + }, + "org/openrewrite/meta#rewrite-analysis/2.5.0": { + "jar": "sha256-/wYl8HtENRIN5D1Qnej6SKJrMHGC6O0qAqO9+PIKEXA=", + "pom": "sha256-KJ/UbupGTtq8FE3q3ao/J4pM04i3t3PFlsBMj5s0EUA=" + }, + "org/openrewrite/recipe#rewrite-github-actions/2.1.7": { + "jar": "sha256-+U58BXTuyk4b3glUSQNpazuJLDVWgVfgpx5imSpByQY=", + "pom": "sha256-9tN8nQx7IKgMwlNmh0Qhu6dFQBAqmOXW2HuG9y/+3cQ=" + }, + "org/openrewrite/recipe#rewrite-java-dependencies/1.6.0": { + "jar": "sha256-xEXEsREh7neaM4sehHO5FP2AmadbLdoVhDpBWe4dJMw=", + "pom": "sha256-ju9CTQl7Uu6MX3zAlr8QGXcDPfJpjCteGMNflvPun6s=" + }, + "org/openrewrite/recipe#rewrite-logging-frameworks/2.5.0": { + "jar": "sha256-XkUkAscaFk1HfLoxBS6KoVDPXW2XnkO84pc401lkPPw=", + "pom": "sha256-Fr1EBxgNTmopE+Yv9mBXXkLPgwi+3b48TYTCBlhXljU=" + }, + "org/openrewrite/recipe#rewrite-migrate-java/2.11.0": { + "jar": "sha256-G7KiDLRYWfiH61uT1KFByn5tSgoX7Lili3G1vtnGmtQ=", + "pom": "sha256-1AUeb7KAgDV/Ny3jgzw3F8aGVlg4pS5GJ3JrGtwwzao=" + }, + "org/openrewrite/recipe#rewrite-recipe-bom/2.8.1": { + "pom": "sha256-UhsIRURzoOk+BXcbmOqz/WgEB8mPtt4x6KVvnvUpnGg=" + }, + "org/openrewrite/recipe#rewrite-static-analysis/1.4.2": { + "jar": "sha256-jQ+HQhy5s65fr8DJVx9zBwelxwc7NENwgkxYbEnP3WY=", + "pom": "sha256-JWhucQZ6NSPReV1ZAjkjBbyTEL6hZhHJpRY/JN4mMBo=" + }, + "org/openrewrite/recipe#rewrite-testing-frameworks/2.6.0": { + "jar": "sha256-yZeGKnv0lO04nA2wYX2RDbXQHdJ4FKOVtjz1azcPLdA=", + "pom": "sha256-PTCTctbxw43Bf4rNg5LD0Etp2oCT/T64CA80/bpZo/I=" + }, + "org/openrewrite/tools#java-object-diff/1.0.1": { + "jar": "sha256-jc8DgdMGxSI86kwKy4Sv1WkexutB4Lajbdooigx+xNw=", + "pom": "sha256-WB1ijMi/jOggPdk0mFEiFkhqZeiG6KM7lLgZgdWrEe4=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "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-bom/9.5": { + "pom": "sha256-cXVrNd2DfbY4gG8A9Ad+i7Nf6NgL1nToFBowfIEWNb8=" + }, + "org/ow2/asm#asm-commons/9.5": { + "jar": "sha256-cu7p+6+53o2UY/IN1YSkjO635RUq1MmHv74X3UgRya4=", + "pom": "sha256-im5GDu34zHuF0zx1YhPmpfeHX0qDg9U10ZnzIR7CNVw=" + }, + "org/ow2/asm#asm-tree/9.5": { + "jar": "sha256-PDOmSBkQea6urrfBmkmxU5UvnkD+hvusUgVVTd2azZQ=", + "pom": "sha256-pyqq+N0FGJn6CJ54PsfUgnrE19GHYgHG3uy6qUoNyVY=" + }, + "org/ow2/asm#asm-tree/9.6": { + "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm-util/9.6": { + "jar": "sha256-xjWnQC9Kqb9msvQjDOpiAloP4c1j6HKa3vybGZT6xMM=", + "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4=" + }, + "org/ow2/asm#asm/9.0": { + "jar": "sha256-Dfl1dJFK7pL9NJ0MtOAPM0XUWywjngu1DwqQ6tR4iOA=", + "module": "sha256-ivgQlu06/6OaRyn8kApVtmOJSRHWfE1L7w6kJDk90/k=", + "pom": "sha256-3gNVWQ3Rv8zNyNeQJK6ZKXLoVSaKztua1oLQheA6lK0=" + }, + "org/ow2/asm#asm/9.5": { + "jar": "sha256-ti6EtZgHKXUbBFjFNM8TZvcnVCu40VhiEzVoKkYPA1M=", + "pom": "sha256-LJzOuVHMZYbejZoWxnKtPkwwucMjAo16PDNmVg1WJ7E=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/postgresql#postgresql/42.7.3": { + "jar": "sha256-omRMv7obqhRf9+jI71gqbu16fsTKeS9/BUEivex1Ymg=", + "pom": "sha256-wqy2hFfZlqjkntB3flklW3RlCXZSOVHxAa25QHXhWIU=" + }, + "org/reactfx#reactfx/2.0-M5": { + "jar": "sha256-ux/CCc2cBXsXpIAz03lPk3unpWazwIstuIh3cnaf3Wc=", + "pom": "sha256-FdCXejrnQDKd3KigR9gDgnVo5WO+1MLABshBr3/mftE=" + }, + "org/reflections#reflections/0.10.2": { + "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=", + "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc=" + }, + "org/rnorth/duct-tape#duct-tape/1.0.8": { + "jar": "sha256-Mc7xLd7JedH4bXz3CMQaF9pSPQXGhf1mQunQsq3bckA=", + "pom": "sha256-Jjb2bevm4SQ3Yy8jpnubyWGwNjMAnlJSeju8hx9AabQ=" + }, + "org/scala-lang#scala-library/2.13.8": { + "jar": "sha256-oIgrglFBkMK6x9GkWYcqdfAF/A8+iLK8A5A2cUbjXbc=", + "pom": "sha256-SucLPLDCFdaa6sKMkhLmgR+euXiVZ4I0BgiTNCCIDVI=" + }, + "org/slf4j#jul-to-slf4j/2.0.12": { + "jar": "sha256-hPAoZMq4Zv+xlu0gIrG42mgupvs9ShYQaUKeg5HuKXk=", + "pom": "sha256-cSxGGjt/ZQhXk27ruv6k8afSqsHlVheuJM4+vjkorEg=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "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-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.12": { + "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springframework#spring-framework-bom/5.3.32": { + "module": "sha256-R6cJH2l8pjEYXtQY8Morhu7wyCqhbRdx3exLLDu3s70=", + "pom": "sha256-glr3ES49kupDa7DfeMGVFIhfXAFtD8YMiyTUdjoBWhA=" + }, + "org/testcontainers#testcontainers/1.19.7": { + "jar": "sha256-xjfgJnjOvRKjAZqw/QWu9actBCkfC3OPGASZciMSgGw=", + "pom": "sha256-cKoV/o9xafOk76fPgfcIpIHMucsuCUe2Qh9ZKwjTDkU=" + }, + "org/testfx#testfx-core/4.0.16-alpha": { + "jar": "sha256-d0OENQCPIFYHClNrpQE9YxtPjBJv/1tTpJgh0Ml6dVE=", + "pom": "sha256-WgPqJdnH2bzqrnSheRJYPpZEpfUPENk20ovgMHzuyhs=" + }, + "org/testfx#testfx-junit5/4.0.16-alpha": { + "jar": "sha256-QFZZthIlFxY+GwQdr3WL6q7Y2PQKmtRXEkhiUTrSbZI=", + "pom": "sha256-US6tI6KaaXRc4VgL44P/L1XE+2ts0tAoOjJCOo1sQcQ=" + }, + "org/tinylog#slf4j-tinylog/2.7.0": { + "jar": "sha256-UdOqc6mGv8mFPuqRzXGHe5eJHwHIX2m0Kie1u5YpXeI=", + "pom": "sha256-m/aklJduXebZ9Qqm8D2J3IVeBnG9MGvvgJdAMbEkHys=" + }, + "org/tinylog#tinylog-api/2.7.0": { + "jar": "sha256-61ER4CprUyS1/U5DTL5rkxGb4FrS26PSHPAEWzqXVAw=", + "pom": "sha256-tSUMtY3N/tHm3xrll9xpKdNfukezTEmqKOS4iTyhjSQ=" + }, + "org/tinylog#tinylog-impl/2.7.0": { + "jar": "sha256-N+Uy9wagG7dqmEVMzXHR/6LoPyvv4cMJ5cZ+PEdL7bo=", + "pom": "sha256-mfmyIjpFEnD+OiS3DkfSXS46HWyYW0AxzReI/l1jt8Q=" + }, + "org/xerial/snappy#snappy-java/1.1.10.5": { + "jar": "sha256-Dz8YV+0zEWWD9IC031wCGINsR7+8nGIhwNc/NW3s83s=", + "pom": "sha256-ZfW4PkjZ5JRIKtA/GEyeV680jXj0rr4AzWr9xnaB7Y0=" + }, + "org/xmlresolver#xmlresolver/5.2.2": { + "jar": "sha256-78kr1+0ys+VwleCz6HIFHM+73MmAgx7zPonjgWGoUiI=", + "module": "sha256-GwTrOc/sj9X44KtqVSGymabUTza3o8Vx+6lr5Tp26AU=", + "pom": "sha256-4VopIlQ7OlXDF3TxDoPbdOk7L6kLPWMV3TocQqkfAHQ=" + }, + "org/xmlresolver#xmlresolver/5.2.2/data": { + "jar": "sha256-FzkEvb14O6D6ySxbzAXaXQnwzn7tJDRmZuoKI5Rh+bQ=" + }, + "org/xmlunit#xmlunit-core/2.9.1": { + "jar": "sha256-fnDyPU914F8O558Pa54Tts9R0082xfw6a4OUKd3h7+8=", + "pom": "sha256-0n5OKjEqIVR+82BcgS5+YMiuyWTn+WDlDU3Dy2azkBI=" + }, + "org/xmlunit#xmlunit-matchers/2.9.1": { + "jar": "sha256-uAyzm0wip1yGgQbGJoG/K64aWB9D82s1x74qz52d1GY=", + "pom": "sha256-EuxNwYrSDy5ojDCKgHWYl4ZE8T2bsTrqkDKlUEvQIK0=" + }, + "org/xmlunit#xmlunit-parent/2.9.1": { + "pom": "sha256-1+RY+9XGRFBIeOX7zglLHTB402mn/uF93ezj0Zn9qsA=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + }, + "pt/davidafsilva/apple#jkeychain/1.1.0": { + "jar": "sha256-DBAKBPcAbxpuRxOFMF2IORIFaO29gPV7eHtxq415sXM=", + "module": "sha256-jMj9dmUna3xQ+fSqQtV4t40JKzy8ts0F/TKffE36A40=", + "pom": "sha256-McjawxJZPkNy5BS90l5/ggozTuwD/itb0p4daocwRKg=" + }, + "tech/units#indriya/2.1.2": { + "jar": "sha256-KGUPPEehW1AM1XkXaZKqWfbcQwqEKQqd7Svhly0r/eA=", + "pom": "sha256-ydZchn1fU9Z4XogcMASiwBCmk9EcCT8y03eiwHWxz9c=" + }, + "tech/uom#uom-parent/2.1": { + "pom": "sha256-iIrWpNud30ZNQcX1Jf0E95C5yTmoEPEWskVBw6ndFpM=" + }, + "tech/uom#uom-parent/2.1.1": { + "pom": "sha256-rNe3raemg444OLgoG3V4Hoo+mKSZm79kjwsNiBHXSe0=" + }, + "tech/uom/lib#uom-lib-common/2.1": { + "jar": "sha256-YYJfVNYd2pvalSU7QHZTvhz5/ZuUHaNGLJSjsW8rHIg=", + "pom": "sha256-ZyShzOK9EVWuZmGJ5j6Hzyu2tScCqxqLZsgY18dufvg=" + }, + "tech/uom/lib#uom-lib/2.1": { + "pom": "sha256-x71alqfCcTCj8zlti6X9PO7yPTE9k8wAexFAKlJzjbY=" + } + }, + "https://sandec.jfrog.io": { + "artifactory/repo/one/jpro/jproutils#tree-showing/0.2.2": { + "jar": "sha256-UL0OKkyxsS6fmZUT19xz7XRE6xGDirJwOPh/42G7wk0=", + "module": "sha256-MIj5KRKf67jwt1J/uusje3MSfHk6PB4wVAPLpTn3xC8=", + "pom": "sha256-fP6x7y/1WE9jjIYlE+o+8IyFw0gTyzvHDOPTUyQLTMw=" + } + } +} From 83d8edbedeb471dc472bd46359a486597b37aa9f Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sun, 10 Dec 2023 07:14:15 +0700 Subject: [PATCH 068/227] signald: convert to gradle setup hook --- ...g-during-gradle-build-inside-Nix-FOD.patch | 42 -- .../0002-buildconfig-local-deps-fixes.patch | 71 --- .../instant-messengers/signald/default.nix | 89 +-- .../instant-messengers/signald/deps.json | 528 ++++++++++++++++++ 4 files changed, 546 insertions(+), 184 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch delete mode 100644 pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch create mode 100644 pkgs/applications/networking/instant-messengers/signald/deps.json diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch deleted file mode 100644 index 4a49ff991e6b..000000000000 --- a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 33d8de9ccce7eecb12542e0fc11131b5101e1aa8 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sat, 26 Feb 2022 12:33:13 +0100 -Subject: [PATCH] Fetch buildconfig during gradle build inside Nix FOD - ---- - build.gradle | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/build.gradle b/build.gradle -index ea3fea1..01e444d 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -82,6 +82,9 @@ static String getVersion() { - - repositories { - maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages -+ maven { -+ url "https://plugins.gradle.org/m2/" -+ } - mavenCentral() - } - -@@ -101,6 +104,8 @@ dependencies { - implementation 'io.prometheus:simpleclient:0.16.0' - implementation 'io.prometheus:simpleclient_hotspot:0.16.0' - implementation 'io.prometheus:simpleclient_httpserver:0.16.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' -+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' - implementation 'io.sentry:sentry:6.11.0' - testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' -@@ -170,4 +175,4 @@ allprojects { - runtime { - options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages'] - modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported'] --} -\ No newline at end of file -+} --- -2.38.3 - diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch deleted file mode 100644 index bf583de53ba2..000000000000 --- a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 4bf0aef4003f7494103a93ae1c2957b2cd32bb59 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sat, 26 Feb 2022 12:36:15 +0100 -Subject: [PATCH 2/2] buildconfig/local deps fixes - ---- - build.gradle | 26 ++++++++++++++++++-------- - 1 file changed, 18 insertions(+), 8 deletions(-) - -diff --git a/build.gradle b/build.gradle -index ea3fea1..24415d8 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -10,11 +10,21 @@ import org.gradle.nativeplatform.platform.internal.ArchitectureInternal - import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform - import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal - -+buildscript { -+ repositories { -+ maven { -+ url(uri("@deps@")) -+ } -+ } -+ dependencies { -+ classpath "com.github.gmazzo:gradle-buildconfig-plugin:3.0.3" -+ } -+} -+ - plugins { -- id 'com.github.gmazzo.buildconfig' version '3.0.3' -- id 'org.beryx.runtime' version '1.12.7' - id 'application' - } -+apply plugin: "com.github.gmazzo.buildconfig" - - compileJava.options.encoding = 'UTF-8' - -@@ -82,7 +92,10 @@ static String getVersion() { - - repositories { - maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages -- mavenCentral() -+ mavenLocal() -+ maven { -+ url uri("@deps@") -+ } - } - - dependencies { -@@ -101,6 +114,8 @@ dependencies { - implementation 'io.prometheus:simpleclient:0.16.0' - implementation 'io.prometheus:simpleclient_hotspot:0.16.0' - implementation 'io.prometheus:simpleclient_httpserver:0.16.0' -+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.0.3' -+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10' - implementation 'com.squareup.okhttp3:logging-interceptor:4.10.0' - implementation 'io.sentry:sentry:6.11.0' - testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0' -@@ -166,8 +181,3 @@ allprojects { - } - } - } -- --runtime { -- options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages'] -- modules = ['java.base', 'java.management', 'java.naming', 'java.sql', 'java.xml', 'jdk.crypto.ec', 'jdk.httpserver', 'java.desktop', 'jdk.unsupported'] --} -\ No newline at end of file --- -2.38.3 - diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 425e4b45ec61..44e849092ca8 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -1,10 +1,7 @@ { lib, stdenv, fetchFromGitLab, jdk17_headless, coreutils, findutils, gnused, -gradle, git, perl, makeWrapper, substituteAll, jre_minimal +gradle, git, makeWrapper, jre_minimal }: -# NOTE: when updating the package, please check if some of the hacks in `deps.installPhase` -# can be removed again! - let pname = "signald"; version = "0.23.2"; @@ -16,8 +13,6 @@ let sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; }; - gradleWithJdk = gradle.override { java = jdk17_headless; }; - jre' = jre_minimal.override { jdk = jdk17_headless; # from https://gitlab.com/signald/signald/-/blob/0.23.0/build.gradle#L173 @@ -37,76 +32,19 @@ let ]; }; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version; - nativeBuildInputs = [ gradleWithJdk perl ]; - patches = [ ./0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon build - ''; - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh -x - - # WARNING: don't try this at home and wear safety-goggles while working with this! - # We patch around in the dependency tree to resolve some spurious dependency resolution errors. - # Whenever this package gets updated, please check if some of these hacks are obsolete! - - # Mimic existence of okio-3.2.0.jar. Originally known as okio-jvm-3.2.0 (and renamed), - # but gradle doesn't detect such renames, only fetches the latter and then fails - # in `signald.buildPhase` because it cannot find `okio-3.2.0.jar`. - pushd $out/com/squareup/okio/okio/3.2.0 &>/dev/null - cp -v ../../okio-jvm/3.2.0/okio-jvm-3.2.0.jar okio-3.2.0.jar - popd &>/dev/null - - # For some reason gradle fetches 2.14.1 instead of 2.14.0 here even though 2.14.0 is required - # according to `./gradlew -q dependencies`, so we pretend to have 2.14.0 available here. - # According to the diff in https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.14.0...jackson-dataformats-text-2.14.1 - # the only relevant change is in the code itself (and in the tests/docs), so this seems - # binary-compatible. - cp -v \ - $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.1/jackson-dataformat-toml-2.14.1.jar \ - $out/com/fasterxml/jackson/dataformat/jackson-dataformat-toml/2.14.0/jackson-dataformat-toml-2.14.0.jar - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - # Downloaded jars differ by platform - outputHash = { - x86_64-linux = "sha256-9DHykkvazVBN2kfw1Pbejizk/R18v5w8lRBHZ4aXL5Q="; - aarch64-linux = "sha256-RgAiRbUojBc+9RN/HpAzzpTjkjZ6q+jebDsqvah5XBw="; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); - }; - in stdenv.mkDerivation { inherit pname src version; - patches = [ - (substituteAll { - src = ./0002-buildconfig-local-deps-fixes.patch; - inherit deps; - }) - ]; - - passthru = { - # Mostly for debugging purposes. - inherit deps; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; - buildPhase = '' - runHook preBuild + __darwinAllowLocalNetworking = true; - export GRADLE_USER_HOME=$(mktemp -d) + gradleFlags = [ "-Dorg.gradle.java.home=${jdk17_headless}" ]; - gradle --offline --no-daemon distTar - - runHook postBuild - ''; + gradleBuildTask = "distTar"; installPhase = '' runHook preInstall @@ -120,10 +58,19 @@ in stdenv.mkDerivation { runHook postInstall ''; - nativeBuildInputs = [ git gradleWithJdk makeWrapper ]; + nativeBuildInputs = [ git gradle makeWrapper ]; doCheck = true; + gradleUpdateScript = '' + runHook preBuild + + SIGNALD_TARGET=x86_64-unknown-linux-gnu gradle nixDownloadDeps + SIGNALD_TARGET=aarch64-unknown-linux-gnu gradle nixDownloadDeps + SIGNALD_TARGET=x86_64-apple-darwin gradle nixDownloadDeps + SIGNALD_TARGET=aarch64-apple-darwin gradle nixDownloadDeps + ''; + meta = with lib; { description = "Unofficial daemon for interacting with Signal"; longDescription = '' @@ -138,6 +85,6 @@ in stdenv.mkDerivation { ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ expipiplus1 ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/signald/deps.json b/pkgs/applications/networking/instant-messengers/signald/deps.json new file mode 100644 index 000000000000..c3ec7f1e80d0 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/deps.json @@ -0,0 +1,528 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://gitlab.com/api/v4/groups/6853927/-/packages/maven/org": { + "signald#libsignal-client-aarch64-apple-darwin/0.21.1": { + "jar": "sha256-GZyZBUokXraIAXXRoGMFoU48FzUym80J0XU2o/fbEgE=", + "module": "sha256-Z6k9Pt5ac5il2uK2ngQn0Mc8utSRChIl+pO7UeOmbJs=", + "pom": "sha256-b2SOa4rB+2SGAohZpsv7ZNUKPrcCBIONBiflsaLJA7A=" + }, + "signald#libsignal-client-aarch64-unknown-linux-gnu/0.21.1": { + "jar": "sha256-qkF5S7OwiRTABFoAWsXn2WsRCKe+GIcDeX+ENFjbhQg=", + "module": "sha256-Y/ir3VC1oORyDy19ZOctnIcDxgm+tbZSbKKz9VcBh3E=", + "pom": "sha256-E5pDb3MphJnKuE6xfizHrJ4qWXu4Tfv1hWPzynRkx+g=" + }, + "signald#libsignal-client-x86_64-apple-darwin/0.21.1": { + "jar": "sha256-Xc+eIRMlTTReDigOlcPxD4sIm44cwKoJ63tGBxx10pk=", + "module": "sha256-g2GHQh5ThVjmHn7Fiq4j0cPQDpZWl4Lx8kNq8E754fQ=", + "pom": "sha256-AHphg71FAR4tLhOXJP0TfHtSRothQmXL9h6/Vy2fg2I=" + }, + "signald#libsignal-client-x86_64-unknown-linux-gnu/0.21.1": { + "jar": "sha256-b9C1XUATmYS+QyZZT0twxY8e5VBYPX4PGc4KwMuz3MY=", + "module": "sha256-LdJQ1bGMcVuW5gMxwXNfco0fk9EqKUR3/dcXK9/f+uI=", + "pom": "sha256-vQvRDMrMPzs26mkIGyWealXU9n+F1zUsYi+0mGmB4Pc=" + }, + "signald#signal-service-java-aarch64-apple-darwin/2.15.3_unofficial_65": { + "jar": "sha256-AWLSsBwoo2bA95cX7cUZr8djin+pzrg7uQklKB5HaX8=", + "module": "sha256-Kx4rUnEcn7UqES53q7SBDzM1SrPYRW9hLyy8bTUpGqE=", + "pom": "sha256-lIWISMl3ZO1DTH0UvwrFWsWNvTT2T/l8XMnbVu64b90=" + }, + "signald#signal-service-java-aarch64-unknown-linux-gnu/2.15.3_unofficial_65": { + "jar": "sha256-rnh3En9Apq4zZPNCWCpat3bJwjegnWmfKclyWq9WV38=", + "module": "sha256-+ul/buZ1z6UMjhTWY4wrhz9sYrOOiOvbuLg3qSpxJKI=", + "pom": "sha256-4Bt4nts4B+MZJMVAjrxB5b85TaHhEfcslDDegkCVy7Y=" + }, + "signald#signal-service-java-x86_64-apple-darwin/2.15.3_unofficial_65": { + "jar": "sha256-Hkig/2S8txhBKyyzRcloqwc5rMhDELTbRSzy4XGg7Sw=", + "module": "sha256-e/U5v2nGOG3VbIHh0GDFBdIRo+qp3SyiTcsrum9T7gk=", + "pom": "sha256-B+8twiic8oQYWENG9d9ETv4eyYfdEuT6U0aNj87rB48=" + }, + "signald#signal-service-java-x86_64-unknown-linux-gnu/2.15.3_unofficial_65": { + "jar": "sha256-+p3jm8+Bg96BUIQdGT6LHczAhMfSqQVm5OlP5g+bEEs=", + "module": "sha256-GKfQ5h9vzUQL+1pNejIPyb1yjhtVn8CkkAGyaUr5RBM=", + "pom": "sha256-MCAEHWahZHEhR7FP7tDKII+FZM41e3Sc3fVuWwN8GhI=" + } + }, + "https://plugins.gradle.org/m2": { + "com/github/gmazzo#gradle-buildconfig-plugin/3.0.3": { + "jar": "sha256-ql6AIOvktizdRYn07XFhq1wkSlIJ5eWey7lFOP312to=", + "pom": "sha256-EVUqzLXaH59nxdNJoUjwxAP6MJKT85Vcc1qOvY1XH8I=" + }, + "com/github/gmazzo/buildconfig#com.github.gmazzo.buildconfig.gradle.plugin/3.0.3": { + "pom": "sha256-U2RlL3aMVri6eXtNL2AEDerbGlzB6lvG0gfFF88d7W4=" + }, + "com/github/gundy#semver4j/0.16.4": { + "jar": "sha256-3vm0Il+jchnhj4HQHw5S1z3KElejj1R1vp3Vj4dzZRA=", + "pom": "sha256-MgAdskQ7M53SH1t5/ynRreci0boIDCFL3oGfD3LRYE0=" + }, + "com/google/code/gson#gson-parent/2.8.6": { + "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q=" + }, + "com/google/code/gson#gson/2.8.6": { + "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=", + "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE=" + }, + "com/squareup#javapoet/1.11.1": { + "jar": "sha256-nL8hB75JnsbpWv02tY48oSKiQWbN03VzLlEmfWQFjpA=", + "pom": "sha256-+fP8Lz85koufe74oEXW3R9O1Wgkh8wLi4g0J7o5Bw+w=" + }, + "com/squareup#kotlinpoet/1.0.1": { + "jar": "sha256-vqGIRbA8fGXPkfc5iLoBlQuuZ5nDxRgrVo/nHN2JSqE=", + "pom": "sha256-R0rbJYzTlWjOYNanxzBoFzo6BhZ25AGBBVKnXiPuxdU=" + }, + "de/undercouch#gradle-download-task/4.0.2": { + "jar": "sha256-lSy/zF8hvuzLWSXMW6ZIrwmDklhEHdRNCH1kpX006Ho=", + "pom": "sha256-YvKRaNwv+1gMRKpgIfZVBRqcsKSN/Ue8fk6MpvljrbA=" + }, + "org/antlr#antlr4-master/4.5.2-1": { + "pom": "sha256-U1i0eNglVatXr9f8cjHWA7QPl3vnyjn0DF7FTnZ+tnQ=" + }, + "org/antlr#antlr4-runtime/4.5.2-1": { + "jar": "sha256-6DFBMAS87tfZFcOhdZJ7Haq8SXS3uKb4e7zohtNVA5g=", + "pom": "sha256-k7rJtrxxTVWZBO1DJCeCqMvlQ86/AQS7PswXhqnLZh4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache/commons#commons-lang3/3.8.1": { + "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=", + "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/beryx#badass-runtime-plugin/1.12.7": { + "jar": "sha256-N3Mx2VyxIFb6U6Qt9/RfF4svqG1sWF9w74TRIz0RB0U=", + "pom": "sha256-9vIy9OpH3sXV5y4jWaQG+pMd8/M2fiVdMmkkCAPBtkk=" + }, + "org/beryx/runtime#org.beryx.runtime.gradle.plugin/1.12.7": { + "pom": "sha256-95lWpL5pLmiBvaBnA0zUDOOqFX8ti9VWS5wAKWxrK3M=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20181211": { + "jar": "sha256-r/t8haPIe9z2n/HbuE3hH2PckxKTk0vAjNerGN4INgE=", + "pom": "sha256-MQpqotkFNMMrj0bx/JjNDtrpXc38oj4oR+Xvqa4MAZo=" + }, + "org/jetbrains/kotlin#kotlin-android-extensions/1.4.31": { + "jar": "sha256-SNfgjtYPscadJ/VyBaihHEcdaBM55nlEpL0L8sLht5A=", + "pom": "sha256-6ezdB6SaaAPWXoSb5064ff36iLtElaSDK1zJJbvv2BY=" + }, + "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/1.4.31": { + "jar": "sha256-E11Hgji/ecK6L8FKIgRG3uj3TmiyP5ELwuTRmBorcG0=", + "pom": "sha256-GkmFH2YJ3/XRCK5UUb76mNEcNYUsz7XZiOmqeBiUw4I=" + }, + "org/jetbrains/kotlin#kotlin-build-common/1.4.31": { + "jar": "sha256-2AXnlC+1fSIUHUODV8TAIv8bIa78+yRd3SLqa3SGKrQ=", + "pom": "sha256-DIaSpl7cpUpc/Pp9s+9OLx9nafNTf4jrMwWvw4PBwhw=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.4.31": { + "jar": "sha256-X0oOX3T+lrzUzRQxfISlbnsGpqwW2z2+cMOwaAdzOZ4=", + "pom": "sha256-DWc4Z/LPQirjQPVloRWgPrtcdVxVe9bZyiiGTcw4iyQ=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/1.4.31": { + "jar": "sha256-Ybrn0tzI82KaPrIUkKmsVTU8Io+iPdfids7u3jeHisE=", + "pom": "sha256-Yhlloc7kdCcFwWEjv1oN7mTkLZohXrDEvHMj40tEWxs=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/1.4.31": { + "jar": "sha256-fQJ+9Vrx3JC8BiRn8sjBbAwMlhZ2JdtAnyEhCSjtZAk=", + "pom": "sha256-edI2i+n6TYGBCdixMynI1WMVJSzTV69R9YzgT6f0izw=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.4.31": { + "jar": "sha256-l9xXBLT9JbFamx7X/9hJiqWAeHf7ar5Ni2bW0Qs5zzY=", + "pom": "sha256-L94ntYnr0Y2EFnb7sh4/pi2ZD25eqqbKq1K0vgDj5+s=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.4.31": { + "jar": "sha256-fAuO07UHXmM0/+rpg6Io9LFEUmMenUl9FhwMKiMN4mI=", + "pom": "sha256-MggUaX5sg1nwXU46eBVdL3MetImMyyXfUCKz+VT1vMc=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.4.31": { + "jar": "sha256-9ATALOZ7ahMo2s4i2TW+/cZmBdzdziaVEBvkZshZJqk=", + "pom": "sha256-6EvVpsF+h0q9cIlbQcWI9I/mmzcq6rQTTVW8V2Dzp8s=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.4.31": { + "jar": "sha256-/MsDW9vopXkf6e2zvUknrFByoMf9/UzFWDukRv8dfc8=", + "pom": "sha256-UQ2wwA85guaiBXihK97GuNB7d8Mdag2amJJw1Jl71kQ=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.4.31": { + "jar": "sha256-kfrQtCl0p9WBHjCmHwVwbhdrFEI1cXxt5+geOngQKPI=", + "pom": "sha256-jkm6uEPdhV8xXIfjkMUpqcojkSHYv/uFs6z6L2BgNpc=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.4.31": { + "jar": "sha256-t/j6k4MVJ2wTV7xr+VUDTUZ+20JCuxKjlscPNqxI0/k=", + "pom": "sha256-BnvN9hLIGnhfkdeSR4VpM6ulX9gUEAk8US6Qp+VOs4c=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/1.4.31": { + "jar": "sha256-7Gb0SktBsyUsvAkcnXwJa8i7WaIRGCt913xmlPCXfzw=", + "pom": "sha256-SZt/nSwkShmt9lDZOmOKIUYYm555w57W2jok/N1EQOU=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.4.31": { + "jar": "sha256-0t+NwkUxRqwnvOwBiQxM9rBNGIZbFtnTFWYcqoc4c5I=", + "pom": "sha256-08xMx05y+9GrwJI5/eU/y2DkqAiZqokUfHIqzjN3MRY=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.4.31": { + "jar": "sha256-oWYNbJIDA+MEgTI51PjKD/gB8iQl1C3454+twFe6fAY=", + "pom": "sha256-v1odNDN3icu4zbwipO9OGBnUod+yoRdRjnRc+PrrBVE=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/1.4.31": { + "jar": "sha256-/A0P+l0IOsnJS8f4aUmgV+L5cRISs/xyt0X2eLPM/6o=", + "pom": "sha256-ZwY1ME+KCaH0smigpfb/klIwc7DNootBdASK6tfLHyk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.4.31": { + "jar": "sha256-V5YvRDcadGtnghiggCqHEsYlUgbemmnt4hXjqksERwg=", + "pom": "sha256-FYKrEwto/LuJsukVVzwfmfi6O8aP3UUfazYtbFM1MYc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.4.31": { + "jar": "sha256-dqWZ2IsWforJCHm22qcixq00UrpxTJq6Gb0ZZUS5fxw=", + "pom": "sha256-hRnj56xe5wBSfuEEiOtDLxqhBtzN3nwGw7qyWKHdvU4=" + }, + "org/jetbrains/kotlin#kotlin-util-io/1.4.31": { + "jar": "sha256-742OP5+fXt4dcNPcIXRsiQySCi9APVaeHNW1KIE6XMA=", + "pom": "sha256-0JWe1skYAwhX/3VMyTLA44GDawd4IsoChO5uftTyItY=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/1.4.31": { + "jar": "sha256-K8ihVTz6jLbeitaN50bY+thxQbF3SfCLpQcMaUxr2W0=", + "pom": "sha256-4VfHncwf0BzZaSstV21gbs9q8hGHhv6gTa/IBLpm93c=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.3.8": { + "jar": "sha256-+Mi3SF1KV1445elJRVOdHU7M0yKKGZ4amqCU6MJhdO4=", + "pom": "sha256-JP+mW9+32JM0nLLnj7NxSkkN0KnAc3V0S7E26YBIB/0=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/9.1": { + "jar": "sha256-gaiAQbG4vtpaiplkYJgEbEhwlTgnDEne9oq/8lrDvjQ=", + "pom": "sha256-rFRUwRsDQxypUd9x+06GyMTIDfaXn5W3V8rtOrD0cVY=" + }, + "org/ow2/asm#asm-commons/9.1": { + "jar": "sha256-r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=", + "pom": "sha256-oPZRsnuK/pwOYS16Ambqy197HHh7xLWsgkXz16EYG38=" + }, + "org/ow2/asm#asm-tree/9.1": { + "jar": "sha256-/QCvpJ6VlddkYgWwnOy0p3ao/wugby1ZuPe/nHBLSnM=", + "pom": "sha256-tqANkgfANUYPgcfXDtQSU/DSFmUr7UX6GjBS/81QuUw=" + }, + "org/ow2/asm#asm-util/9.1": { + "jar": "sha256-OA4uzRb3zA8adrqboEkXm1dgpXsoKoekxlPK7/LNW9Y=", + "pom": "sha256-jd108aHiuTxwnZdtAgXnT7850AVwPJYmpe1cxXTK+88=" + }, + "org/ow2/asm#asm/9.1": { + "jar": "sha256-zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=", + "pom": "sha256-xoOpDdaPKxeIy9/EZH6pQF71kls3HBmfj9OdRNPO3o0=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-base/2.14.0": { + "pom": "sha256-tZryboho1AOOURYUvXa7t0A2NXOVGWAvEOfaCTFYKw8=" + }, + "com/fasterxml/jackson#jackson-base/2.14.1": { + "pom": "sha256-GAFdG6y6mhRiWovxlBH1v62C0AYN83snvQLngTLEZ24=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.0": { + "pom": "sha256-SfD44IeIL07MwxErYBt91RKZRyOklDo3oQ7LgHMiZso=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.1": { + "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.14.1": { + "jar": "sha256-0lW0uGP/jscUqPlvpVw0Yh1D27grgtP1dHZJakwJ4ec=", + "module": "sha256-JnpoC7csvXUsdreeuQiuDAq+sRT8scIKlnjwN4iYues=", + "pom": "sha256-id8WI4ax7eg6iATpCDlw0aYr310caenpkUdhtGf4CIM=" + }, + "com/fasterxml/jackson/core#jackson-core/2.14.1": { + "jar": "sha256-ARQYfilrNMkxwb+eWoQVK2K/q30YL1Yj85gtwto15SY=", + "module": "sha256-fIuANfkA8/HL2wa4x53CsYsR9q+hOwt0cZzuNJ/0wyk=", + "pom": "sha256-dHse68uLbe8o+u7cCSN0jxwVP8aksNjjsLyo3l/aY38=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.14.1": { + "jar": "sha256-QjoMgG3ks/petKKGmDBeOjd3xzHhvPobLzo3YMe253M=", + "module": "sha256-2BeXfIprCq7aUZ+yp7jcugKzjDwnICT62jLFzOfj08s=", + "pom": "sha256-etsj1tdG7c+UbRwGKxmP+aAmwOIrMHuNXXnB4IU4xjU=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-toml/2.14.0": { + "module": "sha256-CsCosk9G8UO74qeQCyh914XgMRuf7s92MG2Is1aJBl0=", + "pom": "sha256-UbvlEh00Ij7Yc8nN6DWTvDl+mCSkknNvv7wuA65QrhA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-toml/2.14.1": { + "jar": "sha256-EwRbLsSlXKVS8JF5N83Qt7rp1a5AnJVfbw0We5HIYkE=", + "module": "sha256-fYt0DCgjZAjWkDDdCewOQgy08dBIZEhM/muNxnJro8g=", + "pom": "sha256-k3qvGFoaW0g5TmkQusBVM+iPu8ICREy5aZ2D4BpNprc=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.0": { + "pom": "sha256-6tGzXPQ8iianI2wDCKi/w+5InCkyiOBRPqvLXnIyS4o=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.14.1": { + "pom": "sha256-+jI/nD8sJtfMzU4hNgkQRRVNRdwcFmHU+HakcfVix1k=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/protobuf#protobuf-bom/3.21.11": { + "pom": "sha256-b8t65uskGL00Pp3E4ED3nFk+9W957j0NKiEZzk/nr7Q=" + }, + "com/google/protobuf#protobuf-bom/3.21.12": { + "pom": "sha256-O72GqUBXpnHmPVX532EsZBlz1ecNba4qtFYk/xrfUcU=" + }, + "com/google/protobuf#protobuf-javalite/3.21.11": { + "jar": "sha256-2HsppVT9lD3WH0lPJjeyDeKI27EsS87oXp/k4q2JRFM=", + "pom": "sha256-RnCf68zs39yLZXU+9Bs5E7cPC2Ipu7U5XYCYXtziW/U=" + }, + "com/google/protobuf#protobuf-javalite/3.21.12": { + "jar": "sha256-z2eKs/vJkvS0ZUqGwDVXwhkE1jUgK2doj8suykQsLUA=", + "pom": "sha256-JX9QiTSYkVb912RUQ9uf4lbX06pEx93oMCfYHW6MutQ=" + }, + "com/google/protobuf#protobuf-parent/3.21.11": { + "pom": "sha256-kZpCn8dl43GYT5jpgoEcn6jMTqxgt0tEJM/NgMruCG8=" + }, + "com/google/protobuf#protobuf-parent/3.21.12": { + "pom": "sha256-fj44jW/7fyDmb/JfRbk3i0Igt7L9Jh9rO8IGs9/4u8g=" + }, + "com/googlecode/libphonenumber#libphonenumber-parent/8.12.54": { + "pom": "sha256-MzfHf0YxCWHoxuXPv4zgRDIXpDNqhqRneipt5U8mqHo=" + }, + "com/googlecode/libphonenumber#libphonenumber/8.12.54": { + "jar": "sha256-sjeB0pk7ailmUzsvWOEfM5L8FB+J6NVYNdo4Nl3guuk=", + "pom": "sha256-/SZ9HcfjYSkf+MEAbrBvTv2isfEt/jhTXZVf/sDBl/E=" + }, + "com/kohlschutter#kohlschutter-parent-multirelease/1.5.1": { + "pom": "sha256-m8IGSgNZlu+KoTo39gEtr+wrj7Ixf0gK0vYOcUu/BTM=" + }, + "com/kohlschutter#kohlschutter-parent/1.5.1": { + "pom": "sha256-QOM4M3T7g/qqpHW7scFy920D5DLYbpgsnfTO+ZQDh40=" + }, + "com/kohlschutter/junixsocket#junixsocket-common/2.6.1": { + "jar": "sha256-k9Eg4tSd31v97oJYdi/IdLJsZX8Cf41szBoFUVa/zeE=", + "pom": "sha256-RRjCFVtlyk9jbQJRRBK1kIFdbAsYKMsV8vUlXcA2Qzo=" + }, + "com/kohlschutter/junixsocket#junixsocket-native-common/2.6.1": { + "jar": "sha256-Yfu9bP0rbfZcDnsZsW/091XWyx0zO1ZvQoZAfxLxhnA=", + "pom": "sha256-t4zAQTztX2+M2jYiG5Yg0Bq4PPJMlwN2vEqH31S4jAQ=" + }, + "com/kohlschutter/junixsocket#junixsocket/2.6.1": { + "pom": "sha256-crOETfvf8/Nc6WPPHBro4cxJa/SoJMYFYb6QQvVHtfQ=" + }, + "com/squareup/okhttp3#logging-interceptor/4.10.0": { + "jar": "sha256-JzuiGGNsNPegkcBZ0VlgBUPgPqi+7yxfxWUltHOWFg4=", + "module": "sha256-/MsMrtTFnKXjEketzz+Zu9FeWn8NI8me4UbeMd0BhSI=", + "pom": "sha256-t/v3nfpIMFDEygZTdhoh0A1YWBkVUHo9nVGctmJgv98=" + }, + "com/squareup/okhttp3#okhttp/4.10.0": { + "jar": "sha256-dYDxT6FpEgbjcIGtP5IGOxYDsyjaC7MW8v7wLgVi5+w=", + "module": "sha256-bDBwggtZH17IwpSEl7Wmt0L0krcVvKz0t1EVs6j/qxU=", + "pom": "sha256-x/kgsofIOOHYHipj+Gd7svqZE3BYorEeZTWv3pyBoOU=" + }, + "com/squareup/okio#okio-jvm/3.2.0": { + "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", + "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", + "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" + }, + "com/squareup/okio#okio/3.2.0": { + "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", + "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + }, + "info/picocli#picocli/4.7.0": { + "jar": "sha256-P2/7EM6FPvL2+TS0Z8zBPJwXCLTYOhpWZP2wfgeOjhw=", + "pom": "sha256-TeCd0zhFd9Vzo9lP85jNe4SUbEJkDzhSva2X9yl0YXQ=" + }, + "io/prometheus#parent/0.16.0": { + "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY=" + }, + "io/prometheus#simpleclient/0.16.0": { + "jar": "sha256-IsN08jf3vE/bHw7C2jecC6AOaa0v/otq3lQ9cwYtN38=", + "pom": "sha256-/sCA0HqxWHXZccSugflR2mG1z/mZHPUOUwuo/KR3CXM=" + }, + "io/prometheus#simpleclient_common/0.16.0": { + "jar": "sha256-66bsJs5+QMu4cl4F+4Mkep9PRJRbnnUi4zdd3me58Fk=", + "pom": "sha256-d/ARCc4VB710Q+InJzdnSydST6rLDcuW47jt4LarnrY=" + }, + "io/prometheus#simpleclient_hotspot/0.16.0": { + "jar": "sha256-E08VbP60TL04ZAZYBu9dtVQ8aK9XjR1+5ZKD4umFP3M=", + "pom": "sha256-0haTfecjEg+3pMiLksW+oZEa+4i6dtDUjxdprYW2dek=" + }, + "io/prometheus#simpleclient_httpserver/0.16.0": { + "jar": "sha256-yrh94QtqR0FRzO68O2NDKalz/7YCzm7+8sD9l6kDZcg=", + "pom": "sha256-PGR/1vVhohsZ7ZcdBBn9Ri2fg/k0e8ChBaHCie6qqsQ=" + }, + "io/prometheus#simpleclient_tracer/0.16.0": { + "pom": "sha256-OBK7IrlfgbTDRg6eTnXDunL6ReRDqfzlMghCqr0OmcI=" + }, + "io/prometheus#simpleclient_tracer_common/0.16.0": { + "jar": "sha256-6Ep4SsjiTxgu5i2oC2tcgUB3S3W/pL+cw9O4OQ22JfY=", + "pom": "sha256-X5AHXOz80RKB3pzLSJaNEhKyRnDWhP/IQEQaUq6HXv8=" + }, + "io/prometheus#simpleclient_tracer_otel/0.16.0": { + "jar": "sha256-oqhMWb7zeWu3+cbyrot96LkFMT7ygYCsPef/Yd1o3z8=", + "pom": "sha256-frl58dwz6L5OWtFDDlQJcYpBeDwmd5qzEFJg9rQ20EY=" + }, + "io/prometheus#simpleclient_tracer_otel_agent/0.16.0": { + "jar": "sha256-etK7QN90p3LZ9URaPQNXm0nWs3pH1ekPbPP1ns9BrQY=", + "pom": "sha256-VSj4WIQ1SulNm8BnR+f1iS0JLAtVBVrnBWZo6gyhznw=" + }, + "io/reactivex/rxjava3#rxjava/3.0.13": { + "jar": "sha256-WYq69x28lw3Qcn5tX094bcmZ31uXLL8mExajLhVbLGk=", + "module": "sha256-khiPWj8bL7xUkxB3AKetrnAsHXc8TO02auitkjj2q+g=", + "pom": "sha256-yZCmX0c2tGOe0X1nhMqUdtPClRuGUqAKVnbAKHw24OQ=" + }, + "io/sentry#sentry/6.11.0": { + "jar": "sha256-77Huk5ks2xQSGMB71siYkzkvwzzcAaqHZjOuJNc8Wa4=", + "pom": "sha256-gOTkmRGslV0gUJp3OFODNyge4TUUFCIslXFpoyfWIfc=" + }, + "org/apache#apache/24": { + "pom": "sha256-LpO7q+NBOviaDDv7nmv3Hbyej5+xTMux14vQJ13xxSU=" + }, + "org/apache/logging#logging-parent/5": { + "pom": "sha256-3HYwz4LLMfTUdiFgVCIa/9UldG7pZUEkD0UvcyNwMCI=" + }, + "org/apache/logging/log4j#log4j-api/2.19.0": { + "jar": "sha256-XMskrZ+S52jQvEVtMGGnN5USYt+APgBNLK0Ja3WojWA=", + "pom": "sha256-DKkiQ2MurHxkRF8mO+UDBLdaerv7eIXNbIH1cRJ01KU=" + }, + "org/apache/logging/log4j#log4j-bom/2.19.0": { + "pom": "sha256-jGp6wVCpGKIpBzNf1VZpFHMe14E2l3DVJfZMDQf+h+c=" + }, + "org/apache/logging/log4j#log4j-core/2.19.0": { + "jar": "sha256-tKF5b6t7/DbfAVwbQFJFkUeZfo0hWnGZ1x0F+edH5PQ=", + "pom": "sha256-c1r8+2E2GCqidn62RZdhr9MrgleR1OCJXqGpSyrbmzk=" + }, + "org/apache/logging/log4j#log4j/2.19.0": { + "pom": "sha256-FWJLoaVtv4ZGBgdFMlM2GPoytGQvcoUfy+kuE2vq7JQ=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/bouncycastle#bcprov-jdk15on/1.70": { + "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", + "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" + }, + "org/checkerframework#checker-qual/3.5.0": { + "jar": "sha256-cpmQs/GKlWBvwlc4NraVi820TLUr+9G3qpwznP81paQ=", + "pom": "sha256-KDazuKeO2zGhgDWS5g/HZ7IfLRkHZGMbpu+gg3uzVyE=" + }, + "org/flywaydb#flyway-core/9.10.2": { + "jar": "sha256-OAf+3K2+ykuLiUCW0R2+zX8qosfO2QrDmM9/fgWzhT4=", + "pom": "sha256-2xICRB2Ebg6wWLppHmJbvq4p7Dj7HgmRtdsbhrxoeSE=" + }, + "org/flywaydb#flyway-parent/9.10.2": { + "pom": "sha256-HPI2yGyMqSFnUC8Fjw/IUagPpXG5UvEWUGhAqcIbOHg=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.20": { + "jar": "sha256-jaQKJSDTDcsQEhdv6T0k6C0Io+NGw34DQ7D7b2T2vgE=", + "pom": "sha256-PgTMk1HVzsQqRcBg+HM/bpTrx+NZExClGOBuiFB4mcg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.10": { + "pom": "sha256-YSIR/5MPW1LHJP92NBfVqigd1+AyXDs1yNGBIKao300=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.20": { + "jar": "sha256-qi+i6BNVxNmN2X2iFpv0AfhCJhN49bHL6hqhGFXWdiA=", + "pom": "sha256-iBveiiNwhuKOA0KLTvMmj0SspfoajHb4lUdIRVyuvSE=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.10": { + "pom": "sha256-Q6ZJ+nN7+zX6SvTm3jPi8IpdGRBNdYLqQNvNK2N5Csw=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.20": { + "jar": "sha256-/asb8SDiteerbXiI6evAJOxrjKcpNhKWOV2rY0shNpU=", + "pom": "sha256-GEap+GBLC+HHGiEovb2diQJyAnlCf2ItK5pECsmjwwk=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.6.20": { + "jar": "sha256-7rUcK2eyYjP9gdC8T4BE7ISXGIkJBXY87/2Eox4st5k=", + "pom": "sha256-oI6D3LDymFCYd94i1SZEZHbdsx6hx3Uw8sgfJNsWb5k=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit/jupiter#junit-jupiter-api/5.9.0": { + "jar": "sha256-PjcLy7HoV/2l8LIDckEW0CsF54j6oeslGIFKzPnPtbE=", + "module": "sha256-n5LPF5V1xN9pgpRwTRDxLozHFdaC+yDtzYrbxB/H8PQ=", + "pom": "sha256-ap2MRpjcjGkE1qwfXRMBiqf4KESbxbjO94/BQxzgghc=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.9.0": { + "jar": "sha256-24bLszUnGfoKl4AO39CcIEY8fyq0oEaZJEQwvYlUWDs=", + "module": "sha256-sVnltbYmIiOP1v0oZPigEsHfbbK7JvEMqA4dIqzOLx0=", + "pom": "sha256-qLfR7QMvuStDJY140jmwGcX1g02swIT5l4PjTD7hLL8=" + }, + "org/junit/jupiter#junit-jupiter-params/5.9.0": { + "jar": "sha256-uM73mC3VPfhMlXpumsie3pZ88ubZNA70xReG4gVIxBs=", + "module": "sha256-QUkSewrR3JKJdqY4WIer3wpD9oNlRLK614OUh2kJenE=", + "pom": "sha256-DDOljPiR2vvGIfPG2cyCMnCDHrOxib3juIbMMDmQ/Ww=" + }, + "org/junit/jupiter#junit-jupiter/5.9.0": { + "jar": "sha256-LbLkqitegv78vxjQryDICVpD6UrZq50WvYdVfNqjl90=", + "module": "sha256-a1AJDfWdSZ4ycr41ULiBJdXJGojhzbSaEsLwi+p6hds=", + "pom": "sha256-Imsy40Pt4WvSls+36xXhmaFOQBxUJulUOsUDrM1E3JI=" + }, + "org/junit/platform#junit-platform-commons/1.9.0": { + "jar": "sha256-5YlLcQCUtMqvxigLiCmkOft2SQHqCuGNBu2AOIswm3o=", + "module": "sha256-SyAzP4ruVOgwRY2B0EXrjRfcBCTTEzKNtQmpzCSZsXo=", + "pom": "sha256-MJp9efG/577WChoXCKqovXGGHBKdIWhNaO305NnILCA=" + }, + "org/junit/platform#junit-platform-engine/1.9.0": { + "jar": "sha256-quxzX3REqfwFXiBlmN49gpwk6ceo7qbv3usZYgh/6BE=", + "module": "sha256-/3Xx1hE/RdWyXyUpUE3tiDmGoBLJtD0hrUI5jknXEGM=", + "pom": "sha256-G2rN+hUNaWYlIHYAAcaONlhl1o7xMNGZblK5SD7IYWE=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/postgresql#postgresql/42.5.1": { + "jar": "sha256-iei/+os3uUh5RgEsaQzwTzEDlTBRwcGT2I7ja2jTZa4=", + "pom": "sha256-R8t/RdAe0XyJ5mNlrU4v8anBR5AX35QhAPSgjLYyIRw=" + }, + "org/reactivestreams#reactive-streams/1.0.3": { + "jar": "sha256-He4EgQctGckptiPhVeFNL2CF3AEVKaCg2+/ITPVx2GU=", + "pom": "sha256-zO1GcXX0JXgz9ssHUQ/5ezx1oG4aWNiCo515hT1RxgI=" + }, + "org/slf4j#slf4j-api/2.0.5": { + "jar": "sha256-9KKXRQkpGsxJ/aSnmw1Z4V4rUkCV1kIcZjkbkjh69Mk=", + "pom": "sha256-nvLaYxSfXZ7M9608lTzfwSTrbRR79444YA9Z9gXF1G4=" + }, + "org/slf4j#slf4j-nop/2.0.5": { + "jar": "sha256-qY7YTal6RbnblFVrKH4vWW6h3qz4j4qw0ivRt+jvANk=", + "pom": "sha256-uCIqkKiTH/PY63GgELA8JGCqBWfKaWQvUCXulWd/Ga4=" + }, + "org/slf4j#slf4j-parent/2.0.5": { + "pom": "sha256-FwsRsEgVAFw7TMbfeckYQ+C5UPhbWP++jUg+0hkTuYs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/xerial#sqlite-jdbc/3.40.0.0": { + "jar": "sha256-46G5CXh7M7s34E8lLzfkq0ekieHB1FqAmgmCw3lEXBA=", + "pom": "sha256-fI0dETimo05pNXbQe29U4h840iC4YtnhQFyy4KqIpDo=" + } + } +} From da8cbf47787aa513e67c3af7978047bc9f8e9eaf Mon Sep 17 00:00:00 2001 From: chayleaf Date: Sun, 10 Dec 2023 15:44:47 +0700 Subject: [PATCH 069/227] mindustry: convert to gradle setup hook --- pkgs/games/mindustry/default.nix | 167 ++++++++---------- pkgs/games/mindustry/deps.json | 294 +++++++++++++++++++++++++++++++ 2 files changed, 366 insertions(+), 95 deletions(-) create mode 100644 pkgs/games/mindustry/deps.json diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 8489d32a8ed7..12125d761098 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv , fetchpatch , makeWrapper , makeDesktopItem @@ -6,13 +7,13 @@ , fetchFromGitHub , gradle , jdk17 -, perl # for arc , SDL2 , pkg-config -, stb , ant +, curl +, wget , alsa-lib , alsa-plugins , glew @@ -42,7 +43,6 @@ let buildVersion = makeBuildVersion version; jdk = jdk17; - gradleWithJdk = gradle.override { java = jdk; }; selectedGlew = if enableWayland then glew-egl else glew; @@ -65,22 +65,29 @@ let rev = "v0.9"; hash = "sha256-6KlqOtA19MxeqZttNyNrMU7pKqzlNiA4rBZKp9ekanc="; }; - freetypeSource = fetchurl { - # This is pinned in Arc's extensions/freetype/build.gradle - url = "https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.gz"; - hash = "sha256-Xqt5XrsjrHcAHPtot9TVC11sdGkkewsBsslTJp9ljaw="; - }; - glewSource = fetchurl { - # This is pinned in Arc's backends/backend-sdl/build.gradle - url = "https://github.com/nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0.zip"; - hash = "sha256-qQRqkTd0OVoJXtzAsKwtgcOqzKYXh7OYOblB6b4U4NQ="; - }; - SDLmingwSource = fetchurl { - # This is pinned in Arc's backends/backend-sdl/build.gradle - url = "https://www.libsdl.org/release/SDL2-devel-2.0.20-mingw.tar.gz"; - hash = "sha256-OAlNgqhX1sYjUuXFzex0lIxbTSXFnL0pjW0jNWiXa9E="; + + desktopItem = makeDesktopItem { + name = "Mindustry"; + desktopName = "Mindustry"; + exec = "mindustry"; + icon = "mindustry"; + categories = [ "Game" ]; }; +in +assert lib.assertMsg (enableClient || enableServer) + "mindustry: at least one of 'enableClient' and 'enableServer' must be true"; +stdenv.mkDerivation { + inherit pname version; + + unpackPhase = '' + cp -r ${Mindustry} Mindustry + cp -r ${Arc} Arc + chmod -R u+w -- Mindustry Arc + cp -r ${soloud} Arc/arc-core/csrc/soloud + chmod -R u+w -- Arc/arc-core/csrc/soloud + ''; + patches = [ ./0001-fix-include-path-for-SDL2-on-linux.patch # Fix build with gradle 8.8, remove on next Arc release @@ -96,69 +103,45 @@ let extraPrefix = "Arc/"; stripLen = 1; }) + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/commit/695dad201fb4c2b4252f2ee5abde32e968169ba5.patch"; + hash = "sha256-bbTjyfUl+XFG/dgD1XPddVKD/ImOP5ARAP3q0FPnt58="; + name = "always-use-local-arc-1.patch"; + stripLen = 1; extraPrefix = "Mindustry/"; + }) + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/commit/f6082225e859c759c8d9c944250b6ecd490151ed.patch"; + hash = "sha256-xFHdAUTS1EiHNQqw6qfzYk2LMr/DjeHoEzQfcfOUcFs="; + name = "always-use-local-arc-2.patch"; + stripLen = 1; extraPrefix = "Mindustry/"; + }) + (fetchpatch { + url = "https://github.com/Anuken/Mindustry/commit/e4eadbbb7f35db3093a0a3d13272bdfbedfaead3.patch"; + hash = "sha256-L/XQAxh6UgKsTVTgQKDXNRIAdtVtaY4ameT/Yb/+1p8="; + name = "always-use-local-arc-3.patch"; + stripLen = 1; extraPrefix = "Mindustry/"; + }) ]; - unpackPhase = '' - cp -r ${Mindustry} Mindustry - cp -r ${Arc} Arc - chmod -R u+w -- Mindustry Arc - cp ${stb.src}/stb_image.h Arc/arc-core/csrc/ - cp -r ${soloud} Arc/arc-core/csrc/soloud - chmod -R u+w -- Arc - ''; - - desktopItem = makeDesktopItem { - name = "Mindustry"; - desktopName = "Mindustry"; - exec = "mindustry"; - icon = "mindustry"; - categories = [ "Game" ]; - }; - - cleanupMindustrySrc = '' + postPatch = '' # Ensure the prebuilt shared objects don't accidentally get shipped rm -r Arc/natives/natives-*/libs/* rm -r Arc/backends/backend-*/libs/* + cd Mindustry + # Remove unbuildable iOS stuff - sed -i '/^project(":ios"){/,/^}/d' Mindustry/build.gradle - sed -i '/robo(vm|VM)/d' Mindustry/build.gradle - rm Mindustry/ios/build.gradle + sed -i '/^project(":ios"){/,/^}/d' build.gradle + sed -i '/robo(vm|VM)/d' build.gradle + rm ios/build.gradle ''; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version unpackPhase patches; - postPatch = cleanupMindustrySrc; - - nativeBuildInputs = [ gradleWithJdk perl ]; - # Here we download dependencies for both the server and the client so - # we only have to specify one hash for 'deps'. Deps can be garbage - # collected after the build, so this is not really an issue. - buildPhase = '' - pushd Mindustry - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon resolveDependencies - popd - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - outputHashMode = "recursive"; - outputHash = "sha256-hbWLsWorEo+1BBURvrFMXpxvZjJBZ1p7HVlJN5e5JZc="; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; -in -assert lib.assertMsg (enableClient || enableServer) - "mindustry: at least one of 'enableClient' and 'enableServer' must be true"; -stdenv.mkDerivation rec { - inherit pname version unpackPhase patches; - - postPatch = cleanupMindustrySrc; + __darwinAllowLocalNetworking = true; buildInputs = lib.optionals enableClient [ SDL2 @@ -167,33 +150,26 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkg-config - gradleWithJdk + gradle makeWrapper jdk ] ++ lib.optionals enableClient [ ant copyDesktopItems + curl + wget ]; desktopItems = lib.optional enableClient desktopItem; - buildPhase = with lib; '' - export GRADLE_USER_HOME=$(mktemp -d) + gradleFlags = [ "-Pbuildversion=${buildVersion}" "-Dorg.gradle.java.home=${jdk}" ]; - # point to offline repo - sed -ie "1ipluginManagement { repositories { maven { url '${deps}' } } }; " Mindustry/settings.gradle - sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" Mindustry/build.gradle - sed -ie "s#mavenCentral()#mavenCentral(); maven { url '${deps}' }#g" Arc/build.gradle - sed -ie "s#wget.*freetype.* -O #cp ${freetypeSource} #" Arc/extensions/freetype/build.gradle - sed -ie "/curl.*glew/{;s#curl -o #cp ${glewSource} #;s# -L http.*\.zip##;}" Arc/backends/backend-sdl/build.gradle - sed -ie "/curl.*sdlmingw/{;s#curl -o #cp ${SDLmingwSource} #;s# -L http.*\.tar.gz##;}" Arc/backends/backend-sdl/build.gradle - - pushd Mindustry + buildPhase = with lib; optionalString enableServer '' + gradle server:dist '' + optionalString enableClient '' - pushd ../Arc - gradle --offline --no-daemon jnigenBuild -Pbuildversion=${buildVersion} - gradle --offline --no-daemon jnigenJarNativesDesktop -Pbuildversion=${buildVersion} + gradle jnigenBuild + gradle jnigenJarNativesDesktop glewlib=${lib.getLib selectedGlew}/lib/libGLEW.so sdllib=${lib.getLib SDL2}/lib/libSDL2.so patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \ @@ -204,9 +180,7 @@ stdenv.mkDerivation rec { cp extensions/freetype/libs/*/* natives/natives-freetype-desktop/libs/ popd - gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion} - '' + optionalString enableServer '' - gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion} + gradle desktop:dist ''; installPhase = with lib; let @@ -247,9 +221,13 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.tests = { - nixosTest = nixosTests.mindustry; - }; + postGradleUpdate = '' + # this fetches non-gradle dependencies + cd ../Arc + gradle preJni + ''; + + passthru.tests.nixosTest = nixosTests.mindustry; meta = with lib; { homepage = "https://mindustrygame.github.io/"; @@ -261,9 +239,8 @@ stdenv.mkDerivation rec { ]; license = licenses.gpl3Plus; maintainers = with maintainers; [ chkno fgaz thekostins ]; - platforms = if enableClient then platforms.x86_64 else platforms.linux; - # Hash mismatch on darwin: - # https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293 - broken = stdenv.isDarwin; + platforms = platforms.all; + # TODO alsa-lib is linux-only, figure out what dependencies are required on Darwin + broken = enableClient && stdenv.isDarwin; }; } diff --git a/pkgs/games/mindustry/deps.json b/pkgs/games/mindustry/deps.json new file mode 100644 index 000000000000..eca1452addf7 --- /dev/null +++ b/pkgs/games/mindustry/deps.json @@ -0,0 +1,294 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://download.savannah.gnu.org": { + "releases/freetype/freetype-2.10.4": { + "tar.gz": "sha256-Xqt5XrsjrHcAHPtot9TVC11sdGkkewsBsslTJp9ljaw=" + } + }, + "https://github.com": { + "nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0": { + "zip": "sha256-qQRqkTd0OVoJXtzAsKwtgcOqzKYXh7OYOblB6b4U4NQ=" + } + }, + "https://jitpack.io/com/github": { + "Anuken#jabel/0.9.0": { + "jar": "sha256-uFYvq/P7dVZNH8xfSZPmm57JI+h47A7YqOaN3bsFLuo=", + "module": "sha256-r0Hiyh4MXzQkBudNhixHcXf1QOr4GWU841ypzRa0w/g=", + "pom": "sha256-2Zp//AsIqW7/+5ybmtConz5ykh3ZYrFBi6SzLuKTz8A=" + }, + "Anuken#rhino/73a812444ac388ac2d94013b5cadc8f70b7ea027": { + "jar": "sha256-g2+szbtgsHvalu5F4kygVDN89kk0zvzVSw3EOcAL11I=", + "module": "sha256-BbXoWzXoJGKhH6kA6EiluDHhfs3th9X+ojLLZuGISOg=", + "pom": "sha256-ngLvPqdMq7ayWlDHf7qr8MGYsDh+uMK6OYcDX9y5bXk=" + }, + "Anuken#steamworks4j/0b86023401880bb5e586bc404bedbaae9b1f1c94": { + "jar": "sha256-YbaPhCjWtlExwQ1dFNA6JrkiAfQYWxJ0VRV9rLnoYhY=", + "pom": "sha256-ktvhk8s3T1zswrYWuXz+cWHRyK3YbkikD5Sv/gjcfz4=" + }, + "libgdx/gdx-jnigen#gdx-jnigen-gradle/dffc32eecbf77aad264991ea44f1767a58cbee9d": { + "jar": "sha256-nuUxM4zDV48+8Z+Rsn2dhEhkH4wOcfG62lz84BUhDH0=", + "module": "sha256-OU9DEb3A9A7OtnJ6jQkS32KImMlNn9NX7eKMX4YVh5E=", + "pom": "sha256-0THLPDNZDZe9PbIEPl71pGwL7E6Oq2Y5LiVevltdbP8=" + }, + "libgdx/gdx-jnigen#gdx-jnigen/28dd11fa4c33a7ae9e58897912b52ba7d53d54fe": { + "jar": "sha256-fPszziBPrTDACbBuL6OxJ2oK1iA4izBk4TMHK53b+GQ=", + "module": "sha256-0RR9vgSqD1ISADHSO5OV7rxi+6HM9h0ZO4kEYw/Ao4Y=", + "pom": "sha256-vnz59i+3/wY9RizYWGMOuebfrZO4HrpOYV73ShIFH2g=" + }, + "libgdx/gdx-jnigen#gdx-jnigen/dffc32eecbf77aad264991ea44f1767a58cbee9d": { + "jar": "sha256-bd8xr4/YgvQbvdFkayXdJKpMvYwE9XlISof20vsfcSU=", + "module": "sha256-zQ1DewRtrsdTgxXINq7pOa+UJwnDNrGsVKnX0K/AWRQ=", + "pom": "sha256-HWFvvs+x6DyJioqkRDDVvf0GCKfxPTjhdec8JC2PZvA=" + } + }, + "https://plugins.gradle.org/m2/org/jetbrains/kotlin": { + "jvm#org.jetbrains.kotlin.jvm.gradle.plugin/1.6.0": { + "pom": "sha256-FeMDwR4tRlKdxOmvd853pFyge29WJvHjkFslMyVlJAg=" + }, + "kapt#org.jetbrains.kotlin.kapt.gradle.plugin/1.6.0": { + "pom": "sha256-EPl8xsN9xufqKiw5ptVSBLiMrZkniaiGvLSaH/RURV8=" + } + }, + "https://raw.githubusercontent.com": { + "nothings/stb/e140649ccf40818781b7e408f6228a486f6d254b/stb_image": { + "h": "sha256-jlsNcX38ioNMl+8gLSDnjQg9AJWG4XMcmFgX0BVdVow=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/github/gundy#semver4j/0.16.4": { + "pom": "sha256-MgAdskQ7M53SH1t5/ynRreci0boIDCFL3oGfD3LRYE0=" + }, + "com/github/gundy#semver4j/0.16.4/nodeps": { + "jar": "sha256-P1nspRY3TM1P01UWJb9Q+KSxkfcAUI985IZkYKYSivA=" + }, + "com/github/javaparser#javaparser-core/3.14.14": { + "jar": "sha256-Z4GYXisXFCvQfhp75Zt5NIXLAms3ZnN30WYQrpgUi24=", + "pom": "sha256-70ERyN/Uh+Zp5w1Qzz2z8O3YuTLKvjXmYzuzzuuGpIo=" + }, + "com/github/javaparser#javaparser-parent/3.14.14": { + "pom": "sha256-RwgtW3eLzkmjEnRtUWHJ48yhfYwh2eO+MTF68Io2FDc=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.8.6": { + "pom": "sha256-NzZGOFnsGSZyleiUlAroKo9oRBMDESL+Nc58/34wp3Q=" + }, + "com/google/code/gson#gson/2.8.6": { + "jar": "sha256-yPtIOQVNKAswM/gA0fWpfeLwKOuLoutFitKH5Tbz8l8=", + "pom": "sha256-IXRBWmRzMtMP2gS9HPxwij7MhOr3UX9ZYYjYJE4QORE=" + }, + "com/google/errorprone#error_prone_annotations/2.3.4": { + "jar": "sha256-uvfW6pfOYGxT4RtoVLpfLOfvXCTd3wr6GNEmC9JbACw=", + "pom": "sha256-EyZziktPfMrPYHuGahH7hRk+9g9qWUYRh85yZfm+W+0=" + }, + "com/google/errorprone#error_prone_parent/2.3.4": { + "pom": "sha256-QElbQ3pg0jmPD9/AVLidnDlKgjR6J0oHIcLpUKQwIYY=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/29.0-jre": { + "pom": "sha256-alf54C9436L0vaNBYGWmRCauG2beIoz24Zbi4ZElU78=" + }, + "com/google/guava#guava/29.0-jre": { + "jar": "sha256-sixftm1h57lSJTHQSy+RW1FY6AqgtA7nKCyL+wew2iU=", + "pom": "sha256-kCfpNAmJA9KH8bphyLZfAdHR4dp6b7zAS/PeBUQBRCY=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/squareup#javapoet/1.12.1": { + "jar": "sha256-g/D9S66+w78p7jrSwCSzBl3e+CWlqin33PXBifn6KWI=", + "pom": "sha256-pxrD2PJ8ua0yyHtdiVnyLWca60YMejVdCfV35MV+TF8=" + }, + "de/undercouch#gradle-download-task/4.1.1": { + "jar": "sha256-6wi1cOQI1GRnBecKlJYU1DnqKxFFXxZSqwMw3olU2rk=", + "pom": "sha256-heZgcmDbvbXoXxmIhAsNmsS+kRnd6QobrKjqd1ZGQVo=" + }, + "net/java/dev/jna#jna/5.6.0": { + "jar": "sha256-VVfiNaiqL5dm1dxgnWeUjyqIMsLXls6p7x1svgs7fq8=", + "pom": "sha256-X+gbAlWXjyRhbTexBgi3lJil8wc+HZsgONhzaoMfJgg=" + }, + "org/apiguardian#apiguardian-api/1.1.0": { + "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=", + "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE=" + }, + "org/checkerframework#checker-qual/2.11.1": { + "jar": "sha256-AVIkpLHcbebaBTJz1Np9Oc/qIOYwOBafxFrA0dycWTg=", + "pom": "sha256-zy4MkNj3V0VfSiWOpglzkFNmO9XaannZvVP5NaR955w=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20181211": { + "jar": "sha256-r/t8haPIe9z2n/HbuE3hH2PckxKTk0vAjNerGN4INgE=", + "pom": "sha256-MQpqotkFNMMrj0bx/JjNDtrpXc38oj4oR+Xvqa4MAZo=" + }, + "org/jetbrains/kotlin#kotlin-android-extensions/1.6.0": { + "jar": "sha256-TPrz8BIFF78dbY07r8+uHomMZ9P3yLdocIG/uBk8ftQ=", + "pom": "sha256-hlMj+0VThiKBTO4p4gN1AamL/eUwVzg2+gCBPvSVcR4=" + }, + "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/1.6.0": { + "jar": "sha256-hnP///sAqxYDPZD2x/7BC10xDKQPvkNRmrQRi/yEF5w=", + "pom": "sha256-G0C/0FxYRRS55Z1YnjPCZb456Z6gRvhHxe411uUFjiM=" + }, + "org/jetbrains/kotlin#kotlin-build-common/1.6.0": { + "jar": "sha256-4kp7cGukVhi07kOWa2JQETbQBgsDL46fGNGD2gWxv0M=", + "pom": "sha256-93xRil6Ux4dnVflhEApdtQuSQFTH8GQqSIMeJagk8pE=" + }, + "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.6.0": { + "jar": "sha256-A2aEPNLe/dWDxrFrELwyuF8oxb+VEPEORMiG9b0kw4g=", + "pom": "sha256-KlWcBwvS5YxY2x5/z2T7t92+hHciXec9Zu4AAQiocCQ=" + }, + "org/jetbrains/kotlin#kotlin-compiler-runner/1.6.0": { + "jar": "sha256-avdSCvhKRCxqvxvXKFunG6xzZWYLLQj9BMhOw1NjPUk=", + "pom": "sha256-Oc+l/Aqzv3VwSfj9Dx6bNbYrebnTJdLPlwLVqaDY/jc=" + }, + "org/jetbrains/kotlin#kotlin-daemon-client/1.6.0": { + "jar": "sha256-bBsv3jMVh50Ml35fJRU5fngpvQrfiSHkxf262DLrwqE=", + "pom": "sha256-gatFLaX29bavP6ggpywNKNCfVUTU7EXafxFDG6Xtkhg=" + }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.6.0": { + "jar": "sha256-INCHBqoXdi/lqwOpFtYsm37iEdIIRKiqvg24PZ2QKEo=", + "pom": "sha256-dTHQzBNuWUgjMpvMExxPHv4XP8OVr4Lus4/SZhbckfY=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.6.0": { + "jar": "sha256-yGksM4gmxIQlv8h/q2nLef4tT1+B/wWMkpQYvw2pfRU=", + "pom": "sha256-HP5CdZvSCiU6S36NvQ5yll5nReE1Duzd6lOZsjy40Wg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.6.0": { + "jar": "sha256-ne9NHPDZV3pRGiqk9/MQ7MwkJDsFwCpxelExxMj5ll4=", + "pom": "sha256-aZyyu6C03O/rmbelzYHM8MLOPWi8AVgZCAli7mflbUs=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/1.6.0": { + "jar": "sha256-twN61m6wybWbrcqiONHFQmcVt5eqdwk0cwe3XBrawWo=", + "pom": "sha256-G6PfHEnY5ZBuWyGdFyCRd7nnb4M9xPFuwbjPjRA/qN4=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.6.0": { + "jar": "sha256-/GqznpDYIibZuLzOAYdhZOW6/RrAogPz8DB4yxtIMB8=", + "pom": "sha256-elUGa/rRTIyZqq8GCHV+uKfl7LzODzC9J+56qWtWoAk=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/1.6.0": { + "jar": "sha256-x8gRYmPShf5TjnwZaEHiNaqPe52fasNhP4jeU7Jh2MM=", + "pom": "sha256-htOIK0/IKs3DheQpnn76HaZQvzUG/lqg+F5FzNwmmss=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/1.6.0": { + "jar": "sha256-oLD9fer0/hCwZxNVJYvGN1nj0kpxFc7/h7x0G/p86ew=", + "pom": "sha256-a9fh1Kc7At/mYvqDdkrikRPrWqItrdGKVn8cfpdCQhs=" + }, + "org/jetbrains/kotlin#kotlin-project-model/1.6.0": { + "jar": "sha256-OBNdP5lfxQXWBK7S6CrFuoWLKmo+R2iZw7i+R/0iK2g=", + "pom": "sha256-sMn75G5kDHVwJEMc9+p5PdmN2nbRFe9K5OXz1B9nH9Q=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.0": { + "jar": "sha256-xhYYhCCSIdt/XdsDG7SAo8RruQ1bZdfMAWexSaqpxJQ=", + "pom": "sha256-hcz47mWEylEpbV8yn+zAIerbRbxqLDu9qMrmAvWO4lQ=" + }, + "org/jetbrains/kotlin#kotlin-script-runtime/1.6.0": { + "jar": "sha256-3coPdlxBbnek2IFvPS327alT9hr4EXN4RqIgMyJaDlc=", + "pom": "sha256-GsP9ZI4oCa3h+13heKISaNPXurUYNV7dTEmAXMsx1c4=" + }, + "org/jetbrains/kotlin#kotlin-scripting-common/1.6.0": { + "jar": "sha256-FmmbBwr8RCIwDJ7WboHpi2X3xpH6qFK41EGV5QndbSI=", + "pom": "sha256-9l4xIUhL0lNnX9BqxOiCkuDk8zV7kBKjRYKlc02OOVA=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.6.0": { + "jar": "sha256-LNHG9q9pwWt5NNfY1nwYM0m0NPRQSC1yKalgcTb6BEc=", + "pom": "sha256-4jtqC3HdlDRIRzwooThIk8LMx6tK9hMwCVuFEmBYMvo=" + }, + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.6.0": { + "jar": "sha256-5L1IkGdG5M0Z4BZEVZncomg6mU2gasOMrTg6rEgzjag=", + "pom": "sha256-ZX90rM8Q8WYXJBIvDgLIBkMFyuLSgAxZQmqIQG80cPE=" + }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/1.6.0": { + "jar": "sha256-X2p+onTLbGxDcglKNXLfKjkqpTifFVO4JIc9YtYANlI=", + "pom": "sha256-nzZY4pTKV2EytPaUIOpJsp3twftsDl0HqygOq75tCzY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.0": { + "jar": "sha256-ZEpyV8I7UaH9UGiWDkCSLj5SwhnxHs4+BAo6vHSCPyI=", + "pom": "sha256-iZ6XwgKLX3or2vZ1H6KgG2h+PuKngXZ8iiJ8v/tsAYQ=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.6.0": { + "jar": "sha256-EV2uowsNSEr88jYCN7nZU39IpKLwPzzCoWV338bpA0I=", + "pom": "sha256-cSpt3XF8zVsNUOdMM16TqbGRBSzXu4KWBSAJu4XJRBI=" + }, + "org/jetbrains/kotlin#kotlin-tooling-metadata/1.6.0": { + "jar": "sha256-X3m1R/gM66SC1vcYRLI0ReEJ9oXrdEgQRGeM11worXc=", + "pom": "sha256-yYlWnKkvPwTPHmuhScQ8SVao2dyXk5vkmPHfUvQMwsU=" + }, + "org/jetbrains/kotlin#kotlin-util-io/1.6.0": { + "jar": "sha256-rbeHTvdxKKs7CVP/SeyAEjnIN/5xMcMUfO+duLvfVzk=", + "pom": "sha256-PGMhnFxVPRyfo2HTbtzZsDXL6QzpS86hqhR4F3IvY5w=" + }, + "org/jetbrains/kotlin#kotlin-util-klib/1.6.0": { + "jar": "sha256-qWMcC3gjxpuNM1AqKGPnV0MI2fnBLj8o9LW79sKkH3Q=", + "pom": "sha256-YJjHylRvWZ35UdQOKaAdqT9NepB1l5Uy7hSSmzjE42g=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.5.0": { + "jar": "sha256-eNbMcTX4TWkv83Uvz9H6G74JQNffcGUuTx6u7Ax4r7s=", + "module": "sha256-yIXdAoEHbFhDgm3jF+PLzcPYhZ2+71OuHPrNG5xg+W4=", + "pom": "sha256-U2IuA3eN+EQPwBIgGjW7S9/kAWTv7GErvvze7LL/wqs=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/junit/jupiter#junit-jupiter-api/5.7.1": { + "jar": "sha256-znuYW8Rp4mJXWaTrxFUzxwWBoFo0gnjB1kCOmy414xQ=", + "module": "sha256-AiFvaghBm7NdVHeGPZ0hpoxXWRqol7qYGmHFVFZWzX4=", + "pom": "sha256-1Vvisj13FDKXB3IEMgey5mpnJK4CvVGStyFuS3AbxiM=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.7.1": { + "jar": "sha256-VmFsk1CzYk92z/72skznuyIpFb/VaI+W089M7zTwd8s=", + "module": "sha256-2A5S75X2XNxQT8Mb4KArJYnJ78JzpCVcs2NyPOVMr/8=", + "pom": "sha256-gRF+OjoCDf3W8wkcXseU0stJhAcxrPQogxxWmQEvTLs=" + }, + "org/junit/jupiter#junit-jupiter-params/5.7.1": { + "jar": "sha256-jv/df4pLpVWLVoGE3uCACLJEPIbGc++B3lhh+8fvBhM=", + "module": "sha256-TUOYtYCpnIVNnxF6bk44o9GOZSJ2obzmeaDDx5nGFL0=", + "pom": "sha256-UIPD5bw9OhjVY6M0fVPi3f35ONdh60TbsL9PQgX+6Sw=" + }, + "org/junit/platform#junit-platform-commons/1.7.1": { + "jar": "sha256-fFRr6GhkcY+6zrefqE/x06UWUA/EKPGyHQYcLg+8Wks=", + "module": "sha256-5abLDsz80tAuaGvyt2OnBCTQiB2/+uvjp/kxShhT+TE=", + "pom": "sha256-t8GENMTUsn5yO9SKr5ercK7IwMra1MFTkvvdFEykpQo=" + }, + "org/junit/platform#junit-platform-engine/1.7.1": { + "jar": "sha256-N99anNbbwfdUuitG+WuIdKg2YOF5a/OMc48CLc+Gwj8=", + "module": "sha256-S2knc2Ouooq1DFpnYZ++q/jAgk5JOOYmC6wEjlvrga8=", + "pom": "sha256-dmAvWZVKo9+mjjHIDKibb7ouoAG0+wbLUfoV6tfIWjA=" + }, + "org/lz4#lz4-java/1.8.0": { + "jar": "sha256-10ozNPs1GVAJszipUfkYID1rvKPR01kDPcM+3Rytye8=", + "pom": "sha256-DbittR4TJFSlxAbeuy8aDfgfk91Z++IMuUcQKZRokDQ=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://www.libsdl.org": { + "release/SDL2-devel-2.0.20-mingw": { + "tar.gz": "sha256-OAlNgqhX1sYjUuXFzex0lIxbTSXFnL0pjW0jNWiXa9E=" + } + } +} From ac7944dab491b0129b18cbb3788a943f49ab26f9 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 14 Dec 2023 18:55:39 +0700 Subject: [PATCH 070/227] shattered-pixel-dungeon: convert to gradle setup hook --- .../games/shattered-pixel-dungeon/default.nix | 2 +- pkgs/games/shattered-pixel-dungeon/deps.json | 252 ++++++++++++++++++ .../default.nix} | 9 +- .../experienced-pixel-dungeon/deps.json | 252 ++++++++++++++++++ .../games/shattered-pixel-dungeon/generic.nix | 45 +--- .../default.nix} | 4 +- .../rat-king-adventure/deps.json | 238 +++++++++++++++++ .../{rkpd2.nix => rkpd2/default.nix} | 4 +- .../shattered-pixel-dungeon/rkpd2/deps.json | 252 ++++++++++++++++++ .../default.nix} | 9 +- .../shorter-pixel-dungeon/deps.json | 252 ++++++++++++++++++ .../default.nix} | 4 +- .../summoning-pixel-dungeon/deps.json | 177 ++++++++++++ .../disable-git-version.patch | 0 pkgs/top-level/all-packages.nix | 10 +- 15 files changed, 1444 insertions(+), 66 deletions(-) create mode 100644 pkgs/games/shattered-pixel-dungeon/deps.json rename pkgs/games/shattered-pixel-dungeon/{experienced-pixel-dungeon.nix => experienced-pixel-dungeon/default.nix} (71%) create mode 100644 pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json rename pkgs/games/shattered-pixel-dungeon/{rat-king-adventure.nix => rat-king-adventure/default.nix} (85%) create mode 100644 pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json rename pkgs/games/shattered-pixel-dungeon/{rkpd2.nix => rkpd2/default.nix} (84%) create mode 100644 pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json rename pkgs/games/shattered-pixel-dungeon/{shorter-pixel-dungeon.nix => shorter-pixel-dungeon/default.nix} (69%) create mode 100644 pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json rename pkgs/games/shattered-pixel-dungeon/{summoning-pixel-dungeon.nix => summoning-pixel-dungeon/default.nix} (90%) create mode 100644 pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json rename pkgs/games/shattered-pixel-dungeon/{ => summoning-pixel-dungeon}/disable-git-version.patch (100%) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index dd58a3d9db3a..f5a8ceb20984 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -14,7 +14,7 @@ callPackage ./generic.nix rec { hash = "sha256-1msmjKDEd/pFMqLB4vJgR6GPC9z4CnNew2hlemLw2d0="; }; - depsHash = "sha256-vihoR0bPh7590sRxeYJ1uuynNRxtRBuiFUrdmsRNUJc="; + depsPath = ./deps.json; passthru.tests = { shattered-pixel-dungeon-starts = nixosTests.shattered-pixel-dungeon; diff --git a/pkgs/games/shattered-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/deps.json new file mode 100644 index 000000000000..76260aee3636 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/deps.json @@ -0,0 +1,252 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": { + "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=", + "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4=" + }, + "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200112" + } + }, + "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200114" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": { + "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": { + "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.12.1": { + "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=", + "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=", + "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1": { + "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": { + "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0=" + }, + "com/badlogicgames/gdx#gdx/1.12.1": { + "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=", + "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=", + "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY=" + }, + "com/badlogicgames/jamepad#jamepad/2.26.5.0": { + "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=", + "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=", + "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3": { + "jar": "sha256-7gUVBU7hmj9AiEJv7p2HnrLuZXsH5QZOTiyFH2rc8Us=", + "pom": "sha256-LBvRGfQeZaVEYT+R5xYOAGuBkW5zpu919UkkLMTzvvI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux": { + "jar": "sha256-oHb6BaTRdHYuq1hS7nLCnRSrEKVlTyf7AGZO8bUsDAU=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux-arm64": { + "jar": "sha256-gNNOdtFcBJUXRBSIMpCDkdqLFPaKAwtksLQHAqNzkdc=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos": { + "jar": "sha256-RGXdRv35MJwM5kw1KaDaZ5L7ZxHDKB6MXbqTXmqb/Dw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos-arm64": { + "jar": "sha256-b32XlBRlHjQ9yLiz+q3g4tnk/fmdVl1WI+EtQNuuSiI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-windows": { + "jar": "sha256-AihZEfHIgXNfpNDrFB/+qv2aK7k0nZj3wfuKnLScD1g=" + }, + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix similarity index 71% rename from pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix rename to pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix index 72ce4f790ad4..ec379dfef033 100644 --- a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -callPackage ./generic.nix rec { +callPackage ../generic.nix rec { pname = "experienced-pixel-dungeon"; version = "2.18"; @@ -13,13 +13,6 @@ callPackage ./generic.nix rec { hash = "sha256-jOKHBd9LaDn3oqLdQWqAcJnicktlbkDGw00nT8JveoI="; }; - postPatch = '' - substituteInPlace build.gradle \ - --replace-fail "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" - ''; - - depsHash = "sha256-PyBEhlOOVD3/YH4SWs1yMkdg3U96znk1/VV6SAr8S30="; - desktopName = "Experienced Pixel Dungeon"; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json new file mode 100644 index 000000000000..76260aee3636 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json @@ -0,0 +1,252 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": { + "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=", + "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4=" + }, + "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200112" + } + }, + "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200114" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": { + "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": { + "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.12.1": { + "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=", + "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=", + "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1": { + "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": { + "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0=" + }, + "com/badlogicgames/gdx#gdx/1.12.1": { + "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=", + "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=", + "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY=" + }, + "com/badlogicgames/jamepad#jamepad/2.26.5.0": { + "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=", + "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=", + "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3": { + "jar": "sha256-7gUVBU7hmj9AiEJv7p2HnrLuZXsH5QZOTiyFH2rc8Us=", + "pom": "sha256-LBvRGfQeZaVEYT+R5xYOAGuBkW5zpu919UkkLMTzvvI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux": { + "jar": "sha256-oHb6BaTRdHYuq1hS7nLCnRSrEKVlTyf7AGZO8bUsDAU=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux-arm64": { + "jar": "sha256-gNNOdtFcBJUXRBSIMpCDkdqLFPaKAwtksLQHAqNzkdc=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos": { + "jar": "sha256-RGXdRv35MJwM5kw1KaDaZ5L7ZxHDKB6MXbqTXmqb/Dw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos-arm64": { + "jar": "sha256-b32XlBRlHjQ9yLiz+q3g4tnk/fmdVl1WI+EtQNuuSiI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-windows": { + "jar": "sha256-AihZEfHIgXNfpNDrFB/+qv2aK7k0nZj3wfuKnLScD1g=" + }, + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/games/shattered-pixel-dungeon/generic.nix index fdd87ba2bd19..7f2f3a14a4d2 100644 --- a/pkgs/games/shattered-pixel-dungeon/generic.nix +++ b/pkgs/games/shattered-pixel-dungeon/generic.nix @@ -2,10 +2,10 @@ { pname , version , src -, depsHash , meta , desktopName , patches ? [ ./disable-beryx.patch ] +, depsPath ? null , lib , stdenv @@ -53,30 +53,18 @@ let keywords = [ "roguelike" "dungeon" "crawler" ]; }; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src patches postPatch; - nativeBuildInputs = [ gradle perl ] ++ attrs.nativeBuildInputs or []; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - gradle --no-daemon desktop:release - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - outputHashMode = "recursive"; - outputHash = depsHash; - }; + depsPath' = if depsPath != null then depsPath else ./${pname}/deps.json; in stdenv.mkDerivation (cleanAttrs // { inherit pname version src patches postPatch; + mitmCache = gradle.fetchDeps { + inherit pname; + data = depsPath'; + }; + + __darwinAllowLocalNetworking = true; + nativeBuildInputs = [ gradle perl @@ -86,18 +74,7 @@ in stdenv.mkDerivation (cleanAttrs // { desktopItems = [ desktopItem ]; - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - # point to offline repo - sed -ie "s#repositories {#repositories { maven { url '${deps}' };#g" build.gradle - gradle --offline --no-daemon desktop:release - - runHook postBuild - ''; + gradleBuildTask = "desktop:release"; installPhase = '' runHook preInstall @@ -131,8 +108,6 @@ in stdenv.mkDerivation (cleanAttrs // { license = licenses.gpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - # https://github.com/NixOS/nixpkgs/pull/99885#issuecomment-740065005 - broken = stdenv.isDarwin; mainProgram = pname; } // meta; }) diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix similarity index 85% rename from pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix rename to pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix index c376545ffcef..fcdf31cf94ff 100644 --- a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure.nix +++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -callPackage ./generic.nix rec { +callPackage ../generic.nix rec { pname = "rat-king-adventure"; version = "1.5.3"; @@ -13,8 +13,6 @@ callPackage ./generic.nix rec { hash = "sha256-Q/smIObu7khcRnwdT8m7+WstpPE1tbDFJcZ4OGYJ338="; }; - depsHash = "sha256-yE6zuLnFLtNq76AhtyE+giGLF2vcCqF7sfIvcY8W6Lg="; - desktopName = "Rat King Adventure"; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json new file mode 100644 index 000000000000..231b9de37158 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json @@ -0,0 +1,238 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.11.0": { + "jar": "sha256-my0CJorGB5QwSi4E5ep1H62fX5bsyvFdgCOm4LF6994=", + "module": "sha256-o7gpPFXSp2lb60LCcKrfKpQcK4NqQL8Ob4W6OOY0VwY=", + "pom": "sha256-wa55d83hp9muWlhfDe8Ap2d4LzcR5/+RYTX2UPA2HOo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0": { + "pom": "sha256-a5PHPPIyrqNpnueP5GEkJ14KwbsROJkXUcz96l8Au9c=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.11.0/natives-desktop": { + "jar": "sha256-9GCzmqhP9bnWC4mT4j/zKtpWellmThTrfha7VcWk9yE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.11.0": { + "jar": "sha256-u5hP1RQ13YCN0HaSWOqzJikXG19OnkPzmvRUPh7E3yI=", + "module": "sha256-n5oGuAY9dyn7H94+ippXm3vuPUqevY+xrDubsj78b/M=", + "pom": "sha256-xkjQNIE46uOtYmScUTA8R5rr5czpsbXQeLX3rkVQG+0=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.11.0": { + "pom": "sha256-8cBBk8LQnXP8lVNQL05ZFMIOgDWrdpoZ0z4bxJJ0AkA=" + }, + "com/badlogicgames/gdx#gdx-platform/1.11.0/natives-desktop": { + "jar": "sha256-yUFpxwl25LGMCL1qKWtETqiLtUlF67EtHy5DK5L4OTA=" + }, + "com/badlogicgames/gdx#gdx/1.11.0": { + "jar": "sha256-IxU8Z+GVYGROD6EjUjK12F7kHPKJKBwtp+yMKONXULk=", + "module": "sha256-twUVE1CLWninINOZQrsifRvrOrzgBpskstIAA2TPbbM=", + "pom": "sha256-2W6H3BZixRugifIY1Cy3/U3b3sZQiytosvCsZ5dvJSU=" + }, + "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.2": { + "jar": "sha256-DKa7jeeMTIY2ycrjhvrAU4LdMp9y1xCU+62wL89aEAQ=", + "pom": "sha256-Y0QV6aRkzGOr46Gb6+AYM2OdS95sUt2zIoaOQduz724=" + }, + "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.2": { + "jar": "sha256-oJnxlAyrkj1QtnHH4uK6HkXq44+mxdzq6piktPUqTl0=", + "pom": "sha256-ZAhAV2hHVAbq8aLVysozRiKXIYdZmkssHWSOf+rarn8=" + }, + "com/badlogicgames/jamepad#jamepad/2.0.20.0": { + "jar": "sha256-6fFqB9SpRCSs0DiOw6P+TsZLfhiWxlgUwv9rRisTs2Y=", + "module": "sha256-vXFX36GUJsdj2VgYbnHR3+lKnBRgBeEI9pwUameDrmY=", + "pom": "sha256-+gwaoDndosNqw/VslH3vLEOptLnkbCPhrqddHQaZ3eQ=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1": { + "jar": "sha256-CLvDTrdS+GPjf4OrHHsMIvfLJtD4+wpKSoxgKKxFs4U=", + "pom": "sha256-TKQrQ8iqDodIWWB0d0C5lFqqH99+QTTm+iTo+d8cF2A=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux": { + "jar": "sha256-Ze0Ev/fQf+ybf958OxHEBShsjWbk609Mm3kuJn7OWwY=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm32": { + "jar": "sha256-hOvo8klGPrF84PrpnYsto8G/kcjUEHOjtYNFd7dS4/s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-linux-arm64": { + "jar": "sha256-IgDyzcENHaZ215o+oFybpVnaCZUFwbdWtu0iL2FagSA=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos": { + "jar": "sha256-G2z/nmSKci7gzBRmlhIFKqW6gJRp+os/sh8kw6vnDek=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-macos-arm64": { + "jar": "sha256-nHlVeHSNWPQtXUcu2A0ulpk71Psf/ABYztosYx7zmJo=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows": { + "jar": "sha256-nnROy4QCnXrO2uh24lV2WRhKKa/uVeRT9KslZzSb+Ek=" + }, + "org/lwjgl#lwjgl-glfw/3.3.1/natives-windows-x86": { + "jar": "sha256-pYAgBm4ePVP/xMf7ShWMDLP/tPM6rrPlTSVScyGUxBI=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1": { + "jar": "sha256-7kn8Co2UVkUuVM1vd3gj7aZm4sY/wU1lsv0sws/tXb4=", + "pom": "sha256-+ZSGEVVV8RPaHOOs1f7LyWk7X9o1P/era9Lj1//dsn4=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux": { + "jar": "sha256-m3mvXH/Q2UkG7h0qU6NCCidQfWYiS0/0a59ncmRd7TQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm32": { + "jar": "sha256-Bj8Lsu2V5d4q0G4Q0xJ/hJDdviBKyj5qOc5C3pF4TF8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-linux-arm64": { + "jar": "sha256-X4nVRq4fr1Gv+/sMZBR60swze/ajLwv4fEbTTDQvxdU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos": { + "jar": "sha256-B6qwMJQFjjiph2upM54IoiQDlO+Ii35/z9R2I1j22Wg=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-macos-arm64": { + "jar": "sha256-500OE6wC9BAsIMF/DUFmCK2FNDSV7K4wAp32VousLSc=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows": { + "jar": "sha256-Il8331UAYUZ1vprLYnjLbJyAo0kmR5iyz8fsQ08e1HI=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.1/natives-windows-x86": { + "jar": "sha256-Y5uy113z3Vnqewv4uEfgr1cHRpTXk5ILoclTeJeyw9g=" + }, + "org/lwjgl#lwjgl-openal/3.3.1": { + "jar": "sha256-cyXuG5GooQwGJsabVXqI8t9qwb3KDlLiqS0yQknyytA=", + "pom": "sha256-+ZzowctqhyXSbdyzNFxAPNu8x8qO6WYIu/PCxP2WaiE=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-linux": { + "jar": "sha256-C3OB9R7cYQy2ByRdw0p2LSsht0R4FARAaKGmADu4eDg=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm32": { + "jar": "sha256-PQ39lwowYdM7FdvxjT7u/PB83EFx6skgUU8DhkY4mmI=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-linux-arm64": { + "jar": "sha256-RPO9inlEGNtNU+51Rtkdl9nK9/QuE+ojU2PMM18u9ig=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-macos": { + "jar": "sha256-UYTKJLjf6XJVtstVjFKb1qOImBu+VeITcY4/0r2ehuQ=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-macos-arm64": { + "jar": "sha256-wi7Lzvj+5K7q+YEDLfPiy8MKkRqQJS7awfFJeX1YdXU=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-windows": { + "jar": "sha256-X35maqJMqLP7dY5ywD/7nYCbMEicantH6tZ8aXf/ZU4=" + }, + "org/lwjgl#lwjgl-openal/3.3.1/natives-windows-x86": { + "jar": "sha256-fVtbb61e+7Lowk80dgDHy8bv3RNh/TewtaEzGSMehR4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1": { + "jar": "sha256-5DbSFE86Nv/3cv1kIzMWgJt5XzkN79TVVmD8aG58KDQ=", + "pom": "sha256-LL9XxnqNBGatgI4aJ/4908EQ6KwC3IqyushKhRl3VUE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux": { + "jar": "sha256-vPzZ+N/SKUiK2ew1PUjHsC3lyiG63UCS8ZAiOaHtBpA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm32": { + "jar": "sha256-IDPJfXY+YL2sAX/bsI06Q7vlwXqjZ7QsU3ycw6tAYY8=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-linux-arm64": { + "jar": "sha256-EFjEunNUzavz75NZUeKT91tJYedT13/XU13ccy4oPyg=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos": { + "jar": "sha256-cR8plyiIUJJiqVfxsxOL+ptQVRnRHfbldj0cmj+LPF0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-macos-arm64": { + "jar": "sha256-29EQBE6uitvKjjx6cwUpo1FVnnTOqIe7PNbvDcAW8pU=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows": { + "jar": "sha256-hRubWTysIeOvUd1MMD6N8/5qNEo/gda5vMGG5+VAv9o=" + }, + "org/lwjgl#lwjgl-opengl/3.3.1/natives-windows-x86": { + "jar": "sha256-aD2K09DQl3puoYuIpMvn6P1PBsGrIbq+2riDCXQLzGA=" + }, + "org/lwjgl#lwjgl-stb/3.3.1": { + "jar": "sha256-ZOXMzi/Hy88Mg0pb6GQtniSYzj/jHBT/HfdBh4o/gSE=", + "pom": "sha256-dKgsbPvqhNIxAk2f2FgO2VumPCAafUeqsmO6hofDCVk=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-linux": { + "jar": "sha256-+BuZjoxdYj1XHi/NRvy4e30w7SXfd95jrsjP7bNMSnA=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm32": { + "jar": "sha256-6xnGjFt5MUjKOT24bzHQ3pVALZ9MFOUADjkYSA9iKkc=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-linux-arm64": { + "jar": "sha256-XOyb0h8xIAJaLIOB3BCax+yI5o5xX9fK27kPXVVfZZs=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-macos": { + "jar": "sha256-oXjWYDA5nGmJeN/kqVALdVep2vTAYeg8iHAzfpsL0+c=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-macos-arm64": { + "jar": "sha256-DXoP8tto86vkFpFn4vSJ3/d72igvQvhuQelEvnxDbdg=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-windows": { + "jar": "sha256-/W/3om6GRa95oNIcpz6NyeRz80AtEzPlRKgdIcpQd+c=" + }, + "org/lwjgl#lwjgl-stb/3.3.1/natives-windows-x86": { + "jar": "sha256-v3PjtRu0MOWIvRWOlsyimOmMoS8p3FzxRFwfDFw5uhs=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1": { + "jar": "sha256-SI9R7ZXw+sSNHYfLDjusCMAS3L9u88FohoXXCM28zVY=", + "pom": "sha256-78RtVita7rFRzJnBhn5KUeVLzwWs+2EwOtZUh45Nyq8=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux": { + "jar": "sha256-e9cLKCM/RiGdoZiaw+n27vcuvyEc43Uv8eZFzqQYpM8=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-linux-arm64": { + "jar": "sha256-pLai7OGbhNkzyXmwx1+46BgCpoLVJEmWXDP0xaH+cAw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos": { + "jar": "sha256-H1yGorLASVqlahKnTHwvwsk1PMOKoAzBOjJAR2QcMk0=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-macos-arm64": { + "jar": "sha256-EY1ViXZdZobUeDcZwt6MpmWiSX2LncKK00/RDtU0P6o=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.1/natives-windows": { + "jar": "sha256-7McVIQloBZdWnZsyIEXynBp93uxxgs9pGJ2uFUE4ucg=" + }, + "org/lwjgl#lwjgl/3.3.1": { + "jar": "sha256-z4P5DjL7lz/17fyk7zX1XKUbtwpXm2ofKQdE9VLo5IQ=", + "pom": "sha256-xMXHr6uOt4JTZqIwhsPf7droMIwRXF1iF6gm7DJLN+M=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-linux": { + "jar": "sha256-Iu8q+jGhdAozfsnGgGxrjZfpMaY+LEMnDLrxT7P2/E4=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-linux-arm32": { + "jar": "sha256-9rVYGOx25ewBfiW8OvbsTbe3ol56KhdW+i/6uojIZWQ=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-linux-arm64": { + "jar": "sha256-T9lq94+cKTsXAAEcfbGg7AI3xNGIPjf6vgj3To0uAiQ=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-macos": { + "jar": "sha256-9I5hCpgdylFbm75zRcx240UME0BLBS2Kw1fvCvjpCr8=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-macos-arm64": { + "jar": "sha256-cZfomrgKKiGDtO6SXMtE5XLwy3V6kndq34JlJpIAo2o=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-windows": { + "jar": "sha256-CT0T1ipkNLxla/EKOzfiUw/ZrzsLwg+OlUW+WGWdFEM=" + }, + "org/lwjgl#lwjgl/3.3.1/natives-windows-x86": { + "jar": "sha256-6QwfnPVwGu7ymC6/CQWiuZH0YiuKf4JQ6vCHO1oKAiM=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2.nix b/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix similarity index 84% rename from pkgs/games/shattered-pixel-dungeon/rkpd2.nix rename to pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix index 5f73a825fca4..9efa5fde80ff 100644 --- a/pkgs/games/shattered-pixel-dungeon/rkpd2.nix +++ b/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -callPackage ./generic.nix rec { +callPackage ../generic.nix rec { pname = "rkpd2"; version = "2.0.6"; @@ -13,8 +13,6 @@ callPackage ./generic.nix rec { hash = "sha256-jwH0nEsv3agUCZt5Mhuv1JSeELOKfrsj3cnmAJsV9sM="; }; - depsHash = "sha256-vihoR0bPh7590sRxeYJ1uuynNRxtRBuiFUrdmsRNUJc="; - desktopName = "Rat King Pixel Dungeon 2"; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json b/pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json new file mode 100644 index 000000000000..76260aee3636 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json @@ -0,0 +1,252 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": { + "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=", + "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4=" + }, + "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200112" + } + }, + "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200114" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": { + "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": { + "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.12.1": { + "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=", + "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=", + "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1": { + "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": { + "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0=" + }, + "com/badlogicgames/gdx#gdx/1.12.1": { + "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=", + "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=", + "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY=" + }, + "com/badlogicgames/jamepad#jamepad/2.26.5.0": { + "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=", + "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=", + "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3": { + "jar": "sha256-7gUVBU7hmj9AiEJv7p2HnrLuZXsH5QZOTiyFH2rc8Us=", + "pom": "sha256-LBvRGfQeZaVEYT+R5xYOAGuBkW5zpu919UkkLMTzvvI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux": { + "jar": "sha256-oHb6BaTRdHYuq1hS7nLCnRSrEKVlTyf7AGZO8bUsDAU=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux-arm64": { + "jar": "sha256-gNNOdtFcBJUXRBSIMpCDkdqLFPaKAwtksLQHAqNzkdc=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos": { + "jar": "sha256-RGXdRv35MJwM5kw1KaDaZ5L7ZxHDKB6MXbqTXmqb/Dw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos-arm64": { + "jar": "sha256-b32XlBRlHjQ9yLiz+q3g4tnk/fmdVl1WI+EtQNuuSiI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-windows": { + "jar": "sha256-AihZEfHIgXNfpNDrFB/+qv2aK7k0nZj3wfuKnLScD1g=" + }, + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix similarity index 69% rename from pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix rename to pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix index 7d775e7e6ed5..a53f27fb14d0 100644 --- a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: -callPackage ./generic.nix rec { +callPackage ../generic.nix rec { pname = "shorter-pixel-dungeon"; version = "1.4.0"; @@ -13,13 +13,6 @@ callPackage ./generic.nix rec { hash = "sha256-iG90T/Ho8/JY3HgkACiBnGdbUGsVRlfxXbcNFHhzZi4="; }; - postPatch = '' - substituteInPlace build.gradle \ - --replace-fail "gdxControllersVersion = '2.2.4-SNAPSHOT'" "gdxControllersVersion = '2.2.3'" - ''; - - depsHash = "sha256-PyBEhlOOVD3/YH4SWs1yMkdg3U96znk1/VV6SAr8S30="; - desktopName = "Shorter Pixel Dungeon"; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json new file mode 100644 index 000000000000..76260aee3636 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json @@ -0,0 +1,252 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": { + "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": { + "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=", + "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4=" + }, + "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": { + "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=", + "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4=" + }, + "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200112" + } + }, + "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": { + "xml": { + "groupId": "com.badlogicgames.gdx-controllers", + "lastUpdated": "20231021200114" + } + } + }, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": { + "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=", + "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=", + "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": { + "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": { + "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.12.1": { + "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=", + "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=", + "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8=" + }, + "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": { + "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=", + "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=", + "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1": { + "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc=" + }, + "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": { + "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0=" + }, + "com/badlogicgames/gdx#gdx/1.12.1": { + "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=", + "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=", + "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY=" + }, + "com/badlogicgames/jamepad#jamepad/2.26.5.0": { + "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=", + "module": "sha256-KGmFPVwJdU2vuY9u6veZLc2Q6K3uFxL/bgjmUgBKflA=", + "pom": "sha256-Up7mQ8lbw+6SfuSnRqwFaOQSnbb5dscD82IjN9/6Inc=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3": { + "jar": "sha256-vtx1f9KxslUUbbJrdLnL0fz1ZEuJtHsQT6chx0FgQlk=", + "pom": "sha256-fJuPWGrEz36esvNnrphUzK7i2Nf2LiOHxJ0sGvrtirM=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux": { + "jar": "sha256-uDBgYrF3QfNCaQiHUUIfGsIaWXv7vQxsYSJjAc3nRLg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm32": { + "jar": "sha256-3Z1NZxT8k1nUfdoNR8HYyLvkmQG393wj/Kepyb/CmFg=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-linux-arm64": { + "jar": "sha256-zGE5yD95nQ4UhOpMIByM5tV8jHokSlIXEWqAax60F5s=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos": { + "jar": "sha256-qJtVNirsnlo7vRNkYBu4WxR9trrmiJHKmiMtbPstVew=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-macos-arm64": { + "jar": "sha256-uUUdZ7wXyQb7goKlUi8liwIvMFaeC2LaAB1ZChe0Xhk=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows": { + "jar": "sha256-mBVbRR38b1hQid7HehL5wFeJxNzrjaRy+dMIFgEBpw0=" + }, + "org/lwjgl#lwjgl-glfw/3.3.3/natives-windows-x86": { + "jar": "sha256-lkZVXUBfDSo6lXa1BvV8FjKvZPaaiuWMsESK4EqceCQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3": { + "jar": "sha256-6Z4xJp5meKS/xi7yTFCkgcAcvdAEhh7Omlm6EnaMZRY=", + "pom": "sha256-IJuMfX+cGXLVyNX5zhmjUW/5BxRD0N+Khm2hNDvS46k=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux": { + "jar": "sha256-TkoT1wFdQmBbvPfvn66tRt6sZAnkN3qO1K6oFfFGNLM=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm32": { + "jar": "sha256-5IM/wmIeLnMCBXPmKZcJIPHNHfmE/hyc7bszSNzDeG8=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-linux-arm64": { + "jar": "sha256-44PVJBwNR/QBKnU+C//+Ra/DDQBiGbm9iQN1ahA3ibU=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos": { + "jar": "sha256-ICTapcaqQHhmQUi3OQ+4sjHyNw6g4X1AeJTbp+nlZOw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-macos-arm64": { + "jar": "sha256-Y5Vuokb/ZKqpzg4dbjzK1obPv5N9H81suNX0T2OCFgw=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows": { + "jar": "sha256-mUnI5JmYvQyHjYQohAEfE4PihRAFCR4LK897dnG4SOs=" + }, + "org/lwjgl#lwjgl-jemalloc/3.3.3/natives-windows-x86": { + "jar": "sha256-2bTgbiqEIFWD+wVEDSI4OFqRywGgYN2x03YiOuIl8Uo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3": { + "jar": "sha256-rg6Cdnys8Ikh9Xj7qdhHU93rAM6toFEKK0qIK+KPv5U=", + "pom": "sha256-f6aiEbvk5FuCmHU31kN6e1KUM07TrBbLhElV70PV5w8=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux": { + "jar": "sha256-kDD+2SinHqwv30zhZDzE7HJNhxDjtDe9znUL3J6YKyo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm32": { + "jar": "sha256-xyXRfh5GJsf0O29NCKRnSW4JECXnHxn0+x8xN8Tabmc=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-linux-arm64": { + "jar": "sha256-q/OSSHs1h9qJtlUlAAjfSjYKL9Xh7gCr1h9/UpFSBaE=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos": { + "jar": "sha256-gmSuMqyfQTxPRQGGPF9udXam/avcXQUtMoG7rMM3fx0=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-macos-arm64": { + "jar": "sha256-OZJGOhao3xn2MRewiD6tDtko3U3wF/VbXk4St6JwSJo=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows": { + "jar": "sha256-49p8PbJcgduNQl7x49v6FQALBA1mnwCLCBPJQzOslsg=" + }, + "org/lwjgl#lwjgl-openal/3.3.3/natives-windows-x86": { + "jar": "sha256-hSyk42sf390++2zkLwi30PlXsExLz714BXsMeZ85kjE=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3": { + "jar": "sha256-UGLadQ5ffsieJ+i2e31A+oxLFokBWeNfgoEWzmyOyh4=", + "pom": "sha256-RDkltWQq0xjUnfrpe66c3QnkkCWzAqlLAQf8iIm+bN0=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux": { + "jar": "sha256-2COpLGooELURLaME3MarzUyxAnBvdPfpNKIjzqIFElA=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm32": { + "jar": "sha256-BbGiXD+3Ipdao78siIQ3I9puEFmhktVo3e/AGkV/qkc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-linux-arm64": { + "jar": "sha256-Cyt1Mn1HRRY0EjNI1VUDrgPlFVGwyIea6QyOS04aT5w=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos": { + "jar": "sha256-TBBz0OWumZZtDvHWp3lXWEdtJH2TD9xewYZeOMuEfM4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-macos-arm64": { + "jar": "sha256-8bPx3oP5c6uuOkvDLbWyKa5dVcyA27xffIQYEv4gtf4=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows": { + "jar": "sha256-9F5fYFlrA7Lj2LmKEjyFXr0LUVTIFV3CpWuJDMyQdHc=" + }, + "org/lwjgl#lwjgl-opengl/3.3.3/natives-windows-x86": { + "jar": "sha256-nZnSA95OMShsrnU6HfuYE2fJNzTxlEZEunG+Uhs68sw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3": { + "jar": "sha256-DP96pG6p1w/MIIVwFSk+qA+/Ia3Kw0YAyE2puBpEypM=", + "pom": "sha256-jR2kP3mIdcV5yokH95rk/D6tFVQl6pVVxvqqsT1Q5J0=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux": { + "jar": "sha256-xEiQaN3G3ESxAwcZQ/gBotB2Y01LdNtHCSf4SjCCGeE=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm32": { + "jar": "sha256-/WYDpBauUJJiAxV7ajQOiPX60GyAjvQcsDUBcTn+Lzw=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-linux-arm64": { + "jar": "sha256-F/DPG45SLuprS5fBkHCznlT1+H7YT7iVhXR+QPkF4ds=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos": { + "jar": "sha256-MpN6NS20usPpKqG72uKYipWOS5B6tbVXdky6gtsgupc=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-macos-arm64": { + "jar": "sha256-sfZYdf2d3SgJe+YHYCniuPq168FibiHO92FhHfynFcI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows": { + "jar": "sha256-0Sq4Zv4RaekkrFtNa7d2eueEKp/IZSeYaCwAabtz/PI=" + }, + "org/lwjgl#lwjgl-stb/3.3.3/natives-windows-x86": { + "jar": "sha256-RkJORUWXM7JsSnsN0mlSCctpONr6OpASxqVoLJSixA4=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3": { + "jar": "sha256-7gUVBU7hmj9AiEJv7p2HnrLuZXsH5QZOTiyFH2rc8Us=", + "pom": "sha256-LBvRGfQeZaVEYT+R5xYOAGuBkW5zpu919UkkLMTzvvI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux": { + "jar": "sha256-oHb6BaTRdHYuq1hS7nLCnRSrEKVlTyf7AGZO8bUsDAU=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-linux-arm64": { + "jar": "sha256-gNNOdtFcBJUXRBSIMpCDkdqLFPaKAwtksLQHAqNzkdc=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos": { + "jar": "sha256-RGXdRv35MJwM5kw1KaDaZ5L7ZxHDKB6MXbqTXmqb/Dw=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-macos-arm64": { + "jar": "sha256-b32XlBRlHjQ9yLiz+q3g4tnk/fmdVl1WI+EtQNuuSiI=" + }, + "org/lwjgl#lwjgl-tinyfd/3.3.3/natives-windows": { + "jar": "sha256-AihZEfHIgXNfpNDrFB/+qv2aK7k0nZj3wfuKnLScD1g=" + }, + "org/lwjgl#lwjgl/3.3.3": { + "jar": "sha256-3Jx7LUjoOW1oiV+JAv+gHkYlPeRN/pJ1M/8JRX6/7sQ=", + "pom": "sha256-gx1Gb8AWKUUrRhNzEeFYI8CWx9b66VKYxke5+/XWgfQ=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux": { + "jar": "sha256-5mNzjFGaBvbWWYgvqOTgmvfxDpIZKe5cxUp1h/Yu1Mk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm32": { + "jar": "sha256-cNP3SNRawTWDKplV6lGcpv7Tqn0dR+tnR8uHk2hGyUE=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-linux-arm64": { + "jar": "sha256-OXp5pdiQcobUAY0CbLw3NYxTu7aqvDoVNPGf8jt/hVg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos": { + "jar": "sha256-ApTuTi3X72vvr/r8C7maKom3YHC1zYMC89dWJLZ4bQM=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-macos-arm64": { + "jar": "sha256-UKycoJ5Z8FHcrPTcCyFF6ekW5qsUYzt1aUIxv+WTFKg=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows": { + "jar": "sha256-XuY6GRh+/lu4dH/ST3sTJX2zSN9a1kEROjaV5D8hOVk=" + }, + "org/lwjgl#lwjgl/3.3.3/natives-windows-x86": { + "jar": "sha256-IqIjOCYlVOteEzyEQd7u2shNoILrO6yE0DLaT682l0k=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix similarity index 90% rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix rename to pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix index 5e7ed1b817e0..291b4b386cc5 100644 --- a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix +++ b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix @@ -4,7 +4,7 @@ , substitute }: -callPackage ./generic.nix rec { +callPackage ../generic.nix rec { pname = "summoning-pixel-dungeon"; version = "1.2.5a"; @@ -21,8 +21,6 @@ callPackage ./generic.nix rec { substitutions = [ "--subst-var-by" "version" version ]; })]; - depsHash = "sha256-0P/BcjNnbDN25DguRcCyzPuUG7bouxEx1ySodIbSwvg="; - desktopName = "Summoning Pixel Dungeon"; meta = { diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json new file mode 100644 index 000000000000..57ca57ed36a4 --- /dev/null +++ b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json @@ -0,0 +1,177 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.10.0": { + "jar": "sha256-d++ydeqgB5DWDTfjfoOywrohsQc+9HWIoNytlE2wQPA=", + "pom": "sha256-uMxeWteXeontAQkrkwVjHaMmig33+nOtRB+p+98MMR0=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.10.0": { + "pom": "sha256-IwJUobNWR3huT995tgEnT1WlvDUHweu5MNQLnYQtHmI=" + }, + "com/badlogicgames/gdx#gdx-freetype-platform/1.10.0/natives-desktop": { + "jar": "sha256-seXxOGFJ8yzo5P0nArn9cefzkiXnhthi9HJRSw1u7UM=" + }, + "com/badlogicgames/gdx#gdx-freetype/1.10.0": { + "jar": "sha256-/w9zEsBjV6vsBm1JKWuPZVS0D6HMPla5wgiVdBaWoSU=", + "pom": "sha256-U8Gwv4iBQJv5t6rf5NBhZEUbfChBfKhJECjEj36UtHU=" + }, + "com/badlogicgames/gdx#gdx-parent/1.10.0": { + "pom": "sha256-AYAdm3Dejy2nDDIhir83qOiJLpQBa/LUOzq5vzMVM4A=" + }, + "com/badlogicgames/gdx#gdx-platform/1.10.0": { + "pom": "sha256-3jAHeUCQqrP43j+EUMT8baNr3cdnl9E+8r+RsiQzPQw=" + }, + "com/badlogicgames/gdx#gdx-platform/1.10.0/natives-desktop": { + "jar": "sha256-CUvIkr+UISzmdLtaO+sUyYUwwf9vac1OQ4uTpvVWask=" + }, + "com/badlogicgames/gdx#gdx/1.10.0": { + "jar": "sha256-/7SbBnEeNLGhdd8XMRsPOuDoW/RsVpoTfsANKRuyyuE=", + "pom": "sha256-vhyhtPolCV13nAxCdpMKDe/64+lYsnhuycZtx/LxN9Y=" + }, + "com/badlogicgames/jlayer#jlayer/1.0.1-gdx": { + "jar": "sha256-qrze3C4/pBxOE4hwUj10MzfxiZMQgGMLoaIoVTjNAPs=", + "pom": "sha256-nGCRe2JnOIvFeWpSDswPF8ed2hVGUM0FQdTEE4ghv0k=" + }, + "org/jcraft#jorbis/0.0.17": { + "jar": "sha256-4GfymjcBQmtn7ZcwNpScbljKW7U+73JAsuceKG0lKp4=", + "pom": "sha256-GN47DZMq+Zgy202DL2g1B/vdWgsMJN1oDoTOb1cYLiQ=" + }, + "org/json#json/20170516": { + "jar": "sha256-gT835IIPGFTopOtPgN+UvxsfLsbDtyaS8jq5pVYlavY=", + "pom": "sha256-ZMFVQ6PV2yeaIK6w36A0oqecIVn4zUAd6kj/DyNMGN0=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3": { + "jar": "sha256-7yec2u7eTKNE51alb4WoXL0Dn3kxARl1Zy3BuQC1nI8=", + "pom": "sha256-DY2qM/0T4KBNt+H+299oliGWkx/20Y4giZN9r5Fx7y4=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-linux": { + "jar": "sha256-Y99GHednfhZY0TcK5wUBqGx6Qv9H9mkpKNTVvNHmxYk=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-linux-arm32": { + "jar": "sha256-E9pTVkPR4RvpMcdKDDa5hdoIJuF2ckSu140IdxwSa3M=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-linux-arm64": { + "jar": "sha256-5IkX7vQXhQb20mbEUowS+vlhs3nyN/d3lhTPXc9R0jM=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-macos": { + "jar": "sha256-ZOZIODO8lNp/Oc9x75lo/7/zSE8FS+Mz8Cc34eMUidA=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-windows": { + "jar": "sha256-GSct3hyelmZGtmayqmtZXr9Zj+dRnNtKsGwbM9jga6w=" + }, + "org/lwjgl#lwjgl-glfw/3.2.3/natives-windows-x86": { + "jar": "sha256-tva+jC2llyvp41zzlr7sRnXoudkYPBVHXEb8lnKgTU4=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3": { + "jar": "sha256-b3kNvndetWvmOOnZezVTE8DK83TxNUWZZnB1ahXL/m8=", + "pom": "sha256-rl4zlsr8aV3BVRgNcIGkkFAlYUlBzd8Iz5llXvG02bI=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-linux": { + "jar": "sha256-kET+UTHXjN63S7ezybOhsVX6dTDjtMK5HLMC7rTCnS0=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-linux-arm32": { + "jar": "sha256-UAuvqQH46bc9lep28RfStuf9fc7YjiqISgCrIf9NlqI=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-linux-arm64": { + "jar": "sha256-gPCtzfusC3iQexpywu2A1BW2uGWvrd2qTBA3Rymys98=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-macos": { + "jar": "sha256-b/7STgWbCRdgdU1rCrWuWUkNBMIJ+EuEpXHxy9ZS5EE=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-windows": { + "jar": "sha256-y9QXTlytKkDRJpMrA9jTlrmzJIQTXV4/KoofNKpLIiQ=" + }, + "org/lwjgl#lwjgl-jemalloc/3.2.3/natives-windows-x86": { + "jar": "sha256-y/Qtr6UVizabe8U01zYEw5VQdbRI9yMAT/P7HpAd4Qo=" + }, + "org/lwjgl#lwjgl-openal/3.2.3": { + "jar": "sha256-mxv99go/57psSJdkEdMRV1+yt6fnRX5VidFYhxmCD7A=", + "pom": "sha256-E9O+StiSkp6SE78rHUkMbrY3JLjehQ6zrntaKjdmG+8=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-linux": { + "jar": "sha256-7d0+6RfFkO0g/JssVGO3PRI7LhUCwvlNb3NU7OVT7Xc=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-linux-arm32": { + "jar": "sha256-oZyXuR9FBUx+7DrViWz/qhIekPD4j3H8X3lo5aL5Hns=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-linux-arm64": { + "jar": "sha256-YX4XOLZsxZEqmE2shuCDVnuPUHCADFQgsGW2Fk0fyvY=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-macos": { + "jar": "sha256-1tCCMsvvMw3llL6cQZmpY0q1vsagUTXQt20ygnR/yS0=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-windows": { + "jar": "sha256-PePin8ODpITjfpIYrezKb6EqNUZV3bu4y+ryuMT2FA4=" + }, + "org/lwjgl#lwjgl-openal/3.2.3/natives-windows-x86": { + "jar": "sha256-mY6z6IVtwnHCNL5lCh/Urqr/CIFl2Q9SEgURSODtHxw=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3": { + "jar": "sha256-ELzDdQbgHRR31l8fzwqmcslet4UmWyi38yHIOBCT7aI=", + "pom": "sha256-hQ+jXJN9DPfjsxVKW1ujkDFWF1Cino0aoBNphk0wLLA=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-linux": { + "jar": "sha256-Rm6LrhgYxMWEdx7gk8inNeJvVvslqB3eVnUWCqovoEU=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-linux-arm32": { + "jar": "sha256-FsLVHzvUR4FzhcdTByx4YIsrMCpsZASW1WH93+d1ZAw=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-linux-arm64": { + "jar": "sha256-2OMYjUTPv4k33/CcuPClU/hwHw635mSjzKcLcGFtVOw=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-macos": { + "jar": "sha256-5LTQzZE41SJxwdXBjkPJrF020acnxH5e5AMctFznMMo=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-windows": { + "jar": "sha256-wI494xYyFjrF90b6lF8ZJBQuCFIL2cgbfdG129GwuLs=" + }, + "org/lwjgl#lwjgl-opengl/3.2.3/natives-windows-x86": { + "jar": "sha256-POzFHWcd92u2DMmu95hM9EVAoKc1i4brAXy7gNj3G3s=" + }, + "org/lwjgl#lwjgl-tinyfd/3.2.3": { + "jar": "sha256-eklNyHUeXvjLec5xaMfbVmZIE3grkZK7ETDkMpuRQBE=", + "pom": "sha256-9JHY/FlAu9WYtNNtbchR///Ugeqj6pE80de/GCJoLI0=" + }, + "org/lwjgl#lwjgl-tinyfd/3.2.3/natives-linux": { + "jar": "sha256-s9m98zg+6BfMJ5VcWGTYC6NuhtjvSqLH+G3NL6c96Rg=" + }, + "org/lwjgl#lwjgl-tinyfd/3.2.3/natives-macos": { + "jar": "sha256-Oq75QsQaT+7i1rdrzurx/2vd3/AxWm3domCvBvjrHUQ=" + }, + "org/lwjgl#lwjgl-tinyfd/3.2.3/natives-windows": { + "jar": "sha256-Q/M1D+EtGrpiB6b28cq72ujoB110OqCcz2hQ8kh6MTo=" + }, + "org/lwjgl#lwjgl/3.2.3": { + "jar": "sha256-+ZKMO0tUBkOhu9WShtPHF15HCEkmGgwpqBOJ9SJlrYs=", + "pom": "sha256-IL2EdryHg3IwMY1rmvYuN1cL2qIqEqJAwwIs0k+t/W0=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-linux": { + "jar": "sha256-ACgQEp/GrEzfzfGQ4YpkOlAhtjAPSJwQJrvF0AFAyi4=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-linux-arm32": { + "jar": "sha256-RrY5yizuoll7Z8yeAEgz0OgnEd92q15SzenGTwGdRNY=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-linux-arm64": { + "jar": "sha256-Pbazlfu2icsYvSetIAVfS8aV7pNZHXHR6kXzEoHG8AM=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-macos": { + "jar": "sha256-XFIMRlqEA0uLwj4dfs1iG7mcQ3zSVOpGtTGXRI0bgSg=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-windows": { + "jar": "sha256-vfUZuaqQ95mVQROhXfqEsnPuR4GHaz7N6/GSzk+Iomw=" + }, + "org/lwjgl#lwjgl/3.2.3/natives-windows-x86": { + "jar": "sha256-Trduz48tvJzT+iexpL+XhOqRxK/DhpEHRhPVv3o03I8=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} diff --git a/pkgs/games/shattered-pixel-dungeon/disable-git-version.patch b/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch similarity index 100% rename from pkgs/games/shattered-pixel-dungeon/disable-git-version.patch rename to pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f6c9df2fc42..960ee975b231 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36825,11 +36825,11 @@ with pkgs; }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; - rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2.nix { }; - rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure.nix { }; - experienced-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon.nix { }; - summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon.nix { }; - shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon.nix { }; + rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2 { }; + rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure { }; + experienced-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon { }; + summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon { }; + shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon { }; shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; From f9c2c4a8be1816dff9ad1697d29e795ae839f921 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 27 Jun 2024 03:19:41 +0700 Subject: [PATCH 071/227] jextract: convert to gradle setup hook --- pkgs/by-name/je/jextract/package.nix | 52 +++------------------------- 1 file changed, 5 insertions(+), 47 deletions(-) diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix index 187a0e91f93a..891eac01ae79 100644 --- a/pkgs/by-name/je/jextract/package.nix +++ b/pkgs/by-name/je/jextract/package.nix @@ -1,41 +1,12 @@ { lib , stdenv , fetchFromGitHub -, emptyDirectory -, writeText , makeBinaryWrapper , gradle , jdk22 , llvmPackages }: -let - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with empty directory...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${emptyDirectory}' } - } - } - repositories { - clear() - maven { url '${emptyDirectory}' } - } - } - } - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${emptyDirectory}' } - } - } - } - ''; -in - stdenv.mkDerivation { pname = "jextract"; version = "unstable-2024-03-13"; @@ -52,27 +23,14 @@ stdenv.mkDerivation { makeBinaryWrapper ]; - env = { - ORG_GRADLE_PROJECT_llvm_home = llvmPackages.libclang.lib; - ORG_GRADLE_PROJECT_jdk22_home = jdk22; - }; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --console plain --init-script "${gradleInit}" assemble - - runHook postBuild - ''; + gradleFlags = [ + "-Pllvm_home=${llvmPackages.libclang.lib}" + "-Pjdk22_home=${jdk22}" + ]; doCheck = true; - checkPhase = '' - runHook preCheck - gradle --console plain --init-script "${gradleInit}" verify - runHook postCheck - ''; + gradleCheckTask = "verify"; installPhase = '' runHook preInstall From 6d513fb246368da5acd51e2eef9d427a1af08223 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 10:27:48 +0700 Subject: [PATCH 072/227] jextract-21: convert to gradle setup hook --- pkgs/by-name/je/jextract-21/package.nix | 52 +++---------------------- 1 file changed, 5 insertions(+), 47 deletions(-) diff --git a/pkgs/by-name/je/jextract-21/package.nix b/pkgs/by-name/je/jextract-21/package.nix index efff21c27c07..ec2ad3b1485d 100644 --- a/pkgs/by-name/je/jextract-21/package.nix +++ b/pkgs/by-name/je/jextract-21/package.nix @@ -1,41 +1,12 @@ { lib , stdenv , fetchFromGitHub -, emptyDirectory -, writeText , makeBinaryWrapper , gradle , jdk21 , llvmPackages }: -let - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with empty directory...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${emptyDirectory}' } - } - } - repositories { - clear() - maven { url '${emptyDirectory}' } - } - } - } - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${emptyDirectory}' } - } - } - } - ''; -in - stdenv.mkDerivation { pname = "jextract"; version = "unstable-2023-11-27"; @@ -52,27 +23,14 @@ stdenv.mkDerivation { makeBinaryWrapper ]; - env = { - ORG_GRADLE_PROJECT_llvm_home = llvmPackages.libclang.lib; - ORG_GRADLE_PROJECT_jdk21_home = jdk21; - }; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --console plain --init-script "${gradleInit}" assemble - - runHook postBuild - ''; + gradleFlags = [ + "-Pllvm_home=${llvmPackages.libclang.lib}" + "-Pjdk21_home=${jdk21}" + ]; doCheck = true; - checkPhase = '' - runHook preCheck - gradle --console plain --init-script "${gradleInit}" verify - runHook postCheck - ''; + gradleCheckTask = "verify"; installPhase = '' runHook preInstall From d895bc0049f00e06132f7b108e6cbf2cc8c3bfea Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 10:53:21 +0700 Subject: [PATCH 073/227] jadx: convert to gradle setup hook --- pkgs/tools/security/jadx/default.nix | 89 +--- pkgs/tools/security/jadx/deps.json | 695 +++++++++++++++++++++++++++ 2 files changed, 704 insertions(+), 80 deletions(-) create mode 100644 pkgs/tools/security/jadx/deps.json diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index df7bb1ca839c..a857ed571416 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -5,108 +5,37 @@ , jdk , quark-engine , makeWrapper -, perl , imagemagick , makeDesktopItem , copyDesktopItems , desktopToDarwinBundle }: -let +stdenv.mkDerivation (finalAttrs: { pname = "jadx"; version = "1.4.7"; src = fetchFromGitHub { owner = "skylot"; - repo = pname; - rev = "v${version}"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; hash = "sha256-3t2e3WfH/ohkdGWlfV3t9oHJ1Q6YM6nSLOgmzgJEkls="; }; - deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src; - - nativeBuildInputs = [ gradle jdk perl ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - export JADX_VERSION=${version} - gradle --no-daemon jar - - # Apparently, Gradle won't cache the `compileOnlyApi` dependency - # `org.jetbrains:annotations:22.0.0` which is defined in - # `io.github.skylot:raung-common`. To make it available in the - # output, we patch `build.gradle` and run Gradle again. - substituteInPlace build.gradle \ - --replace 'org.jetbrains:annotations:23.0.0' 'org.jetbrains:annotations:22.0.0' - gradle --no-daemon jar - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - - # Work around okio-2.10.0 bug, fixed in 3.0. Remove "-jvm" from filename. - # https://github.com/square/okio/issues/954 - mv $out/com/squareup/okio/okio/2.10.0/okio{-jvm,}-2.10.0.jar - ''; - - outputHashMode = "recursive"; - outputHash = "sha256-QebPRmfLtXy4ZlyKeGC5XNzhMTsYI0X36My+nTFvQpM="; - }; -in stdenv.mkDerivation (finalAttrs: { - inherit pname version src; - nativeBuildInputs = [ gradle jdk imagemagick makeWrapper copyDesktopItems ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; # Otherwise, Gradle fails with `java.net.SocketException: Operation not permitted` __darwinAllowLocalNetworking = true; - buildPhase = '' - # The installDist Gradle build phase tries to copy some dependency .jar - # files multiple times into the build directory. This ends up failing when - # the dependencies are read directly from the Nix store since they are not - # marked as chmod +w. To work around this, get a local copy of the - # dependency store, and give write permissions. - depsDir=$(mktemp -d) - cp -R ${deps}/* $depsDir - chmod -R u+w $depsDir + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; + }; - gradleInit=$(mktemp) - cat >$gradleInit < - settings.pluginManagement { - repositories { - maven { url '$depsDir' } - } - } - } - EOF - - export GRADLE_USER_HOME=$(mktemp -d) - export JADX_VERSION=${version} - gradle --offline --no-daemon --info --init-script $gradleInit pack - ''; + gradleBuildTask = "pack"; installPhase = '' runHook preInstall diff --git a/pkgs/tools/security/jadx/deps.json b/pkgs/tools/security/jadx/deps.json new file mode 100644 index 000000000000..500404ebb6aa --- /dev/null +++ b/pkgs/tools/security/jadx/deps.json @@ -0,0 +1,695 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://dl.google.com/dl/android/maven2/com/android": { + "tools#r8/4.0.48": { + "jar": "sha256-932anr2p4yCS6sTdjhFkSnNi36YO1qOp0NMt5XC79SQ=", + "pom": "sha256-5mEMufgumNH5nOgSUcnnlm/Pgrzr0GR3pbpkzzNJ+xA=" + }, + "tools/build#aapt2-proto/7.3.1-8691043": { + "jar": "sha256-1eLz4eHrBiJLaHX15RPHKmUYI0J0VxgWDK8ZHUapZmQ=", + "module": "sha256-XHobthipLvWcPWDPgEmPFkYKa/L+qvxK6EfT+2xZ7aw=", + "pom": "sha256-90SV2eV+uTBEowjJ0SDPlOucHbxK9gieeWPwVgf0OWI=" + }, + "tools/build#apksig/7.4.1": { + "jar": "sha256-bWoTpRrDgGwRr18JZwkgVeNaZ99qdL/xVE2fVRjFrVU=", + "pom": "sha256-PnV6UitSV0bqvN4mcNzsyAKOqmcQyUe74DnIE+nSajM=" + } + }, + "https://plugins.gradle.org/m2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.13.0": { + "pom": "sha256-4qHufTD0GGdheUdAEOYkVE6BP0MHAO4oBjQvKukFMNQ=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.32.0": { + "jar": "sha256-i8SQYGLclmwFaGL8kmCsfQWTZguEOtZcEbFW6dzLZKE=", + "module": "sha256-a8dLFqcxDey2fs8H1vXOG9x6+bh5Hek+TwfziyxosQo=", + "pom": "sha256-7wDQM9CMLJ7yFDwmJVav40DYs4doI9Zw0pzrct/nhBQ=" + }, + "com/diffplug/spotless#spotless-lib/2.32.0": { + "jar": "sha256-S6xhJrXWaIZdgFrGGqDiUoi5EN6zPydHZO543raRsuw=", + "module": "sha256-h6cE9aXpl+52z2PjA5+orSSKMx7xV4tfiX7VQ2AZYhM=", + "pom": "sha256-a+Uybvhc5iiiuHq8mwLN+kw1rfeqdZ4a/C2ytQut5Fw=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.13.0": { + "jar": "sha256-Js7wl5w5CHH1wWX6KGAeEAlgkuyW1zWKC/XM2oYJbEk=", + "module": "sha256-i9cKqqO2WIEYk+jSq+bMAxo87Hcbgyto8Dl0JH9kOig=", + "pom": "sha256-NpfHbxQP9djFACOzYUHhMOffXzQD2biONjNpzNeBZmw=" + }, + "com/formdev#flatlaf/1.0": { + "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=", + "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", + "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" + }, + "com/github/ben-manes#gradle-versions-plugin/0.45.0": { + "jar": "sha256-RpBMEWJmqzmQy6JpyFGsSUppwhIbz5nkPKU4blLUJaM=", + "module": "sha256-RyWDjnWYFyb1ogLMtL31WY2c34mAdiApHtWi7XAJR4c=", + "pom": "sha256-8TEb3zGSUlFQ0qtWZCgpqnnfiCrp6GNt+97S+d78NDk=" + }, + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.45.0": { + "pom": "sha256-TF+vdABxshvnS8Py3jamb3OZ8ISsA2DTFzt5iYWyh7Q=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/7.1.2": { + "pom": "sha256-lW5FCF5S6l7zLTRnHruE6xxBqDxFSa8m5oY18QYXmNM=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.13": { + "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", + "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" + }, + "com/squareup/moshi#moshi-kotlin/1.12.0": { + "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", + "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", + "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" + }, + "com/squareup/moshi#moshi/1.12.0": { + "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=", + "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", + "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" + }, + "com/squareup/okhttp3#okhttp/4.9.3": { + "jar": "sha256-k+zWy6Gdh9zP5WbshI2RqueZ488WwAcJNY6mm9kichk=", + "module": "sha256-gyf+V2cjmG3tSvpeDZ4TKuMCzPVvITwNuCGnQE1A+O8=", + "pom": "sha256-ZN87m63dAOqkvHJ2Qf0VfGXzlGXmjq7KpaHQQX/C8mk=" + }, + "com/squareup/okio#okio/2.10.0": { + "jar": "sha256-on8JHTSqRS43In4s+oWAnykBKo7yUBqbWhJal45Py8E=", + "module": "sha256-EcvqvDp2XJqAMkL6ICShGFPrCGXaU2xLBa/c27I0Y3A=", + "pom": "sha256-S5YGC20aK5bpDkKtcVitvjRpMWuA/qCBfGwzmT7hzHI=" + }, + "com/squareup/okio#okio/2.8.0": { + "module": "sha256-F7qrcnA4ml+mOrEoEYZNCgDzgWEbxOsEL6G9WRjtCWU=", + "pom": "sha256-JiFAaP1Mf0N6yP6FdoAqmp3BUcRXWCgHrZryry6MlIE=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.19": { + "pom": "sha256-DUgSxOMREJtuOk5gZvgh10kZgTl25P6p5CfPNi8vBYM=" + }, + "com/thoughtworks/xstream#xstream/1.4.19": { + "jar": "sha256-yayTUnlCGJron8kSBnY1jxHqj3E8Y1qfLHAGP+ZxZjQ=", + "pom": "sha256-7odNIUDKTox3TojfZW7svJZT9bjLmAapq4UFwmm3s34=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.4": { + "pom": "sha256-0kiTtasyoeS0aMK/2OoTMqA9qBFFhgpuz3e/bM6fE6c=" + }, + "edu/sc/seis/launch4j#launch4j/2.5.4": { + "jar": "sha256-ItJxFUklmcsCnJcoo1nKPuEHXuoMVNMCLP9l8CNB734=", + "module": "sha256-36qMMXxT12p0b8RM8T8onfxF/6dx1e9gRkinCOMv8bA=", + "pom": "sha256-x3C0urW9xQxP3xKUkCBdFmfYKEwGLK5wS7vGy2xXKv8=" + }, + "gradle/plugin/com/github/johnrengelman#shadow/7.1.2": { + "jar": "sha256-v3BcwupcAYCqhwoPqAs5vxOhTScSjh6zpLZ0vjT1jpA=", + "pom": "sha256-H6qwvkF9ezxBqXzKCsqKWwtkBvw7Etfyjiw0Ex3/k0o=" + }, + "io/github/x-stream#mxparser/1.2.2": { + "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", + "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" + }, + "net/sf/launch4j#launch4j/3.14": { + "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" + }, + "net/sf/launch4j#launch4j/3.14/core": { + "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache/ant#ant-launcher/1.10.11": { + "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", + "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" + }, + "org/apache/ant#ant-parent/1.10.11": { + "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" + }, + "org/apache/ant#ant/1.10.11": { + "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=", + "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging/log4j#log4j-api/2.17.1": { + "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", + "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + }, + "org/apache/logging/log4j#log4j-core/2.17.1": { + "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", + "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" + }, + "org/apache/logging/log4j#log4j/2.17.1": { + "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + }, + "org/beryx#badass-runtime-plugin/1.13.0": { + "jar": "sha256-ekslb9N9F6TK7Ms2hpeKmzRYW7WbXxmhmCzwYX+q86g=", + "module": "sha256-FdSu+57WOootchnvCNjEY6VztDoF2UiBAeUmgx3pmMA=", + "pom": "sha256-0bql4D6Gy4kd5e9l0OYNlowgT6/5EQ2TWFmX3EoZW9E=" + }, + "org/beryx/runtime#org.beryx.runtime.gradle.plugin/1.13.0": { + "pom": "sha256-xlrrkFABYYEdS2cOwaKcaTL5gk5hI00vWQNCJaDSSRg=" + }, + "org/codehaus/plexus#plexus-utils/3.4.1": { + "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=", + "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI=" + }, + "org/codehaus/plexus#plexus/8": { + "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/5.13.1.202206130422-r": { + "pom": "sha256-3mX8du2PRKV3he4WSRjcPU9V7j/qake8fLG6oZ7xvIM=" + }, + "org/eclipse/jgit#org.eclipse.jgit/5.13.1.202206130422-r": { + "jar": "sha256-1nk2WmyOVcFJZwEJn15XZUM/aNy2WXWUFrpbIi61BVw=", + "pom": "sha256-PMS+v5yTZXjq4rbST7KpEtiZk6VP0OL7wcirwEmHhRU=" + }, + "org/jdom#jdom2/2.0.6": { + "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=", + "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.6.21": { + "jar": "sha256-Hh9XIJ9yOMP9FzWhuTOaVlZVB9yiSfg3G/WdkfYBrqo=", + "pom": "sha256-2nHh493COI1nVkFnLi8DFtucnSEvlG8CbUoOahM2p/M=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.6.21": { + "jar": "sha256-GDvsWc2fOhSVexkOjIec8RlL0fEGsKe24cu4eQ0kI2M=", + "pom": "sha256-W8FW7nP9PC2sil7FSNWBtjMzNUfC/r7Zz2VH//FSa6I=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.6.21": { + "jar": "sha256-8bBjTbuUFyA4RjAguy3UXKJoSfjOKdYlrLDxVp0R2+4=", + "pom": "sha256-ARzSjruf3oFrA1nVrhCjZ07A/yxTEMBBLCDv6Oo9oG4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.6.21": { + "jar": "sha256-2rRUibR3NtWfzkS4BnbxlHqba8qxD9YOh4qDvYKmlUw=", + "pom": "sha256-g2oReaCNJJFGl9JhLgO4SKCHyAy0sMoj+c+rJH86dcQ=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.6.21": { + "jar": "sha256-c5xSZnK7M3Vzso9jr6gwbrCIsMOgln9W1sifSjASpJI=", + "pom": "sha256-zkJyW6Ab2DbNqmZ9l032hL9vjxXng5JjMgraf/quHzQ=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/9.2": { + "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", + "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" + }, + "org/ow2/asm#asm-commons/9.2": { + "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", + "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" + }, + "org/ow2/asm#asm-tree/9.2": { + "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", + "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" + }, + "org/ow2/asm#asm/9.2": { + "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", + "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/vafer#jdependency/2.7.0": { + "jar": "sha256-1j79V0b/QIlDp91++Frp8Jqn+2O7KxaRFCfObEW1n9A=", + "pom": "sha256-6yRCKwo+nofVrG6oCHeG+1HEsbvg0iXvdSFSxzaiBNA=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + } + }, + "https://repo.maven.apache.org/maven2": { + "antlr#antlr/2.7.7": { + "jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=", + "pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc=" + }, + "ch/qos/logback#logback-classic/1.3.5": { + "jar": "sha256-nWi52vL7uYoJsEReDGSsMJ2dDhVraFELY3kTl8l+MuQ=", + "pom": "sha256-7HWshxo9E2HbsPjbbSUDW6uJpeqXPxhKse+pHO7oRsU=" + }, + "ch/qos/logback#logback-core/1.3.5": { + "jar": "sha256-sfDsOT8vW7rx3sthYk3hg4ZjTDGX6e7WnRwSNN3XVvM=", + "pom": "sha256-HgdGJT8D995vW70VQzaqTXWGlCEPac//bo61+O/DVSg=" + }, + "ch/qos/logback#logback-parent/1.3.5": { + "pom": "sha256-EYAKLQpLzUQpZNpWHBGhHxbkS4n+prEKiRoQkigHn1s=" + }, + "com/beust#jcommander/1.81": { + "jar": "sha256-nYtCl5yZ89qpkQL+m6H7JfUiJstIz1i8GKy5MTLkGgU=", + "module": "sha256-yQiuLdCRx1kB8zhnWrOWNOGfmyFjaUZwwSLiir5aDoI=", + "pom": "sha256-8CBdB5nUsdc0JS/Z+g3T63x1H1/762eyVeQStV/i41U=" + }, + "com/beust#jcommander/1.82": { + "jar": "sha256-3urBV8jeaCKHjYXQx7yEZ6GcyEhNN3iPeATwOd3igLE=", + "module": "sha256-k2oti84PhNoYUA9OEZSIuTEG26qDuEYv6Za80OHDixY=", + "pom": "sha256-JGNEFwtRO4Acz4EiNNThMkoPbtKoHpCqYYkTtmucwXM=" + }, + "com/fifesoft#rsyntaxtextarea/3.3.2": { + "jar": "sha256-TAslPpJ8Ho8zUkhBcNA98Iu39QORc6vAXP+dERwyqks=", + "module": "sha256-ctL5lETQWlYoNVrzcGQm8Ea+Yzpm4a+wdt2xLTdoi9Y=", + "pom": "sha256-KwgwlBEYFM9LGWtMEA75Nc2ztgJ9Z9HAtWLPc0LRNgk=" + }, + "com/formdev#flatlaf-extras/3.0": { + "jar": "sha256-wAud4HI/J1PtR7c1t6RLVK6rJt6bO5dTIYgftTVTx1E=", + "module": "sha256-FkTiG6Si+TVfX7Ap9WZoo5KsEqUpSQ1nu2VWJoKmoek=", + "pom": "sha256-B1lbUVRfuH8a1+CDuKEjm/h7/P64KAc4bOaFP59vCWI=" + }, + "com/formdev#flatlaf-intellij-themes/3.0": { + "jar": "sha256-N3qzctH/ln9MPMO0us78YYWgYnehChoUOlwqITjZObA=", + "module": "sha256-sKyuEQ8TM+zDL3YDcQrw4HjM1OV+uBLrZG/Wnd6sRv8=", + "pom": "sha256-dSGPJNAI5MRhs8b6JQ5w1c0yJ6ChWzcXexL/z3fF33Y=" + }, + "com/formdev#flatlaf/3.0": { + "jar": "sha256-lpsnqmEscOy4VmTlXYxfdnimGI+dt8UUKoH25HXhmGc=", + "module": "sha256-ndu+u4qmfA+PJfYcWspgGYHiWjZ2fM9YuuaMopWgUxs=", + "pom": "sha256-p4oaUVQeiMBghuMPw5BvUdWOUCDETbd52rsS8JEuTPk=" + }, + "com/formdev#svgSalamander/1.1.4": { + "jar": "sha256-4PGk2RzE9s4I6LRBsbMmuJjiUDZqn0xIk3EoTHhNMhE=", + "pom": "sha256-ndRWBiO6S1ETmg3EnarIjL5dJIzUgrPzoLJfYZutUvk=" + }, + "com/github/akarnokd#rxjava2-swing/0.3.7": { + "jar": "sha256-umWvI1GP+Ucha7S+kDC7AavSQkHOEy3oPoUdC81S7n4=", + "pom": "sha256-VCbDiy18y9Z5qiBuF6TPrxPrk3IPPnjPjdckAjfNnLE=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "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/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/errorprone#error_prone_annotations/2.5.1": { + "jar": "sha256-/4Bia6rxKgk0K+/U6Ey6nVBmL1/Nf3qbNJCmt8+H5mw=", + "pom": "sha256-mDrX/g+m9vkeLSBHf1CJ7Mw/TY7GxR1utFWDlw4nnTw=" + }, + "com/google/errorprone#error_prone_annotations/2.7.1": { + "jar": "sha256-zVJXwIokbPhiiBeuccuCK+GS75H2iByko/z/Tx3hz/M=", + "pom": "sha256-Mahy4RScXzqLwF+03kVeXqYI7PrRryIst2N8psdi7iU=" + }, + "com/google/errorprone#error_prone_parent/2.5.1": { + "pom": "sha256-oXp2d0gqOlGkX14IFAByrNMyzLEvI4mbAFLYCnKcLlI=" + }, + "com/google/errorprone#error_prone_parent/2.7.1": { + "pom": "sha256-Cm4kLigQToCTQFrjeWlmCkOLccTBtz/E/3FtuJ2ojeY=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/30.1.1-jre": { + "pom": "sha256-BCK9Rcokl7+hiq0mmDJJZe1w2gkHuKfUWberO17tODQ=" + }, + "com/google/guava#guava-parent/31.0.1-jre": { + "pom": "sha256-s7a2qnCZwRgXrO6FsyL9kffuMq6mn+CD7jbIc17AZ4g=" + }, + "com/google/guava#guava/30.1.1-jre": { + "jar": "sha256-RM4inOJtiAvzr8Niu/zsNNfmkD0ZW7sdufO24NmDTwY=", + "pom": "sha256-bRjJGIrUt4Vft/6m8Xk3VLQfoXR4Ea4ePXU9b8ydzFk=" + }, + "com/google/guava#guava/31.0.1-jre": { + "jar": "sha256-1b6U1l6HvSGfsxk60VF7qlWjuI/JHSHPc1gmq1rwh7k=", + "pom": "sha256-K+VmkgwhxgxcyvKCeGfK/3ZmRuIRO3/MPunCSkCy85Y=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/google/protobuf#protobuf-bom/3.21.12": { + "pom": "sha256-O72GqUBXpnHmPVX532EsZBlz1ecNba4qtFYk/xrfUcU=" + }, + "com/google/protobuf#protobuf-java/3.21.12": { + "jar": "sha256-Pz7b2pKGJGCA8+r1Yd1rDVorHxAI9pCRFchgnOrp34c=", + "pom": "sha256-CXiOUXdwUnUK3bE39cMbdwDlY6UsncRQlXqGVM/gVrU=" + }, + "com/google/protobuf#protobuf-parent/3.21.12": { + "pom": "sha256-fj44jW/7fyDmb/JfRbk3i0Igt7L9Jh9rO8IGs9/4u8g=" + }, + "com/jakewharton/android/repackaged#dalvik-dx/11.0.0_r3": { + "jar": "sha256-N1gaVv3tFexviLRtPHcEzHAKM3H5519BshIeMod2m6k=", + "pom": "sha256-p1xwnmYDV+amCkqI5dm/UQEH5TJ2JzabwfgDDzmJONE=" + }, + "com/puppycrawl/tools#checkstyle/9.3": { + "jar": "sha256-BGPjBJgPVGC5ZPSBzMJaEPslO2AQDBnlD8mSiSiVl38=", + "pom": "sha256-p9y0ZmVtZ/oKUNkE/d8U/GtTmEa4FO3/djXHRdW9MDQ=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "hu/kazocsaba#image-viewer/1.2.3": { + "jar": "sha256-wqNLddLK8alfjMGXGam6MNEJZhi9sIez22/8ELrAUik=", + "pom": "sha256-7Wev/h7E7cGYGKhqSZqe8DfWujf3GFvTBbs62otf+qw=" + }, + "info/picocli#picocli/4.6.2": { + "jar": "sha256-R1TZbq9TFPNaKH2lxnhIsoUGeGj8ptH1Ehp09n8GW2E=", + "pom": "sha256-3q4p2lxR4/6dla9ujzkVbCvBt0niQtATbp4jIINIF5k=" + }, + "io/github/skylot#jdwp/2.0.0": { + "jar": "sha256-Z01piJwpSc+I/MIGr38ur7FTMWsy5GzO8Tz5FRw3jqw=", + "module": "sha256-0bY96BmtAR3paWge0wxaULPc3FclHTTfnEtnw+6nU3Q=", + "pom": "sha256-2tG6+z2xh4vm/awirm/tYaXN38OXwJruNuP8HKOEIMU=" + }, + "io/github/skylot#raung-asm/0.0.3": { + "jar": "sha256-o+NOaprRhicntyd7Q2w/jkx0ll3ixsNBNDEB7t23S0w=", + "module": "sha256-Xr/NftSYTE6eV44X6knVOvrHRbSNYS6cnGgQo1Hqr94=", + "pom": "sha256-sU7Vq9Zy3OCw4QwPAe8EgZYLBchyl5xDszVfcstSBYc=" + }, + "io/github/skylot#raung-common/0.0.3": { + "jar": "sha256-I/bEZ+qWVPA5ii/V+TpjeEZd2M4fzTYInDM5dNcnICg=", + "module": "sha256-tvEtR3+g69ui7+wp1I+H6QcEHOPDuvQwk0FhH7RSuCU=", + "pom": "sha256-yfInb1qT0ikQ2BkEr/0OArStnwhVBsFTyl4k5vVtfVU=" + }, + "io/github/skylot#raung-disasm/0.0.3": { + "jar": "sha256-j9HSGFHXDY2hfhwJxf0M5ME8zWlnBX1Vtlw8qYP5DaI=", + "module": "sha256-1Vdekft2GEATZ0KC32uKD6viK6ANyilFQD4qIe/QtJI=", + "pom": "sha256-/iYlIgpujopppbkOu/wMVWFIkRjBadAkvBf/3q1y9Y4=" + }, + "io/reactivex/rxjava2#rxjava/2.2.21": { + "jar": "sha256-Wd9lQahAAY8PTImark9MH0OD9MFv61JoYV++OE0oUBw=", + "pom": "sha256-slvs5QSD3po+Hf0lARwthTMCFu+Kgbhvar69vfmw8Sc=" + }, + "net/bytebuddy#byte-buddy-agent/1.12.19": { + "jar": "sha256-OnAkDefNzeBOfFBMIyfXA1ucJa4CBogeO/TmeYonPtg=", + "pom": "sha256-taLP9kNoHeFof8QKzSUf7v38oj5nPgSfs8NpK1NSbUs=" + }, + "net/bytebuddy#byte-buddy-parent/1.12.19": { + "pom": "sha256-cqtv70CegSkh9HKLPEtu9PpTvCX6uwSI/CyuNnNotU0=" + }, + "net/bytebuddy#byte-buddy-parent/1.12.21": { + "pom": "sha256-/2bYhmBxN+IJXyDJDuCT88gDKRZO/wkaBoi9zjfj5rI=" + }, + "net/bytebuddy#byte-buddy/1.12.19": { + "pom": "sha256-Q1+4Zkqpt+EgyN1scH1Or6ZC+iYt/21eP3HcJcaeies=" + }, + "net/bytebuddy#byte-buddy/1.12.21": { + "jar": "sha256-9vRcIjen8TLBZ0WtKlLEzd5YAosR7oCwnw1CL0kw1oU=", + "pom": "sha256-letCyJ/QT2IYfdM7nN8E0t8bh2s3XBatMsClocwaBws=" + }, + "net/sf/launch4j#launch4j/3.14": { + "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" + }, + "net/sf/launch4j#launch4j/3.14/workdir-linux64": { + "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY=" + }, + "net/sf/saxon#Saxon-HE/10.6": { + "jar": "sha256-bQjfguTthrarsaAse3SiaPz8XgBOg7tP8AbsOlCb01Y=", + "pom": "sha256-otbdpDjoZKuTXzG0O1MFLE6HEalQVkJxkZBRPnb0Ekg=" + }, + "org/antlr#ST4/4.0.8": { + "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", + "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr/3.5.2": { + "jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=", + "pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ=" + }, + "org/antlr#antlr4-master/4.9.3": { + "pom": "sha256-VlzAVNO631DKCgcX2uMRJootZwn93ckKxKQ8YtAZNbk=" + }, + "org/antlr#antlr4-runtime/4.9.3": { + "jar": "sha256-ExpllJabxPMh1lLqKjO8DjeMoxJoXvh3kbLGCynQHqU=", + "pom": "sha256-T35E5OoGKfo6dZsRFv65+yiBTpX3keHu7dIMEoideqQ=" + }, + "org/antlr#stringtemplate/3.2.1": { + "jar": "sha256-9mznLpZeUwHLDwIOVNK6atdv65Gzy/ww278AwGpt9tc=", + "pom": "sha256-tF6CZVqlpI8z0TpD5DRUJrFWM1s14kta6hLbWCPBahY=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-parent/39": { + "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" + }, + "org/apache/commons#commons-parent/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/54": { + "pom": "sha256-AA2Bh5UrIjcC/eKW33mVY/Nd6CznKttOe/FXNCN4++M=" + }, + "org/apache/commons#commons-text/1.10.0": { + "jar": "sha256-dwzZA/p7YE0ffve6F/hBCGZylLK0eL6O0a87/7SuABg=", + "pom": "sha256-OI3VI0i6GEKqOK64l8kdJwsUZh64daIP2YAxU1qydWc=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "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/checkerframework#checker-qual/3.12.0": { + "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", + "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", + "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" + }, + "org/checkerframework#checker-qual/3.8.0": { + "jar": "sha256-yIwual/a658m/Ph5JkBC3oqe6dN24kd4OP6qvPpE3aY=", + "pom": "sha256-fm1Z4tO8AbHwT6NmcZOm1BcBmbFPulOnqONr92AiOac=" + }, + "org/eclipse/jdt#ecj/3.32.0": { + "jar": "sha256-B+A0xEoBnAxjlKBu57XDROVRj2CDwP0Eby2P0WpnYOI=", + "pom": "sha256-nHgB0Qv3Z4qRIwZCCOcFiSsd99CTbaLUoO3TyIqXtHU=" + }, + "org/hamcrest#hamcrest-core/2.2": { + "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=", + "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" + }, + "org/hamcrest#hamcrest-library/2.2": { + "jar": "sha256-OFFSOiAaDUglwlphpu3FBxKCWjm9PQM5G5jEjKPLOWw=", + "pom": "sha256-9YrYNdJCZDElnYbk/jpPUWHmcdkWxcvs81c4vN6C/P8=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "org/javassist#javassist/3.28.0-GA": { + "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", + "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" + }, + "org/jetbrains#annotations/24.0.0": { + "jar": "sha256-/xEvVM6HS4romc/WjwMV2WyfQGozi47KgMdtEOLlovc=", + "pom": "sha256-q4eN2sP6teB48NqVHqvWf77d09KvFzn+t/lHFgJ1Xws=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit/jupiter#junit-jupiter-api/5.9.2": { + "jar": "sha256-92ehcPlxJ7CtNYK/M1jqu7vpgdn5ZBGFPmKdknaSb9U=", + "module": "sha256-y9Ae2F1HTMhbIT/iBrzpgmbWdZzSjWxeQb/kUJCepHs=", + "pom": "sha256-EK9g+mkKzNzr85TsWECdzs/x3sNwJopnA2ChFfcxxVw=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.9.2": { + "jar": "sha256-dM/Ek4j3YEE/80jKLJqzlSdIS1fe7NFX8idaX4pf6XE=", + "module": "sha256-WmigqdMTI0BieAXap0YY+zTEXMUZp8LsgzQedDixOTM=", + "pom": "sha256-nfOOgj4a3Zplas+5Wc5zsHAE32yffANnwmt0PmVrWa8=" + }, + "org/junit/platform#junit-platform-commons/1.9.2": { + "jar": "sha256-Yko9dF7x0o6VWmpnr47boP38XJutaApz9npwu5UKaD0=", + "module": "sha256-a6TIRhPluJ5mjuaomXHw2Q0OG4FyG4tf4MgAWPDOue4=", + "pom": "sha256-JAI/IMI1ppYJ+y+Vpgc4VX/PlBPzrpKpLhMpVH1hRck=" + }, + "org/junit/platform#junit-platform-engine/1.9.2": { + "jar": "sha256-JfI9xTWgkencgMAI+vKdy5K+kC5pEfd6c2+68BmQg2c=", + "module": "sha256-HehRQa+fWBU+JFdQaaE3X7vt169dhEy+MoeWU0nLofc=", + "pom": "sha256-LflCCmsk5fTzFCNeAc2cO49kYoXbL26C2G7gbvevTiQ=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-core/4.10.0": { + "jar": "sha256-vBSafXSmWCf6rVb9zTfy9T9DbuOcKfCIJ2+hs4S/g3o=", + "pom": "sha256-Dzw6IxhyvrM1D0WynDIPI/KTKMjDgCrbs5WIbS+OsyU=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-analysis/9.4": { + "jar": "sha256-e1+MXjvzQbW7Vw0m83nj/evcMnMhhxWcQkeRZAU/Nz0=", + "pom": "sha256-fZtgkidiP2x+9v13+gbaWG0Na6wRTPPnICDaiFPYdZw=" + }, + "org/ow2/asm#asm-tree/9.4": { + "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", + "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + }, + "org/ow2/asm#asm-util/9.4": { + "jar": "sha256-PXkyuT/1UFZkHnz7YB+WvNXNBx4bBQPHilAUIyKXoj4=", + "pom": "sha256-ugQzwHsMD2mA8suPgEH/WcgemEgeEBliEFFi43IvH5I=" + }, + "org/ow2/asm#asm/9.4": { + "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", + "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + }, + "org/reactivestreams#reactive-streams/1.0.3": { + "jar": "sha256-He4EgQctGckptiPhVeFNL2CF3AEVKaCg2+/ITPVx2GU=", + "pom": "sha256-zO1GcXX0JXgz9ssHUQ/5ezx1oG4aWNiCo515hT1RxgI=" + }, + "org/reflections#reflections/0.10.2": { + "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=", + "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc=" + }, + "org/slf4j#slf4j-api/2.0.6": { + "jar": "sha256-LyqS1BCyaBOdfWO3XtJeIZlc/kEAwZvyNXfP28gHe9o=", + "pom": "sha256-i06GxT0ng2CPGuohPZBsW6xcBDPgCxkjm7FnZLn6NzY=" + }, + "org/slf4j#slf4j-parent/2.0.6": { + "pom": "sha256-FIJlDL4x5AjB3IkCHLrh0wRK1KAb+PYro2C2qBOhMSQ=" + }, + "org/smali#baksmali/2.5.2": { + "jar": "sha256-HtI2Jm19xJB6reCxmjT3fvrCU0K2PIrOUuV5A5lBs4k=", + "module": "sha256-g+59x3oek4+5BtaNfUPiRX8s+Im7HecuqtcJJDVfpbU=", + "pom": "sha256-8FzZiasE/SboahreXCGauEgovqfebryA/Bd7YtJ1k4g=" + }, + "org/smali#dexlib2/2.5.2": { + "jar": "sha256-WlyJgti9fW47saBxMEnjx4txnsMrIPa2GYhc7DCg3WE=", + "module": "sha256-5XDKZe/asrKMAq2P34W9hSIGZrkkuJXKW+r1fXKGiDw=", + "pom": "sha256-BWB6NSDN841drl0MQZZRKjhWpA3rlTny/OCGNalut44=" + }, + "org/smali#smali/2.5.2": { + "jar": "sha256-E2xcRlPWUxvXtvEPNfhpHLlkMucn0wtNVXmCbuAelBk=", + "module": "sha256-3ubU7dlRzZ7W5xd4wA81AoCJw7e+/HIwojoeqxalV3s=", + "pom": "sha256-NSyCM7StGa2AyNSrKY8jvdMHeHrE/phZDs30CODcZOY=" + }, + "org/smali#util/2.5.2": { + "jar": "sha256-T1gKnP8+u4PLP9IL7Ijjfk8YN5bKZScymSYRYgKC2uo=", + "module": "sha256-rRt+JSAWcAXJFp2Gv8z/JvXF+b8Ls/qyRMtIIWU9wmE=", + "pom": "sha256-IKx+12/5cPUQB6IPrIvbon7IeUT9Kb2oxnQJZ5LJFFE=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "tools/profiler#async-profiler/2.9": { + "jar": "sha256-bE6ZPCjPKIKWTKyCoPlugaMlhABDiEUmVlAXsvYsW6Q=", + "pom": "sha256-oDKflhfii6+4Rj+/btPUskpJc5oVvhlwRVB27V1SgU8=" + } + } +} From 7b1a794bc2accf0345465b0aae424ffc22fb0356 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 11:33:33 +0700 Subject: [PATCH 074/227] cie-middleware-linux: convert to gradle setup hook --- .../security/cie-middleware-linux/default.nix | 77 +++----- .../security/cie-middleware-linux/deps.json | 185 ++++++++++++++++++ 2 files changed, 216 insertions(+), 46 deletions(-) create mode 100644 pkgs/tools/security/cie-middleware-linux/deps.json diff --git a/pkgs/tools/security/cie-middleware-linux/default.nix b/pkgs/tools/security/cie-middleware-linux/default.nix index d88295915094..11c0567bb6f0 100644 --- a/pkgs/tools/security/cie-middleware-linux/default.nix +++ b/pkgs/tools/security/cie-middleware-linux/default.nix @@ -34,35 +34,6 @@ let # Shared libraries needed by the Java application libraries = lib.makeLibraryPath [ ghostscript ]; - # Fixed-output derivation that fetches the Java dependencies - javaDeps = stdenv.mkDerivation { - pname = "cie-java-deps"; - inherit src version; - - nativeBuildInputs = [ gradle ]; - - buildPhase = '' - # Run the fetchDeps task - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon -b cie-java/build.gradle fetchDeps - ''; - - installPhase = '' - # Build a tree compatible with the maven repository format - pushd "$GRADLE_USER_HOME/caches/modules-2/files-2.1" - find -type f | awk -F/ -v OFS=/ -v out="$out" '{ - infile = $0 - gsub(/\./, "/", $2) - system("install -m644 -D "infile" "out"/"$2"/"$3"/"$4"/"$6) - }' - popd - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-fxrjo4iduXzTgMqmQGwdI1vLMA4EZLObsHyKGZ6b14I="; - }; - in stdenv.mkDerivation { @@ -101,26 +72,40 @@ stdenv.mkDerivation { # libraries and the Java application builds. preConfigure = "pushd libs"; - postBuild = '' + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + gradleFlags = [ + "-Dorg.gradle.java.home=${jre}" + "--build-file" "cie-java/build.gradle" + ]; + + gradleBuildTask = "standalone"; + + buildPhase = '' + runHook preBuild + + ninjaBuildPhase + pushd ../.. + gradleBuildPhase popd - # Use the packages in javaDeps for both plugins and dependencies - localRepo="maven { url uri('${javaDeps}') }" - sed -i cie-java/settings.gradle -e "1i \ - pluginManagement { repositories { $localRepo } }" - substituteInPlace cie-java/build.gradle \ - --replace 'mavenCentral()' "$localRepo" + runHook postBuild + ''; - # Build the Java application - export GRADLE_USER_HOME=$(mktemp -d) - gradle standalone \ - --no-daemon \ - --offline \ - --parallel \ - --info -Dorg.gradle.java.home=${jre} \ - --build-file cie-java/build.gradle + doCheck = true; - pushd libs/build + checkPhase = '' + runHook preCheck + + mesonCheckPhase + pushd ../.. + gradleCheckPhase + popd + + runHook postCheck ''; postInstall = '' @@ -144,7 +129,7 @@ stdenv.mkDerivation { install -Dm644 LICENSE "$out/share/licenses/cieid/LICENSE" ''; - passthru = { inherit javaDeps; }; + preGradleUpdate = "cd ../.."; meta = with lib; { homepage = "https://github.com/M0Rf30/cie-middleware-linux"; diff --git a/pkgs/tools/security/cie-middleware-linux/deps.json b/pkgs/tools/security/cie-middleware-linux/deps.json new file mode 100644 index 000000000000..b9145f453e10 --- /dev/null +++ b/pkgs/tools/security/cie-middleware-linux/deps.json @@ -0,0 +1,185 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/durian#durian-swt.os/4.2.2": { + "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", + "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", + "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": { + "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.45.0": { + "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", + "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", + "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + }, + "com/diffplug/spotless#spotless-lib/2.45.0": { + "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", + "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", + "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { + "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", + "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", + "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "dev/equo/ide#solstice/1.7.5": { + "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", + "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", + "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { + "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { + "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", + "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + }, + "org/eclipse/platform#org.eclipse.osgi/3.18.300": { + "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", + "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "commons-io#commons-io/2.15.1": { + "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-logging#commons-logging/1.3.0": { + "jar": "sha256-ZtPJgEcLmbDFEdrT38CueyZewfsUTpa8AlOooXX9NNk=", + "pom": "sha256-je/afOtIiP/k1OYyeJVqGjxRS3W4Nj1nFqG9Zv6WLH8=" + }, + "net/java/dev/jna#jna/5.14.0": { + "jar": "sha256-NO0eHyf6iWvKUNvE6ZzzcylnzsOHp6DV40hsCWc/6MY=", + "pom": "sha256-4E4llRUB3yWtx7Hc22xTNzyUiXuE0+FJISknY+4Hrj0=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache/commons#commons-parent/65": { + "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" + }, + "org/apache/pdfbox#fontbox/3.0.2": { + "jar": "sha256-ds8EEOkD49txQDKvu0WNWiO5IlO5/fiAA18J6orTraw=", + "pom": "sha256-hthT5W8q+Yb6c1s/kH6jh6KXNCLH0F8TwDasuRNal90=" + }, + "org/apache/pdfbox#pdfbox-io/3.0.2": { + "jar": "sha256-nW535C437zaC53aBEpwxRRXog9UKvB3aljguejHnDjg=", + "pom": "sha256-yD3gYR+UMN4W2dakjfXJEPgrkfHgU1xB9Woy9iYwz0c=" + }, + "org/apache/pdfbox#pdfbox-parent/3.0.2": { + "pom": "sha256-kN6rEjTjkUu8B07Ax3Y7+kFHgICziISpOwtVVxnWY0g=" + }, + "org/apache/pdfbox#pdfbox/3.0.2": { + "jar": "sha256-yv4sysEB6ao63z9+p23/AuWIWislWLdfr/l0dvBIfuI=", + "pom": "sha256-wMNAwn6AF2V+Y81PaJUG8U03Y10NFebRpAjysZFGax8=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + } + } +} From e7aa9a3aebe3bc5dfa64a409c4e7901e3f1e86a0 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 12:07:02 +0700 Subject: [PATCH 075/227] mucommander: convert to gradle setup hook --- .../file-managers/mucommander/default.nix | 79 +- .../file-managers/mucommander/deps.json | 1064 +++++++++++++++++ 2 files changed, 1078 insertions(+), 65 deletions(-) create mode 100644 pkgs/applications/file-managers/mucommander/deps.json diff --git a/pkgs/applications/file-managers/mucommander/default.nix b/pkgs/applications/file-managers/mucommander/default.nix index 308035b094a1..0a6ca746caee 100644 --- a/pkgs/applications/file-managers/mucommander/default.nix +++ b/pkgs/applications/file-managers/mucommander/default.nix @@ -2,20 +2,22 @@ , stdenv , fetchFromGitHub , gradle_7 -, perl , makeWrapper -, writeText , jdk , gsettings-desktop-schemas }: let + gradle = gradle_7; +in +stdenv.mkDerivation (finalAttrs: { + pname = "mucommander"; version = "1.3.0-1"; src = fetchFromGitHub { owner = "mucommander"; repo = "mucommander"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-rSHHv96L2EHQuKBSAdpfi1XGP2u9o2y4g1+65FHWFMw="; }; @@ -23,72 +25,19 @@ let # there is no .git anyway substituteInPlace build.gradle \ --replace "git = grgit.open(dir: project.rootDir)" "" \ - --replace "id 'org.ajoberstar.grgit' version '3.1.1'" "" \ - --replace "revision = git.head().id" "revision = '${version}'" + --replace "revision = git.head().id" "revision = '${finalAttrs.version}'" ''; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "mucommander-deps"; - inherit version src postPatch; - nativeBuildInputs = [ gradle_7 perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon tgz - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - # reproducible by sorting - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | LC_ALL=C sort \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - # copy maven-metadata.xml for commons-codec - # thankfully there is only one xml - cp $GRADLE_USER_HOME/caches/modules-2/resources-2.1/*/*/maven-metadata.xml $out/commons-codec/commons-codec/maven-metadata.xml - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-9tCcUg7hDNbkZiQEWtVRsUUfms73aU+vt5tQsfknM+E="; + nativeBuildInputs = [ gradle makeWrapper ]; + + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; }; -in -stdenv.mkDerivation rec { - pname = "mucommander"; - inherit version src postPatch; - nativeBuildInputs = [ gradle_7 perl makeWrapper ]; + __darwinAllowLocalNetworking = true; - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } - repositories { - clear() - maven { url '${deps}' } - } - } - } - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${deps}' } - } - } - } - ''; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - - gradle --offline --init-script ${gradleInit} --no-daemon tgz - ''; + gradleBuildTask = "tgz"; installPhase = '' mkdir -p $out/share/mucommander @@ -107,4 +56,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = "mucommander"; }; -} +}) diff --git a/pkgs/applications/file-managers/mucommander/deps.json b/pkgs/applications/file-managers/mucommander/deps.json new file mode 100644 index 000000000000..264328bca01d --- /dev/null +++ b/pkgs/applications/file-managers/mucommander/deps.json @@ -0,0 +1,1064 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains": { + "jediterm#jediterm-core/3.17": { + "jar": "sha256-H+W44u9O07KMjsN6RQeX4X/XrD55JPlo7x1It5dvja8=", + "pom": "sha256-Q90WihOSMfQwY4TrVl5a6t9m23kKyvs8ZdF/clKpcug=" + }, + "jediterm#jediterm-ui/3.17": { + "jar": "sha256-7NUda5rQJjnDi+xq60mXwZKHj3i2/DCoBzzQSFT2Vhw=", + "pom": "sha256-Cc/AVJs6u5eNfJiBkAk4+/reuzup4Xl1LjvOtLXf3cg=" + }, + "pty4j#purejavacomm/0.0.11.1": { + "jar": "sha256-McBIqGBX4HJyQpqibpBxPtvelq+XRzYvJ0cNjoajmKM=", + "pom": "sha256-x/2ePzjDduHwyb3HGm+NWKz6ytqK/sF99dbjjadR02s=" + } + }, + "https://plugins.gradle.org/m2": { + "com/athaydes/osgi-run#com.athaydes.osgi-run.gradle.plugin/1.6.0": { + "pom": "sha256-+xykaSPbBh7wPQYefKAvJmXT/HIz/B/NDrsFqpZPDLk=" + }, + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/2.5.4": { + "pom": "sha256-0kiTtasyoeS0aMK/2OoTMqA9qBFFhgpuz3e/bM6fE6c=" + }, + "edu/sc/seis/launch4j#launch4j/2.5.4": { + "jar": "sha256-ItJxFUklmcsCnJcoo1nKPuEHXuoMVNMCLP9l8CNB734=", + "module": "sha256-36qMMXxT12p0b8RM8T8onfxF/6dx1e9gRkinCOMv8bA=", + "pom": "sha256-x3C0urW9xQxP3xKUkCBdFmfYKEwGLK5wS7vGy2xXKv8=" + }, + "gradle/plugin/com/athaydes/gradle/osgi#osgi-run-core/1.6.0": { + "jar": "sha256-aL4xq5FzCujxcNdLADLLdjwNGLRrInpyGfcA3NXJIig=", + "pom": "sha256-WrXeDFsFM5qb4YtafXw/nW/ubTYi+uYoMmM3qvntAsc=" + }, + "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { + "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ant#ant/1.6.5": { + "jar": "sha256-8GpgHHGKfJJi10t+w7qtFMglhOiSNQibT4IdakTZ4eQ=", + "pom": "sha256-b83RPYGzLw7byJCBHS9z1HU7ZebkKe3QByxBYP4Hd0A=" + }, + "avalon-framework#avalon-framework/4.1.5": { + "jar": "sha256-gz8eUN+mKPE9SkIGs+xtj0LpYoSjXXbActiAgEt0egQ=", + "pom": "sha256-WsHHwtsp/rJWj1xxlZpsCKbEHgZZsSa/owisdCHyysg=" + }, + "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/6.4.0": { + "jar": "sha256-G9LIOa4YEoDsBrXCBRuE+sf1mZagUZQOGk24RtvG828=", + "pom": "sha256-677wPInYJxwp7I2b7oZWCG+D5M273AKTUtcBWk/mMNk=" + }, + "biz/aQute/bnd#biz.aQute.bnd.gradle/6.4.0": { + "jar": "sha256-lakUFc2tA0LJJb97sDgwVye9TU1+MSLScClC/zWbCTo=", + "pom": "sha256-IhATjNEm8dfAKe0waawigmXckZfw3XSjyESPKwoXIpQ=" + }, + "biz/aQute/bnd#biz.aQute.bnd.util/6.4.0": { + "jar": "sha256-ZbW9Sg+rFoEvGADJj/dKA483o4v+iZrzgu/tTv3B4+E=", + "pom": "sha256-o9QfkwNfFvSai1AFrNPQlrfzJoagUVMNmhiuzT25DCE=" + }, + "biz/aQute/bnd#biz.aQute.bndlib/6.4.0": { + "jar": "sha256-NXFFB0hy+dv2fmKfzSN+YVJwflddc130U1KC+fWI0tg=", + "pom": "sha256-6jk7yLU4PHFhu+XjqqjPvQCzZkR1GiI4VaTJAEumrZw=" + }, + "biz/aQute/bnd#biz.aQute.repository/6.4.0": { + "jar": "sha256-0k3V0QvZ5gZ2FlJzpq6NWsYS4d/Mm4w0kSCWeciBL/U=", + "pom": "sha256-++slSN+o3ttLLtBwWu6vImqbriDrDwJdxHuKb366iXo=" + }, + "biz/aQute/bnd#biz.aQute.resolve/6.4.0": { + "jar": "sha256-wxf5KC5I2FlOK5d0mYbS2WX7vaYMO4MModjDcS14p+g=", + "pom": "sha256-290Wg307M+k0i/9KhTgPuiee4UapzAI6Ch9zm2y0FY4=" + }, + "ch/qos/logback#logback-classic/1.2.3": { + "jar": "sha256-+1P4U55/y48JOlbhOBEgVuwdyAnrsCC1nYo2peusN+A=", + "pom": "sha256-oFHrGiVIuTyZq8qOtx1cddL/BpdmgpYDSBJLxJAaUxU=" + }, + "ch/qos/logback#logback-core/1.2.3": { + "jar": "sha256-WUbYN/5vlgwCpT7aemkm7MPHWLvdaapFPuQp+FghfyI=", + "pom": "sha256-301xgexRZVuqqrBnlxGA12gWQ93SdBOfDDB426FOl+A=" + }, + "ch/qos/logback#logback-parent/1.2.3": { + "pom": "sha256-ec0CHa/HsCVdPN0/1wy6pjjfc5lXSaNI7oLEVjXqsmo=" + }, + "com/athaydes/osgiaas#osgiaas-cli-api/0.7": { + "jar": "sha256-/5g6U3a4GDCkAx8njhnvjSVd9MvFWDeaMUk/p0EGMMI=", + "pom": "sha256-LniyokqUSW72hNIUFWrGA0dLheNWLd1nW78X3PiJpLE=" + }, + "com/athaydes/osgiaas#osgiaas-cli-core/0.7": { + "jar": "sha256-+29PYDq4B/TjvN0XF7w9+GAcFlu7aY0pOuEvDogMIYU=", + "pom": "sha256-6dAawLpzKBVYwK74apiVGiC5PLnJUcdx44BPf+yWGgY=" + }, + "com/athaydes/osgiaas#osgiaas-common/0.7": { + "jar": "sha256-IAZKBz8SHtQkqOCKDUdjquTTQLK+alIGhjGz3Q4/uGw=", + "pom": "sha256-aN9UOc4DQls8eDzZ4qQTt96gJmIes2WReU5kgJXArK8=" + }, + "com/beust#jcommander/1.64": { + "jar": "sha256-FWvnNhmcmQMh2f93CQsZlinPyYZeLWwT980pG7FkGBc=", + "pom": "sha256-F84MMunPlTZ4+CCuXyrZLu85bYQPZn/JnyOtwK0l0yg=" + }, + "com/beust#jcommander/1.82": { + "jar": "sha256-3urBV8jeaCKHjYXQx7yEZ6GcyEhNN3iPeATwOd3igLE=", + "module": "sha256-k2oti84PhNoYUA9OEZSIuTEG26qDuEYv6Za80OHDixY=", + "pom": "sha256-JGNEFwtRO4Acz4EiNNThMkoPbtKoHpCqYYkTtmucwXM=" + }, + "com/dropbox/core#dropbox-core-sdk/5.2.0": { + "jar": "sha256-uo+xxTATiLSzM6JgT4hlVLJ/ATFdRsRhMfoSifMMfYA=", + "module": "sha256-U7JRv2oYUiiMl7Qzr2BdyIjmOf/EgK4jkrdhMAHaA1A=", + "pom": "sha256-MirGoEbZW6GKmqjZidQ74DYgM1JPVz+b5wiQ6oop4Bc=" + }, + "com/fasterxml#oss-parent/25": { + "pom": "sha256-3EFgl7m8Tv6JbcJWewbKuGqTZ4bSNuyyhM4t2GBymkA=" + }, + "com/fasterxml#oss-parent/33": { + "pom": "sha256-xUNwlkz8ziMZvZqF9eFPUAyFGJia5WsbR13xs0i3MQg=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml/jackson#jackson-base/2.10.0": { + "pom": "sha256-r5dC9EUhQ/GySYSfgioZ84drb40wyufDVeu0oopIPQ4=" + }, + "com/fasterxml/jackson#jackson-base/2.9.6": { + "pom": "sha256-+81gnH4GPoOzDc5YVVsj3uPlGdwAqqx0ceUrQUCRcyk=" + }, + "com/fasterxml/jackson#jackson-bom/2.10.0": { + "pom": "sha256-LDGTpqe7yfycHmh8jwWtuWM7q8qAd6puqu4ZDYbhTVk=" + }, + "com/fasterxml/jackson#jackson-bom/2.9.6": { + "pom": "sha256-9BOCmOts2HKgOORiRoAxqGA6p4SC6aIjnJFy81ci8Pg=" + }, + "com/fasterxml/jackson#jackson-parent/2.10": { + "pom": "sha256-pQ24CCnE+JfG0OfpVHLLtDsOvs4TWmjjnCe4pv4z5IE=" + }, + "com/fasterxml/jackson#jackson-parent/2.7": { + "pom": "sha256-OJQmHGTKZDJFHjNRM9UCFgwRtXwqaVqyEgmg7113+Hs=" + }, + "com/fasterxml/jackson#jackson-parent/2.9.1.1": { + "pom": "sha256-IlykrxyJWrSEXPLSn9WsUOU4s1OAXnW7K3Shs7nYa8U=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.10.0": { + "jar": "sha256-d6CEYhl3SoJpvBs4zAApSQjTTnf4qdo02XZzmC91hT0=", + "pom": "sha256-FLGqxIj74H7Oqug/X8ppId8ETUX8hejG7DsW5zQ42tg=" + }, + "com/fasterxml/jackson/core#jackson-core/2.10.0": { + "jar": "sha256-aedpWx5Ag0+hJC/DKKQBBgeRHO03Bqt5q8dp1FEZdRM=", + "pom": "sha256-rZo5sYeQgaVlVuUCd2742RD5BHMfhlXFJoH/882kr54=" + }, + "com/fasterxml/jackson/core#jackson-core/2.7.9": { + "jar": "sha256-vZByFCC7iZqXTtCaEH/vQsqMx8jgVXYvbIFXYTLlu8U=", + "pom": "sha256-Y5RpKyntD9jelAX/5gr0cCz0JLMkcSXqyxUxv6olHWw=" + }, + "com/fasterxml/jackson/core#jackson-core/2.9.6": { + "jar": "sha256-+rh0au3WQneI7jkOoE1DjsFBv/frNHb4vdXZEQ+ycYo=", + "pom": "sha256-fd0tyP0KY04n4wapqoVJWczEckV5dijFC8g3F3WkLjI=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.10.0": { + "jar": "sha256-jmxWbGf8YalsXfxKcdQw8lZXZXeOyabvIWxUYKmRG2A=", + "pom": "sha256-kAdHbEZ6U59DnFEiWw9s1MTiNNZ93pKaICEYZhAmkic=" + }, + "com/fifesoft#rsyntaxtextarea/3.3.3": { + "jar": "sha256-BtzbujMTN/g1cBWAYe9JdFMTG6yAyFbscRQs1d1WSfo=", + "module": "sha256-gyR4XKxJ1K0GLZU5wpS+WGeWO9uhkazgLqsFGiuSEQU=", + "pom": "sha256-vPdSvzOppTP6qTd0XtOOdhbbVWWV7Doqsbeny0P5e8I=" + }, + "com/formdev#flatlaf/1.0": { + "jar": "sha256-E12NWsOf7CnZs/9SyzBybT+XawaYYVvjJTT9eSTynsc=", + "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", + "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" + }, + "com/formdev#flatlaf/2.2": { + "jar": "sha256-CRiJizWqeFWfPJiWsUKKlo58Zp1e6LBFm61Q4ZLks18=", + "module": "sha256-FVtOnXOuoXXbX9Cwp7zbDgUurJRXZkpS10bqR1aGzJU=", + "pom": "sha256-iDEsV9UfzoVt4O4wSl3U2LI7wNOICiteBGprhOofGTo=" + }, + "com/formdev#flatlaf/2.6": { + "jar": "sha256-aol8rBnE9IsiiEohp93L+kfH/aJm26aYBKb4R6uel8g=", + "module": "sha256-bI6NyWonUOIHu1jOAV6LV4fEZiOxCves4Hg1zz6c8uA=", + "pom": "sha256-LyBWRSdf3po/+KaqsTgf29k7T67QfiDqkCujsUaVSuQ=" + }, + "com/github/junrar#junrar/7.5.4": { + "jar": "sha256-xZRJh80HDROp+9UVJi9LomPHLm3T+Yak1/EOrhtusM4=", + "module": "sha256-dl/GX7jryzhbcCG3J95RAAypDNMKcQm9Ed8QYv94lGk=", + "pom": "sha256-puop94MBMKrQQOMFjwNC4UBybts1QtXoDn1qZcmbAc8=" + }, + "com/github/mwiede#jsch/0.2.8": { + "jar": "sha256-0vgM9unIlvl/6UgT03ofW0zcGOF9oDFGxuFGMasb6bs=", + "pom": "sha256-CyRCnDntCWozUfpmflRNcg+M559/cRcRmTqzGHsQQGA=" + }, + "com/github/pcorless/icepdf#icepdf-core/7.0.1": { + "jar": "sha256-RBAMICxzxmPzHJ7TgHg/0G0mr9HdJAX7YL49R3r7f9g=", + "pom": "sha256-MwixlyFAVBbfn1xS+cyBUywXnlaZRaMpoleRHyxSc/o=" + }, + "com/github/pcorless/icepdf#icepdf-viewer/7.0.1": { + "jar": "sha256-cUQ/NKc4sbq51CwZnZGFZQetc+Fp2UuF8Hw5HKF27Hc=", + "pom": "sha256-ZRY98Xd643d1jG63i6nddkac8zxWBjU1vnhTvXx5Ahc=" + }, + "com/google/api-client#google-api-client-parent/1.25.0": { + "pom": "sha256-NElJWTWT7Wp7YMFmdQcr4lO3PMOAxyC5yWiT/KVhzUc=" + }, + "com/google/api-client#google-api-client/1.25.0": { + "jar": "sha256-JOGmnWwE5ucuPhZ1fUbTLap91DyzLDiV+DLyU1i+FAI=", + "pom": "sha256-xyaAUSeQpZObOW/XaPC2GXWGQj4QW4962fsetrNYTZg=" + }, + "com/google/apis#google-api-services-drive/v3-rev197-1.25.0": { + "jar": "sha256-lvAOQzAcToTxHvGJZyrOxVegIUhtcoSHvakWXqPs1L8=", + "pom": "sha256-g9+53Y56ucZWRyJcIuo3eGxFPcMTvn5Kp27ZWqRw3Ak=" + }, + "com/google/code/findbugs#jsr305/1.3.9": { + "jar": "sha256-kFchoO6pCoFTSrt+5u9OouXmRfod7wpc2IQC3xtGye0=", + "pom": "sha256-/quRkTEcPXru8rZtYGSvyA09HVLZgPsHrkPHjJh7qTo=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.9.0": { + "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" + }, + "com/google/code/gson#gson/2.9.0": { + "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", + "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" + }, + "com/google/errorprone#error_prone_annotations/2.11.0": { + "jar": "sha256-chy5GEK0b6BWhH0QTVIlyLjh6LYiY7mTBR4eWgE3t+w=", + "pom": "sha256-AmHKAfLS6awq4uznXULFYyOzhfspS2vJQ/Yu9Okt3wg=" + }, + "com/google/errorprone#error_prone_parent/2.11.0": { + "pom": "sha256-goPwy0TGJKedMwtv2AuLinFaaLNoXJqVHD3oN9RUBVE=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/30.1.1-android": { + "pom": "sha256-2Oaw8PpL9r4hc03FMPdNhpbp0Kw60n+8eSi6PY9k12E=" + }, + "com/google/guava#guava-parent/31.1-android": { + "pom": "sha256-chYh8BUxLnop8NtXDQi7NjJ/vUpTo+6T3zIUNjzlOXE=" + }, + "com/google/guava#guava-parent/31.1-jre": { + "pom": "sha256-RDliZ4O0StJe8F/wdiHdS7eWzE608pZqSkYf6kEw4Pw=" + }, + "com/google/guava#guava/30.1.1-android": { + "pom": "sha256-shjebjRaeYP+/OSaBLrxn2rONZytHISXMZDNbE2gWEY=" + }, + "com/google/guava#guava/31.1-android": { + "jar": "sha256-Mqwu1wnZbSeLXS4+XOoXj6STmTnFJftkdTLwEzCNswk=", + "pom": "sha256-ZikplWROlVN+6XqJ6JkBcdjzwmrPmEgwp3kZlwc9RR0=" + }, + "com/google/guava#guava/31.1-jre": { + "jar": "sha256-pC7cnKt5Ljn+ObuU8/ymVe0Vf/h6iveOHWulsHxKAKs=", + "pom": "sha256-kZPQe/T2YBCNc1jliyfSG0TjToDWc06Y4hkWN28nDeI=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/http-client#google-http-client-bom/1.41.8": { + "pom": "sha256-yVh1SDQDTW6bV19FDYAINuQYkW1vNIOXqwpMmzfLhKA=" + }, + "com/google/http-client#google-http-client-gson/1.41.8": { + "jar": "sha256-FRKmpkILWW8UJXXvBFDQK7XQbo9Y4RRAT1Tfg1NfO1g=", + "pom": "sha256-MytVQtfeavHdJZ4UvOGcpfVpX18apBVC/KvtqGtYRRk=" + }, + "com/google/http-client#google-http-client-jackson2/1.25.0": { + "jar": "sha256-+efg0xiGCiCS1wtWMxl2KAxOk0igZe3juZySqgMv2FM=", + "pom": "sha256-kJ9uCYAW/9nOnr83IN+2YbxKF6qTLLTCIYNpl9whWF8=" + }, + "com/google/http-client#google-http-client-parent/1.25.0": { + "pom": "sha256-BinHEZjqaXXv6PEi72pbyqcvvtbPMMO4PMPLtkcI/as=" + }, + "com/google/http-client#google-http-client-parent/1.41.8": { + "pom": "sha256-HKVBMLDXTBxWaWEdPp9+XCXtxsSKMJCcMjDi4Jld7Vw=" + }, + "com/google/http-client#google-http-client/1.41.8": { + "jar": "sha256-mfps8okNuo1yUIo/1wEhHlXaZsgSBZGXcibkTVf18Bc=", + "pom": "sha256-3tTlt+Us2xmGB+rfh6huKKmSbEC/fKao9UZ5kWyfdvI=" + }, + "com/google/j2objc#j2objc-annotations/1.3": { + "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", + "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" + }, + "com/google/oauth-client#google-oauth-client-java6/1.34.0": { + "jar": "sha256-zWbH9vnIzmFFPRL05/iComFqAyOeqTf9D86G7bUWKMU=", + "pom": "sha256-+WIvkogQedMf7W2DjC4eyR3DmOqKots9y60o6JDxYk8=" + }, + "com/google/oauth-client#google-oauth-client-jetty/1.34.0": { + "jar": "sha256-p97u4NDKLERAyRI95uV6jznV4ZglyYrscgSatE7EIs4=", + "pom": "sha256-hz/FGUgZeoSiBbUpQ/KoWYiJdJV/awRxaJYrlpobZqA=" + }, + "com/google/oauth-client#google-oauth-client-parent/1.34.0": { + "pom": "sha256-Pq1EPY3oIipV15kAq6aeIhnL7GhRmlelqmOzdMS4FqA=" + }, + "com/google/oauth-client#google-oauth-client/1.34.0": { + "jar": "sha256-QCDi9jQvFR55cYfoQzuS0ZpAs6SAHyKrg4nXBhXRcNI=", + "pom": "sha256-DJ03VEuUcRXdzOoUiV0ZpgmEEKcrDD1FGy2KWzkDGDg=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.13": { + "jar": "sha256-TA/aKx0xd1DX6jJONscLK8SDEMCqrme5jfCRXWltcRE=", + "pom": "sha256-lyWx/pxoENl3dQu4RBXqEILEtIjUqDn5cEu09ej8F/Q=" + }, + "com/googlecode/json-simple#json-simple/1.1.1": { + "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=", + "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M=" + }, + "com/googlecode/plist#dd-plist/1.23": { + "jar": "sha256-PXlPKAjQ6Qx+yIlljoQ/kqJEFL1N8Y7PnxR4cmrxI4w=", + "pom": "sha256-irwhpc7IBIMPGpXg6ePumjP+vuugYUoKC39r1Q2sNoM=" + }, + "com/ibm/icu#icu4j/59.2": { + "jar": "sha256-S+43qfIsCzNv6Km/6Lp+8XL6FBO+1Nfyb9Q1EQzIl5s=", + "pom": "sha256-rULdMCtmkeYiiWFf01Xd8XDArSvqYRG55SF1swkKmS0=" + }, + "com/jamesmurty/utils#java-xmlbuilder/1.1": { + "jar": "sha256-Ulf963GblQOfxs81ASUnk5hWsvLJ12PVk8wMtk6IqyQ=", + "pom": "sha256-CPvh/9g2Z7fusWo3U/WqwQ1aUqwt3Dvu/aqA9q3oSt4=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "com/sun/activation#javax.activation/1.2.0": { + "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=", + "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.19": { + "pom": "sha256-DUgSxOMREJtuOk5gZvgh10kZgTl25P6p5CfPNi8vBYM=" + }, + "com/thoughtworks/xstream#xstream/1.4.19": { + "jar": "sha256-yayTUnlCGJron8kSBnY1jxHqj3E8Y1qfLHAGP+ZxZjQ=", + "pom": "sha256-7odNIUDKTox3TojfZW7svJZT9bjLmAapq4UFwmm3s34=" + }, + "com/twelvemonkeys#twelvemonkeys/3.9.4": { + "pom": "sha256-gOzTBd8tVuolgm89azuQc6gopH6WUu8FZKOPHzt3VSc=" + }, + "com/twelvemonkeys/common#common-image/3.9.4": { + "jar": "sha256-pfQZkdJJLyjOTwS4Kr//uJ9f+p38h/TljxDVJuW6SoM=", + "pom": "sha256-8e4RuOVYMAMujk1Zi2EoHjXnZ0+N2adwFGpxOaDOPkE=" + }, + "com/twelvemonkeys/common#common-io/3.9.4": { + "jar": "sha256-zHwnlHvyGnX7w9YT55vdhhmQjme4jMfXMJGlWHbk/Tg=", + "pom": "sha256-CsHg6dQkTPzshRxVmIXUi4RZGGEQh63lSc3V1e6rsWI=" + }, + "com/twelvemonkeys/common#common-lang/3.9.4": { + "jar": "sha256-pSG3l9WPZbgPqMo2XZWRFiJAjKsiD9XYUhaYBfZArL0=", + "pom": "sha256-mS8V1Ni9Bv+g5GYY7FV5wqvSizgmDLPljY3wGJ4YjJM=" + }, + "com/twelvemonkeys/common#common/3.9.4": { + "pom": "sha256-eMLMiO9JfTKBbZrtHWZ0YYWwk4ANvICJDFJqweuwWQE=" + }, + "com/twelvemonkeys/imageio#imageio-core/3.9.4": { + "jar": "sha256-JEhDp7yOz277IKpfgX6Xet2vs/awznA5Oz5tEQlZH64=", + "pom": "sha256-bkmhULWKTlKRmufie0l2KCI1JF44gdqMTuPipOj7eBc=" + }, + "com/twelvemonkeys/imageio#imageio-metadata/3.9.4": { + "jar": "sha256-WAozT44gyZ/5En+psAIrDwKpgbRuazjg3zkwUjKaYyQ=", + "pom": "sha256-VmIGSg5hQybZFjeDeRi/kdT9MiDN7yN5N/xQojyZLtU=" + }, + "com/twelvemonkeys/imageio#imageio-psd/3.9.4": { + "jar": "sha256-LB+jMxlkYUDbQw/PNohyRIO+0Asd4Ze3ZGs29aFu1ok=", + "pom": "sha256-smU8jX25W0PnzV94pCx18xJTGHNMsofkXDMHztIu3IU=" + }, + "com/twelvemonkeys/imageio#imageio-tiff/3.9.4": { + "jar": "sha256-RfOfSeOnDS2yzlSTtpp4nYACwSKqTk5gTZv6LfQmyDw=", + "pom": "sha256-yS09aeR3Rl6A44DDllbGypQmFyD3Xdxd/HYl9KVaGFo=" + }, + "com/twelvemonkeys/imageio#imageio/3.9.4": { + "pom": "sha256-q24dY2m5UtPiKwv8mmZYbKRhYX3oMEjDVQBp398INyo=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-cli#commons-cli/1.2": { + "jar": "sha256-582JUZVtNJtWi3zP1PWyUpqMET5nwysCj1L/2jcSWdk=", + "pom": "sha256-GPPpIHbgjC/eSDFwJQmOn2uqqF9pEutD8tfmjVcORWE=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "commons-codec#commons-codec/1.17.0": { + "pom": "sha256-wBxM2l5Aj0HtHYPkoKFwz1OAG2M4q6SfD5BHhrwSFPw=" + }, + "commons-codec#commons-codec/1.3": { + "jar": "sha256-G6/S7OLojbTN+DWn+PDeZfq1sRR5d6XcxZt8G4xvUIA=", + "pom": "sha256-0VfjQkTohN2R+gGSHKhDcuEfe7CP7bXUVsBnDCgFRjY=" + }, + "commons-codec#commons-codec/1.9": { + "jar": "sha256-rRnSYBw6vwuUa1w6QRPiJqjB4zBeOVuQATt43ZSnI84=", + "pom": "sha256-5e/PA5zZCWiMIB3FR5sUT9bwHw5AJSt/xefS4bXAeZA=" + }, + "commons-codec/commons-codec/maven-metadata": { + "xml": { + "groupId": "commons-codec", + "lastUpdated": "20240427124755", + "release": "1.17.0" + } + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-el#commons-el/1.0": { + "jar": "sha256-DWdVDsACK2U0U8dZ8GOmQ8L+ZLxI+qiyX5WiIOKiguI=", + "pom": "sha256-CvMQHgSH7l4LJ/6GusL2gvoSo6KSuzvRm58n1e2ArsQ=" + }, + "commons-httpclient#commons-httpclient/3.0.1": { + "pom": "sha256-prCLPpblcaY7vWHEYzsfRrA4Y1JQ1uYn3TSkSjYetB4=" + }, + "commons-httpclient#commons-httpclient/3.1": { + "jar": "sha256-29SVPQE+EOfBzDcBo+bM2MlQyJLwjYBPq/rCFwWTBEM=", + "pom": "sha256-ipsH1FjT5zAiHb7N+vpzU+wbq9O5TIQyJ8RxBKkMbWw=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "commons-net#commons-net/1.4.1": { + "jar": "sha256-BaNhHe35DQqz6O2D3sTuSSABSMCUJUN+uTSFYv3n2Dw=", + "pom": "sha256-1REvVdum8eRbaz00zlvhox9BBFkwbbksME/spDBP7Ko=" + }, + "commons-net#commons-net/3.8.0": { + "jar": "sha256-NSsLocZX2JMAY6m4OHj7cX3u8tKe4l0TlDvpvszGTUk=", + "pom": "sha256-WKIkqJs9YGMxCzm5riRAluoyPCMTH58YShS6d6CZ08k=" + }, + "eu/agno3/jcifs#jcifs-ng/2.1.7": { + "jar": "sha256-6mlza+XKjx9l8dputipQaz/iX/SY/0uO2eWdpFBGqRU=", + "pom": "sha256-QWCb9JaBLTeupRJrjd65GD0tRWCMZr6h0FvIDLpe7ZI=" + }, + "hsqldb#hsqldb/1.8.0.10": { + "jar": "sha256-sEs7OsKV1JfIcjDutPiIMnpaFbnDwVZ9sgKlHYOsnkE=", + "pom": "sha256-2QDYa4u/4/bugeqfIgbwd5Myu8pYjmo1/Rh4agoRkzE=" + }, + "io/github/x-stream#mxparser/1.2.2": { + "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", + "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" + }, + "io/grpc#grpc-context/1.27.2": { + "jar": "sha256-vL+QVd/0U/1lCL18yioKotXwWanJS+7R9f2h3AFWB7g=", + "pom": "sha256-DyErFOvYNMvtm9iGml1snBeY7OtRLH/MKNqJ9vik7dg=" + }, + "io/opencensus#opencensus-api/0.31.0": { + "jar": "sha256-cCulXXjznVUZXc8EH9+qt6dJCprEUBNUJIftnk06TSM=", + "pom": "sha256-m0eVkefD4KtFOB+gQ6kWV4Fb3Yw1k68BDHrDb0yQWRk=" + }, + "io/opencensus#opencensus-contrib-http-util/0.31.0": { + "jar": "sha256-vMbNebAMLCqln8KgLUCUEIMAWFDrtS2X1jkI0253r9M=", + "pom": "sha256-fvy/lNXcYnWCw/4LjEgz5N08vF0vEvpx7yko9MOoWgg=" + }, + "javax/activation#activation/1.1.1": { + "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", + "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A=" + }, + "javax/jws#javax.jws-api/1.1": { + "jar": "sha256-nyCrH+o/lXHtUqnZjjxlHMfATIpwmt3yODErYJh8byw=", + "pom": "sha256-2MBdp0oEuZfbN+I8xFBokVMZkJXfvn5eR9HMRJT1zXM=" + }, + "javax/xml#jaxrpc-api/1.1": { + "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", + "pom": "sha256-7l6D/wZZh4dIA7uRJ5r8zC8dP526odNX2f1X6Ls7xUY=" + }, + "javax/xml/bind#jaxb-api/2.2.9": { + "jar": "sha256-FmXRK8xopBjKJNOJ3OPFhs0W/J1XHfIdQkn/Hjj8uZI=", + "pom": "sha256-IfsrIZfYZypJLBrgGN18cxgwQeptHMmYSKSdYu7cHL0=" + }, + "javax/xml/soap#javax.xml.soap-api/1.3.5": { + "jar": "sha256-/Ne06NLZVpWtonmH3TXVJGgkiAHK3zpgPZaawpqZ3Yw=", + "pom": "sha256-a8CULqgG3xhh/DZ966JAKEXbh8nXcImhIPfoipqRIdU=" + }, + "javax/xml/ws#jaxws-api/2.2.12": { + "jar": "sha256-fnbOOvYwVFkrEUHe7THpb8SzhQK4bfSNU3bQALAwLJQ=", + "pom": "sha256-nlweszqLecaX7vPaFugWk9bBAsyq4q65UqaidYHfPco=" + }, + "jline#jline/2.14.2": { + "jar": "sha256-c3wEwqrwkAlyMygUYICvrnhp1AViWLQjg0pUeHkhOGw=", + "pom": "sha256-VOIz9HwTd6tBH7ZNJuMhULzZkEUTecWZUCeIeGO4p6c=" + }, + "junit#junit/4.10": { + "jar": "sha256-NqdHyh4LhvbqiAVbhyO7hwMNYndm2mKIvwd6/e6w91o=", + "pom": "sha256-IqG/C6rothBretgCbs8nxZ5+R920nWKXUDa+rbLGLrU=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "junit#junit/4.5": { + "jar": "sha256-kjurxR22dfOSN3fDn/fYaOenbmmkU0C6Ts84zlMa3w4=", + "pom": "sha256-dS6JNTrcfSfLat1xKija1YKK5zDhAuusLTSa9uLvda4=" + }, + "log4j#log4j/1.2.17": { + "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", + "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" + }, + "net/iharder#base64/2.3.8": { + "jar": "sha256-u/Qf2iKHelOPa8LVrQqjcqfd9KdWrzOGqgnT1O6oT38=", + "pom": "sha256-GztOxlWgmYGaS9QCKQBNP14Y0kz1Iy/rOS4faUoENzA=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java#jvnet-parent/4": { + "pom": "sha256-RxOVc1VJSVKXyP+Tm5oy4IuRMCAg/3c1htJ+SXq7j7s=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/java/dev/jets3t#jets3t/0.7.1": { + "jar": "sha256-zzwEdXFHFoKn9Z31SAinFD14xrj2gmgJ7pWi+WN7fmA=", + "pom": "sha256-Ll4uq1m1a8DqquHRTgulO+6sYjvXK14c9UdcpcvR4Hs=" + }, + "net/java/dev/jets3t#jets3t/0.9.4": { + "jar": "sha256-oD8NJegQ7P8wE34NMUjRv5r9z2I1fr0bGvM49/YRW7s=", + "pom": "sha256-nqFHD161gt9fJa+pteIFPCy2GPJjlqG/IQ3m6T2XZGI=" + }, + "net/java/dev/jna#jna-platform/5.10.0": { + "jar": "sha256-H3Gv2XcFG/AQnvXjdn1OKv13e+iU2JeIzA84rWj2oW8=", + "pom": "sha256-5Kho919p2VQvw5nczcs5mxDB/8hJUlUJvoJOM7IbApU=" + }, + "net/java/dev/jna#jna-platform/5.12.1": { + "jar": "sha256-jOlpEWyslb1hsHqNXgcXSzUuYzAUc8qscsOV48CEiNI=", + "pom": "sha256-wnn/o7UWjiIDCHIxxjiRmnzsdFgAaxzaZpWXR4YPtFc=" + }, + "net/java/dev/jna#jna-platform/5.5.0": { + "jar": "sha256-JNgWIfgqwp/N2adBFgMfWQeiNDFY5hb0Vzu/okNK4NU=", + "pom": "sha256-EFaeNiLpdNPmYlW6hZI8El2E+iV+8lQ9isHGWNnrzRA=" + }, + "net/java/dev/jna#jna/5.10.0": { + "jar": "sha256-4zXBBnn3QyB9gixfeUjpMDGYNUkldanbprlPijuW/Mg=", + "pom": "sha256-B3PdO7r1MF5MDIL+NFzF1Mjp+tYjAqVVEYAj9ePq4xY=" + }, + "net/java/dev/jna#jna/5.12.1": { + "jar": "sha256-kagUrE9A1g3ukdhC4aith0xiGXmEQD0OPDDTnlXPU7M=", + "pom": "sha256-Zf8lhJuthZVUtQMXeS9Wia20UprkAx6aUkYxnLK4U1Y=" + }, + "net/java/dev/jna#jna/5.5.0": { + "jar": "sha256-swj66/5O1AnehBDgpjLRZLISawNfbqz/lo05CMr7TZ4=", + "pom": "sha256-pRrZTj90+Fo8362XU5KCkxZFJmn1iCA8e0nl+Beb5Tk=" + }, + "net/sf/kosmosfs#kfs/0.3": { + "jar": "sha256-GAfL/7bIh2z0QLj310j/9JzqQN3S0EK7tiuuPIe6iEI=", + "pom": "sha256-vh1i+xebfsSFJ1HqBmd9ZgUt9fwBwur8eUUudaXBZfg=" + }, + "net/sf/launch4j#launch4j/3.14": { + "pom": "sha256-xEYpdod2nJWyb2Qg9zsr0qKd90TYllTAdKhVb2Is+Vs=" + }, + "net/sf/launch4j#launch4j/3.14/core": { + "jar": "sha256-pGVAv4Nrz3s1AHM9n6f1muzYyDeUJz5zZlWrLKdXYjA=" + }, + "net/sf/launch4j#launch4j/3.14/workdir-linux64": { + "jar": "sha256-mphFGb9E6CWlsEFZfgVPi/qy+Tpm+na30aM79JIcNUY=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding-all-platforms/16.02-2.01": { + "jar": "sha256-cvq1Op0x4W1lP+H0AAEdAqf2vGqR6GNLXPrVzhXUZ7s=", + "pom": "sha256-u3FCxepITF/phCbcFezhuYu/3UZTRWqI2idCHXJnAmU=" + }, + "net/sf/sevenzipjbinding#sevenzipjbinding/16.02-2.01": { + "jar": "sha256-Ezyj9pyMc12Jl8CUd1BPSKny5h6ntwSzcUqQZrHvuI4=", + "pom": "sha256-pdF4WGwNvc4V3cKlKBaE04ek8jW10bklWzls7TaWhcE=" + }, + "org/ajoberstar/grgit#grgit-core/5.0.0": { + "jar": "sha256-euHeUDb2pP8sTyHULuJ53LvKcOYDpEtP6zBZK0eu8G8=", + "module": "sha256-fuADv+5+8bNRyxV2GAXUs5HI7CUAwxdax1o1MgM7KjU=", + "pom": "sha256-wmURBGMEd98+Iig8ChGyIiwm3184m+t2G2ACnGXiGpw=" + }, + "org/ajoberstar/grgit#grgit-gradle/5.0.0": { + "jar": "sha256-aa8WiXAg1WPHBtYBRNgBpnrSS2cd4GA5j8rJho7aPCw=", + "module": "sha256-RJ+Wog22yCYvNtpsLZWdEkJb3LY6ki6Ikit50KC+VJk=", + "pom": "sha256-D6nV84E9yjIz2f2rjUWtaJ7nQ+qPxJVUVYbK6Ufw0pY=" + }, + "org/ajoberstar/grgit#org.ajoberstar.grgit.gradle.plugin/5.0.0": { + "pom": "sha256-cszQAN0OuVBwDurgtOkLouUb/LdE6FZiggM0cuVqqyA=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/17": { + "pom": "sha256-OYBEt0tacZMmviGK4IEk5eLzMYq114/hmdUE78Lg1D8=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/commons#commons-compress/1.20": { + "jar": "sha256-CutiXJSMaX6nsgUVbhEjY7We1eJVEhLNTkYL23LHwG4=", + "pom": "sha256-2VZ4469WsXx9ts/5ZF761etZvp88HKqvXwFG7fBGkdc=" + }, + "org/apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "org/apache/commons#commons-parent/11": { + "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" + }, + "org/apache/commons#commons-parent/32": { + "pom": "sha256-5NJYr4sv9AMhSNQVN53veHB4mmAD6AV28VBLEPJrS+g=" + }, + "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/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-vfs2-project/2.3": { + "pom": "sha256-esuoQCmKFoMHNgZkPcGX0+XwIoOrIMuUyLbjB18pU7E=" + }, + "org/apache/commons#commons-vfs2/2.3": { + "jar": "sha256-VtHuk/pi7VJzsUQDwZwAlV7vN5JgUwfksQa0GuXYOmY=", + "pom": "sha256-HAjXM3vPvbo1PJKIYKRlE8A95kp4mTCs1rwQIE4pHjY=" + }, + "org/apache/felix#felix-parent/2.1": { + "pom": "sha256-xVKlZDq0Z8MSJeB8tVsdwq5agR5WdIGnOiVKOJgThzY=" + }, + "org/apache/felix#felix-parent/4": { + "pom": "sha256-XM0w8s5e1T09oZGiPs71mxWw/Q5JSgGu60AmRBQn5Gg=" + }, + "org/apache/felix#felix-parent/6": { + "pom": "sha256-Ngi2sgD2yPSIx3zBWYR9UV5pZugzO4XY4E45Sgk7VZU=" + }, + "org/apache/felix#org.apache.felix.framework/7.0.5": { + "jar": "sha256-q6cpMsX/5S0a6ftzVBVHS8gwX9BPBQ6FHzqPZ9oYNP0=", + "pom": "sha256-CBAm1JP4dt+OsPPxyPhdpyy+N99VeDPpaLQMMNrL/Kk=" + }, + "org/apache/felix#org.apache.felix.main/7.0.5": { + "jar": "sha256-IIUtVR3jJ4BKU7IOUPL7v3e2KwP0JubpXnYG06WPjpg=", + "pom": "sha256-p5ct/DzTQrxR5G2PMD5avTzjDhgOi1cVLAnxiUpTLv0=" + }, + "org/apache/felix#org.apache.felix.scr/2.0.12": { + "jar": "sha256-jaF57ceJ4SYH+x7pCNuEkJkh6A4JO9Sdm648LCDsqQ0=", + "pom": "sha256-Tj7MhctREnNZO/4c7/RpZAkzjs0+2wvv05oie/2iZaI=" + }, + "org/apache/felix#org.apache.felix.shell/1.4.3": { + "jar": "sha256-xT4vgt58Qntj27+RG4uJA4b0qxI41s/olFsQ8B3YqgQ=", + "pom": "sha256-E3gqgSD8OX+Fxl5jdRrxQhrWjxbqQ9etxpjI9wDJUeY=" + }, + "org/apache/hadoop#hadoop-core/0.20.2": { + "jar": "sha256-NpnQfjXPWJgtIovrrzBz70z4Tg9PgtyRY2EYyrEy5PY=", + "pom": "sha256-8IygIDOByE19sy1x1giwIWt2NY8BBLLBcJ1uyCHs4A4=" + }, + "org/apache/httpcomponents#httpclient/4.5": { + "jar": "sha256-o8FVmR3h416FHoKKZ/iU0QEVjEEkzA8d9fEtJ8+kd3I=", + "pom": "sha256-KXbd8fDEATUubMf0kmbH+D/h+hEwhlB1Ik/DfJAr28s=" + }, + "org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5": { + "pom": "sha256-VPLVLc8b3fp7AEvsk8fmDjLyU6Rkj9ee8t/gOL1KrhM=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.1": { + "pom": "sha256-QSBuBZ8samqOylrk4YC0C5P2+raJ65tcCTa3K2K3GNI=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.15": { + "pom": "sha256-YNQ3J6YXSATIrhf5PpzGMuR/PEEQpMVLn6/IzZqMpQk=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.1": { + "jar": "sha256-3ROQwX1A92D35RuyBSOo1j3raelLq+r1Z+t27NLK1CI=", + "pom": "sha256-uBpinKyR8Q4siiRfd0tvCIlQOerWifqITHj0csdSxIM=" + }, + "org/apache/httpcomponents#httpcore/4.4.15": { + "jar": "sha256-PLrtCIxJmhD5bd5Y853A55hRcavYgTjKFlWocgEbsUI=", + "pom": "sha256-Kaz+qoqIu2IPw0Nxows9QDKNxaecx0kCz0RsCUPBvms=" + }, + "org/apache/httpcomponents#project/7": { + "pom": "sha256-PW66QoVVpVjeBGtddurMH1pUtPXyC4TWNu16/xiqSMM=" + }, + "org/apache/pdfbox#fontbox/2.0.27": { + "jar": "sha256-3HQphoqvPTE8Ukuaq4RqQF6Jykkn81diyk0aYLzh1/Q=", + "pom": "sha256-q/mNDGhURYJaBs5q6wDrs1qRkgrhnO1GEl1afhAoMQY=" + }, + "org/apache/pdfbox#jbig2-imageio/3.0.4": { + "jar": "sha256-KcspUWIvEKz2H9BlbE5vpVYhlKkJX3odJqpCbi9rF+s=", + "pom": "sha256-KOp8SskuCYX3lqi8aJCnvviSZwetrf0eLIVsmwvho4s=" + }, + "org/apache/pdfbox#pdfbox-parent/2.0.27": { + "pom": "sha256-4mbfDSSS71+JopUQrkv35b0RW82duwFn+bZaPZzB3Po=" + }, + "org/bouncycastle#bcpkix-jdk15on/1.70": { + "jar": "sha256-5bnLgh31f3CwWTNY6JwOjXJmUV2p0IivbGRvY9QzwHw=", + "pom": "sha256-bqVQK37r7HAYJxu4qCy4Gb9MHytlQ1ScXP2E1qE5lr8=" + }, + "org/bouncycastle#bcprov-ext-jdk15on/1.70": { + "jar": "sha256-XYGfO4hZfsaAyUFRoLoKOv/wwMHJmbWwZaZ8mYo+Phs=", + "pom": "sha256-349vD7+aZoBvsV+M/E40S1fEdgoiYpAIbKuLkb4X4m8=" + }, + "org/bouncycastle#bcprov-jdk15on/1.52": { + "jar": "sha256-DcTRgeTTR4k8LdvS5s1dcof8ZRwDZI+mSyNBxzZrF3M=", + "pom": "sha256-fko0x7Y9h5xc7EVOLkfrHmHicaWGcuflSGWfTyN0JQA=" + }, + "org/bouncycastle#bcprov-jdk15on/1.69": { + "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", + "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" + }, + "org/bouncycastle#bcprov-jdk15on/1.70": { + "jar": "sha256-jzwg4+LVZdJvM+jUhXo30Nf4rDm2KnAmSW/Ksb2sMNQ=", + "pom": "sha256-bfS1t22QYgF2ZK0MooXlcVSugDYHy4nJcLOcwOAWq7A=" + }, + "org/bouncycastle#bcutil-jdk15on/1.70": { + "jar": "sha256-UtxVUbAldmZSbFCVQkVn/tfcewDSsbp71SKYQRESsdA=", + "pom": "sha256-nrrnHCXgyfLNdWADwB8a0Pw5jKBvvNoNF15xysWECq0=" + }, + "org/checkerframework#checker-qual/3.12.0": { + "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", + "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", + "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" + }, + "org/checkerframework#checker-qual/3.24.0": { + "jar": "sha256-2tGJ1OO0he3wI6niC7yEeDA9yM3clX5oij9ZTV5zu3s=", + "module": "sha256-EC7EgMhtWlEqb6BEgroCeX+kiwiSJ3cRBLgsRFGapDw=", + "pom": "sha256-70TDGulmr9RNMXge4m7zviQm1UITPeVC10lBGOagAjE=" + }, + "org/codehaus#codehaus-parent/3": { + "pom": "sha256-UOslOs0LbuBI9DLZ/Do7NiZO+z2h/6f7B/bE1LeoyjE=" + }, + "org/codehaus/jackson#jackson-core-asl/1.9.13": { + "jar": "sha256-RAqctcqVshX5U9OiCmsaENofCbUpqd3qX4pJBd2rT1o=", + "pom": "sha256-95Xcr5QSdPZanVRaSSanQtCygttPLrGUADBgyvvv2QA=" + }, + "org/codehaus/jackson#jackson-mapper-asl/1.9.13": { + "jar": "sha256-dOegenby7breKTEqWi68z6AZEovAIezjhW12GX6b4MI=", + "pom": "sha256-MPLZHeJHhRcjaODaGKh5cQLHWZqJdmuhf+YzDCQMy/4=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.9": { + "jar": "sha256-zZb+60fzSyVZcEcV23sXmgOjch+dxAksNFxxjim0LeQ=", + "pom": "sha256-/nEJDiNXjdGapqj+9Rhvz6WPSPgHBnKprIlFhis7fz0=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.9": { + "pom": "sha256-nyDSRN5e5OZQmbJ3tpiE7xr4EROcAJcl3TzPqPsaxjs=" + }, + "org/codehaus/mojo#mojo-parent/28": { + "pom": "sha256-WrbfH5JfxhOX3y0XNSu8mK8UZOhT7SF+CeU9IKMm9wc=" + }, + "org/eclipse/jdt#core/3.1.1": { + "jar": "sha256-+eOc9zJrYNHTAW7ZD63ASfcdMSyXqpfLqvhR1jdnMLo=", + "pom": "sha256-thSFD4+KUKt1m1nJIZqv+xxbzz7yQMbE0eFjN/9ZJao=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.0.0.202111291000-r": { + "pom": "sha256-KlNYEM2GhoEaaT0au4sQGRE1bfRlhdxpD0TNNGx3vwU=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.0.0.202111291000-r": { + "jar": "sha256-NSkKqsxiVhMEzQLvjPpbKXqIAHVdfXQk5SlU/MUqEgM=", + "pom": "sha256-pRCLLHNdZ7Zfh7f+77kxAUhCax4dAfHdY04zLB2mJUs=" + }, + "org/exbin/bined#bined-core/0.2.0": { + "jar": "sha256-V+URrCaEsKKGtEI5NrX6Itc2UJ/MqRLLgFmvYGKktAM=", + "pom": "sha256-Jl0xEBR+SbRNns8W4cQdbQMItCvteFcuhav7DPWQiwM=" + }, + "org/exbin/bined#bined-extended/0.2.0": { + "jar": "sha256-zSqJKG0pQ09mz7/mYXWT8CG8QE7xqOUqwpF8QtBhYA8=", + "pom": "sha256-zWZRTzYvH/3JLQPSf4dL+2hmD2lx+5d79jO4LLz1MLY=" + }, + "org/exbin/bined#bined-highlight-swing/0.2.0": { + "jar": "sha256-mInT2MV+iH3NP063uXwjAb5TKumnNnqZa7lv8nutGG8=", + "pom": "sha256-yS9O78KNIZ5Z1GsxQCimeidtrHwmMHOP1YybD81FznA=" + }, + "org/exbin/bined#bined-operation-swing/0.2.0": { + "jar": "sha256-RTyGSbiv+h2dTmC7ob/Y0gKa9/IWweTZhiBH3sWFQC0=", + "pom": "sha256-VX1ftIJE/Jr4ld421jJvS0f5t6gHDUMode6l/9bdTyc=" + }, + "org/exbin/bined#bined-operation/0.2.0": { + "jar": "sha256-rFVLd5DdXoFzEoGkohFvYk902VQNs5hq/AT07EQppag=", + "pom": "sha256-o1y6AYkmzfs0pveozWSz8idrPNDHU2Nr7O8CyD2PxU0=" + }, + "org/exbin/bined#bined-swing-extended/0.2.0": { + "jar": "sha256-FslY+vbzPtW+OytscgHfI1FHIdIl1X4CubCd1yyXIys=", + "pom": "sha256-h/WxZiFbKaoAZH2uVaC8P8b8SmcLpCqlHe3Djtz5YA8=" + }, + "org/exbin/bined#bined-swing/0.2.0": { + "jar": "sha256-9az+O66PgOCt3LGWTDqdRfjk7njp+6/z+bNIvAKA8NY=", + "pom": "sha256-EcPobxsauuBDTGvaia9bDEBHyNzGYEsfN6QK4UNs+ho=" + }, + "org/glassfish#glassfish-parent/10.0-b28": { + "pom": "sha256-2DdvCwd5g3hYi0THaFhNWgg2IC/r1bthQV69NHlUhJw=" + }, + "org/glassfish#javaee-api/10.0-b28": { + "pom": "sha256-iSXwgLFPb32MSS0nNzfJ8XlliH6T2e6jHUI7Dbkv1mU=" + }, + "org/glassfish#javax.xml.soap/10.0-b28": { + "jar": "sha256-DngfntIbAM+gZvD+wATSRGsRDOAATSMW5CDPEa8AF70=", + "pom": "sha256-Oxqk3Tss+B5WJo/d5jAG76V2FeDcfv7dYNwOlws8CuI=" + }, + "org/glassfish#pom/2": { + "pom": "sha256-vjuPfQ8bH3mTTBvDAd133tVZpj8H+cBiEM1LTslohi4=" + }, + "org/hamcrest#hamcrest-core/1.1": { + "jar": "sha256-A2HRST/w2U+GE1nv6pEgByBjUHITR5LvtyF/bgnVz/s=", + "pom": "sha256-OXOH9AbGjMtAP0d8y+wcgYz8a4/0+tpaM+Jhg6hBfIM=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.1": { + "pom": "sha256-FOaVChpimMvLg8+UKcrEFf8nMWf28Vh2hZQTsNbAfjo=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jetbrains#annotations/20.1.0": { + "jar": "sha256-7cjj7JeWpfQcGuRLLTGFB+5qwSEvEh2T0zaZs9Cv9jg=", + "pom": "sha256-RKoM0kV47KB8dgMdQsQv+8rmHOwxMFdeIxlparBUgQQ=" + }, + "org/jetbrains#annotations/23.0.0": { + "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", + "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" + }, + "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { + "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", + "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.7.10": { + "jar": "sha256-GfEC7+lin46rxjhTrRXFM+R8R/kfygkoXFvehuWfkdQ=", + "pom": "sha256-EBHGO4julM3/XVlpNzB1WbxVA3tzPMAM5jzaPPrgqOs=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.7.10": { + "jar": "sha256-53H+dCUKlD6PY0ZxMgH/HYy5XDpdGpGiK2Wp4E9qiQE=", + "pom": "sha256-bMDPWivALe4GDruQw1Nfw929ejurIQrOPhQqr4F2TYE=" + }, + "org/jetbrains/pty4j#pty4j/0.12.3": { + "jar": "sha256-j0VqkehguhKfPlwOlM6/WEmqN8pAEanXSYOaZjL6xrs=", + "module": "sha256-G7L2GjoEPAQaUDGEZOrzptK+J/JkNTeK/F1My2uZlb0=", + "pom": "sha256-GValtB7ec6dC0Tu8vBFZXaZdQJaAleM342qSi4vjbb4=" + }, + "org/jmdns#jmdns/3.5.5": { + "jar": "sha256-iUyFKyYAHjuxrQ9pFec3BqpZBjftXXMbZSoUYYZQRzc=", + "pom": "sha256-bQIQbpkKWGMuq2ujjSce09Gei6OubT8uM113G2FW8hY=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + }, + "org/mortbay/jetty#jetty-parent/7": { + "pom": "sha256-AXPY2/7SuKsqWza2CKnFCeoKP7tPrKZ85wZ2gMiVBmo=" + }, + "org/mortbay/jetty#jetty-util/6.1.14": { + "jar": "sha256-8mY5/R7P2Dpm+dilkyQvpavXW7R2TP2siLQHmpP+Mvk=", + "pom": "sha256-h1IR/PM+77cX+/94uqGmC+XJc/4gbP9HshlcUDN9hYQ=" + }, + "org/mortbay/jetty#jetty/6.1.14": { + "jar": "sha256-IwGVcKiM3lf3z572YuVvZssXnc9+KMvg0WKedk0Iw0M=", + "pom": "sha256-LYNk1QxMmFO2kNaGdQ5MnbRioQt/rfP0TpdOJJCtGRU=" + }, + "org/mortbay/jetty#jsp-2.1/6.1.14": { + "jar": "sha256-2VTa2Kpx8mmfNZAzPoybjY/B6ixZ12A1GTuP8q8F1j8=", + "pom": "sha256-OFFKit71HajPrD79tZosDfYiXBnUszHJy3bYeYXy+5Y=" + }, + "org/mortbay/jetty#jsp-api-2.1/6.1.14": { + "jar": "sha256-2+YHBuGi8+PjeFsofXi1J7b0GqY37M2k48OEF2w1pAU=", + "pom": "sha256-jWdSNsVPkhg4bzacfuxMSLNHS7Kh1vT89VYzLyoyVwk=" + }, + "org/mortbay/jetty#project/6.1.14": { + "pom": "sha256-3LefygsrOTGr0/WwJYLF0jyeu9LnoN2Mk+/j0a0++l4=" + }, + "org/mortbay/jetty#servlet-api-2.5/6.1.14": { + "jar": "sha256-DtM+4wUYZqOmMxl2zfUJijau/RbsH6LYNusGfjfUbUc=", + "pom": "sha256-i3Fd2/c7vaY0TCI8E5hnWSLkF7o5ntPH+NepSVnA/4E=" + }, + "org/osgi#org.osgi.dto/1.0.0": { + "jar": "sha256-y3Xzx+SOWjGjHfIuJoczRvW/ZZ4tyrI2ngMeSFDS/0M=", + "pom": "sha256-XDHfk5LAR5tfgS9/hIDPsvcrbUmu8oVLfZFuBrCxDKw=" + }, + "org/osgi#org.osgi.framework/1.8.0": { + "jar": "sha256-7BlLeHGvJ2gXFv8FJZMZpcPJuXJ+gADp6DJJm5NIS04=", + "pom": "sha256-Z9tZJwa+xs7fS932a6ZJrVEkDN8SnjSQXm78j5AhCTM=" + }, + "org/osgi#org.osgi.resource/1.0.0": { + "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=", + "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA=" + }, + "org/osgi#org.osgi.service.coordinator/1.0.2": { + "jar": "sha256-sA3LUHuCQ/vlTubn+FNEmoRa+OfYQxPH1JdJSf2qsis=", + "pom": "sha256-DR2KkKB+CBsBIewegopVu51NRK7SK9qUKZEqIQFGi2o=" + }, + "org/osgi#org.osgi.service.log/1.3.0": { + "jar": "sha256-/2cQxIVtMmhM8+vcRSSPQQNv9zTysDu8CMRgmmH+z6A=", + "pom": "sha256-IcKVDBCS/bOOwIRYa471pU5dHQSV9UqCR+Auuu1EMos=" + }, + "org/osgi#org.osgi.service.repository/1.1.0": { + "jar": "sha256-xVU+lbRZUpGSQzSG1MTMIv9FourkloSE+fcXMZJkpTI=", + "pom": "sha256-QGb8pxWqwy/jzgvHv4Epe/1xMOu2CQzJZSrfeyqAfxk=" + }, + "org/osgi#org.osgi.service.resolver/1.1.1": { + "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=", + "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI=" + }, + "org/osgi#org.osgi.util.function/1.2.0": { + "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=", + "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg=" + }, + "org/osgi#org.osgi.util.promise/1.2.0": { + "jar": "sha256-/vhuZPWE0BKhagMGFgdk9heWY7kJiKImxGQbkg86SzY=", + "pom": "sha256-m6aVb+n6Frge8Q6O8UED4WwEuKACQVC20DKfkX7y4hY=" + }, + "org/osgi#org.osgi.util.tracker/1.5.4": { + "jar": "sha256-fXjCzJvLZCHCTxeqCXhmzo2RFcIZpPjWzHU7xN+5fvo=", + "pom": "sha256-L3oSGrysdT5csPguP+4NpHlZV5hp4wTYwvtuh2PkMSk=" + }, + "org/osgi#osgi.annotation/8.0.1": { + "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=", + "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM=" + }, + "org/osgi#osgi.core/8.0.0": { + "jar": "sha256-QcJNGH9nqq9HRfq3j9HaZt5/N92CWB27vJuolkW6AWY=", + "pom": "sha256-ZR92uim7Q5LTaupW99CwyC/EkXAk2eaoQ3dLulAV61M=" + }, + "org/ovirt/engine/api#java-sdk-parent/4.4.5": { + "pom": "sha256-0yDbSWA1kRnOQhG3+R1Y+regNqra7Uo+feiehoO/PIw=" + }, + "org/ovirt/engine/api#sdk/4.4.5": { + "jar": "sha256-ch6stVl0/BuFz+GfRtjgRgTUDYNr1lxxoKpHf/RLumI=", + "pom": "sha256-w6qSGYiYuDuLy3mWDXJSX+uMKiOI1lfjBw/iW8yZSCM=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/testng#testng/6.11": { + "jar": "sha256-VdWJesCTOQEO7SBREkMJpxJ5iNgv8GNCKJJtUdo1QPY=", + "pom": "sha256-mLAN2VtnH6U7TZjnzR5+/I2CfNdrEPW0uZjk07XN9JE=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "org/unix4j#unix4j-base/0.6": { + "jar": "sha256-dOiHClT3oLNDIz6ZcSnyg9uvBIud6/H1aOalwH3LbYw=", + "pom": "sha256-4aXxzU2oD7pYfvCwWGO83MnDQ/GtWg+8YlTgs0J+40U=" + }, + "org/unix4j#unix4j-command/0.6": { + "jar": "sha256-UumRX7DzERvMtdoxvqVX/MeV7xH1bs6KrI5QJzELVjk=", + "pom": "sha256-X14lknDlCSul+cwDnBQpL69xh9FCHk9Y8/QXyuVQ/Ko=" + }, + "org/unix4j#unix4j-core/0.6": { + "pom": "sha256-1XgPLlf1TdsnKUGgOcblb3Xo7HG6/CvYeTzDcOgy9HM=" + }, + "org/unix4j#unix4j/0.6": { + "pom": "sha256-WDiqu1K7nH+Tu0GfQHWBJpMXKV9KrHMbtXvZSmKu4Uw=" + }, + "org/violetlib#jnr/11": { + "jar": "sha256-IQjDFWiGB4PxMJdEk1balFUEuSpir84hmFWAlLW5ZZ4=", + "pom": "sha256-TMlmvQeIgGZMQY00YpzUlOXvWTch92oyei8VgiDIaI4=" + }, + "org/violetlib#vappearances/3": { + "jar": "sha256-+OWyHWPDX3DkMaEY9EbQTqZSTZxmd+SgOJ3Iy3L9K7E=", + "pom": "sha256-dex3tlNLtJZvMCSKaCDBnSQOZpGrGcYMO9nlr0FtvSk=" + }, + "org/violetlib#vaqua/10": { + "jar": "sha256-e4ZgbF9Mdls2MoUwvdJ/nHmW0NK3a1ZjKFEAE8x4cxI=", + "pom": "sha256-ANTlWsGt0lnrbokL0oa3cQKjLtuXbou7qglQFLCztns=" + }, + "org/yaml#snakeyaml/1.17": { + "jar": "sha256-Vmazb520bwbdWhnXO7/ztYjVlpwPS4hI/eD17ISUMKU=", + "pom": "sha256-2sbaZNJ6+/QXByGGcQTLB3iRGMR9YjhXLP9F1mmNMbc=" + }, + "oro#oro/2.0.8": { + "jar": "sha256-4AzNrV3360P97kQjLvZGAr9jgHwtEzp76Dugn9Sa8m4=", + "pom": "sha256-mqnf6y6F4dXnkyyHFAaXzswrD63ZM9Z5/UIKLkODGoI=" + }, + "tomcat#jasper-compiler/5.5.12": { + "jar": "sha256-V2Z7FKEPkc7Y9uw4iBcIuJghH9D6ull8MS/R0cjGwKM=", + "pom": "sha256-eZ+lAPzpBrou6E+9mt409mN1p4oUgehMyuSgwdo+pWQ=" + }, + "tomcat#jasper-runtime/5.5.12": { + "jar": "sha256-EoqikuUM2Vbox7vakLfiINBECXdx7V1i671dNyU+vvQ=", + "pom": "sha256-Supxo2hAM7WFhsp6oMh6LOzgtN3LglNF8vOQz1lfYlA=" + }, + "xmlenc#xmlenc/0.52": { + "jar": "sha256-KCrhhfwv8n2ncUr5liiXwJz++vuIByIZxKL5xzYWwCY=", + "pom": "sha256-vSLwW83TfiJr9kJvIv73dI1y42TJ7xQAT3t7b4qC+EQ=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + } + }, + "https://repository.jboss.org/maven2/javax": { + "activation#activation/1.1.1": { + "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", + "pom": "sha256-D8ky5fICygzkukU/sdrMUoxhi76//h4igSYUrbcaU5Q=" + }, + "xml#jaxrpc-api/1.1": { + "jar": "sha256-dF1OFvbzNlIC5VR4D9AFyri/XMDyjjceeAkw24pc9Yc=", + "pom": "sha256-UDMEHgq0M92KL9K+HpQ4k+qBYBN5ynMLdWYbfj5aIto=" + }, + "xml/soap#saaj-api/1.3": { + "jar": "sha256-02J4xJxQ8f5BwmRBSh9XKmV41US4yokFNZfsucqH9j4=", + "pom": "sha256-mVi9bmvcCAJ60U1ztgWICaUTidM0mUiv2d+N7CUu5vk=" + } + } +} From 7754e3541d9a80a65c6b365b259787b0dba23c36 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 14:39:34 +0700 Subject: [PATCH 076/227] freenet: convert to gradle setup hook --- .../networking/p2p/freenet/default.nix | 60 +---- .../networking/p2p/freenet/deps.json | 240 ++++++++++++++++++ 2 files changed, 248 insertions(+), 52 deletions(-) create mode 100644 pkgs/applications/networking/p2p/freenet/deps.json diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 3ca23647251a..abcc69ec1240 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, jdk, jre, gradle, bash, coreutils -, substituteAll, nixosTests, perl, fetchpatch, writeText }: +, substituteAll, nixosTests, fetchpatch, writeText }: let version = "01497"; @@ -45,60 +45,17 @@ in stdenv.mkDerivation rec { inherit bash coreutils jre seednodes; }; - # https://github.com/freenet/fred/blob/next/build-offline.sh - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version patches; - - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon build - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ - | sh - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - # Downloaded jars differ by platform - outputHash = "sha256-CZf5M3lI7Lz9Pl8U/lNoQ6V6Jxbmkxau8L273XFFS2E="; - outputHashAlgo = "sha256"; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}/'; metadataSources {mavenPom(); artifact()} } - } - } - repositories { - clear() - maven { url '${deps}/'; metadataSources {mavenPom(); artifact()} } - } - } - } + # using reproducible archives breaks the build + gradleInitScript = writeText "empty-init-script.gradle" ""; - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${deps}/'; metadataSources {mavenPom(); artifact()} } - } - } - } - ''; + gradleFlags = [ "-Dorg.gradle.java.home=${jdk}" ]; - buildPhase = '' - gradle jar -Dorg.gradle.java.home=${jdk} --offline --no-daemon --info --init-script $gradleInit - ''; + gradleBuildTask = "jar"; installPhase = '' runHook preInstall @@ -108,7 +65,6 @@ in stdenv.mkDerivation rec { install -Dm555 ${wrapper} $out/bin/freenet substituteInPlace $out/bin/freenet \ --subst-var-by outFreenet $out - ln -s ${deps} $out/deps runHook postInstall ''; diff --git a/pkgs/applications/networking/p2p/freenet/deps.json b/pkgs/applications/networking/p2p/freenet/deps.json new file mode 100644 index 000000000000..83ae9f333ae5 --- /dev/null +++ b/pkgs/applications/networking/p2p/freenet/deps.json @@ -0,0 +1,240 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jcenter.bintray.com": { + "io/pebbletemplates#pebble-project/3.1.5": { + "pom": "sha256-TSnFtsOFqJp3c0S4sPjcKe/j+q06e5f4faJfAnOnOJM=" + }, + "io/pebbletemplates#pebble/3.1.5": { + "jar": "sha256-0lOm3eWeE4aYqqruVGRh0vH2yL0qo47N00ffF8+Q1vA=", + "pom": "sha256-kGnsr9XZc4ey9mNXp1X5Ghv4kZC0yHZ6zyCJDlFAuzc=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "net/java/dev/jna#jna-platform/4.5.2": { + "jar": "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY=", + "pom": "sha256-+mLh78vRkHG+SzftEFPa3AymCICzmA9Yq9SX8qnxPQU=" + }, + "net/java/dev/jna#jna/4.5.2": { + "jar": "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8=", + "pom": "sha256-nfQrTM73BF1uT7ZLg3bdCS3XTZc3zGSVx2mO7MvTxE8=" + }, + "org/bouncycastle#bcprov-jdk15on/1.59": { + "jar": "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU=", + "pom": "sha256-QeZGb3GwjQXw0+tdhFXATl42hpxjXhFq4Nt04oAD7OU=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-library/1.3": { + "jar": "sha256-cR1kUi+exBCYO9MQk0KW2hNL5CVKElCAoEFuwXjfrRw=", + "pom": "sha256-HOtL+w8JiuKbk1BEsjY+ETIzE/4+0gVd+LeXN9UFYnc=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/mockito#mockito-core/1.9.5": { + "jar": "sha256-+XSDuglEufoTOqKWOHZN2+rbUew9vAIHTFj6LK7NB/o=", + "pom": "sha256-9DIR3AoX/PzVBDCr1bx0e2/SOu9FaWgrZc8rrw8gcnw=" + }, + "org/objenesis#objenesis/1.0": { + "jar": "sha256-xWlLVdklJ0eTgvJUGZs8ax2HgPZSrWHpylmRmIf0kag=", + "pom": "sha256-JInYiwSZ9V5173Xw8lBUV8cSxc+oR8maRvjes+fqPOs=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/unbescape#unbescape/1.1.6.RELEASE": { + "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=", + "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E=" + } + }, + "https://mvn.freenetproject.org": { + "org/freenetproject#freenet-ext/29": { + "jar": "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158=" + } + }, + "https://repo.maven.apache.org/maven2": { + "com/android/tools#common/22.7.2": { + "jar": "sha256-6ttGKrkD+J2cPRFUxxHwRni3mSHGgmjTQYuba/NEMk4=", + "pom": "sha256-8zhO5T3Z3fYzOUMDUs3/+WY225ZP0mzxaNvVOt8fSQg=" + }, + "com/android/tools#dvlib/22.7.2": { + "jar": "sha256-/a4X4WbglSc1P37HGgt/PZPMBhxkf8p73ZZjJjO7Z+s=", + "pom": "sha256-Q1HWW5dIC0kjSGhulIFI7Hp/AOVXbZjC9DHPIBxDSpw=" + }, + "com/android/tools#sdk-common/22.7.2": { + "jar": "sha256-l/7SZpQEdLQTNBcmSalIWvV6Qqmsmrcm2S27X6SjPpU=", + "pom": "sha256-Ln4pJV6PBhvVs706Vj7/nqu2xqmLSIHwlpzklOkrhD4=" + }, + "com/android/tools#sdklib/22.7.2": { + "jar": "sha256-qFsaBA/dxaWEWjBuaOK4qx/+LFMS4buyoosTvxOE7RU=", + "pom": "sha256-mGlFT4xtSEwnyYC4eIETnMx/7/Q+7g+MGkhtsbXUPSM=" + }, + "com/android/tools/build#builder-model/0.9.2": { + "jar": "sha256-Utfe2Ho/LgcOOyj3IdFPXtik4s6cVFlT2C3cp0XQ/pU=", + "pom": "sha256-8F2KJ7WoFcgydCbzj7DeW6zpgmAAtE4iR+vTxtcnw28=" + }, + "com/android/tools/build#builder-test-api/0.9.2": { + "jar": "sha256-+i52Ho1fu3bUsVJVeE2nx89qaGW03e1IDXpCxvjqbgo=", + "pom": "sha256-c2xEI3eXn7+LDkxMnGSI6Gg7In6VIXekA6LH+4SB2Fg=" + }, + "com/android/tools/build#builder/0.9.2": { + "jar": "sha256-Vbz5bMADnI7bU9GRVeq+1NfgGgkbZv6zrbb/acJ59Bk=", + "pom": "sha256-UaLeg+swvMwBEbTd3mkxvswC5HwpuqNgm9ErCm7kvvg=" + }, + "com/android/tools/build#gradle/0.9.2": { + "jar": "sha256-gX/QEcuyw4yF/39EWHwTsUCoRUrfk3/Do/KKZggULII=", + "pom": "sha256-DCk9CiNuuQYLtf32UJGE98BPy2xFGXbKkS0LysbBt7Y=" + }, + "com/android/tools/build#manifest-merger/22.7.2": { + "jar": "sha256-KUCCoJLJeibyMtC+EhCamQj7pI/dOfdkWTI2nONiD5Q=", + "pom": "sha256-yTWvDWMw7Lk41paAn7mIG5hMz07owjDEUP8nqVNIFv0=" + }, + "com/android/tools/build/gradle/maven-metadata": { + "xml": { + "groupId": "com.android.tools.build", + "lastUpdated": "20170306221012", + "release": "2.3.0" + } + }, + "com/android/tools/ddms#ddmlib/22.7.2": { + "jar": "sha256-NZ5F7s1IkUbifaIimc7nOzYL1Ox/wCfb2zXKys5BOfk=", + "pom": "sha256-YrMjYBcQ4UiBuJ/LDEJ/DfnNbewtmiY+F17jMt8iMXY=" + }, + "com/android/tools/external/lombok#lombok-ast/0.2.2": { + "jar": "sha256-Ww2J1DBMXGFGDkijsPMTf3EitDOBuLtQWr9HzF/bmoE=", + "pom": "sha256-iuaeannJXNEvRP80ak/B1wrnLTlkqnk3cTbGPIv0074=" + }, + "com/android/tools/layoutlib#layoutlib-api/22.7.2": { + "jar": "sha256-X/eOSXu1N9Hi9toYoVGvyQZ7Cj6Q6KQvHJldOxd0kSw=", + "pom": "sha256-dyDIj0DkMDb+tWMd2uEnO8XSwURDnqGK3/p0J3LzHnM=" + }, + "com/android/tools/lint#lint-api/22.7.2": { + "jar": "sha256-1faoCgpY1ycOFmiZGr+akAkteBBqy1qDRGddCv71Tv4=", + "pom": "sha256-gs32TSJflZ0SMJzK4k21b17zmJzn27TrE/oEW01RaQM=" + }, + "com/android/tools/lint#lint-checks/22.7.2": { + "jar": "sha256-Hrp9wZ3RAhpR3BkT5obPwe4yrP3e26H3NZf2X6ghXzM=", + "pom": "sha256-5/n3/kXskHm5S/kCh6xSbyGQ6/vJyU3LJsGhsG2+uM8=" + }, + "com/android/tools/lint#lint/22.7.2": { + "jar": "sha256-vyzGoCzhz2/wdqBBo6GC8G8chqZfU/vR69VK/cxqjrg=", + "pom": "sha256-PPoEnyzLSe5u7n55c5WjqGrpizxkIIINKEb+B6bqKlc=" + }, + "com/google/guava#guava-parent/15.0": { + "pom": "sha256-9RllyaeD1msuchhUmHcfYJsJcQik/g9xfPwzCBWV2js=" + }, + "com/google/guava#guava/15.0": { + "jar": "sha256-ejRXV3DuvGClR2YW42dqbLbyl1x4xBXipgFKxyS6V4M=", + "pom": "sha256-lxBXG7i0qZL0X/gKSOL+Ws7cdD6/iD1M/cuSBgIruFs=" + }, + "com/squareup#javawriter/2.2.1": { + "jar": "sha256-HIIW3l9u2UaerpQhAybEt/5hFmvlAnaOkCd5xqe6vOo=", + "pom": "sha256-XNmnCSuBlmCSc4cBpL28LkoDm/r8E6NcfKCYEc+7MPA=" + }, + "commons-codec#commons-codec/1.4": { + "jar": "sha256-aqQjTHTzoQNXUaJYIlRYZ8jDcnElpkK24ElmXRhjYxs=", + "pom": "sha256-9fMAaUIboBPna+znYEB9zIACJGHclVXcvXX9sG2aQI8=" + }, + "commons-logging#commons-logging/1.1.1": { + "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", + "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" + }, + "kxml2#kxml2/2.3.0": { + "pom": "sha256-CVvyT0be2d4LZsqdZx3PVPj2FbqVFQsaMTw0dcVf1qU=" + }, + "net/sf/kxml#kxml2/2.3.0": { + "jar": "sha256-8mTdn3mh/eEM5ezFMiHv8kvkyTMcgwt9UvLwintjPeI=", + "pom": "sha256-Mc5gb06VGJNimbsNJ8l4+mHhhf0d58mHT+lZpT40poU=" + }, + "net/sf/proguard#proguard-base/4.10": { + "jar": "sha256-pCU0cXeR5+2oMDYTNzWP4siLCRmAEfnu0epVkfNUTyQ=", + "pom": "sha256-iYTsEfuzfC9fj1aDRT2mLVtGYU8VxVBxJUH9isYqnWs=" + }, + "net/sf/proguard#proguard-gradle/4.10": { + "jar": "sha256-ijb/GXYIYcPPWijb4aadk+aEfi5aadg5PQhkQv8R0Ms=", + "pom": "sha256-kZNouji8XuG6t3YYOqf2HKBaDg1syDbiOhByk59mK5E=" + }, + "net/sf/proguard#proguard-parent/4.10": { + "pom": "sha256-31W088lOxk4iyZFZ/VmWktA9VNdaFRMXMqovUDOeLGM=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache/commons#commons-compress/1.0": { + "jar": "sha256-CehOeXeMoboVtzNll6MhRX/CJb1dQfe0aTXSeSL8KnQ=", + "pom": "sha256-O4swzTU6QIV7IEMRzGQVBLATSET8lhOMIkMlniAo/5E=" + }, + "org/apache/commons#commons-parent/11": { + "pom": "sha256-ueAwbzk0YBBbij+lEFJQxSkbHvqpmVSs4OwceDEJoCo=" + }, + "org/apache/commons#commons-parent/5": { + "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" + }, + "org/apache/httpcomponents#httpclient/4.1.1": { + "jar": "sha256-6uUm0Ipmeb9soTjUWgAFsgum7EpAJ4i+gQlwcTyOR1E=", + "pom": "sha256-rboX2TSKl9TOBfKCZ5cP2BlcYaVssG1eDdFfr/YP4qc=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.1": { + "pom": "sha256-UhW2SHmMbI2bnN42QtO/taTMiUt8hBEAQ1Ln3l0RmCc=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.1.1": { + "pom": "sha256-R1KE5emVUm1+dxUTSgdBLOctWYUEY0I4P13kGIoCKlM=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.1": { + "pom": "sha256-T3l//Zw9FW3g2+wf0eY+n9hYSpPHBDV2VT38twb2TeQ=" + }, + "org/apache/httpcomponents#httpcore/4.1": { + "jar": "sha256-POON5R9OJGaMbRhAV6jQhUH56BXS0xnQ9GLwgwkrKc8=", + "pom": "sha256-T8hq+jjpyfqwmcz0XCvHQ9RT5qsiJJCr/oZxl1w8cyc=" + }, + "org/apache/httpcomponents#httpmime/4.1": { + "jar": "sha256-MWKVZhSOikdoiuQ7Qgq8Ps14PtFbM768AIJL8kybFao=", + "pom": "sha256-2zzZW+wQAWBeFlPyhD6FQucS+iu2cv2cjBrOhsV2c9E=" + }, + "org/apache/httpcomponents#project/4.1.1": { + "pom": "sha256-IbtNRN/1TjOjfBGvaYWacUICrgCWmqtUU+unJ2aI+Ow=" + }, + "org/bouncycastle#bcpkix-jdk15on/1.48": { + "jar": "sha256-U0czNrTlqtd5aKGLFsVNFc28Q/Plehh4eZ7faUHQujc=", + "pom": "sha256-v3z/mqxILUKuuKFVHQDrZ81DbsjNThJuyKHgnITdIX0=" + }, + "org/bouncycastle#bcprov-jdk15on/1.48": { + "jar": "sha256-gEt+Ljuax3Hf07Q94WZmrGAI+GAPSPKN3JTjmhFOIog=", + "pom": "sha256-KRIr50qOwbT8VB49opmL62Irw4wEuovx9Vk4aReCeYI=" + }, + "org/eclipse/jdt/core/compiler#ecj/4.2.2": { + "jar": "sha256-THTfiGENZzssdL9bSLYoS65C+biA8K2JqK2mn+hKDXA=", + "pom": "sha256-sh7YTnfE/FhyYqADSzUx+vt+WxGlMWqbjKo/47fqYj0=" + }, + "org/ow2#ow2/1.3": { + "pom": "sha256-USFcZ9LAaNi30vb4D1E3KgmAdd7MxEjUvde5h7qDKPs=" + }, + "org/ow2/asm#asm-analysis/4.0": { + "jar": "sha256-3VOXq69XIxBJrLEBxFHlmKlHpd0YKYMneVNc/cK68U4=", + "pom": "sha256-7U8zeG58CrtuaOYcK047V7WLFOqu/ewxtwkCXja3/Hg=" + }, + "org/ow2/asm#asm-parent/4.0": { + "pom": "sha256-QFr+Cu5AfJEcXkqoCpSdtVOS8XleE8oCrnKdFV30rBg=" + }, + "org/ow2/asm#asm-tree/4.0": { + "jar": "sha256-2LAWoiBbLhQdtCbAQdKubQ1ButBQBioqUXWiWdNkF9o=", + "pom": "sha256-eskVIWBDQDSQMyuS1unIoqd5QIyy1kgdqdOjXtGKLvw=" + }, + "org/ow2/asm#asm/4.0": { + "jar": "sha256-+y3ekCCke7AkxD2d4KlOc6vveTvwjwE1TMl8stLiqVc=", + "pom": "sha256-5jzvroWeRrEtOd1Yh3oZ+JN0pM6xvLE2Fz+nbUfXhtc=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + } + } +} From 5aa611e4d0c22a30f10790fbaa708471b63783fb Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 18:05:01 +0700 Subject: [PATCH 077/227] key: convert to gradle setup hook --- .../science/logic/key/default.nix | 50 +-- pkgs/applications/science/logic/key/deps.json | 387 ++++++++++++++++++ 2 files changed, 397 insertions(+), 40 deletions(-) create mode 100644 pkgs/applications/science/logic/key/deps.json diff --git a/pkgs/applications/science/logic/key/default.nix b/pkgs/applications/science/logic/key/default.nix index 5a48abfc4aa4..0cd5e90cbb50 100644 --- a/pkgs/applications/science/logic/key/default.nix +++ b/pkgs/applications/science/logic/key/default.nix @@ -2,7 +2,6 @@ , fetchurl , jdk , gradle_7 -, perl , jre , makeWrapper , makeDesktopItem @@ -12,6 +11,9 @@ }: let + gradle = gradle_7; + +in stdenv.mkDerivation rec { pname = "key"; version = "2.10.0"; src = fetchurl { @@ -20,30 +22,6 @@ let }; sourceRoot = "key-${version}/key"; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src sourceRoot; - nativeBuildInputs = [ gradle_7 perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - gradle --no-daemon classes testClasses - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; - outputHash = "sha256-GjBUwJxeyJA6vGrPQVtNpcHb4CJlNlY4kHt1PT21xjo="; - }; -in stdenv.mkDerivation rec { - inherit pname version src sourceRoot; - nativeBuildInputs = [ jdk gradle_7 @@ -65,23 +43,15 @@ in stdenv.mkDerivation rec { }) ]; - # disable tests (broken on darwin) - gradleAction = if stdenv.isDarwin then "assemble" else "build"; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - buildPhase = '' - runHook preBuild + __darwinAllowLocalNetworking = true; - export GRADLE_USER_HOME=$(mktemp -d) - # https://github.com/gradle/gradle/issues/4426 - ${lib.optionalString stdenv.isDarwin "export TERM=dumb"} - # point to offline repo - sed -ie "s#repositories {#repositories { maven { url '${deps}' }#g" build.gradle - cat <(echo "pluginManagement { repositories { maven { url '${deps}' } } }") settings.gradle > settings_new.gradle - mv settings_new.gradle settings.gradle - gradle --offline --no-daemon ${gradleAction} - - runHook postBuild - ''; + # tests are broken on darwin + doCheck = !stdenv.isDarwin; installPhase = '' runHook preInstall diff --git a/pkgs/applications/science/logic/key/deps.json b/pkgs/applications/science/logic/key/deps.json new file mode 100644 index 000000000000..4d6dee8060f9 --- /dev/null +++ b/pkgs/applications/science/logic/key/deps.json @@ -0,0 +1,387 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "ca/coglinc#javacc-gradle-plugin/2.4.0": { + "jar": "sha256-RsMHTru+ENUOzWkQpiYxCkE5FlZ5Ct0JF+kBp9afidw=", + "pom": "sha256-NTSsuHwtwH2hAqOP1wn1oANHgSkM+gcjPZTLXMOiyrA=" + }, + "ca/coglinc/javacc#ca.coglinc.javacc.gradle.plugin/2.4.0": { + "pom": "sha256-zmWjvt7VamHG21s6/cHApVuH6mvAewTxamaqn8DP2jw=" + }, + "com/github/hierynomus/license-base#com.github.hierynomus.license-base.gradle.plugin/0.15.0": { + "pom": "sha256-jWmQF6e7GyViPR4EGOKapRwtUYEHkgNaR8PG+hgMSXU=" + }, + "com/github/hierynomus/license-report#com.github.hierynomus.license-report.gradle.plugin/0.15.0": { + "pom": "sha256-OIRMJK0goaid41C254nDEz3FeeD51kZSyQi9uCgwAxM=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/7.1.0": { + "pom": "sha256-mh4hygODDXleq/uKbALOM4QuvCPGd+xqqZ50W1FPKt4=" + }, + "com/google/guava#guava-jdk5/17.0": { + "jar": "sha256-Wb9FZUe23aPO2WjLVvfy0+FEdOLeKWCjLEfjHB5FbGE=", + "pom": "sha256-+MFSYngT1FvE58wXrW7WpkmgIxroGf+44F0ZsgWj22Y=" + }, + "com/google/guava#guava-parent-jdk5/17.0": { + "pom": "sha256-WpYGvCdjKVazwR34h+mz54WFQGiqpOCAjtVmD2Cx+28=" + }, + "com/mycila#license-maven-plugin-parent/3.0": { + "pom": "sha256-DR8XPOud8hKSZ2Z8EMiR5eXXJm2C46hQcGaNtW2wy/o=" + }, + "com/mycila#license-maven-plugin/3.0": { + "jar": "sha256-Ul/o866FI9Be7ac2ZFxB6cMw8CV4K1s95u8Lqs8teMw=", + "pom": "sha256-kmJwjckIctcrvmfLFVITU6feJkgJzh6zLflfvqR2/IM=" + }, + "com/mycila#mycila-pom/3": { + "pom": "sha256-QCd6OyVlPuZDPEaFLacOlzbBmNlLyvbSw0cIqHOjGyY=" + }, + "com/mycila#mycila-xmltool/4.4.ga": { + "jar": "sha256-ddeyvpOBpl9vrDLzEIIhEvgFVm6fipekXY8Tz1UEnOA=", + "pom": "sha256-wMaee7roquvUQOFnjOn1AotD07ToHNQ26Y+BOkvDIrI=" + }, + "com/mycila/xmltool#xmltool/3.3": { + "jar": "sha256-hw+TlnieL0inuPso38BwwvjnSyAHJ0ziPmm2WBEP0pQ=", + "pom": "sha256-64P2FpRcjH37TYDm+QnnKG9SO7EQd4ArzSFr1w6ccXo=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "commons-io#commons-io/2.4": { + "jar": "sha256-zGpB3D6qzJ5ECmvQ0okLINNrTuQI/i1nEi8yi7bgFYE=", + "pom": "sha256-srXdRs+Zj6Ym62+KHBFPYWfI05JpQWTmJTPliY6bMfI=" + }, + "commons-logging#commons-logging/1.1.1": { + "jar": "sha256-zm+RPK0fDbOq1wGG1lxbx//Mmpnj/o4LE3MSgZ98Ni8=", + "pom": "sha256-0PLhbQVOi7l63ZyiZSXrI0b2koCfzSooeH2ozrPDXug=" + }, + "gradle/plugin/com/github/johnrengelman#shadow/7.1.0": { + "jar": "sha256-Bar4oiGwbGeS7hmZYZPolH7zv3Il6nWOUYsywoNxCJA=", + "pom": "sha256-q7tz6sHPSyR/wBbmyohafaFjNk/vyYDICvjTy+jRSQI=" + }, + "gradle/plugin/com/hierynomus/gradle/plugins#license-gradle-plugin/0.15.0": { + "jar": "sha256-gpLVOVy+k7lGe/p64JgC70z9316oNexy6jxKahfw9ZY=", + "pom": "sha256-IAmy13nhNo/tPGzHVwS58EVRv+3tFpk4F0ltrbtDyiw=" + }, + "org/apache#apache/10": { + "pom": "sha256-gC/uznKFLa/L0KQlpgNnxyxcubbqWq5ZSBEoVpGJ2vk=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/4": { + "pom": "sha256-npMjomuo6yOU7+8MltMbcN9XCAhjDcFHyrHnNUHMUZQ=" + }, + "org/apache#apache/9": { + "pom": "sha256-SUbmClR8jtpp87wjxbbw2tz4Rp6kmx0dp940rs/PGN0=" + }, + "org/apache/ant#ant-launcher/1.10.11": { + "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", + "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" + }, + "org/apache/ant#ant-parent/1.10.11": { + "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" + }, + "org/apache/ant#ant/1.10.11": { + "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=", + "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M=" + }, + "org/apache/commons#commons-collections4/4.1": { + "jar": "sha256-sf6LWWi1fYRlQlNX7S2dxpVQRRi+0t9bVlxLjmjByKU=", + "pom": "sha256-wK1C6RA1N5YNmnTaWOzCTdGjehPR5MSPCWm+k+QBg2k=" + }, + "org/apache/commons#commons-lang3/3.4": { + "jar": "sha256-c0yDVkIMyOMMeV1k/R/NXUTqnZA0KizDJixRWPvG2Ys=", + "pom": "sha256-aG51tWGhPBAx1Dp2R6Nk4u0+RWRnBQ6sRSe5SwbXP9E=" + }, + "org/apache/commons#commons-parent/25": { + "pom": "sha256-RnrmUEQuh2hnN5CU51GN/dZ9IsU1Lr05gIyEJZ6XkLo=" + }, + "org/apache/commons#commons-parent/33": { + "pom": "sha256-U9ABE1Li5RBvN52vzNrHdU7G8PeCQ8AwXklp9azd+Ps=" + }, + "org/apache/commons#commons-parent/37": { + "pom": "sha256-7nBaTdaNjc2cyNEknVeQhh6xRc57DG1sBVW6lEidAUs=" + }, + "org/apache/commons#commons-parent/38": { + "pom": "sha256-VY2WF0Xrrcxdw5HP3n1HQIbUyq7iTdPm35Me2fa1tJU=" + }, + "org/apache/commons#commons-parent/5": { + "pom": "sha256-i9YywAvfgKfeNsIrYPEkUsFH2Oyi8A151maZ6+faoCo=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-pool2/2.2": { + "jar": "sha256-h4Czu7Mah5fnTp8wIvBD3a3Crui+Y9lPgIKmoWVGxBs=", + "pom": "sha256-SPll6CQtvwF4bQqS0K1j4gogHUpTbgMh0DsQ0uDJgVM=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging/log4j#log4j-api/2.17.1": { + "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", + "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + }, + "org/apache/logging/log4j#log4j-core/2.17.1": { + "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", + "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" + }, + "org/apache/logging/log4j#log4j/2.17.1": { + "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + }, + "org/apache/maven#maven-parent/21": { + "pom": "sha256-/EWviRHqMH0bV1ZO7x94tpgB6cEaVhnn61jV0Arp244=" + }, + "org/apache/maven#maven-settings-builder/3.0.4": { + "jar": "sha256-o4pU7B5pow3fwUQ04K7Cdk/CaGaKvMDhMthmkqXc4+Q=", + "pom": "sha256-Pgs/YCZ7YHCnQbFdtbQPvYJMYdsSofTxZu1li59i7OA=" + }, + "org/apache/maven#maven-settings/3.0.4": { + "jar": "sha256-Pj3xf1315M4ee38gEcV9YdMo5lZ4VCreIEjw0PopXwk=", + "pom": "sha256-vu3/18fkmtNe+UXDQT8YGfBOQ+opSjGARxTIy7DzcrM=" + }, + "org/apache/maven#maven/3.0.4": { + "pom": "sha256-TSI+AaZWnWZVwfT86Elp1FFCzbq9sRjqCMXIwz7GMvY=" + }, + "org/codehaus/plexus#plexus-component-annotations/1.5.5": { + "jar": "sha256-Tfemp75ks1u8z2C1wRVpf56jQh0iZ0rmcTXd43X8yh8=", + "pom": "sha256-gV8+wxa4xfpwE4X99ACb+1HgfXgOj2puKv5yDFLX4pI=" + }, + "org/codehaus/plexus#plexus-components/1.1.18": { + "pom": "sha256-7128f6kYttu6cdJ+Wz16AN9iS8+iVJpyl/Nv4nX2NNc=" + }, + "org/codehaus/plexus#plexus-containers/1.5.5": { + "pom": "sha256-G8Jkgk7IdrDKb09YOBdcVBxjjLxDMmomi5rufUd4te8=" + }, + "org/codehaus/plexus#plexus-interpolation/1.14": { + "jar": "sha256-f8YzeNPoRmNhm5vtrOn5/niydsK+PGLKIkVEkpTIQXY=", + "pom": "sha256-0IFVxJffN7LD2bWw39sC7AUlsgcLW+Nzn//elC/Kya8=" + }, + "org/codehaus/plexus#plexus-utils/2.0.5": { + "pom": "sha256-Nbx9EhNhYjZXEHKyxW2hj3pXZY3otKQQBkW3BUorJzs=" + }, + "org/codehaus/plexus#plexus-utils/2.0.6": { + "jar": "sha256-i5CfTKl4hkeUL4g9TlWbzGQhI/fGvNOEaYOi5GVGnDM=", + "pom": "sha256-/drU+mLIIxCuxDUl5RnNWfJ9BMdWn+IbGwPKIQiHgQw=" + }, + "org/codehaus/plexus#plexus-utils/3.4.1": { + "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=", + "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI=" + }, + "org/codehaus/plexus#plexus/2.0.6": { + "pom": "sha256-vqEudHcI0l5zQQyhxzHr36EC6L227H2BvUUiWDsjS8w=" + }, + "org/codehaus/plexus#plexus/2.0.7": { + "pom": "sha256-K1kGIDCrChXF0Jd7oiQhcGNokmSIc5pl8leT5xXMinQ=" + }, + "org/codehaus/plexus#plexus/8": { + "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw=" + }, + "org/jdom#jdom2/2.0.6": { + "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=", + "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/9.2": { + "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", + "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" + }, + "org/ow2/asm#asm-commons/9.2": { + "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", + "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" + }, + "org/ow2/asm#asm-tree/9.2": { + "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", + "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" + }, + "org/ow2/asm#asm/9.2": { + "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", + "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" + }, + "org/sonarqube#org.sonarqube.gradle.plugin/3.0": { + "pom": "sha256-1Pg7ynlN6ZPv/gtqt/HO572zNJgWc4BVkHgvv6Mj420=" + }, + "org/sonarsource/parent#parent/54": { + "pom": "sha256-QVl5Y/x9ObDgJArLTYT1dbQCQtbhR9xQsCbUzvwFMV8=" + }, + "org/sonarsource/scanner/api#sonar-scanner-api-parent/2.15.0.2182": { + "pom": "sha256-JcR02YT0wD5P147u53D0Pqks+5Xrixf3+qyFVpNgFoY=" + }, + "org/sonarsource/scanner/api#sonar-scanner-api/2.15.0.2182": { + "jar": "sha256-h+foNKu97912pce/pM7ztxUhsfVQ/Iu+qLCphVPjNeg=", + "pom": "sha256-H+gEKIHd2qgREtNNv0k30OM+TQFYYIJ7/R/fb0YLH9U=" + }, + "org/sonarsource/scanner/gradle#sonarqube-gradle-plugin/3.0": { + "jar": "sha256-KLTNnuKtiAHAxeXJhPNtLizGDRkhwC61jujORTpejb8=", + "pom": "sha256-2jJNuKvT65d8B0lY/9E4vdVTWwYojfN7WiRv53Uad7Y=" + }, + "org/sonatype/forge#forge-parent/4": { + "pom": "sha256-GDjRMkeQBbS3RZt5jp2ZFVFQkMKICC/c2G2wsQmDokw=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/plexus#plexus-cipher/1.4": { + "jar": "sha256-WhX9uiJmng/dBuENzOYyCHnh9zmPvJEM0Gd7UGcqeMQ=", + "pom": "sha256-pjouI5iMyn+sbJOIbW8FBv0m2I1+jMDLibnG4NbJlK0=" + }, + "org/sonatype/plexus#plexus-sec-dispatcher/1.3": { + "jar": "sha256-OwVZu4Qy8ok37+bKGT71SoUG0Addc/10BrmxFsahEGM=", + "pom": "sha256-1eZQxQ72lYwCjtAktZrwTPPTjhRTp31UK2tIS8D0ygs=" + }, + "org/sonatype/spice#spice-parent/12": { + "pom": "sha256-IaGbJtvlw43bURTPTq2/XMtBG8axKP3VlJscyxLzaD4=" + }, + "org/springframework#spring-asm/3.1.3.RELEASE": { + "jar": "sha256-za8dBwQOdREzok+Zesp9mOrL/mfhsoddzoynOCUngTA=", + "pom": "sha256-f7b7uYdEDEjGc9sVsIdwqcLWySBSBEIZl5z0j0ZvcSM=" + }, + "org/springframework#spring-core/3.1.3.RELEASE": { + "jar": "sha256-AUp7IdtoD9iGfgJrGMO/idME3sWyEJCotqezy1z8d9I=", + "pom": "sha256-8xqLb1m2oBgOOMnBKboGB7rnoNShC5U3V3DIFKtMx1M=" + }, + "org/springframework#spring-parent/3.1.3.RELEASE": { + "pom": "sha256-ZOkRARj4KhQnWaMW0J09jY1xfV2VB51/aziO5Hn6eC8=" + }, + "org/vafer#jdependency/2.7.0": { + "jar": "sha256-1j79V0b/QIlDp91++Frp8Jqn+2O7KxaRFCfObEW1n9A=", + "pom": "sha256-6yRCKwo+nofVrG6oCHeG+1HEsbvg0iXvdSFSxzaiBNA=" + } + }, + "https://repo.maven.apache.org/maven2": { + "antlr#antlr/2.7.7": { + "jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=", + "pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc=" + }, + "com/atlassian/commonmark#commonmark-ext-gfm-tables/0.15.2": { + "jar": "sha256-Wn3BAWFAwPHGnFV21kvjcYJcWlStc1sMaZuWLMTgpPo=", + "pom": "sha256-rRZxS5MgMZDpRiSFMrWCkDdBQkg7RhdrsD3CrijycN0=" + }, + "com/atlassian/commonmark#commonmark-parent/0.15.2": { + "pom": "sha256-PhTratCeeq+Uow5I3kexFm+QCz6Ncm+UfMWkD3HkfCU=" + }, + "com/atlassian/commonmark#commonmark/0.15.2": { + "jar": "sha256-/UmFBUzWYXaB9smSH/yTq2uGQraeV3T48InZc9HGbmo=", + "pom": "sha256-3ZVTaHcyCDS90YRnvtbgKE7UhXKdU8LcLfWEE2vmGaI=" + }, + "com/atlassian/pom#base-pom/5.0.13": { + "pom": "sha256-CN0hBF/fYQSL7zj/7FbiHuslxuLYRPwJ9rlW4JNzdUM=" + }, + "com/atlassian/pom#central-pom/5.0.13": { + "pom": "sha256-zihFbTZlB8oPkQIpQqBeOI/Zj4YqbY2zEFxcRJenTOU=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/ibm/icu#icu4j/58.2": { + "jar": "sha256-lT4eg7K+fD6i+I2obBNhT0fp5x01eMhSHX8Yd1a2OWI=", + "pom": "sha256-R7Zq1yxypJmlRL57ixEzX2xz/bcyFxfRGBHfs+k0FGo=" + }, + "com/miglayout#miglayout-core/5.2": { + "jar": "sha256-Zp8NqP12vlPXX1lA9IFibym1RM2ZJbfaJhEYfSaEvHo=", + "pom": "sha256-scvva6qqt3IaCLKlAZtpajfV4+wKfQzXmRo4MOJrfGA=" + }, + "com/miglayout#miglayout-parent/5.2": { + "pom": "sha256-+STS0Cl2vIQu0u/4sx4Hp2Zb/NJUY9TXmtvkEFis6Zs=" + }, + "com/miglayout#miglayout-swing/5.2": { + "jar": "sha256-g2n2guoVPvtoGj9YKsxIjoKpfub0fSU1LwgOl38TjIY=", + "pom": "sha256-52Q1kq9JpxIUc+OUOzdO3Xw/u5zJBdDGq5DOcCvkQqE=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "javax/activation#javax.activation-api/1.2.0": { + "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=", + "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk=" + }, + "javax/xml/bind#jaxb-api-parent/2.4.0-b180830.0359": { + "pom": "sha256-ctEy4shY0iMPFdBI8ek6J5xAxOnshLxW+fLz61r0tLg=" + }, + "javax/xml/bind#jaxb-api/2.4.0-b180830.0359": { + "jar": "sha256-VrnpcCdTdjAHQ1Fi6niAVe/P78hquSDwMsBBHcVHuDY=", + "pom": "sha256-sck/wwHX9f5M3hPRlTKZJR2jfv/8kfUjg1UEw/+HNwc=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/java/dev/javacc#javacc/4.0": { + "jar": "sha256-z7qy1qzbN2TivLXAhCpZ9YPLXoui61wTqNuYNoqtzC8=", + "pom": "sha256-EBLeGTH+yhXhvQEomKaJBOXTO7TD6IhY+oagD7ePUDg=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.0.8": { + "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", + "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr/3.5.2": { + "jar": "sha256-WsNsKs+woPPTfa/iC1tXDyZD4tAAxkjURQPCc4vmQ98=", + "pom": "sha256-Bl5egGYv64WHldPAH3cUJHvdMZRZcF7hOxpLGWj6IuQ=" + }, + "org/antlr#antlr4-master/4.7.1": { + "pom": "sha256-QSb2e/QT9si8wbGdh7mnJWdCz6ccJQxKmVMNrt6ghow=" + }, + "org/antlr#antlr4-runtime/4.7.1": { + "jar": "sha256-Q1FtGb6uNZCeBNBq9sDFjBe8lOAHDIXo3JkpymQNyR0=", + "pom": "sha256-zhOGobkOUSy3oli1Ih1C8RJh/9qaElkBzdhs3ypZ/5E=" + }, + "org/antlr#antlr4/4.7.1": { + "jar": "sha256-os3C8vjriTcogyVo3FTQgOtaFJXts7ZuUblxIqYKDYc=", + "pom": "sha256-k+AkX5wHQx6tBunpyPmO7IJUQb9PbtZr3aboypxoR5Y=" + }, + "org/glassfish#javax.json/1.0.4": { + "jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=", + "pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ=" + }, + "org/glassfish#json/1.0.4": { + "pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} From 3304e8a0e6b139cfda144ac660d0a73f6612d0a4 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 18:05:49 +0700 Subject: [PATCH 078/227] apksigner: convert to gradle setup hook --- pkgs/development/tools/apksigner/default.nix | 40 +------ pkgs/development/tools/apksigner/deps.json | 119 +++++++++++++++++++ 2 files changed, 124 insertions(+), 35 deletions(-) create mode 100644 pkgs/development/tools/apksigner/deps.json diff --git a/pkgs/development/tools/apksigner/default.nix b/pkgs/development/tools/apksigner/default.nix index 1df733c183b4..0a918df061a7 100644 --- a/pkgs/development/tools/apksigner/default.nix +++ b/pkgs/development/tools/apksigner/default.nix @@ -3,7 +3,6 @@ , fetchgit , jdk_headless , gradle -, perl , makeWrapper }: @@ -39,41 +38,14 @@ stdenv.mkDerivation rec { sed -i -e '/conscrypt/s/testImplementation/implementation/' build.gradle ''; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version postPatch; - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon build - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/okio-jvm/okio/r)}" #e' \ - | sh - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - # Downloaded jars differ by platform - outputHash = "sha256-cs95YI0SpvzCo5x5trMXlVUGepNKIH9oZ95AfLErKIU="; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; }; - preBuild = '' - # Use the local packages from -deps - sed -i -e '/repositories {/a maven { url uri("${deps}") }' build.gradle - ''; + __darwinAllowLocalNetworking = true; - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon build - - runHook postBuild - ''; + doCheck = true; nativeBuildInputs = [ gradle makeWrapper ]; @@ -83,8 +55,6 @@ stdenv.mkDerivation rec { --add-flags "-jar $out/lib/apksigner.jar" ''; - __darwinAllowLocalNetworking = true; - meta = with lib; { description = "Command line tool to sign and verify Android APKs"; mainProgram = "apksigner"; diff --git a/pkgs/development/tools/apksigner/deps.json b/pkgs/development/tools/apksigner/deps.json new file mode 100644 index 000000000000..a0f5ccb9c489 --- /dev/null +++ b/pkgs/development/tools/apksigner/deps.json @@ -0,0 +1,119 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jcenter.bintray.com": { + "com/google#google/1": { + "pom": "sha256-zW2xehGjHt55TMvR3w5Nl1D2QCNHMfIc/4hamZcnfoE=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotations/2.2.0": { + "jar": "sha256-br0iyhudjsBtQd6NZOBZaYHZYHtCA1+e03T53icaSBo=", + "pom": "sha256-XgJY6huk5RoTN0JoC8IkSPerIUvkBz6GGfZF7xvkLdU=" + }, + "com/google/errorprone#error_prone_parent/2.2.0": { + "pom": "sha256-xGCQLd9ezmiDLGsnHOUqCSiwXPOmrIGo9UjHPL1UETg=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.6.2": { + "jar": "sha256-hFw+/OY70j2WLyELE77rqwXE1YOJihsaf/uMez7X1dQ=", + "pom": "sha256-W/T2le0Rd+gFJFJbbloECl1+pLFhlrERCILGLmmlVeg=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/27.0.1-jre": { + "pom": "sha256-MX6IKRJi4M8oBelWwYhQ8dRWXIXC4REvXZ0Iqxcy5pY=" + }, + "com/google/guava#guava/27.0.1-jre": { + "jar": "sha256-4cgU/QRJKifDjgMX6r6qGz6VDsgBAjnkAP6QrWyRB7Q=", + "pom": "sha256-ao3QQfI6a7FKhuRA/MuZNTe2InE1eg2sCjyw/zkVjzY=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/1.1": { + "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", + "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" + }, + "com/google/protobuf#protobuf-bom/3.8.0": { + "pom": "sha256-WjrGCFOIDEORPNXLY7Np626WRuHtDEgGnsmpMTd700c=" + }, + "com/google/protobuf#protobuf-gradle-plugin/0.8.11": { + "jar": "sha256-gFr+/pf6AYFXpWvxQtvuStIo0RSyq3s97le5fD4teHk=", + "pom": "sha256-RBeVBVv4AjSXKcjFWdrVcmi4C4tk6KPePK2lQmo45aA=" + }, + "com/google/protobuf#protobuf-javalite/3.8.0": { + "jar": "sha256-HSWDsgkvIdvCnJCabwV+u4bYTkxU/LHXvAAmO4AaM/g=", + "pom": "sha256-4EnZCbCH/zokFi4H0KgIFE7BnnwK6Z1Ee0dZZ83361s=" + }, + "com/google/protobuf#protobuf-parent/3.8.0": { + "pom": "sha256-cGPoFu/yyZcFW9KmbuLJtObNEvhcj8lW5UhweQmAHEU=" + }, + "com/google/protobuf#protoc/3.8.0": { + "pom": "sha256-0bqQU0Wx2o1GXQ0DCkzgiuVX0nz8krZiMvEN3ks4V9I=" + }, + "com/google/protobuf/protoc/3.8.0/protoc-3.8.0-linux-x86_64": { + "exe": "sha256-eeGGIvawJqOETt7d5Fzw4M98+8emLCho2dgtvtYSZeQ=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "junit#junit/4.13": { + "jar": "sha256-S4Uy9jvcDgZhUH+UfrMkqVTR26xjGtGciqmgD+7R2GM=", + "pom": "sha256-mg3Ew/orCG5wgiZzfvS7N4R8PLHOTiA1F8CfYwWyJn4=" + }, + "kr/motd/maven#os-maven-plugin/1.6.2": { + "jar": "sha256-OgxJXeHOvIP2e+qhd2p5NvAvEfKt3Th5WWp4sqhryqM=", + "pom": "sha256-bXDR8vJydzDXedMqH9L7seoI51pnpQotjn0P2zoqSvM=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/commons#commons-parent/17": { + "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" + }, + "org/bouncycastle#bcprov-jdk15on/1.68": { + "jar": "sha256-9zKkbI3n4iMvIAfGgqIdH0zIqKAUm2t71qoa/cZaD40=", + "pom": "sha256-2QfezWhfnNlx5xvfbOWXzzqVt8j/ajSCNRv9irwXz+A=" + }, + "org/checkerframework#checker-qual/2.5.2": { + "jar": "sha256-ZLAmkci51OdwD47i50Lc5+osboHmYrdSLJ7jv1aMBAo=", + "pom": "sha256-3EzUOKNkYtATwjOMjiBtECoyKgDzNynolV7iGYWcnt4=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.17": { + "jar": "sha256-kmVPST7P7FIILnY1Tw6/h2SNw9XOwuPDzblHwBZ0elM=", + "pom": "sha256-6VarXS60j6uuEjANDNLTKU1KKkGrwgaMI8tNYK12y+U=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.17": { + "pom": "sha256-GKA98W4qGExYLbexJWM8Fft3FAJ6hMG1MtcpM9wIuB8=" + }, + "org/codehaus/mojo#mojo-parent/40": { + "pom": "sha256-/GSNzcQE+L9m4Fg5FOz5gBdmGCASJ76hFProUEPLdV4=" + }, + "org/conscrypt#conscrypt-openjdk-uber/2.5.1": { + "jar": "sha256-AfnHQstZKhUeLmK9U5eomAYoqWcAH82s1KpHRGeGhfM=", + "pom": "sha256-XivA41GARnUwxVpnqvq+XvmOBg7raY6a9tCw3N26lc0=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} From 346bfec1c87687d49a2d908574cc2f5bc01a0269 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 18:06:19 +0700 Subject: [PATCH 079/227] fastddsgen: convert to gradle setup hook --- pkgs/development/tools/fastddsgen/default.nix | 73 +++++---------- pkgs/development/tools/fastddsgen/deps.json | 93 +++++++++++++++++++ 2 files changed, 114 insertions(+), 52 deletions(-) create mode 100644 pkgs/development/tools/fastddsgen/deps.json diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix index ec4523e270c2..1a38ca3050ce 100644 --- a/pkgs/development/tools/fastddsgen/default.nix +++ b/pkgs/development/tools/fastddsgen/default.nix @@ -1,8 +1,14 @@ -{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle_7, openjdk17, git, perl, cmake }: +{ lib, stdenv, runtimeShell, fetchFromGitHub, gradle_7, openjdk17 }: let pname = "fastddsgen"; version = "3.3.0"; + gradle = gradle_7; + +in +stdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-DDS-Gen"; @@ -11,65 +17,21 @@ let hash = "sha256-oqbSIzsYUwD8bTqGKZ9he9d18EDq9mHZFoNUp0RK0qU="; }; - gradle = gradle_7; - - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version; - nativeBuildInputs = [ gradle openjdk17 perl ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d); - gradle --no-daemon -x submodulesUpdate assemble - ''; - - # perl code mavenizes paths (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - dontStrip = true; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-YkVRp6TXI7/5O+u0DDYiCq7DITfGJ4lT/L4hT90JOL8="; - }; -in -stdenv.mkDerivation { - inherit pname src version; - nativeBuildInputs = [ gradle openjdk17 ]; - # use our offline deps - postPatch = '' - sed -ie '1i\ - pluginManagement {\ - repositories {\ - maven { url "${deps}" }\ - }\ - }' thirdparty/idl-parser/settings.gradle - sed -ie "s#mavenCentral()#maven { url '${deps}' }#g" build.gradle - sed -ie "s#mavenCentral()#maven { url '${deps}' }#g" thirdparty/idl-parser/build.gradle - ''; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - buildPhase = '' - runHook preBuild + __darwinAllowLocalNetworking = true; - export GRADLE_USER_HOME=$(mktemp -d) - - # Run gradle with daemon to make installPhase faster - gradle --offline -x submodulesUpdate assemble - - runHook postBuild - ''; + gradleFlags = [ "-x" "submodulesUpdate" ]; installPhase = '' runHook preInstall - gradle --offline -x submodulesUpdate install --install_path=$out + gradle install --install_path=$out # Override the default start script to use absolute java path cat <$out/bin/fastddsgen @@ -81,6 +43,13 @@ stdenv.mkDerivation { runHook postInstall ''; + postGradleUpdate = '' + cd thirdparty/idl-parser + # fix "Task 'submodulesUpdate' not found" + gradleFlags= + gradle nixDownloadDeps + ''; + meta = with lib; { description = "Fast-DDS IDL code generator tool"; mainProgram = "fastddsgen"; diff --git a/pkgs/development/tools/fastddsgen/deps.json b/pkgs/development/tools/fastddsgen/deps.json new file mode 100644 index 000000000000..c749fd049ad9 --- /dev/null +++ b/pkgs/development/tools/fastddsgen/deps.json @@ -0,0 +1,93 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/ibm/icu#icu4j/72.1": { + "jar": "sha256-PfVyskCmjRO1zXeK0jk+iF0mQRQ0zY8JisWYfqLmTOM=", + "pom": "sha256-Pe8rKa9KGa2AXLFTBWklqJqQP5L77hre4S7S/BTETug=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.3.4": { + "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", + "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" + }, + "org/antlr#antlr-master/3.5.3": { + "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" + }, + "org/antlr#antlr-runtime/3.5.3": { + "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", + "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" + }, + "org/antlr#antlr4-master/4.13.0": { + "pom": "sha256-IiBv17pJUVLlJvUO/sn8j03QX8tD38+PJk6Dffa2Qk8=" + }, + "org/antlr#antlr4-runtime/4.13.0": { + "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=", + "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8=" + }, + "org/antlr#antlr4/4.13.0": { + "jar": "sha256-HA3rJpklFJIvuLmWGRmPCcMveYQkbcatHDu8SYPeHTU=", + "pom": "sha256-OdLSWEk8QnvL1EAGP34PQqt4j6wVp4wP73RK5hk2d8k=" + }, + "org/apiguardian#apiguardian-api/1.1.0": { + "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=", + "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE=" + }, + "org/junit/jupiter#junit-jupiter-api/5.5.2": { + "jar": "sha256-JJov29OTGYfAKY0AygjtJISW4PwR4EY8CMT4LgzHmxw=", + "pom": "sha256-dqFdgNhYehpaOlsULSzrNzBPvZEZi6QlSG5X920IiGA=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.5.2": { + "jar": "sha256-bXd9qYduLvegM26PCY+NdKWmT4EKo6Si9fO3Zs6Xg3s=", + "pom": "sha256-Ay/vTiVjCE05fq5IGjiAEPRDQBr2JSv9N312MH9vi/4=" + }, + "org/junit/platform#junit-platform-commons/1.5.2": { + "jar": "sha256-/ESv38DyDIXnGmbnlDKBrvO8Hg/WLS1po2y2kB5oLBA=", + "pom": "sha256-O9DU3tYyqK+MpYf7Z2QBnedxsda8uJrNViQ1oQCfqto=" + }, + "org/junit/platform#junit-platform-engine/1.5.2": { + "jar": "sha256-/yC6StjADvF7rvnFVRL5wC2aaHQPfxrAGppqoCOZMfg=", + "pom": "sha256-LUuVVVwh4IXrwd299C156x1VZA3Bk7G35hACQP0vGJ8=" + }, + "org/openjdk/nashorn#nashorn-core/15.4": { + "jar": "sha256-b4FuhN/WOoHU6qeCnAgze7r/PsaD/zv2u9kNAXoA3G8=", + "pom": "sha256-aan3ueR+zPR7vO5yGtT7A5yn2bZQF05thgKq23flrCM=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/7.3.1": { + "jar": "sha256-Rrio79S5T6y1q0s1r+MO4FRq56Q9LGTm3vVsLxaP76U=", + "pom": "sha256-be7rsjbIAyhFrcO3XuWrEiPr1T5M8+hTQsMTvaBtVH8=" + }, + "org/ow2/asm#asm-commons/7.3.1": { + "jar": "sha256-h82Ls8a/a8uzP8pIBgxQZfZuv2o9fem/GL/1G88Vbrw=", + "pom": "sha256-2jEe/3FqEUJ8JCS1iFvR+0lC2QNml2zW1aVae6DfWkA=" + }, + "org/ow2/asm#asm-tree/7.3.1": { + "jar": "sha256-+RpKiqhoxcRmW7T9E0AZqR+fi5IWUn+6KV48i1Qit4s=", + "pom": "sha256-yrFmzVNdMJgzasVcG2du7WYxZbWG+gPXmWBSO+0f8Ew=" + }, + "org/ow2/asm#asm-util/7.3.1": { + "jar": "sha256-GCEoWSdC7UiDrIK/IF8Te2v74SNMaOb+sTdZ51qFtyk=", + "pom": "sha256-DzYMMOEoeTfh1C/txvrWmCT9Vl5P//7RQS7I2HMD+8o=" + }, + "org/ow2/asm#asm/7.3.1": { + "jar": "sha256-L2fhHO7IGevYjd7lMAq6aZscurLiDCLpfPAn076TlZs=", + "pom": "sha256-6s3NUA1lJ+ljiI2u2jGSPkvCQaJUJNzDisyi5gHn/eI=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + } +} From dcf6957b32220fd783a31d36424b3366dd84bbff Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 18:06:50 +0700 Subject: [PATCH 080/227] jd-gui: convert to gradle setup hook --- pkgs/tools/security/jd-gui/default.nix | 83 +++------- pkgs/tools/security/jd-gui/deps.json | 210 +++++++++++++++++++++++++ 2 files changed, 232 insertions(+), 61 deletions(-) create mode 100644 pkgs/tools/security/jd-gui/deps.json diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index 7cc714d96773..a9ef78f3f5e4 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -7,8 +7,6 @@ , gradle_6 , makeDesktopItem , copyDesktopItems -, perl -, writeText , runtimeShell }: @@ -16,6 +14,8 @@ let pname = "jd-gui"; version = "1.6.6"; + name = "${pname}-${version}"; + src = fetchFromGitHub { owner = "java-decompiler"; repo = pname; @@ -23,58 +23,7 @@ let hash = "sha256-QHiZPYFwDQzbXVSuhwzQqBRXlkG9QVU+Jl6SKvBoCwQ="; }; - patches = [ - # https://github.com/java-decompiler/jd-gui/pull/362 - (fetchpatch { - name = "nebula-plugin-gradle-6-compatibility.patch"; - url = "https://github.com/java-decompiler/jd-gui/commit/91f805f9dc8ce0097460e63c8095ccea870687e6.patch"; - hash = "sha256-9eaM9Mx2FaKIhGSOHjATKN/CrtvJeXyrH8Mdx8LNtpE="; - }) - ]; - - deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src patches; - - nativeBuildInputs = [ jdk perl gradle_6 ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d); - gradle --no-daemon jar - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-gqUyZE+MoZRYCcJx95Qc4dZIC3DZvxee6UQhpfveDI4="; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } - repositories { - clear() - maven { url '${deps}' } - } - } - } - ''; + gradle = gradle_6; desktopItem = makeDesktopItem { name = "jd-gui"; @@ -89,15 +38,27 @@ let }; in stdenv.mkDerivation rec { - inherit pname version src patches; - name = "${pname}-${version}"; + inherit pname version src; - nativeBuildInputs = [ jdk gradle_6 copyDesktopItems ]; + patches = [ + # https://github.com/java-decompiler/jd-gui/pull/362 + (fetchpatch { + name = "nebula-plugin-gradle-6-compatibility.patch"; + url = "https://github.com/java-decompiler/jd-gui/commit/91f805f9dc8ce0097460e63c8095ccea870687e6.patch"; + hash = "sha256-9eaM9Mx2FaKIhGSOHjATKN/CrtvJeXyrH8Mdx8LNtpE="; + }) + ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon --info --init-script ${gradleInit} jar - ''; + nativeBuildInputs = [ jdk gradle copyDesktopItems ]; + + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + gradleBuildTask = "jar"; installPhase = let jar = "$out/share/jd-gui/${name}.jar"; diff --git a/pkgs/tools/security/jd-gui/deps.json b/pkgs/tools/security/jd-gui/deps.json new file mode 100644 index 000000000000..aea4ea642552 --- /dev/null +++ b/pkgs/tools/security/jd-gui/deps.json @@ -0,0 +1,210 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://jcenter.bintray.com": { + "com/bmuschko#gradle-docker-plugin/3.2.1": { + "jar": "sha256-BfgdS5EdMR7nrEhJ6/eLMD4HdDQY1OiaVZVCK/OAIxQ=", + "pom": "sha256-slOHkvEGJnUa9sjeAgdH/1E4kntOKfL69KjtOsFKzSE=" + }, + "com/fifesoft#rsyntaxtextarea/3.0.4": { + "jar": "sha256-76a7i/iJ6WnAwIGQ5AsolZbqDO3sA/7yNwGAdcsBSQU=", + "pom": "sha256-Dat8ku0cJsdYs0EjYsDXjQy4v2RB2i5q4FqGPAO3W64=" + }, + "com/netflix/nebula#gradle-ospackage-plugin/8.5.6": { + "jar": "sha256-sQK7oYx9F4OlcSgZj6/vNYr+/nIVufi783YpFCjvkGk=", + "module": "sha256-CQGrawL62gDjdBsDaCwdRtgDDQQ0aexWDIrl8jrwsYw=", + "pom": "sha256-zr2oKXDuN6bO9Ppzs81hOR+zFWseT5si55TrZ1yUdfs=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.10": { + "pom": "sha256-RncMfpQQkzv62s69yR5ekLAjxhoako27hXa2kh2DBsw=" + }, + "com/thoughtworks/xstream#xstream/1.4.10": { + "jar": "sha256-oVh/NfphdRNgfIbsnm5N5euKzfmjptf3RY+KjECwCFg=", + "pom": "sha256-pKn/aI9xPaPqwEQS5QoMml4XPmkh/kRt2wfUkB2aNBc=" + }, + "com/yuvimasory#orange-extensions/1.3.0": { + "jar": "sha256-M1gGPRjFV56evw/eRWQOqy1FJ9HummKDyTZ5zqRG3YY=", + "pom": "sha256-MBQbN96epg6iqwnPBCVAc4hHqKG8A1o7a9A2OsMvV7I=" + }, + "commons-beanutils#commons-beanutils/1.7.0": { + "jar": "sha256-JLyqIMy9x8hWzgwK6hRFZpQ0A+Lp8nvZd5zaHXaCPvQ=", + "pom": "sha256-tqymRloosCdobwJdV3AvkK0NEo4U0c/OygvYcfAIStk=" + }, + "commons-io#commons-io/2.6": { + "jar": "sha256-+HfTBGYKwqFC84ZbrfyXHex+1zx0fH+NXS9ROcpzZRM=", + "pom": "sha256-DCOGOJOiKR9aev29jRWSOzlIr9h+Vj+jQc3Pbq4zimA=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "edu/sc/seis/gradle#launch4j/2.4.4": { + "jar": "sha256-Q3jZCBGaI9GKG9t0HAnL+KRhoNfFNSFo3PQHZmFC3FY=", + "pom": "sha256-Cfk0ecS6AgtilLVZvLVOHdRNsB+iLGDZLa0o0zHJFqs=" + }, + "junit#junit/4.12": { + "jar": "sha256-WXIfCAXiI9hLkGd4h9n/Vn3FNNfFAsqQPAwrF/BcEWo=", + "pom": "sha256-kPFj944/+28cetl96efrpO6iWAcUG4XW0SvmfKJUScQ=" + }, + "net/sf/launch4j#launch4j/3.12": { + "pom": "sha256-rVGWVL75ed10qYwXKlR93sPNhWSAORnj296G05Srvpc=" + }, + "net/sf/launch4j#launch4j/3.12/core": { + "jar": "sha256-XUbxMJCI4cijjw9KV84ITUZBakNdG5OZW8OFKooysIU=" + }, + "net/sf/launch4j#launch4j/3.12/workdir-linux64": { + "jar": "sha256-XlgZsoDyUT9EfHBsXejU3OceVlxFMUv0+pv+0MXs57k=" + }, + "net/sf/proguard#proguard-base/6.1.0": { + "jar": "sha256-gdCEOhP5zuZehDy8c/Km8U/MeyfHxgEDyLxx3umFp24=", + "pom": "sha256-H39OO6GpBYFGL9Jn6eEWfiAcCk9h5pq1DUV/SMBQFXY=" + }, + "net/sf/proguard#proguard-gradle/6.1.0": { + "jar": "sha256-rQfrlm3lIewsMYLaYg0xpaNTTwXMjmDDlNG41EGCmvQ=", + "pom": "sha256-tEDYJgbG4nVImE2JcLeF8LWCJhvDhhecWS2VMKO6TzQ=" + }, + "net/sf/proguard#proguard-parent/6.1.0": { + "pom": "sha256-v7pHjLrr8KfIx139/iBxnls33nzAgA+iYjoFgOaJEXE=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.1": { + "jar": "sha256-grnjYxrMcIwRUhb6ePl3gNioHbt/FfjYIpGh3DqDsdA=", + "pom": "sha256-fIy/ymTpcEQNTyh/NRapbABpKgOU/KHVexKpepbw6hE=" + }, + "org/antlr#ST4/4.0.8": { + "jar": "sha256-WMqrxAyfdLC1mT/YaOD2SlDAdZCU5qJRqq+tmO38ejs=", + "pom": "sha256-PAiQ3scRdOs7o9QEyp40GQH/awQhgIsAcTsNuxMGwXw=" + }, + "org/antlr#antlr-master/3.5.2": { + "pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y=" + }, + "org/antlr#antlr-runtime/3.5.2": { + "jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=", + "pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU=" + }, + "org/antlr#antlr4-runtime/4.5": { + "jar": "sha256-tcQNVavm6kxWFPjxHoNy2YQ07TwRKNWLjuoduVWXN6s=", + "pom": "sha256-hRz5esL2utOZacMOx95PhBu2R1J/Rl7CDMur+yKHIpg=" + }, + "org/antlr#antlr4/4.5": { + "jar": "sha256-do7i3es2pP5kNMgFoTyVI41LZBPlL3ce0meKGEGOMNk=", + "pom": "sha256-4Mhs6hXMEO/K6UuvsOEADmv8xBgUK11ybNe8OyL+dwI=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache/ant#ant-launcher/1.10.6": { + "jar": "sha256-wDqhjaSwHJ791kGYNkvC/PL7nqWElxYVup8aCaRoUCY=", + "pom": "sha256-CGuKg9hhebR7pgMeuGiOlGiKAz/qmW8ttwltSLIn6KY=" + }, + "org/apache/ant#ant-parent/1.10.6": { + "pom": "sha256-n+ReOBBPxGOdqFs4WdeUqT7oMkIrx57D5zfA/QvWmiA=" + }, + "org/apache/ant#ant-parent/1.9.1": { + "pom": "sha256-kQ71Ysi7ahrZAOGY9U2pG4bQ0o3wG8Eah9tlbZBv1us=" + }, + "org/apache/ant#ant/1.10.6": { + "jar": "sha256-bFy9iMELt61iTlY3oDdbAQ9AZ/ZJfNj85wtaXxDTtBo=", + "pom": "sha256-AEhxs7RrtMSGoyTlA3CgnKBY72zLhOp6Ceyks/Djx1c=" + }, + "org/apache/ant#ant/1.9.1": { + "pom": "sha256-wtNC6vx3d7G97/vmCp5NeRIOvV34/PwOY7TesMcOPFQ=" + }, + "org/apache/commons#commons-compress/1.18": { + "jar": "sha256-Xy3x5GeCXkysWZbUSJDEIBwAC0PAsjz/wHgtKKC+ubA=", + "pom": "sha256-Zyxf6SvT6rQ+jVMzjK1coHO2Up3k6ys4hZo+qmyegRk=" + }, + "org/apache/commons#commons-compress/1.8": { + "pom": "sha256-OPhEKHDCaR2YIlGfLP+46JxwQQBQt8RsuhdqiCGeRCk=" + }, + "org/apache/commons#commons-lang3/3.9": { + "jar": "sha256-3i4dzc8++ReozoWGYaBnJqmpRPKOM61/ngi+pE3DwjA=", + "pom": "sha256-pAIkKbmEJbQwGBkVchJ5pS9hDzRki9rEh9TKy76N/rU=" + }, + "org/apache/commons#commons-parent/33": { + "pom": "sha256-U9ABE1Li5RBvN52vzNrHdU7G8PeCQ8AwXklp9azd+Ps=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "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/bouncycastle#bcpg-jdk15on/1.62": { + "jar": "sha256-+EduQ4RO2yAOoLL7OTWVLSI/O2syOmctcxYipLkpQ+A=", + "pom": "sha256-372CfVICQmFhq7AdlCOOakMDsvzWkp5sUpWPjW3wciY=" + }, + "org/bouncycastle#bcprov-jdk15on/1.62": { + "jar": "sha256-L6CrcbFU2imsE0CXvGu6zZCYfdTEAFUWFZ5klNHVLqI=", + "pom": "sha256-cA/nligsj+84xi/Cw974WM5EmrXzwiCINjYXVth5viY=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jd#jd-core/1.1.3": { + "jar": "sha256-M/YP91x33AiQXnZ2lKOPe2q3kr0uWDH0HitWNUu4Bvs=", + "pom": "sha256-n1Gs7cjKfNmu9LZ3nbLdOkFqcILMtO8Z67VHfBHG6wQ=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm/7.1": { + "jar": "sha256-SrL6K20sycyx6qBeoynEB7R7E+0pFfYvjEuMyWJY1N4=", + "pom": "sha256-Dyl0Lq2mWIpGxnn0maZ1Xks5OXZwBPK9nAIBnP0dMYA=" + }, + "org/redline-rpm#redline/1.2.9": { + "jar": "sha256-zEe5s3Tr9DoPAmv4amdL9uNqVr04lqyIEcUIPTW79OE=", + "pom": "sha256-k94nVXykHsKx/LMHxAhtdDtYdig/41FRUi8oaJjmfGw=" + }, + "org/slf4j#slf4j-api/1.7.5": { + "jar": "sha256-/jCCUkXSM2yFncONYMD8XzZo2/Kc1YaCjStWZ+w1W5E=", + "pom": "sha256-r6+OdAGbIw0/Vv3XyT+xBwwNyjTz0tWrXeqfxha9XKQ=" + }, + "org/slf4j#slf4j-parent/1.7.5": { + "pom": "sha256-xDvFoCLb/Z3oK+Iy3/5GIIy8feEsFDhbXagk4zHlNbs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/tukaani#xz/1.4": { + "pom": "sha256-/kqLT1R/okQ0L7r0pOgPDEg3HYXMQBtYUViRKENiWJI=" + }, + "org/tukaani#xz/1.8": { + "jar": "sha256-jHlks2/j8MvmRLBPy/+E5JHOgZF9svW/oMuo6VSK/10=", + "pom": "sha256-8p51y4jrSsv35apcCe1V6sLLrmAdY6nzdSMfRUUsEBM=" + }, + "org/vafer#jdeb/1.8": { + "jar": "sha256-N0/gKgkxTabsghngBVmOdgMjoavktxXMM84+KpvNqTI=", + "pom": "sha256-MQdFSRqXEzi0XcwhFMRt6GWvNOWLI96d2JJfEGFewBY=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + }, + "xpp3#xpp3_min/1.1.4c": { + "jar": "sha256-v8kOnjLQ6rHzl/uXS18VCoFRiDgqxB83KnFJ1bwXgAg=", + "pom": "sha256-tbRqwMCdpBsE28dTRWtIkShWp/+7FJBnaRC1EMRx0T8=" + } + } +} From 9b877fd5ab7c4ca14c817552d9672a2c309689c9 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 18:07:17 +0700 Subject: [PATCH 081/227] pdftk: convert to gradle setup hook --- pkgs/tools/typesetting/pdftk/default.nix | 72 ++------ pkgs/tools/typesetting/pdftk/deps.json | 215 +++++++++++++++++++++++ 2 files changed, 227 insertions(+), 60 deletions(-) create mode 100644 pkgs/tools/typesetting/pdftk/deps.json diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 27d95c00c01b..9ecb87b86ff6 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitLab, gradle, jre, perl, writeText, runtimeShell }: +{ lib, stdenv, fetchFromGitLab, gradle, jre, runtimeShell }: -let +stdenv.mkDerivation rec { pname = "pdftk"; version = "3.3.3"; @@ -11,66 +11,18 @@ let hash = "sha256-ciKotTHSEcITfQYKFZ6sY2LZnXGChBJy0+eno8B3YHY="; }; - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version; - - nativeBuildInputs = [ gradle perl ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle -Dfile.encoding=utf-8 shadowJar; - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-Mx5CdiRxuql22kbLozzr9Rs2E2Svzg2zN1138Xa0pMc="; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } - repositories { - clear() - maven { url '${deps}' } - } - } - } - - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - maven { url '${deps}' } - } - } - } - ''; - -in stdenv.mkDerivation rec { - inherit pname version src; - nativeBuildInputs = [ gradle ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon --info --init-script ${gradleInit} shadowJar - ''; + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + gradleFlags = [ "-Dfile.encoding=utf-8" ]; + + gradleBuildTask = "shadowJar"; installPhase = '' mkdir -p $out/{bin,share/pdftk,share/man/man1} diff --git a/pkgs/tools/typesetting/pdftk/deps.json b/pkgs/tools/typesetting/pdftk/deps.json new file mode 100644 index 000000000000..b257c8e8ba1f --- /dev/null +++ b/pkgs/tools/typesetting/pdftk/deps.json @@ -0,0 +1,215 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.10.0": { + "pom": "sha256-KBM628w3hpIzn4fzKVkykdnjBnmrwpsBVCzmULjHoL4=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.29.0": { + "jar": "sha256-m0zpiqT128dYUP5tmnnoeNMYvnGPmX5epAUsiFYhuqs=", + "module": "sha256-QW44lubwZ/WXlI70QVDJk43wV6NCt31X20gqj5aWgeg=", + "pom": "sha256-hf5PLJpFEVVtzqLbzFth9+f+VlxgedC5ItVmLJCIu+8=" + }, + "com/diffplug/spotless#spotless-lib/2.29.0": { + "jar": "sha256-G/rNp1jy4JDwLBVoR3PlORR/3od/rezZsAY3v536q8c=", + "module": "sha256-Rty7wtfX0d47lSZoX66uA20b/XwrvhL3izIuD1xLVk8=", + "pom": "sha256-v0UZJkr/2hRWrbjIHLazJ5AiMBqn/tdbNKlM34Oj4bo=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.10.0": { + "jar": "sha256-p8P8jOFdk311AFsuSclmXdp2UfLSLk7Kn7G03eR79As=", + "module": "sha256-m6j/efMjDs5rZomCishSor+pbZl8JXKjre7wtrFckq0=", + "pom": "sha256-+PCTwoomONZy0ML6LCljz5WFVKoeFHuuvLIEsViM4ns=" + }, + "com/fasterxml#oss-parent/38": { + "pom": "sha256-yD+PRd/cqNC2s2YcYLP4R4D2cbEuBvka1dHBodH5Zug=" + }, + "com/fasterxml/jackson#jackson-base/2.11.2": { + "pom": "sha256-k0uchkLt8xBMUAKC+4EGxzxWeBw9xMdelr2NG7Ha3p0=" + }, + "com/fasterxml/jackson#jackson-bom/2.11.2": { + "pom": "sha256-2qQsw65gqJH9ssh0ZxtiPc0tH+/Kd7z7OU/rHRInfME=" + }, + "com/fasterxml/jackson#jackson-parent/2.11": { + "pom": "sha256-wbChPYz+Y7QLD66EWLmUYxae0MYPf8lj7z8FJXFQy+g=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.11.2": { + "jar": "sha256-kNYC0ZVd9QmxVpYYz/hpmUyvlIPLgqPMs5eCpc2lQSY=", + "pom": "sha256-AEEc6Dh0WAKZWB4oOuRaXtN7AFHm9WO2miVQeKtYk+4=" + }, + "com/fasterxml/jackson/core#jackson-core/2.11.2": { + "jar": "sha256-+NdoxOiIRSK+WIHdKpGuyBLQjU8FhStDQZDiLeZZ38k=", + "pom": "sha256-QL3NBekAYAtBM3NCz1xpwln9ii+en0p5aNYebvWeOYw=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.11.2": { + "jar": "sha256-y4kLSq2O0hp7V+PI95JNvcoa7/nd0nyw/zckMDeuE0I=", + "pom": "sha256-9a5wZBwK4Svl+UaDjujKE9qIk+d7RNkNXuJfPfjhYQU=" + }, + "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/7.1.2": { + "pom": "sha256-lW5FCF5S6l7zLTRnHruE6xxBqDxFSa8m5oY18QYXmNM=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.1.12": { + "jar": "sha256-sZIEMxrG4gS++vUIpo9S7GtGONnZus3b69Q1+cTVAPI=", + "pom": "sha256-BhhOmwWeCAkRgnE2r17Hj1fuTDvBn2MutWGw34+HiM4=" + }, + "commons-io#commons-io/2.11.0": { + "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", + "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + }, + "gradle/plugin/com/github/johnrengelman#shadow/7.1.2": { + "jar": "sha256-v3BcwupcAYCqhwoPqAs5vxOhTScSjh6zpLZ0vjT1jpA=", + "pom": "sha256-H6qwvkF9ezxBqXzKCsqKWwtkBvw7Etfyjiw0Ex3/k0o=" + }, + "gradle/plugin/org/mikeneck#graalvm-native-image-plugin/1.4.1": { + "jar": "sha256-hxjq0IdN8UuGNB6IOkxkp3amRd0GbzcO2o+0xaPPZSI=", + "pom": "sha256-nNX2P1cnBVME1ZPa+uqiQK5dE/nZ3xn6meED8wc0lKo=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache/ant#ant-launcher/1.10.11": { + "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", + "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" + }, + "org/apache/ant#ant-parent/1.10.11": { + "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" + }, + "org/apache/ant#ant/1.10.11": { + "jar": "sha256-iMC4m7uq4B4Nn8rpO+eS9au+NAkQb47uhY/fNl28B1Q=", + "pom": "sha256-wiiU2ctGq/XOv27rK8z+TXjhju6jEaDqat3VnftLH+M=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/logging#logging-parent/3": { + "pom": "sha256-djouwrgJTUFh3rbCZLEmIIW5vjC/OjHCzhNyQuV3Iqc=" + }, + "org/apache/logging/log4j#log4j-api/2.17.1": { + "jar": "sha256-sNikyKtPuLGIjQCVgicDsObUeTxBlVAgPanmkZYWHeQ=", + "pom": "sha256-HirO8yILKb4QrgmXKLFYsY2UP5Ghk8xFAbtC+SnB6Io=" + }, + "org/apache/logging/log4j#log4j-core/2.17.1": { + "jar": "sha256-yWfyI0h5gLk2TpSnx/mooB/T7nwZvb8LD5+MuFEfPUE=", + "pom": "sha256-C7s79tTSKhv6PDwJJ8KUEK8UoPsm47Ark3JvXH6Yqv0=" + }, + "org/apache/logging/log4j#log4j/2.17.1": { + "pom": "sha256-lnq8AkRDqcsJaTVVmvXprW8P9hN1+Esn1EDS+nCAawk=" + }, + "org/codehaus/groovy#groovy-xml/3.0.10": { + "jar": "sha256-vCrVETWWo6m7ZQ2mRx8biRUFQheCF0p/5g15DttinoU=", + "pom": "sha256-Zwf5O1jO4BxBc/uuhNLh2DDKQc00LZBgbNW3GKn/fSk=" + }, + "org/codehaus/groovy#groovy/3.0.10": { + "jar": "sha256-3/762oKUhlvlA1UVwDIPtnlEPShfSl+K2tzwDBEw6Ew=", + "pom": "sha256-SYKt9KbGxQVnsL489JSCXmwqJ9izhx2eGIIqdCcreao=" + }, + "org/codehaus/plexus#plexus-utils/3.4.1": { + "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=", + "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI=" + }, + "org/codehaus/plexus#plexus/8": { + "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/5.13.0.202109080827-r": { + "pom": "sha256-oY/X0MQf2o2PHEoktQAKhmRWFHokdG7mzEcx54ihje4=" + }, + "org/eclipse/jgit#org.eclipse.jgit/5.13.0.202109080827-r": { + "jar": "sha256-2r+DafDN+M8Xt/faS9qTIMVwu3VMiOC+t7hSgSz1zSU=", + "pom": "sha256-qEF3Rc+i2V1qlxHpQT/KmE/FZmt2J7rRVAzyfUYq6BM=" + }, + "org/jdom#jdom2/2.0.6": { + "jar": "sha256-E0XxG6YG0VYD1nQFUajCGUfAIVZAdw7GcnH+eL6pfPU=", + "pom": "sha256-R7I6ef4za3QbgkNMbgSdaBZSVuQF51wQkh/XL6imXY0=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.3.21": { + "jar": "sha256-zqYfe2EYleZPWFaal1f8CrDVgvEHIR4ZMODOKgrdUqc=", + "pom": "sha256-HkQzMKGrEIPdEjMesYI7zaGM06YWLtxTagNeTeHXhz0=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.3.21": { + "jar": "sha256-OLojcNnwb1BDPgayyndblEc8LieF9BCSYHmreTxysDQ=", + "pom": "sha256-nOHqMzlsW/5I7IQSoM1WHsyQnXHI+TZZZ6FPnyT9uaU=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/mikeneck/graalvm-native-image#org.mikeneck.graalvm-native-image.gradle.plugin/1.4.1": { + "pom": "sha256-vxSiyLGrQgrTQ+r8tt9YEbEtbZsn+mBcM/7yz9QZeW8=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/9.2": { + "jar": "sha256-h4++UhcxwHLRTS1luYOxvq5q0G/aAAe2qLroH3P0M8Q=", + "pom": "sha256-dzzBor/BTGxKl5xRoHXAI0oL9pT8Or5PrPRU83oUXxs=" + }, + "org/ow2/asm#asm-commons/9.2": { + "jar": "sha256-vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=", + "pom": "sha256-AoJOg58qLw5ylZ/dMLSJckDwWvxD3kLXugsYQ3YBwHA=" + }, + "org/ow2/asm#asm-tree/9.2": { + "jar": "sha256-qr+b0jCRpOv8EJwfPufPPkuJ9rotP1HFJD8Ws8/64BE=", + "pom": "sha256-9h8+vqVSDd8Z9FKwPEJscjG92KgdesKHZctScSJaw3g=" + }, + "org/ow2/asm#asm/9.2": { + "jar": "sha256-udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=", + "pom": "sha256-37EqGyJL8Bvh/WBAIEZviUJBvLZF3M45Xt2M1vilDfQ=" + }, + "org/slf4j#slf4j-api/1.7.30": { + "jar": "sha256-zboHlk0btAoHYUhcax6ML4/Z6x0ZxTkorA1/lRAQXFc=", + "pom": "sha256-fgdHdR6bZ+Gdy1IG8E6iLMA9JQxCJCZALq3QNRPywxQ=" + }, + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/vafer#jdependency/2.7.0": { + "jar": "sha256-1j79V0b/QIlDp91++Frp8Jqn+2O7KxaRFCfObEW1n9A=", + "pom": "sha256-6yRCKwo+nofVrG6oCHeG+1HEsbvg0iXvdSFSxzaiBNA=" + } + }, + "https://repo.maven.apache.org/maven2/org": { + "apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "apache/commons#commons-lang3/3.12.0": { + "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", + "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + }, + "apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "bouncycastle#bcprov-jdk18on/1.71": { + "jar": "sha256-80M6l9eA/p+j3D1WKkHezVmy5hfOiE3pBgNJrBR1AEU=", + "pom": "sha256-u90garzosxsfGnMBORtEO6bN4X5y3udcH9LkEBFsXIc=" + }, + "junit#junit-bom/5.7.1": { + "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", + "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + } + } +} From 9b470f383e4cbd4e5364658c84ea90bf98cb90c1 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 19:42:15 +0700 Subject: [PATCH 082/227] scenic-view: convert to gradle setup hook --- .../development/tools/scenic-view/default.nix | 67 +------ pkgs/development/tools/scenic-view/deps.json | 177 ++++++++++++++++++ 2 files changed, 185 insertions(+), 59 deletions(-) create mode 100644 pkgs/development/tools/scenic-view/deps.json diff --git a/pkgs/development/tools/scenic-view/default.nix b/pkgs/development/tools/scenic-view/default.nix index 84d47390aa15..3fc74d7e3c73 100644 --- a/pkgs/development/tools/scenic-view/default.nix +++ b/pkgs/development/tools/scenic-view/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, perl, writeText, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, openjdk, openjfx, gradle_7, makeDesktopItem, makeWrapper }: let jdk = openjdk.override (lib.optionalAttrs stdenv.isLinux { enableJavaFX = true; @@ -17,57 +17,6 @@ let gradle = gradle_7; - deps = stdenv.mkDerivation { - name = "${pname}-deps"; - inherit src; - - nativeBuildInputs = [ jdk perl gradle ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d); - gradle --no-daemon build - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0d6qs0wg2nfxyq85q46a8dcdqknz9pypb2qmvc8k2w8vcdac1y7n"; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - clear() - maven { url '${deps}' } - } - } - } - logger.lifecycle 'Replacing Maven repositories with ${deps}...' - gradle.projectsLoaded { - rootProject.allprojects { - buildscript { - repositories { - clear() - maven { url '${deps}' } - } - } - repositories { - clear() - maven { url '${deps}' } - } - } - } - ''; - desktopItem = makeDesktopItem { name = pname; desktopName = pname; @@ -79,16 +28,16 @@ let in stdenv.mkDerivation rec { inherit pname version src; - nativeBuildInputs = [ jdk gradle makeWrapper ]; + nativeBuildInputs = [ gradle makeWrapper ]; - buildPhase = '' - runHook preBuild + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon --info --init-script ${gradleInit} build + __darwinAllowLocalNetworking = true; - runHook postBuild - ''; + doCheck = true; installPhase = '' runHook preInstall diff --git a/pkgs/development/tools/scenic-view/deps.json b/pkgs/development/tools/scenic-view/deps.json new file mode 100644 index 000000000000..c0b49afdd3d8 --- /dev/null +++ b/pkgs/development/tools/scenic-view/deps.json @@ -0,0 +1,177 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/github/javaparser#javaparser-core/3.6.23": { + "jar": "sha256-Jd6Y4JulJ3cBiHFxQWx1BmsMkK4QyER5wIy62OwC2ko=", + "pom": "sha256-uS4cfUmFkaRUByoI4abESgjvT5YyH772jlPnQagyO84=" + }, + "com/github/javaparser#javaparser-parent/3.6.23": { + "pom": "sha256-RrplfMwXfcIrmXLTDq3vB+pK2Y7C2ZJ4mi2pyMaOEMY=" + }, + "com/github/javaparser#javaparser-symbol-solver-core/3.6.23": { + "jar": "sha256-xgZHY43ddl13bN0jDhzWlmT5BYVrnTUgHcpZFcHhhLM=", + "pom": "sha256-IxlhRqtmo5sFxOIsoQ3rcpbBvmPuI5Vpax21wO7ayiQ=" + }, + "com/github/javaparser#javaparser-symbol-solver-logic/3.6.23": { + "jar": "sha256-iUKL5AoLtSXiC5BwTUzmhE/Min2ePxCaSmIckIICKSo=", + "pom": "sha256-+c70XJwzh7J95a0unepGR18S5nLrMTuo2hl9n5KTuUs=" + }, + "com/github/javaparser#javaparser-symbol-solver-model/3.6.23": { + "jar": "sha256-Oyot02mnKEgZJIkaRC7gHztEFr9a84kGv+CXAEEHbRs=", + "pom": "sha256-l9XodywQqD1zerqsIXaufDIYN2FzS1Nshd66kOdsfV0=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/errorprone#error_prone_annotations/2.0.18": { + "jar": "sha256-y0z62HC/VjoHGZ8+vqV2Pw3sRA/NoLMYZAsf6qeIZWs=", + "pom": "sha256-kUQScZLW9hLCNmgl3OrrI7DVMTC4Pgvx/+EH0UcKhIc=" + }, + "com/google/errorprone#error_prone_parent/2.0.18": { + "pom": "sha256-zxSZVSebB9TxHoF5hcEWSmnpMNc9t0QbQ6bvU7vShsQ=" + }, + "com/google/gradle#osdetector-gradle-plugin/1.6.1": { + "jar": "sha256-N/Sm2S8lh2Ls9i/XcYZSK77LXaGyDevHj4NhuFbfDac=", + "pom": "sha256-i4MRE6lOCXvEnh7KTTJ/0iNAVwRU1Ey7ccJSuZ5sTD8=" + }, + "com/google/guava#guava-parent/23.4-jre": { + "pom": "sha256-EO8XbFPNj5Wd7Wr3QFFumbX8IKogHjqRmLuSGUpqOTQ=" + }, + "com/google/guava#guava/23.4-jre": { + "jar": "sha256-JmKjPwn+urUCPdv1J4DLjSpuDEmiTbgJStwOlEgBqBA=", + "pom": "sha256-Iuu7g72VwApr6oeMtbm7imAuoSpmRnsM+k+XtBTqXQ4=" + }, + "com/google/j2objc#j2objc-annotations/1.1": { + "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", + "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" + }, + "kr/motd/maven#os-maven-plugin/1.6.0": { + "jar": "sha256-HNnWwIn5ZnEbx9lWSXaz/+ZRAmFqUkdoHMIwlc+90aw=", + "pom": "sha256-zRUfUQeKRnd7UPgoO4gqis4MCLu+F0RrP56mPIEi/Kg=" + }, + "org/beryx#badass-jlink-plugin/2.6.5": { + "jar": "sha256-WXeNmHfVtqkDyRN2ZfzzSoHFprSdPDpxt70FDJVSWrA=", + "pom": "sha256-ytOd1e29JuGnOxYHCShfkLTAjwmT85n2Qsley3Bs4LQ=" + }, + "org/beryx/jlink#org.beryx.jlink.gradle.plugin/2.6.5": { + "pom": "sha256-n3jKnoCItgThUQZCBW3b+WsQZ+zn/SZuZwc/y/dsW/Y=" + }, + "org/codehaus#codehaus-parent/4": { + "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.14": { + "jar": "sha256-IGgyC9a610TDZzqwSPZ+ML749RiZb6OAAzVWYAZpkF0=", + "pom": "sha256-GHnxmgWZHj7ZWRC5ZokzM5awxGeiFdxNH5ABhAS3KiY=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.14": { + "pom": "sha256-9RVQoGsUEL1JYssOcd8Lkhpgp+9Hv6nEgloUvnIxbuo=" + }, + "org/codehaus/mojo#mojo-parent/34": { + "pom": "sha256-Pjldb7xDwJo3dMrIaUzlJzmDBeo/1UktgOJa8n04Kpw=" + }, + "org/javamodularity#moduleplugin/1.4.0": { + "jar": "sha256-DsRpRPMp5s7qu+4mT39lW3VOz+qXti1zeROvm/cnWkk=", + "pom": "sha256-ys6MmZmVjsvuHC00/yZVxHvgOrtlFInDustCNl+e33s=" + }, + "org/javassist#javassist/3.23.1-GA": { + "jar": "sha256-0rFMCXY1IzdGJPMqCdbjH8sXQIKpet21ri1YC0dP2AY=", + "pom": "sha256-TBjLCfVKXn3uusVCUbXsZaXgSuRgZ/Mb3OMzwvDujJk=" + }, + "org/openjfx#javafx-plugin/0.0.7": { + "jar": "sha256-cMNMLi/MFLDiEkJuYhbX7xktB+i4fw3O8y1drZ+6tK0=", + "pom": "sha256-JVTXrl0EsYMJcp5LkHmy8iQKXTfr1GxrC97HZ8q/svk=" + }, + "org/openjfx/javafxplugin#org.openjfx.javafxplugin.gradle.plugin/0.0.7": { + "pom": "sha256-SybdZ/HqOekf+cyybnONJwR1DlhFYYajVz9QadOIe1U=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2/asm#asm-analysis/7.0": { + "jar": "sha256-6YH49lDE2QC7AzZQsY4SL6axYerdX4iXjQh1H3LuhHQ=", + "pom": "sha256-xrVEd+nVuuHnrd/y4ky/kqr/L/CP1rwFlsOTPD+twss=" + }, + "org/ow2/asm#asm-commons/7.0": { + "jar": "sha256-/tNI7wWVjj6EajrAdKEq9feTbvPSHORKYsT6CKdxkn0=", + "pom": "sha256-9MaXiGzbSlskcgVKC140Nx6bSOYgvkDD7Ujh9LbVHrQ=" + }, + "org/ow2/asm#asm-tree/7.0": { + "jar": "sha256-z9egh0+d42qZnBJ/7q37/m4E1Kce6VTXrz2FPwvkimw=", + "pom": "sha256-05590S9P9TWgg50ZScOcdkQ1WkRwIgyUt2pcFoxXoGg=" + }, + "org/ow2/asm#asm-util/7.0": { + "jar": "sha256-dfu8pEDvRj9BwrCrGoCr5n6RCsSG2mCnhjy8tbrn4UU=", + "pom": "sha256-4HvOS7VdWgb0wQ2RL8ne6Km5wE7FSbu4208g2zRwb3U=" + }, + "org/ow2/asm#asm/7.0": { + "jar": "sha256-uI72ZGizyXitDJf9bpCXnlYVW0rGkIm6ekTpqn/+ms8=", + "pom": "sha256-g/ZbEIPVzk+Lp/lUXP6f8XgkWJyafMgsOkaVgB5PX2g=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=", + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + } + }, + "https://repo.maven.apache.org/maven2/org": { + "openjfx#javafx-base/11.0.2": { + "jar": "sha256-Hy+IiY9U8aKeK1jKrrChEFBZigdSTyls2a72wAu5PQ8=", + "pom": "sha256-F/QWaIULgDukqDp+LZYDm2nwcniLvbqI4J/sgVegMpw=" + }, + "openjfx#javafx-base/11.0.2/linux": { + "jar": "sha256-hMNW8TRL/TqnS1WiOgzgeLTF5qm+iFPajeQV5ez81Bs=" + }, + "openjfx#javafx-controls/11.0.2": { + "jar": "sha256-YBBsLPUqfzHsobjQipUs9Lk7Wx2FSSp1XpeggIpp/5o=", + "pom": "sha256-WI5hxbroHQl2C2DYz7E7ERtC09RwwKCpnaBqtq/XjQM=" + }, + "openjfx#javafx-controls/11.0.2/linux": { + "jar": "sha256-wXIELPTOd/xon61lWSVrEbmcb7ic5f0bM9/DRLhqCpc=" + }, + "openjfx#javafx-fxml/11.0.2": { + "pom": "sha256-hqY8PXMIR6kmAEQ3YosWH88GXj0vrzSjwTjK4j3FDxg=" + }, + "openjfx#javafx-fxml/11.0.2/linux": { + "jar": "sha256-IsRLJbxYjfZiPgT6EnuLyCQj8flI6a/ySFr0pokOL5Q=" + }, + "openjfx#javafx-graphics/11.0.2": { + "jar": "sha256-3ukAoYanC66CZoRcVrA62aJOaXy1K6PaQhxgSQibNjg=", + "pom": "sha256-5O3+os2WNa3JLTqbp81ew6VqsbF+pKJWDRIr+97gU8g=" + }, + "openjfx#javafx-graphics/11.0.2/linux": { + "jar": "sha256-+yCVZOUN49jQVdmzzWnUahbT7xjsVRYvwTANFAip1QI=" + }, + "openjfx#javafx-media/11.0.2": { + "jar": "sha256-buLos8kx27mNmLuVqoIDP9tvQ839Vp5gYT21g0Yp0CU=", + "pom": "sha256-ea0fX/vvejwnrd8jvXYICIN23mLl1w/tQRKKMu0f0Ps=" + }, + "openjfx#javafx-media/11.0.2/linux": { + "jar": "sha256-SQgWhhxhQ6jpPDBRreX/ZcJ8h5zE0lSZmBQ3RnZDF9Y=" + }, + "openjfx#javafx-swing/11.0.2": { + "pom": "sha256-huvlJlgb5jeG3hJxPMFL23wVAwzPacjJ7lluwyUtB7M=" + }, + "openjfx#javafx-swing/11.0.2/linux": { + "jar": "sha256-5WLb2tBbKGTo3F75chsMmiyxcxWdpElqJ4K4zR5lsUw=" + }, + "openjfx#javafx-web/11.0.2": { + "pom": "sha256-VPT4QZplXM2lGzDG+canNTR6h9myctpnwMndXps/UcU=" + }, + "openjfx#javafx-web/11.0.2/linux": { + "jar": "sha256-FWUzbTr1okARbBPkPepcPZpnSWMnuCj6EL9n6unlsa8=" + }, + "openjfx#javafx/11.0.2": { + "pom": "sha256-vGfwPQ2VsXURSpjv/7E+RORq2eOsGe/w6OBjpudnWtg=" + } + } +} From 5e0160dc08caf17cb5796393bb0205aab7b33046 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Fri, 15 Dec 2023 21:51:15 +0700 Subject: [PATCH 083/227] corretto: convert to gradle setup hook --- .../compilers/corretto/mk-corretto.nix | 48 +++++++++---------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index c26614e47641..1059935ce20f 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -31,7 +31,9 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { dontConfigure = true; - postPatch = '' + postPatch = let + extra_config = builtins.concatStringsSep " " extraConfig; + in '' # The rpm/deb task definitions require a Gradle plugin which we don't # have and so the build fails. We'll simply remove them here because # they are not needed anyways. @@ -41,35 +43,29 @@ jdk.overrideAttrs (finalAttrs: oldAttrs: { for file in $(find installers -name "build.gradle"); do substituteInPlace $file --replace-warn "workingDir '/usr/bin'" "workingDir '.'" done + + gradleFlagsArray+=(-Pcorretto.extra_config="${extra_config}") ''; + # since we dontConfigure, we must run this manually + preBuild = "gradleConfigureHook"; - buildPhase = - let - # The Linux installer is placed at linux/universal/tar whereas the MacOS - # one is at mac/tar. - task = - if stdenv.isDarwin then - ":installers:mac:tar:packageBuildResults" - else ":installers:linux:universal:tar:packageBuildResults"; - extra_config = builtins.concatStringsSep " " extraConfig; - in - '' - runHook preBuild + # The Linux installer is placed at linux/universal/tar whereas the MacOS + # one is at mac/tar. + gradleBuildTask = + if stdenv.isDarwin then + ":installers:mac:tar:build" + else ":installers:linux:universal:tar:packageBuildResults"; - # Corretto's actual built is triggered via `gradle`. - gradle -Pcorretto.extra_config="${extra_config}" --console=plain --no-daemon ${task} - - # Prepare for the installPhase so that it looks like if a normal - # OpenJDK had been built. - dir=build/jdkImageName/images - mkdir -p $dir - file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') - tar -xzf $file -C $dir - mv $dir/amazon-corretto-* $dir/jdk - - runHook postBuild - ''; + postBuild = '' + # Prepare for the installPhase so that it looks like if a normal + # OpenJDK had been built. + dir=build/jdkImageName/images + mkdir -p $dir + file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') + tar -xzf $file -C $dir + mv $dir/amazon-corretto-* $dir/jdk + '' + oldAttrs.postBuild or ""; installPhase = oldAttrs.installPhase + '' # The installPhase will place everything in $out/lib/openjdk and From 5969a69a11322e847f9f4ee741428cb856e04a0b Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 27 Jun 2024 03:34:00 +0700 Subject: [PATCH 084/227] armitage: convert to gradle setup hook --- pkgs/by-name/ar/armitage/deps.json | 73 ++++++++++++++++++++++++++++ pkgs/by-name/ar/armitage/package.nix | 42 +++------------- 2 files changed, 81 insertions(+), 34 deletions(-) create mode 100644 pkgs/by-name/ar/armitage/deps.json diff --git a/pkgs/by-name/ar/armitage/deps.json b/pkgs/by-name/ar/armitage/deps.json new file mode 100644 index 000000000000..d9a755c0c204 --- /dev/null +++ b/pkgs/by-name/ar/armitage/deps.json @@ -0,0 +1,73 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/googlecode/json-simple#json-simple/1.1.1": { + "jar": "sha256-TmlpaJK4i0HFXUmrL9zCHurZK/VKzFiMAFBZbDt1GZw=", + "pom": "sha256-Zl9jWQ3vtj1irdIdNSU2LPk3z2ocBeSwFFuujailf4M=" + }, + "org/apiguardian#apiguardian-api/1.1.0": { + "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=", + "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE=" + }, + "org/javassist#javassist/3.28.0-GA": { + "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", + "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" + }, + "org/junit#junit-bom/5.7.0": { + "module": "sha256-Jd5FSzrdZ2VNZpG1PedZO1ApZ7X/VJVHsQTXlh8aUr0=", + "pom": "sha256-NfsV+NC+4rWQCiKDJ2I2ZVL5o0nFbO1guhI85Hc4/wA=" + }, + "org/junit/jupiter#junit-jupiter-api/5.7.0": { + "jar": "sha256-sD944Nru0td6Cvm81mK0zblpP37nLgGlObUIuExj0YI=", + "module": "sha256-0ae65s1ErW2WcVJhQQ7vIziklENtZnKA0Tc6R8F+JBw=", + "pom": "sha256-oPgj1RPI1GkpNfJML+bnfMSnthR6nopRj3IuULv4YTg=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.7.0": { + "jar": "sha256-36Jq+UZErCYS3eZiWFL8tVCg0hyqJDJX3lTLpzi6h68=", + "module": "sha256-w2vaSCKO71xAzcmp1jA7uEg4LNsIhLNnfUkYK07HoaQ=", + "pom": "sha256-twLiUIddMx7jxriPNymfvpUfQ5kvSy5KjxROLkzyx+g=" + }, + "org/junit/platform#junit-platform-commons/1.7.0": { + "jar": "sha256-UzDuh8x1hubiUXWjTpJRYk/xL/UlJp00FdC0ylGbb+o=", + "module": "sha256-sKXHobfkCdH1zJY9muocd8NLkOFj1oQqRInGqgf/juI=", + "pom": "sha256-DNfE+b7mWZEqwdzkbxI80G9Au7c6sxa9lBHHkuPGgKI=" + }, + "org/junit/platform#junit-platform-engine/1.7.0": { + "jar": "sha256-dfIaINxZSv3IdXNnJbQIzsbQNEh00p80st0wdVACNvI=", + "module": "sha256-ZRCp+ogc70LUFIVTjbxUdJQm2x4LFOxDORXqXyRIB5o=", + "pom": "sha256-IluZxQMv0cuM7Noui1p1Jtal+B+5iimldVf39czanRI=" + }, + "org/msgpack#msgpack/0.6.12": { + "jar": "sha256-4JymXYUgSI6ApdxCaEior8z9QPSi6zuWRgQlldO9m14=", + "pom": "sha256-lEl9jwL43oFZpbfVE24BD1f12axliGES7O2GlcUFbe4=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/postgresql#pgjdbc-core-parent/1.1.2": { + "pom": "sha256-K5B1vOVrI8vfRwy80/7rwgivBf1XfNxcmjbadTRsZ50=" + }, + "org/postgresql#pgjdbc-core-parent/1.1.5": { + "pom": "sha256-XtK0rdiF6e4eY3opfLNHlPT/LtVCb/zStL3N1uJiPrc=" + }, + "org/postgresql#pgjdbc-versions/1.1.2": { + "pom": "sha256-FJIccV6cNLFOpOtn1O6cPUGtxYj1639F01f89xgv3P4=" + }, + "org/postgresql#pgjdbc-versions/1.1.5": { + "pom": "sha256-fktof5IZOQGPdV6TUwtvO/pkOH9zJIiTXAsFo2PEkFw=" + }, + "org/postgresql#postgresql/42.2.5": { + "jar": "sha256-f/pG+MYZN3zevNF3IbayHs9mWYUBeflv7D0QNc9aDNw=", + "pom": "sha256-QeLEYQz6+o+46jOfZeUECMDzGDV6eKP0hOKi8bUq0ew=" + }, + "org/postgresql#postgresql/9.4.1212": { + "jar": "sha256-DLKhWL4xrPIY4KThjI89usaKO8NIBkaHc/xECUsMNl0=", + "pom": "sha256-3WEi1R5mRIHFMgl7hzPLJAW6oqrhsgqOrr6jlLErb1A=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + } + } +} diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix index 2d07d215d0f6..ef2b5c3101c7 100644 --- a/pkgs/by-name/ar/armitage/package.nix +++ b/pkgs/by-name/ar/armitage/package.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , jdk11 , gradle_6 -, perl , metasploit , makeWrapper , makeDesktopItem @@ -16,6 +15,8 @@ let pname = "armitage"; version = "unstable-2022-12-05"; + gradle = gradle_6; + src = fetchFromGitHub { owner = "r00t0v3rr1d3"; repo = "armitage"; @@ -46,31 +47,10 @@ let }) ]; - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit version src patches; - nativeBuildInputs = [ gradle_6 perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon assemble - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - rm -rf $out/tmp - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-6o3HlBfmpjpmMeiRydOme6fJc8caq8EBRVf3nJq9vqo="; - }; in stdenv.mkDerivation (finalAttrs: { inherit pname version src patches; - __darwinAllowLocalNetworking = true; - desktopItems = [ (makeDesktopItem { name = "armitage"; @@ -85,25 +65,19 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ jdk11 - gradle_6 + gradle makeWrapper copyDesktopItems ] ++ lib.optionals stdenv.isDarwin [ writeDarwinBundle ]; - buildPhase = '' - runHook preBuild + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - export GRADLE_USER_HOME=$(mktemp -d) - substituteInPlace armitage/build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' - substituteInPlace cortana/build.gradle \ - --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }' - gradle --offline --no-daemon assemble - - runHook postBuild - ''; + __darwinAllowLocalNetworking = true; installPhase = '' runHook preInstall From 2029c93adfe222a59d4d448bf7fd26b667322fe2 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 27 Jun 2024 03:34:48 +0700 Subject: [PATCH 085/227] freeplane: convert to gradle setup hook --- pkgs/by-name/fr/freeplane/deps.json | 1335 +++++++++++++++++++++++++ pkgs/by-name/fr/freeplane/package.nix | 77 +- 2 files changed, 1344 insertions(+), 68 deletions(-) create mode 100644 pkgs/by-name/fr/freeplane/deps.json diff --git a/pkgs/by-name/fr/freeplane/deps.json b/pkgs/by-name/fr/freeplane/deps.json new file mode 100644 index 000000000000..335fa1d7f9f9 --- /dev/null +++ b/pkgs/by-name/fr/freeplane/deps.json @@ -0,0 +1,1335 @@ +{ + "!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=" + } + }, + "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/versions#com.github.ben-manes.versions.gradle.plugin/0.50.0": { + "pom": "sha256-yP3sJnGeh1uqwkRdCtWZkUbntLwkF1FLRJlFY/0W9KU=" + }, + "com/netflix/nebula/ospackage#com.netflix.nebula.ospackage.gradle.plugin/11.6.0": { + "pom": "sha256-uDd5wYEKi4kQq2+H/Ypgz/rcIZUoEWbEqNKKCChmCF8=" + }, + "de/jflex#cup-parent/11b": { + "pom": "sha256-c4L5m+Pbb+Uh8E1+/XMZ/jlj2nnWXFaOfoofWRLpmHw=" + }, + "de/jflex#cup_runtime/11b": { + "jar": "sha256-nAtck/4MDiOdX5Kv+2cst8RRIsPj3ozalRP6jjnbvDw=", + "pom": "sha256-ju+4bQA82PuigLnCU/kt6cXKBQ4Ezxk/rLByTXL2aZ8=" + }, + "de/jflex#jflex-parent/1.7.0": { + "pom": "sha256-AugI9nJxuxzWPT9uT+XPU2RgfckzSK73cYntaPoza7Y=" + }, + "de/jflex#jflex/1.7.0": { + "jar": "sha256-xA5kYA99KeFhihwdXNaXySb/hJXhZuqUFsrhlkTjeuY=", + "pom": "sha256-KNGeqICM1UhMgeSP8SOiaRYZkAuFReSd8+fFSJuPmjI=" + }, + "gradle/plugin/org/xbib/gradle/plugin#gradle-plugin-jflex/1.2.1": { + "jar": "sha256-vV2rEjD0NhlJXg7mWLeoiqd2zMyDaeejqDh6AgqJk+E=", + "pom": "sha256-fcQapTZMLrJ/bVUHdIfF7sdHYJFsCa6p8OhWU86zXgc=" + }, + "org/apache/ant#ant-launcher/1.9.7": { + "jar": "sha256-vDdvbWy1hiKfRRrEWfrxRDsUTCbWZHYY7Jy6YOVMK3k=", + "pom": "sha256-17zdOrD/Ve2+G5bQbwbawhNexjtafDLO86Q2tJye7ic=" + }, + "org/apache/ant#ant-parent/1.9.7": { + "pom": "sha256-ddLO9kxlzL3S+vcmHlO0RHeNVtM4djFU4w+tpKQdEhU=" + }, + "org/apache/ant#ant/1.9.7": { + "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/xbib/gradle/plugin/jflex#org.xbib.gradle.plugin.jflex.gradle.plugin/1.2.1": { + "pom": "sha256-rdhfPghFWqbgA7rr8sZfkLsJ3vnoE6oH3TGltArns0w=" + }, + "se/patrikerdes#gradle-use-latest-versions-plugin/0.2.18": { + "jar": "sha256-P9Qm3NYf3dX9FvhkBJyopVQtN1FAfhLNJs/FyeFay60=", + "pom": "sha256-eGyLwlKFSQhAr7YuGbnryVVpqV2Z+T4emLr7F7eAFZs=" + }, + "se/patrikerdes/use-latest-versions#se.patrikerdes.use-latest-versions.gradle.plugin/0.2.18": { + "pom": "sha256-6DCee4xZSPaNwK2dl7lOwIsfw5lm2eXsrsNOzFbMnnI=" + } + }, + "https://repo.maven.apache.org/maven2": { + "biz/aQute/bnd#biz.aQute.bnd.embedded-repo/7.0.0": { + "jar": "sha256-pCxnvPjZxR9NzYYlTWKYdjWpaXzRDGSRtXSYOLqr6+A=", + "pom": "sha256-3Prn96stJjHK9pLazzn6yGK3GNEdCwu294+aW6gCjLo=" + }, + "biz/aQute/bnd#biz.aQute.bnd.gradle/7.0.0": { + "jar": "sha256-LMWmnBybMoqsR38mKt0K2MW8K355tbw5OWNCCl4EQhE=", + "pom": "sha256-x2EBfWRP4nI9Gxxlx38fGYKXT0RtqEBoianDvjp07B0=" + }, + "biz/aQute/bnd#biz.aQute.bnd.util/7.0.0": { + "jar": "sha256-OVddFQJJliqcbUbM5+Zy53fIqGIKHS0iDH8sCnmediM=", + "pom": "sha256-+dgDJLl2Hp3ipFoP6naPWZRH9AxuQZ8gje2MrxIYAMU=" + }, + "biz/aQute/bnd#biz.aQute.bndlib/7.0.0": { + "jar": "sha256-gKVp0AbzLpJc7kzor5Jrfm/aqqtcy/1f5MnN/5xN0t8=", + "pom": "sha256-mOuywO2iBtxb79bFJsjCAneApDvymekXyzwDXwOYp9I=" + }, + "biz/aQute/bnd#biz.aQute.repository/7.0.0": { + "jar": "sha256-ggIaWyICKD8J9XpW0zsh+rxvemSFC5FnNdaiZI8nYzc=", + "pom": "sha256-f1ar8LnsiL40/ZCDaYYdnlQwxnu6FROItbf0shvwOTU=" + }, + "biz/aQute/bnd#biz.aQute.resolve/7.0.0": { + "jar": "sha256-nVjTmv0Y/d2LTSHnC4Ui+KUmiH4UUH2UDcfK/p8NCZo=", + "pom": "sha256-UVIg7ZyoHFkzGz/zyuQfkUGMmn0Atavq0nEYS8rNp1Y=" + }, + "com/bmuschko#gradle-docker-plugin/3.2.1": { + "jar": "sha256-BfgdS5EdMR7nrEhJ6/eLMD4HdDQY1OiaVZVCK/OAIxQ=", + "pom": "sha256-slOHkvEGJnUa9sjeAgdH/1E4kntOKfL69KjtOsFKzSE=" + }, + "com/esotericsoftware#minlog/1.3.1": { + "jar": "sha256-XU1jLPvr/gp2RFAcwwNXC2kUBhgb7mXpkWuSHHZ9fHI=", + "pom": "sha256-pRyvwguZFGMaa9scYgE0A2ZJqxjIicgy+HR7SvNZLCo=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml/jackson#jackson-base/2.16.0": { + "pom": "sha256-+bdHbsN5ihJfFMnaVG+nr4YerZOhmZssDTY7lZLCM24=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.0": { + "pom": "sha256-Wqooh0QFvwT7qOLFcVkieCRGG6b31VKr246NOgum+L8=" + }, + "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/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-databind/2.16.0": { + "jar": "sha256-iq8XU4I75wt5gpDlgmq1v+AV01s6NqXTwuyfV9SwE4s=", + "module": "sha256-OQdNp2wUl4ioe+btq5eNC3WIIgK5J5TCSnpGmfkfc0s=", + "pom": "sha256-Mov1X2G38skAkYaIrdQBOAG6b6rVUnYAvzuiPg3IOP4=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.16.0": { + "jar": "sha256-fQpQIn9MvSmL55cYFVNGAL1ib5iHZZuNkcKGxi8XvQs=", + "module": "sha256-TLBgZ7zA2jx/nkzGh2q14GdqReSJb7S6zQqyGl6yiok=", + "pom": "sha256-olvftRudsqWS7lMPQRjgJ7QtdcyR3eQMNL8Juv4jrps=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.16.0": { + "pom": "sha256-VUFTMByvSyFND21W/AZF1zl2sHkQ4zrsdsv23Dxei20=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.16.0": { + "jar": "sha256-G1BqzqSGP0I7Z5arbyCbqzzDyeI6q07bZioxeEZlAoc=", + "module": "sha256-z9jtUlThaY0qypKNOreraru6nMq7vIhIKqPcPNhwFaU=", + "pom": "sha256-fx9oGz7+VaJXv0eSoavDqJF2ulY1blY/d0S4cDVnjhQ=" + }, + "com/fasterxml/jackson/module#jackson-module-afterburner/2.16.0": { + "jar": "sha256-AH0J72ftkjmBDPyyxHFmn9aZvs9rVYxLRbozZOoo1Nw=", + "module": "sha256-BTDcUZwucFQiWj30pHrMObU+kwtKlM9OJHb/Me0OTQw=", + "pom": "sha256-mCgdXXlDI2AwLhUdGDG4PzsnCsBmtGX5S1uuJSGTk7k=" + }, + "com/fasterxml/jackson/module#jackson-module-blackbird/2.16.0": { + "jar": "sha256-Xq9gCvlmWStkCam0Sqexv41JF08c8ooYC90lZSNX8o4=", + "module": "sha256-T799z+Samx1lg9ana9AY5+lAkxn1yS6A8cWqe6pHVHQ=", + "pom": "sha256-ZNjmjo9XmB7t3vjJZytzirf6RfdAlY4gGPrxSkJC4FI=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.16.0": { + "pom": "sha256-AA3F5X97SXV0GPzRcFTrRtdOFZKpzIFyBmkSyitb5Sc=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.16.0": { + "pom": "sha256-n+TKeceUAqwcxUpI27ZeJ/uYannL99CvC8Dbx9Z0GLc=" + }, + "com/formdev#flatlaf/3.2.5": { + "jar": "sha256-v7FM73SLNkdhEV+mdWQJwZ+maKqMNkf6VZDtIG7PaY8=", + "module": "sha256-7nyjpAQHuvbZQKbnkvWJArhaS6OXBgPpp1/Cjt80OWM=", + "pom": "sha256-/juWnGbGpawfWP61nNMBbhvlTR+evAhtClgo1q4dEuE=" + }, + "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-parent/3.25.7": { + "pom": "sha256-zRy2l5P5Klq4hkQnrk26ZsHMLFMP3zkPC0awTLl3UxA=" + }, + "com/github/package-url#packageurl-java/1.4.1": { + "jar": "sha256-jiMoAiGv0eZWHUM9+xMyUs0ocWessOylqZFmcRj/EKI=", + "pom": "sha256-/avfpMfepjVMd/Jb3dGOSO4izUuYFcvsw3ow8lQs0TM=" + }, + "com/github/robtimus#data-url/2.0.1": { + "jar": "sha256-GlsCbIWuXlJQm700u2suLNjBQV2T7MDxJ3qngKIPxX4=", + "pom": "sha256-4n9X/ib/mkG8YhVZBT+jkwxg9yaogOnUHOSNAkZtV9c=" + }, + "com/github/robtimus#robtimus-parent/1.9": { + "pom": "sha256-/vwSPTv/uO+cw6hW2FA+AmrjZHh0JTyoxfNiRWX+F2c=" + }, + "com/github/spullara/mustache/java#compiler/0.9.6": { + "jar": "sha256-xNaX/TYZy2FsxeIulTDIpP1Kjpp2lTwGVe5ifLLSIxg=", + "pom": "sha256-KsrXolfZyNPHxVnF7q8hCkeTl/8Z9EZU/5jrR/WDQJM=" + }, + "com/github/spullara/mustache/java#mustache.java/0.9.6": { + "pom": "sha256-iZ8UAXo747e/Y3TW524tFaijtMfL7S3reXF1ugyYUfw=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.9.0": { + "pom": "sha256-r3gcmldm/+oxGg3wU2V2pk3sxmGqEQxN5cc6yL9DRCQ=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/code/gson#gson/2.3.1": { + "pom": "sha256-gvqiGq/oQRqWwbvSKjDi1jnl9PxHFreWu3Dbw3n3Oec=" + }, + "com/google/code/gson#gson/2.9.0": { + "jar": "sha256-yW1gVRMxoZbaxUt0WqZCzQeO+JtvJnFGtwXywsvvBS0=", + "pom": "sha256-cZDQsH8njp9MYD9E5UOUD4HPGiVZ+FHG8pjJuyvil4w=" + }, + "com/google/errorprone#error_prone_annotations/2.21.1": { + "jar": "sha256-0fPGaqkaxSVJ4Arjsgi6S5r31y1o8jBkNVO+s45hGKw=", + "pom": "sha256-9ZiID+766p1nTcQdsTqzcAS/A3drW7IcBN7ejpIMHxI=" + }, + "com/google/errorprone#error_prone_parent/2.21.1": { + "pom": "sha256-MrsLX/JB/Wuh/upEiuu5zt7xaZvnPLbzGTZTh7gr+Sw=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/32.1.3-jre": { + "pom": "sha256-8oPB8EiXqaiKP6T/RoBOZeghFICaCc0ECUv33gGxhXs=" + }, + "com/google/guava#guava/32.1.3-jre": { + "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=", + "module": "sha256-9f/3ZCwS52J7wUKJ/SZ+JgLBf5WQ4jUiw+YxB/YcKUI=", + "pom": "sha256-cA5tRudbWTmiKkHCXsK7Ei88vvTv7UXjMS/dy+mT2zM=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/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=" + }, + "com/h3xstream/retirejs#retirejs-core/3.0.4": { + "jar": "sha256-70KQSbHoKL/OCpiGl2Wn8Q19r0GssDIB/NNAT0JNDDc=", + "pom": "sha256-up8LenmgzRd045wtXk+DRkWsMCnehzDO+9sL594IURI=" + }, + "com/h3xstream/retirejs#retirejs-root-pom/3.0.4": { + "pom": "sha256-+HJ2y/4cGQfXuLiEAJsT+0HSVzTwcc2q+IMuFwjfS+M=" + }, + "com/hankcs#aho-corasick-double-array-trie/1.2.3": { + "jar": "sha256-Vk8PxpDVBwKjE1ELmnLpUFrOboEQjoT2XeT+sNokTrg=", + "pom": "sha256-Hzj4XDHuqt0cF1E+/MkGdb3pj13ICFJTttosSpVfnlg=" + }, + "com/jgoodies#jgoodies-common/1.8.1": { + "jar": "sha256-3coQwW4dx6GzmcFFgPCq4jAUhR5X0iTLlsJg5tZJ0q0=", + "pom": "sha256-ia2b+Cr1wL1uSt8Vn2CBNhe4dtHL2hZ2pIlzv2QJIvI=" + }, + "com/jgoodies#jgoodies-forms/1.9.0": { + "jar": "sha256-dVx5UBq9gG9aqDJX3Iiyylkj5pZfPL/ocxFsfJdoIQo=", + "pom": "sha256-XPoeoCxNwZ0n3Vr8pRPynGerNE0aylU9jxbxW2mOT4U=" + }, + "com/moandjiezana/toml#toml4j/0.7.2": { + "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/samskivert#jmustache/1.15": { + "jar": "sha256-GuuWudwXvClUC4wzQujpHul01cYEFl7NRp3XawQcJQw=", + "pom": "sha256-Z77EYiZJjJBFuqct8cnH9mG4XOObYni2TWign0Xry1k=" + }, + "com/squareup/moshi#moshi-kotlin/1.12.0": { + "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", + "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", + "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24=" + }, + "com/squareup/moshi#moshi/1.12.0": { + "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=", + "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", + "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" + }, + "com/squareup/okhttp3#okhttp/4.11.0": { + "jar": "sha256-7o9r1s0SVwE9dIMw9MoUdjip+8tS+ziNWsk89TQIdF0=", + "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", + "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" + }, + "com/squareup/okio#okio-jvm/3.2.0": { + "jar": "sha256-tkK670xXAFXeTLPRZnsrFtztkB/4BmNFoGNpGqBgJaQ=", + "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", + "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" + }, + "com/squareup/okio#okio/3.2.0": { + "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", + "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "com/sun/activation#javax.activation/1.2.0": { + "jar": "sha256-mTMCsWzXBW8h53nMV30XWoELtJAO9zzY+/K1D5KLqc4=", + "pom": "sha256-+Hm26UWFTGkAsNvuHIOE16s95+FX/XrISTdAXEFtKl4=" + }, + "com/thoughtworks/qdox#qdox/1.12.1": { + "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/twelvemonkeys#twelvemonkeys/3.10.1": { + "pom": "sha256-k0AY2+dfgNCT9vl1ks+o2DGX70D36r0dfH9mqZ9R5eI=" + }, + "com/twelvemonkeys/common#common-image/3.10.1": { + "jar": "sha256-lg6bzhQGlNDXuP6VjcmrBPjWJcQo96qem/odfZzUFtE=", + "pom": "sha256-t/zu2VnQ4PFqYdUo91bSHK49WQJnxHFt3b8ia1MKW7s=" + }, + "com/twelvemonkeys/common#common-io/3.10.1": { + "jar": "sha256-VpH7etJAL4FV6XqXVTDBQ5eQNqvDQ2FknZO5ukHCzgE=", + "pom": "sha256-NuBRBgV8jwzhTiEVVLdloBBMx7RWCeq97nrErXZ2yk8=" + }, + "com/twelvemonkeys/common#common-lang/3.10.1": { + "jar": "sha256-SdXsz3bfITxZgYlCnH03GmlqCzt3nlBSsPm7H9HtLxE=", + "pom": "sha256-15CiZZFWHhyk0I+N+3dHDZstsWYCK82yH2X60HcvVco=" + }, + "com/twelvemonkeys/common#common/3.10.1": { + "pom": "sha256-TIfgKQ3H+yFkJxkXuGnZ3Y+p4epC/eWfQPgF1Wkli+0=" + }, + "com/twelvemonkeys/imageio#imageio-core/3.10.1": { + "jar": "sha256-u5kr0a34nuP95oxzOOy6P50P7v6cwfaRaQizUNxiklQ=", + "pom": "sha256-wenZItSAc1DJNh3p3GZl61ImaZuJi5jZBnN5NNfBods=" + }, + "com/twelvemonkeys/imageio#imageio-jpeg/3.10.1": { + "jar": "sha256-lsOMuoAmd3uDB77fcWsOqHlhQPTgWy/R2/UNXCZXK/U=", + "pom": "sha256-c07f2XbCK63LHUPMyh/tTwg+RrV60L0kTZOY8e/+23M=" + }, + "com/twelvemonkeys/imageio#imageio-metadata/3.10.1": { + "jar": "sha256-Tq1OX6/zA/eBvI/vG4b0rv+PmzXRXy+C9g6gdqNk5gI=", + "pom": "sha256-SHHCLjmKuSvHXTBrpXbG76OxRrhnfLv43ATvkx5P8cQ=" + }, + "com/twelvemonkeys/imageio#imageio/3.10.1": { + "pom": "sha256-wmu6VU5gjjPJAYJeCJXW/uUfaC3ZBVn3TfpgFKgRSC4=" + }, + "com/vaadin/external/google#android-json/0.0.20131108.vaadin1": { + "jar": "sha256-37e64vQEz+C3K00jlEaYy3FrdmUXGBKgpND1kmwPrHk=", + "pom": "sha256-L/bBfZwGC4nNfvGPpICuJEbrqGhVpjPziSg3/DuEj+8=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "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-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-digester#commons-digester/2.1": { + "jar": "sha256-4LK5gKhPxlM8XOKR8ZF7MsUH9ivK1kGY//RDaMIZaj0=", + "pom": "sha256-FaWcDnV8bAfD0baJ1zXI46nsVpXWzrapQdQGKrIpAbc=" + }, + "commons-io#commons-io/2.11.0": { + "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.15.1": { + "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-io#commons-io/2.6": { + "pom": "sha256-DCOGOJOiKR9aev29jRWSOzlIr9h+Vj+jQc3Pbq4zimA=" + }, + "commons-lang#commons-lang/2.6": { + "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", + "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" + }, + "commons-logging#commons-logging/1.0.4": { + "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", + "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "commons-validator#commons-validator/1.7": { + "jar": "sha256-TXT0zk+2iyYX7a0Ibfbe/fkzhGfSN30sYuaQOOHE8C8=", + "pom": "sha256-UztBf2dHU/bHn6v7/vlqRj6pw8yj16g/8Ot9dmgpP8k=" + }, + "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=" + }, + "io/github/gitbucket#markedj/1.0.18": { + "jar": "sha256-/i87GMhoxSVQOQSywMMOE9JJwrZSLQGivL1xqemnsII=", + "pom": "sha256-bdJVS82u894pg8lI4TGzEk8tfXQr/0js5YZDYL5mfyw=" + }, + "io/github/jeremylong#jcs3-slf4j/1.0.5": { + "jar": "sha256-WyEpqRFdF8n7ZbFD83WrDBX4UCSP1aoPMwfSzGGN8Js=", + "module": "sha256-XBWwnUNExkubH+LzjSR0Z+S3daWQikxK+fAfj9ehTs8=", + "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=" + }, + "jakarta/transaction#jakarta.transaction-api/1.3.3": { + "jar": "sha256-CwKhlN0E7i4ZLcnalXnhCVXdborHB638kdkvEZsOZ6s=", + "pom": "sha256-ODgmwQkvt2d/h9VgJWJFsPpbL5SolTAdMh8jad22DFU=" + }, + "javax/activation#javax.activation-api/1.2.0": { + "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=", + "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk=" + }, + "javax/inject#javax.inject/1": { + "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", + "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" + }, + "javax/ws/rs#javax.ws.rs-api/2.0.1": { + "jar": "sha256-OGB9Ym8iiNj7wbH4piw2nmOAbZoxOsfLxfnWyU9LRm0=", + "pom": "sha256-YkOQNGy5Tc3cTfIsHzyiJUw0pneWM4axMSRGRWu4udQ=" + }, + "javax/xml/bind#jaxb-api-parent/2.3.1": { + "pom": "sha256-zRvqpFYNxN/bgmudgJ5GTbIlJt+1QmS654pv9++wjh8=" + }, + "javax/xml/bind#jaxb-api/2.3.1": { + "jar": "sha256-iLlVoN9XiAomp0cIvDT3Tcr46/TniEOii1Dq6UVzKwY=", + "pom": "sha256-ErIM+SJ3NEXDRFwog8v2cfqYIRHpv5+HUCD5MTs4FLE=" + }, + "jline#jline/2.14.6": { + "jar": "sha256-l9GsqsgkCb5C5iLXpU066dCFF+iu/eo9K6l5EVDC8C0=", + "pom": "sha256-Hfe28I37gaJo1rk7ZZpqnjicXYwyvfB1Qji6ZIOk6YI=" + }, + "joda-time#joda-time/2.10.4": { + "jar": "sha256-rG/aiYl3V3b0KN+LWkUXzbBtkjRlq/m9oHRuwH38xlc=", + "pom": "sha256-mby5zmO1yG6E9IMctY+dwsFAmz6jY0HpD2j0OoMdQYk=" + }, + "junit#junit/4.13.2": { + "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-parent/1.14.10": { + "pom": "sha256-xpghkGD7DlZaDyyWCU6Ssg7+FG/WFjayyeTAO9m6Sns=" + }, + "net/bytebuddy#byte-buddy/1.14.10": { + "jar": "sha256-MObgRGQ3pn2zfit/fTP1B4fd/ZcDWTGd/QVGnaoty84=", + "pom": "sha256-zVh4KEX/ju3y7YOgw+30Xu65nhTAWvii6QGGDqCAzq8=" + }, + "net/gpedro/integrations/slack#slack-webhook/1.4.0": { + "jar": "sha256-uaZg4gvqtDOShH2SLBMEXFMZ7Mq/QpK5b/kadO6NmGU=", + "pom": "sha256-LZLLX0+6gvx9mtxBkOqZ98KgQITPIObyD2VHkUIQIOE=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/anarres/jdiagnostics#jdiagnostics/1.0.7": { + "jar": "sha256-fH/lNHzi0Uf/e8Ny9LLhENYCYfsPKAnnGePFbKUu49c=", + "pom": "sha256-zSFGLf/kk8r2KVQqiDPYMZWWTkKsLaQDObaagFIcO+k=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/3": { + "pom": "sha256-OTxQr7S3qm61flN3pVoaBhCxn3W1Ls4BMI2wShGHog4=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "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-junit/1.10.14": { + "jar": "sha256-o7U109VJ8YUKiRenwr/fNk//t51ScmfbMKEpR1yi+vg=", + "pom": "sha256-ZFiOW9XE89jIh5NFpsNQoxzIp5qovBJjGNytBL4/Pno=" + }, + "org/apache/ant#ant-launcher/1.10.11": { + "jar": "sha256-2rUw33qYC1rI/X6NIIJDrg0+vW3gmxqiznVjYMwu0lY=", + "pom": "sha256-7SoGiCYb624I7FSzgxLx1ILM8aO4Y8R9KNW5CkRtHB4=" + }, + "org/apache/ant#ant-launcher/1.10.14": { + "jar": "sha256-8JCXJaeiTjk4iPP7tVg0er9QbOL368WB/yYzG5TZUaU=", + "pom": "sha256-nJ2qQSPp63BzVnk2UsOIo1UQqqWm0UW0T4VdCN1LK7w=" + }, + "org/apache/ant#ant-parent/1.10.11": { + "pom": "sha256-V6BTJoLzD6MHQWoiWSnVcQrNpy17Je4IyvmNyCzTXbY=" + }, + "org/apache/ant#ant-parent/1.10.14": { + "pom": "sha256-CBYQamBniMJw767yFWLPy9j0uvfafBG85RSetWYbMx8=" + }, + "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.14": { + "jar": "sha256-TLvZJD3kwQQtYdmhXbTEPJD/k7FteLOUgdoclWyOlnE=", + "pom": "sha256-L6QmnmscRXI6iojmnZhKdm27IEzQ/pgUlMzfP+469lw=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "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-dbcp2/2.11.0": { + "jar": "sha256-WNFE1jJ7SgVMoOcaRDhFa9ZsDKjQwap5n1nc+w7Fmcw=", + "pom": "sha256-pLgH5TzLgZtfxibS/e9q36ysfePzpHGliPbfBUJUldc=" + }, + "org/apache/commons#commons-jcs3-core/3.2": { + "jar": "sha256-dH899tksRdZAndnVT08omOyvGkgpXDj4dsdUKasRxzA=", + "pom": "sha256-8e/SI40PxWsp235VmmuQsr8CaMX2szLJjW0DqvfKO80=" + }, + "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.9": { + "pom": "sha256-pAIkKbmEJbQwGBkVchJ5pS9hDzRki9rEh9TKy76N/rU=" + }, + "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=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/commons#commons-parent/62": { + "pom": "sha256-dM1i1osJqtf7lCTqiCaat2q6DWUIjZVp/yc70gdCdDk=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "org/apache/commons#commons-parent/65": { + "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" + }, + "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/groovy#groovy-all/4.0.17": { + "module": "sha256-YtWD309HvS6BJsyMuZpiHMP08XGOYqi0PqWcjeHcPfE=", + "pom": "sha256-qfqDYNMMVc7UmDZzDV03N1ZZq69QVN4XlmC/E50Hxww=" + }, + "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-bom/4.0.17": { + "module": "sha256-mzIfOgQTEwXGkJ/SI2f0F45Fvfl6xtakiVSmB/4zdx8=", + "pom": "sha256-0VKgJGW/lNrN1YNbFq1UYsPn/G7HXuDDVDDI6/vKUZk=" + }, + "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-console/4.0.17": { + "jar": "sha256-+sXN8nNhqmh5uLXq9zfaimvh8Vfy6WLG1mHKfdIsy40=", + "module": "sha256-vHTZDAV4MicCyA83QKHvXbXr+c4Up1qMPhpqs4p+pOs=", + "pom": "sha256-326wZvgPeOjCm44LgOhkazK7Xgq+ljVcWkfcVf6skio=" + }, + "org/apache/groovy#groovy-datetime/4.0.17": { + "jar": "sha256-2fDgwWVM3REqb7yYwjJiIw3WWLoqagKpHwp/kNtddY4=", + "module": "sha256-BBIxzENsPUQ9OKeTUlMVpfiYmurF9it4bFxgHkyKYzQ=", + "pom": "sha256-x5zAmAk6YuaOzOuL2zXEoL3o/oX44eJdBg0M+9YOHD4=" + }, + "org/apache/groovy#groovy-dateutil/4.0.17": { + "jar": "sha256-lkCoL2dLCpWbwLtNEL1G1bjg4NXH0KXgddTqaUTG5vo=", + "module": "sha256-cZZ99El3vieCQzdejWHD5ggruoQGhSy9gxJydETQzZk=", + "pom": "sha256-i1NJh3/MVBfO5mJNORtRDx9y4VWd4LWDwS+2yp/ieps=" + }, + "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-groovydoc/4.0.17": { + "jar": "sha256-5mxKRRTDDKyQHJC0uZ6yJnD7JiL5mRnfwHhFmkYYlxs=", + "module": "sha256-qufwIJqU6g+KwQwwmGmzja8oFJ0TcwAS0H4fys4FF/Y=", + "pom": "sha256-3DuMN4ZLAJtHFn+8JDBdhlAO3ltkRRwMpcNkKx7WV4I=" + }, + "org/apache/groovy#groovy-groovysh/4.0.17": { + "jar": "sha256-s0sZ9MpZkg1m5tqUnh8wjLBk5xs5FxJHmWK8Sc3aiks=", + "module": "sha256-M7Prs0L30ddt9BV3KljQ4G8iTy9s5VwztULVKaRK7eM=", + "pom": "sha256-ozFVRhxK4Yoi/dkd8VbB2fganavLjq3KfVQtgdDDOGo=" + }, + "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-json/4.0.17": { + "jar": "sha256-5/ZoGstuGNz6Di/zcygceVdNt3KVGwGu2etCLJLV1aQ=", + "module": "sha256-z1iX5xuWFRq7vEAHZFT3XrQS75VNbB6s63xHsD4KegI=", + "pom": "sha256-/ytkljka23x8GDyOmPCx5tLLc+xCGB9RCb6KGg2ofj8=" + }, + "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-macro/4.0.17": { + "jar": "sha256-DHkrtje+4hYQRYSg+MIWbMqLJe651lobQfSwfq6k3A4=", + "module": "sha256-j+dkU6DUFwbSmpi46w75RZGzNJUxiXhjSzHCmPlPoCQ=", + "pom": "sha256-szh2EBtSSGNs09PvpvZfhM5x86Cj6TzA4szD4y7pP28=" + }, + "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-servlet/4.0.17": { + "jar": "sha256-aStIomYhl6reHTvBHZKCz8hgd0HbkojY2SyZZERD4jM=", + "module": "sha256-e5q5JbYbLBZYIPAJ68PyQxyW/fauZnsP+YL6EKUPqMc=", + "pom": "sha256-uIHtlhWEnJwu6vKFby0PjeuOaOfcxX65VFUgfY8V6lM=" + }, + "org/apache/groovy#groovy-sql/4.0.17": { + "jar": "sha256-ZdriAquQXI0OhvrGwZ3gd+gFamzEs3aWb7SGq7GpMUQ=", + "module": "sha256-NwtkYaP3hmuQYDGJgR/9QfN3tb6fOJhdW6EdS2avwyY=", + "pom": "sha256-TCWjsZnOJFMhSXnbdRgcF9sb/w0oTTDRvxxyLBUGvIA=" + }, + "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-templates/4.0.17": { + "jar": "sha256-1oF+OjDmRfzmCSz4684nMTSsJK1iP5er3lU+bYtDPB0=", + "module": "sha256-3K5vWxfaC+2hY4I8aPQHhFPruKpmwfvBnIMjwbEdkWc=", + "pom": "sha256-iz+wHVOlhD/8+K8bqwQhugSbt98iyxRYCLcnNHyXqd8=" + }, + "org/apache/groovy#groovy-test-junit5/4.0.17": { + "jar": "sha256-WxLWTWpbzkYJoT03WszsklzlJAb+BsIVyPuKcNXR4hs=", + "module": "sha256-DXyYrom2dJYCH9z4UR2H0uZW1Yiyc7VbQFwTBvDLXNs=", + "pom": "sha256-Il9nKD1jAjZhEKxRBe5t42VLAcqXzvez0Ea4n5gjYfI=" + }, + "org/apache/groovy#groovy-test/4.0.17": { + "jar": "sha256-4BODn/xw4k4JMyLlcMX4aF9CB7UYWTm3mzXnnlDZktk=", + "module": "sha256-Hm40SCtyEh0QfqtalJqZqs7qNoFO0LSVLHIweHKZD+c=", + "pom": "sha256-DQElTOV2JB6Su2gZfGbQ4AJApGkWOo9jEsEGi+GpRps=" + }, + "org/apache/groovy#groovy-xml/4.0.17": { + "jar": "sha256-d55jbIE7rWe+TCAEuGB7oZlMYvxJU37FQI8o5Yh3YLY=", + "module": "sha256-upuTtiJVZkWISbBoDVQ6veMWQytldsKXExP440b9vsg=", + "pom": "sha256-jjCHeCS0a/hbNHIUkSWzL4MiHfHAOSeJs1PlgeF67FU=" + }, + "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/4.0.17": { + "jar": "sha256-UaKoWX8ocU50tAiIYMJw15shhh3RMIQdY2jYngIg10Y=", + "module": "sha256-H2fmwVACypI0euSI5kMvqKirpAdYfFsw0wZH4S6T9pM=", + "pom": "sha256-aRZKKtWmpKBLdGcEwwMNH0Z3QC+l89DvkOZaQMf+GzQ=" + }, + "org/apache/httpcomponents#httpcomponents-parent/13": { + "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M=" + }, + "org/apache/httpcomponents/client5#httpclient5-parent/5.2.1": { + "pom": "sha256-Dh6u8QHwRZEp9HElsL2UpYObn1TYKyxfNVGlfM74VkE=" + }, + "org/apache/httpcomponents/client5#httpclient5/5.2.1": { + "jar": "sha256-k1Xzh2uvgv7BPO0iwSti1XU2Iwg2QG01lFkSjk9z7VE=", + "pom": "sha256-RlsNajRmSds3SFsPpmBiG0qN+QCGP6GYcJ8ZjVR+G9s=" + }, + "org/apache/httpcomponents/core5#httpcore5-h2/5.2": { + "jar": "sha256-Wgh/uMYZl51JKoNUbzUd2t8ysozGoykjIp8/x3cXFXg=", + "pom": "sha256-WdDu5k/MP0VJqLoeDJnaEl9GQhxo/GPsynL8j28sPuI=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.2": { + "pom": "sha256-1/fv7GCeD91+OubrOlUAWOb5Pl0sJCTXSyHej3U291A=" + }, + "org/apache/httpcomponents/core5#httpcore5/5.2": { + "jar": "sha256-KTMhy/WU156ooMsCFPdfFG0X8Ii+F61c4Rwv6GTfEkw=", + "pom": "sha256-EHqMsQtc5ARGTq/B9nscEy8GgxDzC4bYpMCkTakFfyU=" + }, + "org/apache/ivy#ivy/2.5.2": { + "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-core/8.11.2": { + "jar": "sha256-iXCSX0PXiacCR+NsG6WiYHuvQZXDWv0M2HhkLJXDdAk=", + "pom": "sha256-ri4+eBO+bTd4uTPCfG0aAxwJxk+JURgMAE9vFI0nG10=" + }, + "org/apache/lucene#lucene-parent/8.11.2": { + "pom": "sha256-2KiRciKjtdDGjnmn+Bb8zM77bHvbuQf6FwsJ5HIJUuA=" + }, + "org/apache/lucene#lucene-queries/8.11.2": { + "jar": "sha256-D5MRnX0xbO8T/euqZo5xaxl+uGy+jns0XA6tJjIOY8g=", + "pom": "sha256-urVlf5EpC/zVrdDBDdto+p6AMR7o8Diloc84itrE8dM=" + }, + "org/apache/lucene#lucene-queryparser/8.11.2": { + "jar": "sha256-0s9RG6072nuRWHy6TCJ/iWSk6NoEM9BadAQ56iG7GuQ=", + "pom": "sha256-4fhknAaqtrtUJNdnrxWgUGLWM7zyVJB7I2/4AGtXytE=" + }, + "org/apache/lucene#lucene-sandbox/8.11.2": { + "jar": "sha256-/qZMMQLiGhwjOpXr7Y5wIeZfguUX2o2LFEZ3Y1ZwW7c=", + "pom": "sha256-M+S6VEvQv8U33WHboeMXvQ75DzU9yvp9ACePJYlApjs=" + }, + "org/apache/lucene#lucene-solr-grandparent/8.11.2": { + "pom": "sha256-0ShbeRyB734Rqb7fbt8Yh2C8Q/MJPkT0nygSvA8QAHE=" + }, + "org/apache/pdfbox#fontbox/3.0.1": { + "jar": "sha256-nSwtOESSmc0Nghovb2VnFDMlFEjT31efr/0PhzYcfH4=", + "pom": "sha256-dtkbZg8MqSYqfIEqvny+OdvHNNc68yiWpZ7omXG3aQ4=" + }, + "org/apache/pdfbox#pdfbox-parent/3.0.1": { + "pom": "sha256-7WhRk3AwJFzoTmKS65oUgKoSltrSwy7fVIZickTXdio=" + }, + "org/apache/velocity#velocity-engine-core/2.3": { + "jar": "sha256-sIbO6P2Bg+JAtK/PVP447DPdjrDaQUY25b96pNmFZik=", + "pom": "sha256-1CQqYXQkPx5oBDRXG6TmoduuGZwLw1Cph9X7nDzh4NM=" + }, + "org/apache/velocity#velocity-engine-parent/2.3": { + "pom": "sha256-TA5KkvaHDzmblG1bt4nRd+SkeUEUfD/dwubwY+nLlts=" + }, + "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-awt-util/1.17": { + "jar": "sha256-f+OPlFHrlFdSFDIyYcgZK2Px39JhBlklX7u7/elKKmY=", + "pom": "sha256-K0uhvyKqtiKmdyIXZTnRlWJ92KVfggGRq0udbh/PrgI=" + }, + "org/apache/xmlgraphics#batik-bridge/1.17": { + "jar": "sha256-O9An4ZoL4klsLDlQFSUlyRRhp9CB7b2Ci7PS0mnsWHA=", + "pom": "sha256-SfOQORML7tSikG1DGOSpv8l+yRax0bo+trqK9BigvVc=" + }, + "org/apache/xmlgraphics#batik-codec/1.17": { + "jar": "sha256-ZDSkhxe2nwWYaGZlPnXVKED4Es0rwnpb9diK7pXkEh8=", + "pom": "sha256-cfyOmfGNajQC9Dtl+R9OwtkiHy22pzTOvohmAUKOhJ4=" + }, + "org/apache/xmlgraphics#batik-constants/1.17": { + "jar": "sha256-ddsAGAveTvXK7jkW1vZeUEUFHVnPUdV+ZzwDlp17u80=", + "pom": "sha256-BtbvBrb+NCkKDiopaz95YejFX18VgvCVIcguAAt5Px8=" + }, + "org/apache/xmlgraphics#batik-css/1.17": { + "jar": "sha256-3PmpAr0MSxqErAVh17ZgUryTOBxJI6W8VgIpDByCt3k=", + "pom": "sha256-kt6q1WROf4uqA6h0YZwha2eEc02elByJYnkzsKmxUTs=" + }, + "org/apache/xmlgraphics#batik-dom/1.17": { + "jar": "sha256-8kLdsFsmixX/BV0dGq8tycNBjoQrqAZzFAiphNTjJAw=", + "pom": "sha256-5j2XE/BJoPrXcWpbixROVgr7L4Opygbe0mi0QlRTjyY=" + }, + "org/apache/xmlgraphics#batik-ext/1.17": { + "jar": "sha256-gmf8YLSlsPKvp9z9rUC+sOcj1qGbZrjiS8N8LsbcVFA=", + "pom": "sha256-SIjUiOkeJB9Apenz6xS3eg+/tGK29U7i4krFp0NYh94=" + }, + "org/apache/xmlgraphics#batik-gui-util/1.17": { + "jar": "sha256-2ZNr5tv3rvofNRe4YE7CE/4VTR1lTy7Gcjq1Jn3VXnc=", + "pom": "sha256-1WEFYc2SyU/fnXXAuY3Su0kHldxUaC/qZEQZgdcB/jo=" + }, + "org/apache/xmlgraphics#batik-gvt/1.17": { + "jar": "sha256-k/TkqETK/Fs9VzGimbwAzxRAQCbdyx10nSnKeUhrS5A=", + "pom": "sha256-zIhrsEtaMpUrKgtYmx3XNZNoZg/ysqxcBJ5MNkdSmpE=" + }, + "org/apache/xmlgraphics#batik-i18n/1.17": { + "jar": "sha256-1aZGgDY+ezaz8ow0o6U2126Ef3fOwHQKq3x5mme1LYs=", + "pom": "sha256-LczXNOp8Pf3cOQDcrOgYGIsUZsAq6dqK4wpwj3Tw9MI=" + }, + "org/apache/xmlgraphics#batik-parser/1.17": { + "jar": "sha256-XkSLv69hJ1Z/QfaY7iWtebhENjBxwS0RdYlseIkXF9c=", + "pom": "sha256-O4WKAV0DzUCF+HnRF81IbyijM3IIG0oRL/w5OjPzMOs=" + }, + "org/apache/xmlgraphics#batik-script/1.17": { + "jar": "sha256-LMu0vW1aYw+30m8N0xGNR0L3uuDpcu5nITDoA/ZylQw=", + "pom": "sha256-cev1FjXjwA1UnPAc/HxAZXssvZOCUVkUf73N0U83xqI=" + }, + "org/apache/xmlgraphics#batik-shared-resources/1.17": { + "jar": "sha256-XXQYK5yhns2NSBTy/0tCpK7qbhiXfpBcyE6Kb4GUDJ8=", + "pom": "sha256-ut4U1rq9//BiLBjNPCUf9flZN4MFieL2jgO92nu1RxE=" + }, + "org/apache/xmlgraphics#batik-svg-dom/1.17": { + "jar": "sha256-GTRyGKSQZwxLnSzRWkUVXBr59B539+rameuU27kL6OM=", + "pom": "sha256-BRKX2S6SjPAcAWqpNp8zhw7EEBQ0j30C6avoVZKIvlA=" + }, + "org/apache/xmlgraphics#batik-svggen/1.17": { + "jar": "sha256-EI9yX/4TXcpWbZJfOs4mpfgDmfKIyhkFYYBd7CgAXWM=", + "pom": "sha256-3HgOLwRWFTzXBP+zLhjGababh+ZW77ku3KNv7tIz1DA=" + }, + "org/apache/xmlgraphics#batik-swing/1.17": { + "jar": "sha256-ejNy6y/pO8CKE2kK7HyiY6Lt1j5n2Qtliy3qLG8L6Tk=", + "pom": "sha256-UJz+WAJ4NGTjWRypIO5OGmsgwHFsoVAj3xbnxpsagv8=" + }, + "org/apache/xmlgraphics#batik-transcoder/1.17": { + "jar": "sha256-H2nphrRukfcHzxMUP04ukwufYKaXhY26vbq1y4bNWg8=", + "pom": "sha256-4UQOu5q+0Ev3RDbBkVOFeGNE4iFBaooCLHGO2oY8al0=" + }, + "org/apache/xmlgraphics#batik-util/1.17": { + "jar": "sha256-oeT3Q8i4CsaC7dSzl/qkrELeWRNDA2MkyA7o8ilzyXY=", + "pom": "sha256-gtWFfUG9TeWskX7sgSoz0zKXN04UOAew4KYt7KBVofk=" + }, + "org/apache/xmlgraphics#batik-xml/1.17": { + "jar": "sha256-+8wjAAZqxAQodsUsMnrN8LUVli8WkEAO16eO0sDUwbQ=", + "pom": "sha256-0ypeBt4LkxxN2ebgS/oSQHwkNwmmmNdpZ7TnkYoPLn0=" + }, + "org/apache/xmlgraphics#batik/1.17": { + "pom": "sha256-D9ZlDtWtkmuw6X2xx/yMJqQOOmtrShOxR2XryjKvsTo=" + }, + "org/apache/xmlgraphics#fop-core/2.9": { + "jar": "sha256-G6o/84uWbL+7FXcEXNsMOdou857zN/SCZC+Jwy6E7Qw=", + "pom": "sha256-gYLc9qvzM/JWGIGtG+4ebnaGB5EhIDIrXhbAY1EjPQo=" + }, + "org/apache/xmlgraphics#fop-events/2.9": { + "jar": "sha256-4ddBM2p6q3z9fwYTxwPewOkxyx/gt3OAqXSM9EX1zrY=", + "pom": "sha256-qz74ZmlV0FKvUYeZFfwv85mXymheJaPJIuuKuDU0sH0=" + }, + "org/apache/xmlgraphics#fop-parent/2.9": { + "pom": "sha256-Oq9QCzomfEmzCdoCziBOirxzojRmry4kK7mJRPdL0d0=" + }, + "org/apache/xmlgraphics#fop-util/2.9": { + "jar": "sha256-fJzwPh48KvR5QxIlYHCCnhPyRRu2TJcpk8YFl5k9BD8=", + "pom": "sha256-HfUlsA3xpY3CzLcju3IiMhWhCmbrdl7++PhW+xAZAJw=" + }, + "org/apache/xmlgraphics#xmlgraphics-commons/2.9": { + "jar": "sha256-Lr0zOrKmJFFHk8M2468IZghnMob+N7oeY54Kw+G1i+I=", + "pom": "sha256-CS1SCmHKS4pFkEN0JMQhzbDPQOeYrs7PKwUm8q+PH4g=" + }, + "org/apfloat#apfloat-parent/1.10.1": { + "pom": "sha256-rHDBL+cJtXDurKOZT4NbpGnnJaWbvjYRDTpBImHgUt8=" + }, + "org/apfloat#apfloat/1.10.1": { + "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/bouncycastle#bcpg-jdk15on/1.69": { + "jar": "sha256-o5hP9/2VGNAAlONPPT5xSkgj8lBa2hwZs1wSnib2OTQ=", + "pom": "sha256-2iKA/jlan+d4adxcwAqpvuiPaUx8R4XqEHOXIrafrU8=" + }, + "org/bouncycastle#bcpg-jdk18on/1.71": { + "jar": "sha256-V/mrdqg1irvqkLoe+OVTuK49B7IzcHikyiCxy9SLTsU=", + "pom": "sha256-HZAWwSXnJp1y/KeGINan6Jha9hCfAI3MQs7H65MTEy0=" + }, + "org/bouncycastle#bcprov-jdk15on/1.69": { + "jar": "sha256-5Gm9Ofk2mZ8lYAJjEAP/AioilR2p1b2Xicer+pdjopI=", + "pom": "sha256-/YHicUSVvOeeauazAp2s0kzyz/NAJB2lgQVYlae6eN4=" + }, + "org/bouncycastle#bcprov-jdk18on/1.71": { + "jar": "sha256-80M6l9eA/p+j3D1WKkHezVmy5hfOiE3pBgNJrBR1AEU=", + "pom": "sha256-u90garzosxsfGnMBORtEO6bN4X5y3udcH9LkEBFsXIc=" + }, + "org/checkerframework#checker-qual/3.37.0": { + "jar": "sha256-5M4TdswnNeHd4iC2KtCRP1EpdwTarRVaM/OGvF2w2fc=", + "module": "sha256-clinadyqJrmBVNIp2FzHLls2ZrC8tjfS2vFuxJiVZjg=", + "pom": "sha256-AjkvvUziGQH5RWFUcrHU1NNZGzqr3wExBfXJLsMstPA=" + }, + "org/codehaus#codehaus-parent/4": { + "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8=" + }, + "org/eclipse/ee4j#project/1.0.5": { + "pom": "sha256-kWtHlNjYIgpZo/32pk2+eUrrIzleiIuBrjaptaLFkaY=" + }, + "org/eclipse/packager#packager-core/0.19.0": { + "jar": "sha256-9XmIqLNtoAU1O6XVo0FHZuGYqlTh+302Ov8ePdhH1Io=", + "pom": "sha256-gMond9r++bVTJcISD3mX79+/37uN8P9QTMqkVmCHmPE=" + }, + "org/eclipse/packager#packager-rpm/0.19.0": { + "jar": "sha256-8lULL06x1mfnZoFdmKPUPJWj3n5oyxkGVRWYC+aJ8T0=", + "pom": "sha256-T3NFFZZmY9uaKDMc1LZT81qkBqY4K5H1IqsbVn8Oahc=" + }, + "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/dpolivaev/mnemonicsetter#mnemonicsetter/0.6": { + "jar": "sha256-tm1Hrc7hdzU8YWFZhOJvG8Fj48VPTvfWo6nwkw5bnKo=", + "module": "sha256-B73+X5w1lH4fExAfRzdYRXAl6EiuTNWn6JfVxx9vOOQ=", + "pom": "sha256-IxRB2JhTMNHoZTTik+S/kLDfO9JsZNpvKDD+dUZJVbo=" + }, + "org/freeplane/emoji#twemoji/12.1.4": { + "jar": "sha256-VPNeiF3UDc/ElmlWosD7QWvNowuSU2D8oRqGLqIhm5I=", + "pom": "sha256-YdIcDlfkD/vek0h07VsDCiJlqoMXphXOVi9iXPOMz8E=" + }, + "org/freeplane/lightdev#simplyhtml/0.19.9": { + "jar": "sha256-M8qZwUjAXtrfOqt/M0bMZedObQYCZIaxIjjizk5/Jq0=", + "pom": "sha256-WsY1HVexEJk4aAPpmMRJhb3f4gzrYMb4K/E+ywF4Jrs=" + }, + "org/glassfish#javax.json/1.1.4": { + "jar": "sha256-F/3rfiI3Wn+0C7BVEwb23PK1dDB4Zorc32xkLJqeyVU=", + "pom": "sha256-UNKlkVUoQQmnCGdbUuu0WYUA5DaTlnz/FAHLJrl/iFM=" + }, + "org/glassfish#json/1.1.4": { + "pom": "sha256-2j9Tvh1F7zr2Z/36JvVMPrwOGWuMTftkZJHb4+Mcsgs=" + }, + "org/hamcrest#hamcrest-all/1.3": { + "jar": "sha256-SHdnBimrlvNPX5CrKDEl/Nmst+aD5mMZpovm6yzKYN4=", + "pom": "sha256-W/9oXY0wk7ttAuBXWvgEVi075wlAm8xxnZ40utZTObA=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.8.20": { + "jar": "sha256-Ux48P5sMRfmiHxZCF0RTBmoQZr7AGQJUpjMbMxgUq4s=", + "pom": "sha256-5D19CbkCpeM8I0r1O3YYTUkz9gkI0A4QSy7EA+4tQDU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": { + "jar": "sha256-akTJ7MnXdU2elD+x41iMdNSj8Xhb5RB09J1sVyNoKnM=", + "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "jar": "sha256-M9FI2w4R3r0NkGd9KCQrztkH+cd3MAAP1ZeGcIkDnYY=", + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "jar": "sha256-BCoc0ayXbNz+XrY/HY4LC4kskkjhWmnIz7pJXVRupSo=", + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/jgrapht#jgrapht-core/1.5.2": { + "jar": "sha256-36WW6fDQg48bXoHdDNYOOnbCwpCsJaCgKf/eWM9eTBQ=", + "pom": "sha256-R+MlGXkdDQblxsiNqMUZgA9O/9M2x9bVYE/f10+Sf8o=" + }, + "org/jgrapht#jgrapht/1.5.2": { + "pom": "sha256-V4X+aGHRVM9tin5rwS2X+GcmxgA2g/AOW++4rAPy0sM=" + }, + "org/jheaps#jheaps/0.14": { + "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/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.7.2": { + "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", + "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + }, + "org/junit#junit-bom/5.8.2": { + "module": "sha256-QM+tmT+nDs3yr3TQxW2hSE7iIJZL6Pkyz+YyvponM/o=", + "pom": "sha256-g2Bpyp6O48VuSDdiItopEmPxN70/0W2E/dR+/MPyhuI=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit#junit-bom/5.9.3": { + "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-engine/5.10.1": { + "jar": "sha256-ApMN/klfk/5wsmVQrOOij34bkAyEQmwuRibOAgxygtY=", + "module": "sha256-VBIeWCzLLUYl7J+lRnlDbJA/oFPHQJe75F/fud22f7g=", + "pom": "sha256-MHCG3F5wjLdZAQhoXAQOCOCK3g7UlUkwsvM8BttT6l4=" + }, + "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-engine/1.10.1": { + "jar": "sha256-uqSORw1t7nNpoKiCDFHaicFGMnntpuE6ME0R9Fkix2A=", + "module": "sha256-KXiTcRuSz0lfdH41o6rLSDELHRNBpFzYTSP5QxxS4p0=", + "pom": "sha256-3X1k/Zr2eJywPFDCWGyRW7hrHizIwH+5dPHbDvhhZA0=" + }, + "org/junit/platform#junit-platform-launcher/1.10.1": { + "jar": "sha256-3tQUxQTojQInAzEHGWkIThsv2bz4RD811E2ixuMwG8I=", + "module": "sha256-3ZcDx0TqC54Vv4yeP+vM/B40cBalXXHvf/qbC8TEBRI=", + "pom": "sha256-unroFwQMcqPCbTY6R/wTZIoc0MZOmjgYDd6YGKG1DjM=" + }, + "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/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/osgi#org.osgi.dto/1.0.0": { + "jar": "sha256-y3Xzx+SOWjGjHfIuJoczRvW/ZZ4tyrI2ngMeSFDS/0M=", + "pom": "sha256-XDHfk5LAR5tfgS9/hIDPsvcrbUmu8oVLfZFuBrCxDKw=" + }, + "org/osgi#org.osgi.framework/1.8.0": { + "jar": "sha256-7BlLeHGvJ2gXFv8FJZMZpcPJuXJ+gADp6DJJm5NIS04=", + "pom": "sha256-Z9tZJwa+xs7fS932a6ZJrVEkDN8SnjSQXm78j5AhCTM=" + }, + "org/osgi#org.osgi.resource/1.0.0": { + "jar": "sha256-gfxQ8fHTikryjhMZB9Sv4hMkmqsFBgSE7coOYMSvm0o=", + "pom": "sha256-g6zfIl/7mkp7xYL1OkFFofLDvbtCjgM8AJZvY8YQ6CA=" + }, + "org/osgi#org.osgi.service.coordinator/1.0.2": { + "jar": "sha256-sA3LUHuCQ/vlTubn+FNEmoRa+OfYQxPH1JdJSf2qsis=", + "pom": "sha256-DR2KkKB+CBsBIewegopVu51NRK7SK9qUKZEqIQFGi2o=" + }, + "org/osgi#org.osgi.service.log/1.3.0": { + "jar": "sha256-/2cQxIVtMmhM8+vcRSSPQQNv9zTysDu8CMRgmmH+z6A=", + "pom": "sha256-IcKVDBCS/bOOwIRYa471pU5dHQSV9UqCR+Auuu1EMos=" + }, + "org/osgi#org.osgi.service.repository/1.1.0": { + "jar": "sha256-xVU+lbRZUpGSQzSG1MTMIv9FourkloSE+fcXMZJkpTI=", + "pom": "sha256-QGb8pxWqwy/jzgvHv4Epe/1xMOu2CQzJZSrfeyqAfxk=" + }, + "org/osgi#org.osgi.service.resolver/1.1.1": { + "jar": "sha256-0hLyvLRc++yQcxDXj1MNmJjeDM97B5Os8Ys4bwPH3jk=", + "pom": "sha256-uPMUllLomdnRY/zyBKSD1Cq79OoT/+zI2aMyLIF84cI=" + }, + "org/osgi#org.osgi.util.function/1.2.0": { + "jar": "sha256-IIgZx8cWkMFaa7ixh0dOf50BR5RraAGCpiufIirgFOw=", + "pom": "sha256-9O3YQYEVfUNoGNRlZdSAN5wbBwAdXLEwtAZxlykRXqg=" + }, + "org/osgi#org.osgi.util.promise/1.2.0": { + "jar": "sha256-/vhuZPWE0BKhagMGFgdk9heWY7kJiKImxGQbkg86SzY=", + "pom": "sha256-m6aVb+n6Frge8Q6O8UED4WwEuKACQVC20DKfkX7y4hY=" + }, + "org/osgi#org.osgi.util.tracker/1.5.4": { + "jar": "sha256-fXjCzJvLZCHCTxeqCXhmzo2RFcIZpPjWzHU7xN+5fvo=", + "pom": "sha256-L3oSGrysdT5csPguP+4NpHlZV5hp4wTYwvtuh2PkMSk=" + }, + "org/osgi#osgi.annotation/8.0.1": { + "jar": "sha256-oOikw2K9NgCBLzew6kX7qWbHvASdAf7Vagnsx0CCdZ4=", + "pom": "sha256-iC0Hao4lypIH95ywk4DEcvazxBUIFivSuqBpF74d7XM=" + }, + "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-tree/9.6": { + "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm-util/9.6": { + "jar": "sha256-xjWnQC9Kqb9msvQjDOpiAloP4c1j6HKa3vybGZT6xMM=", + "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/owasp#dependency-check-core/9.0.7": { + "jar": "sha256-yhlVOSFWYKUSdUlxFj9kDALwPnnBdL0EvhcbksBnl8U=", + "pom": "sha256-GI2Umv65MFI7SOl7FQDigRdEBOqIVpc01HMub3sH7yM=" + }, + "org/owasp#dependency-check-parent/9.0.7": { + "pom": "sha256-tC3i7MCzf4xVwha5dvk6tkhNu+ZoVcf2EtqlsIFfGE0=" + }, + "org/owasp#dependency-check-utils/9.0.7": { + "jar": "sha256-wATn3kAc3d+o07BeQaTt1V5kNRDnIctyTbDwZw9hrkQ=", + "pom": "sha256-0gNTZJ4/NK7UpjuOnKT+dLa0H28PXnQ2gWTtHIt6nu4=" + }, + "org/redline-rpm#redline/1.2.10": { + "jar": "sha256-LgdOe9QhdOrqyYzrx4Lw17zI3CpBYXkyrJx51WvIbs0=", + "pom": "sha256-B6tuIriDJfDPdNQuiaZjQY5Vb+pXmMZnjSY8+YJuxC4=" + }, + "org/scilab/forge#jlatexmath-font-cyrillic/1.0.7": { + "jar": "sha256-GgFQ5L5k24jCUN/0H1kzSfVfDJz9uOOUM/Fbpz7NIbg=", + "pom": "sha256-kburwRXaL3ZznId52afCXWmNjI5/CRCrqgehNwO2oi0=" + }, + "org/scilab/forge#jlatexmath-font-greek/1.0.7": { + "jar": "sha256-zdx+fm8+f/BDTIpIBercPp3IBFfVgtGcNpnmqu6PavI=", + "pom": "sha256-Y4k7Qay6GJQvIt8WO5Cex5yqLzRxjXvmJEeNQ7P6/mo=" + }, + "org/scilab/forge#jlatexmath-parent/1.0.7": { + "pom": "sha256-1dUNpkwZJfPGVwiUI2nakFsYSyIBB5ueJntlLWM5Beg=" + }, + "org/scilab/forge#jlatexmath/1.0.7": { + "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/slf4j#jcl-over-slf4j/1.7.28": { + "jar": "sha256-uB9fkQ2pcIx6ane3IKfeIBVMztQGW1bzMwGUXASqrXA=", + "pom": "sha256-CR1F8JpUBvZbO4nYwDcGCN7GS8HP6P/XvyjQThKKOpI=" + }, + "org/slf4j#slf4j-api/1.7.25": { + "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-api/2.0.9": { + "jar": "sha256-CBiTDcjX3rtAMgRhFpHaWOSdQsULb/z9zgLa23w8K2w=", + "pom": "sha256-nDplT50KoaNLMXjr5TqJx2eS4dgfwelznL6bFhBSM4U=" + }, + "org/slf4j#slf4j-bom/2.0.9": { + "pom": "sha256-6u9FhIB9gSxqC2z4OdXkf1DHVDJ3GbnOCB4nHRXaYkM=" + }, + "org/slf4j#slf4j-nop/2.0.9": { + "jar": "sha256-VhI2exK6w+rPTm/04GzluhyDxNjW1eLqX5JGNXF6bYM=", + "pom": "sha256-3qe7VIVu9pOIkiqtCiU4qfNd8nk/iUF5S8smUYp0CK8=" + }, + "org/slf4j#slf4j-parent/1.7.25": { + "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" + }, + "org/slf4j#slf4j-parent/1.7.28": { + "pom": "sha256-kZtfQt3jOs4DaGXR4rKS2YoGJ0F/91bgKH9KVq0+VE4=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/slf4j#slf4j-parent/2.0.9": { + "pom": "sha256-wwfwQkFB8cUArlzw04aOSGbLIZ7V45m2bFoHxh6iH9U=" + }, + "org/sonatype/buildsupport#buildsupport/13": { + "pom": "sha256-MuFUs6Y4iedSg+cMOqqNzzS0DQmXHIh7/KOLdDQDBtM=" + }, + "org/sonatype/buildsupport#buildsupport/28": { + "pom": "sha256-cnweK70oqsuQ60sZYX0w2rw/eZ+i8YvNcrrteu6aICY=" + }, + "org/sonatype/buildsupport#public-parent/13": { + "pom": "sha256-apKi9RvzXaZVTJaF1M3klpyETHbUpAZTVR7mXf2zjoY=" + }, + "org/sonatype/buildsupport#public-parent/28": { + "pom": "sha256-xaG91AEo0naus0aPnjlM1aCp9Khliu+XQ8PR6JxIqQM=" + }, + "org/sonatype/goodies#package-url-java/1.1.1": { + "jar": "sha256-FSl4YjQrSUpTV0L7qQ6ooyHNE+HQ3Exht6OxjOOF4ag=", + "pom": "sha256-mGfgLN1Qx6ciQh8quZNY2Z3CUrZHmlQ0AmG2VZkdVXk=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/sonatype/ossindex#ossindex-service-api/1.8.2": { + "jar": "sha256-YfsE6TzymRcYBXlW+SU0y/FJTtXnQlC539bAErw3mqg=", + "pom": "sha256-9eL5rbvJHe5Skyg3lVxivwFhljcuFJdPDc/SAkp2VRM=" + }, + "org/sonatype/ossindex#ossindex-service-bom/1.8.2": { + "pom": "sha256-gyZ7UASN3Vhhog/my/u6ZfwHFjCJxk/8wjoWX7ZTCqE=" + }, + "org/sonatype/ossindex#ossindex-service-client/1.8.2": { + "jar": "sha256-72krmeEeVYUkA2RH2u33y5goVAfU23r1eaWRTCZfmBs=", + "pom": "sha256-7Aq9JZUefen7SRl69pMo5rSTf8adNyz07tSqfCrD4E8=" + }, + "org/sonatype/ossindex#ossindex-service/1.8.2": { + "pom": "sha256-3fX6d+tx8GpBDzD8umtqu4O7gUkMzJswQKQej8ukDk0=" + }, + "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/violetlib#jnr/13": { + "jar": "sha256-Rlyk/6Q2LHssoGLvuY13yo/6ceWCp5VN50hBn72/ERA=", + "pom": "sha256-ylDwFnSA2Q8xOyZ2+aGKpQrIW2cfLwwdqdsSkCTtzPU=" + }, + "org/violetlib#vappearances/3": { + "jar": "sha256-+OWyHWPDX3DkMaEY9EbQTqZSTZxmd+SgOJ3Iy3L9K7E=", + "pom": "sha256-dex3tlNLtJZvMCSKaCDBnSQOZpGrGcYMO9nlr0FtvSk=" + }, + "org/violetlib#vaqua/12": { + "jar": "sha256-rAsehX4k+vkpdpkEZV94Nkl/+24kl+nVGl05qZ7NyOk=", + "pom": "sha256-gcXkZPQxLsbTpEWOCjVX6QFS5bFNcOR6EhMBR0XAbag=" + }, + "org/whitesource#pecoff4j/0.0.2.1": { + "jar": "sha256-hHNzgo4EkLq9+u0rBI7TkI3BqN6C1Mjm66ub/QopTtY=", + "pom": "sha256-ITSyrni76ndbwyNuSR4IJeKoNzZgrvSGW/8cBoDpnUQ=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + }, + "us/springett#cpe-parser/2.0.3": { + "jar": "sha256-xmnSer5OmFsIMkXW8zKEsECJ+zKOdmAnYN5bQLcrqAo=", + "pom": "sha256-m1CINhAtmutHKGcerDe2yRWwaMjJO7B1xL0GIkQ2IDU=" + }, + "xml-apis#xml-apis-ext/1.3.04": { + "jar": "sha256-0LSIfcNNV95JB0pYr/rUOaAT0Lr/oagDT47ypeoZFkY=", + "pom": "sha256-G1k5qTEKWcDfDANyZyHV/JUh6H1sIDv6ciC66Cow2eg=" + } + }, + "https://resources.knopflerfish.org": { + "repo/maven2/release/org/knopflerfish/kf6#framework/8.0.11": { + "jar": "sha256-NC9SRdUhR1Nw/IwVVMseSTswFcAcr3xg6cgYm3A4wGk=", + "pom": "sha256-iWr+X/fdfT4fclUgtJw1xrnYMoS1gsTp9JV0MbdY5hg=" + } + } +} diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix index 5ce7cebac098..83a59347f933 100644 --- a/pkgs/by-name/fr/freeplane/package.nix +++ b/pkgs/by-name/fr/freeplane/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, makeBinaryWrapper, makeDesktopItem, - writeText, jdk17, - perl, gradle_7, which, }: @@ -25,62 +23,6 @@ let hash = "sha256-zEQjB57iiKVQnH8VtynpEGKNAa2e+WpqnGt6fnv5Rjs="; }; - deps = stdenvNoCC.mkDerivation { - pname = "${pname}-deps"; - inherit src version; - - nativeBuildInputs = [ - jdk - perl - gradle - ]; - - buildPhase = '' - runHook preBuild - GRADLE_USER_HOME=$PWD gradle -Dorg.gradle.java.home=${jdk} --no-daemon build - runHook postBuild - ''; - - # Mavenize dependency paths - # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar - installPhase = '' - runHook preInstall - find ./caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - # com/squareup/okio/okio-jvm/x.y.z/okio-jvm-x.y.z.jar is expected to exist under com/squareup/okio/okio/x.y.z/okio-x.y.z.jar - while IFS="" read -r -d "" path; do - ln -s "$path" ''${path//okio-jvm/okio} - done < <(find "$out" -type f -name 'okio-jvm-*.jar' -print0) - runHook postInstall - ''; - # otherwise the package with a namespace starting with info/... gets moved to share/info/... - forceShare = [ "dummy" ]; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-mWQTe/hOWGwWtsUPCZ7gle2FtskcEmJwsGQZITEc/Uc="; - }; - - # Point to our local deps repo - gradleInit = writeText "init.gradle" '' - settingsEvaluated { settings -> - settings.pluginManagement { - repositories { - clear() - maven { url '${deps}' } - } - } - } - gradle.projectsLoaded { - rootProject.allprojects { - repositories { - clear() - maven { url '${deps}' } - } - } - } - ''; in stdenvNoCC.mkDerivation (finalAttrs: { inherit pname version src; @@ -91,17 +33,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { gradle ]; - buildPhase = '' - runHook preBuild - mkdir -p freeplane/build + mitmCache = gradle.fetchDeps { + inherit pname; + data = ./deps.json; + }; - GRADLE_USER_HOME=$PWD \ - gradle -Dorg.gradle.java.home=${jdk} \ - --no-daemon --offline --init-script ${gradleInit} \ - -x test \ - build - runHook postBuild - ''; + gradleFlags = [ "-Dorg.gradle.java.home=${jdk}" "-x" "test" ]; + + preBuild = "mkdir -p freeplane/build"; + + gradleBuildTask = "build"; desktopItems = [ (makeDesktopItem { From 183e1f5fc38c11ce97d0321247836c827299d736 Mon Sep 17 00:00:00 2001 From: chayleaf Date: Thu, 27 Jun 2024 03:42:12 +0700 Subject: [PATCH 086/227] stirling-pdf: convert to gradle setup hook --- pkgs/by-name/st/stirling-pdf/deps.json | 1823 +++++++++++++++++ .../st/stirling-pdf/disable-spotless.patch | 34 - .../st/stirling-pdf/fix-jar-timestamp.patch | 16 - pkgs/by-name/st/stirling-pdf/package.nix | 78 +- .../st/stirling-pdf/use-fod-maven-repo.patch | 25 - 5 files changed, 1838 insertions(+), 138 deletions(-) create mode 100644 pkgs/by-name/st/stirling-pdf/deps.json delete mode 100644 pkgs/by-name/st/stirling-pdf/disable-spotless.patch delete mode 100644 pkgs/by-name/st/stirling-pdf/fix-jar-timestamp.patch delete mode 100644 pkgs/by-name/st/stirling-pdf/use-fod-maven-repo.patch diff --git a/pkgs/by-name/st/stirling-pdf/deps.json b/pkgs/by-name/st/stirling-pdf/deps.json new file mode 100644 index 000000000000..fb37c93baae8 --- /dev/null +++ b/pkgs/by-name/st/stirling-pdf/deps.json @@ -0,0 +1,1823 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/diffplug/durian#durian-collect/1.2.0": { + "jar": "sha256-sZTAuIAhzBFsIcHcdvScLB/hda9by3TIume527+aSMw=", + "pom": "sha256-i7diCGoKT9KmRzu/kFx0R2OvodWaVjD3O7BLeHLAn/M=" + }, + "com/diffplug/durian#durian-core/1.2.0": { + "jar": "sha256-F+0KrLOjwWMjMyFou96thpTzKACytH1p1KTEmxFNXa4=", + "pom": "sha256-hwMg6QdVNxsBeW/oG6Ul/R3ui3A0b1VFUe7dQonwtmI=" + }, + "com/diffplug/durian#durian-io/1.2.0": { + "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", + "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" + }, + "com/diffplug/durian#durian-swt.os/4.2.2": { + "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", + "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", + "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + }, + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": { + "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo=" + }, + "com/diffplug/spotless#spotless-lib-extra/2.45.0": { + "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", + "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", + "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + }, + "com/diffplug/spotless#spotless-lib/2.45.0": { + "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", + "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", + "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + }, + "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { + "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", + "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", + "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + }, + "com/fasterxml#oss-parent/48": { + "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + }, + "com/fasterxml/jackson#jackson-base/2.14.2": { + "pom": "sha256-OuJFud+VEnMh8fkF9wO9MndP5VcVip06nlB9grK8TtQ=" + }, + "com/fasterxml/jackson#jackson-bom/2.14.2": { + "pom": "sha256-mqIJuzI5HL9fG9Pn+hGQFnYWms0ZDZiWtcHod8mZ/rw=" + }, + "com/fasterxml/jackson#jackson-parent/2.14": { + "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.14.2": { + "jar": "sha256-LGhp1QXPYNwGZzS31QM5+XW9OtxjXianirtxrLRHPA0=", + "module": "sha256-sBSmTMGESUn4JNNGcSk1Qfq3IyI6yLgyIrV3IRO97Bc=", + "pom": "sha256-hK4DQYN9dpamEEPYCeQyYKXrB3Iy0dyqRkyNpUnNnqA=" + }, + "com/fasterxml/jackson/core#jackson-core/2.14.2": { + "jar": "sha256-tdN6d8iCd7l+NZPIdAklIWwG345BcrveBYUo3wStPno=", + "module": "sha256-knOeO8vgmyZJ4YfrftJawlK1h3B82SKrlbrc3orqEtw=", + "pom": "sha256-9EzGPWEvA7Hb/IKJLc2zL9t1vxYEn9hZVWHnx6M7xFE=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.14.2": { + "jar": "sha256-UB06vOTRjcw4EFjsWTxblEd5Brum77rBTa5ApkL3dCQ=", + "module": "sha256-YTDKm5VwfM1PgPYlhWmZCnzkADmqNTxGNckA02vuxwU=", + "pom": "sha256-IoCOu0t12MQDfZzuEgitxlvHgqmIVzIjSjG3tXTF2Qw=" + }, + "com/fasterxml/jackson/module#jackson-module-parameter-names/2.14.2": { + "jar": "sha256-tOP76lRaFVoU3LimXEa1etjQ+5YnyE94mFgmPwUpkzA=", + "module": "sha256-FS+gHfdRXJqmhk0hmHjx1RDMxU6RSkRuwWhoSQeHNjY=", + "pom": "sha256-ZJQDWanJpVdkpMbeM0eZUJBL0JJtKKHWj2sNQdp1fJc=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.14.2": { + "pom": "sha256-Nup9rcsQxxU+9lp14Wmxt/k33tCaGEUODxD+IC3yrc0=" + }, + "com/github/jk1#gradle-license-report/2.6": { + "jar": "sha256-P4Gsjr9QBSzza2Mqbp9/DtCVTYI+FTOZuYolKOz8YbE=", + "module": "sha256-f79/6rarYy/N+dQNR9CJmsoLlRucyAfoz+uE139Zr7M=", + "pom": "sha256-lagUHcf0R4CevR65cNtkDO4iTZwCwMEm8vbDySP93LI=" + }, + "com/github/jk1/dependency-license-report#com.github.jk1.dependency-license-report.gradle.plugin/2.6": { + "pom": "sha256-PHvB2j5eV/g+O4oz2FTAav5LTPGGVy58Y14/VJ+CcJI=" + }, + "com/github/psxpaul#gradle-execfork-plugin/0.2.0": { + "jar": "sha256-609z3xPuJPsZUuCpBUxWGO8H8NYjhr+tGgSZDfDLOmU=", + "module": "sha256-eyOesCmy5MqwDd3x3yBO9Lv4jnikNhnCb7seSbxTxkI=", + "pom": "sha256-2PT/ECfYvjIQBA9xKPisWYCMUJ6+8oTzPZq13IfB8Q0=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, + "com/google/code/gson#gson/2.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, + "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { + "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", + "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/squareup/okhttp3#okhttp/4.12.0": { + "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", + "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", + "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" + }, + "com/squareup/okio#okio-jvm/3.6.0": { + "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", + "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", + "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" + }, + "com/squareup/okio#okio/3.6.0": { + "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", + "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.20": { + "pom": "sha256-ERiJ4wIWWg9EpU3k23BSUNHeDckbp4oZih0ieDRL7uc=" + }, + "com/thoughtworks/xstream#xstream/1.4.20": { + "jar": "sha256-h98PC+V8kgN9ARD7siWjC2UXAtwnVlPSha/P7zG8LoE=", + "pom": "sha256-c9gezjnpSh0tf80BhGYqo9QQa/6XCbeTlkiS4+f0/cQ=" + }, + "commons-codec#commons-codec/1.16.0": { + "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", + "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + }, + "dev/equo/ide#solstice/1.7.5": { + "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", + "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", + "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + }, + "edu/sc/seis/launch4j#edu.sc.seis.launch4j.gradle.plugin/3.0.5": { + "pom": "sha256-Nplw/agsRFMGIjSqxiwBbqw5nY8C2VKdUe28QY0fzPs=" + }, + "edu/sc/seis/launch4j#launch4j/3.0.5": { + "jar": "sha256-4x62k3vvPwCsxAPkraf7ihY4ATiQ0bNSVmiFBocx7WM=", + "module": "sha256-+hiZBJpE2pdEnjoBvCx9rC01t0npPPdsBDSuzjT9ux8=", + "pom": "sha256-UvTlC0T2dzuebNq7jmmveQc4IW+8ZxJ1G77tGKFCknk=" + }, + "io/github/x-stream#mxparser/1.2.2": { + "jar": "sha256-ru7iOjMD2BG8qHkOp/JbU0MUhhwDz/Ntr9zCGAlp65c=", + "pom": "sha256-I1AiQk4S8zGB9iraGcxEKAGbaXZXw8OSzjVxYKQi+qg=" + }, + "io/spring/dependency-management#io.spring.dependency-management.gradle.plugin/1.1.3": { + "pom": "sha256-IjgvRfuFgvBXWMuKSZjk4RsXHH4w8f2r9zBPcm7DV50=" + }, + "io/spring/gradle#dependency-management-plugin/1.1.3": { + "module": "sha256-RgDMe8BIFu+9g/D4OJ9hWSM527UUWo2Uv5f4O8dldsY=", + "pom": "sha256-I9snVxPLFDWY6BBdB6YhbGcJmpHSbV6j5iLoLScbJpM=" + }, + "io/spring/gradle#dependency-management-plugin/1.1.4": { + "jar": "sha256-ilmvd2SN0H5rZ1HScdsvodAr8ubPfpqzf7mwjsybQ6E=", + "module": "sha256-tfZT8jN6BlFiyXmEiGD3kXGbd2qg740mmRSDXFeo/6A=", + "pom": "sha256-7dDEvl+Ooaigy0VhCvoRfn4e8m4wGlBZZI71BdZgj+s=" + }, + "io/swagger#swaggerhub/1.3.2": { + "jar": "sha256-cDph6Wsjr4GyzuukoIG7MhLsACEa4wB0iz58yx8zvTI=", + "module": "sha256-vVzNbkgiTKuIu9eeiA/wEe5PpxFJD0EPeBC3Wiy5w8A=", + "pom": "sha256-Ho4HzW9Tu1RxN9DKdLVetTkAeNmIRd1tZcfcvS8mVv8=" + }, + "io/swagger/swaggerhub#io.swagger.swaggerhub.gradle.plugin/1.3.2": { + "pom": "sha256-aQae7hJEDFIWYgVzNKxKyuoM5lNMpP2LG8Jk3pMK0tA=" + }, + "net/java/dev/jna#jna-platform/5.13.0": { + "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", + "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" + }, + "net/java/dev/jna#jna/5.13.0": { + "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/sf/launch4j#launch4j/3.50": { + "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0=" + }, + "net/sf/launch4j#launch4j/3.50/core": { + "jar": "sha256-2U8eT20fHhl9Es7vpwot75OMzxbig+mjx0Cmb/WGvW8=" + }, + "org/antlr#antlr4-master/4.7.2": { + "pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE=" + }, + "org/antlr#antlr4-runtime/4.7.2": { + "jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=", + "pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache/commons#commons-compress/1.21": { + "jar": "sha256-auz9VFlyillWAc+gcljRMZcv/Dm0kutIvdWWV3ovJEo=", + "pom": "sha256-Z1uwI8m+7d4yMpSZebl0Kl/qlGKApVobRi1Mp4AQiM0=" + }, + "org/apache/commons#commons-lang3/3.13.0": { + "jar": "sha256-gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=", + "pom": "sha256-/3zqTrI53WIRdRDavlGo1fDJ5MxCa8PowsIhpxj4ZIQ=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/httpcomponents#httpcomponents-parent/13": { + "pom": "sha256-5Ch4ZwNYVsc3QgNo3VhuXlfnAgmBNYQM89c+nINj17M=" + }, + "org/apache/httpcomponents/client5#httpclient5-parent/5.2.3": { + "pom": "sha256-8GQi0fH4n6RqPfdmyHii3RoI4flVOh+mZgmZ47ispow=" + }, + "org/apache/httpcomponents/client5#httpclient5/5.2.3": { + "jar": "sha256-fPTH5gM4qjNOhpnyQjrxyTvcOjEh8t8iN41hIi+lkQw=", + "pom": "sha256-8Dz23MD/7AFWSxfz0I5b5gFORHusRzWwH6cX+S+5XC8=" + }, + "org/apache/httpcomponents/core5#httpcore5-h2/5.2.4": { + "jar": "sha256-3BqV5z6wTbk0UVM9OQzgLFOzAaENw0PQjIYvKTSz0w4=", + "pom": "sha256-TRZ2hcCpo5jMJEpzqQhuKs9jUWCAGgpOuM/T4ycc+dM=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.2.4": { + "pom": "sha256-g/3u2xolBJtf5+AK/NNXQ/eon5kED7mjpRNfuSaaWko=" + }, + "org/apache/httpcomponents/core5#httpcore5/5.2.4": { + "jar": "sha256-p/YklhE/ZvnifCa4TET1zkVVxicAg83y1F8lUzbNUq8=", + "pom": "sha256-Abq2p2771NJoSf1FDqrofK75ocHAzF9g/k87kY8HcWQ=" + }, + "org/awaitility#awaitility-kotlin/4.0.3": { + "jar": "sha256-66iiOFFxL0WzGvZ/gwbHYC/0TaAh0UZwl/41LeVlo9s=", + "pom": "sha256-JBnkQ4E6uPP8191HBjPf2KDYDx5R3Z7To87TsmLbr18=" + }, + "org/awaitility#awaitility-parent/4.0.3": { + "pom": "sha256-5KRCX+WKidKbl1x05X5uqIpGg/BNR2KPBTwRgBO7grQ=" + }, + "org/awaitility#awaitility/4.0.3": { + "jar": "sha256-G8JCQg80krW4xo8Ujk5BAfbqglUnznk74iwMb/o7USE=", + "pom": "sha256-P8iCHmLEEy5xfNk1wB0dOTTov7sPklphhPj2oo2jasY=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { + "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + }, + "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { + "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", + "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + }, + "org/eclipse/platform#org.eclipse.osgi/3.18.300": { + "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", + "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + }, + "org/hamcrest#hamcrest/2.1": { + "jar": "sha256-upOy46ViMiukMvChtTrdzFXLGIJTMZoCDtd/gk5pIFA=", + "pom": "sha256-eH/dx6wGS1oiQGOA4g1WB2nwoIm77P8ijhntyWz2ySc=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-reflect/1.8.20": { + "jar": "sha256-Ux48P5sMRfmiHxZCF0RTBmoQZr7AGQJUpjMbMxgUq4s=", + "pom": "sha256-5D19CbkCpeM8I0r1O3YYTUkz9gkI0A4QSy7EA+4tQDU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.20": { + "pom": "sha256-YFWRuJs3ISfmspxpMl+i9qjEb0aMRdCUEOeOtZ/IChc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.8.21": { + "pom": "sha256-4ZpVd8vOqJcolw21MzyCZMjGmuci7recv0HV8LDJrmU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { + "jar": "sha256-zeM0G6GKK6JisLfPbFWyDJDo1DTkLJoT5qP3cNuWWog=", + "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.20": { + "pom": "sha256-NiLRBleM3cwKnsIPjOgV9/Sf9UL2QCKNIUH8r4BhawY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { + "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { + "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", + "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.20": { + "pom": "sha256-OkYiFKM26ZVod2lTGx43sMgdjhDJlJzV6nrh14A6AjI=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { + "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", + "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.20": { + "pom": "sha256-ycHvxLpLRsYy4qIeaTJYo+ztB+vqoAr008NG05kLIB4=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.10": { + "jar": "sha256-VemJxRK4CQd5n4VDCfO8d4LFs9E5MkQtA3nVxHJxFQQ=", + "pom": "sha256-fin79z/fceBnnT3ufmgP1XNGT6AWRKT1irgZ0sCI09I=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/slf4j#slf4j-api/1.7.36": { + "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", + "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + }, + "org/slf4j#slf4j-parent/1.7.36": { + "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springdoc#springdoc-openapi-gradle-plugin/1.8.0": { + "jar": "sha256-lAdaoBdXoMHVc63pFFwJiWPwhP7v0x3JXWVgbFA1hfQ=", + "module": "sha256-by2CiAeWEWkpP09biX98PudtoG3Gu52UrLPV8kGOmYw=", + "pom": "sha256-4CMQC3oczVQmo9cPklZdW8Xdf/51f6TqYGOhkpBlCHM=" + }, + "org/springdoc/openapi-gradle-plugin#org.springdoc.openapi-gradle-plugin.gradle.plugin/1.8.0": { + "pom": "sha256-LRFzQyMeKb4i5Im8H0gl4dS771RZBeeTJE6VIhlXFU8=" + }, + "org/springframework#spring-core/6.0.10": { + "jar": "sha256-HApr+czPqLvmq0nBOWPBq7Lt/4HYixr3RiYX3cfAl10=", + "module": "sha256-hbYoaLgyPn4yns3fCcR2oEMC2Ie7de4F+2RSVmrMFSA=", + "pom": "sha256-jKnCE+qV3MCO/lIfH27GsbaSAO+LdPr9Z7Jls/Ndp8k=" + }, + "org/springframework#spring-jcl/6.0.10": { + "jar": "sha256-MjIJyDN06eTAeFMRM0hi/vI3VbJMPA75SvVzEzNtbDA=", + "module": "sha256-3x5LmsRnzVg3yDb9b6D8wYBSxJNx4tpwNxGDVdzkNgM=", + "pom": "sha256-3PtOmzAEr32JWwzRxzVO7dbsO+5ZXFeAn8pG162DtPI=" + }, + "org/springframework/boot#org.springframework.boot.gradle.plugin/3.2.4": { + "pom": "sha256-5DmvFjixGykdvMkP5+YMQnmEOCrOviVmsJQzFYF4Xf8=" + }, + "org/springframework/boot#spring-boot-buildpack-platform/3.2.4": { + "jar": "sha256-wj8dASDMAWMUok49iOK7A8lfLRnpqWG5U84lhoVXzog=", + "module": "sha256-1W3+CczrqrcwXSIHKN6J1Zv4hMgqIy8denoZl2KhNIg=", + "pom": "sha256-k5+6HnB4vmBsg9SaiQB5KbBPKajR9om5faTP8Whiob4=" + }, + "org/springframework/boot#spring-boot-gradle-plugin/3.2.4": { + "jar": "sha256-6V6gGlTW/Q4ocjRlXDCsSSWo9nEqGxZDfTfqTPptlJk=", + "module": "sha256-xbSUt50Fj/B2DvtjphAMAsvBPG/jPv2I0xYBmXocpMc=", + "pom": "sha256-cbraMCUInappn9Uz5yBrPnGBPSGg0xIFsQUrgzNXHlc=" + }, + "org/springframework/boot#spring-boot-loader-tools/3.2.4": { + "jar": "sha256-hwt3UejNc7ev0muh3ihyjnBwVY/2XyGz9gELX5N0Fac=", + "module": "sha256-7sSC123IGCd8bYK4V0BkLHa4XUiJ6ZWyrC+0mxMJzic=", + "pom": "sha256-gzfQx85z1gx3NLmGadxPldXd7uyJXD5UUVD8FFhgH5k=" + }, + "org/tomlj#tomlj/1.0.0": { + "jar": "sha256-Mml8dWeykhxHNnioILE/xkcAqoe7FFdu60jQ7VhHz9Q=", + "pom": "sha256-rYGSAH9zRQxRyIAwXxTdIqxVFEm3IbWF/FEjFCLLCRM=" + }, + "org/tukaani#xz/1.9": { + "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", + "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "jar": "sha256-NOCO5iEWBxy7acDtcNFaelsgjWJ5jFnyEgu4kpMky2M=", + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ch/qos/logback#logback-classic/1.5.3": { + "jar": "sha256-tf6W/VZV+Usbyogdtc4WQ9CLnb3Ni2/jYeMuRXjVYTs=", + "pom": "sha256-a1TxNgVxhl+cbEvsDkhUiE63o268ZGWlKpYGU6iwZ8Y=" + }, + "ch/qos/logback#logback-core/1.5.3": { + "jar": "sha256-eFRQelmtXFgijcS8Pas9eSJTl/XvJDDts6zlREXgER8=", + "pom": "sha256-sZGeCDrFrpwZZq+FnI/FEgTIW384Nf5pnF7eZtQv2Bg=" + }, + "ch/qos/logback#logback-parent/1.5.3": { + "pom": "sha256-DFvLSOq4iEJD6SEv0+XzOME4PitMsa8xMyCZQfgtCk8=" + }, + "com/datastax/oss#java-driver-bom/4.15.0": { + "pom": "sha256-XJ4x7/lc83XFvf/4XOKCh9Wa/PUTS05qJKdj2xcaXmc=" + }, + "com/datastax/oss#java-driver-bom/4.17.0": { + "pom": "sha256-GMs4z09H2+zY1bKnbEFzqUvrSEMgSS+G1pZGSXQxJn4=" + }, + "com/fasterxml#classmate/1.6.0": { + "jar": "sha256-0vy9lWg3pXocYA3aEY1WNBNsvWc/MIUiUeTw3ij9Tr8=", + "pom": "sha256-LjYTx1Xn2kJeRFiOZraoHmXVKUiVYksR9JfwqHcQO+o=" + }, + "com/fasterxml#oss-parent/50": { + "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" + }, + "com/fasterxml#oss-parent/55": { + "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml/jackson#jackson-base/2.15.4": { + "pom": "sha256-dOOtPAiqNxApnzWCU44H7YxQJsPBKLZqYYl2PXTljIg=" + }, + "com/fasterxml/jackson#jackson-bom/2.15.2": { + "pom": "sha256-Hq1jAlXEiMUbXgq1YMdsI3GtJq422t8JKcUmVy6ls4s=" + }, + "com/fasterxml/jackson#jackson-bom/2.15.4": { + "pom": "sha256-bMLZJfyt9c0iUlTL9OSni7mvkZTQGHF3M9WYRh41/Zg=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.1": { + "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" + }, + "com/fasterxml/jackson#jackson-parent/2.15": { + "pom": "sha256-bN+XvGbzifY+NoUNL1UtEhZoj45aWHJ9P2qY7fhnXN4=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.15.4": { + "jar": "sha256-8gTrvVUmFKIrhTH/41DUf4/ULEW7YFF8B5dNwnpaHdM=", + "module": "sha256-IEXd1K3wouVsBUAiBVyUn3xyKqBJhtg0HpbVwQb932I=", + "pom": "sha256-fV1brPhSbkv/LtX+zBk+SgPaKaKbWxssfqYiDdoAZ/U=" + }, + "com/fasterxml/jackson/core#jackson-core/2.15.4": { + "jar": "sha256-jckhDdKF2zZvRfUY3R5qnM/rDxqOGEqJn+ltKe3x/ZQ=", + "module": "sha256-G8EfZVih8qFaFvjR5+Grp6aKLu0aIzemhlniAW0oWM8=", + "pom": "sha256-c+IQW4TXUa6yDR85+StaU7M2IR7Jq+gjRSVTVfBXWhI=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.15.4": { + "jar": "sha256-D5n/dxnu8+6FYIs97m7PPGmAA/6dbjTqu/q8zcm1rCw=", + "module": "sha256-RHAqK/3Ro7KScRuTVikdsF35YdGAVVhJ0sv2DrnMsQE=", + "pom": "sha256-DOjRi5CswPz/3dowyl2pPqRFCydtBm2eMCnAOwknBaQ=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.15.4": { + "jar": "sha256-mkY6yM51+iDEwWNl9qceqICLvE7KNzbjFWZ80x4bVJw=", + "module": "sha256-ST1lmAcoS58VliOHPt06guPK4uuyeV2V6zXhZPI4wiU=", + "pom": "sha256-5ONWD32KBjSF2ZwBEAP96KtBCFf9v4nNAaqUFunv1rM=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.4": { + "pom": "sha256-nc/Zaw46obazYDPnutgd8uodEExbDzsLLMjmHCSRw0c=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.15.4": { + "jar": "sha256-PvudVbYvUOZLEf4AYlgAKF/vh4Fza4C9IGZ3+1YECqw=", + "module": "sha256-r2tfmedOojijTzz7hRFwtDRtKTQQfqJXKs+UHl0Bzw4=", + "pom": "sha256-oYMOic9GPr6Nz9tzoEDwh8LNUO4F3H6bqRkSP+ckGbE=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.15.4": { + "jar": "sha256-RySYy7onJgEv+C+G/I/u+Vk2Y72hppWhfbgEpj+nM/8=", + "module": "sha256-7fQDOV9KMvjdq3CDS0mTNmkuFJQPK7nXELYufS3Dtn8=", + "pom": "sha256-u28bhQeGliTlTBoh0Bip5Lf06nX/zMcx599Ky2coxbE=" + }, + "com/fasterxml/jackson/module#jackson-module-parameter-names/2.15.4": { + "jar": "sha256-piDuEfid6ubizmzVpk2fLRSAvwi0XsLwcwvd+Rd/N/w=", + "module": "sha256-4sXPiLCT5prpdqWxJH7JB47YxmySoe/r6sRSPP5r3jE=", + "pom": "sha256-Os249wu/1EeTNai3Dy6EyYGUBlJR+VEYpKvrX47C4Pc=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.15.4": { + "pom": "sha256-OxSBaCFhP/9ZoNDHqEboIXxB78xQXYtjlqUMDJEamsw=" + }, + "com/fathzer#javaluator/3.0.3": { + "jar": "sha256-Q/0dt7ItMw5TwNI32BwfTb+gyeE/wUThwxQCDcS2eCs=", + "pom": "sha256-LJV70AFI9vLH9xNp15+7wVojSF5SFdD+2yPV9XOjbDk=" + }, + "com/fathzer#parent-pom/1.0.3": { + "pom": "sha256-bGRS0s8XtqB7GJxI6UdeHQHIEvXnhG3rkkHnRhAcjzo=" + }, + "com/formdev#flatlaf/1.0": { + "module": "sha256-dStur7AL/wRCGXCYLcqvz1l7SajJE64M73XkKHYKC68=", + "pom": "sha256-ylkCGnUHptHH0ZM+DN+hxKlpqgTsaMYsMdYTMtMAlpo=" + }, + "com/github/stephenc/jcip#jcip-annotations/1.0-1": { + "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", + "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" + }, + "com/github/vladimir-bukhtoyarov#bucket4j-core/7.6.0": { + "jar": "sha256-0XMQ4gZuWcBAT2GuXaGkD/lEKvoxNjqCvdwaTmJT/Yg=", + "pom": "sha256-OVtCWprjmQpylVV9ImeBPtDfUm7fQ/iO+xinuBt2Eq8=" + }, + "com/google/zxing#core/3.5.3": { + "jar": "sha256-jYBkwWNv2u9xid2QVcfVmVColAoS8ik5VkRuw8EJ/YI=", + "pom": "sha256-2KEui/aQVOKt0j15U0FOrv3azskwFAqNFE0frJ5it98=" + }, + "com/google/zxing#zxing-parent/3.5.3": { + "pom": "sha256-W7ilpDmBxNwQl6QUy/tMHUvP5C9yLSOgA8RdixuNTe8=" + }, + "com/h2database#h2/2.1.214": { + "jar": "sha256-1iPNwPYdIYz1SajQnxw5H/kQlhFrIuJHVHX85PvnK9A=", + "pom": "sha256-UX4aBXKZSVISML9WJlvaxaI5/bkOrWyqhfDGppzX+AM=" + }, + "com/jayway/jsonpath#json-path/2.9.0": { + "jar": "sha256-Eanub4i7MfFFAQjRz2RBN33shKygdetrsjQ74VdXW+o=", + "module": "sha256-5ikAQ9rpOnDZqz+hvrh56M9e1ajgqQGD+5bCUVqXCD4=", + "pom": "sha256-DCU33em/ncKix5ZzAPwTvFIp0ZJnf8uItv2Jlmk2ZD8=" + }, + "com/jgoodies#forms/1.2.1": { + "pom": "sha256-Rya6hKIwmKG9F6/xHe6waTOPmywM/X/Xuv4wZYCZsII=" + }, + "com/jgoodies#jgoodies-common/1.7.0": { + "pom": "sha256-MuhZojXD4ip33Q/Xzs9IaIBn2NjLxiGRfC7YBAmMUIY=" + }, + "com/jgoodies#jgoodies-looks/2.5.2": { + "pom": "sha256-ktKprZrAxUXdthqzVSvh1f0w3uG/tMaWEVl2MfPGSMk=" + }, + "com/martiansoftware#jsap/2.1": { + "jar": "sha256-MxdG+mLPvDNoJgxaLmYJNq0RvmEjCMEgoEThIDYdR04=", + "pom": "sha256-ms9WqFecBb7dgZ2ZIyNj4r8yfo9zxnWY29mIWoRaPGk=" + }, + "com/nimbusds#content-type/2.2": { + "jar": "sha256-cw8YFhlhReiCdQk8FH8ubaPD5UEges01A6GwYSm5vqk=", + "pom": "sha256-iznCFjD7tvBIqAflfjy/c17zDaPxHnAZ5muqa5fa8Gs=" + }, + "com/nimbusds#lang-tag/1.7": { + "jar": "sha256-6MHFlOJCW9vqLYYN5Vxptp/F1ZRURSRJoPCRPCpbijE=", + "pom": "sha256-gksNfeeCer/GpH5u+UsP+qE4/vOK8IxWon9dOhUiEZ4=" + }, + "com/nimbusds#nimbus-jose-jwt/9.24.4": { + "jar": "sha256-jViWMHIqTFY0kkhlJHf9qk4w35xzLE1urC8nFDckYwQ=", + "pom": "sha256-rEz2OglJyeyy+E23KZ+R2/8aEdLYbJT6xGdgtmfhXKE=" + }, + "com/nimbusds#oauth2-oidc-sdk/9.43.3": { + "jar": "sha256-YhaW4PEaGTvR8qUcvk977FxYLWRyfYlqSL8RZmLwSAs=", + "pom": "sha256-g3cIDcQCNyiNynUqBynnqNxeNodhdSRg7hcs3FwFnVE=" + }, + "com/opencsv#opencsv/5.9": { + "jar": "sha256-ICOWm4bOlorYrlSWSKxYfRQcGa5oSppcZ8kQXzerDRw=", + "pom": "sha256-l+UC78Xmwt0VZiGynKy8D0dEIowAmPaxafV/eukwMGA=" + }, + "com/oracle/database/jdbc#ojdbc-bom/21.9.0.0": { + "pom": "sha256-YWOUxaVc9n/ygO1pdup/MxarCdRMDin6ILZqyykKyaU=" + }, + "com/querydsl#querydsl-bom/5.0.0": { + "pom": "sha256-M9iKwC/Iwb2sEp3BGP/aOxf+lr9c+DVB3cAUoptiexs=" + }, + "com/squareup/okhttp3#okhttp-bom/4.10.0": { + "module": "sha256-NLNP75zu3d2ihMXxVoc4lg0qU9VuHvz/jK6tPmZSpcM=", + "pom": "sha256-vmLpNvEMNmU+XpGVrwBVq4bMugi4/sKo773exKzu71g=" + }, + "com/squareup/okhttp3#okhttp-bom/4.12.0": { + "module": "sha256-fg4vNHsbY22SsEMZnlFAPhXwn7SsRujBY1UaWCt7Brw=", + "pom": "sha256-eAg47mfyoe5YCIfeinSOWyWfnoFULhxCRNUEJlmSLhQ=" + }, + "com/sun/istack#istack-commons-runtime/4.1.2": { + "jar": "sha256-f9Z5I2H03QD4xWr0ogzswAZt7qSo897Dg0ivI/wilu4=", + "pom": "sha256-EiKikL7dtvbpK8mZvOvDaW/NbXIhWFbSJHJ6e8LcOso=" + }, + "com/sun/istack#istack-commons/4.1.2": { + "pom": "sha256-2Ig+twNkcB2uDjdEnIj9knUResPYYEDonxvj6dR+nJ0=" + }, + "com/sun/xml/bind#jaxb-bom-ext/4.0.5": { + "pom": "sha256-vDnKsUxxStmKeyoG96ybM3bgeVVCaa03KhfXEd9Yp6E=" + }, + "com/sun/xml/bind/mvn#jaxb-parent/4.0.5": { + "pom": "sha256-xrVu/pzFnzx4NT0oTFXo3PFivoX4IrJs+BAjxvkI9/c=" + }, + "com/sun/xml/bind/mvn#jaxb-runtime-parent/4.0.5": { + "pom": "sha256-/nf5B+HRRTqtaa92NX6tEKXkkzyKkI9XqZ2ncTBw00A=" + }, + "com/sun/xml/bind/mvn#jaxb-txw-parent/4.0.5": { + "pom": "sha256-yu7EM19YqOOcl+oK6JvqnCtJro2bD82SUjjgKNOESU8=" + }, + "com/thoughtworks/xstream#xstream-parent/1.4.15": { + "pom": "sha256-GDOZpW5OtAJkCjcZURmuZx61kW17OKX2PpTvGvkPuc4=" + }, + "com/thoughtworks/xstream#xstream/1.4.15": { + "pom": "sha256-sX3W1xyyywYmTZ6q0a6Mgg5FdhTx1jRcdgmSB3Ei1EY=" + }, + "com/twelvemonkeys#twelvemonkeys/3.10.1": { + "pom": "sha256-k0AY2+dfgNCT9vl1ks+o2DGX70D36r0dfH9mqZ9R5eI=" + }, + "com/twelvemonkeys/common#common-image/3.10.1": { + "jar": "sha256-lg6bzhQGlNDXuP6VjcmrBPjWJcQo96qem/odfZzUFtE=", + "pom": "sha256-t/zu2VnQ4PFqYdUo91bSHK49WQJnxHFt3b8ia1MKW7s=" + }, + "com/twelvemonkeys/common#common-io/3.10.1": { + "jar": "sha256-VpH7etJAL4FV6XqXVTDBQ5eQNqvDQ2FknZO5ukHCzgE=", + "pom": "sha256-NuBRBgV8jwzhTiEVVLdloBBMx7RWCeq97nrErXZ2yk8=" + }, + "com/twelvemonkeys/common#common-lang/3.10.1": { + "jar": "sha256-SdXsz3bfITxZgYlCnH03GmlqCzt3nlBSsPm7H9HtLxE=", + "pom": "sha256-15CiZZFWHhyk0I+N+3dHDZstsWYCK82yH2X60HcvVco=" + }, + "com/twelvemonkeys/common#common/3.10.1": { + "pom": "sha256-TIfgKQ3H+yFkJxkXuGnZ3Y+p4epC/eWfQPgF1Wkli+0=" + }, + "com/twelvemonkeys/imageio#imageio-batik/3.10.1": { + "jar": "sha256-38a0g10xkrBfILqFt3b1XnjszN/PoSYLaFcDr5Ugfxc=", + "pom": "sha256-s0PhynnsDrM2ompLPbeGefmxA5Bz1/IkCYTEsNfy9jg=" + }, + "com/twelvemonkeys/imageio#imageio-bmp/3.10.1": { + "jar": "sha256-ICwyjVx+D1vWjyphRGhiT/H7GbteGvrA9xNIEiFGYtM=", + "pom": "sha256-G65QtRvRcMNXUkLf6mGM0F/jNdzhoP9bFij5YfO6oZY=" + }, + "com/twelvemonkeys/imageio#imageio-core/3.10.1": { + "jar": "sha256-u5kr0a34nuP95oxzOOy6P50P7v6cwfaRaQizUNxiklQ=", + "pom": "sha256-wenZItSAc1DJNh3p3GZl61ImaZuJi5jZBnN5NNfBods=" + }, + "com/twelvemonkeys/imageio#imageio-jpeg/3.10.1": { + "jar": "sha256-lsOMuoAmd3uDB77fcWsOqHlhQPTgWy/R2/UNXCZXK/U=", + "pom": "sha256-c07f2XbCK63LHUPMyh/tTwg+RrV60L0kTZOY8e/+23M=" + }, + "com/twelvemonkeys/imageio#imageio-metadata/3.10.1": { + "jar": "sha256-Tq1OX6/zA/eBvI/vG4b0rv+PmzXRXy+C9g6gdqNk5gI=", + "pom": "sha256-SHHCLjmKuSvHXTBrpXbG76OxRrhnfLv43ATvkx5P8cQ=" + }, + "com/twelvemonkeys/imageio#imageio-tiff/3.10.1": { + "jar": "sha256-2UTAU2SRfeSmveUJutzsgGxk0WNoIKjCTaJTjV2lDkA=", + "pom": "sha256-IhuryGIeZx1bb0Koes993F5waA+ctQMg+6NidvC1L44=" + }, + "com/twelvemonkeys/imageio#imageio-webp/3.10.1": { + "jar": "sha256-DTMvXYB2vQ419nG4UvK/txYMPX1gfv2yHTZRV5OP+54=", + "pom": "sha256-W0OaTVQ99Llxhc7agNSw0ewtKT4uRaTUzcy+/KzlArM=" + }, + "com/twelvemonkeys/imageio#imageio/3.10.1": { + "pom": "sha256-wmu6VU5gjjPJAYJeCJXW/uUfaC3ZBVn3TfpgFKgRSC4=" + }, + "com/vaadin/external/google#android-json/0.0.20131108.vaadin1": { + "jar": "sha256-37e64vQEz+C3K00jlEaYy3FrdmUXGBKgpND1kmwPrHk=", + "pom": "sha256-L/bBfZwGC4nNfvGPpICuJEbrqGhVpjPziSg3/DuEj+8=" + }, + "com/zaxxer#HikariCP/5.0.1": { + "jar": "sha256-JtSSOX5ndbQpZzeokZvwQEev5YJ/3SwItFV1lUNrOis=", + "pom": "sha256-xHNfXT/2ylsyI0Xofw3diA9XkNiLzle6/hqfn8eeAq4=" + }, + "commons-beanutils#commons-beanutils/1.9.4": { + "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", + "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" + }, + "commons-collections#commons-collections/3.2.2": { + "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", + "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" + }, + "commons-io#commons-io/2.15.1": { + "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-logging#commons-logging/1.0.4": { + "jar": "sha256-6Ur0l0k4TBH1qlDo0PX+Z5vncSlbUgMDONMoQ8mANR4=", + "pom": "sha256-ZdMQUJNStUJRGCJe5gCgH4O6chQtA1AUtdFkvASy0oQ=" + }, + "commons-logging#commons-logging/1.2": { + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "io/dropwizard/metrics#metrics-bom/4.2.19": { + "pom": "sha256-+G9/Vev/HwNOTVHbypTh18FykokM79GdBDDugjrFxDo=" + }, + "io/dropwizard/metrics#metrics-bom/4.2.25": { + "pom": "sha256-glrTe4OA+ZK1FQULvZVFL4VGb+rnuFbVwVDU5fcWqOk=" + }, + "io/dropwizard/metrics#metrics-parent/4.2.19": { + "pom": "sha256-lm7hDMMMk2UClsipjkFs11IpEj1WItPcHqV+UgjVgLY=" + }, + "io/dropwizard/metrics#metrics-parent/4.2.25": { + "pom": "sha256-33tjcfmxVpjhI9mGHyCZyjLJ7JZtnwxgdVoqNMy/q8I=" + }, + "io/fabric8#kubernetes-client-bom/5.12.4": { + "pom": "sha256-0jI5KonD79yFqymcWpToud01vALzQM6ERv9lmqFZE6A=" + }, + "io/github/pixee#java-security-toolkit/1.1.3": { + "jar": "sha256-eZW1qPrE0aZasCh5AHYWBOa7G+OOsoX0FdCR6PKLAFY=", + "module": "sha256-72CmAQlWmBzCsbpfl1BtbRr5vHdnfOxZfbNgVGypBi8=", + "pom": "sha256-REGk9EmIQBEsrcsUKSL5HqIrKzTgRWPwnemk4K6sdv4=" + }, + "io/micrometer#micrometer-bom/1.11.2": { + "pom": "sha256-2qo2vb6vKmnTVi6A92D+f4bU02uUGsBbqhjPpGtkvhA=" + }, + "io/micrometer#micrometer-bom/1.12.4": { + "pom": "sha256-5db0qM57qkrlKtZ8hWlFcfr2XaUC9LYiKm2guglgJc0=" + }, + "io/micrometer#micrometer-commons/1.12.4": { + "jar": "sha256-YuRvO0biNOOPgzPPPjpf9U0KnzyokOS5dzZ00YDDaRQ=", + "pom": "sha256-TVSeACNoTzcRH5XKktaz2YI69rZasC5XxYy7hCwjgIs=" + }, + "io/micrometer#micrometer-core/1.12.4": { + "jar": "sha256-whV432b5MDFUqiTuuC6o5rLC/RmFCGa0y+UdyWkKJAE=", + "pom": "sha256-vB3kn7iQlw0VQrspDUTFPGJmVYxcyKn135IYcZjtT6c=" + }, + "io/micrometer#micrometer-jakarta9/1.12.4": { + "jar": "sha256-bfoEnUZuA5VwR+/LLAoYFWJorrydU0aQ48xam1RUMi4=", + "pom": "sha256-V02QPoQColDwQf8VUkxV3ATFCVluXFWY7MM//8FXu08=" + }, + "io/micrometer#micrometer-observation/1.12.4": { + "jar": "sha256-UaZwuzPPl5vKSbRjkb10TDpOI2mdCjBcITTvDQGpEPM=", + "pom": "sha256-xkVXuEggDQwjmPCzq65IIMIjI+j0dO06kbAYUAEpXjg=" + }, + "io/micrometer#micrometer-tracing-bom/1.1.3": { + "pom": "sha256-fprbb3oR0grb8tb/f7NMCJ9FGvQdM7uRjr17kcXszJk=" + }, + "io/micrometer#micrometer-tracing-bom/1.2.4": { + "pom": "sha256-57ZJO5fCoBH3POtaRdSCHXk4aLp5dN5kdcdddlj9iMc=" + }, + "io/netty#netty-bom/4.1.107.Final": { + "pom": "sha256-w2mXVYv7ThHyAN2m7i5BpF8t+eGu9njtoI553Yk4whA=" + }, + "io/netty#netty-bom/4.1.94.Final": { + "pom": "sha256-FLsEPt93HvaT1f9ezBRm913JFpjwSn+oIrMJPT0COdE=" + }, + "io/netty#netty-bom/4.1.97.Final": { + "pom": "sha256-eDs+5JRlAO5batDkP81p1/KbiPcknMkTPDn1PQGhUgA=" + }, + "io/opentelemetry#opentelemetry-bom/1.25.0": { + "module": "sha256-RHe55WRW2h7ZM64ig4bOAbusBl2bVLSZ7cKI4rumzLk=", + "pom": "sha256-VsipemuNS6DjaRVWdCMISrVTq++a+XTaGTXcIeXjCR8=" + }, + "io/opentelemetry#opentelemetry-bom/1.31.0": { + "module": "sha256-LeU7hvtjWgl0WtgKGg+yFZSCKjHuN605YQwM/QAiE6E=", + "pom": "sha256-EAmW9IHDQxgozgeqeBIPyyOLdLzW9FibCDVqRXCLf+A=" + }, + "io/projectreactor#reactor-bom/2022.0.9": { + "module": "sha256-BfI8ABvRI1lpnqe+Y6bRi03YWoqRZ/PxehkRrwI9t7k=", + "pom": "sha256-agI/PfE5yap6gWUR1YSSnd0PXrhIeb+i46VRTFsXYJI=" + }, + "io/projectreactor#reactor-bom/2023.0.4": { + "module": "sha256-g7dS+AbTfh8yxIr2ZuFMDIW8D0taUAFkciD1drxSoLI=", + "pom": "sha256-jvedycp5GYn9t/4aIgnOVmg70kzzX1OPSQgQFvuIhEE=" + }, + "io/prometheus#parent/0.16.0": { + "pom": "sha256-citVEZCXsE1xFHnftg3VSye1kgoa63cCAnxEohX/xZY=" + }, + "io/prometheus#simpleclient_bom/0.16.0": { + "pom": "sha256-r0QdMpXeEacONf6+s9kZui7RdVJ1MWMyW5VNU1lNVcM=" + }, + "io/rest-assured#rest-assured-bom/5.3.1": { + "pom": "sha256-Tg5ZUuRY6U+3dZ3nFM6hy9ru/ZFSJ4Z1if6R1EKJBUg=" + }, + "io/rest-assured#rest-assured-bom/5.3.2": { + "pom": "sha256-zMdatMCunjb9B+ZfKP+dGWv1oY3jVldWdk8VpYz5X3g=" + }, + "io/rsocket#rsocket-bom/1.1.3": { + "pom": "sha256-5czY/tNBW7Q4Xk0Hh+PjNiTLLHwALSVQw5eI8rubD64=" + }, + "io/smallrye#jandex-parent/3.1.2": { + "pom": "sha256-fkYFO0xKyz2eo+8LDLLRqWvriSRanlsriuSEzXX4Its=" + }, + "io/smallrye#jandex/3.1.2": { + "jar": "sha256-3uEvoXh9VSPtGgLWxjsZ5672rFYPfG1wWV2wGqN+BB4=", + "pom": "sha256-HFK+SK0hc8V9n7gVhdW/WriGO1jz8sd6/zIL7zINP7o=" + }, + "io/smallrye#smallrye-build-parent/39": { + "pom": "sha256-NtHAKKxxhuPvCc0h603rb8RGdU0Mubl6NVGkwePGzwI=" + }, + "io/swagger/core/v3#swagger-annotations-jakarta/2.2.15": { + "jar": "sha256-2RvQjd92HA2zTvao4Ftf4/7cJrt2h4ti/aEwJLhP7Qw=", + "pom": "sha256-O0+45xZK8IyJMqLESv5jv2Hgc+oF/64iHNxCs3izL68=" + }, + "io/swagger/core/v3#swagger-core-jakarta/2.2.15": { + "jar": "sha256-P+NWP4qRp84f60pqgVlN3PcJHNtPMJ6tjaNPNbezY+Q=", + "pom": "sha256-KqQIInyuhFI7Ey892SGRZA4Hh7gNvMCvshm9qYEV+6A=" + }, + "io/swagger/core/v3#swagger-models-jakarta/2.2.15": { + "jar": "sha256-nsdvb7bqw4X3wJGU9aOGTXb6qDyvtBLcciaZcIvIXeo=", + "pom": "sha256-lYxl0r9XBqnmkVQ7CLl34MMBQfzFzEHuEYlflZ3WJqg=" + }, + "io/swagger/core/v3#swagger-project-jakarta/2.2.15": { + "pom": "sha256-DuEGCUZxQIy4MPJj6NidCVKzXT8oiqY6Mh6CtA9Uugg=" + }, + "io/zipkin/brave#brave-bom/5.15.1": { + "pom": "sha256-HX6AYLG4a9DsxU3Hv99gp9bgAHYaTL0zLCry1W9vvZs=" + }, + "io/zipkin/brave#brave-bom/5.16.0": { + "pom": "sha256-vatLPlSHv9jhec+ipE71zoJLrMQqstaQs4SbIsZ67Gc=" + }, + "io/zipkin/reporter2#zipkin-reporter-bom/2.16.3": { + "pom": "sha256-3hWmaeME4kB8d2agw6vuCKTsAf+JOoBJoJFo5kPFpvw=" + }, + "jakarta/activation#jakarta.activation-api/2.1.3": { + "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", + "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" + }, + "jakarta/annotation#jakarta.annotation-api/2.1.1": { + "jar": "sha256-X2X9r0JO7itV4diCupuzdr6T+wmze4CL5uIuiFHJCf4=", + "pom": "sha256-r2UOyh3huYdBAGrNglB+RAjP/t0v7jOg6kY9YVCNt+w=" + }, + "jakarta/inject#jakarta.inject-api/2.0.1": { + "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", + "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" + }, + "jakarta/persistence#jakarta.persistence-api/3.1.0": { + "jar": "sha256-R1OJRG01xvRsVlcot1bcUIwoRkTqJpBkTg2OfjOdQv0=", + "pom": "sha256-+Hb8jYhnM1QPWYFat3sbmYvuxwgAMt+xUmyt5GzuzL0=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "jakarta/servlet#jakarta.servlet-api/6.0.0": { + "jar": "sha256-wDTrGvsViYfbtTpf6gyt9hHI2ujardWcRNnVq3ASnO8=", + "pom": "sha256-PVolnfvSuUDklcMFy6K2BhWSPcgXjgMrfvYMuyQThDk=" + }, + "jakarta/transaction#jakarta.transaction-api/2.0.1": { + "jar": "sha256-UMCnx2DBOubAQqzxgrKPAEdBPblbRjb7iHm8/6tbqHU=", + "pom": "sha256-X+NJmBwVb7viY4jVmUn9rBa7jXh57mGzTEnHtc4PLyM=" + }, + "jakarta/validation#jakarta.validation-api/3.0.2": { + "jar": "sha256-KRwl5pEMxqfr2W1Ma66/bXw3Z2xUgsLZYUbpAbYsH8k=", + "pom": "sha256-CnucYyeWiv4NgvfPT6y9p+FXloxYCNaby4AZhjspjcQ=" + }, + "jakarta/websocket#jakarta.websocket-all/2.1.1": { + "pom": "sha256-J9vJgkpicx4a2/XKfTEkJS+MAjPlVs7aiACjDNGPO7U=" + }, + "jakarta/websocket#jakarta.websocket-api/2.1.1": { + "jar": "sha256-vq25LCbQTaZT9tLbJTK1Sbeg2+WcbiLCPlW9A2F/ASA=", + "pom": "sha256-3xb6ydroxTIAIOJWDJUBbENAFYK5eFyIE8Sv33At610=" + }, + "jakarta/websocket#jakarta.websocket-client-api/2.1.1": { + "jar": "sha256-6P6MHf+Ug4WkYdvIXexUZ8vjUPBl7BoPO/7VO3nnsQI=", + "pom": "sha256-OC2FVbzLdeOu+epfSndOuByFpSs2SlKdkyah59L0jdo=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/4.0.2": { + "pom": "sha256-SCzbRtTdL1r33IhMim3nPd/+ba9UnvNqbAd/1uQe7Qg=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/4.0.2": { + "jar": "sha256-DWvP5Hdj6FBHrPfDmDNtyE/4XrytCny287nT6YEkVAY=", + "pom": "sha256-q3Jz4mpUgks7czPUlW5uzSbeE6XrPZDuYwIxk6ktcr4=" + }, + "net/bytebuddy#byte-buddy-agent/1.14.12": { + "jar": "sha256-KzCakwAJLgtpb3xHH9UdmWkAHfeEyKufB5l0N9dXrW0=", + "pom": "sha256-ZpifcNNV1gD9TZJtiDXke30b7/Z47r7FnRljY7XNTCw=" + }, + "net/bytebuddy#byte-buddy-parent/1.14.12": { + "pom": "sha256-m3/SvyklMayw6XTZVeSjbKQTMt0Nr+icJNj+Q5uuV7A=" + }, + "net/bytebuddy#byte-buddy/1.14.12": { + "jar": "sha256-lwY2E01hwYOxn49Y+mMeMNLyq8o0SzeEijk8rHhj3XA=", + "pom": "sha256-XamVxw3nt/SoSKhUN8fd7oA9GrfKwtfY33GUw9XicU0=" + }, + "net/java/abeille#abeille/3.0": { + "pom": "sha256-tV3TFjYwhIkWkPnb0dHwbJWcRbJaYOBWjqkVSDplZH8=" + }, + "net/minidev#accessors-smart/2.5.0": { + "jar": "sha256-EjFPxogdZqQT/WY3B4etuhblBPv34ThpCw85UuP70yE=", + "pom": "sha256-VJelxIYeWCxm5xyHzFppgtauiz4hSUersbl7l70+HAc=" + }, + "net/minidev#json-smart/2.5.0": { + "jar": "sha256-QyueVFhIxBQbgHF7JuNn+DvzPxklCiKM512m6WfaK8c=", + "pom": "sha256-wyo2YQmypaNuoA4SGqolfa5W7jqbl9JEI+YzteIUVGY=" + }, + "net/sf/launch4j#launch4j/3.50": { + "pom": "sha256-1716EuPm1bR/Ou0p/4g89cTKnie3GWkQZnkzH6N+xy0=" + }, + "net/sf/launch4j#launch4j/3.50/workdir-linux64": { + "jar": "sha256-/uvoOrT+Q5F+qn3/Jy3uDvP6hUvWgzRDRDDgjjoS8zA=" + }, + "org/antlr#antlr4-master/4.13.0": { + "pom": "sha256-IiBv17pJUVLlJvUO/sn8j03QX8tD38+PJk6Dffa2Qk8=" + }, + "org/antlr#antlr4-runtime/4.13.0": { + "jar": "sha256-vX97XQe8CwR/EJFbMspLsd6eV9gEkJiILkRTyIwHal0=", + "pom": "sha256-GY40+1rHWXsaPDGTAwHgjOlB5cpQQRbdVKOnU3iRSn8=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/16": { + "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" + }, + "org/apache#apache/19": { + "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/29": { + "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" + }, + "org/apache#apache/3": { + "pom": "sha256-OTxQr7S3qm61flN3pVoaBhCxn3W1Ls4BMI2wShGHog4=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/ant#ant-launcher/1.10.9": { + "pom": "sha256-Ek3lb+ph22wNtJwHnR62XUiWwaxNEf8mVXvjaePb6ls=" + }, + "org/apache/ant#ant-parent/1.10.9": { + "pom": "sha256-ytRkDglENOlwQa4RFy0QmA7AQpmERWC/Z+Rje+hFC5Y=" + }, + "org/apache/ant#ant/1.10.9": { + "pom": "sha256-tidgF89vKge3t7YneDMyN8pzQF/MOvHKnZX1L5f7eeE=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-lang3/3.13.0": { + "jar": "sha256-gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=", + "pom": "sha256-/3zqTrI53WIRdRDavlGo1fDJ5MxCa8PowsIhpxj4ZIQ=" + }, + "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/47": { + "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/commons#commons-parent/58": { + "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "org/apache/commons#commons-parent/65": { + "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" + }, + "org/apache/commons#commons-text/1.11.0": { + "jar": "sha256-Ks8woHCxkWPVpIDq5BGigTQehwAg41NMbV1MhHJznjA=", + "pom": "sha256-O0AZecBkEoXYUM8Ri04Y8EmsIj3Hherk0LNXKPxTTRE=" + }, + "org/apache/groovy#groovy-bom/4.0.13": { + "module": "sha256-UMvUHEPhbMJKIJ7i2pNdeV1rN8VnNQlmtJJusxQwM6M=", + "pom": "sha256-M5j/NPIIMkDWY0erSnMzudi3nTqVrN8vz03DAn2B5qs=" + }, + "org/apache/groovy#groovy-bom/4.0.20": { + "module": "sha256-+HZJydeO91O7YLIw6bLPXDf5tlB9pLVmGuf+3NLmu8k=", + "pom": "sha256-VB0owxBiqdn/BwrqS9XRmSIQQijrho7qjabmkfJtPnQ=" + }, + "org/apache/logging#logging-parent/10.1.1": { + "pom": "sha256-NO01x8rCVD9sSDtIvT0B+rFcApjUXUoFkuJ1kZhiH7I=" + }, + "org/apache/logging#logging-parent/7": { + "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + }, + "org/apache/logging/log4j#log4j-api/2.21.1": { + "jar": "sha256-HbSOGAiBvvHetQICIAagJaJI2PaiYYZ4mwx85IfGAtY=", + "pom": "sha256-reMKNdCtO0t0ts+8Sfx3+Uy0B+EAKZ377e4nJVPcvpg=" + }, + "org/apache/logging/log4j#log4j-bom/2.20.0": { + "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + }, + "org/apache/logging/log4j#log4j-bom/2.21.1": { + "pom": "sha256-Rv6OpW5KSk5E+fU8/0J/T1UL7y7WGyP6WR2DpeOVBjc=" + }, + "org/apache/logging/log4j#log4j-to-slf4j/2.21.1": { + "jar": "sha256-3hQ8Vluniw8sC+WPEyx67HXm4aEIRevaWk8XwqNdmZA=", + "pom": "sha256-H+pgZBIKmcgZUvNVxYE1e2wSxxzA/RmmEFY4Y+j5/CE=" + }, + "org/apache/logging/log4j#log4j/2.21.1": { + "pom": "sha256-PFbCFYVfPiXOPPWi2Kgmmk8aPV8JjaAYfM3T8GxskjI=" + }, + "org/apache/pdfbox#fontbox/3.0.2": { + "jar": "sha256-ds8EEOkD49txQDKvu0WNWiO5IlO5/fiAA18J6orTraw=", + "pom": "sha256-hthT5W8q+Yb6c1s/kH6jh6KXNCLH0F8TwDasuRNal90=" + }, + "org/apache/pdfbox#pdfbox-io/3.0.2": { + "jar": "sha256-nW535C437zaC53aBEpwxRRXog9UKvB3aljguejHnDjg=", + "pom": "sha256-yD3gYR+UMN4W2dakjfXJEPgrkfHgU1xB9Woy9iYwz0c=" + }, + "org/apache/pdfbox#pdfbox-parent/3.0.2": { + "pom": "sha256-kN6rEjTjkUu8B07Ax3Y7+kFHgICziISpOwtVVxnWY0g=" + }, + "org/apache/pdfbox#pdfbox/3.0.2": { + "jar": "sha256-yv4sysEB6ao63z9+p23/AuWIWislWLdfr/l0dvBIfuI=", + "pom": "sha256-wMNAwn6AF2V+Y81PaJUG8U03Y10NFebRpAjysZFGax8=" + }, + "org/apache/pdfbox#xmpbox/3.0.2": { + "jar": "sha256-GJLj3icM8GdIRgZW0G0/sNFfScVLfRs4hB5sl0WwGuQ=", + "pom": "sha256-LOPcpcHUKiZOJw5rOrIcR5Dd0f2Vg3ZOkjfGoYqKkXc=" + }, + "org/apache/tomcat/embed#tomcat-embed-el/10.1.19": { + "jar": "sha256-rNG5rYxgxyyZte0B0+9nR/hb5sUbWwRaNlaG3oib+uQ=", + "pom": "sha256-Za4PdNUBiVQs7BOlb5XEcoFf1jm7SbETbPUIFh0CMiw=" + }, + "org/apache/xmlgraphics#batik-all/1.17": { + "jar": "sha256-F0thbZPqTauabQwjwatfFGEjwO4lNAh5MWB/nuElMZE=", + "pom": "sha256-V3JwMcCaBTM5LTiyi4DfzJvMdZC8ZPd1Lj0hgX7sAHc=" + }, + "org/apache/xmlgraphics#batik/1.17": { + "pom": "sha256-D9ZlDtWtkmuw6X2xx/yMJqQOOmtrShOxR2XryjKvsTo=" + }, + "org/apache/xmlgraphics#xmlgraphics-commons/2.9": { + "jar": "sha256-Lr0zOrKmJFFHk8M2468IZghnMob+N7oeY54Kw+G1i+I=", + "pom": "sha256-CS1SCmHKS4pFkEN0JMQhzbDPQOeYrs7PKwUm8q+PH4g=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/aspectj#aspectjweaver/1.9.21": { + "jar": "sha256-zDOX2dOhFIlHVvxnd5lB9fBLBuMuQaqUCFZMZxoVBLo=", + "pom": "sha256-Vhn7SZr9b1S5HpVum9/iIi8STjpgdx80OH1vZ3SUelw=" + }, + "org/assertj#assertj-bom/3.24.2": { + "pom": "sha256-EqxGrmTTYl80S79kKrVvoC4Vuu/lPvX1sGHhJLSEYgA=" + }, + "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/attoparser#attoparser/2.0.7.RELEASE": { + "jar": "sha256-dd0cBFSSv/jhljqrsov+kDwgZOEeJ/4vDwr/GtPYRHY=", + "pom": "sha256-sJ04k7/zYJkkXdPBnELIDdzLGAukcvlMGqti8A41vgg=" + }, + "org/awaitility#awaitility-parent/4.2.0": { + "pom": "sha256-LasXIPpF4j2gj3qKOxw8Tbo2oM/xMJALiOZYlxJ1y0U=" + }, + "org/awaitility#awaitility/4.2.0": { + "jar": "sha256-LSO3khH90ZA29pQMx4NUN3kyCq+G841uOFov8m2kEnI=", + "pom": "sha256-O9OMaPy2lPb+4pu1BCyWv209RqN9EyKU+HxivWs4ITo=" + }, + "org/bouncycastle#bcpkix-jdk18on/1.77": { + "jar": "sha256-Gsf+jv1bLzjNwWW+WgZ1c0/kSAjauScHIB8DpTXW8bg=", + "pom": "sha256-j7CSbwLixLLcUuR+uwk/kvHTu28UnCpcyl4qZI0sSY0=" + }, + "org/bouncycastle#bcprov-jdk18on/1.77": { + "jar": "sha256-2ruYwk1yybn1hWM9HfnFzVjZrTc9DNaBNn5qYDpJXVg=", + "pom": "sha256-rROCz80DvN2L4TkTwC9E/UadCnalPPLK71vhgK3DayM=" + }, + "org/bouncycastle#bcutil-jdk18on/1.77": { + "jar": "sha256-lHZzvLxajd4tL6aIpbdZjQym4qdKfqMM2T8E9rOtaPg=", + "pom": "sha256-Fj36ZjL/uSinBcqDciNQys6knM1iPOc2RaXMOw+p5ug=" + }, + "org/codehaus/groovy#groovy-bom/3.0.19": { + "pom": "sha256-E+POc+1L+fxu4rVA2FVWh/astwf4SSOUFMgnfUMd7KE=" + }, + "org/commonmark#commonmark-ext-gfm-tables/0.22.0": { + "jar": "sha256-yb02kBoKZ/DdTPhOiPizdps1klrE8rypEik29yCRXLI=", + "pom": "sha256-FDGltPkhvIXyNR1/GuvN14Og7zxStFiGifqZ1Pyx7ns=" + }, + "org/commonmark#commonmark-parent/0.22.0": { + "pom": "sha256-YwxW0a89ryKEl8dsNWN0lSk9MDngyffFhJQIzlTuzdc=" + }, + "org/commonmark#commonmark/0.22.0": { + "jar": "sha256-NBeQnymXvIxh2Q1kxq8p9KP1tnKcrOrvlyIc6sk9+BQ=", + "pom": "sha256-jQUuO3manv/Yu+1TTDV98402HbOAxBCVB26Bj5h6sRQ=" + }, + "org/eclipse/angus#angus-activation-project/2.0.2": { + "pom": "sha256-r5GIoQy4qk61/+bTkfHuIVnx6kp/2JDuaYYj5vN52PY=" + }, + "org/eclipse/angus#angus-activation/2.0.2": { + "jar": "sha256-bdO8/8IrzoOwc3ag4uCU5JZKMZXUEY+0PjgO81Q2zB4=", + "pom": "sha256-deViGn3IWMmW7nDGtNiE2QHRh4Ns5sZxIMr5VH5vxXE=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.8": { + "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jetty#jetty-alpn-client/12.0.7": { + "jar": "sha256-YxdWV8ebpXlOZNZrhLePSD07SNZ5PyGFJ3+HFD0khKQ=", + "pom": "sha256-8Af80vHeqJfKKzDGBYaAEaNxlrMzx+xLrPFFBlEuOXc=" + }, + "org/eclipse/jetty#jetty-alpn/12.0.7": { + "pom": "sha256-+taXYU5Y0g/gS/WhYVh/ugFRo4TNHg/wi1uNJynIal4=" + }, + "org/eclipse/jetty#jetty-bom/11.0.15": { + "pom": "sha256-+ksNDeuvyR9Q++wI7+RkInAzTzeOg562o1+jdqoaLPg=" + }, + "org/eclipse/jetty#jetty-bom/12.0.7": { + "pom": "sha256-Tmywx2r+TZYMlnxr+27cy9Or02XwenkDKSMTDcClu9c=" + }, + "org/eclipse/jetty#jetty-bom/9.4.53.v20231009": { + "pom": "sha256-+vlzoZh0JmzQhlsCmeup8WfLsHB13U/tvj1hVjV+ndU=" + }, + "org/eclipse/jetty#jetty-client/12.0.7": { + "jar": "sha256-kRKisrw635zWQLQ9fSA46BWk3rvG/ZPiZuouK4G/vXM=", + "pom": "sha256-njK8Q0z4JHlF+OOQ21aeK1zRHXsTUeeB2h6DLPCCkGY=" + }, + "org/eclipse/jetty#jetty-core/12.0.7": { + "pom": "sha256-VVn/wpuShKsdqAs4jZw5kYw7lpXJIaTCwNVGWCrtTX0=" + }, + "org/eclipse/jetty#jetty-http/12.0.7": { + "jar": "sha256-uhczUMrRZYFufIrFyzcwqJV2PBCGNwGE90mkbEJkJ8w=", + "pom": "sha256-44BTqnBsi2HvGpZccB2/Uuu2WpeXcBkBlE8Ye3rbqz4=" + }, + "org/eclipse/jetty#jetty-io/12.0.7": { + "jar": "sha256-AvScx82lsGMrsRSb7akttQ/WE6JR4cjvBvQLlOjPio8=", + "pom": "sha256-EBF7Ih+DdMuLdyonoZ2kJ1V7iBf/ghEGrhcb3w+G/qU=" + }, + "org/eclipse/jetty#jetty-jndi/12.0.7": { + "jar": "sha256-/k7+Xt9q58mrRwndO8rpohReCVt1JvVRHrhAuAAjE5E=", + "pom": "sha256-3w7T96MgcxKXq44zlYFFAkS1TGvr2MMuRMXFAuGk04E=" + }, + "org/eclipse/jetty#jetty-plus/12.0.7": { + "jar": "sha256-nWKF154Wj88s7vrKDht8LOa1g5Q0HespP0el4BHMAfM=", + "pom": "sha256-XW+UR7cjLpqkrO5xDZAZ1YRNZUUoyHBx2iiVYB3ukgo=" + }, + "org/eclipse/jetty#jetty-project/12.0.7": { + "pom": "sha256-kY4GfPOIuVqLydGaK2Z5hxsoKa1/NLKyANeBrIpMrO8=" + }, + "org/eclipse/jetty#jetty-security/12.0.7": { + "jar": "sha256-Pa5/oMtzr1HhZ4gaQZdxBsi3RA2tfc79aKTtIdrjI0Y=", + "pom": "sha256-FpML7sOGfmKw2WTClbruIqXROKl6s9q6M9nUsObNZeA=" + }, + "org/eclipse/jetty#jetty-server/12.0.7": { + "jar": "sha256-hL5nXqZc2SEg566w7Uwz1lmZYFgYvYvEp5PKXY0uH3U=", + "pom": "sha256-RPrL4EpUuWksw9O2XSyiS2k18L2sPYCUvf2EljoXHpo=" + }, + "org/eclipse/jetty#jetty-session/12.0.7": { + "jar": "sha256-mcBZ9+WyQjpnQU4ZZEjD0FSoFjEJwJomTYdyhiP1Bf4=", + "pom": "sha256-VtoU55R8i4AucsMfcbiGpCe4sbufC2unszmofs5Hbj0=" + }, + "org/eclipse/jetty#jetty-util/12.0.7": { + "jar": "sha256-kwZqCVyspBBunz+ibDiN4fotLFVLmFmwRdjRqThjgXU=", + "pom": "sha256-ZzfyxZ8l8kOFIV4Z0f7Lzx/BRa2gRDK2CWTwA4Rejq8=" + }, + "org/eclipse/jetty#jetty-xml/12.0.7": { + "jar": "sha256-9vBsQiYbN52/V8CDiv7uLNg8adUHv76PwJbDrqLDIOQ=", + "pom": "sha256-QrxwoV9AG21CQQ+Pd1pI0XHRsYgUNDl/ppOOsK2O3YE=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-annotations/12.0.7": { + "jar": "sha256-4knkXT8UO9lH5tjnARbxJXt8Sy6wBTmDi1ZqndW8IF8=", + "pom": "sha256-OzT6LlWYLG68GSbDm8I87NELyLVuLE20T/w34TKWS2E=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-bom/12.0.7": { + "pom": "sha256-hDBz9n7+k+EFLf7pjsECp9joYoKrUONpzMUEXzjhzd4=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-plus/12.0.7": { + "jar": "sha256-E8NvjbRMI4D6XVkJgK1ky0avcO+WBI27YmQGx1QbPsQ=", + "pom": "sha256-gwEntcRmmqbiO7ch/N8XesiwihvFNue23kGvDpND46o=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-servlet/12.0.7": { + "jar": "sha256-natemJ6UaAq2azI96FpZJj0brLAA0qU8E6ivpWu4hcU=", + "pom": "sha256-JIoarzkdwzsZwFkvUKsnh0vC7NVWMSuhm19xpB9LKdM=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-servlets/12.0.7": { + "jar": "sha256-bOAryXT0xsKG1xA/avO2XhpRVyydl1un1aL6KHhAx8g=", + "pom": "sha256-vspY2FwraSssjKYyxnS9eaGAu/M+I5M0dQHI0QLEtFs=" + }, + "org/eclipse/jetty/ee10#jetty-ee10-webapp/12.0.7": { + "jar": "sha256-y1KdrBSR+OfqceW3Sfz1ntlSldjBji9x51Htl6H0kMc=", + "pom": "sha256-ABmnbrthJAQGUphZCJ72a3OZ+fC7jxZQMqKAHxMTxzY=" + }, + "org/eclipse/jetty/ee10#jetty-ee10/12.0.7": { + "pom": "sha256-1FrfFrxnSVbeZxXd/dTNg/yJ8kx2IXGZI0/qsJdqClY=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-client/12.0.7": { + "jar": "sha256-vQoBjfy0yw2UZOpZ6ke5JVi5KKauDAWEqacv9LDaDeQ=", + "pom": "sha256-HE2aGex6gj6kY8r0FMWQdZxRzOoYeDbNtCXGjbAlbvA=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-common/12.0.7": { + "jar": "sha256-yBfr3NxzDFDA5s9BpfDoj0GCTewjBRBi3E01HnxMTNQ=", + "pom": "sha256-mqBhmkUImpBIkT148Fvt/pjbd27Z6TqdY1+rNEv99sU=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jakarta-server/12.0.7": { + "jar": "sha256-A19hqfAVgm1o87Zweka/SYoFx4y5Q/8Iaz0QUoy3z1o=", + "pom": "sha256-o6pdb2eL+pnC6L1Q5lgNLi4oamIfFTsZvc0q2+OKfDM=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-jetty-server/12.0.7": { + "jar": "sha256-Ts74xCOob76QsDmFBcHZD8TKwM9g3VIuMQ7JJ1fsG18=", + "pom": "sha256-zE5zAM1radv2kWPRXEENPfKFxNGjKXDPS0HCl0/oaCk=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket-servlet/12.0.7": { + "jar": "sha256-7WAYEdZrzIKYO0Sv4zAjMU8koCLPrGtVdt5Tlgwy3y4=", + "pom": "sha256-2nbRYHjEV5q8c8+dDABV/1VZ0JW3kq2dmhhfAKoq00E=" + }, + "org/eclipse/jetty/ee10/websocket#jetty-ee10-websocket/12.0.7": { + "pom": "sha256-wtne5akTiixFGtAv+N5Yf+deZG+eqSfJJOmbHCJ7va0=" + }, + "org/eclipse/jetty/websocket#jetty-websocket-core-client/12.0.7": { + "jar": "sha256-PISYNhMgHsu01x6Ndo6/EbvAIHhJG+HsX4XvzNkuTPY=", + "pom": "sha256-iEUsuxBfM0/j+yVIkOm7JjEYPINBhynK8AhepMY0l0M=" + }, + "org/eclipse/jetty/websocket#jetty-websocket-core-common/12.0.7": { + "jar": "sha256-HeOZnr5cS0JRMiKFNDz0QlSGwap5GrA5lbKVioIsv4k=", + "pom": "sha256-0Uvg308AGBopUyXYQQLnUSqTR+SznWc2h2VZ8jBRqVM=" + }, + "org/eclipse/jetty/websocket#jetty-websocket-core-server/12.0.7": { + "jar": "sha256-9+SmIFMyhCOztVPwR0ODrTBF7mpsYFOCfslWuX0YUs4=", + "pom": "sha256-F5mF9191dWvfcTbip499FxUiB5Req3DwC+jsid8AANg=" + }, + "org/eclipse/jetty/websocket#jetty-websocket-jetty-api/12.0.7": { + "jar": "sha256-TW0eky1ao6ANk79hheVDrPs8cHRBtCaxRgYzDdd8Ync=", + "pom": "sha256-SJJEq2meLe5aymiuecB3UPaPJEX8kakVRwrl0IcOGP8=" + }, + "org/eclipse/jetty/websocket#jetty-websocket-jetty-common/12.0.7": { + "jar": "sha256-lY3a0UIQBCTldkZxqRnPIdkYCg9E/yAI3hPqWfiNQs4=", + "pom": "sha256-ZXh1WuFEm4wghu1kVJ6OCP//SVRt/NyHtMUyTspySqg=" + }, + "org/eclipse/jetty/websocket#jetty-websocket/12.0.7": { + "pom": "sha256-wxv6MC9SZtQx2ifh1+vOP7tZ+SKtcquE6m0zCfIti7Y=" + }, + "org/glassfish/jaxb#jaxb-bom/4.0.3": { + "pom": "sha256-Zg8EhAYlliYXiumpcrA86VFmXDPDM8q0U7EXi40NJBU=" + }, + "org/glassfish/jaxb#jaxb-bom/4.0.5": { + "pom": "sha256-7JfsQtk308iVGXl+RCRvgN4IUIGax6euZ1xEl7cHXDk=" + }, + "org/glassfish/jaxb#jaxb-core/4.0.5": { + "jar": "sha256-rT/ZvwDePtqYWfcLbPsBHi/pkEgE4WomZQkoiOzg/co=", + "pom": "sha256-S1OSE3b7/exg46j+8FjMPcmdn8o+nJUOhZKYeYRghXI=" + }, + "org/glassfish/jaxb#jaxb-runtime/4.0.5": { + "jar": "sha256-SF2JQOdjc6fzAIFepVBL9bcmwjRCWtMJcQGdEzEkzKQ=", + "pom": "sha256-d8T6BuLZyVN2LC5jUXN3oa4oWbGBssEzdZy1poKojKA=" + }, + "org/glassfish/jaxb#txw2/4.0.5": { + "jar": "sha256-kXNVvEUUgfMNBDsk0SMRBReWavNDg5AXc4goENykgOU=", + "pom": "sha256-a2gzdWAy4YOaQBRoFaWY7IsFg6Lv+9Rd311UMB9Ky6s=" + }, + "org/glassfish/jersey#jersey-bom/3.1.2": { + "pom": "sha256-WmsvkyguMAlcrhRpCiqrWpxTa1f/MuiQ6giu/4qEwT4=" + }, + "org/glassfish/jersey#jersey-bom/3.1.5": { + "pom": "sha256-WoMNet3GCaIEQueBfK+fbHts6yV/x/oO0Y8WHe+0SVc=" + }, + "org/hamcrest#hamcrest/2.2": { + "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", + "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + }, + "org/hdrhistogram#HdrHistogram/2.1.12": { + "jar": "sha256-m0f7rkRP6qxLfgTw6ilFaeS8KCvGnYws4qw/I1dygeI=", + "pom": "sha256-f7PnkMFU0bXiMXC7jL9/cO8ICa8XIp8dywENd5llEIA=" + }, + "org/hibernate/common#hibernate-commons-annotations/6.0.6.Final": { + "jar": "sha256-zZdOCoSB+v26+bSg8Iu1pslpsDZUgnY+7fd+b9f0k7c=", + "module": "sha256-WvzxkaqDNZY3NlnlROW1BnQmwbF0Hg3jcc6+K6wYOLs=", + "pom": "sha256-hzhyRO2hjBgdDvEwH4zyeQ8HTO2LXrFl1qW9TtIH5MQ=" + }, + "org/hibernate/orm#hibernate-core/6.4.4.Final": { + "jar": "sha256-oTJLfIDIAIJsml10thsN52gUH5Z8KwgmUMt79GdVcKc=", + "pom": "sha256-nKbm1A5oAPDV5aofZGeX3Ex9AvoGZvzvX4JXj/7KpE0=" + }, + "org/infinispan#infinispan-bom/11.0.18.Final": { + "pom": "sha256-msM5qJN8P0WwSXPDuUiJJdnKGe/AZJVGJ0ml4LnPKSA=" + }, + "org/infinispan#infinispan-bom/14.0.12.Final": { + "pom": "sha256-morEX54P+bvW3iEsHdCHIrxPrmuhC/vN7zaL8jroDh4=" + }, + "org/infinispan#infinispan-bom/14.0.27.Final": { + "pom": "sha256-4xy7kAucGCozFn8D8vglBkmE7PFZgMMztPzun9r6oNM=" + }, + "org/infinispan#infinispan-build-configuration-parent/11.0.18.Final": { + "pom": "sha256-8cAOWfuORG8HEL3BcZ5hlS8nwWFK5HhFLC8AEQNTIq4=" + }, + "org/infinispan#infinispan-build-configuration-parent/14.0.12.Final": { + "pom": "sha256-WTir5k+BZwjr5C5mlla+UltuhfxMyAh3OkVqnp6ne6I=" + }, + "org/infinispan#infinispan-build-configuration-parent/14.0.27.Final": { + "pom": "sha256-5eKwoVo9nMBdz+Ju7CroBCpbey9GMwFXDQPFjMqZcFQ=" + }, + "org/jboss#jboss-parent/36": { + "pom": "sha256-AA3WFimK69IanVcxh03wg9cphCS5HgN7c8vdB+vIPg4=" + }, + "org/jboss#jboss-parent/39": { + "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ=" + }, + "org/jboss/logging#jboss-logging/3.5.3.Final": { + "jar": "sha256-exGUYN4XQZWspBLf7VLKC77w7OJsLXQwG2Fyz630/1k=", + "pom": "sha256-GGFMhJXpXxL+1s8lR5syQwhTnRSUjmAoGLhH1Bld1Oo=" + }, + "org/jboss/logging#logging-parent/1.0.1.Final": { + "pom": "sha256-e2CEZRKTW9dYnba5e57G3W7zlUmesUEYULL00hDcDZM=" + }, + "org/jetbrains/kotlin#kotlin-bom/1.8.22": { + "pom": "sha256-yNeU63YYiNNDaeZ33o6roLAfnop1bPv/UyFcz6XFjD8=" + }, + "org/jetbrains/kotlin#kotlin-bom/1.9.23": { + "pom": "sha256-Gb8FhoXOaQ3AslVsVqux08SF+j4VXTXy08foBV+NeP8=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.7.3": { + "pom": "sha256-Tl0ZAOY3nvP1lw0EqPMFKa3IL4WejMEHwhzoFJ72ZsQ=" + }, + "org/jetbrains/kotlinx#kotlinx-serialization-bom/1.6.3": { + "pom": "sha256-KdaYQrt9RJviqkreakp85qpVgn0KsT0Wh0X+bZVzkzI=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.9.1": { + "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", + "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit#junit-bom/5.9.3": { + "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", + "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + }, + "org/junit/jupiter#junit-jupiter-api/5.10.2": { + "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=", + "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=", + "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.10.2": { + "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=", + "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=", + "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM=" + }, + "org/junit/jupiter#junit-jupiter-params/5.10.2": { + "jar": "sha256-7bHkP/C4BnYm/7VeXp7sodmrJHgUGnx/JT0RWynMfPI=", + "module": "sha256-IMLmXVKjnIVJbo4XDgjG7Sk1x/NeZRAT2WTcG7dcgns=", + "pom": "sha256-8n19CW20igXW56/YQalUVEJOVcUj167RZoF4szpjy9c=" + }, + "org/junit/jupiter#junit-jupiter/5.10.2": { + "jar": "sha256-Jj5DRH9LQPEmrWsdy9ffN5RIQTve244NJAxby7p8ek8=", + "module": "sha256-cjF2bPGyuJLGehQsljkU5rc/u1BhpschROt/jnJ3DsE=", + "pom": "sha256-1bcMXC10Ui2mEM04d28iW6wDSsJZGEO+6Xl6urOIDqs=" + }, + "org/junit/platform#junit-platform-commons/1.10.2": { + "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=", + "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=", + "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c=" + }, + "org/junit/platform#junit-platform-engine/1.10.2": { + "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=", + "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=", + "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728=" + }, + "org/latencyutils#LatencyUtils/2.0.3": { + "jar": "sha256-oyqf+gay9OAcU2D4+d97xdlFSl03PNjzYTR/paVxZew=", + "pom": "sha256-jwwBU3kLhK9sCTFtVpvRBu4PAIuTk+gLpHj1v2Vziig=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/mockito#mockito-bom/5.3.1": { + "pom": "sha256-F8lglCSkwzBWhOTlZS9VQRAyV1wafKPXhZZiEEafJTU=" + }, + "org/mockito#mockito-bom/5.7.0": { + "pom": "sha256-dlcAW89JAw1nzF1S3rxm3xj0jVTbs+1GZ/1yWwZ5+6A=" + }, + "org/mockito#mockito-core/5.7.0": { + "jar": "sha256-261edGZUkQoRpZ7LTQHjhGHz5dFhYWidwliNVVRDJSE=", + "pom": "sha256-eeZzpTX0jKN+6/dst6xMaZ1JRs7tbwgrBAxZNtRDAO8=" + }, + "org/mockito#mockito-junit-jupiter/5.7.0": { + "jar": "sha256-4kFqJgw6Rbp31nTP4n1JQo5X7+Iaey3ernM+u1xdhb8=", + "pom": "sha256-imEoqpHW4uT0Glxw6kEkfhgUnORgiDUbIFl6Y82qWZE=" + }, + "org/objenesis#objenesis-parent/3.3": { + "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + }, + "org/objenesis#objenesis/3.3": { + "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", + "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + }, + "org/opentest4j#opentest4j/1.3.0": { + "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", + "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", + "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" + }, + "org/ow2#ow2/1.5": { + "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-bom/9.5": { + "pom": "sha256-cXVrNd2DfbY4gG8A9Ad+i7Nf6NgL1nToFBowfIEWNb8=" + }, + "org/ow2/asm#asm-bom/9.6": { + "pom": "sha256-ig5fYk/ikwt6jWmVb0OORe9TKZa01kQJthbErvSxrE4=" + }, + "org/ow2/asm#asm-commons/9.6": { + "jar": "sha256-eu/Q1cCQFwHGn3UT/tp2X7a+M68s56oXxXgfyHZXxRE=", + "pom": "sha256-qYrkiVM0uvj/hr1mUWIQ29mgPxpuFeR92oKvz2tT13w=" + }, + "org/ow2/asm#asm-tree/9.6": { + "jar": "sha256-xD7PF7U5x3fhXae1uGVTs3fi05poPeYoVWfVKDiI5+8=", + "pom": "sha256-G8tIHX/Ba5VbtgygfIz6JCS87ni9xAW7oxx9b13C0RM=" + }, + "org/ow2/asm#asm/9.3": { + "pom": "sha256-jqwH4p+K6oOoFW17Kfo2j26/O+z7IJyaGsNqvZBhI+A=" + }, + "org/ow2/asm#asm/9.6": { + "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", + "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" + }, + "org/projectlombok#lombok/1.18.32": { + "jar": "sha256-l1dGdOKiX1Z6MTc2rOAN+Hh9RD3jFkB9V/yHfZ8Zpl0=", + "pom": "sha256-kJG8bAW2lzNJ2beLe33Y3abrt0zJ6nTieSlg+1A0ipI=" + }, + "org/seleniumhq/selenium#selenium-bom/4.14.1": { + "pom": "sha256-lsHFVPuI0tI0gU1PEQAVtuSGzw5Ai96qnqWRnJYw71A=" + }, + "org/seleniumhq/selenium#selenium-bom/4.8.3": { + "pom": "sha256-VjKTeC4Y0PLA1r3M6+vjQUjw7LuSuBjbCLhAXtOuCB4=" + }, + "org/skyscreamer#jsonassert/1.5.1": { + "jar": "sha256-Hpp8RD0N1XmQZkbXZ/NwGRinjLiKkxEvUoMF/JCV0mE=", + "pom": "sha256-x07S0PFNq9SGOLgph7qMwFCZmEsFluBwbEzUXs/XgWc=" + }, + "org/slf4j#jul-to-slf4j/2.0.12": { + "jar": "sha256-hPAoZMq4Zv+xlu0gIrG42mgupvs9ShYQaUKeg5HuKXk=", + "pom": "sha256-cSxGGjt/ZQhXk27ruv6k8afSqsHlVheuJM4+vjkorEg=" + }, + "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-parent/2.0.12": { + "pom": "sha256-fGvEdX5NSZJN3w/sX1zkAvg6bGzz4QUtGVsSgqeFVd4=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/springdoc#springdoc-openapi-starter-common/2.2.0": { + "jar": "sha256-zEr8QIcXzwP6tvVFrZZ1eDy6+D18h04LrnLLWPh2OG8=", + "pom": "sha256-ispBYN10vlujiirctgHGPFZ/ezLy1oY9/d2hkAX1yu0=" + }, + "org/springdoc#springdoc-openapi-starter-webmvc-api/2.2.0": { + "jar": "sha256-0LKlyYo07K2f0Mwo2mz5sH37yHeOJlMZAF0sSvI2+jI=", + "pom": "sha256-ZPUNQT5EKWrYbXRpe2WRlpLRoZ8kuR5yqDA25VQXKqo=" + }, + "org/springdoc#springdoc-openapi-starter-webmvc-ui/2.2.0": { + "jar": "sha256-2+lkQpxHn/vJKynrfLO8cRNuGzShifnOk0pxX2Uje9g=", + "pom": "sha256-Cv9w4vNuOl5Zgq2nnSbUxIiN4Umoiqya9fVdJ9ukizo=" + }, + "org/springdoc#springdoc-openapi/2.2.0": { + "pom": "sha256-Los3sS+E+doEZrqeLfbA2nneG1cyCSPFNW/oXbE0d2w=" + }, + "org/springframework#spring-aop/6.1.5": { + "jar": "sha256-HgPayw2pkpOO9ZfaqWJxBJku/LWiJPywuhB2H1YD23A=", + "module": "sha256-Gs+T81Rc9Igs7E2kdpv/gDvHItPOmE4V/EA/0SpoYKs=", + "pom": "sha256-BOtzUrc6yG0txf0phEh9zJhtK7Dkr2iTL8+5pv/3O5E=" + }, + "org/springframework#spring-aspects/6.1.5": { + "jar": "sha256-f+u/HH9IX9naYVtN/YPBJWQR3nXO5j86olIYQeLwIO0=", + "module": "sha256-CV0KNwdOWgR53RCLw8BXxU5fpgBjhsz7wE7d58GzjKA=", + "pom": "sha256-6pqt6vIWz9OTzoRU96wGbadbXo1n3BO752bCNnNkQt8=" + }, + "org/springframework#spring-beans/6.1.5": { + "jar": "sha256-vc9hA2KT/DR1Jy50O2JdZ54G0VK3gRNJUckHsYXw9fE=", + "module": "sha256-Xl8vA+zEAsSsmrvB/ai17XvXrqeQq+zPo/oIt0tYsZU=", + "pom": "sha256-Xabx7e45f/XlcfEevU74LTGwV8gz5eGDDCX+z2AtON8=" + }, + "org/springframework#spring-context/6.1.5": { + "jar": "sha256-j4XrCr4egPYqgx90vhNePLvgWHpRBBevdP3S476k7sc=", + "module": "sha256-Q/+/GUNAYNYvULfuQ9+Nm4z93wPTEqreWJJNwCUCr3Q=", + "pom": "sha256-ZUYqy97G8s3HsWRrV9Yqho+g9R16vfcfph1TO5piBzg=" + }, + "org/springframework#spring-core/6.1.5": { + "jar": "sha256-R22sKFCbP0fQteiVpjn6dawiGPB0ziFORIMqg2xGn34=", + "module": "sha256-9y0utFaZs5m96BcHjDofP9w1h88rIPVj+YRlFOcFd4k=", + "pom": "sha256-lAoGKQS46H9ZNzhcr59XLhFhI1MpGDX74aiTTkfgIvI=" + }, + "org/springframework#spring-expression/6.1.5": { + "jar": "sha256-Hze1DcrwkaQ7sQ2UYXj/9AgmdEl/2CFDgyeBXaFPf9A=", + "module": "sha256-BjxGmLzfA7yBy7p2C6QlORxmqCbr8oMV26qzaiDKXCU=", + "pom": "sha256-bGhL5Up+3D355xKaSvovDXHhPd15TGbDy8VFKRY7t4A=" + }, + "org/springframework#spring-framework-bom/5.3.29": { + "module": "sha256-pslWW9lncgrg50PCMmUst9yai4GAjvFDWv1/aJICE78=", + "pom": "sha256-Bald+izdhQdNkd3pYqk/KW2v3tf6l9Eu2+jQ/21hMys=" + }, + "org/springframework#spring-framework-bom/6.0.11": { + "module": "sha256-CV5xI53YkWkSRMjWvm19o05nC2UYaUeexdJBXZmrYZI=", + "pom": "sha256-SK3yYlH1WiPKJZbVBuBZEdmnZ3fm0CxSgMGhd4wUMGc=" + }, + "org/springframework#spring-framework-bom/6.1.5": { + "module": "sha256-7U7C7/BZdKQd6tLcvrGWx3zguWo0ASx1moJgekDyPkM=", + "pom": "sha256-yQDgm0NW62vBKuKjqnWvYyfM9k4xGSEtH6wUEs3j7RQ=" + }, + "org/springframework#spring-jcl/6.1.5": { + "jar": "sha256-xTVAQZ5IIkLIFdttaozYCvhaaoleODKbnZvWtGFlA+s=", + "module": "sha256-2cFwLKmfXbBVH0OfHVTdFTVFXp/mmorW8ITIcCuDufk=", + "pom": "sha256-zFNMIQNwPoP72KUfEIjB+IwxPFf8rBqVmbqUnYQrkuk=" + }, + "org/springframework#spring-jdbc/6.1.5": { + "jar": "sha256-EhoCQxcPwuz++fKlKfn9CbtGXZBeqg4pgjCOZFGTctU=", + "module": "sha256-EAKtC26LefaL7gxTpnG2f6mewMDp3ljqiBBUo0fR5x4=", + "pom": "sha256-bQmiCchhzxfOy+DlWfmFmSPPbmD0ifz4ozyMBwI9pJk=" + }, + "org/springframework#spring-orm/6.1.5": { + "jar": "sha256-1N5k8OxGyhSAsSDbVeuVOQSn5caNq7nf2WRrmh0qgso=", + "module": "sha256-NoB5v3YCe26jNlErhr+KuIuD7rWzG89K5Np2oAOnOTE=", + "pom": "sha256-bn/rmLIKcE49DTI04Jx4JnB69ptbX4tzvaArNtk5JDE=" + }, + "org/springframework#spring-test/6.1.5": { + "jar": "sha256-e1tYUlfSb4wr1dzN3MvFgAKK6sWS05CVBVEcbF7L9lc=", + "module": "sha256-3ZAJHhRe23LjjFnlg8qmqtJlPH/639b0iZ87T1aDOoc=", + "pom": "sha256-sU3+3yKLCJV+8ssDZaEMQQb3EdCvsSqJFrIL9vBRFD4=" + }, + "org/springframework#spring-tx/6.1.5": { + "jar": "sha256-u9Q3Y5H0yVCWD2vfTX3Px84cQDOWEEaKz6/dA2hdrUQ=", + "module": "sha256-MEDEuSz02m9hCZiuPn2iEIeE9BSIL0FqETnprzIYMJ8=", + "pom": "sha256-npsjXfHJoAKQF9jYdlrqT8SkAbKFlf9fWUedRBkUwiE=" + }, + "org/springframework#spring-web/6.1.5": { + "jar": "sha256-ufqr5wdENG3tLvi7eqj3LmN2IpSHiNAPxdHg8mR877I=", + "module": "sha256-zIS+644Hkn816yfX+yH5T6/vt7H3qFekxyBihh+mBpI=", + "pom": "sha256-+UyFgG1XKe4in7Y9xLIg4YAFpX6cJx2H+zuBE7DsZps=" + }, + "org/springframework#spring-webmvc/6.1.5": { + "jar": "sha256-9PvgwzbUxrM52EwmQYQoo0xeVAgyHaTlqwpXg7F5MiU=", + "module": "sha256-0w+TeO861HHMiUU9EpE0cjx0XAde+EHOoZx/JIxCN5s=", + "pom": "sha256-WGBut3Pi52sXgk130Nv/ow+JjtEM6WUaanNEdkVIT4E=" + }, + "org/springframework/amqp#spring-amqp-bom/3.0.6": { + "pom": "sha256-sch8n8omH3LZPz+tDWBfn6FQECv1fU6eT9Ga0ltYvB4=" + }, + "org/springframework/amqp#spring-amqp-bom/3.1.3": { + "module": "sha256-Q4DGAGtYET+GTeGA/GVbn/qlQi4hLOD+EqLgX7W6VUM=", + "pom": "sha256-RFfi3NUlrKZCKAmqZtNLnsj0RDc56LUj8I3ZgwiD3Gk=" + }, + "org/springframework/batch#spring-batch-bom/5.0.2": { + "pom": "sha256-aDpeNRsQ0aR8gkN/CtTnhmTUICWhpXBtaPpDhCHt1uw=" + }, + "org/springframework/batch#spring-batch-bom/5.1.1": { + "pom": "sha256-1R88KqBI9EqHD7C+H4i5MhfWHfQwW+NsfeXB23ENa80=" + }, + "org/springframework/boot#spring-boot-actuator-autoconfigure/3.2.4": { + "jar": "sha256-Qm8Cl8uwX7gZ1SSCp4FoKivKCVUSPOgf4meTih5E0Z8=", + "module": "sha256-M7Yu8nhLidE4hVHgnQWLHwczE8XyuKbiJxthsFokWSc=", + "pom": "sha256-6sGp05pSESzuofYNPWh3B3BWy0ZIMVPbcCcUYDex6mY=" + }, + "org/springframework/boot#spring-boot-actuator/3.2.4": { + "jar": "sha256-3TmG65GkOvANXasDzRWA2y49Z3Lu7EMC/fqyu1AQcb8=", + "module": "sha256-qZsBKuzw2tJcKh6S2JGTD1EpzeGIHTWX2yFIzSt+WTg=", + "pom": "sha256-X74vIc9RpPbvHXfDiXl6QxQDsSxIdv65g8tHz6/jTUw=" + }, + "org/springframework/boot#spring-boot-autoconfigure/3.2.4": { + "jar": "sha256-FLRpThp4LqlGJkp2dtopNtJHSr8Ph1c5sa9do7t62Fs=", + "module": "sha256-9LuyO5Wgmt2QkeNe2jQ0yacJutGo8I7/cyN0jDKcaEg=", + "pom": "sha256-yb4pyPXeG7NfGk3ixkuiaK5zZGQEBAk13fNM1gWNycY=" + }, + "org/springframework/boot#spring-boot-dependencies/3.1.2": { + "pom": "sha256-DIaB6QfO2iWOWU6lt8/aByuKxHDamKrAGEqO62lQV9o=" + }, + "org/springframework/boot#spring-boot-dependencies/3.2.4": { + "pom": "sha256-70YbfRmWkP/4qTa436J16BOHzXPaXRfnpuDhlX87ZHY=" + }, + "org/springframework/boot#spring-boot-devtools/3.2.4": { + "jar": "sha256-+ipJT83cd0DiM/MC7v1rhO2K2LPhIvPLA8ncn1U4jR8=", + "module": "sha256-TFz9e2WvdjtnUYPu5RsX3QDmsb6U4PXy+3k27HBOgEA=", + "pom": "sha256-AKmUsRZ4Syaop9bZtvG9m5POOhU4KtU1PHvcaPmyoj8=" + }, + "org/springframework/boot#spring-boot-starter-actuator/3.2.4": { + "jar": "sha256-PplRboWGYJGG2yTB3/10KTx0Pxy2iIPzUm4ewgGIA70=", + "module": "sha256-f/+Mys1QFcuaATkwqeLchgqUWRa1N1Vq8jGdg50dNzU=", + "pom": "sha256-n/JDazVblAkx+XO4ayvynkEigJ4FpHGNbzloSsJ6ETw=" + }, + "org/springframework/boot#spring-boot-starter-aop/3.2.4": { + "jar": "sha256-CXsCUrgjpzANh9TBGBunS0aNolOyayUMoivRg9hKlYM=", + "module": "sha256-TIejCWG4uVNixxbvkBeq5790bWo9r87+aSHub595pE8=", + "pom": "sha256-QSGWU4+tZOWjsqEzm3hbyBOq5r+CvOtXPU1OCIQ1j3g=" + }, + "org/springframework/boot#spring-boot-starter-data-jpa/3.2.4": { + "jar": "sha256-spfq4M7fVJBaKMSeVw9ka2o76mod9jYVOwPu+GSvi1g=", + "module": "sha256-tSzjyfv4FJnMJQt3Dj3CCFb4XsuDIIIlyA5FCtdboJc=", + "pom": "sha256-VLhpTsL5oAD3UQNxTrZiwHvyKyPwdNjGmZJes1LQJMo=" + }, + "org/springframework/boot#spring-boot-starter-jdbc/3.2.4": { + "jar": "sha256-1dLxE4kJ135ztyhmv6qgBSxnjvCyOH2XqP0Pb9tvbCY=", + "module": "sha256-FKXvpRN+Eo8h/KxYH/NRQnrYqOkM9R6H16pwP2Y/za0=", + "pom": "sha256-pUn2sXF1H71qk8L9+NuhAEXVKlyDTeQ053/W+JsRbOI=" + }, + "org/springframework/boot#spring-boot-starter-jetty/3.2.4": { + "jar": "sha256-jWRTsvLnHsEBsHw8gEn9ziHIlX5UjLVUnHR0YRLySL8=", + "module": "sha256-i9h7yYGoVNmPrcewZKn3peOXguU+f07bdIG67/hup6I=", + "pom": "sha256-KJYplMADbOGAmBRAc+goZYSQRc07IS8KTNJq+CBrqwk=" + }, + "org/springframework/boot#spring-boot-starter-json/3.2.4": { + "jar": "sha256-9I1Q6hnzGY0y7zVXvVcrX+JwSprWI52lbRzOQd+tQy4=", + "module": "sha256-VDviUkvA422Sm7VNmfzOOZ46bTKWRjw0yfgXxC1K+Gc=", + "pom": "sha256-2q8V85plreytydxTp5a7f3bdfmtMkk/5VqXxIKq85qM=" + }, + "org/springframework/boot#spring-boot-starter-logging/3.2.4": { + "jar": "sha256-NJCOp/RztUMcKTcUg4KU4fYwy5PWxBnLE3C3qzXPJCQ=", + "module": "sha256-CfVHe9vFckpo6tshH/1KSoCRG1Kn91To96xbQ+MQhcg=", + "pom": "sha256-jK8Fj0FUSTqX6PsvTOqzdlRMQW2Y02njpZVEcC02Nlw=" + }, + "org/springframework/boot#spring-boot-starter-oauth2-client/3.2.4": { + "jar": "sha256-kQGeJk9c475xKyE0vFgUnyt2gbFVWD1BcgLdSJUgrwo=", + "module": "sha256-obqnMV97fdb2AbnbxkXfidX8hHNMy4mxbmuLMG/KCJI=", + "pom": "sha256-nVhE8Nra1qNX8o5liNY7mX2BDkNxsLrbvOMUkVp1qF8=" + }, + "org/springframework/boot#spring-boot-starter-parent/3.1.2": { + "pom": "sha256-TB9NCfr9cgJEhZCDvfx7VytHF22Bil965q1m0ZOODO4=" + }, + "org/springframework/boot#spring-boot-starter-security/3.2.4": { + "jar": "sha256-z7u6be1UrrxNPuR0jlpjcMIHmyaS8sUPExXcuzJt500=", + "module": "sha256-pWm2RyqDlRJpa5HOHJSVxZytw7BkIrGCeMIJ3z2IDhA=", + "pom": "sha256-t6P8Kf0TVarO5elLBBTqdSKYAjVDHwdqsxpGYZNo9KE=" + }, + "org/springframework/boot#spring-boot-starter-test/3.2.4": { + "jar": "sha256-roiIYrffE8AbIjIBBaQZLM5o2FdBI2WfCMe3rrK51NA=", + "module": "sha256-Rn4w+w+o3k6LQoCUEtkbDUdab7/0BT1oDIfCZRUVTVQ=", + "pom": "sha256-g5hcN9j1HOND/K1RJv3egrarTEcBIhcqxkKoUc1T9pA=" + }, + "org/springframework/boot#spring-boot-starter-thymeleaf/3.2.4": { + "jar": "sha256-K6M/xhRjEXomVKNqTN2GpbMwAQWKM1OosPW96GRdu0I=", + "module": "sha256-c3xgISaYbfye+GcGN+INItEGsYZntSXEmED2dFsmo10=", + "pom": "sha256-2LsV8iADLSVxKM+VuDpER2PO4KTiaJpUS9urkabbNRk=" + }, + "org/springframework/boot#spring-boot-starter-web/3.2.4": { + "jar": "sha256-YD7sNOOuA+G/VZ8VM+g0tAxZ0gxysHXEa4ZlVehpcUA=", + "module": "sha256-5mNnkF/YqgUwA5nUYHKbh0yeVGHUQ5XF8RKMSScReDw=", + "pom": "sha256-Ls5mMK0u7d7UxrBnZ9SzTfx3+jm4549FRY+S9u0fjes=" + }, + "org/springframework/boot#spring-boot-starter/3.2.4": { + "jar": "sha256-L9hZRjMhRTEXoPndsX1GDU7MQz0Q7BDBLnkz4Dpc1tw=", + "module": "sha256-ZadNITSiaVlQI/pbKEqd8v6PFwa6NU6gJ4ts0K6GLGU=", + "pom": "sha256-8lZomjiyuFTAQoXap1041mwqacK/QK2Nz4dBDKmahPA=" + }, + "org/springframework/boot#spring-boot-test-autoconfigure/3.2.4": { + "jar": "sha256-xRGtoYwbzGwxuM6+Yk+78bN6mfsIT/1lHrN+6pHgYdY=", + "module": "sha256-B2KbO0M7AJgbZdDBW++/oBySubjqIxsTsy/a1Fv84Ag=", + "pom": "sha256-cJiOKwXyrLN9wyDKavIh4dtNA4QB0fgyYO1TvJzuZd4=" + }, + "org/springframework/boot#spring-boot-test/3.2.4": { + "jar": "sha256-4o9VYcRXVaI5JX32z62FZWKrpo57dGXLZFsfxIl/66c=", + "module": "sha256-A5GtDR82iY4hMpE/VdxO4UZ8luU604c7/etw8QqgteA=", + "pom": "sha256-ObCg+EFSTshH2N0orqQo0S6rKyAWhdiHdKG1l5tool0=" + }, + "org/springframework/boot#spring-boot/3.2.4": { + "jar": "sha256-+bu6EGY7vkZ1JkrrBxl2KfG7ysYRGJ+Jh6Rsgvf/uVo=", + "module": "sha256-sUyCr1mB59SKH92P6L2vzlc9kxx99ltnJMztRtXbRdc=", + "pom": "sha256-2+K06VhH4WLufDefQ6m8xes4kKhS7uxQDiJJWSsvPrs=" + }, + "org/springframework/data#spring-data-bom/2023.0.2": { + "pom": "sha256-r5JYFO1beGWJH9CGEGBVcLS7hFCi9Rv55bhjXNNoHgQ=" + }, + "org/springframework/data#spring-data-bom/2023.1.4": { + "pom": "sha256-/o7BqXiJbhaY1SHehZAgxzcMuwwJcvg+ivelhjh2YLQ=" + }, + "org/springframework/data#spring-data-commons/3.2.4": { + "jar": "sha256-NdlUQqtHbkbZrE1gB0+bnDCxjBBv0exx0daMANgID20=", + "pom": "sha256-mWK4Z7iOOkC3J3P2HeHPJXN2LHA5GKAnREg4Is2UW28=" + }, + "org/springframework/data#spring-data-jpa-parent/3.2.4": { + "pom": "sha256-nQUPSozvyh+SX0xF3rZaM2DBwYU7ugd9MGUheSxB4zk=" + }, + "org/springframework/data#spring-data-jpa/3.2.4": { + "jar": "sha256-mCeFLgIRhSnHTNviPdQyacxVUMqksAz+baiUkgD8zJo=", + "pom": "sha256-m5x8wh8EuArrW5HaofqhCN3mRJrJqZnH9DmcnuX72tg=" + }, + "org/springframework/data/build#spring-data-build/3.2.4": { + "pom": "sha256-4yRJ0xvTcBm+/zrQr7Wylmme7BrALVpgYWlOjjmR+DY=" + }, + "org/springframework/data/build#spring-data-parent/3.2.4": { + "pom": "sha256-ERQ+XCTTLtCF1jfagA/0ITmf2RUO/8UV380l8Y+pQa4=" + }, + "org/springframework/integration#spring-integration-bom/6.1.2": { + "pom": "sha256-0mxOaZYUSD15O82BeZxUTtpYlXYrSzGXFX7tAo7GL+c=" + }, + "org/springframework/integration#spring-integration-bom/6.2.3": { + "module": "sha256-NalcbsQOkaB/xJQh8OHI82Ae/Yg0P5GffYL62PpC318=", + "pom": "sha256-imipyWBFoXiOfs3aBwqvNwYT/jpyYfYrtbBBOXs3aI0=" + }, + "org/springframework/pulsar#spring-pulsar-bom/1.0.4": { + "module": "sha256-zi4j7BIPd3hz/BoiscQVZW9aek2OZHFE1Y7nUYFhBwU=", + "pom": "sha256-GFpoIFAhC4R2imyGxL5DvjKfuqeCnIgDzUwZBTXHG74=" + }, + "org/springframework/restdocs#spring-restdocs-bom/3.0.0": { + "pom": "sha256-/8nEe+Wo60iO3pJozgiaeZyT6JT7G9P5QPYsRnpmEyM=" + }, + "org/springframework/restdocs#spring-restdocs-bom/3.0.1": { + "pom": "sha256-USAiW8r+ZB3MJmfpDTSFMXGaUOvdX4rwf7o0UZmtWM4=" + }, + "org/springframework/security#spring-security-bom/5.8.5": { + "module": "sha256-ThRXe7Hs0qntCNqoNEe5HBK2pGX+1YqlqWoztXBZEVo=", + "pom": "sha256-NtcpSd0VViwUD/4Xbnf8sfc+GaTSwDNhE6oJbCNbW8s=" + }, + "org/springframework/security#spring-security-bom/6.1.2": { + "module": "sha256-HMJ40imEfP7hLpBd9w5W5W4eo2m+LKd3S/u60EtbMos=", + "pom": "sha256-P0nGqe8bTNCnKRAzAyshnLkmzIPX3KlutclyzSQnI44=" + }, + "org/springframework/security#spring-security-bom/6.2.3": { + "module": "sha256-f84oRRxjgixv0HNVa/nTgKjHjB/SdlMxC2s5J22iNsE=", + "pom": "sha256-gMuEACI3nqzsIjYnas19+8DFenkhBnuAlrMspnein9w=" + }, + "org/springframework/security#spring-security-config/6.2.3": { + "jar": "sha256-DgdWeH0RK+ufxrA45sqKwJ8fF5Hn1BZ7p+d7C9jMtZU=", + "module": "sha256-xZyqjp8OT+xpiGpJnm+cmfIN64keizk/kkT+nSxAkkI=", + "pom": "sha256-NjSHendEXyFnJRwFFlwHSePBFeAvdeIADyI21eI9mOs=" + }, + "org/springframework/security#spring-security-core/6.2.3": { + "jar": "sha256-K/5zefSpk6lnCrn1ldzhDNDx2KpE02k1AG+uL8b7ro4=", + "module": "sha256-FSCaQ+9sWr+zqJ3zlrRHMOZirDsm5zMnGUA6y/COw6k=", + "pom": "sha256-kijsMZ42lwTLW3be6PjuE2YCNEJhcEY0TgWfeiDqjYQ=" + }, + "org/springframework/security#spring-security-crypto/6.2.3": { + "jar": "sha256-S4/0AkG0addIiMxuQSz7qDk7diCuMFImubLy0zhOojY=", + "module": "sha256-1Z819TgD+L3X6u5pfriOQmNk1fki0e+A9lXZSD8w5VQ=", + "pom": "sha256-tYVxm1x8aS1mIEgp74HqSRNzvkd+7Hz3Hz2kuyvIStg=" + }, + "org/springframework/security#spring-security-oauth2-client/6.2.3": { + "jar": "sha256-dQU2HZlKEc65EruqbBg4S91cKfNo08LLtlOhJUPWCh8=", + "module": "sha256-WFFQJVcahVA3bjvDbwiB51YZPYIs4nRS/g6VZAKdjoQ=", + "pom": "sha256-OZPCiABfsTWoh97Q2xiU1nJCcFna/Hr1K9lv3uPgkRs=" + }, + "org/springframework/security#spring-security-oauth2-core/6.2.3": { + "jar": "sha256-7GfsWYypjmSZu9+B3/iOOVg3PaYNme7Jv79q1AcATvg=", + "module": "sha256-tPQigzzqjx3uF2Ln9wSNVlwFU5WBFXgm/AmdzPHipZ4=", + "pom": "sha256-VhY1V59db2HsEzjLuMhcW0VxUQoxiUbkEYq9o5mHdqM=" + }, + "org/springframework/security#spring-security-oauth2-jose/6.2.3": { + "jar": "sha256-xeExSPNakMj0SD3YKXaxRwVJwii4iFsDB8MTIVdyX60=", + "module": "sha256-JoA2U5+6FHT1wfQCgSf3UH5YLboMdkssM2OCFvFXWlM=", + "pom": "sha256-z/1HGThaaSlzCcQH0a6Q3UUI6qJ/RVSYomVJIj98HKo=" + }, + "org/springframework/security#spring-security-web/6.2.3": { + "jar": "sha256-jn4vSk7LjAwHjMr2QKKqxyc4YJVKCpiLH60WfWN6J4g=", + "module": "sha256-SF+TouUqLcNDpsX/UtxcFgvBUwAA7JBfUfBpihtpXLQ=", + "pom": "sha256-ZZP6CHlOVrNi0/3cpN8ekWOFpE9bON5uwsoPzSMEAKk=" + }, + "org/springframework/session#spring-session-bom/3.1.1": { + "module": "sha256-1pUWyPsAHxEYTRTC/WPXiiXTt3H27w40+UMFo+/cYyc=", + "pom": "sha256-yKH2TVmHtfeggnybjVe/dSegTYM/7o7EXlKD7kKTwV0=" + }, + "org/springframework/session#spring-session-bom/3.2.2": { + "module": "sha256-HETW6djPKtvw3VzVzAgnvlyDfHKGLGvoYQdOdzMXhPo=", + "pom": "sha256-xUZFF0k+pgCmhLEeGlZNGrW4ebU48i+CjbXC7/623HM=" + }, + "org/springframework/ws#spring-ws-bom/4.0.10": { + "pom": "sha256-1BQ8nGc3RNef88ZLWSPKP7oDaeLC+W4uPnx2LAyLY/o=" + }, + "org/springframework/ws#spring-ws-bom/4.0.5": { + "pom": "sha256-8OjPCyFD18APnTYVoZy7cPI+Qy+B8OcCi91a0/KBo/w=" + }, + "org/testcontainers#testcontainers-bom/1.18.3": { + "pom": "sha256-l0dtYsuLXM/NHLrmkmHEk3v36BtWUw2oKmZJ4w3DHMw=" + }, + "org/testcontainers#testcontainers-bom/1.19.3": { + "pom": "sha256-0L6xP4gXPdXI4XgioXWun7r17homxyAfafZYpW5SqeU=" + }, + "org/testcontainers#testcontainers-bom/1.19.7": { + "pom": "sha256-bDMp72KWE8iKyQI7fa4oHOHdh6AO+hg5ah2pErDJRPQ=" + }, + "org/thymeleaf#thymeleaf-lib/3.1.2.RELEASE": { + "pom": "sha256-+BG2hU0QZoLGjwYOUMk3ONhXOaq8UKOYiP3FnWZlu+Q=" + }, + "org/thymeleaf#thymeleaf-parent/3.1.2.RELEASE": { + "pom": "sha256-yISd92GB/uypYinPsWHcJA7eQNtQUsnWjSyqd8r4Ujk=" + }, + "org/thymeleaf#thymeleaf-spring5/3.1.2.RELEASE": { + "jar": "sha256-DELJReKUFEYCy0R9NkExEjkktg/Y1PS28TN+R4qr3L8=", + "pom": "sha256-LYUlq7euSQPQGwB5TQhhoVfgXKwaJB6EY7DBeTZl82I=" + }, + "org/thymeleaf#thymeleaf-spring6/3.1.2.RELEASE": { + "jar": "sha256-LS3THRJS03d7Uh22s3HemG76vS1bFdUcXK14t5zXeZw=", + "pom": "sha256-KoPIXHLDCamBMDIvJ6ycgqN2gkXmVxgrrnWDSM8g93Y=" + }, + "org/thymeleaf#thymeleaf/3.1.2.RELEASE": { + "jar": "sha256-KzpxS+LeNJzLYMZWA65ei9cGDHpPiDNIVwdnHpqGKiQ=", + "pom": "sha256-yNg11KkpXvSZfjyK6eiUz4B1nNVpPoNukaSkY4cn3/w=" + }, + "org/thymeleaf/extras#thymeleaf-extras-springsecurity5/3.1.2.RELEASE": { + "jar": "sha256-NANxlgdib0YRutYET9yB7WpDTxMOmtZG03JlaCWT5Ow=", + "pom": "sha256-gahhwPVVfRDoivS0opdkOwUlWgws+yLaORBtpTTAVWI=" + }, + "org/unbescape#unbescape/1.1.6.RELEASE": { + "jar": "sha256-WXz4fVsaTzhbnRzsl0t7SDq7PuhfxbP4tir45L7JXCw=", + "pom": "sha256-AgOVYrsyfVQcDwUHZ+kYmPo4l0eSZojMITvRG8dRJ9E=" + }, + "org/webjars#swagger-ui/5.2.0": { + "jar": "sha256-x7hZO4W+yIujqoGQudsk2a7a8CyVmqOMMu3WpkO8k9Q=", + "pom": "sha256-n0iJORwtkGWjTpc9CURMnMycPMASGDNgQ8Umuqe5BgA=" + }, + "org/xmlunit#xmlunit-core/2.9.1": { + "jar": "sha256-fnDyPU914F8O558Pa54Tts9R0082xfw6a4OUKd3h7+8=", + "pom": "sha256-0n5OKjEqIVR+82BcgS5+YMiuyWTn+WDlDU3Dy2azkBI=" + }, + "org/xmlunit#xmlunit-parent/2.9.1": { + "pom": "sha256-1+RY+9XGRFBIeOX7zglLHTB402mn/uF93ezj0Zn9qsA=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + }, + "xml-apis#xml-apis-ext/1.3.04": { + "jar": "sha256-0LSIfcNNV95JB0pYr/rUOaAT0Lr/oagDT47ypeoZFkY=", + "pom": "sha256-G1k5qTEKWcDfDANyZyHV/JUh6H1sIDv6ciC66Cow2eg=" + }, + "xml-apis#xml-apis/1.4.01": { + "jar": "sha256-qECWgXZkVoS7Aa7TduBnqzlhSIX57uRKvjWl8g6+f60=", + "pom": "sha256-Cagv8VCshr+jEUXgpq/YmgLkUEeF9doRLk+uFCUCDpI=" + }, + "xmlpull#xmlpull/1.1.3.1": { + "pom": "sha256-jxD/2N8NPpgZyMyEAnCcaySLxTqVTvbkVHDZrjpXNfs=" + }, + "xpp3#xpp3_min/1.1.4c": { + "pom": "sha256-tbRqwMCdpBsE28dTRWtIkShWp/+7FJBnaRC1EMRx0T8=" + } + } +} diff --git a/pkgs/by-name/st/stirling-pdf/disable-spotless.patch b/pkgs/by-name/st/stirling-pdf/disable-spotless.patch deleted file mode 100644 index 8b58207b963f..000000000000 --- a/pkgs/by-name/st/stirling-pdf/disable-spotless.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index c206e2f..b1fda33 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -69,19 +69,7 @@ launch4j { - messagesInstanceAlreadyExists="Stirling-PDF is already running." - } - --spotless { -- java { -- target project.fileTree('src/main/java') - -- googleJavaFormat('1.19.1').aosp().reorderImports(false) -- -- importOrder('java', 'javax', 'org', 'com', 'net', 'io') -- toggleOffOn() -- trimTrailingWhitespace() -- indentWithSpaces() -- endWithNewline() -- } --} - - dependencies { - //security updates -@@ -163,9 +151,6 @@ dependencies { - annotationProcessor 'org.projectlombok:lombok:1.18.28' - } - --tasks.withType(JavaCompile) { -- dependsOn 'spotlessApply' --} - compileJava { - options.compilerArgs << '-parameters' - } diff --git a/pkgs/by-name/st/stirling-pdf/fix-jar-timestamp.patch b/pkgs/by-name/st/stirling-pdf/fix-jar-timestamp.patch deleted file mode 100644 index dd94b8514f76..000000000000 --- a/pkgs/by-name/st/stirling-pdf/fix-jar-timestamp.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index 7025b2b..d063da3 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -20,6 +20,11 @@ repositories { - } - - -+tasks.withType(AbstractArchiveTask) { -+ preserveFileTimestamps = false -+ reproducibleFileOrder = true -+} -+ - - licenseReport { - renderers = [new JsonReportRenderer()] diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix index 9ec363cf5b58..2695e3d58010 100644 --- a/pkgs/by-name/st/stirling-pdf/package.nix +++ b/pkgs/by-name/st/stirling-pdf/package.nix @@ -2,13 +2,14 @@ lib, stdenv, fetchFromGitHub, - substituteAll, gradle_7, - perl, makeWrapper, jre, }: +let + gradle = gradle_7; +in stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; version = "0.25.1"; @@ -21,77 +22,28 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - # disable spotless because it tries to fetch files not in the FOD - # and also because it slows down the build process - ./disable-spotless.patch # remove timestamp from the header of a generated .properties file ./remove-props-file-timestamp.patch - # use gradle's built-in method of zeroing out timestamps, - # because stripJavaArchivesHook can't patch signed JAR files - ./fix-jar-timestamp.patch - # set the FOD as the only repository gradle can resolve from - (substituteAll { - src = ./use-fod-maven-repo.patch; - inherit (finalAttrs) deps; - }) ]; - # fake build to pre-download deps into fixed-output derivation - deps = stdenv.mkDerivation { - name = "${finalAttrs.pname}-${finalAttrs.version}-deps"; - inherit (finalAttrs) src; - - patches = [ ./disable-spotless.patch ]; - - nativeBuildInputs = [ - gradle_7 - perl - ]; - - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon --console=plain build - - runHook postBuild - ''; - - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - runHook preInstall - - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ - | sh - - # Mimic existence of okio-3.6.0.jar, originally known as okio-jvm-3.6.0 (and renamed). - # Gradle doesn't detect such renames and only fetches the latter. - # Whenever this package gets updated, please check if this hack is obsolete. - ln -s $out/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar $out/com/squareup/okio/okio/3.6.0/okio-3.6.0.jar - - runHook postInstall - ''; - - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-JaTL6/DyBAqXkIQOkbi8MYoIZrhWqc3MpJ7DDB4h+ok="; + mitmCache = gradle.fetchDeps { + inherit (finalAttrs) pname; + data = ./deps.json; }; + __darwinAllowLocalNetworking = true; + + # disable spotless because it tries to fetch files not in deps.json + # and also because it slows down the build process + gradleFlags = [ "-x" "spotlessApply" ]; + + doCheck = true; + nativeBuildInputs = [ - gradle_7 + gradle makeWrapper ]; - buildPhase = '' - runHook preBuild - - export GRADLE_USER_HOME=$(mktemp -d) - gradle --offline --no-daemon --console=plain build - - runHook postBuild - ''; - installPhase = '' runHook preInstall diff --git a/pkgs/by-name/st/stirling-pdf/use-fod-maven-repo.patch b/pkgs/by-name/st/stirling-pdf/use-fod-maven-repo.patch deleted file mode 100644 index f26074a0598f..000000000000 --- a/pkgs/by-name/st/stirling-pdf/use-fod-maven-repo.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/build.gradle b/build.gradle -index c206e2f..cdaddf7 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -16,7 +16,7 @@ version = '0.22.3' - sourceCompatibility = '17' - - repositories { -- mavenCentral() -+ maven { url '@deps@' } - } - - -diff --git a/settings.gradle b/settings.gradle -index f813993..2c87f3c 100644 ---- a/settings.gradle -+++ b/settings.gradle -@@ -1 +1,7 @@ -+pluginManagement { -+ repositories { -+ maven { url '@deps@' } -+ } -+} -+ - rootProject.name = 'Stirling-PDF' From f8ef17711d7122b0ad66689af28e286f3f2677a1 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Fri, 12 Jul 2024 10:02:31 -0500 Subject: [PATCH 087/227] aws-sso-cli: move to by-name --- .../default.nix => by-name/aw/aws-sso-cli/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/admin/aws-sso-cli/default.nix => by-name/aw/aws-sso-cli/package.nix} (100%) diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix similarity index 100% rename from pkgs/tools/admin/aws-sso-cli/default.nix rename to pkgs/by-name/aw/aws-sso-cli/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d48e0156367b..bb9a0ab07046 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3302,8 +3302,6 @@ with pkgs; aws-sam-cli = callPackage ../development/tools/aws-sam-cli { }; - aws-sso-cli = callPackage ../tools/admin/aws-sso-cli { }; - aws-sso-creds = callPackage ../tools/admin/aws-sso-creds { }; aws-vault = callPackage ../tools/admin/aws-vault { }; From a37affa58548abb9a3423fd692e882739bb8f497 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 12 Jul 2024 14:34:04 +0200 Subject: [PATCH 088/227] tika: fix typo --- pkgs/by-name/ti/tika/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ti/tika/package.nix b/pkgs/by-name/ti/tika/package.nix index 932cb99a945f..f702d27fa3d4 100644 --- a/pkgs/by-name/ti/tika/package.nix +++ b/pkgs/by-name/ti/tika/package.nix @@ -45,7 +45,7 @@ maven'.buildMavenPackage rec { mvnHash = if mvnDepsHash != null then mvnDepsHash else knownMvnDepsHash; mvnParameters = toString [ - "-DskipTests=true" # skip tests (out of memory execptions) + "-DskipTests=true" # skip tests (out of memory exceptions) "-Dossindex.skip" # skip dependency with vulnerability (recommended by upstream) ]; From c8bf7321a90a569d4eada05b1a150a98305040e8 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 12 Jul 2024 12:59:00 +0200 Subject: [PATCH 089/227] nixos/tika: init module --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/search/tika.nix | 84 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/tika.nix | 21 +++++ pkgs/by-name/ti/tika/package.nix | 5 ++ 6 files changed, 114 insertions(+) create mode 100644 nixos/modules/services/search/tika.nix create mode 100644 nixos/tests/tika.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index b518761a6991..81f9d83de6a1 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -36,6 +36,8 @@ - [Glance](https://github.com/glanceapp/glance), a self-hosted dashboard that puts all your feeds in one place. Available as [services.glance](option.html#opt-services.glance). +- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika). + ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} - `transmission` package has been aliased with a `trace` warning to `transmission_3`. Since [Transmission 4 has been released last year](https://github.com/transmission/transmission/releases/tag/4.0.0), and Transmission 3 will eventually go away, it was decided perform this warning alias to make people aware of the new version. The `services.transmission.package` defaults to `transmission_3` as well because the upgrade can cause data loss in certain specific usage patterns (examples: [#5153](https://github.com/transmission/transmission/issues/5153), [#6796](https://github.com/transmission/transmission/issues/6796)). Please make sure to back up to your data directory per your usage: diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index eb2f049985c9..26c2a8373b87 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1264,6 +1264,7 @@ ./services/search/qdrant.nix ./services/search/quickwit.nix ./services/search/sonic-server.nix + ./services/search/tika.nix ./services/search/typesense.nix ./services/security/aesmd.nix ./services/security/authelia.nix diff --git a/nixos/modules/services/search/tika.nix b/nixos/modules/services/search/tika.nix new file mode 100644 index 000000000000..7ab0433e220a --- /dev/null +++ b/nixos/modules/services/search/tika.nix @@ -0,0 +1,84 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.tika; + inherit (lib) + literalExpression + mkIf + mkEnableOption + mkOption + mkPackageOption + getExe + types + ; +in +{ + meta.maintainers = [ lib.maintainers.drupol ]; + + options = { + services.tika = { + enable = mkEnableOption "Apache Tika server"; + package = mkPackageOption pkgs "tika" { }; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + example = "0.0.0.0"; + description = '' + The Apache Tika bind address. + ''; + }; + + port = mkOption { + type = types.port; + default = 9998; + description = '' + The Apache Tike port to listen on + ''; + }; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + The Apache Tika configuration (XML) file to use. + ''; + example = literalExpression "./tika/tika-config.xml"; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open the firewall for Apache Tika. + This adds `services.tika.port` to `networking.firewall.allowedTCPPorts`. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.tika = { + description = "Apache Tika Server"; + + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + Type = "simple"; + + ExecStart = "${getExe cfg.package} --host ${cfg.listenAddress} --port ${toString cfg.port} ${lib.optionalString (cfg.configFile != null) "--config ${cfg.configFile}"}"; + DynamicUser = true; + StateDirectory = "tika"; + CacheDirectory = "tika"; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e6b4a4b66567..d2d5c1dfc8e3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -980,6 +980,7 @@ in { thanos = handleTest ./thanos.nix {}; tiddlywiki = handleTest ./tiddlywiki.nix {}; tigervnc = handleTest ./tigervnc.nix {}; + tika = runTest ./tika.nix; timescaledb = handleTest ./timescaledb.nix {}; timezone = handleTest ./timezone.nix {}; tinc = handleTest ./tinc {}; diff --git a/nixos/tests/tika.nix b/nixos/tests/tika.nix new file mode 100644 index 000000000000..61a3a6ad22ae --- /dev/null +++ b/nixos/tests/tika.nix @@ -0,0 +1,21 @@ +{ lib, ... }: + +{ + name = "tika-server"; + + nodes = { + machine = { pkgs, ... }: { + services.tika = { + enable = true; + }; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("tika.service") + machine.wait_for_open_port(9998) + ''; + + meta.maintainers = [ lib.maintainers.drupol ]; +} diff --git a/pkgs/by-name/ti/tika/package.nix b/pkgs/by-name/ti/tika/package.nix index f702d27fa3d4..748e24222df1 100644 --- a/pkgs/by-name/ti/tika/package.nix +++ b/pkgs/by-name/ti/tika/package.nix @@ -6,6 +6,7 @@ fetchFromGitHub, makeWrapper, mvnDepsHash ? null, + nixosTests, }: let @@ -67,6 +68,10 @@ maven'.buildMavenPackage rec { runHook postInstall ''; + passthru.tests = { + inherit (nixosTests) tika; + }; + meta = { changelog = "https://github.com/apache/tika/blob/${src.rev}/CHANGES.txt"; description = "A toolkit for extracting metadata and text from over a thousand different file types"; From 082650db763e3d8eef9a6af02816e10905b94547 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 20:07:59 +0000 Subject: [PATCH 090/227] python312Packages.monty: 2024.5.24 -> 2024.7.12 --- pkgs/development/python-modules/monty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 0c7a285228d4..520f266f3c96 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "monty"; - version = "2024.5.24"; + version = "2024.7.12"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = "monty"; rev = "refs/tags/v${version}"; - hash = "sha256-c2RG38lsYWtwdCzrRTH/l9o4k6UPUOFC+wwV9zjoDvk="; + hash = "sha256-AehlFwrWRa6HNF2vuBcWlpADfxny+FcXSZgcdQiC7Ug="; }; postPatch = '' From dd70191416ea6f9d970161dd90d7f6f2066feea7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 13 Jul 2024 00:31:27 +0200 Subject: [PATCH 091/227] agebox: drop, lack of upstream maintenance This is a follow-up to #307229. Project does not seem to be maintained upstream anymore. --- pkgs/tools/security/agebox/default.nix | 39 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 pkgs/tools/security/agebox/default.nix diff --git a/pkgs/tools/security/agebox/default.nix b/pkgs/tools/security/agebox/default.nix deleted file mode 100644 index fb75fbf9b093..000000000000 --- a/pkgs/tools/security/agebox/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: - -buildGoModule rec { - pname = "agebox"; - version = "0.6.1"; - - src = fetchFromGitHub { - owner = "slok"; - repo = pname; - rev = "v${version}"; - hash = "sha256-W6/v5BIl+k6tMan/Wdua7mHKMsq23QZN13Cy24akJr4="; - }; - - patches = [ - # Update gopkg.in/yaml.v2 to v2.2.8 to fix vulnerabilities. - # https://github.com/slok/agebox/pull/199 - (fetchpatch { - url = "https://github.com/slok/agebox/commit/40a515d39911f601ebe05cc914e8a02695d85dc7.patch"; - hash = "sha256-0iBI0nID12OoWqWY/8MPb3vvTUDe0JdSHu2vefix/bM="; - }) - ]; - - vendorHash = "sha256-MNAF2ExIOYPzXyGR6H7lfUEhnMDCyD7ecst5MKm7u+A="; - - ldflags = [ - "-s" - "-w" - "-X main.Version=${version}" - ]; - - meta = with lib; { - homepage = "https://github.com/slok/agebox"; - changelog = "https://github.com/slok/agebox/releases/tag/v${version}"; - description = "Age based repository file encryption gitops tool"; - license = licenses.asl20; - maintainers = with maintainers; [ lesuisse ]; - mainProgram = "agebox"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a498fa95649c..40bb5bab0ef4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -72,6 +72,7 @@ mapAliases ({ aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" + agebox = throw "agebox has been removed due to lack of upstream maintenance"; # Added 2024-07-13 airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28 alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f90e707a504..5751624cbe5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6811,8 +6811,6 @@ with pkgs; age = callPackage ../tools/security/age { }; - agebox = callPackage ../tools/security/agebox { }; - age-plugin-ledger = callPackage ../tools/security/age-plugin-ledger { inherit (darwin.apple_sdk.frameworks) AppKit; }; From 7f0ab09402f4bb9c105e98f3906207ab552cfa01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 05:09:03 +0000 Subject: [PATCH 092/227] python312Packages.formulaic: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/formulaic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix index ae9ccc02c36c..93f777746791 100644 --- a/pkgs/development/python-modules/formulaic/default.nix +++ b/pkgs/development/python-modules/formulaic/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "formulaic"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "matthewwardrop"; repo = "formulaic"; rev = "refs/tags/v${version}"; - hash = "sha256-qivWv1LtFkW55tVKD/Zjd8Q5gVbxhDpZ0inkV6NR7bA="; + hash = "sha256-1Ygu4o6RXXTnvve8XZi+QMhCjvUyMspYWTyUH3p6+dg="; }; env.SETUPTOOLS_SCM_PRETEND_VERSION = version; From 43cc09e319eaf76fe31f30c4c2b7fce970f970a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 07:28:31 +0000 Subject: [PATCH 093/227] python312Packages.s3fs: 2024.6.0 -> 2024.6.1 --- pkgs/development/python-modules/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 426e65615bb0..bd53e3b3ef2b 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "s3fs"; - version = "2024.6.0"; + version = "2024.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pZAg7e3GHpZm8eRzzkqih2Tl97PJdBS+sVzZvlIqh7Y="; + hash = "sha256-bCEG1sNPv7uI49IMbzVyiW1e49NRKJZpYwHCGjxUG+o="; }; postPatch = '' From 5ebd80d6d25536f167bc0cbab53b6f35f3cb63c9 Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 13 Jul 2024 08:35:34 +0100 Subject: [PATCH 094/227] lazygit: move to by-name --- .../lazygit/default.nix => by-name/la/lazygit/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/lazygit/default.nix => by-name/la/lazygit/package.nix} (100%) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/by-name/la/lazygit/package.nix similarity index 100% rename from pkgs/development/tools/lazygit/default.nix rename to pkgs/by-name/la/lazygit/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f90e707a504..7d86e2079f43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18778,8 +18778,6 @@ with pkgs; kythe = callPackage ../development/tools/kythe { }; - lazygit = callPackage ../development/tools/lazygit { }; - laminar = callPackage ../development/tools/continuous-integration/laminar { }; lcov = callPackage ../development/tools/analysis/lcov { }; From 606f9e487833b0fafdd867aaffa9229f96e75741 Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 13 Jul 2024 08:37:02 +0100 Subject: [PATCH 095/227] lazygit: format with nixfmt-rfc-style --- pkgs/by-name/la/lazygit/package.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index b5f1d5d4a64e..98bb863350f5 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -1,5 +1,10 @@ -{ lib, buildGoModule, fetchFromGitHub, lazygit, testers }: - +{ + lib, + buildGoModule, + fetchFromGitHub, + lazygit, + testers, +}: buildGoModule rec { pname = "lazygit"; version = "0.42.0"; @@ -14,18 +19,24 @@ buildGoModule rec { vendorHash = null; subPackages = [ "." ]; - ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; + ldflags = [ + "-X main.version=${version}" + "-X main.buildSource=nix" + ]; - passthru.tests.version = testers.testVersion { - package = lazygit; - }; + passthru.tests.version = testers.testVersion { package = lazygit; }; meta = with lib; { description = "Simple terminal UI for git commands"; homepage = "https://github.com/jesseduffield/lazygit"; changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne equirosa paveloom starsep ]; + maintainers = with maintainers; [ + Br1ght0ne + equirosa + paveloom + starsep + ]; mainProgram = "lazygit"; }; } From eabb70aad5518086d268afcd78e40929d21bc110 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 4 Jul 2024 20:23:55 +0200 Subject: [PATCH 096/227] lomiri.teleports: init at 1.20 --- .../lomiri/applications/teleports/default.nix | 131 ++++++++++++++++++ pkgs/desktops/lomiri/default.nix | 1 + 2 files changed, 132 insertions(+) create mode 100644 pkgs/desktops/lomiri/applications/teleports/default.nix diff --git a/pkgs/desktops/lomiri/applications/teleports/default.nix b/pkgs/desktops/lomiri/applications/teleports/default.nix new file mode 100644 index 000000000000..7f58ea5b9abf --- /dev/null +++ b/pkgs/desktops/lomiri/applications/teleports/default.nix @@ -0,0 +1,131 @@ +{ + stdenv, + lib, + fetchFromGitHub, + fetchFromGitLab, + fetchpatch, + gitUpdater, + cmake, + content-hub, + intltool, + lomiri-indicator-network, + lomiri-push-qml, + lomiri-thumbnailer, + lomiri-ui-toolkit, + pkg-config, + qqc2-suru-style, + qtbase, + qtmultimedia, + qtpositioning, + qtquickcontrols2, + quazip, + quickflux, + rlottie, + rlottie-qml, + tdlib, + wrapQtAppsHook, +}: + +let + tdlib-1811 = tdlib.overrideAttrs ( + oa: fa: { + version = "1.8.11"; + src = fetchFromGitHub { + owner = "tdlib"; + repo = "td"; + rev = "3179d35694a28267a0b6273fc9b5bdce3b6b1235"; + hash = "sha256-XvqqDXaFclWK/XpIxOqAXQ9gcc/dTljl841CN0KrlyA="; + }; + } + ); +in +stdenv.mkDerivation (finalAttrs: { + pname = "teleports"; + version = "1.20"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/apps/teleports"; + rev = "v${finalAttrs.version}"; + hash = "sha256-hHnQjitBI4RX8DwX1HHicpgAl3pznWN4wC4lkhlh+OI="; + }; + + patches = [ + # Remove when https://gitlab.com/ubports/development/apps/teleports/-/merge_requests/551 merged & in release + (fetchpatch { + name = "0001-teleports-Call-i18n.bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/apps/teleports/-/commit/dd537c08453be9bfcdb2ee1eb692514c7e867e41.patch"; + hash = "sha256-zxxFvoj6jluGPCA9GQsxuYYweaSOVrkD01hZwCtq52U="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'COMMAND git describe --tags --abbrev=0 --exact-match' 'COMMAND echo v${finalAttrs.version}' \ + --replace-fail 'set(DATA_DIR ''${CMAKE_INSTALL_PREFIX})' 'set(DATA_DIR ''${CMAKE_INSTALL_FULL_DATADIR}/teleports)' + + # Doesn't honour DATA_DIR + substituteInPlace app/main.cpp push/pushhelper.cpp libs/qtdlib/client/qtdclient.cpp \ + --replace-fail 'QGuiApplication::applicationDirPath()' "QString(\"$out/share/teleports\")" + + substituteInPlace teleports.desktop.in \ + --replace-fail 'assets/icon.svg' 'teleports' \ + --replace-fail 'assets/splash.svg' 'lomiri-app-launch/splash/teleports.svg' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + intltool + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + content-hub + lomiri-indicator-network + lomiri-push-qml + lomiri-thumbnailer + lomiri-ui-toolkit + rlottie-qml + qqc2-suru-style + qtbase + qtmultimedia + qtpositioning + qtquickcontrols2 + quazip + quickflux + rlottie + tdlib-1811 + ]; + + postInstall = '' + mkdir -p $out/share/{applications,content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash,lomiri-url-dispatcher/urls} + + ln -s $out/share/teleports/teleports.desktop $out/share/applications/teleports.desktop + ln -s $out/share/teleports/teleports.content-hub $out/share/content-hub/peers/teleports + ln -s $out/share/teleports/assets/icon.svg $out/share/icons/hicolor/scalable/apps/teleports.svg + ln -s $out/share/teleports/assets/splash.svg $out/share/lomiri-app-launch/splash/teleports.svg + ln -s $out/share/teleports/teleports.url-dispatcher $out/share/lomiri-url-dispatcher/urls/teleports.url-dispatcher + ''; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + }; + + meta = { + description = "Ubuntu Touch Telegram client"; + homepage = "https://gitlab.com/ubports/development/apps/teleports"; + license = with lib.licenses; [ + mit # main + asl20 # benlau/asyncfuture in qtdlib + bsd3 # FastScroll.js from Meego? maybe? + gpl3Only # components + lgpl3Only # components + ]; + mainProgram = "teleports"; + maintainers = lib.teams.lomiri.members; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 5cf0fe22caaf..98cfe068086b 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -17,6 +17,7 @@ let lomiri-system-settings = callPackage ./applications/lomiri-system-settings/wrapper.nix { }; lomiri-terminal-app = callPackage ./applications/lomiri-terminal-app { }; morph-browser = callPackage ./applications/morph-browser { }; + teleports = callPackage ./applications/teleports { }; #### Data lomiri-schemas = callPackage ./data/lomiri-schemas { }; From e5ad7914a86f8b0bc7f593d645ca8dd1f1e3bfee Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 4 Jul 2024 20:36:22 +0200 Subject: [PATCH 097/227] tests/teleports: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/teleports.nix | 48 +++++++++++++++++++ .../lomiri/applications/teleports/default.nix | 2 + 3 files changed, 51 insertions(+) create mode 100644 nixos/tests/teleports.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b9a6311eaf35..b1269cb76e6e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -975,6 +975,7 @@ in { teeworlds = handleTest ./teeworlds.nix {}; telegraf = handleTest ./telegraf.nix {}; teleport = handleTest ./teleport.nix {}; + teleports = runTest ./teleports.nix; thelounge = handleTest ./thelounge.nix {}; terminal-emulators = handleTest ./terminal-emulators.nix {}; thanos = handleTest ./thanos.nix {}; diff --git a/nixos/tests/teleports.nix b/nixos/tests/teleports.nix new file mode 100644 index 000000000000..31f4946a0843 --- /dev/null +++ b/nixos/tests/teleports.nix @@ -0,0 +1,48 @@ +{ pkgs, lib, ... }: +{ + name = "teleports-standalone"; + meta.maintainers = lib.teams.lomiri.members; + + nodes.machine = + { config, pkgs, ... }: + { + imports = [ ./common/x11.nix ]; + + services.xserver.enable = true; + + environment = { + systemPackages = with pkgs.lomiri; [ + suru-icon-theme + teleports + ]; + variables = { + UITK_ICON_THEME = "suru"; + }; + }; + + i18n.supportedLocales = [ "all" ]; + + fonts.packages = with pkgs; [ + # Intended font & helps with OCR + ubuntu_font_family + ]; + }; + + enableOCR = true; + + testScript = '' + machine.wait_for_x() + + with subtest("teleports launches"): + machine.execute("teleports >&2 &") + machine.wait_for_text(r"(TELEports|Phone Number)") + machine.screenshot("teleports_open") + + machine.succeed("pkill -f teleports") + + with subtest("teleports localisation works"): + machine.execute("env LANG=de_DE.UTF-8 teleports >&2 &") + machine.wait_for_text("Telefonnummer") + machine.screenshot("teleports_localised") + ''; +} diff --git a/pkgs/desktops/lomiri/applications/teleports/default.nix b/pkgs/desktops/lomiri/applications/teleports/default.nix index 7f58ea5b9abf..f5fceb5bd40a 100644 --- a/pkgs/desktops/lomiri/applications/teleports/default.nix +++ b/pkgs/desktops/lomiri/applications/teleports/default.nix @@ -5,6 +5,7 @@ fetchFromGitLab, fetchpatch, gitUpdater, + nixosTests, cmake, content-hub, intltool, @@ -112,6 +113,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gitUpdater { rev-prefix = "v"; }; + tests.vm = nixosTests.teleports; }; meta = { From 77aaa0695f1c56c79f01254fd14e4ed5df00bd94 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 4 Jul 2024 20:37:05 +0200 Subject: [PATCH 098/227] nixos/lomiri: Add teleports --- nixos/modules/services/desktop-managers/lomiri.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index e1de29ba3b59..8db2c4f5fca8 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -39,6 +39,7 @@ in { qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session suru-icon-theme telephony-service + teleports ]); variables = { # To override the keyboard layouts in Lomiri From 3751d66c836fa24f2828f0a4d818c7d9cd18aa39 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 12 Jul 2024 11:49:04 +0200 Subject: [PATCH 099/227] python311Packages.jaxtyping: 0.2.31 -> 0.2.33 Diff: https://github.com/google/jaxtyping/compare/refs/tags/v0.2.31...v0.2.33 Changelog: https://github.com/patrick-kidger/jaxtyping/releases/tag/v0.2.33 --- pkgs/development/python-modules/jaxtyping/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaxtyping/default.nix b/pkgs/development/python-modules/jaxtyping/default.nix index c8fba04ec260..e28c6aecef3d 100644 --- a/pkgs/development/python-modules/jaxtyping/default.nix +++ b/pkgs/development/python-modules/jaxtyping/default.nix @@ -18,7 +18,7 @@ let self = buildPythonPackage rec { pname = "jaxtyping"; - version = "0.2.31"; + version = "0.2.33"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ let owner = "google"; repo = "jaxtyping"; rev = "refs/tags/v${version}"; - hash = "sha256-kuGFzp8sDLq6J/qq8ap3lD3n1pABHurXcbRUtDQyWwE="; + hash = "sha256-CL1EONbjjT3SCAn2o1x+1cgfuYWMEgQwbX9j34t+HGs="; }; build-system = [ From 6c549edd900a82dbce58524457ddc06d3fac6d4f Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 13 Jul 2024 11:35:42 +0200 Subject: [PATCH 100/227] python311Packages.equinox: disable flaky test --- pkgs/development/python-modules/equinox/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix index 0e9cabdcf656..47a1be300568 100644 --- a/pkgs/development/python-modules/equinox/default.nix +++ b/pkgs/development/python-modules/equinox/default.nix @@ -72,6 +72,10 @@ buildPythonPackage rec { # AssertionError: assert 'foo:\n pri...pe=float32)\n' == 'foo:\n pri...pe=float32)\n' # Also reported in patrick-kidger/equinox#716 "test_backward_nan" + + # Flaky test + # See https://github.com/patrick-kidger/equinox/issues/781 + "test_traceback_runtime_eqx" ]; meta = { From ac7456760d6d2cb19deb2a1fd22753235cb0893b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 10:12:15 +0000 Subject: [PATCH 101/227] python312Packages.azure-mgmt-cosmosdb: 9.5.0 -> 9.5.1 --- .../python-modules/azure-mgmt-cosmosdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 01ef04a5d231..2ae19e4d8e25 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "9.5.0"; + version = "9.5.1"; format = "setuptools"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-XSGhl94Is2OOCa2I4y2iEfe7WYt9fP7kjWHVfWmz7dk="; + hash = "sha256-TlXTlz8RzwLPeoBVruhmFSM9fL47siegfBdrrIvH7wI="; }; propagatedBuildInputs = [ From c3fa9d6d0bff5c19cb733226f2f9d6a9b536299a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Jun 2024 11:21:10 -0300 Subject: [PATCH 102/227] SDL2_image: migrate to by-name --- .../default.nix => by-name/sd/SDL2_image/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries/SDL2_image/default.nix => by-name/sd/SDL2_image/package.nix} (100%) diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/by-name/sd/SDL2_image/package.nix similarity index 100% rename from pkgs/development/libraries/SDL2_image/default.nix rename to pkgs/by-name/sd/SDL2_image/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32dadb301c0e..bcb895e6fa2d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23980,7 +23980,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; - SDL2_image = callPackage ../development/libraries/SDL2_image { + SDL2_image = callPackage ../by-name/sd/SDL2_image/package.nix { inherit (darwin.apple_sdk.frameworks) Foundation; }; # Pinned for pygame, toppler From 093e3b60d33223529d32b8865a08e61a7e573b35 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Jun 2024 11:34:40 -0300 Subject: [PATCH 103/227] SDL2_image: refactor - internalize `darwin` - reorder input set - new input: enableSdltest - reorder buildInputs - rewrite configureFlags - get rid of nested with - SDL team Caution: can cause mass rebuilds. --- pkgs/by-name/sd/SDL2_image/package.nix | 64 +++++++++++++++++++------- pkgs/top-level/all-packages.nix | 3 -- 2 files changed, 47 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 03b3f146ca93..20eb05732f9c 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -1,8 +1,25 @@ -{ lib, stdenv, fetchurl -, pkg-config -, SDL2, libpng, libjpeg, libtiff, giflib, libwebp, libXpm, zlib, Foundation +{ + lib, + SDL2, + darwin, + fetchurl, + giflib, + libXpm, + libjpeg, + libpng, + libtiff, + libwebp, + pkg-config, + stdenv, + zlib, + # Boolean flags + ## Darwin headless will hang when trying to run the SDL test program + enableSdltest ? (!stdenv.isDarwin), }: +let + inherit (darwin.apple_sdk.frameworks) Foundation; +in stdenv.mkDerivation (finalAttrs: { pname = "SDL2_image"; version = "2.8.2"; @@ -14,29 +31,42 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 libpng libjpeg libtiff giflib libwebp libXpm zlib ] - ++ lib.optional stdenv.isDarwin Foundation; + buildInputs = [ + SDL2 + giflib + libXpm + libjpeg + libpng + libtiff + libwebp + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + Foundation + ]; configureFlags = [ # Disable dynamically loaded dependencies - "--disable-jpg-shared" - "--disable-png-shared" - "--disable-tif-shared" - "--disable-webp-shared" + (lib.enableFeature false "jpg-shared") + (lib.enableFeature false "png-shared") + (lib.enableFeature false "tif-shared") + (lib.enableFeature false "webp-shared") + (lib.enableFeature enableSdltest "sdltest") ] ++ lib.optionals stdenv.isDarwin [ - # Darwin headless will hang when trying to run the SDL test program - "--disable-sdltest" # Don't use native macOS frameworks - "--disable-imageio" + # Caution: do not set this as (!stdenv.isDarwin) since it would be true + # outside Darwin - and ImageIO does not exist outisde Darwin + (lib.enableFeature false "imageio") ]; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "SDL image library"; - homepage = "http://www.libsdl.org/projects/SDL_image/"; - platforms = platforms.unix; - license = licenses.zlib; - maintainers = with maintainers; [ cpages ]; + homepage = "https://github.com/libsdl-org/SDL_image"; + license = lib.licenses.zlib; + maintainers = lib.teams.sdl.members + ++ (with lib.maintainers; [ cpages ]); + platforms = lib.platforms.unix; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bcb895e6fa2d..67dc91b624c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23980,9 +23980,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; - SDL2_image = callPackage ../by-name/sd/SDL2_image/package.nix { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; # Pinned for pygame, toppler SDL2_image_2_0 = SDL2_image.overrideAttrs (oldAttrs: { version = "2.0.5"; From 7f084a8532ffb264473b5f4bb3c3fd51efce5060 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 10 Jul 2024 22:28:04 -0300 Subject: [PATCH 104/227] SDL2_image: set strictDeps as true --- pkgs/by-name/sd/SDL2_image/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 20eb05732f9c..73af43bffcfd 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -29,7 +29,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-j0hrv7z4Rk3VjJ5dkzlKsCVc5otRxalmqRgkSCCnbdw="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + SDL2 + pkg-config + ]; buildInputs = [ SDL2 @@ -59,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.enableFeature false "imageio") ]; + strictDeps = true; + enableParallelBuilding = true; meta = { From 1f8f3e7c402d85ee6737d0ec5ff498873232354e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 10 Jul 2024 22:30:35 -0300 Subject: [PATCH 105/227] SDL2_image: nixfmt --- pkgs/by-name/sd/SDL2_image/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 73af43bffcfd..3db69218078e 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -43,10 +43,7 @@ stdenv.mkDerivation (finalAttrs: { libtiff libwebp zlib - ] - ++ lib.optionals stdenv.isDarwin [ - Foundation - ]; + ] ++ lib.optionals stdenv.isDarwin [ Foundation ]; configureFlags = [ # Disable dynamically loaded dependencies @@ -70,8 +67,7 @@ stdenv.mkDerivation (finalAttrs: { description = "SDL image library"; homepage = "https://github.com/libsdl-org/SDL_image"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members - ++ (with lib.maintainers; [ cpages ]); + maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ cpages ]); platforms = lib.platforms.unix; }; }) From a91743a5f3a667aa6987c86c58466e2712143246 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 10 Jul 2024 22:31:35 -0300 Subject: [PATCH 106/227] SDL2_image: remove cpages from meta.maintainers No activity since a long time. --- pkgs/by-name/sd/SDL2_image/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sd/SDL2_image/package.nix b/pkgs/by-name/sd/SDL2_image/package.nix index 3db69218078e..2af81bd18cb7 100644 --- a/pkgs/by-name/sd/SDL2_image/package.nix +++ b/pkgs/by-name/sd/SDL2_image/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { description = "SDL image library"; homepage = "https://github.com/libsdl-org/SDL_image"; license = lib.licenses.zlib; - maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ cpages ]); + maintainers = lib.teams.sdl.members ++ (with lib.maintainers; [ ]); platforms = lib.platforms.unix; }; }) From 108d37991f17054f036a6fffb3d113828081a0d6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Jun 2024 11:42:58 -0300 Subject: [PATCH 107/227] SDL2_image_2_0: migrate to by-name --- pkgs/by-name/sd/SDL2_image_2_0/package.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 8 -------- 2 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 pkgs/by-name/sd/SDL2_image_2_0/package.nix diff --git a/pkgs/by-name/sd/SDL2_image_2_0/package.nix b/pkgs/by-name/sd/SDL2_image_2_0/package.nix new file mode 100644 index 000000000000..c52a60637766 --- /dev/null +++ b/pkgs/by-name/sd/SDL2_image_2_0/package.nix @@ -0,0 +1,14 @@ +# Dependency of pygame, toppler +{ + lib, + SDL2_image, + fetchurl, +}: + +SDL2_image.overrideAttrs (oldAttrs: { + version = "2.0.5"; + src = fetchurl { + inherit (oldAttrs.src) url; + hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67dc91b624c2..525ef43e9599 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23980,14 +23980,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; - # Pinned for pygame, toppler - SDL2_image_2_0 = SDL2_image.overrideAttrs (oldAttrs: { - version = "2.0.5"; - src = fetchurl { - inherit (oldAttrs.src) url; - hash = "sha256-vdX24CZoL31+G+C2BRsgnaL0AqLdi9HEvZwlrSYxCNA"; - }; - }); # Pinned for hedgewars: # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 SDL2_image_2_6 = SDL2_image.overrideAttrs (oldAttrs: { From cea3c9fbe57bf03d06283b88816bbad1fd8f7266 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 7 Jun 2024 11:43:47 -0300 Subject: [PATCH 108/227] SDL2_image_2_6: migrate to by-name --- pkgs/by-name/sd/SDL2_image_2_6/package.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 10 ---------- 2 files changed, 15 insertions(+), 10 deletions(-) create mode 100644 pkgs/by-name/sd/SDL2_image_2_6/package.nix diff --git a/pkgs/by-name/sd/SDL2_image_2_6/package.nix b/pkgs/by-name/sd/SDL2_image_2_6/package.nix new file mode 100644 index 000000000000..ef57e146098e --- /dev/null +++ b/pkgs/by-name/sd/SDL2_image_2_6/package.nix @@ -0,0 +1,15 @@ +# Dependency for hedgewars: +# https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 +{ + lib, + SDL2_image, + fetchurl, +}: + +SDL2_image.overrideAttrs (oldAttrs: { + version = "2.6.3"; + src = fetchurl { + inherit (oldAttrs.src) url; + hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw="; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 525ef43e9599..1fd43c9b3470 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23980,16 +23980,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL; }; - # Pinned for hedgewars: - # https://github.com/NixOS/nixpkgs/pull/274185#issuecomment-1856764786 - SDL2_image_2_6 = SDL2_image.overrideAttrs (oldAttrs: { - version = "2.6.3"; - src = fetchurl { - inherit (oldAttrs.src) url; - hash = "sha256-kxyb5b8dfI+um33BV4KLfu6HTiPH8ktEun7/a0g2MSw="; - }; - }); - sdrplay = callPackage ../applications/radio/sdrplay { }; sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { }; From 444dcf383b6136db1f44be520a3038001e0bc65a Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sat, 13 Jul 2024 13:57:30 +0200 Subject: [PATCH 109/227] cloudcompare: fix source hash --- pkgs/applications/graphics/cloudcompare/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 0ef3444fe78a..74522f48630a 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { owner = "CloudCompare"; repo = "CloudCompare"; rev = "v${version}"; - hash = "sha256-KVbFGim2Nqhs5PAQiBNTmJStmnEINTeopiqqEBBniHc="; + hash = "sha256-a/0lf3Mt5ZpLFRM8jAoqZer8pY1ROgPRY4dPt34Bk3E="; fetchSubmodules = true; }; From 5d27ab8df13638ce24ea29076c70d4c3be9ab165 Mon Sep 17 00:00:00 2001 From: isabel Date: Sat, 13 Jul 2024 08:40:07 +0100 Subject: [PATCH 110/227] lazygit: 0.42.0 -> 0.43.1 --- pkgs/by-name/la/lazygit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 98bb863350f5..4f7134692ba5 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "lazygit"; - version = "0.42.0"; + version = "0.43.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - hash = "sha256-w5QL+CuMYyTTnNAfWF8jQuQWfjxaw7bANK69Dc+onGk="; + hash = "sha256-iFx/ffaijhOqEDRW1QVzhQMvSgnS4lKFOzq1YdlkUzc="; }; vendorHash = null; From fb0f3213f3ffa887a31055340d4a65a6d666ed8c Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Fri, 12 Jul 2024 08:35:33 -0700 Subject: [PATCH 111/227] python3Packages.expiringdict: remove nose Addresses NixOS/nixpkgs#326513 by applying mailgun/expiringdict#49 --- .../python-modules/expiringdict/default.nix | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/expiringdict/default.nix b/pkgs/development/python-modules/expiringdict/default.nix index 772b3d636335..6478de1aff92 100644 --- a/pkgs/development/python-modules/expiringdict/default.nix +++ b/pkgs/development/python-modules/expiringdict/default.nix @@ -2,11 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, dill, - coverage, - coveralls, mock, - nose, + pytestCheckHook, }: buildPythonPackage rec { @@ -23,19 +22,19 @@ buildPythonPackage rec { hash = "sha256-vRhJSHIqc51I+s/wndtfANM44CKW3QS1iajqyoSBf0I="; }; - nativeCheckInputs = [ - dill - coverage - coveralls - mock - nose + patches = [ + # apply mailgun/expiringdict#49 to address NixOS/nixpkgs#326513 + (fetchpatch2 { + url = "https://github.com/mailgun/expiringdict/commit/1c0f82232d20f8b3b31c9269a4d0e9510c1721a6.patch"; + hash = "sha256-IeeJVb2tOwRhEPNGqM30fNZyz3jFcnZNWC3I6K1+hSY="; + }) ]; - checkPhase = '' - runHook preCheck - nosetests -v --with-coverage --cover-package=expiringdict - runHook postCheck - ''; + nativeCheckInputs = [ + dill + mock + pytestCheckHook + ]; pythonImportsCheck = [ "expiringdict" ]; From 34d1affd6e1bbc74715e5b064268d3b336cbed9e Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Fri, 12 Jul 2024 14:42:25 -0700 Subject: [PATCH 112/227] python3Packages.expiringdict: patch for Python 3.12 Applies mailgun/expiringdict#56 for compatibility with Python 3.12 --- pkgs/development/python-modules/expiringdict/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/expiringdict/default.nix b/pkgs/development/python-modules/expiringdict/default.nix index 6478de1aff92..4fc3366a7a42 100644 --- a/pkgs/development/python-modules/expiringdict/default.nix +++ b/pkgs/development/python-modules/expiringdict/default.nix @@ -28,6 +28,12 @@ buildPythonPackage rec { url = "https://github.com/mailgun/expiringdict/commit/1c0f82232d20f8b3b31c9269a4d0e9510c1721a6.patch"; hash = "sha256-IeeJVb2tOwRhEPNGqM30fNZyz3jFcnZNWC3I6K1+hSY="; }) + + # apply mailgun/expiringdict#56 for compatibility with Python 3.12 + (fetchpatch2 { + url = "https://github.com/mailgun/expiringdict/commit/976faf3664d54049e443aca054f5819db834577b.patch"; + hash = "sha256-FNdnU6iUMyED5j8oAjhmJTR7zQeEc/Z5s64pdeT4F8w="; + }) ]; nativeCheckInputs = [ From ead5eba6b371b8a849ac4ed7f427fc2ebe09d6d2 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Sat, 13 Jul 2024 05:36:26 -0700 Subject: [PATCH 113/227] python3Packages.expiringdict: use PEP 517 builder --- pkgs/development/python-modules/expiringdict/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/expiringdict/default.nix b/pkgs/development/python-modules/expiringdict/default.nix index 4fc3366a7a42..e4904230a497 100644 --- a/pkgs/development/python-modules/expiringdict/default.nix +++ b/pkgs/development/python-modules/expiringdict/default.nix @@ -6,12 +6,13 @@ dill, mock, pytestCheckHook, + setuptools }: buildPythonPackage rec { pname = "expiringdict"; version = "1.2.2"; - format = "setuptools"; + pyproject = true; # use fetchFromGitHub instead of fetchPypi because the test suite of # the package is not included into the PyPI tarball @@ -36,6 +37,8 @@ buildPythonPackage rec { }) ]; + build-system = [ setuptools ]; + nativeCheckInputs = [ dill mock From 1a89942243719cd83ba016a07fe4273710137735 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 13 Jul 2024 21:27:47 +0800 Subject: [PATCH 114/227] treewide: sha256 -> hash attribute for gitlab.com fetchers --- pkgs/applications/audio/callaudiod/default.nix | 2 +- pkgs/applications/audio/geonkick/default.nix | 2 +- pkgs/applications/audio/mellowplayer/default.nix | 2 +- pkgs/applications/audio/sayonara/default.nix | 2 +- pkgs/applications/audio/uade/default.nix | 2 +- pkgs/applications/blockchains/bitcoin-unlimited/default.nix | 2 +- pkgs/applications/emulators/goldberg-emu/default.nix | 2 +- pkgs/applications/gis/zombietrackergps/default.nix | 2 +- pkgs/applications/graphics/ovito/default.nix | 2 +- pkgs/applications/graphics/pizarra/default.nix | 2 +- pkgs/applications/misc/OSCAR/default.nix | 2 +- pkgs/applications/misc/corectrl/default.nix | 2 +- pkgs/applications/misc/darkman/default.nix | 2 +- pkgs/applications/misc/fetchmail/v7.nix | 2 +- pkgs/applications/misc/gcstar/default.nix | 2 +- pkgs/applications/misc/kile-wl/default.nix | 2 +- pkgs/applications/misc/openrgb/default.nix | 2 +- pkgs/applications/misc/redshift/default.nix | 2 +- pkgs/applications/misc/tipp10/default.nix | 2 +- pkgs/applications/networking/headlines/default.nix | 2 +- .../networking/instant-messengers/signald/default.nix | 2 +- pkgs/applications/networking/weather/meteo/default.nix | 2 +- pkgs/applications/radio/gridtracker/default.nix | 2 +- pkgs/applications/science/chemistry/octopus/default.nix | 2 +- pkgs/applications/science/electronics/flopoco/default.nix | 2 +- .../gitlab/gitlab-elasticsearch-indexer/default.nix | 2 +- .../version-management/gitlab/gitlab-shell/default.nix | 2 +- pkgs/applications/video/devede/default.nix | 2 +- pkgs/applications/video/glaxnimate/default.nix | 2 +- pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix | 2 +- pkgs/by-name/an/ananicy-cpp/package.nix | 2 +- pkgs/by-name/cl/clickable/package.nix | 2 +- pkgs/by-name/ec/eclint/package.nix | 2 +- pkgs/by-name/sw/swayws/package.nix | 2 +- pkgs/data/icons/simp1e-cursors/default.nix | 2 +- pkgs/desktops/gnome/extensions/arcmenu/default.nix | 2 +- pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix | 2 +- pkgs/development/compilers/owl-lisp/default.nix | 2 +- pkgs/development/guile-modules/guile-git/default.nix | 2 +- pkgs/development/libraries/arpa2common/default.nix | 2 +- pkgs/development/libraries/eigen/default.nix | 2 +- pkgs/development/libraries/ldutils/default.nix | 2 +- pkgs/development/libraries/libaccounts-glib/default.nix | 2 +- pkgs/development/libraries/libarchive-qt/default.nix | 2 +- pkgs/development/libraries/quickder/default.nix | 2 +- pkgs/development/libraries/quickmem/default.nix | 2 +- pkgs/development/libraries/science/math/lcalc/default.nix | 2 +- pkgs/development/libraries/science/networking/ns-3/default.nix | 2 +- pkgs/development/libraries/tezos-rust-libs/default.nix | 2 +- pkgs/development/ocaml-modules/bls12-381/default.nix | 2 +- pkgs/development/ocaml-modules/class_group_vdf/default.nix | 2 +- pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix | 2 +- pkgs/development/ocaml-modules/dose3/default.nix | 2 +- pkgs/development/ocaml-modules/ff/sig.nix | 2 +- pkgs/development/ocaml-modules/lwt-watcher/default.nix | 2 +- pkgs/development/ocaml-modules/polynomial/default.nix | 2 +- pkgs/development/ocaml-modules/resto/default.nix | 2 +- pkgs/development/ocaml-modules/ringo/default.nix | 2 +- pkgs/development/tools/asn2quickder/default.nix | 2 +- pkgs/development/tools/build-managers/arpa2cm/default.nix | 2 +- pkgs/development/tools/check/default.nix | 2 +- pkgs/development/tools/click/default.nix | 2 +- .../tools/continuous-integration/gitlab-runner/default.nix | 2 +- pkgs/development/tools/misc/deheader/default.nix | 2 +- pkgs/development/tools/misc/yodl/default.nix | 2 +- pkgs/development/tools/parsing/bisonc++/default.nix | 2 +- pkgs/development/tools/profiling/EZTrace/default.nix | 2 +- pkgs/development/tools/rust/gitlab-clippy/default.nix | 2 +- pkgs/development/tools/rust/ograc/default.nix | 2 +- pkgs/development/tools/tapview/default.nix | 2 +- pkgs/games/airshipper/default.nix | 2 +- pkgs/games/cbonsai/default.nix | 2 +- pkgs/games/doom-ports/enyo-launcher/default.nix | 2 +- pkgs/games/infra-arcana/default.nix | 2 +- pkgs/games/sfrotz/default.nix | 2 +- pkgs/games/toppler/default.nix | 2 +- pkgs/misc/drivers/argononed/default.nix | 2 +- pkgs/misc/drivers/utsushi/default.nix | 2 +- pkgs/os-specific/linux/brillo/default.nix | 2 +- pkgs/os-specific/linux/fanctl/default.nix | 2 +- pkgs/os-specific/linux/pscircle/default.nix | 2 +- pkgs/servers/misc/virtiofsd/default.nix | 2 +- pkgs/tools/X11/libstrangle/default.nix | 2 +- pkgs/tools/audio/mpd-sima/default.nix | 2 +- pkgs/tools/compression/bzip2/1_1.nix | 2 +- pkgs/tools/graphics/vkbasalt-cli/default.nix | 2 +- pkgs/tools/inputmethods/interception-tools/caps2esc.nix | 2 +- pkgs/tools/inputmethods/interception-tools/default.nix | 2 +- pkgs/tools/misc/ffsend/default.nix | 2 +- pkgs/tools/misc/gwe/default.nix | 2 +- pkgs/tools/misc/kcollectd/default.nix | 2 +- pkgs/tools/misc/ristate/default.nix | 2 +- pkgs/tools/misc/timelimit/default.nix | 2 +- pkgs/tools/misc/usbimager/default.nix | 2 +- pkgs/tools/misc/watchlog/default.nix | 2 +- pkgs/tools/networking/goimapnotify/default.nix | 2 +- pkgs/tools/networking/mmsd-tng/default.nix | 2 +- pkgs/tools/networking/networkd-notify/default.nix | 2 +- pkgs/tools/networking/ocserv/default.nix | 2 +- pkgs/tools/networking/redfang/default.nix | 2 +- pkgs/tools/networking/veilid/default.nix | 2 +- pkgs/tools/networking/wget2/default.nix | 2 +- pkgs/tools/system/tree/default.nix | 2 +- pkgs/tools/text/highlight/default.nix | 2 +- pkgs/tools/text/sgml/linuxdoc-tools/default.nix | 2 +- pkgs/tools/wayland/swaysome/default.nix | 2 +- 106 files changed, 106 insertions(+), 106 deletions(-) diff --git a/pkgs/applications/audio/callaudiod/default.nix b/pkgs/applications/audio/callaudiod/default.nix index 37b0ca2fa047..51dc15f4ec54 100644 --- a/pkgs/applications/audio/callaudiod/default.nix +++ b/pkgs/applications/audio/callaudiod/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "mobian1"; repo = pname; rev = version; - sha256 = "sha256-gc66XrrFyhF1TvrDECBfGQc+MiDtqZPxdCn0S/43XQU="; + hash = "sha256-gc66XrrFyhF1TvrDECBfGQc+MiDtqZPxdCn0S/43XQU="; }; strictDeps = true; diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index 2ff3c823a7ab..da22ade3868c 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "Geonkick-Synthesizer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zoEC85QYcQMF92KvLBikYw1nDoSHaedpTDDqvoAtte0="; + hash = "sha256-zoEC85QYcQMF92KvLBikYw1nDoSHaedpTDDqvoAtte0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix index b5eb65cad444..9551e0dda3b2 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/pkgs/applications/audio/mellowplayer/default.nix @@ -21,7 +21,7 @@ mkDerivation rec { owner = "ColinDuquesnoy"; repo = "MellowPlayer"; rev = version; - sha256 = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk="; + hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/applications/audio/sayonara/default.nix index e7efb7896be7..eef3c083b5a1 100644 --- a/pkgs/applications/audio/sayonara/default.nix +++ b/pkgs/applications/audio/sayonara/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { owner = "luciocarreras"; repo = "sayonara-player"; rev = version; - sha256 = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw="; + hash = "sha256-tJ/8tGNkmTwWRCpPy/h85SP/6QDAgcaKWJdM5MSAXJw="; }; nativeBuildInputs = [ cmake ninja pkg-config qttools ]; diff --git a/pkgs/applications/audio/uade/default.nix b/pkgs/applications/audio/uade/default.nix index 8a7a336283cc..b435bba66b96 100644 --- a/pkgs/applications/audio/uade/default.nix +++ b/pkgs/applications/audio/uade/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "uade-music-player"; repo = "uade"; rev = "uade-${version}"; - sha256 = "sha256-skPEXBQwyr326zCmZ2jwGxcBoTt3Y/h2hagDeeqbMpw="; + hash = "sha256-skPEXBQwyr326zCmZ2jwGxcBoTt3Y/h2hagDeeqbMpw="; }; postPatch = '' diff --git a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index 033c3d6ed9bf..4cd60294a81d 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "bitcoinunlimited"; repo = "BCHUnlimited"; rev = "BCHunlimited${version}"; - sha256 = "sha256-d+giTXq/6HpysRAPT7yOl/B1x4zie9irs4O7cJsBqHg="; + hash = "sha256-d+giTXq/6HpysRAPT7yOl/B1x4zie9irs4O7cJsBqHg="; }; nativeBuildInputs = [ pkg-config autoreconfHook python3 ] diff --git a/pkgs/applications/emulators/goldberg-emu/default.nix b/pkgs/applications/emulators/goldberg-emu/default.nix index 4c545ac3b85b..8b1e92b5963a 100644 --- a/pkgs/applications/emulators/goldberg-emu/default.nix +++ b/pkgs/applications/emulators/goldberg-emu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "mr_goldberg"; repo = "goldberg_emulator"; rev = version; - sha256 = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog="; + hash = "sha256-goOgMNjtDmIKOAv9sZwnPOY0WqTN90LFJ5iEp3Vkzog="; }; # It attempts to install windows-only libraries which we never build diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix index 4acedbac2a2f..762777bf8acf 100644 --- a/pkgs/applications/gis/zombietrackergps/default.nix +++ b/pkgs/applications/gis/zombietrackergps/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { # latest revision is not tagged upstream, use commit sha in the meantime #rev = "v_${version}"; rev = "cc75d5744965cc6973323f5bb77f00b0b0153dce"; - sha256 = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM="; + hash = "sha256-z/LFNRFdQQFxEWyAjcuGezRbTsv8z6Q6fK8NLjP4HNM="; }; buildInputs = diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix index 81ce2518cea7..3af9566c375f 100644 --- a/pkgs/applications/graphics/ovito/default.nix +++ b/pkgs/applications/graphics/ovito/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { owner = "stuko"; repo = "ovito"; rev = "v${version}"; - sha256 = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA="; + hash = "sha256-Z3uwjOYJ7di/LLllbzdKjzUE7m119i03bA8dJPqhxWA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix index c636637763d7..5d06423b9fa4 100644 --- a/pkgs/applications/graphics/pizarra/default.nix +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { repo = "pizarra-gtk"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw="; + hash = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw="; }; cargoHash = "sha256-btvMUKADGHlXLmeKF1K9Js44SljZ0MejGId8aDwPhVU="; diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix index 223fff1080e5..fab17cb0737d 100644 --- a/pkgs/applications/misc/OSCAR/default.nix +++ b/pkgs/applications/misc/OSCAR/default.nix @@ -7,7 +7,7 @@ mkDerivation rec { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg="; + hash = "sha256-FBHbPtMZeIgcR1pQflfEWK2FS8bquctXaeY/yaZofHg="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index 14247827b2d6..efcedf63d2a1 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec{ owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; + hash = "sha256-E2Dqe1IYXjFb/nShQX+ARZW/AWpNonRimb3yQ6/2CFw="; }; patches = [ ./polkit-dir.patch diff --git a/pkgs/applications/misc/darkman/default.nix b/pkgs/applications/misc/darkman/default.nix index 33918b41329b..66b67be5b607 100644 --- a/pkgs/applications/misc/darkman/default.nix +++ b/pkgs/applications/misc/darkman/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { owner = "WhyNotHugo"; repo = "darkman"; rev = "v${version}"; - sha256 = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o="; + hash = "sha256-FaEpVy/0PqY5Bmw00hMyFZb9wcwYwEuCKMatYN8Xk3o="; }; patches = [ diff --git a/pkgs/applications/misc/fetchmail/v7.nix b/pkgs/applications/misc/fetchmail/v7.nix index 9fa51a34d596..69235f454133 100644 --- a/pkgs/applications/misc/fetchmail/v7.nix +++ b/pkgs/applications/misc/fetchmail/v7.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "fetchmail"; repo = "fetchmail"; rev = "30b368fb8660d8fec08be1cdf2606c160b4bcb80"; - sha256 = "sha256-83D2YlFCODK2YD+oLICdim2NtNkkJU67S3YLi8Q6ga8="; + hash = "sha256-83D2YlFCODK2YD+oLICdim2NtNkkJU67S3YLi8Q6ga8="; }; buildInputs = with pkgs; [ openssl python3 ]; diff --git a/pkgs/applications/misc/gcstar/default.nix b/pkgs/applications/misc/gcstar/default.nix index 02662f11f96b..fbc730121f02 100644 --- a/pkgs/applications/misc/gcstar/default.nix +++ b/pkgs/applications/misc/gcstar/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "Kerenoc"; repo = "GCstar"; rev = "v${version}"; - sha256 = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg="; + hash = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix index 582509db4184..a5f05c473f38 100644 --- a/pkgs/applications/misc/kile-wl/default.nix +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { owner = "snakedye"; repo = "kile"; rev = "c24208761d04e0a74d203fc1dcd2f7fed68da388"; - sha256 = "sha256-4iclNVd7nm6LkgvsHwWaWyi1bZL/A+bbT5OSXn70bLs="; + hash = "sha256-4iclNVd7nm6LkgvsHwWaWyi1bZL/A+bbT5OSXn70bLs="; }; passthru.updateScript = unstableGitUpdater { diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index ce9219372735..7ac9f639858d 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; + hash = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; }; nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index f0c46f8c207a..80017a41a70a 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -132,7 +132,7 @@ rec { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; + hash = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; }; meta = redshift.meta // { diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index dd3c2ab4fe1a..9405542b45ab 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "tipp10"; repo = "tipp10"; rev = "v${version}"; - sha256 = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4="; + hash = "sha256-e0sWH4pT7ej9XGK/Sg9XMX2bMqcXqtSaYI7KBZTXvp4="; }; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/headlines/default.nix b/pkgs/applications/networking/headlines/default.nix index a4e5a8e684c6..0ab9b639769b 100644 --- a/pkgs/applications/networking/headlines/default.nix +++ b/pkgs/applications/networking/headlines/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "caveman250"; repo = "Headlines"; rev = version; - sha256 = "sha256-wamow0UozX5ecKbXWOgsWCerInL4J0gK0+Muf+eoO9k="; + hash = "sha256-wamow0UozX5ecKbXWOgsWCerInL4J0gK0+Muf+eoO9k="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix index 425e4b45ec61..cdba5366f1ff 100644 --- a/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -13,7 +13,7 @@ let owner = pname; repo = pname; rev = version; - sha256 = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; + hash = "sha256-EofgwZSDp2ZFhlKL2tHfzMr3EsidzuY4pkRZrV2+1bA="; }; gradleWithJdk = gradle.override { java = jdk17_headless; }; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 9914f664d0b0..92ccc8f46ed2 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "bitseater"; repo = pname; rev = version; - sha256 = "sha256-hubKusrs0Hh8RryoEI29pnhTSNsIbtGMltlH4qoM6gE="; + hash = "sha256-hubKusrs0Hh8RryoEI29pnhTSNsIbtGMltlH4qoM6gE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/gridtracker/default.nix b/pkgs/applications/radio/gridtracker/default.nix index 2d632a44680f..688db3fee1d9 100644 --- a/pkgs/applications/radio/gridtracker/default.nix +++ b/pkgs/applications/radio/gridtracker/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "gridtracker.org"; repo = "gridtracker"; rev = "v${version}"; - sha256 = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU="; + hash = "sha256-p3PdYOk0yvG3QkM17grzZmf9upK1n0zo4aOrlhGTvTU="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 2e87cf3db51a..a9b881b2cdc0 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "sha256-8wZR+bYdxJFsUPMWbIGYxRdNzjLgHm+KFLjY7fSN7io="; + hash = "sha256-8wZR+bYdxJFsUPMWbIGYxRdNzjLgHm+KFLjY7fSN7io="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/electronics/flopoco/default.nix b/pkgs/applications/science/electronics/flopoco/default.nix index 2da80512e2b2..cf0ebf18ff75 100644 --- a/pkgs/applications/science/electronics/flopoco/default.nix +++ b/pkgs/applications/science/electronics/flopoco/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { repo = pname; # flopoco-4.1.3 is not tagged on GitLab rev = "67598298207c9f3261c35679c8a5966480c4343c"; - sha256 = "sha256-0jRjg4/qciqBcjsi6BTbKO4VJkcoEzpC98wFkUOIGbI="; + hash = "sha256-0jRjg4/qciqBcjsi6BTbKO4VJkcoEzpC98wFkUOIGbI="; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index b2b29cf15a35..83c4e6c11c1a 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-856lRCW4+FIiXjOzMkfoYws6SMIKXWVtvr+867QEjCk="; + hash = "sha256-856lRCW4+FIiXjOzMkfoYws6SMIKXWVtvr+867QEjCk="; }; vendorHash = "sha256-2XdbTqNGt97jQUJmE06D6M/VxF9+vJAwMM/fF8MP2oo="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 698be436be8f..d9400ce45316 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-SclRIIUZm1D5fYDrTH1L8opQpxxIoi+SrG2GO7wtScU="; + hash = "sha256-SclRIIUZm1D5fYDrTH1L8opQpxxIoi+SrG2GO7wtScU="; }; buildInputs = [ ruby libkrb5 ]; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index f17638d42e3b..798e64ff8372 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -12,7 +12,7 @@ in buildPythonApplication rec { owner = "rastersoft"; repo = "devedeng"; rev = version; - sha256 = "sha256-CdntdD5DRA/eXTBRBRszkbYFeFxj+0odb8XHkAFdobU="; + hash = "sha256-CdntdD5DRA/eXTBRBRszkbYFeFxj+0odb8XHkAFdobU="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index c09b2c8170d4..9e4eda8a0790 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { owner = "mattbas"; repo = "${pname}"; rev = version; - sha256 = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig="; + hash = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix index ab113065629d..41b74807e4af 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "fzwoch"; repo = "obs-nvfbc"; rev = "v${version}"; - sha256 = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo="; + hash = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo="; }; nativeBuildInputs = [ meson pkg-config ninja ]; diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix index 527e9ccd585a..1906773921b4 100644 --- a/pkgs/by-name/an/ananicy-cpp/package.nix +++ b/pkgs/by-name/an/ananicy-cpp/package.nix @@ -23,7 +23,7 @@ clangStdenv.mkDerivation rec { repo = "ananicy-cpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY="; + hash = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY="; }; patches = [ diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix index 28ead1ee695f..53ef6c2dd4b0 100644 --- a/pkgs/by-name/cl/clickable/package.nix +++ b/pkgs/by-name/cl/clickable/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { owner = "clickable"; repo = "clickable"; rev = "v${version}"; - sha256 = "sha256-MFzpeiWeqJ0MG8ouwRkYXD1e6Nsxshmz1NSzCIBRjZ0="; + hash = "sha256-MFzpeiWeqJ0MG8ouwRkYXD1e6Nsxshmz1NSzCIBRjZ0="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/ec/eclint/package.nix b/pkgs/by-name/ec/eclint/package.nix index 3f449489743a..218ca24d2820 100644 --- a/pkgs/by-name/ec/eclint/package.nix +++ b/pkgs/by-name/ec/eclint/package.nix @@ -12,7 +12,7 @@ rec { owner = "greut"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x0dBiRHaDxKrTCR2RfP2/bpBo6xewu8FX7Bv4ugaUAY="; + hash = "sha256-x0dBiRHaDxKrTCR2RfP2/bpBo6xewu8FX7Bv4ugaUAY="; }; vendorHash = "sha256-aNQuALDe37lsmTGpClIBOQJlL0NFSAZCgcmTjx0kP+U="; diff --git a/pkgs/by-name/sw/swayws/package.nix b/pkgs/by-name/sw/swayws/package.nix index 902db2f603d1..75b88ad1baf4 100644 --- a/pkgs/by-name/sw/swayws/package.nix +++ b/pkgs/by-name/sw/swayws/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { owner = "w0lff"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU="; + hash = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU="; }; cargoSha256 = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo="; diff --git a/pkgs/data/icons/simp1e-cursors/default.nix b/pkgs/data/icons/simp1e-cursors/default.nix index 6e20c13465d1..fd2cd4fd9daa 100644 --- a/pkgs/data/icons/simp1e-cursors/default.nix +++ b/pkgs/data/icons/simp1e-cursors/default.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation rec { owner = "cursors"; repo = "simp1e"; rev = version; - sha256 = "sha256-3DCF6TwxWwYK5pF2Ykr3OwF76H7J03vLNZch/XoZZZk="; + hash = "sha256-3DCF6TwxWwYK5pF2Ykr3OwF76H7J03vLNZch/XoZZZk="; fetchSubmodules = true; }; diff --git a/pkgs/desktops/gnome/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix index 9e0747ad876b..d6179736e9e9 100644 --- a/pkgs/desktops/gnome/extensions/arcmenu/default.nix +++ b/pkgs/desktops/gnome/extensions/arcmenu/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "arcmenu"; repo = "ArcMenu"; rev = "v${version}"; - sha256 = "sha256-xLKvcrZkqcj7aHiv9JumLWSP5LbajITAyopCIwGqpkE="; + hash = "sha256-xLKvcrZkqcj7aHiv9JumLWSP5LbajITAyopCIwGqpkE="; }; patches = [ diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix index b24798589cda..9e90d8f1204b 100644 --- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix +++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-ssh.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "Programie"; repo = "krunner-ssh"; rev = version; - sha256 = "sha256-rFTTvmetDeN6t0axVc+8t1TRiuyPBpwqhvsq2IFxa/A="; + hash = "sha256-rFTTvmetDeN6t0axVc+8t1TRiuyPBpwqhvsq2IFxa/A="; }; postPatch = '' diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix index e7bef0e81506..86b7242c31dd 100644 --- a/pkgs/development/compilers/owl-lisp/default.nix +++ b/pkgs/development/compilers/owl-lisp/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo="; + hash = "sha256-GfvOkYLo8fgAvGuUa59hDy+sWJSwyntwqMO8TAK/lUo="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/development/guile-modules/guile-git/default.nix b/pkgs/development/guile-modules/guile-git/default.nix index ef5213b26cbe..d2f6e8e5b2cb 100644 --- a/pkgs/development/guile-modules/guile-git/default.nix +++ b/pkgs/development/guile-modules/guile-git/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "guile-git"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7xKs5Biq9HHOJbNILLU1oX8oPuEbti0uLMiobKz//bU="; + hash = "sha256-7xKs5Biq9HHOJbNILLU1oX8oPuEbti0uLMiobKz//bU="; }; strictDeps = true; diff --git a/pkgs/development/libraries/arpa2common/default.nix b/pkgs/development/libraries/arpa2common/default.nix index 0ada354ce1e6..fc7a897f0d14 100644 --- a/pkgs/development/libraries/arpa2common/default.nix +++ b/pkgs/development/libraries/arpa2common/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "arpa2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg="; + hash = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 4befab1e7b7f..65493e661beb 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "libeigen"; repo = pname; rev = version; - sha256 = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; + hash = "sha256-1/4xMetKMDOgZgzz3WMxfHUEpmdAm52RqZvz6i0mLEw="; }; patches = [ diff --git a/pkgs/development/libraries/ldutils/default.nix b/pkgs/development/libraries/ldutils/default.nix index 157c86ec553e..0bdd8b9ac599 100644 --- a/pkgs/development/libraries/ldutils/default.nix +++ b/pkgs/development/libraries/ldutils/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { repo = pname; rev = "4fc416f694ce888c5bd4c4432a7730bb6260475c"; #rev = "v_${version}"; - sha256 = "sha256-UMDayvz9RlcR4HVJNn7tN4FKbiKAFRSPaK0osA6OGTI="; + hash = "sha256-UMDayvz9RlcR4HVJNn7tN4FKbiKAFRSPaK0osA6OGTI="; }; buildInputs = with libsForQt5.qt5; [ diff --git a/pkgs/development/libraries/libaccounts-glib/default.nix b/pkgs/development/libraries/libaccounts-glib/default.nix index cfac6c97ac74..3ed46996056a 100644 --- a/pkgs/development/libraries/libaccounts-glib/default.nix +++ b/pkgs/development/libraries/libaccounts-glib/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "accounts-sso"; repo = "libaccounts-glib"; rev = "VERSION_${version}"; - sha256 = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; + hash = "sha256-mLhcwp8rhCGSB1K6rTWT0tuiINzgwULwXINfCbgPKEg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix index 767d9228f33a..db1fd7274747 100644 --- a/pkgs/development/libraries/libarchive-qt/default.nix +++ b/pkgs/development/libraries/libarchive-qt/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "marcusbritanicus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-31a6DsxObSJWyLfT6mVtyjloT26IwFHpH53iuyC2mco="; + hash = "sha256-31a6DsxObSJWyLfT6mVtyjloT26IwFHpH53iuyC2mco="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 68da796aa0a5..c3de38398084 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "arpa2"; repo = "quick-der"; rev = "v${version}"; - sha256 = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; + hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/quickmem/default.nix b/pkgs/development/libraries/quickmem/default.nix index 60ea330dc014..91b170030aaf 100644 --- a/pkgs/development/libraries/quickmem/default.nix +++ b/pkgs/development/libraries/quickmem/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "arpa2"; repo = "Quick-MEM"; rev = "v${version}"; - sha256 = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc="; + hash = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index ebab7c00809a..6ea1ca8f8e6c 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "sagemath"; repo = pname; rev = version; - sha256 = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc="; + hash = "sha256-RxWZ7T0I9zV7jUVnL6jV/PxEoU32KY7Q1UsOL5Lonuc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/networking/ns-3/default.nix b/pkgs/development/libraries/science/networking/ns-3/default.nix index 6e63520031c1..2e2e2a871f7a 100644 --- a/pkgs/development/libraries/science/networking/ns-3/default.nix +++ b/pkgs/development/libraries/science/networking/ns-3/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { owner = "nsnam"; repo = "ns-3-dev"; rev = "ns-3.${version}"; - sha256 = "sha256-2d8xCCfxRpcCZgt7ne17F7cUo/wIxLyvjQs3izNUnmY="; + hash = "sha256-2d8xCCfxRpcCZgt7ne17F7cUo/wIxLyvjQs3izNUnmY="; }; nativeBuildInputs = [ cmake pkg-config pythonEnv ]; diff --git a/pkgs/development/libraries/tezos-rust-libs/default.nix b/pkgs/development/libraries/tezos-rust-libs/default.nix index e59e5858eaac..85470f606f28 100644 --- a/pkgs/development/libraries/tezos-rust-libs/default.nix +++ b/pkgs/development/libraries/tezos-rust-libs/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "tezos"; repo = "tezos-rust-libs"; rev = "v${version}"; - sha256 = "sha256-SuCqDZDXmWdGI/GN+3nYcUk66jnW5FQQaeTB76/rvaw="; + hash = "sha256-SuCqDZDXmWdGI/GN+3nYcUk66jnW5FQQaeTB76/rvaw="; }; nativeBuildInputs = [ llvmPackages_12.llvm cargo ]; diff --git a/pkgs/development/ocaml-modules/bls12-381/default.nix b/pkgs/development/ocaml-modules/bls12-381/default.nix index 65b1a476f9dd..f5e7bbbb6f6d 100644 --- a/pkgs/development/ocaml-modules/bls12-381/default.nix +++ b/pkgs/development/ocaml-modules/bls12-381/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = "cryptography/ocaml-bls12-381"; rev = version; - sha256 = "sha256-z2ZSOrXgm+XjdrY91vqxXSKhA0DyJz6JkkNljDZznX8="; + hash = "sha256-z2ZSOrXgm+XjdrY91vqxXSKhA0DyJz6JkkNljDZznX8="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/class_group_vdf/default.nix b/pkgs/development/ocaml-modules/class_group_vdf/default.nix index 57f8023f79f1..61acb189242d 100644 --- a/pkgs/development/ocaml-modules/class_group_vdf/default.nix +++ b/pkgs/development/ocaml-modules/class_group_vdf/default.nix @@ -13,7 +13,7 @@ buildDunePackage (rec { owner = "nomadic-labs/cryptography"; repo = "ocaml-chia-vdf"; rev = "v${version}"; - sha256 = "sha256-KvpnX2DTUyfKARNWHC2lLBGH2Ou2GfRKjw05lu4jbBs="; + hash = "sha256-KvpnX2DTUyfKARNWHC2lLBGH2Ou2GfRKjw05lu4jbBs="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix index c8913ce9bb0b..84565e8007e0 100644 --- a/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix +++ b/pkgs/development/ocaml-modules/ctypes_stubs_js/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = pname; rev = version; - sha256 = "sha256-OJIzg2hnwkXkQHd4bRR051eLf4HNWa/XExxbj46SyUs="; + hash = "sha256-OJIzg2hnwkXkQHd4bRR051eLf4HNWa/XExxbj46SyUs="; }; propagatedBuildInputs = [ integers_stubs_js ]; diff --git a/pkgs/development/ocaml-modules/dose3/default.nix b/pkgs/development/ocaml-modules/dose3/default.nix index 4210dde025c0..3baf5ab62ff6 100644 --- a/pkgs/development/ocaml-modules/dose3/default.nix +++ b/pkgs/development/ocaml-modules/dose3/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { owner = "irill"; repo = "dose3"; rev = version; - sha256 = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; + hash = "sha256-K0fYSAWV48Rers/foDrEIqieyJ0PvpXkuYrFrZGBkkE="; }; minimalOCamlVersion = "4.07"; diff --git a/pkgs/development/ocaml-modules/ff/sig.nix b/pkgs/development/ocaml-modules/ff/sig.nix index 4043c45ceecf..41d95cf99322 100644 --- a/pkgs/development/ocaml-modules/ff/sig.nix +++ b/pkgs/development/ocaml-modules/ff/sig.nix @@ -7,7 +7,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = "cryptography/ocaml-ff"; rev = version; - sha256 = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y="; + hash = "sha256-IoUH4awMOa1pm/t8E5io87R0TZsAxJjGWaXhXjn/w+Y="; }; duneVersion = "3"; diff --git a/pkgs/development/ocaml-modules/lwt-watcher/default.nix b/pkgs/development/ocaml-modules/lwt-watcher/default.nix index db94ce3d62d1..624b59b811b7 100644 --- a/pkgs/development/ocaml-modules/lwt-watcher/default.nix +++ b/pkgs/development/ocaml-modules/lwt-watcher/default.nix @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-35Z73bSzEEgTabNH2cD9lRdDczsyIMZR2ktyKx4aN9k="; + hash = "sha256-35Z73bSzEEgTabNH2cD9lRdDczsyIMZR2ktyKx4aN9k="; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/polynomial/default.nix b/pkgs/development/ocaml-modules/polynomial/default.nix index cd56175d72d9..791aa7b7fabd 100644 --- a/pkgs/development/ocaml-modules/polynomial/default.nix +++ b/pkgs/development/ocaml-modules/polynomial/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = "cryptography/ocaml-polynomial"; rev = version; - sha256 = "sha256-is/PrYLCwStHiQsNq5OVRCwHdXjO2K2Z7FrXgytRfAU="; + hash = "sha256-is/PrYLCwStHiQsNq5OVRCwHdXjO2K2Z7FrXgytRfAU="; }; propagatedBuildInputs = [ zarith ff-sig ]; diff --git a/pkgs/development/ocaml-modules/resto/default.nix b/pkgs/development/ocaml-modules/resto/default.nix index 43735de3e506..56f4f8f30323 100644 --- a/pkgs/development/ocaml-modules/resto/default.nix +++ b/pkgs/development/ocaml-modules/resto/default.nix @@ -8,7 +8,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = "resto"; rev = "v${version}"; - sha256 = "sha256-DIm7fmISsCgRDi4p3NsUk7Cvs/dHpIKMdAOVdYLX2mc="; + hash = "sha256-DIm7fmISsCgRDi4p3NsUk7Cvs/dHpIKMdAOVdYLX2mc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/ringo/default.nix b/pkgs/development/ocaml-modules/ringo/default.nix index 4920a2910b8f..7597a3b078b0 100644 --- a/pkgs/development/ocaml-modules/ringo/default.nix +++ b/pkgs/development/ocaml-modules/ringo/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { owner = "nomadic-labs"; repo = "ringo"; rev = "v${version}"; - sha256 = "sha256-9HW3M27BxrEPbF8cMHwzP8FmJduUInpQQAE2672LOuU="; + hash = "sha256-9HW3M27BxrEPbF8cMHwzP8FmJduUInpQQAE2672LOuU="; }; minimalOCamlVersion = "4.08"; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index 9300534209d8..79ec94d7e3f8 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { owner = "arpa2"; repo = "quick-der"; rev = "v${version}"; - sha256 = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; + hash = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/arpa2cm/default.nix b/pkgs/development/tools/build-managers/arpa2cm/default.nix index 47b1d502842b..7951c7013474 100644 --- a/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "arpa2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk="; + hash = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix index e7bb571cb199..1de7a49f3180 100644 --- a/pkgs/development/tools/check/default.nix +++ b/pkgs/development/tools/check/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "opennota"; repo = "check"; inherit rev; - sha256 = "sha256-u8U/62LZEn1ffwdGsUCGam4HAk7b2LetomCLZzHuuas="; + hash = "sha256-u8U/62LZEn1ffwdGsUCGam4HAk7b2LetomCLZzHuuas="; }; vendorHash = "sha256-DyysiVYFpncmyCzlHIOEtWlCMpm90AC3gdItI9WinSo="; diff --git a/pkgs/development/tools/click/default.nix b/pkgs/development/tools/click/default.nix index 7c6bb5ba6c3f..3508b4cddbce 100644 --- a/pkgs/development/tools/click/default.nix +++ b/pkgs/development/tools/click/default.nix @@ -25,7 +25,7 @@ buildPythonApplication { owner = "ubports"; repo = "development/core/click"; rev = "aaf2735e8e6cbeaf2e429c70136733513a81718a"; - sha256 = "sha256-pNu995/w3tbz15QQVdVYBnWnAoZmqWj1DN/5PZZ0iZw="; + hash = "sha256-pNu995/w3tbz15QQVdVYBnWnAoZmqWj1DN/5PZZ0iZw="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 6f6a8fd68259..683b7f84451a 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-mRL62PIAkPK0aLA7uYpGlUvaJfbD354RDOD4P8MLzx8="; + hash = "sha256-mRL62PIAkPK0aLA7uYpGlUvaJfbD354RDOD4P8MLzx8="; }; patches = [ diff --git a/pkgs/development/tools/misc/deheader/default.nix b/pkgs/development/tools/misc/deheader/default.nix index 5c2fdb20376f..d562ec98b6d1 100644 --- a/pkgs/development/tools/misc/deheader/default.nix +++ b/pkgs/development/tools/misc/deheader/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "esr"; repo = "deheader"; rev = version; - sha256 = "sha256-dYTHvFWlt3aM/fdZFge7GBdd9bfCrEcp7ULJuBl71Xs="; + hash = "sha256-dYTHvFWlt3aM/fdZFge7GBdd9bfCrEcp7ULJuBl71Xs="; }; buildInputs = [ python3 ]; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 6df8827181fd..d8e5bd26b39d 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; src = fetchFromGitLab { - sha256 = "sha256-MeD/jjhwoiWTb/G8pHrnEEX22h+entPr9MhJ6WHO3DM="; + hash = "sha256-MeD/jjhwoiWTb/G8pHrnEEX22h+entPr9MhJ6WHO3DM="; rev = version; repo = "yodl"; owner = "fbb-git"; diff --git a/pkgs/development/tools/parsing/bisonc++/default.nix b/pkgs/development/tools/parsing/bisonc++/default.nix index 3b8bf5601ed5..16d8e13cdfda 100644 --- a/pkgs/development/tools/parsing/bisonc++/default.nix +++ b/pkgs/development/tools/parsing/bisonc++/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "fbb-git"; repo = "bisoncpp"; rev = "6.04.00"; - sha256 = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl"; + hash = "sha256:0aa9bij4g08ilsk6cgrbgi03vyhqr9fn6j2164sjin93m63212wl"; }; buildInputs = [ bobcat ]; diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix index e05e61f60339..e4dbbd76e76e 100644 --- a/pkgs/development/tools/profiling/EZTrace/default.nix +++ b/pkgs/development/tools/profiling/EZTrace/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "eztrace"; repo = "eztrace"; rev = "eztrace-${version}"; - sha256 = "sha256-A6HMr4ib5Ka1lTbbTQOdq3kIdCoN/CwAKRdXdv9wpfU="; + hash = "sha256-A6HMr4ib5Ka1lTbbTQOdq3kIdCoN/CwAKRdXdv9wpfU="; }; nativeBuildInputs = [ gfortran autoreconfHook ]; diff --git a/pkgs/development/tools/rust/gitlab-clippy/default.nix b/pkgs/development/tools/rust/gitlab-clippy/default.nix index 62b3046f05d8..ae74bd65759b 100644 --- a/pkgs/development/tools/rust/gitlab-clippy/default.nix +++ b/pkgs/development/tools/rust/gitlab-clippy/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { owner = "dlalic"; repo = pname; rev = version; - sha256 = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y="; + hash = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y="; }; cargoSha256 = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk="; diff --git a/pkgs/development/tools/rust/ograc/default.nix b/pkgs/development/tools/rust/ograc/default.nix index 83938a505316..6b1e1f45d232 100644 --- a/pkgs/development/tools/rust/ograc/default.nix +++ b/pkgs/development/tools/rust/ograc/default.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage { owner = "lirnril"; repo = "ograc"; rev = "d09b3102ff7a364bf2593589327a16a473bd4f25"; - sha256 = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo="; + hash = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo="; }; cargoSha256 = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA="; diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/development/tools/tapview/default.nix index cc121061df03..718ef854225a 100644 --- a/pkgs/development/tools/tapview/default.nix +++ b/pkgs/development/tools/tapview/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "esr"; repo = pname; rev = version; - sha256 = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; + hash = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; }; # Remove unnecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index ae26c4cf7bbf..56369398942a 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage { owner = "Veloren"; repo = "airshipper"; rev = "v${version}"; - sha256 = "sha256-5zP1Ye1fJNQp8eWKwdxLqBr4qzBfWEEBsJ9s7+8idL4="; + hash = "sha256-5zP1Ye1fJNQp8eWKwdxLqBr4qzBfWEEBsJ9s7+8idL4="; }; cargoLock = { diff --git a/pkgs/games/cbonsai/default.nix b/pkgs/games/cbonsai/default.nix index 3898a42e476f..28eb5967315f 100644 --- a/pkgs/games/cbonsai/default.nix +++ b/pkgs/games/cbonsai/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jallbrit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XFK6DiIb8CzVubTnEMkqRW8xZkX/SWjUsrfS+I7LOs8="; + hash = "sha256-XFK6DiIb8CzVubTnEMkqRW8xZkX/SWjUsrfS+I7LOs8="; }; nativeBuildInputs = [ pkg-config scdoc ]; diff --git a/pkgs/games/doom-ports/enyo-launcher/default.nix b/pkgs/games/doom-ports/enyo-launcher/default.nix index 857e2a543e63..422a9033ee0f 100644 --- a/pkgs/games/doom-ports/enyo-launcher/default.nix +++ b/pkgs/games/doom-ports/enyo-launcher/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "sdcofer70"; repo = "enyo-launcher"; rev = version; - sha256 = "sha256-k6Stc1tQOcdS//j+bFUNfnOUlwuhIPKxf9DHU+ng164="; + hash = "sha256-k6Stc1tQOcdS//j+bFUNfnOUlwuhIPKxf9DHU+ng164="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/games/infra-arcana/default.nix b/pkgs/games/infra-arcana/default.nix index 4d3db6214cbb..609bb192c28a 100644 --- a/pkgs/games/infra-arcana/default.nix +++ b/pkgs/games/infra-arcana/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "martin-tornqvist"; repo = "ia"; rev = "v${version}"; - sha256 = "sha256-MI+wH0+1f41JYXT2hzDs3RrrR3eTfOzgtCa5T6m8oQc="; + hash = "sha256-MI+wH0+1f41JYXT2hzDs3RrrR3eTfOzgtCa5T6m8oQc="; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/games/sfrotz/default.nix b/pkgs/games/sfrotz/default.nix index 2514374cf05a..49f903b86101 100644 --- a/pkgs/games/sfrotz/default.nix +++ b/pkgs/games/sfrotz/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "DavidGriffith"; repo = "frotz"; rev = version; - sha256 = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8="; + hash = "sha256-GvGxojD8d5GVy/d8h3q6K7KJroz2lsKbfE0F0acjBl8="; }; buildInputs = [ diff --git a/pkgs/games/toppler/default.nix b/pkgs/games/toppler/default.nix index fe36229363ce..48fb4667d93f 100644 --- a/pkgs/games/toppler/default.nix +++ b/pkgs/games/toppler/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "roever"; repo = "toppler"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330="; + hash = "sha256-ecEaELu52Nmov/BD9VzcUw6wyWeHJcsKQkEzTnaW330="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/drivers/argononed/default.nix b/pkgs/misc/drivers/argononed/default.nix index 48b5800abb02..320aaf344050 100644 --- a/pkgs/misc/drivers/argononed/default.nix +++ b/pkgs/misc/drivers/argononed/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "DarkElvenAngel"; repo = pname; rev = "97c4fa07fc2c09ffc3bd86e0f6319d50fa639578"; - sha256 = "sha256-5/xUYbprRiwD+FN8V2cUpHxnTbBkEsFG2wfsEXrCrgQ="; + hash = "sha256-5/xUYbprRiwD+FN8V2cUpHxnTbBkEsFG2wfsEXrCrgQ="; }; patches = [ ./fix-hardcoded-reboot-poweroff-paths.patch ]; diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index d4e6c6ed4a96..1642e91bb109 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { owner = "utsushi"; repo = pname; rev = version; - sha256 = "sha256-CrN9F/WJKmlDN7eozEHtKgGUQBWVwTqwjnrfiATk7lI="; + hash = "sha256-CrN9F/WJKmlDN7eozEHtKgGUQBWVwTqwjnrfiATk7lI="; }; patches = [ diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 237b6db65b02..658b15b70e93 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner= "cameronnemo"; repo= "brillo"; rev= "v${version}"; - sha256 = "sha256-dKGNioWGVAFuB4kySO+QGTnstyAD0bt4/6FBVwuRxJo="; + hash = "sha256-dKGNioWGVAFuB4kySO+QGTnstyAD0bt4/6FBVwuRxJo="; }; patches = [ diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index f55779bd9165..e5ae081d5a2d 100644 --- a/pkgs/os-specific/linux/fanctl/default.nix +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { owner = "mcoffin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw="; + hash = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw="; }; cargoSha256 = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs="; diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index b34a2d7914b3..a1e80ffac0b7 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "mildlyparallel"; repo = "pscircle"; rev = "v${version}"; - sha256 = "sha256-bqbQBNscNfoqXprhoFUnUQO88YQs9xDhD4d3KHamtG0="; + hash = "sha256-bqbQBNscNfoqXprhoFUnUQO88YQs9xDhD4d3KHamtG0="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index a7d1374493c1..53fc114f078c 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-dgGdSnMsz/6dggZXh5crwHEoVVIlcUIHMH5MSOO29TE="; + hash = "sha256-dgGdSnMsz/6dggZXh5crwHEoVVIlcUIHMH5MSOO29TE="; }; separateDebugInfo = true; diff --git a/pkgs/tools/X11/libstrangle/default.nix b/pkgs/tools/X11/libstrangle/default.nix index 218f75f67cb9..f7deb69561e9 100644 --- a/pkgs/tools/X11/libstrangle/default.nix +++ b/pkgs/tools/X11/libstrangle/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "torkel104"; repo = pname; rev = "0273e318e3b0cc759155db8729ad74266b74cb9b"; - sha256 = "sha256-h10QA7m7hIQHq1g/vCYuZsFR2NVbtWBB46V6OWP5wgM="; + hash = "sha256-h10QA7m7hIQHq1g/vCYuZsFR2NVbtWBB46V6OWP5wgM="; }; makeFlags = [ "prefix=" "DESTDIR=$(out)" ]; diff --git a/pkgs/tools/audio/mpd-sima/default.nix b/pkgs/tools/audio/mpd-sima/default.nix index 8123c6d664c4..7752f9d1bf22 100644 --- a/pkgs/tools/audio/mpd-sima/default.nix +++ b/pkgs/tools/audio/mpd-sima/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "kaliko"; repo = "sima"; rev = version; - sha256 = "sha256-lMvM1EqS1govhv4B2hJzIg5DFQYgEr4yJJtgOQxnVlY="; + hash = "sha256-lMvM1EqS1govhv4B2hJzIg5DFQYgEr4yJJtgOQxnVlY="; }; format = "setuptools"; diff --git a/pkgs/tools/compression/bzip2/1_1.nix b/pkgs/tools/compression/bzip2/1_1.nix index e9d6f7c44dab..15ff3c96b257 100644 --- a/pkgs/tools/compression/bzip2/1_1.nix +++ b/pkgs/tools/compression/bzip2/1_1.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "federicomenaquintero"; repo = "bzip2"; rev = "15255b553e7c095fb7a26d4dc5819a11352ebba1"; - sha256 = "sha256-BAyz35D62LWi47B/gNcCSKpdaECHBGSpt21vtnk3fKs="; + hash = "sha256-BAyz35D62LWi47B/gNcCSKpdaECHBGSpt21vtnk3fKs="; }; postPatch = '' diff --git a/pkgs/tools/graphics/vkbasalt-cli/default.nix b/pkgs/tools/graphics/vkbasalt-cli/default.nix index 4d99b4efb413..237aad77f126 100644 --- a/pkgs/tools/graphics/vkbasalt-cli/default.nix +++ b/pkgs/tools/graphics/vkbasalt-cli/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { owner = "TheEvilSkeleton"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4MFqndnvwAsqyer9kMNuCZFP/Xdl7W//AyCe7n83328="; + hash = "sha256-4MFqndnvwAsqyer9kMNuCZFP/Xdl7W//AyCe7n83328="; }; postPatch = '' diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix index ef8c4b17baf1..99865b354dd3 100644 --- a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix +++ b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "linux/plugins"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gPFElAixiDTTwcl2XKM7MbTkpRrg8ToO5K7H8kz3DHk="; + hash = "sha256-gPFElAixiDTTwcl2XKM7MbTkpRrg8ToO5K7H8kz3DHk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix index af77a4a70377..c4476317fe15 100644 --- a/pkgs/tools/inputmethods/interception-tools/default.nix +++ b/pkgs/tools/inputmethods/interception-tools/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "interception/linux"; repo = "tools"; rev = "v${version}"; - sha256 = "sha256-jhdgfCWbkF+jD/iXsJ+fYKOtPymxcC46Q4w0aqpvcek="; + hash = "sha256-jhdgfCWbkF+jD/iXsJ+fYKOtPymxcC46Q4w0aqpvcek="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 7a06d96300c2..91fcaf4ac449 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo="; + hash = "sha256-L1j1lXPxy9nWMeED9uzQHV5y7XTE6+DB57rDnXa4kMo="; }; cargoHash = "sha256-r1yIPV2sW/EpHJpdaJyi6pzE+rtNkBIxSUJF+XA8kbA="; diff --git a/pkgs/tools/misc/gwe/default.nix b/pkgs/tools/misc/gwe/default.nix index f0e9ad1fdcd3..b68fcdb30d30 100644 --- a/pkgs/tools/misc/gwe/default.nix +++ b/pkgs/tools/misc/gwe/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { owner = "leinardi"; repo = pname; rev = version; - sha256 = "sha256-agq967QN1nsAOn+1Ce64+id7UlSS/K3XGsUUihWOztk="; + hash = "sha256-agq967QN1nsAOn+1Ce64+id7UlSS/K3XGsUUihWOztk="; }; prePatch = '' diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix index c46fdcd74ec4..c61ff5f3d72b 100644 --- a/pkgs/tools/misc/kcollectd/default.nix +++ b/pkgs/tools/misc/kcollectd/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { owner = "aerusso"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bUVL5eRQ5UkSZo562pnyEcj0fVoSC5WHRq4BfN67jEM="; + hash = "sha256-bUVL5eRQ5UkSZo562pnyEcj0fVoSC5WHRq4BfN67jEM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/ristate/default.nix b/pkgs/tools/misc/ristate/default.nix index c674b96f9b00..f15731ab0491 100644 --- a/pkgs/tools/misc/ristate/default.nix +++ b/pkgs/tools/misc/ristate/default.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec { owner = "snakedye"; repo = pname; rev = "34dfd0a0bab5b36df118d8da3956fd938c625b15"; - sha256 = "sha256-CH9DZ/7Bhbe6qKg1Nbj1rA9SzIsqVlBJg51XxAh0XnY="; + hash = "sha256-CH9DZ/7Bhbe6qKg1Nbj1rA9SzIsqVlBJg51XxAh0XnY="; }; cargoSha256 = "sha256-HTfRWvE3m7XZhZDj5bEkrQI3pD6GNiKd2gJtMjRQ8Rw="; diff --git a/pkgs/tools/misc/timelimit/default.nix b/pkgs/tools/misc/timelimit/default.nix index 534cd320bf1a..f943c5ee7292 100644 --- a/pkgs/tools/misc/timelimit/default.nix +++ b/pkgs/tools/misc/timelimit/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "timelimit"; repo = pname; rev = "release/${version}"; - sha256 = "sha256-5IEAF8zCKaCVH6BAxjoa/2rrue9pRGBBkFzN57d+g+g="; + hash = "sha256-5IEAF8zCKaCVH6BAxjoa/2rrue9pRGBBkFzN57d+g+g="; }; nativeCheckInputs = [ perl ]; diff --git a/pkgs/tools/misc/usbimager/default.nix b/pkgs/tools/misc/usbimager/default.nix index 2ff1c0b415e7..2d339fabc3f7 100644 --- a/pkgs/tools/misc/usbimager/default.nix +++ b/pkgs/tools/misc/usbimager/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "bztsrc"; repo = pname; rev = version; - sha256 = "sha256-HTFopc2xrhp0XYubQtOwMKWTQ+3JSKAyL4mMyQ82kAs="; + hash = "sha256-HTFopc2xrhp0XYubQtOwMKWTQ+3JSKAyL4mMyQ82kAs="; }; sourceRoot = "${src.name}/src"; diff --git a/pkgs/tools/misc/watchlog/default.nix b/pkgs/tools/misc/watchlog/default.nix index cd2cc2b0792c..3b599c1e12e0 100644 --- a/pkgs/tools/misc/watchlog/default.nix +++ b/pkgs/tools/misc/watchlog/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { owner = "kevincox"; repo = "watchlog"; rev = "v${version}"; - sha256 = "sha256-8uNBjkxETQXZOfRtxDg+aS8sIbYTD3g9ttBA4m2wavY="; + hash = "sha256-8uNBjkxETQXZOfRtxDg+aS8sIbYTD3g9ttBA4m2wavY="; }; cargoHash = "sha256-YFQGqkvUgoJJE2B/SQFksWS42YTF/O2tn3CNL54LRUY="; diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/tools/networking/goimapnotify/default.nix index 4a10dc254248..d2df1709e706 100644 --- a/pkgs/tools/networking/goimapnotify/default.nix +++ b/pkgs/tools/networking/goimapnotify/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "shackra"; repo = "goimapnotify"; rev = version; - sha256 = "sha256-da2Q+glDVWSf574pks6UzvQyzKAU+81ypy5H968Y7HE="; + hash = "sha256-da2Q+glDVWSf574pks6UzvQyzKAU+81ypy5H968Y7HE="; }; vendorHash = "sha256-DphGe9jbKo1aIfpF5kRYNSn/uIYHaRMrygda5t46svw="; diff --git a/pkgs/tools/networking/mmsd-tng/default.nix b/pkgs/tools/networking/mmsd-tng/default.nix index 8d8286774595..475aeafe38e5 100644 --- a/pkgs/tools/networking/mmsd-tng/default.nix +++ b/pkgs/tools/networking/mmsd-tng/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "kop316"; repo = "mmsd"; rev = version; - sha256 = "sha256-fhbiTJWmQwJpuMaVX2qWyWwJ/2Y/Vczo//+0T0b6jhA="; + hash = "sha256-fhbiTJWmQwJpuMaVX2qWyWwJ/2Y/Vczo//+0T0b6jhA="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/networkd-notify/default.nix b/pkgs/tools/networking/networkd-notify/default.nix index 8a58b894d9bd..120bb8111f02 100644 --- a/pkgs/tools/networking/networkd-notify/default.nix +++ b/pkgs/tools/networking/networkd-notify/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { owner = "wavexx"; repo = pname; rev = "c2f3e71076a0f51c097064b1eb2505a361c7cc0e"; - sha256 = "sha256-fanP1EWERT2Jy4OnMo8OMdR9flginYUgMw+XgmDve3o="; + hash = "sha256-fanP1EWERT2Jy4OnMo8OMdR9flginYUgMw+XgmDve3o="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index bf0caf00c2a5..fd223c12c94f 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "openconnect"; repo = "ocserv"; rev = version; - sha256 = "sha256-IYiYC9oAw35YjpptUEnhuZQqoDevku25r7qi6SG8xtk="; + hash = "sha256-IYiYC9oAw35YjpptUEnhuZQqoDevku25r7qi6SG8xtk="; }; nativeBuildInputs = [ autoreconfHook gperf pkg-config ronn ]; diff --git a/pkgs/tools/networking/redfang/default.nix b/pkgs/tools/networking/redfang/default.nix index 9c852aa5ffb6..776479d389a1 100644 --- a/pkgs/tools/networking/redfang/default.nix +++ b/pkgs/tools/networking/redfang/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "packages"; repo = pname; rev = "upstream/${version}"; - sha256 = "sha256-dF9QmBckyHAZ+JbLr0jTmp0eMu947unJqjrTMsJAfIE="; + hash = "sha256-dF9QmBckyHAZ+JbLr0jTmp0eMu947unJqjrTMsJAfIE="; }; patches = [ diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index f1a53c461a33..ba1ec0af4d92 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { owner = "veilid"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Gm65fvLImbsAU8kMYQv5VFEjkBQnhBFDqwheddRbtU8="; + hash = "sha256-Gm65fvLImbsAU8kMYQv5VFEjkBQnhBFDqwheddRbtU8="; }; cargoLock = { diff --git a/pkgs/tools/networking/wget2/default.nix b/pkgs/tools/networking/wget2/default.nix index 017e6303ab2c..85512aec06b9 100644 --- a/pkgs/tools/networking/wget2/default.nix +++ b/pkgs/tools/networking/wget2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "gnuwget"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+xw1nQMBs0m9RlunyrAYaSDPnLY1yRX8zt8hKOMXQT8="; + hash = "sha256-+xw1nQMBs0m9RlunyrAYaSDPnLY1yRX8zt8hKOMXQT8="; }; # wget2_noinstall contains forbidden reference to /build/ diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 66f824ac48d0..32f1efc71bb9 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "OldManProgrammer"; repo = "unix-tree"; rev = version; - sha256 = "sha256-1iBGbzNwjUX7kqkk6XzKISO2e6b05MBH08XgIwR+nyI="; + hash = "sha256-1iBGbzNwjUX7kqkk6XzKISO2e6b05MBH08XgIwR+nyI="; }; preConfigure = '' diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index 312c84921499..a2f91efc9494 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -9,7 +9,7 @@ let owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "sha256-TFMU9owxBGrrbatk7Jj9xP8OEJNjXnjbwnW6Xq34awI="; + hash = "sha256-TFMU9owxBGrrbatk7Jj9xP8OEJNjXnjbwnW6Xq34awI="; }; enableParallelBuilding = true; diff --git a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix b/pkgs/tools/text/sgml/linuxdoc-tools/default.nix index d2611bec7318..58d3ace63caf 100644 --- a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix +++ b/pkgs/tools/text/sgml/linuxdoc-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "agmartin"; repo = "linuxdoc-tools"; rev = version; - sha256 = "sha256-1F3MDYJ9UH7ypgTSfYZV59PfLirlTmw6XBMEnz5Jtyk="; + hash = "sha256-1F3MDYJ9UH7ypgTSfYZV59PfLirlTmw6XBMEnz5Jtyk="; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix index a4f042d99161..791eaa2b5fc7 100644 --- a/pkgs/tools/wayland/swaysome/default.nix +++ b/pkgs/tools/wayland/swaysome/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { owner = "hyask"; repo = pname; rev = version; - sha256 = "sha256-HRLMfpnqjDgkOIaH/7DxeYzoZn/0c0KUAmir8XIwesg="; + hash = "sha256-HRLMfpnqjDgkOIaH/7DxeYzoZn/0c0KUAmir8XIwesg="; }; cargoHash = "sha256-e5B90tIiXxuaRseok69EN4xuoRlCyiTVgEcAqvVg/dM="; From cc0ca35c7454ad20dd28e5bf35dc6ca714f998e8 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 13 Jul 2024 22:29:16 +0800 Subject: [PATCH 115/227] treewide: sha256 -> hash attribute for codeberg.org fetchers --- pkgs/by-name/sn/snekim/package.nix | 2 +- pkgs/by-name/wb/wbg/package.nix | 2 +- pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix | 2 +- pkgs/development/libraries/fcft/default.nix | 2 +- pkgs/development/libraries/soundtouch/default.nix | 2 +- pkgs/games/kabeljau/default.nix | 2 +- pkgs/tools/X11/caffeine-ng/default.nix | 2 +- pkgs/tools/misc/sanctity/default.nix | 2 +- pkgs/tools/text/seehecht/default.nix | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sn/snekim/package.nix b/pkgs/by-name/sn/snekim/package.nix index 777f6fc24b45..cf7d2b718f83 100644 --- a/pkgs/by-name/sn/snekim/package.nix +++ b/pkgs/by-name/sn/snekim/package.nix @@ -9,7 +9,7 @@ buildNimPackage (finalAttrs: { owner = "annaaurora"; repo = "snekim"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Qgvq4CkGvNppYFpITCCifOHtVQYRQJPEK3rTJXQkTvI="; + hash = "sha256-Qgvq4CkGvNppYFpITCCifOHtVQYRQJPEK3rTJXQkTvI="; }; strictDeps = true; diff --git a/pkgs/by-name/wb/wbg/package.nix b/pkgs/by-name/wb/wbg/package.nix index b971bce46d69..f4f82a79c289 100644 --- a/pkgs/by-name/wb/wbg/package.nix +++ b/pkgs/by-name/wb/wbg/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = "wbg"; rev = version; - sha256 = "sha256-zd5OWC0r/75IaeKy5xjV+pQefRy48IcFTxx93iy0a0Q="; + hash = "sha256-zd5OWC0r/75IaeKy5xjV+pQefRy48IcFTxx93iy0a0Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix b/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix index eee03a11d923..9df34f995c53 100644 --- a/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix +++ b/pkgs/by-name/wo/woodpecker-pipeline-transform/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "lafriks"; repo = "woodpecker-pipeline-transform"; rev = "v${version}"; - sha256 = "sha256-ngtpWjbL/ccmKTNQdL3osduELYSxcOu5z5UtqclNNSY="; + hash = "sha256-ngtpWjbL/ccmKTNQdL3osduELYSxcOu5z5UtqclNNSY="; }; vendorHash = "sha256-SZxFsn187UWZqaxwMDdzAmfpRLZSCIpbsAI1mAu7Z6w="; diff --git a/pkgs/development/libraries/fcft/default.nix b/pkgs/development/libraries/fcft/default.nix index faf5906f7a98..87070ac1fb72 100644 --- a/pkgs/development/libraries/fcft/default.nix +++ b/pkgs/development/libraries/fcft/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = "fcft"; rev = version; - sha256 = "sha256-Wgm2QdW4rg573soF/8HhDmlyN4S2cA0VWOejow464gU="; + hash = "sha256-Wgm2QdW4rg573soF/8HhDmlyN4S2cA0VWOejow464gU="; }; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix index 40179b269efd..606fda594d91 100644 --- a/pkgs/development/libraries/soundtouch/default.nix +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "soundtouch"; repo = "soundtouch"; rev = version; - sha256 = "sha256-imeeTj+3gXxoGTuC/13+BAplwcnQ0wRJdSVt7MPlBxc="; + hash = "sha256-imeeTj+3gXxoGTuC/13+BAplwcnQ0wRJdSVt7MPlBxc="; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/games/kabeljau/default.nix b/pkgs/games/kabeljau/default.nix index b518121b6390..7f917dce4b3d 100644 --- a/pkgs/games/kabeljau/default.nix +++ b/pkgs/games/kabeljau/default.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec { owner = "annaaurora"; repo = "kabeljau"; rev = "v${version}"; - sha256 = "sha256-RedVItgfr6vgqXHA3bOiHXDpfGuHI+sX4jCHL9G5jYk="; + hash = "sha256-RedVItgfr6vgqXHA3bOiHXDpfGuHI+sX4jCHL9G5jYk="; }; # Inkscape is needed in a just recipe where it is used to export the SVG icon to several different sized PNGs. diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index 480f4b6e36e9..7e99dd19b801 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { owner = "WhyNotHugo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uYzLRZ+6ZgIwhSuJWRBpLYHgonX7sFXgUZid0V26V0Q="; + hash = "sha256-uYzLRZ+6ZgIwhSuJWRBpLYHgonX7sFXgUZid0V26V0Q="; }; nativeBuildInputs = [ gobject-introspection meson ninja pkg-config wrapGAppsHook3 ]; diff --git a/pkgs/tools/misc/sanctity/default.nix b/pkgs/tools/misc/sanctity/default.nix index 7c892bb16894..eebe0616bb04 100644 --- a/pkgs/tools/misc/sanctity/default.nix +++ b/pkgs/tools/misc/sanctity/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { owner = "annaaurora"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y6xj4A5SHcW747aFE9TfuurNnuUxjTUeKJmzxeiWqVc="; + hash = "sha256-y6xj4A5SHcW747aFE9TfuurNnuUxjTUeKJmzxeiWqVc="; }; cargoSha256 = "sha256-co58YBeFjP9DKzxDegQI7txuJ1smqJxdlRLae+Ppwh0="; diff --git a/pkgs/tools/text/seehecht/default.nix b/pkgs/tools/text/seehecht/default.nix index 9a7b1f936a99..eafcf6e1b790 100644 --- a/pkgs/tools/text/seehecht/default.nix +++ b/pkgs/tools/text/seehecht/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { owner = "annaaurora"; repo = "seehecht"; rev = "v${version}"; - sha256 = "sha256-KIxK0JYfq/1Bn4LOn+LzWPBUvGYMvOEuqS7GMpDRvW0="; + hash = "sha256-KIxK0JYfq/1Bn4LOn+LzWPBUvGYMvOEuqS7GMpDRvW0="; }; cargoSha256 = "sha256-AeVUVF4SBS9FG0iezLBKUm4Uk1PPRXPTON93evgL9IA="; From cb41d0ac1adf2df992c7e2ffa751babc4fe5f0fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 15:33:29 +0000 Subject: [PATCH 116/227] woodpecker-plugin-git: 2.5.0 -> 2.5.1 --- .../woodpecker-plugin-git/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix index 37596774bbde..1008d32401d5 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker-plugin-git/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "woodpecker-plugin-git"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "woodpecker-ci"; repo = "plugin-git"; rev = "refs/tags/${version}"; - hash = "sha256-vQcHEsOJFMbrt5KpoHB59g5gIxwXQuJpudhu2qbgCY8="; + hash = "sha256-vGJk9IfpuZp0FNLzojFiUGvOpj7EP4cr9ylIoUbddmY="; }; - vendorHash = "sha256-nPeF6Z+d69o1JwCUlzVREx8DyIqokHIfTRC1/S5XG6A="; + vendorHash = "sha256-rUXi3oaawTJoGPmVxmdR1v2eh8BIvCBjxJBz3XRygEg="; CGO_ENABLED = "0"; From 3eae220883d4c134f924a338a9fd963b6bb5d21f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 15:33:54 +0000 Subject: [PATCH 117/227] asm-lsp: 0.6.0 -> 0.7.1 --- pkgs/by-name/as/asm-lsp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix index 9a44f68ca64f..a314e16db7fd 100644 --- a/pkgs/by-name/as/asm-lsp/package.nix +++ b/pkgs/by-name/as/asm-lsp/package.nix @@ -6,7 +6,7 @@ }: let pname = "asm-lsp"; - version = "0.6.0"; + version = "0.7.1"; in rustPlatform.buildRustPackage { inherit pname version; @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage { owner = "bergercookie"; repo = "asm-lsp"; rev = "v${version}"; - hash = "sha256-vOkuTJFP2zme8S+u5j1TXt6BXnwtASRVH4Dre9g1dtk="; + hash = "sha256-nHLM4cwVo6esrrpr4s+DfJIUWWKSrYwWLOPC84tb68o="; }; nativeBuildInputs = [ @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-lmOnBcLWfTCuQcPiRmPoFD/QvagfkApFP6/h1ot7atU="; + cargoHash = "sha256-CiHXfy8Xqrg8SAWA4nTHSGZKS0pGcoQem9kLRtTLpRs="; # tests expect ~/.cache/asm-lsp to be writable preCheck = '' From fccf7e0219234c2f40056a52ead4632c67369258 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 16:04:45 +0000 Subject: [PATCH 118/227] python312Packages.optimum: 1.20.0 -> 1.21.2 --- pkgs/development/python-modules/optimum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optimum/default.nix b/pkgs/development/python-modules/optimum/default.nix index 07c80298754a..279db6eded5f 100644 --- a/pkgs/development/python-modules/optimum/default.nix +++ b/pkgs/development/python-modules/optimum/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "optimum"; - version = "1.20.0"; + version = "1.21.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = "optimum"; rev = "refs/tags/v${version}"; - hash = "sha256-aQNDVNWTgY2LEtug229SEZRMvKHpsQfiTPWW4Lh3hs4="; + hash = "sha256-OhquE+QhNOXFkKy/TvKlLn65CMchvKjcbR/S4Rl2MT4="; }; build-system = [ setuptools ]; From 05f5dbd470d5f9c9c6f53fca395ceb1bf20f404e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 13 Jul 2024 18:56:35 +0200 Subject: [PATCH 119/227] doc/php: Fix mkComposerRepository example `mkComposerRepository` required `pname` and `version` since the beginning (b36ad2f51797d82ddd4479835c0edd71b3386865), with the boolean attribute becoming required later (3eb168da9243989a63dfd4e2c17c52f8c133247b). --- doc/languages-frameworks/php.section.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index c1493588a606..1bcb4ee727a5 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -283,7 +283,10 @@ in { ]; composerRepository = php.mkComposerRepository { - inherit (finalAttrs) src; + inherit (finalAttrs) pname version src; + composerNoDev = true; + composerNoPlugins = true; + composerNoScripts = true; # Specifying a custom composer.lock since it is not present in the sources. composerLock = ./composer.lock; # The composer vendor hash From 07c1bc203404a2c34188131b4e454185eba23b11 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 14 Jul 2024 00:25:56 +0800 Subject: [PATCH 120/227] treewide: sha256 -> hash attribute for pypi fetchers --- pkgs/applications/audio/mopidy/bandcamp.nix | 2 +- pkgs/applications/audio/mopidy/iris.nix | 2 +- pkgs/applications/audio/mopidy/jellyfin.nix | 2 +- pkgs/applications/audio/mopidy/mopify.nix | 2 +- pkgs/applications/audio/mopidy/mpd.nix | 2 +- pkgs/applications/audio/mopidy/mpris.nix | 2 +- pkgs/applications/audio/mopidy/muse.nix | 2 +- pkgs/applications/audio/mopidy/notify.nix | 2 +- pkgs/applications/audio/mopidy/podcast.nix | 2 +- pkgs/applications/audio/spotify-cli-linux/default.nix | 2 +- pkgs/applications/misc/bikeshed/default.nix | 2 +- pkgs/applications/misc/chatblade/default.nix | 2 +- pkgs/applications/misc/khard/default.nix | 2 +- pkgs/applications/misc/raiseorlaunch/default.nix | 2 +- pkgs/applications/misc/remarkable/remarkable-mouse/default.nix | 2 +- pkgs/applications/misc/seashells/default.nix | 2 +- pkgs/applications/misc/vit/default.nix | 2 +- pkgs/applications/networking/cluster/luigi/default.nix | 2 +- pkgs/applications/networking/flent/default.nix | 2 +- pkgs/applications/office/tryton/default.nix | 2 +- pkgs/applications/radio/quisk/default.nix | 2 +- pkgs/applications/version-management/git-aggregator/default.nix | 2 +- pkgs/applications/version-management/legit/default.nix | 2 +- pkgs/applications/video/ffmpeg-normalize/default.nix | 2 +- pkgs/applications/video/jellyfin-mpv-shim/default.nix | 2 +- pkgs/applications/window-managers/i3/balance-workspace.nix | 2 +- pkgs/applications/window-managers/i3/i3-resurrect.nix | 2 +- pkgs/by-name/si/signal-export/package.nix | 2 +- pkgs/development/compilers/lesscpy/default.nix | 2 +- pkgs/development/embedded/rshell/default.nix | 2 +- pkgs/development/python-modules/agate-dbf/default.nix | 2 +- pkgs/development/python-modules/aigpy/default.nix | 2 +- .../development/python-modules/aiohttp-client-cache/default.nix | 2 +- pkgs/development/python-modules/aiorpcx/default.nix | 2 +- pkgs/development/python-modules/altgraph/default.nix | 2 +- .../python-modules/argos-translate-files/default.nix | 2 +- pkgs/development/python-modules/argostranslate/default.nix | 2 +- pkgs/development/python-modules/arrayqueues/default.nix | 2 +- .../development/python-modules/azure-datalake-store/default.nix | 2 +- .../python-modules/azure-mgmt-apimanagement/default.nix | 2 +- pkgs/development/python-modules/azure-mgmt-dns/default.nix | 2 +- pkgs/development/python-modules/betamax/default.nix | 2 +- pkgs/development/python-modules/calmjs-types/default.nix | 2 +- pkgs/development/python-modules/calmjs/default.nix | 2 +- pkgs/development/python-modules/cogapp/default.nix | 2 +- pkgs/development/python-modules/commandparse/default.nix | 2 +- pkgs/development/python-modules/ctap-keyring-device/default.nix | 2 +- pkgs/development/python-modules/cypari2/default.nix | 2 +- pkgs/development/python-modules/daff/default.nix | 2 +- pkgs/development/python-modules/dazl/default.nix | 2 +- pkgs/development/python-modules/django-sekizai/default.nix | 2 +- pkgs/development/python-modules/dogtag-pki/default.nix | 2 +- pkgs/development/python-modules/durus/default.nix | 2 +- pkgs/development/python-modules/elasticsearch-dsl/default.nix | 2 +- pkgs/development/python-modules/elasticsearch/default.nix | 2 +- pkgs/development/python-modules/empy/default.nix | 2 +- pkgs/development/python-modules/ete3/default.nix | 2 +- pkgs/development/python-modules/f5-sdk/default.nix | 2 +- pkgs/development/python-modules/fastdownload/default.nix | 2 +- pkgs/development/python-modules/feedgen/default.nix | 2 +- pkgs/development/python-modules/feedgenerator/default.nix | 2 +- pkgs/development/python-modules/flower/default.nix | 2 +- pkgs/development/python-modules/formencode/default.nix | 2 +- pkgs/development/python-modules/freertos-gdb/default.nix | 2 +- pkgs/development/python-modules/grequests/default.nix | 2 +- .../python-modules/gtfs-realtime-bindings/default.nix | 2 +- pkgs/development/python-modules/http-ece/default.nix | 2 +- pkgs/development/python-modules/httpauth/default.nix | 2 +- pkgs/development/python-modules/isosurfaces/default.nix | 2 +- pkgs/development/python-modules/javaobj-py3/default.nix | 2 +- pkgs/development/python-modules/kaggle/default.nix | 2 +- pkgs/development/python-modules/l18n/default.nix | 2 +- pkgs/development/python-modules/langcodes/default.nix | 2 +- pkgs/development/python-modules/latexcodec/default.nix | 2 +- pkgs/development/python-modules/leather/default.nix | 2 +- pkgs/development/python-modules/m2r/default.nix | 2 +- pkgs/development/python-modules/macfsevents/default.nix | 2 +- .../python-modules/material-color-utilities/default.nix | 2 +- pkgs/development/python-modules/memory-profiler/default.nix | 2 +- pkgs/development/python-modules/merge3/default.nix | 2 +- pkgs/development/python-modules/micawber/default.nix | 2 +- pkgs/development/python-modules/miniupnpc/default.nix | 2 +- pkgs/development/python-modules/mixins/default.nix | 2 +- pkgs/development/python-modules/mkdocs-macros/default.nix | 2 +- pkgs/development/python-modules/mock/default.nix | 2 +- pkgs/development/python-modules/multipledispatch/default.nix | 2 +- pkgs/development/python-modules/netaddr/default.nix | 2 +- pkgs/development/python-modules/netapp-lib/default.nix | 2 +- pkgs/development/python-modules/olefile/default.nix | 2 +- pkgs/development/python-modules/omrdatasettools/default.nix | 2 +- pkgs/development/python-modules/oslotest/default.nix | 2 +- pkgs/development/python-modules/palettable/default.nix | 2 +- pkgs/development/python-modules/pamela/default.nix | 2 +- pkgs/development/python-modules/pandocfilters/default.nix | 2 +- pkgs/development/python-modules/persist-queue/default.nix | 2 +- pkgs/development/python-modules/plone-testing/default.nix | 2 +- pkgs/development/python-modules/poppler-qt5/default.nix | 2 +- pkgs/development/python-modules/portend/default.nix | 2 +- pkgs/development/python-modules/pplpy/default.nix | 2 +- pkgs/development/python-modules/pq/default.nix | 2 +- pkgs/development/python-modules/prov/default.nix | 2 +- pkgs/development/python-modules/pubnubsub-handler/default.nix | 2 +- pkgs/development/python-modules/py-slvs/default.nix | 2 +- pkgs/development/python-modules/pyacoustid/default.nix | 2 +- pkgs/development/python-modules/pycollada/default.nix | 2 +- pkgs/development/python-modules/pycparser/default.nix | 2 +- pkgs/development/python-modules/pydelijn/default.nix | 2 +- pkgs/development/python-modules/pydot/default.nix | 2 +- pkgs/development/python-modules/pyephember/default.nix | 2 +- pkgs/development/python-modules/pyfiglet/default.nix | 2 +- .../development/python-modules/pygments-better-html/default.nix | 2 +- pkgs/development/python-modules/pyhomematic/default.nix | 2 +- pkgs/development/python-modules/pylibacl/default.nix | 2 +- pkgs/development/python-modules/pymaven-patch/default.nix | 2 +- pkgs/development/python-modules/pypresence/default.nix | 2 +- pkgs/development/python-modules/pyqt6-charts/default.nix | 2 +- pkgs/development/python-modules/pyqtwebengine/default.nix | 2 +- pkgs/development/python-modules/pyramid-beaker/default.nix | 2 +- pkgs/development/python-modules/pyscreenshot/default.nix | 2 +- pkgs/development/python-modules/pytest-arraydiff/default.nix | 2 +- pkgs/development/python-modules/pytest-instafail/default.nix | 2 +- pkgs/development/python-modules/pytest-twisted/default.nix | 2 +- pkgs/development/python-modules/python-daemon/default.nix | 2 +- pkgs/development/python-modules/python-musicpd/default.nix | 2 +- pkgs/development/python-modules/python-periphery/default.nix | 2 +- pkgs/development/python-modules/python-uinput/default.nix | 2 +- pkgs/development/python-modules/pytubefix/default.nix | 2 +- pkgs/development/python-modules/pyvcd/default.nix | 2 +- pkgs/development/python-modules/pyvizio/default.nix | 2 +- pkgs/development/python-modules/pywatchman/default.nix | 2 +- pkgs/development/python-modules/qgrid/default.nix | 2 +- pkgs/development/python-modules/queuelib/default.nix | 2 +- pkgs/development/python-modules/ramlfications/default.nix | 2 +- pkgs/development/python-modules/relatorio/default.nix | 2 +- pkgs/development/python-modules/requests-futures/default.nix | 2 +- pkgs/development/python-modules/requests-hawk/default.nix | 2 +- pkgs/development/python-modules/riprova/default.nix | 2 +- pkgs/development/python-modules/rnc2rng/default.nix | 2 +- pkgs/development/python-modules/rpmfile/default.nix | 2 +- pkgs/development/python-modules/smpplib/default.nix | 2 +- pkgs/development/python-modules/sockjs/default.nix | 2 +- pkgs/development/python-modules/soundcloud-v2/default.nix | 2 +- pkgs/development/python-modules/sphinx-external-toc/default.nix | 2 +- pkgs/development/python-modules/srt/default.nix | 2 +- pkgs/development/python-modules/sure/default.nix | 2 +- pkgs/development/python-modules/tadasets/default.nix | 2 +- pkgs/development/python-modules/takethetime/default.nix | 2 +- pkgs/development/python-modules/tesserocr/default.nix | 2 +- pkgs/development/python-modules/testrepository/default.nix | 2 +- pkgs/development/python-modules/testtools/default.nix | 2 +- pkgs/development/python-modules/textacy/default.nix | 2 +- pkgs/development/python-modules/tubeup/default.nix | 2 +- pkgs/development/python-modules/types-appdirs/default.nix | 2 +- pkgs/development/python-modules/uhi/default.nix | 2 +- pkgs/development/python-modules/unrardll/default.nix | 2 +- pkgs/development/python-modules/validobj/default.nix | 2 +- pkgs/development/python-modules/verspec/default.nix | 2 +- pkgs/development/python-modules/virtualenvwrapper/default.nix | 2 +- pkgs/development/python-modules/vobject/default.nix | 2 +- pkgs/development/python-modules/waitress/default.nix | 2 +- pkgs/development/python-modules/waqiasync/default.nix | 2 +- .../python-modules/xstatic-asciinema-player/default.nix | 2 +- .../development/python-modules/xstatic-font-awesome/default.nix | 2 +- pkgs/development/python-modules/xstatic/default.nix | 2 +- .../python-modules/yamlordereddictloader/default.nix | 2 +- pkgs/development/python-modules/ydiff/default.nix | 2 +- pkgs/development/python-modules/yubico/default.nix | 2 +- pkgs/development/python-modules/zope-deferredimport/default.nix | 2 +- pkgs/development/python-modules/zopfli/default.nix | 2 +- pkgs/development/tools/bashate/default.nix | 2 +- pkgs/development/tools/database/litecli/default.nix | 2 +- pkgs/development/tools/database/sqlite-web/default.nix | 2 +- pkgs/development/tools/dazel/default.nix | 2 +- pkgs/development/tools/distgen/default.nix | 2 +- pkgs/development/tools/eliot-tree/default.nix | 2 +- pkgs/development/tools/mbed-cli/default.nix | 2 +- pkgs/development/tools/misc/gdbgui/default.nix | 2 +- pkgs/development/tools/misc/usbsdmux/default.nix | 2 +- pkgs/development/tools/patatt/default.nix | 2 +- pkgs/development/tools/pifpaf/default.nix | 2 +- pkgs/development/tools/wllvm/default.nix | 2 +- pkgs/misc/flashfocus/default.nix | 2 +- pkgs/misc/present/default.nix | 2 +- pkgs/servers/dcnnt/default.nix | 2 +- pkgs/servers/geospatial/mapproxy/default.nix | 2 +- pkgs/servers/mail/mailman/mailman-hyperkitty.nix | 2 +- pkgs/servers/matrix-synapse/plugins/ldap3.nix | 2 +- pkgs/servers/monitoring/alerta/client.nix | 2 +- pkgs/servers/monitoring/alerta/default.nix | 2 +- pkgs/servers/monitoring/prometheus/pve-exporter.nix | 2 +- pkgs/tools/admin/mycli/default.nix | 2 +- pkgs/tools/audio/patray/default.nix | 2 +- pkgs/tools/audio/tidal-dl/default.nix | 2 +- pkgs/tools/backup/borgmatic/default.nix | 2 +- pkgs/tools/backup/gh2md/default.nix | 2 +- pkgs/tools/backup/rdiff-backup/default.nix | 2 +- pkgs/tools/backup/zfs-autobackup/default.nix | 2 +- pkgs/tools/misc/bepasty/default.nix | 2 +- pkgs/tools/misc/edir/default.nix | 2 +- pkgs/tools/misc/gaphor/default.nix | 2 +- pkgs/tools/misc/mloader/default.nix | 2 +- pkgs/tools/misc/pandoc-acro/default.nix | 2 +- pkgs/tools/misc/sacad/default.nix | 2 +- pkgs/tools/misc/semiphemeral/default.nix | 2 +- pkgs/tools/misc/twspace-dl/default.nix | 2 +- pkgs/tools/misc/vimwiki-markdown/default.nix | 2 +- pkgs/tools/misc/wlc/default.nix | 2 +- pkgs/tools/misc/you-get/default.nix | 2 +- pkgs/tools/misc/ytmdl/default.nix | 2 +- pkgs/tools/networking/pirate-get/default.nix | 2 +- pkgs/tools/security/ghdorker/default.nix | 2 +- pkgs/tools/security/kerbrute/default.nix | 2 +- pkgs/tools/security/onlykey-agent/default.nix | 2 +- pkgs/tools/security/onlykey-cli/default.nix | 2 +- pkgs/tools/system/s-tui/default.nix | 2 +- pkgs/tools/virtualization/ec2instanceconnectcli/default.nix | 2 +- 216 files changed, 216 insertions(+), 216 deletions(-) diff --git a/pkgs/applications/audio/mopidy/bandcamp.nix b/pkgs/applications/audio/mopidy/bandcamp.nix index 01a5f9f6bd9f..35491813f1a2 100644 --- a/pkgs/applications/audio/mopidy/bandcamp.nix +++ b/pkgs/applications/audio/mopidy/bandcamp.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { version = "1.1.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ="; + hash = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ="; }; propagatedBuildInputs = with python3Packages; [ mopidy pykka ]; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 66af8c658687..bebb4082a40f 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4="; + hash = "sha256-PEAXnapiyxozijR053I7zQYRYLeDOV719L0QbO2r4r4="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/jellyfin.nix b/pkgs/applications/audio/mopidy/jellyfin.nix index 932983aa4dda..819336166610 100644 --- a/pkgs/applications/audio/mopidy/jellyfin.nix +++ b/pkgs/applications/audio/mopidy/jellyfin.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-Jellyfin"; - sha256 = "sha256-cZliraTxTAJ2dXaxttWI3x4wCkmEhEo33GTNtAYwgTc="; + hash = "sha256-cZliraTxTAJ2dXaxttWI3x4wCkmEhEo33GTNtAYwgTc="; }; propagatedBuildInputs = [ mopidy python3Packages.unidecode python3Packages.websocket-client ]; diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index b5f89f4f4511..21ebc32b9d15 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RlCC+39zC+LeA/QDWPHYx5TrEwOgVrnvcH1Xg12qSLE="; + hash = "sha256-RlCC+39zC+LeA/QDWPHYx5TrEwOgVrnvcH1Xg12qSLE="; }; propagatedBuildInputs = with pythonPackages; [ mopidy configobj ]; diff --git a/pkgs/applications/audio/mopidy/mpd.nix b/pkgs/applications/audio/mopidy/mpd.nix index 281efc028951..303a4c733e8a 100644 --- a/pkgs/applications/audio/mopidy/mpd.nix +++ b/pkgs/applications/audio/mopidy/mpd.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; + hash = "sha256-CeLMRqj9cwBvQrOx7XHVV8MjDjwOosONVlsN2o+vTVM="; }; propagatedBuildInputs = [ mopidy ]; diff --git a/pkgs/applications/audio/mopidy/mpris.nix b/pkgs/applications/audio/mopidy/mpris.nix index 86f85749573e..c4f205cd359b 100644 --- a/pkgs/applications/audio/mopidy/mpris.nix +++ b/pkgs/applications/audio/mopidy/mpris.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-MPRIS"; - sha256 = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U="; + hash = "sha256-rHQgNIyludTEL7RDC8dIpyGTMOt1Tazn6i/orKlSP4U="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/muse.nix b/pkgs/applications/audio/mopidy/muse.nix index 9721c5bcc1cc..5b33771ff3f1 100644 --- a/pkgs/applications/audio/mopidy/muse.nix +++ b/pkgs/applications/audio/mopidy/muse.nix @@ -7,7 +7,7 @@ pythonPackages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-Muse"; - sha256 = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs="; + hash = "sha256-CEPAPWtMrD+HljyqBB6EAyGVeOjzkvVoEywlE4XEJGs="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/notify.nix b/pkgs/applications/audio/mopidy/notify.nix index ca6ab3d2bee6..aeeedb23a03a 100644 --- a/pkgs/applications/audio/mopidy/notify.nix +++ b/pkgs/applications/audio/mopidy/notify.nix @@ -6,7 +6,7 @@ pythonPackages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8FT4O4k0wEsdHA1vJaOW9UamJ3QLyO47HwL5XcSU3Pc="; + hash = "sha256-8FT4O4k0wEsdHA1vJaOW9UamJ3QLyO47HwL5XcSU3Pc="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/mopidy/podcast.nix b/pkgs/applications/audio/mopidy/podcast.nix index 8d75b888826c..8af6dff62548 100644 --- a/pkgs/applications/audio/mopidy/podcast.nix +++ b/pkgs/applications/audio/mopidy/podcast.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "Mopidy-Podcast"; - sha256 = "sha256-grNPVEVM2PlpYhBXe6sabFjWVB9+q+apIRjcHUxH52A="; + hash = "sha256-grNPVEVM2PlpYhBXe6sabFjWVB9+q+apIRjcHUxH52A="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/spotify-cli-linux/default.nix b/pkgs/applications/audio/spotify-cli-linux/default.nix index 38aec6ea6f08..944fa4dd3ee0 100644 --- a/pkgs/applications/audio/spotify-cli-linux/default.nix +++ b/pkgs/applications/audio/spotify-cli-linux/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XJMkiQR1FoeIPfAuJT22kfYJdc/ABuxExELh0EEev8k="; + hash = "sha256-XJMkiQR1FoeIPfAuJT22kfYJdc/ABuxExELh0EEev8k="; }; preBuild = '' diff --git a/pkgs/applications/misc/bikeshed/default.nix b/pkgs/applications/misc/bikeshed/default.nix index 21c6ac8c523d..5b51a8324e3f 100644 --- a/pkgs/applications/misc/bikeshed/default.nix +++ b/pkgs/applications/misc/bikeshed/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3fVo+B71SsJs+XF4+FWH2nz0ouTnpC/02fXYr1C9Jrk="; + hash = "sha256-3fVo+B71SsJs+XF4+FWH2nz0ouTnpC/02fXYr1C9Jrk="; }; # Relax requirements from "==" to ">=" diff --git a/pkgs/applications/misc/chatblade/default.nix b/pkgs/applications/misc/chatblade/default.nix index 7310b1c7f19d..a8d252adfb7d 100644 --- a/pkgs/applications/misc/chatblade/default.nix +++ b/pkgs/applications/misc/chatblade/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AjE+1MkSkZOtEUPKEPBKQ3n+aOB8cwsorBpL5skNskU="; + hash = "sha256-AjE+1MkSkZOtEUPKEPBKQ3n+aOB8cwsorBpL5skNskU="; }; doCheck = false; # there are no tests diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 6bd9b2089f18..bcb00ebdbb2e 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WfMKDaPD2j6wT02+GO5HY5E7aF2Z7IQY/VdKiMSRxJA="; + hash = "sha256-WfMKDaPD2j6wT02+GO5HY5E7aF2Z7IQY/VdKiMSRxJA="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/misc/raiseorlaunch/default.nix b/pkgs/applications/misc/raiseorlaunch/default.nix index 925bc9bdcb3f..22eddd71bd11 100644 --- a/pkgs/applications/misc/raiseorlaunch/default.nix +++ b/pkgs/applications/misc/raiseorlaunch/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-L/hu0mYCAxHkp5me96a6HlEY6QsuJDESpTNhlzVRHWs="; + hash = "sha256-L/hu0mYCAxHkp5me96a6HlEY6QsuJDESpTNhlzVRHWs="; }; nativeBuildInputs = [ python3Packages.setuptools-scm ]; diff --git a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix index c953d5e6299a..8d59f0ae99f6 100644 --- a/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix +++ b/pkgs/applications/misc/remarkable/remarkable-mouse/default.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; + hash = "sha256-82P9tE3jiUlKBGZCiWDoL+9VJ06Bc+If+aMfcEEU90U="; }; propagatedBuildInputs = with python3Packages; [ screeninfo paramiko pynput libevdev ]; diff --git a/pkgs/applications/misc/seashells/default.nix b/pkgs/applications/misc/seashells/default.nix index 37a90478710c..c928bca8cefb 100644 --- a/pkgs/applications/misc/seashells/default.nix +++ b/pkgs/applications/misc/seashells/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; + hash = "sha256-RBs28FC7f82DrxRcmvTP9nljVpm7tjrGuvr05l32hDM="; }; doCheck = false; # there are no tests diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 7bd7501f2296..59e0345fc402 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qDfY6GWnDQ44Sh540xQzDwANEI+mLjpy2a7G3sfKIzw="; + hash = "sha256-qDfY6GWnDQ44Sh540xQzDwANEI+mLjpy2a7G3sfKIzw="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index bb57bae66021..6a01cb5134cd 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/HkLJ0dRXdGcZz77uOTJrOX0xc3DH45/k9xmfesuxsg="; + hash = "sha256-/HkLJ0dRXdGcZz77uOTJrOX0xc3DH45/k9xmfesuxsg="; }; propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 tenacity ]; diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 8aa1f9809c26..f2d796b21384 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M="; + hash = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M="; }; buildInputs = [python.pkgs.sphinx]; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index d2db214a4ef8..ddb0138e6897 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk="; + hash = "sha256-XIPzpVIttTgP34rbA705vFoRZE9dj8Of3BR23DbpQPk="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index d9b03d057369..e31c5ea369b0 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg="; + hash = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg="; }; buildInputs = [ diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix index 34365cb5d90d..740f805d12c5 100644 --- a/pkgs/applications/version-management/git-aggregator/default.nix +++ b/pkgs/applications/version-management/git-aggregator/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; + hash = "sha256-79xNPzYP1j71sU5wZM5e2xTqQExqQEdxXPxbk4T/Scw="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/version-management/legit/default.nix b/pkgs/applications/version-management/legit/default.nix index 93d274ecaf2f..d03bc426243b 100644 --- a/pkgs/applications/version-management/legit/default.nix +++ b/pkgs/applications/version-management/legit/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE="; + hash = "sha256-lJOWtoApqK9AWrIMkBkCNB72vVXH/sbatxFB1j1AaxE="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index a3b40daacf79..9a5e4f64d497 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OwREpfWaP0tdAjMGjGpVIAQn8rlTTjSfT+0t5g/2yjQ="; + hash = "sha256-OwREpfWaP0tdAjMGjGpVIAQn8rlTTjSfT+0t5g/2yjQ="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index fe32c894c741..f810b5403f1b 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-EANaNmvD8hcdGB2aoGemKvA9syS1VvIqGsP1jk0b+lE="; + hash = "sha256-EANaNmvD8hcdGB2aoGemKvA9syS1VvIqGsP1jk0b+lE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/window-managers/i3/balance-workspace.nix b/pkgs/applications/window-managers/i3/balance-workspace.nix index bb0ea94e77c3..de68a06d896e 100644 --- a/pkgs/applications/window-managers/i3/balance-workspace.nix +++ b/pkgs/applications/window-managers/i3/balance-workspace.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; + hash = "sha256-zJdn/Q6r60FQgfehtQfeDkmN0Rz3ZaqgNhiWvjyQFy0="; }; propagatedBuildInputs = [ i3ipc ]; diff --git a/pkgs/applications/window-managers/i3/i3-resurrect.nix b/pkgs/applications/window-managers/i3/i3-resurrect.nix index 015bbee6013f..2040cdba806a 100644 --- a/pkgs/applications/window-managers/i3/i3-resurrect.nix +++ b/pkgs/applications/window-managers/i3/i3-resurrect.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-13FKRvEE4vHq5G51G1UyBnfNiWeS9Q/SYCG16E1Sn4c="; + hash = "sha256-13FKRvEE4vHq5G51G1UyBnfNiWeS9Q/SYCG16E1Sn4c="; }; propagatedBuildInputs = [ click psutil xprop natsort i3ipc xdotool importlib-metadata ]; diff --git a/pkgs/by-name/si/signal-export/package.nix b/pkgs/by-name/si/signal-export/package.nix index 40c925e5f4d2..93e82dbaf27d 100644 --- a/pkgs/by-name/si/signal-export/package.nix +++ b/pkgs/by-name/si/signal-export/package.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Hm0BVF2RUsxDacsAB3MJtk1t9FYmBPjeb5JzwaLkZ14="; + hash = "sha256-Hm0BVF2RUsxDacsAB3MJtk1t9FYmBPjeb5JzwaLkZ14="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/compilers/lesscpy/default.nix b/pkgs/development/compilers/lesscpy/default.nix index 52372bb1edce..493fdc08f812 100644 --- a/pkgs/development/compilers/lesscpy/default.nix +++ b/pkgs/development/compilers/lesscpy/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw="; + hash = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw="; }; checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/embedded/rshell/default.nix b/pkgs/development/embedded/rshell/default.nix index b42651aa1404..7791ba72e907 100644 --- a/pkgs/development/embedded/rshell/default.nix +++ b/pkgs/development/embedded/rshell/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8="; + hash = "sha256-frIwZ21JzVgxRS+KouBjDShHCP1lCoUwwySy2oFGcJ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index 0f3008f16f23..1d122ce63f4b 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mKK1N1cTbMdNwpflniEB009tSPQfdBVrtsDeJruiqj8="; + hash = "sha256-mKK1N1cTbMdNwpflniEB009tSPQfdBVrtsDeJruiqj8="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/aigpy/default.nix b/pkgs/development/python-modules/aigpy/default.nix index d8cadb97e1cc..fb331e1633f4 100644 --- a/pkgs/development/python-modules/aigpy/default.nix +++ b/pkgs/development/python-modules/aigpy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1kQced6YdC/wvegqFVhZfej4+4aemGXvKysKjejP13w="; + hash = "sha256-1kQced6YdC/wvegqFVhZfej4+4aemGXvKysKjejP13w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-client-cache/default.nix b/pkgs/development/python-modules/aiohttp-client-cache/default.nix index 540a96a824dd..72ae35816ecb 100644 --- a/pkgs/development/python-modules/aiohttp-client-cache/default.nix +++ b/pkgs/development/python-modules/aiohttp-client-cache/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s="; + hash = "sha256-B2b/9O2gVJjHUlN0pYeBDcwsy3slaAnd5SroeQqEU+s="; }; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index a770b6e5f3ab..7df3f61027a8 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "aiorpcX"; - sha256 = "sha256-WyMALxpNXTCF4xVVoHUZxe+NTEAHHrSZVW/9qBFIYKI="; + hash = "sha256-WyMALxpNXTCF4xVVoHUZxe+NTEAHHrSZVW/9qBFIYKI="; }; propagatedBuildInputs = [ attrs ]; diff --git a/pkgs/development/python-modules/altgraph/default.nix b/pkgs/development/python-modules/altgraph/default.nix index e45be70d4a08..5e638c4aa9b0 100644 --- a/pkgs/development/python-modules/altgraph/default.nix +++ b/pkgs/development/python-modules/altgraph/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-G1r7uY9sTcrbLirmq5+plLu4wddfT6ltNA+UN65FRAY="; + hash = "sha256-G1r7uY9sTcrbLirmq5+plLu4wddfT6ltNA+UN65FRAY="; }; pythonImportsCheck = [ "altgraph" ]; diff --git a/pkgs/development/python-modules/argos-translate-files/default.nix b/pkgs/development/python-modules/argos-translate-files/default.nix index 308f8bb7c0a1..86d269ce76a2 100644 --- a/pkgs/development/python-modules/argos-translate-files/default.nix +++ b/pkgs/development/python-modules/argos-translate-files/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YSTqqd+Kv2QVlAjA0lf4IRx7rJ1DmvB0JIReBv3yZcM="; + hash = "sha256-YSTqqd+Kv2QVlAjA0lf4IRx7rJ1DmvB0JIReBv3yZcM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/argostranslate/default.nix b/pkgs/development/python-modules/argostranslate/default.nix index 5d4db901771d..69e3bf1cc0f8 100644 --- a/pkgs/development/python-modules/argostranslate/default.nix +++ b/pkgs/development/python-modules/argostranslate/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3YzBMnqmcTIpn5UOFg3SDTFLjPSE9UDw0i8fB8LYh2s="; + hash = "sha256-3YzBMnqmcTIpn5UOFg3SDTFLjPSE9UDw0i8fB8LYh2s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/arrayqueues/default.nix b/pkgs/development/python-modules/arrayqueues/default.nix index a363318453ba..a2bd69bf3a19 100644 --- a/pkgs/development/python-modules/arrayqueues/default.nix +++ b/pkgs/development/python-modules/arrayqueues/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY="; + hash = "sha256-7I+5BQO/gsvTREDkBfxrMblw3JPfY48S4KI4PCGPtFY="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix index 2a5ad27ee8c1..1552f1c4b75d 100644 --- a/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BbbeYu4/KgpuaUHmkzt5K4AMPn9v/OL8MkvBmHV1c5M="; + hash = "sha256-BbbeYu4/KgpuaUHmkzt5K4AMPn9v/OL8MkvBmHV1c5M="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 81d30a68fd60..de7c2fa6bb3d 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XPUJzALti7QXTmgtuwVDhCA2luWz7zfykWEsJmpHzA4="; + hash = "sha256-XPUJzALti7QXTmgtuwVDhCA2luWz7zfykWEsJmpHzA4="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 3c117d02f6b3..b166ab5ea0f7 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A="; + hash = "sha256-2DedS7kZS4G3nlKE2HX6bfgHBzRvLLtcVJGiDzUmb9A="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 9c96a59cabc3..dab6fcd1d4f2 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gjFuFnm8aHnjyDMY0Ba1S3ySJf8IxEYt5IE+IgONX5Q="; + hash = "sha256-gjFuFnm8aHnjyDMY0Ba1S3ySJf8IxEYt5IE+IgONX5Q="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/calmjs-types/default.nix b/pkgs/development/python-modules/calmjs-types/default.nix index 4d98b29c5800..906b372572c8 100644 --- a/pkgs/development/python-modules/calmjs-types/default.nix +++ b/pkgs/development/python-modules/calmjs-types/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "calmjs.types"; inherit version; - sha256 = "sha256-EGWYv9mx3RPqs9dnB5t3Bu3hiujL2y/XxyMP7JkjjAQ="; + hash = "sha256-EGWYv9mx3RPqs9dnB5t3Bu3hiujL2y/XxyMP7JkjjAQ="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/calmjs/default.nix b/pkgs/development/python-modules/calmjs/default.nix index 442528807dac..ee3affa9c1bd 100644 --- a/pkgs/development/python-modules/calmjs/default.nix +++ b/pkgs/development/python-modules/calmjs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-73NQiY1RMdBrMIlm/VTvHY4dCHL1pQoj6a48CWRos3o="; + hash = "sha256-73NQiY1RMdBrMIlm/VTvHY4dCHL1pQoj6a48CWRos3o="; extension = "zip"; }; diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index 84139b83f253..c6f669c8ad56 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qAbV254xihotP86YgAgXkWjn2xPl5VsZt5dj+budKYI="; + hash = "sha256-qAbV254xihotP86YgAgXkWjn2xPl5VsZt5dj+budKYI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/commandparse/default.nix b/pkgs/development/python-modules/commandparse/default.nix index a7f28dab1563..88002d022c71 100644 --- a/pkgs/development/python-modules/commandparse/default.nix +++ b/pkgs/development/python-modules/commandparse/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; + hash = "sha256-S9e90BtS6qMjFtYUmgC0w4IKQP8q1iR2tGqq5l2+n6o="; }; # tests only distributed upstream source, not PyPi diff --git a/pkgs/development/python-modules/ctap-keyring-device/default.nix b/pkgs/development/python-modules/ctap-keyring-device/default.nix index a18241658b01..07cf1b616027 100644 --- a/pkgs/development/python-modules/ctap-keyring-device/default.nix +++ b/pkgs/development/python-modules/ctap-keyring-device/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version pname; - sha256 = "sha256-pEJkuz0wxKt2PkowmLE2YC+HPYa2ZiENK7FAW14Ec/Y="; + hash = "sha256-pEJkuz0wxKt2PkowmLE2YC+HPYa2ZiENK7FAW14Ec/Y="; }; # removing optional dependency needing pyobjc diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 3910cdd34f25..f987ee07a64e 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GiWGXDTyCx3JWDB5jjSrZDbieLjgyA3HvwqzTF2wOrg="; + hash = "sha256-GiWGXDTyCx3JWDB5jjSrZDbieLjgyA3HvwqzTF2wOrg="; }; patches = [ diff --git a/pkgs/development/python-modules/daff/default.nix b/pkgs/development/python-modules/daff/default.nix index 2e4841e70c17..d12b3245879b 100644 --- a/pkgs/development/python-modules/daff/default.nix +++ b/pkgs/development/python-modules/daff/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ItDan9ajJ1tUySapyXsYD5JYqtZRE+oY8/7FLLrc2Bg="; + hash = "sha256-ItDan9ajJ1tUySapyXsYD5JYqtZRE+oY8/7FLLrc2Bg="; }; # there are no tests diff --git a/pkgs/development/python-modules/dazl/default.nix b/pkgs/development/python-modules/dazl/default.nix index 7613795fabe9..e73892f1f998 100644 --- a/pkgs/development/python-modules/dazl/default.nix +++ b/pkgs/development/python-modules/dazl/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IErym/Fd8G75NOa+xOyV87UNmEaB31XPvg8GWCSP7k8="; + hash = "sha256-IErym/Fd8G75NOa+xOyV87UNmEaB31XPvg8GWCSP7k8="; }; patches = [ diff --git a/pkgs/development/python-modules/django-sekizai/default.nix b/pkgs/development/python-modules/django-sekizai/default.nix index 0cfe0fae0222..5727b5ac9990 100644 --- a/pkgs/development/python-modules/django-sekizai/default.nix +++ b/pkgs/development/python-modules/django-sekizai/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Kso2y64LXAzv7ZVlQW7EQjNXZ/sxRb/xHlhiL8ZTza0="; + hash = "sha256-Kso2y64LXAzv7ZVlQW7EQjNXZ/sxRb/xHlhiL8ZTza0="; }; propagatedBuildInputs = [ django-classy-tags ]; diff --git a/pkgs/development/python-modules/dogtag-pki/default.nix b/pkgs/development/python-modules/dogtag-pki/default.nix index f2077050314f..ae26a543de05 100644 --- a/pkgs/development/python-modules/dogtag-pki/default.nix +++ b/pkgs/development/python-modules/dogtag-pki/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rQSnQPNYr5SyeNbKoFAbnGb2X/8utrfWLa8gu93hy2w="; + hash = "sha256-rQSnQPNYr5SyeNbKoFAbnGb2X/8utrfWLa8gu93hy2w="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/durus/default.nix b/pkgs/development/python-modules/durus/default.nix index 3c7fd696fa99..d2afcd4b3ff4 100644 --- a/pkgs/development/python-modules/durus/default.nix +++ b/pkgs/development/python-modules/durus/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Durus"; inherit version; - sha256 = "sha256:1gzxg43zawwgqjrfixvcrilwpikb1ix9b7710rsl5ffk7q50yi3c"; + hash = "sha256:1gzxg43zawwgqjrfixvcrilwpikb1ix9b7710rsl5ffk7q50yi3c"; }; # Checks disabled due to missing python unittest framework 'sancho' in nixpkgs diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 45476eaf0418..bd9b460356cb 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-MmxtzPMvH/PUyEiJOIWQd4REuhj3cK3uUvJHIcuXxMc="; + hash = "sha256-MmxtzPMvH/PUyEiJOIWQd4REuhj3cK3uUvJHIcuXxMc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index e33c98782bb4..562d66e9bc2a 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qiSQAp3Zb0AVszPBgnqiH9bApNIjsA37D+kzuNCaURs="; + hash = "sha256-qiSQAp3Zb0AVszPBgnqiH9bApNIjsA37D+kzuNCaURs="; }; nativeBuildInputs = [ elastic-transport ]; diff --git a/pkgs/development/python-modules/empy/default.nix b/pkgs/development/python-modules/empy/default.nix index ea8051381643..018e0240ca65 100644 --- a/pkgs/development/python-modules/empy/default.nix +++ b/pkgs/development/python-modules/empy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nXEul8E5WFm+E9K0V4jJGGzZfxwE2sUQOZEw8yhkM2c="; + hash = "sha256-nXEul8E5WFm+E9K0V4jJGGzZfxwE2sUQOZEw8yhkM2c="; }; pythonImportsCheck = [ "em" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ete3/default.nix b/pkgs/development/python-modules/ete3/default.nix index 54864226c75e..2aa4e65dce0b 100644 --- a/pkgs/development/python-modules/ete3/default.nix +++ b/pkgs/development/python-modules/ete3/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI="; + hash = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI="; }; doCheck = false; # Tests are (i) not 3.x compatible, (ii) broken under 2.7 diff --git a/pkgs/development/python-modules/f5-sdk/default.nix b/pkgs/development/python-modules/f5-sdk/default.nix index 09aded01c5ae..304f1daabbfb 100644 --- a/pkgs/development/python-modules/f5-sdk/default.nix +++ b/pkgs/development/python-modules/f5-sdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IokMj9mCMsFMVFYO4CpZUB2i32cOamhS5u2mNkNjljo="; + hash = "sha256-IokMj9mCMsFMVFYO4CpZUB2i32cOamhS5u2mNkNjljo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fastdownload/default.nix b/pkgs/development/python-modules/fastdownload/default.nix index 82e9281dbf43..363230edcf81 100644 --- a/pkgs/development/python-modules/fastdownload/default.nix +++ b/pkgs/development/python-modules/fastdownload/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-IFB+246JQGofvXd15uKj2BpN1jPdUGsOnPDhYT6DHWo="; + hash = "sha256-IFB+246JQGofvXd15uKj2BpN1jPdUGsOnPDhYT6DHWo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 5dba169171d6..e6b7866b0cd0 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2b1Rw7XpVqKlKZjDcIxNLHKfL8wxEYjh5dO5cmOTVGo="; + hash = "sha256-2b1Rw7XpVqKlKZjDcIxNLHKfL8wxEYjh5dO5cmOTVGo="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index 5b76a3ca7444..d561911cd4d1 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-8HXyPyj9In8JfDayEhYcbPAS4cbKr3/1PV1rsCzUK50="; + hash = "sha256-8HXyPyj9In8JfDayEhYcbPAS4cbKr3/1PV1rsCzUK50="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index b6af9c7564f8..6999a333f284 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WrcXuXlTB3DBavtItQ0qmNI8Pp/jmFHc9rxNAYRaAqA="; + hash = "sha256-WrcXuXlTB3DBavtItQ0qmNI8Pp/jmFHc9rxNAYRaAqA="; }; postPatch = '' diff --git a/pkgs/development/python-modules/formencode/default.nix b/pkgs/development/python-modules/formencode/default.nix index b6be8e6158f6..58a2fe4d772e 100644 --- a/pkgs/development/python-modules/formencode/default.nix +++ b/pkgs/development/python-modules/formencode/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "FormEncode"; inherit version; - sha256 = "sha256-63TSIweKKM8BX6iJZsbjTy0Y11EnMY1lwUS+2a/EJj8="; + hash = "sha256-63TSIweKKM8BX6iJZsbjTy0Y11EnMY1lwUS+2a/EJj8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/freertos-gdb/default.nix b/pkgs/development/python-modules/freertos-gdb/default.nix index 7535ba80d35c..70a7c8efa31a 100644 --- a/pkgs/development/python-modules/freertos-gdb/default.nix +++ b/pkgs/development/python-modules/freertos-gdb/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5rkB01OdbD5Z4vA6dbqhWp5pGwqI1IlE4IE1dSdT1QE="; + hash = "sha256-5rkB01OdbD5Z4vA6dbqhWp5pGwqI1IlE4IE1dSdT1QE="; }; # Project has no tests diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 41632258f64f..a442a6e5d727 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XDPxQmjfW4+hEH2FN4Fb5v67rW7FYFJNakBLd3jPa6Y="; + hash = "sha256-XDPxQmjfW4+hEH2FN4Fb5v67rW7FYFJNakBLd3jPa6Y="; }; # No tests in archive diff --git a/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix b/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix index 3ea28e1b8112..50979a36d10a 100644 --- a/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix +++ b/pkgs/development/python-modules/gtfs-realtime-bindings/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-LoztiQRADMk6t+hSCttpNM+mAe2sxvWT/Cy0RIZiu0c="; + hash = "sha256-LoztiQRADMk6t+hSCttpNM+mAe2sxvWT/Cy0RIZiu0c="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix index 50de4ff088d4..66dd40712ded 100644 --- a/pkgs/development/python-modules/http-ece/default.nix +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "http_ece"; inherit version; - sha256 = "sha256-tZIPjvuOG1+wJXE+Ozb9pUM2JiAQY0sm3B+Y+F0es94="; + hash = "sha256-tZIPjvuOG1+wJXE+Ozb9pUM2JiAQY0sm3B+Y+F0es94="; }; postPatch = '' diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix index e99a7eaea0f5..2fb598918a14 100644 --- a/pkgs/development/python-modules/httpauth/default.nix +++ b/pkgs/development/python-modules/httpauth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-C6rnFroAd5vOULBMwsLSyeSK5zPXOEgGHDSYt+Pm2dQ="; + hash = "sha256-C6rnFroAd5vOULBMwsLSyeSK5zPXOEgGHDSYt+Pm2dQ="; }; doCheck = false; diff --git a/pkgs/development/python-modules/isosurfaces/default.nix b/pkgs/development/python-modules/isosurfaces/default.nix index 7356db3a2744..b72476e7743b 100644 --- a/pkgs/development/python-modules/isosurfaces/default.nix +++ b/pkgs/development/python-modules/isosurfaces/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+lHr6GTqk1WyaDDif91qQdWli0GfqNS0fjuLgHGNbiE="; + hash = "sha256-+lHr6GTqk1WyaDDif91qQdWli0GfqNS0fjuLgHGNbiE="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/javaobj-py3/default.nix b/pkgs/development/python-modules/javaobj-py3/default.nix index 2bc51a204125..fecd77a50300 100644 --- a/pkgs/development/python-modules/javaobj-py3/default.nix +++ b/pkgs/development/python-modules/javaobj-py3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5OMlfvLPgaMzl4ek1c+STlTJHwlacj9tJYTa5h1Dlu0="; + hash = "sha256-5OMlfvLPgaMzl4ek1c+STlTJHwlacj9tJYTa5h1Dlu0="; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index 5d38eeaf6480..f20a03e6df3c 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-WDUyveyjyeDK/EkxESxnN7Xmjxh6tZ7nff/fCf3529k="; + hash = "sha256-WDUyveyjyeDK/EkxESxnN7Xmjxh6tZ7nff/fCf3529k="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/l18n/default.nix b/pkgs/development/python-modules/l18n/default.nix index 3270550e87e3..76491a4699ca 100644 --- a/pkgs/development/python-modules/l18n/default.nix +++ b/pkgs/development/python-modules/l18n/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-GVbokNZz0XE1zCCRMlPBVPa8HAAmbCK31QPMGlpC2Eg="; + hash = "sha256-GVbokNZz0XE1zCCRMlPBVPa8HAAmbCK31QPMGlpC2Eg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 52f4c384f806..981b90bbc5ec 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rlp30aAdDR6RhUpnGJCJK3zpq7YBq3Mn/FyHT4meGXk="; + hash = "sha256-rlp30aAdDR6RhUpnGJCJK3zpq7YBq3Mn/FyHT4meGXk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 822b51053c17..c2890bf591ec 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kX3F/iQnYswZ2WPmVItC1joRgCjN0zYdYjl+O2OLa8U="; + hash = "sha256-kX3F/iQnYswZ2WPmVItC1joRgCjN0zYdYjl+O2OLa8U="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index bd844d647a62..3af76888e420 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+WS+wghvMVOmwW5wfyDLcY+BH1evEWB19MD0gFxgi5U="; + hash = "sha256-+WS+wghvMVOmwW5wfyDLcY+BH1evEWB19MD0gFxgi5U="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 28131581936f..9fc1cf12fb4a 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qvtn/EnPsdieRqNEOsdH4V9LtC3yDtBPBnrZ777iVqs="; + hash = "sha256-qvtn/EnPsdieRqNEOsdH4V9LtC3yDtBPBnrZ777iVqs="; }; patches = [ diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix index 065713f2f05d..77e82746e77d 100644 --- a/pkgs/development/python-modules/macfsevents/default.nix +++ b/pkgs/development/python-modules/macfsevents/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "MacFSEvents"; inherit version; - sha256 = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs="; + hash = "sha256-v3KD8dUXdkzNyBlbIWMdu6wcUGuSC/mo6ilWsxJ2Ucs="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/material-color-utilities/default.nix b/pkgs/development/python-modules/material-color-utilities/default.nix index 527726401f82..1eaec0a4069f 100644 --- a/pkgs/development/python-modules/material-color-utilities/default.nix +++ b/pkgs/development/python-modules/material-color-utilities/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64="; + hash = "sha256-PG8C585wWViFRHve83z3b9NijHyV+iGY2BdMJpyVH64="; }; pythonRelaxDeps = [ "Pillow" ]; diff --git a/pkgs/development/python-modules/memory-profiler/default.nix b/pkgs/development/python-modules/memory-profiler/default.nix index 8e0736e99271..a23929a52be2 100644 --- a/pkgs/development/python-modules/memory-profiler/default.nix +++ b/pkgs/development/python-modules/memory-profiler/default.nix @@ -12,7 +12,7 @@ python.pkgs.buildPythonPackage rec { src = fetchPypi { pname = "memory_profiler"; inherit version; - sha256 = "sha256-Tltz14ZKHRKS+3agPoKj5475NNBoKKaY2dradtogZ7A="; + hash = "sha256-Tltz14ZKHRKS+3agPoKj5475NNBoKKaY2dradtogZ7A="; }; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/development/python-modules/merge3/default.nix b/pkgs/development/python-modules/merge3/default.nix index 3d96e2e1108f..22d02db447b2 100644 --- a/pkgs/development/python-modules/merge3/default.nix +++ b/pkgs/development/python-modules/merge3/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0+rCE9hNVt/J45VSrIJGx4YKlAlk6+7YqL5EIvZJK68="; + hash = "sha256-0+rCE9hNVt/J45VSrIJGx4YKlAlk6+7YqL5EIvZJK68="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index ecd06217faf7..6593253d647b 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CsWBS2X/KngfsTlLkaI6ipX3NJK2u49wW67q2C6t1UM="; + hash = "sha256-CsWBS2X/KngfsTlLkaI6ipX3NJK2u49wW67q2C6t1UM="; }; propagatedBuildInputs = [ beautifulsoup4 ]; diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index c4ec910b6425..a23ef91c8a81 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; + hash = "sha256-KwpNVl+tZTZHHZKW9p3a/S0nZJW6lZftjBK9ECkRUMo="; }; nativeBuildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/mixins/default.nix b/pkgs/development/python-modules/mixins/default.nix index c6632f3b6a78..655f129b8ab6 100644 --- a/pkgs/development/python-modules/mixins/default.nix +++ b/pkgs/development/python-modules/mixins/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SmYYRzo6wClQBMc2oRgO0CQEHOxWe8GFL24TPa6A4NQ="; + hash = "sha256-SmYYRzo6wClQBMc2oRgO0CQEHOxWe8GFL24TPa6A4NQ="; }; pythonImportsCheck = [ "mixins" ]; diff --git a/pkgs/development/python-modules/mkdocs-macros/default.nix b/pkgs/development/python-modules/mkdocs-macros/default.nix index a8940953123b..1be602360f9f 100644 --- a/pkgs/development/python-modules/mkdocs-macros/default.nix +++ b/pkgs/development/python-modules/mkdocs-macros/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/jSNdfAckR82K22ZjFez2FtQWHbd5p25JPLFEsOVwyg="; + hash = "sha256-/jSNdfAckR82K22ZjFez2FtQWHbd5p25JPLFEsOVwyg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index c5b32f6397c4..20c78bf4f18e 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Xpaq1czaRxjgointlLICTfdcwtVVdbpXYtMfV2e4dn0="; + hash = "sha256-Xpaq1czaRxjgointlLICTfdcwtVVdbpXYtMfV2e4dn0="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index 15ff5d914afd..e3f20311123c 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XIOZFUZcaCBsPpxHM1eQghbCg4O0JTYeXRRFlL+Fp+A="; + hash = "sha256-XIOZFUZcaCBsPpxHM1eQghbCg4O0JTYeXRRFlL+Fp+A="; }; # No tests in archive diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index aaf776d9aaba..8d04bc106b07 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; + hash = "sha256-XDw9mJW1Ubdjd5un23oDSH3B+OOzha+BmvNBrp725Io="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/netapp-lib/default.nix b/pkgs/development/python-modules/netapp-lib/default.nix index 4155d3bff0c9..478831a9112e 100644 --- a/pkgs/development/python-modules/netapp-lib/default.nix +++ b/pkgs/development/python-modules/netapp-lib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1g4FCSMyS8T6F/T8BOqak4h1nJis8g9jaOluA4FTNpA="; + hash = "sha256-1g4FCSMyS8T6F/T8BOqak4h1nJis8g9jaOluA4FTNpA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index d69d11a331e6..adf8784a501e 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-WZODOBoL89+9kyygymUVrNF07UiHDL9/7hI9aYwZLBw="; + hash = "sha256-WZODOBoL89+9kyygymUVrNF07UiHDL9/7hI9aYwZLBw="; }; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/omrdatasettools/default.nix b/pkgs/development/python-modules/omrdatasettools/default.nix index a61bc96dc78f..b20189e3e972 100644 --- a/pkgs/development/python-modules/omrdatasettools/default.nix +++ b/pkgs/development/python-modules/omrdatasettools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-kUUcbti29uDnSEvCubMAUnptlaZGpEsW2IBGSAGnGyQ="; + hash = "sha256-kUUcbti29uDnSEvCubMAUnptlaZGpEsW2IBGSAGnGyQ="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oslotest/default.nix b/pkgs/development/python-modules/oslotest/default.nix index 55553b98e1e3..9aebaf81d38c 100644 --- a/pkgs/development/python-modules/oslotest/default.nix +++ b/pkgs/development/python-modules/oslotest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-97skDGy+8voLq7lRP/PafQ8ozDja+Y70Oy6ISDZ/vSA="; + hash = "sha256-97skDGy+8voLq7lRP/PafQ8ozDja+Y70Oy6ISDZ/vSA="; }; nativeBuildInputs = [ pbr ]; diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index acdf8eaf3a82..aa7876f4644a 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-CU3X2aX8HMpIVHc+XB/GoxWzO9WzqPRwZJKPrK8EkKg="; + hash = "sha256-CU3X2aX8HMpIVHc+XB/GoxWzO9WzqPRwZJKPrK8EkKg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pamela/default.nix b/pkgs/development/python-modules/pamela/default.nix index ad16f250130f..5f02936d9252 100644 --- a/pkgs/development/python-modules/pamela/default.nix +++ b/pkgs/development/python-modules/pamela/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1LE5/mAOGS4Xaio2gFkgemv/oOeHmHmxP0/LoBY0gb4="; + hash = "sha256-1LE5/mAOGS4Xaio2gFkgemv/oOeHmHmxP0/LoBY0gb4="; }; postUnpack = '' diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index 37ce5a14d7d0..876637cdfe51 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ACtKVV7k68A/i2Ywfih/pJLkp3tOoU0/k0MoKXu0k54="; + hash = "sha256-ACtKVV7k68A/i2Ywfih/pJLkp3tOoU0/k0MoKXu0k54="; }; # No tests available diff --git a/pkgs/development/python-modules/persist-queue/default.nix b/pkgs/development/python-modules/persist-queue/default.nix index ac91a7fa4ef0..bbadd55d3afe 100644 --- a/pkgs/development/python-modules/persist-queue/default.nix +++ b/pkgs/development/python-modules/persist-queue/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-P/t0aQLTAj/QnrRol2Cf3ubHexZB8Z4vyNmNdEvfyEU="; + hash = "sha256-P/t0aQLTAj/QnrRol2Cf3ubHexZB8Z4vyNmNdEvfyEU="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 044bf148a336..daa68e31afa1 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xdzm4LG/W5ziYXaXbCOfQbZYZvaUUih3lWhkLzWqeUc="; + hash = "sha256-xdzm4LG/W5ziYXaXbCOfQbZYZvaUUih3lWhkLzWqeUc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index dd5434422144..dc3dc7089d22 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tHfohB8OoOCf2rby8wXPON+XfZ4ULlaTo3RgXXXdb+A="; + hash = "sha256-tHfohB8OoOCf2rby8wXPON+XfZ4ULlaTo3RgXXXdb+A="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 2b89a74928db..35bf5d1a8be5 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I="; + hash = "sha256-UlCjUsGclZ12fKyHi4Kdk+XcdiWlFDOZoqANxmKP+3I="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index 98f97f9466ae..d9684090774a 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1CohbIKRTc9NfAAN68mLsza4+D4Ca6XZUszNn4B07/0="; + hash = "sha256-1CohbIKRTc9NfAAN68mLsza4+D4Ca6XZUszNn4B07/0="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pq/default.nix b/pkgs/development/python-modules/pq/default.nix index 5c6a85b29c83..533382cdca26 100644 --- a/pkgs/development/python-modules/pq/default.nix +++ b/pkgs/development/python-modules/pq/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1krw77ij69EbLg5mKmQmxeHpn38uRG9EOboGmRk+StY="; + hash = "sha256-1krw77ij69EbLg5mKmQmxeHpn38uRG9EOboGmRk+StY="; }; # tests require running postgresql cluster diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index 233f71b0a3d9..f4606cda7f48 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DiOMFAXRpVxyvTmzttc9b3q/2dCn+rLsBpOhmimlYX8="; + hash = "sha256-DiOMFAXRpVxyvTmzttc9b3q/2dCn+rLsBpOhmimlYX8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pubnubsub-handler/default.nix b/pkgs/development/python-modules/pubnubsub-handler/default.nix index 2bb9a0e75f73..8938d9df1ce4 100644 --- a/pkgs/development/python-modules/pubnubsub-handler/default.nix +++ b/pkgs/development/python-modules/pubnubsub-handler/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256:1c44x19zi709sazgl060nkqa7vbaf3iyhwcnwdykhsbipvp6bscy"; + hash = "sha256:1c44x19zi709sazgl060nkqa7vbaf3iyhwcnwdykhsbipvp6bscy"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/py-slvs/default.nix b/pkgs/development/python-modules/py-slvs/default.nix index 775de5a238bd..1f434fe66970 100644 --- a/pkgs/development/python-modules/py-slvs/default.nix +++ b/pkgs/development/python-modules/py-slvs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "py_slvs"; inherit version; - sha256 = "sha256-U6T/aXy0JTC1ptL5oBmch0ytSPmIkRA8XOi31NpArnI="; + hash = "sha256-U6T/aXy0JTC1ptL5oBmch0ytSPmIkRA8XOi31NpArnI="; }; pyproject = true; diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index 3f8721e61e04..24dc34c47f53 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-X09IcZHBnruQgnCxt7UpfxMtozKxVouWqRRXTAee0Xc="; + hash = "sha256-X09IcZHBnruQgnCxt7UpfxMtozKxVouWqRRXTAee0Xc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 8a27f29682b0..b2b4ef94b8d3 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-86N1nMTOwdWekyqtdDmdvPVB0YhiqtkDx3AEDaQq8g4="; + hash = "sha256-86N1nMTOwdWekyqtdDmdvPVB0YhiqtkDx3AEDaQq8g4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index fbdb230e3a87..67bbfa1c3d97 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY="; + hash = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY="; }; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/python-modules/pydelijn/default.nix b/pkgs/development/python-modules/pydelijn/default.nix index be679c748b31..c64eef1c9a63 100644 --- a/pkgs/development/python-modules/pydelijn/default.nix +++ b/pkgs/development/python-modules/pydelijn/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g="; + hash = "sha256-xyBq2h3ipUarkjCXq9GIbY7bhsf9729aQwHde3o5K6g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 524010a89a49..3a5fcb066ccc 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU="; + hash = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU="; }; propagatedBuildInputs = [ pyparsing ]; diff --git a/pkgs/development/python-modules/pyephember/default.nix b/pkgs/development/python-modules/pyephember/default.nix index 45d9227d7b9d..7efe8561c883 100644 --- a/pkgs/development/python-modules/pyephember/default.nix +++ b/pkgs/development/python-modules/pyephember/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-j3SftxXKs9EZwdio26W5U0y5owH4yTteS4RUmzkZkoE="; + hash = "sha256-j3SftxXKs9EZwdio26W5U0y5owH4yTteS4RUmzkZkoE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyfiglet/default.nix b/pkgs/development/python-modules/pyfiglet/default.nix index 20c448b36c64..a236951c493c 100644 --- a/pkgs/development/python-modules/pyfiglet/default.nix +++ b/pkgs/development/python-modules/pyfiglet/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-dYeIAYq4+q3cCYTh6gX/Mw08ZL5mPFE8wfEF9qMGbas="; + hash = "sha256-dYeIAYq4+q3cCYTh6gX/Mw08ZL5mPFE8wfEF9qMGbas="; }; doCheck = false; diff --git a/pkgs/development/python-modules/pygments-better-html/default.nix b/pkgs/development/python-modules/pygments-better-html/default.nix index 2f880a0ea867..488126dbe18d 100644 --- a/pkgs/development/python-modules/pygments-better-html/default.nix +++ b/pkgs/development/python-modules/pygments-better-html/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ="; + hash = "sha256-SLAe5ubIGEchUNoHCct6CWisBja3WNEfpE48v9CTzPQ="; }; propagatedBuildInputs = [ pygments ]; diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index b79cbc812bda..8b6b6e68627c 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc="; + hash = "sha256-uB9aDa1urIwL2DBdBwPi0sHWPW7SUZ3EaAjuMLSOudc="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pylibacl/default.nix b/pkgs/development/python-modules/pylibacl/default.nix index e2f2efdef7a2..9438cb9102b9 100644 --- a/pkgs/development/python-modules/pylibacl/default.nix +++ b/pkgs/development/python-modules/pylibacl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-7UludMpUUtXUzr4j3yKepGJzWpZSi5+ijjzh96K+0xo="; + hash = "sha256-7UludMpUUtXUzr4j3yKepGJzWpZSi5+ijjzh96K+0xo="; }; # ERROR: testExtended (tests.test_acls.AclExtensions) diff --git a/pkgs/development/python-modules/pymaven-patch/default.nix b/pkgs/development/python-modules/pymaven-patch/default.nix index 357c1f96f318..c390123e4c5a 100644 --- a/pkgs/development/python-modules/pymaven-patch/default.nix +++ b/pkgs/development/python-modules/pymaven-patch/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DPfJPonwHwQI62Vu7FjLSiKMleA7PUfLc9MfiZBVzVA="; + hash = "sha256-DPfJPonwHwQI62Vu7FjLSiKMleA7PUfLc9MfiZBVzVA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pypresence/default.nix b/pkgs/development/python-modules/pypresence/default.nix index 96aec1c90dc7..cf792a4226d9 100644 --- a/pkgs/development/python-modules/pypresence/default.nix +++ b/pkgs/development/python-modules/pypresence/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-phkaOvM6lmfypO8BhVd8hrli7nCqgmQ8Rydopv7R+/M="; + hash = "sha256-phkaOvM6lmfypO8BhVd8hrli7nCqgmQ8Rydopv7R+/M="; }; doCheck = false; # tests require internet connection diff --git a/pkgs/development/python-modules/pyqt6-charts/default.nix b/pkgs/development/python-modules/pyqt6-charts/default.nix index 60bc08b315d7..f802db34771c 100644 --- a/pkgs/development/python-modules/pyqt6-charts/default.nix +++ b/pkgs/development/python-modules/pyqt6-charts/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyQt6_Charts"; inherit version; - sha256 = "sha256-xPfPNpko978DLk4z9xjTuP5m2hdtSVn+MHNalw2G81w="; + hash = "sha256-xPfPNpko978DLk4z9xjTuP5m2hdtSVn+MHNalw2G81w="; }; # fix include path and increase verbosity diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index b72fde6277f7..e8b1da7fdc87 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -37,7 +37,7 @@ buildPythonPackage ( src = fetchPypi { pname = "PyQtWebEngine"; inherit version; - sha256 = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; + hash = "sha256-riQe8qYceCk5xYtSwq6lOtmbMPOTTINY1eCm67P9ByE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyramid-beaker/default.nix b/pkgs/development/python-modules/pyramid-beaker/default.nix index 8faae270960d..87e9a30932cb 100644 --- a/pkgs/development/python-modules/pyramid-beaker/default.nix +++ b/pkgs/development/python-modules/pyramid-beaker/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyramid_beaker"; inherit version; - sha256 = "sha256-zMUT60z7W0Flfym25rKMor17O/n9qRMGoQKa7pLRz6U="; + hash = "sha256-zMUT60z7W0Flfym25rKMor17O/n9qRMGoQKa7pLRz6U="; }; checkPhase = '' diff --git a/pkgs/development/python-modules/pyscreenshot/default.nix b/pkgs/development/python-modules/pyscreenshot/default.nix index 4cf66570a74f..768cd3170418 100644 --- a/pkgs/development/python-modules/pyscreenshot/default.nix +++ b/pkgs/development/python-modules/pyscreenshot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-jA6T8K72amv+Vahqv87WvTlq5LT2zB428EoorSYlWU0="; + hash = "sha256-jA6T8K72amv+Vahqv87WvTlq5LT2zB428EoorSYlWU0="; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix index 9f98f85052f3..6de1445b7da7 100644 --- a/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KTexRQ/JNWIPJHCdh9QMZ+BVoEPXuFQaJf36mU3aZ94="; + hash = "sha256-KTexRQ/JNWIPJHCdh9QMZ+BVoEPXuFQaJf36mU3aZ94="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pytest-instafail/default.nix b/pkgs/development/python-modules/pytest-instafail/default.nix index 63357c1b48d7..9afcd14deb17 100644 --- a/pkgs/development/python-modules/pytest-instafail/default.nix +++ b/pkgs/development/python-modules/pytest-instafail/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-M6YG9+DI5kbcO/7g1eOkt7eO98NhaM+h89k698pwbJ4="; + hash = "sha256-M6YG9+DI5kbcO/7g1eOkt7eO98NhaM+h89k698pwbJ4="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-twisted/default.nix b/pkgs/development/python-modules/pytest-twisted/default.nix index fa80566a1336..29ae8e462498 100644 --- a/pkgs/development/python-modules/pytest-twisted/default.nix +++ b/pkgs/development/python-modules/pytest-twisted/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qbGLyfykfSiG+O/j/SeHmoHxwLtJ8cVgZmyedkSRtjI="; + hash = "sha256-qbGLyfykfSiG+O/j/SeHmoHxwLtJ8cVgZmyedkSRtjI="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index bb6cf5d94ea1..63f8575ff2d0 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-bFdFI3L36v9Ak0ocA60YJr9eeTVY6H/vSRMeZGS02uU="; + hash = "sha256-bFdFI3L36v9Ak0ocA60YJr9eeTVY6H/vSRMeZGS02uU="; }; nativeBuildInputs = [ twine ]; diff --git a/pkgs/development/python-modules/python-musicpd/default.nix b/pkgs/development/python-modules/python-musicpd/default.nix index 673a9723397d..72ba24cc0aeb 100644 --- a/pkgs/development/python-modules/python-musicpd/default.nix +++ b/pkgs/development/python-modules/python-musicpd/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname; inherit version; - sha256 = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco="; + hash = "sha256-/FdM0UolVqhJNpS60Q/nra1hSHKL/LiSMX7/Hcipwco="; }; pyproject = true; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index ed97aef27a39..95751831d2cc 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YdRh1zaYKm92boeHIKsQpoFR4ujBCGYA2TiaxH5A6Io="; + hash = "sha256-YdRh1zaYKm92boeHIKsQpoFR4ujBCGYA2TiaxH5A6Io="; }; # Some tests require physical probing and additional physical setup diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index ef5ecb4105bc..01f1f2483282 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hTaXNEtk31U31K4yum+88FFdUakBCRD11QGZWQOLbro="; + hash = "sha256-hTaXNEtk31U31K4yum+88FFdUakBCRD11QGZWQOLbro="; }; buildInputs = [ udev ]; diff --git a/pkgs/development/python-modules/pytubefix/default.nix b/pkgs/development/python-modules/pytubefix/default.nix index 2050953b6663..146eca77fbb9 100644 --- a/pkgs/development/python-modules/pytubefix/default.nix +++ b/pkgs/development/python-modules/pytubefix/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5VnJXQo/VjeGB9Kpazg/MHU8m4Kh/JVd43HXitpk0Mk="; + hash = "sha256-5VnJXQo/VjeGB9Kpazg/MHU8m4Kh/JVd43HXitpk0Mk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 3b4c2db06636..3904923d53b4 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Mb4/UBRBqbjF3HJmD/e5z++bQ7ISGiPZb1htKGMnApA="; + hash = "sha256-Mb4/UBRBqbjF3HJmD/e5z++bQ7ISGiPZb1htKGMnApA="; }; buildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/pyvizio/default.nix b/pkgs/development/python-modules/pyvizio/default.nix index 72793ca72b92..d981f8b142e4 100644 --- a/pkgs/development/python-modules/pyvizio/default.nix +++ b/pkgs/development/python-modules/pyvizio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AtqMWe2zgRqOp5S9oKq7keHNHM8pnTmV1mfGiVzygTc="; + hash = "sha256-AtqMWe2zgRqOp5S9oKq7keHNHM8pnTmV1mfGiVzygTc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index d0311c4fdb39..f51d3c2dbce5 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JTVNnjZH+UQRpME+UQyDoc7swXl3sFJbpBsW5wGceww="; + hash = "sha256-JTVNnjZH+UQRpME+UQyDoc7swXl3sFJbpBsW5wGceww="; }; postPatch = '' diff --git a/pkgs/development/python-modules/qgrid/default.nix b/pkgs/development/python-modules/qgrid/default.nix index e409345bcd7a..a508d6351688 100644 --- a/pkgs/development/python-modules/qgrid/default.nix +++ b/pkgs/development/python-modules/qgrid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/or1tQgzCE3AtqJlzRrHuDfAPA+FIRUBY1YNzneNcRw="; + hash = "sha256-/or1tQgzCE3AtqJlzRrHuDfAPA+FIRUBY1YNzneNcRw="; }; patches = [ diff --git a/pkgs/development/python-modules/queuelib/default.nix b/pkgs/development/python-modules/queuelib/default.nix index 9274a8157d97..eee800736a6c 100644 --- a/pkgs/development/python-modules/queuelib/default.nix +++ b/pkgs/development/python-modules/queuelib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KFUWIJbPAjBRCJCzVDeeocD/GdEF0xR9NJ0kM7siKwg="; + hash = "sha256-KFUWIJbPAjBRCJCzVDeeocD/GdEF0xR9NJ0kM7siKwg="; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ramlfications/default.nix b/pkgs/development/python-modules/ramlfications/default.nix index 108ad1470c70..4efb631ad7f3 100644 --- a/pkgs/development/python-modules/ramlfications/default.nix +++ b/pkgs/development/python-modules/ramlfications/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wcQd5j74y7d0xFeWlwlhceZj95ixUmv5upnv/6Rl1ew="; + hash = "sha256-wcQd5j74y7d0xFeWlwlhceZj95ixUmv5upnv/6Rl1ew="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 9595e8e17687..458633c1a36a 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-zgCOmcR9FWj0lpi78U0G1CKR5kyNyr541HusIrBpF/Q="; + hash = "sha256-zgCOmcR9FWj0lpi78U0G1CKR5kyNyr541HusIrBpF/Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/requests-futures/default.nix b/pkgs/development/python-modules/requests-futures/default.nix index d166a0fe0fde..e370ec6f846f 100644 --- a/pkgs/development/python-modules/requests-futures/default.nix +++ b/pkgs/development/python-modules/requests-futures/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-9VpO+ABw4oWOfR5zEj0r+uryW5P9NDhNjd8UjitnY3M="; + hash = "sha256-9VpO+ABw4oWOfR5zEj0r+uryW5P9NDhNjd8UjitnY3M="; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/requests-hawk/default.nix b/pkgs/development/python-modules/requests-hawk/default.nix index 9f3fbb94670d..5e96bd5f2dba 100644 --- a/pkgs/development/python-modules/requests-hawk/default.nix +++ b/pkgs/development/python-modules/requests-hawk/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-rZIFBCyUvbFa+qGbB4DhEHeyTZ5c/6wfs9JssIqkNbc="; + hash = "sha256-rZIFBCyUvbFa+qGbB4DhEHeyTZ5c/6wfs9JssIqkNbc="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/riprova/default.nix b/pkgs/development/python-modules/riprova/default.nix index 98d70bcd939a..737f941f8dbb 100644 --- a/pkgs/development/python-modules/riprova/default.nix +++ b/pkgs/development/python-modules/riprova/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-FgFySbvBjcZU2bjo40/1O7glc6oFWW05jinEOfMWMVI="; + hash = "sha256-FgFySbvBjcZU2bjo40/1O7glc6oFWW05jinEOfMWMVI="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/rnc2rng/default.nix b/pkgs/development/python-modules/rnc2rng/default.nix index bc4147153356..7b691f638b44 100644 --- a/pkgs/development/python-modules/rnc2rng/default.nix +++ b/pkgs/development/python-modules/rnc2rng/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-3Z/7vWnQnLB+bnqM+A/ShwP9xtO5Am+HVrScvjMUZ2s="; + hash = "sha256-3Z/7vWnQnLB+bnqM+A/ShwP9xtO5Am+HVrScvjMUZ2s="; }; propagatedBuildInputs = [ rply ]; diff --git a/pkgs/development/python-modules/rpmfile/default.nix b/pkgs/development/python-modules/rpmfile/default.nix index bec7009ae86f..3f49d153a1bb 100644 --- a/pkgs/development/python-modules/rpmfile/default.nix +++ b/pkgs/development/python-modules/rpmfile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-tLDdVTrZlxGk+oYmeCm/4XLAPx6hzkztJP+lXtiDhb4="; + hash = "sha256-tLDdVTrZlxGk+oYmeCm/4XLAPx6hzkztJP+lXtiDhb4="; }; # Tests access the internet diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix index 16c96ce311d4..e81479419aa0 100644 --- a/pkgs/development/python-modules/smpplib/default.nix +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-UhWpWwU40m8YlgDgmCsx2oKB90U81uKGLFsh4+EAIzE="; + hash = "sha256-UhWpWwU40m8YlgDgmCsx2oKB90U81uKGLFsh4+EAIzE="; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/sockjs/default.nix b/pkgs/development/python-modules/sockjs/default.nix index da423a473052..c41bef8e1c7f 100644 --- a/pkgs/development/python-modules/sockjs/default.nix +++ b/pkgs/development/python-modules/sockjs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-V+lZoj8gqNVRSdHl2ws7hwcm8rStgWbUG9z0EbNs33Y="; + hash = "sha256-V+lZoj8gqNVRSdHl2ws7hwcm8rStgWbUG9z0EbNs33Y="; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/soundcloud-v2/default.nix b/pkgs/development/python-modules/soundcloud-v2/default.nix index 7b46166ec2f4..bd9d11105e1b 100644 --- a/pkgs/development/python-modules/soundcloud-v2/default.nix +++ b/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wcRjzLnPvpz4zWhV7LxAJ6+BDvkI1MexdgL4nBjJwbg="; + hash = "sha256-wcRjzLnPvpz4zWhV7LxAJ6+BDvkI1MexdgL4nBjJwbg="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/sphinx-external-toc/default.nix b/pkgs/development/python-modules/sphinx-external-toc/default.nix index 051da27792f8..fcb02b334a2b 100644 --- a/pkgs/development/python-modules/sphinx-external-toc/default.nix +++ b/pkgs/development/python-modules/sphinx-external-toc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "sphinx_external_toc"; - sha256 = "sha256-p9LGPMR+xohUZEOyi8TvRmEhgn7z3Hu1Cd41S61OouA="; + hash = "sha256-p9LGPMR+xohUZEOyi8TvRmEhgn7z3Hu1Cd41S61OouA="; }; nativeBuildInputs = [ flit-core ]; diff --git a/pkgs/development/python-modules/srt/default.nix b/pkgs/development/python-modules/srt/default.nix index d4ae26479ca6..6a8646be1a5b 100644 --- a/pkgs/development/python-modules/srt/default.nix +++ b/pkgs/development/python-modules/srt/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA="; + hash = "sha256-SIQxUEOk8HQP0fh47WyqN2rAbXDhNfMGptxEYy7tDMA="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index 493f761c8511..a0aff938ab03 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-yPxvq8Dn9phO6ruUJUDkVkblvvC7mf5Z4C2mNOTUuco="; + hash = "sha256-yPxvq8Dn9phO6ruUJUDkVkblvvC7mf5Z4C2mNOTUuco="; }; postPatch = '' diff --git a/pkgs/development/python-modules/tadasets/default.nix b/pkgs/development/python-modules/tadasets/default.nix index 2cf02af4efb2..ad437fd3497b 100644 --- a/pkgs/development/python-modules/tadasets/default.nix +++ b/pkgs/development/python-modules/tadasets/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PWbq+dCQ8mGR81lolBDSArxjkTdis1ZpLY0MqZfZ66I="; + hash = "sha256-PWbq+dCQ8mGR81lolBDSArxjkTdis1ZpLY0MqZfZ66I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/takethetime/default.nix b/pkgs/development/python-modules/takethetime/default.nix index 6c397f7535c8..e5671d5c08e8 100644 --- a/pkgs/development/python-modules/takethetime/default.nix +++ b/pkgs/development/python-modules/takethetime/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "TakeTheTime"; inherit version; - sha256 = "sha256-2+MEU6G1lqOPni4/qOGtxa8tv2RsoIN61cIFmhb+L/k="; + hash = "sha256-2+MEU6G1lqOPni4/qOGtxa8tv2RsoIN61cIFmhb+L/k="; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index b7322f07b473..cfc4922eccf7 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-RcCTYwM30Bpqj5d6JGrW1zLrEfLgcrsibVmtPSR4HJk="; + hash = "sha256-RcCTYwM30Bpqj5d6JGrW1zLrEfLgcrsibVmtPSR4HJk="; }; # https://github.com/sirfz/tesserocr/issues/314 diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index 9217aff5a8ff..ec6a5d662425 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Nor89+CQs8aIvddUol9kvDFOUSuBb4xxufn8F9w3o9k="; + hash = "sha256-Nor89+CQs8aIvddUol9kvDFOUSuBb4xxufn8F9w3o9k="; }; nativeCheckInputs = [ testresources ]; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 6e98a9f3461e..df074958d1cd 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-W+W7wfD6D4tgrKbO7AeEXUHQxHXPRFv6200sRew5fqM="; + hash = "sha256-W+W7wfD6D4tgrKbO7AeEXUHQxHXPRFv6200sRew5fqM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix index 8a95ecf22fea..31e94229e771 100644 --- a/pkgs/development/python-modules/textacy/default.nix +++ b/pkgs/development/python-modules/textacy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-a+AkSMCPx9fE7fhSiQBuOaSlPvdHIB/yS2dcZS9AxoY="; + hash = "sha256-a+AkSMCPx9fE7fhSiQBuOaSlPvdHIB/yS2dcZS9AxoY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tubeup/default.nix b/pkgs/development/python-modules/tubeup/default.nix index 3b351c3a608f..1d58d87eeb77 100644 --- a/pkgs/development/python-modules/tubeup/default.nix +++ b/pkgs/development/python-modules/tubeup/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Pp4h0MBoYhczmxPq21cLiYpLUeFP+2JoACcFpBl3b0E="; + hash = "sha256-Pp4h0MBoYhczmxPq21cLiYpLUeFP+2JoACcFpBl3b0E="; }; diff --git a/pkgs/development/python-modules/types-appdirs/default.nix b/pkgs/development/python-modules/types-appdirs/default.nix index ec18f6cbcedb..9c48d6996f8d 100644 --- a/pkgs/development/python-modules/types-appdirs/default.nix +++ b/pkgs/development/python-modules/types-appdirs/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-gyaNpkWFNhv6KR+PUGogknYhKgSXvTfwUSqTmz1p/xQ="; + hash = "sha256-gyaNpkWFNhv6KR+PUGogknYhKgSXvTfwUSqTmz1p/xQ="; }; meta = { diff --git a/pkgs/development/python-modules/uhi/default.nix b/pkgs/development/python-modules/uhi/default.nix index 4fab1494d88b..c84408b339ed 100644 --- a/pkgs/development/python-modules/uhi/default.nix +++ b/pkgs/development/python-modules/uhi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-DctrGXdQh9OKMe44jLLHDy7P4ExP/iymMiNBDK5b7vo="; + hash = "sha256-DctrGXdQh9OKMe44jLLHDy7P4ExP/iymMiNBDK5b7vo="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/unrardll/default.nix b/pkgs/development/python-modules/unrardll/default.nix index ef69a9bbe94e..14a32c0ba862 100644 --- a/pkgs/development/python-modules/unrardll/default.nix +++ b/pkgs/development/python-modules/unrardll/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4QZ/4nu03iBO+PNpLyPZPF07QpL3iyksb8fcT3V0n3Y="; + hash = "sha256-4QZ/4nu03iBO+PNpLyPZPF07QpL3iyksb8fcT3V0n3Y="; }; buildInputs = [ unrar ]; diff --git a/pkgs/development/python-modules/validobj/default.nix b/pkgs/development/python-modules/validobj/default.nix index 5ee2b0d6d0c8..65076a08843d 100644 --- a/pkgs/development/python-modules/validobj/default.nix +++ b/pkgs/development/python-modules/validobj/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-uwP2Mu10AiDWzlPMRH2+0CMSnibTB8KBY8QZNf+icNA="; + hash = "sha256-uwP2Mu10AiDWzlPMRH2+0CMSnibTB8KBY8QZNf+icNA="; }; nativeBuildInputs = [ flit ]; diff --git a/pkgs/development/python-modules/verspec/default.nix b/pkgs/development/python-modules/verspec/default.nix index 4064f1a18cae..fe30ab8bebf9 100644 --- a/pkgs/development/python-modules/verspec/default.nix +++ b/pkgs/development/python-modules/verspec/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-xFBMppeyBWzbS/pxIUYfWg6BgJJVtBwD3aS6gjY3wB4="; + hash = "sha256-xFBMppeyBWzbS/pxIUYfWg6BgJJVtBwD3aS6gjY3wB4="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/virtualenvwrapper/default.nix b/pkgs/development/python-modules/virtualenvwrapper/default.nix index 62f6315880fa..37662921905a 100644 --- a/pkgs/development/python-modules/virtualenvwrapper/default.nix +++ b/pkgs/development/python-modules/virtualenvwrapper/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-1Ge+rFpEvgD7XNG88zI5jD2rX7O9OveBXqhrTWuz06Q="; + hash = "sha256-1Ge+rFpEvgD7XNG88zI5jD2rX7O9OveBXqhrTWuz06Q="; }; # pip depend on $HOME setting diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 5653e5629d40..81f6553a9646 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-q3J7+B3oiYStpcEfBm8eFkmQPT49fskfHOloFyr9UlY="; + hash = "sha256-q3J7+B3oiYStpcEfBm8eFkmQPT49fskfHOloFyr9UlY="; }; disabled = isPyPy; diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 94b004862d59..933823a748c5 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-AF2kebBBNM3Z3WAtHufEnXneBTdhDWU2dMxsveIiuKE="; + hash = "sha256-AF2kebBBNM3Z3WAtHufEnXneBTdhDWU2dMxsveIiuKE="; }; doCheck = false; diff --git a/pkgs/development/python-modules/waqiasync/default.nix b/pkgs/development/python-modules/waqiasync/default.nix index 91d58d85347c..c627c24290ff 100644 --- a/pkgs/development/python-modules/waqiasync/default.nix +++ b/pkgs/development/python-modules/waqiasync/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SOs998BQV4UlLnRB3Yf7zze51u43g2Npwgk6y80S+m8="; + hash = "sha256-SOs998BQV4UlLnRB3Yf7zze51u43g2Npwgk6y80S+m8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix index 187a9c7baf93..4427858a8157 100644 --- a/pkgs/development/python-modules/xstatic-asciinema-player/default.nix +++ b/pkgs/development/python-modules/xstatic-asciinema-player/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "XStatic-asciinema-player"; inherit version; - sha256 = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw="; + hash = "sha256-yA6WC067St82Dm6StaCKdWrRBhmNemswetIO8iodfcw="; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic-font-awesome/default.nix b/pkgs/development/python-modules/xstatic-font-awesome/default.nix index 1a8868a84685..7f8d70372a3d 100644 --- a/pkgs/development/python-modules/xstatic-font-awesome/default.nix +++ b/pkgs/development/python-modules/xstatic-font-awesome/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "XStatic-Font-Awesome"; inherit version; - sha256 = "sha256-8HWHEJYShjjy4VOQINgid1TD2IXdaOfubemgEjUHaCg="; + hash = "sha256-8HWHEJYShjjy4VOQINgid1TD2IXdaOfubemgEjUHaCg="; }; # no tests implemented diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix index 4d6fd00d221c..fb7b2b1e9001 100644 --- a/pkgs/development/python-modules/xstatic/default.nix +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "XStatic"; inherit version; - sha256 = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg="; + hash = "sha256-QCVEzJ4XlIlEEFTwnIB4BOEV6iRpB96HwDVftPWjEmg="; }; # no tests implemented diff --git a/pkgs/development/python-modules/yamlordereddictloader/default.nix b/pkgs/development/python-modules/yamlordereddictloader/default.nix index 89f871e50be2..33a4732fdebf 100644 --- a/pkgs/development/python-modules/yamlordereddictloader/default.nix +++ b/pkgs/development/python-modules/yamlordereddictloader/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Nq8vYhD8/12k/EwS4dgV+XPc60EETnleHwYRXWNLyhM="; + hash = "sha256-Nq8vYhD8/12k/EwS4dgV+XPc60EETnleHwYRXWNLyhM="; }; propagatedBuildInputs = [ pyyaml ]; diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index db3bfceea9e4..e656721e855c 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ii6EWI7zHT5SVwD6lksfmqth8MnEYoHgU0GlbgHc17g="; + hash = "sha256-ii6EWI7zHT5SVwD6lksfmqth8MnEYoHgU0GlbgHc17g="; }; patchPhase = '' diff --git a/pkgs/development/python-modules/yubico/default.nix b/pkgs/development/python-modules/yubico/default.nix index 43f3a8994b66..8a4bfb769e13 100644 --- a/pkgs/development/python-modules/yubico/default.nix +++ b/pkgs/development/python-modules/yubico/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-2EZkJ6pZIqxdS36cZbaTEIQnz1N9ZT1oyyEsBxPo5vU="; + hash = "sha256-2EZkJ6pZIqxdS36cZbaTEIQnz1N9ZT1oyyEsBxPo5vU="; }; propagatedBuildInputs = [ pyusb ]; diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 352fefbcd373..7cc6f18d5e3d 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "zope.deferredimport"; inherit version; - sha256 = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; + hash = "sha256-Orvw4YwfF2WRTs0dQbVJ5NBFshso5AZfsMHeCtc2ssM="; }; propagatedBuildInputs = [ zope-proxy ]; diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index f26eb8385a6e..93941dd57955 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-28mEG+3XNgQeteaYLNktqTvuFFdF9UIvN5X28ljNxu8="; + hash = "sha256-28mEG+3XNgQeteaYLNktqTvuFFdF9UIvN5X28ljNxu8="; extension = "zip"; }; diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index 69538a923d14..fd4161499c72 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w="; + hash = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 69004289f528..9a20f12c0f60 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-YW3mjYfSuxi/XmaetrWmjVuTfqgaitQ5wfUaJdHIH1Y="; + hash = "sha256-YW3mjYfSuxi/XmaetrWmjVuTfqgaitQ5wfUaJdHIH1Y="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/development/tools/database/sqlite-web/default.nix index dc5960fd9ee2..8adaabd5e094 100644 --- a/pkgs/development/tools/database/sqlite-web/default.nix +++ b/pkgs/development/tools/database/sqlite-web/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-cDSlSh0vnwvbJZFDPqvJ5oXz68gN9yzodcQYkXUAytE="; + hash = "sha256-cDSlSh0vnwvbJZFDPqvJ5oXz68gN9yzodcQYkXUAytE="; }; propagatedBuildInputs = with python3Packages; [ flask peewee pygments ]; diff --git a/pkgs/development/tools/dazel/default.nix b/pkgs/development/tools/dazel/default.nix index f19d46969783..119cbaca9c70 100644 --- a/pkgs/development/tools/dazel/default.nix +++ b/pkgs/development/tools/dazel/default.nix @@ -8,7 +8,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JE7+GS7DpuFoC2LK3dvYvjtOdzRxFMHzgZRfvrGBDtQ="; + hash = "sha256-JE7+GS7DpuFoC2LK3dvYvjtOdzRxFMHzgZRfvrGBDtQ="; }; meta = { diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix index c405aa3fd354..a9d13d973000 100644 --- a/pkgs/development/tools/distgen/default.nix +++ b/pkgs/development/tools/distgen/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Md6R1thUtPQ7BFZsWmTDuNdD7UHMMFlEVksIJZAyjk4="; + hash = "sha256-Md6R1thUtPQ7BFZsWmTDuNdD7UHMMFlEVksIJZAyjk4="; }; nativeCheckInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix index 9a1a8978598b..04eac7726f71 100644 --- a/pkgs/development/tools/eliot-tree/default.nix +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8="; + hash = "sha256-hTl+r+QJPPQ7ss73lty3Wm7DLy2SKGmmgIuJx38ilO8="; }; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index f5d55ce10dfb..393f2512e875 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -8,7 +8,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-X+hNVM8fsy0VFTqFr1pPKWRimacBenTcY4y+PBJpvlI="; + hash = "sha256-X+hNVM8fsy0VFTqFr1pPKWRimacBenTcY4y+PBJpvlI="; }; nativeCheckInputs = [ diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index cc5b0fde7219..33d9da9f636e 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-vmMlRmjFqhs3Vf+IU9IDtJzt4dZ0yIOmXIVOx5chZPA="; + hash = "sha256-vmMlRmjFqhs3Vf+IU9IDtJzt4dZ0yIOmXIVOx5chZPA="; }; postPatch = '' diff --git a/pkgs/development/tools/misc/usbsdmux/default.nix b/pkgs/development/tools/misc/usbsdmux/default.nix index 86ed8b11acf9..7794cf06d77d 100644 --- a/pkgs/development/tools/misc/usbsdmux/default.nix +++ b/pkgs/development/tools/misc/usbsdmux/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-OtGgToDGUr6pBu9+LS/DxaYw/9+Pd6jPhxVDAM22HB4="; + hash = "sha256-OtGgToDGUr6pBu9+LS/DxaYw/9+Pd6jPhxVDAM22HB4="; }; # Remove the wrong GROUP=plugdev. diff --git a/pkgs/development/tools/patatt/default.nix b/pkgs/development/tools/patatt/default.nix index b50fae18ae49..49477035a110 100644 --- a/pkgs/development/tools/patatt/default.nix +++ b/pkgs/development/tools/patatt/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-mAgm9lKdJXbCZ8ofVk1b7wRstH5UIVu1mO1sS5stCig="; + hash = "sha256-mAgm9lKdJXbCZ8ofVk1b7wRstH5UIVu1mO1sS5stCig="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/development/tools/pifpaf/default.nix b/pkgs/development/tools/pifpaf/default.nix index 80d9c26f506c..6ae32206c6d0 100644 --- a/pkgs/development/tools/pifpaf/default.nix +++ b/pkgs/development/tools/pifpaf/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-lmixfUP+pq0RdyXeY6MmUQOx1sMLHqojOKUK1mivbaU="; + hash = "sha256-lmixfUP+pq0RdyXeY6MmUQOx1sMLHqojOKUK1mivbaU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 32c09f4c5388..5a2ef3b16dcf 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; + hash = "sha256-PgV6V18FyezIZpqMQEbyv98MaVM7h7T7/Kvg3yMMwzE="; }; meta = with lib; { diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index 20f6846274b7..8c7fb067f1ab 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE="; + hash = "sha256-O6jRQ6e96b8CuumTD6TGELaz26No7WFZgGSnNSlqzuE="; }; postPatch = '' diff --git a/pkgs/misc/present/default.nix b/pkgs/misc/present/default.nix index a27b6abe4359..77ca05b0faae 100644 --- a/pkgs/misc/present/default.nix +++ b/pkgs/misc/present/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c="; + hash = "sha256-l9W5L4LD9qRo3rLBkgd2I/aDaj+ucib5UYg+X4RYg6c="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/servers/dcnnt/default.nix b/pkgs/servers/dcnnt/default.nix index 2279c9f116b1..505ee26ab95d 100644 --- a/pkgs/servers/dcnnt/default.nix +++ b/pkgs/servers/dcnnt/default.nix @@ -6,7 +6,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE="; + hash = "sha256-73ZLgb5YcXlAOjbKLVv8oqgS6pstBdJxa7LFUgIHpUE="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/geospatial/mapproxy/default.nix b/pkgs/servers/geospatial/mapproxy/default.nix index ce3bcd5560de..773c12f24185 100644 --- a/pkgs/servers/geospatial/mapproxy/default.nix +++ b/pkgs/servers/geospatial/mapproxy/default.nix @@ -9,7 +9,7 @@ buildPythonApplication rec { version = "2.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HwO5gvrsW9pArz4RLtxNfCmiFqa85AAi6wBJI+F9GE8="; + hash = "sha256-HwO5gvrsW9pArz4RLtxNfCmiFqa85AAi6wBJI+F9GE8="; }; prePatch = '' substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv" diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index dfec900b0214..2aac1665f81b 100644 --- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+Nad+8bMtYKJbUCpppRXqhB1zdbvvFXTTHlwJLQLzDg="; + hash = "sha256-+Nad+8bMtYKJbUCpppRXqhB1zdbvvFXTTHlwJLQLzDg="; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/matrix-synapse/plugins/ldap3.nix b/pkgs/servers/matrix-synapse/plugins/ldap3.nix index feac6f084726..6a631f4f262f 100644 --- a/pkgs/servers/matrix-synapse/plugins/ldap3.nix +++ b/pkgs/servers/matrix-synapse/plugins/ldap3.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-s4jZVpNIbu9pra79D9noRGPVL+F7AhSgDvyqZptzy3Q="; + hash = "sha256-s4jZVpNIbu9pra79D9noRGPVL+F7AhSgDvyqZptzy3Q="; }; patches = [ diff --git a/pkgs/servers/monitoring/alerta/client.nix b/pkgs/servers/monitoring/alerta/client.nix index e95c114ee2a6..ea1e589ad4f2 100644 --- a/pkgs/servers/monitoring/alerta/client.nix +++ b/pkgs/servers/monitoring/alerta/client.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ePvT2icsgv+io5aDDUr1Zhfodm4wlqh/iqXtNkFhS10="; + hash = "sha256-ePvT2icsgv+io5aDDUr1Zhfodm4wlqh/iqXtNkFhS10="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/alerta/default.nix b/pkgs/servers/monitoring/alerta/default.nix index f84bb3302eca..3a360ca0f89c 100644 --- a/pkgs/servers/monitoring/alerta/default.nix +++ b/pkgs/servers/monitoring/alerta/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-v4+0l5Sx9RTxmNFnKCoKrWFl1xu1JIRZ/kiI6zi/y0I="; + hash = "sha256-v4+0l5Sx9RTxmNFnKCoKrWFl1xu1JIRZ/kiI6zi/y0I="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/monitoring/prometheus/pve-exporter.nix b/pkgs/servers/monitoring/prometheus/pve-exporter.nix index a9d287a41a7e..aaf5f46b075e 100644 --- a/pkgs/servers/monitoring/prometheus/pve-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pve-exporter.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-C7agnOUdtd4YncAiaPQaZqBJ8DKZoM1Fa+dr1F4xYgI="; + hash = "sha256-C7agnOUdtd4YncAiaPQaZqBJ8DKZoM1Fa+dr1F4xYgI="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 15600c325561..4d3e320bee0a 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0R2k5hRkAJbqgGZEPXWUb48oFxTKMKiQZckf3F+VC3I="; + hash = "sha256-0R2k5hRkAJbqgGZEPXWUb48oFxTKMKiQZckf3F+VC3I="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/audio/patray/default.nix b/pkgs/tools/audio/patray/default.nix index 90c8719b48b3..b281da1b144e 100644 --- a/pkgs/tools/audio/patray/default.nix +++ b/pkgs/tools/audio/patray/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit version pname; - sha256 = "sha256-O8CBUexL2V1qI7bB/Lns3yjUvFOpC6spd/6asXa5+pw="; + hash = "sha256-O8CBUexL2V1qI7bB/Lns3yjUvFOpC6spd/6asXa5+pw="; }; patchPhase = '' diff --git a/pkgs/tools/audio/tidal-dl/default.nix b/pkgs/tools/audio/tidal-dl/default.nix index c45d78aec4dc..eb7c597d2d75 100644 --- a/pkgs/tools/audio/tidal-dl/default.nix +++ b/pkgs/tools/audio/tidal-dl/default.nix @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-b2AAsiI3n2/v6HC37fMI/d8UcxZxsWM+fnWvdajHrOg="; + hash = "sha256-b2AAsiI3n2/v6HC37fMI/d8UcxZxsWM+fnWvdajHrOg="; }; propagatedBuildInputs = [ aigpy ]; diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 7a0793c2763b..f6f9bcd3c0d3 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-4Z5imxNjfvd4fkpFsggSO9XueN5Yzcz4RCl+BqmddCM="; + hash = "sha256-4Z5imxNjfvd4fkpFsggSO9XueN5Yzcz4RCl+BqmddCM="; }; nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ] ++ passthru.optional-dependencies.apprise; diff --git a/pkgs/tools/backup/gh2md/default.nix b/pkgs/tools/backup/gh2md/default.nix index 035139b58022..a56bd53c6f4a 100644 --- a/pkgs/tools/backup/gh2md/default.nix +++ b/pkgs/tools/backup/gh2md/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-B7IB1TWfZ0StH2zo/tXfDAaPlgLvr4ciIv7B8EQyp8w="; + hash = "sha256-B7IB1TWfZ0StH2zo/tXfDAaPlgLvr4ciIv7B8EQyp8w="; }; propagatedBuildInputs = with python3Packages; [ six requests python-dateutil ]; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 58605362f065..bf797a16cbfd 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -10,7 +10,7 @@ pypkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0HeDVyZrxlE7t/daRXCymySydgNIu/YHur/DpvCUWM8"; + hash = "sha256-0HeDVyZrxlE7t/daRXCymySydgNIu/YHur/DpvCUWM8"; }; nativeBuildInputs = with pypkgs; [ setuptools-scm ]; diff --git a/pkgs/tools/backup/zfs-autobackup/default.nix b/pkgs/tools/backup/zfs-autobackup/default.nix index e29813caab27..79d0fcd01dea 100644 --- a/pkgs/tools/backup/zfs-autobackup/default.nix +++ b/pkgs/tools/backup/zfs-autobackup/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "zfs_autobackup"; - sha256 = "sha256-rvtY7fsn2K2hueAsQkaPXcwxUAgE8j+GsQFF3eJKG2o="; + hash = "sha256-rvtY7fsn2K2hueAsQkaPXcwxUAgE8j+GsQFF3eJKG2o="; }; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 1e3f22642321..907fcd6b3541 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -49,7 +49,7 @@ bepastyPython.pkgs.buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-08cyr2AruGAfHAwHHS8WMfJh7DBKymaYyz4AxI/ubkE="; + hash = "sha256-08cyr2AruGAfHAwHHS8WMfJh7DBKymaYyz4AxI/ubkE="; }; nativeCheckInputs = with bepastyPython.pkgs; [ diff --git a/pkgs/tools/misc/edir/default.nix b/pkgs/tools/misc/edir/default.nix index 13cd4ed1c737..85fc426fc57c 100644 --- a/pkgs/tools/misc/edir/default.nix +++ b/pkgs/tools/misc/edir/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-5b86/M8xqzwWMCRtsH1qwmooyfOhORgXgctRjzQEmlU="; + hash = "sha256-5b86/M8xqzwWMCRtsH1qwmooyfOhORgXgctRjzQEmlU="; }; nativeBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/gaphor/default.nix b/pkgs/tools/misc/gaphor/default.nix index 68f922d4abd8..3079a620df45 100644 --- a/pkgs/tools/misc/gaphor/default.nix +++ b/pkgs/tools/misc/gaphor/default.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0="; + hash = "sha256-+qqsSLjdY2I19fxdfkOEQ9DhTTHccUDll4O5yqtLiz0="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/mloader/default.nix b/pkgs/tools/misc/mloader/default.nix index 1a39727e9973..3a06da1e8585 100644 --- a/pkgs/tools/misc/mloader/default.nix +++ b/pkgs/tools/misc/mloader/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-0o4FvhuFudNSEL6fwBVqxldaNePbbidY9utDqXiLRNc="; + hash = "sha256-0o4FvhuFudNSEL6fwBVqxldaNePbbidY9utDqXiLRNc="; }; postPatch = '' diff --git a/pkgs/tools/misc/pandoc-acro/default.nix b/pkgs/tools/misc/pandoc-acro/default.nix index 36bd518f5b2b..824418dd3f7f 100644 --- a/pkgs/tools/misc/pandoc-acro/default.nix +++ b/pkgs/tools/misc/pandoc-acro/default.nix @@ -15,7 +15,7 @@ let src = fetchPypi { inherit pname version; - sha256 = "sha256-JMfSQXX+BCGdFQYPFB+r08WRnhT3aXfnBNINROxCUA0="; + hash = "sha256-JMfSQXX+BCGdFQYPFB+r08WRnhT3aXfnBNINROxCUA0="; }; in buildPythonApplication { diff --git a/pkgs/tools/misc/sacad/default.nix b/pkgs/tools/misc/sacad/default.nix index cd948505301e..d8666ebd495f 100644 --- a/pkgs/tools/misc/sacad/default.nix +++ b/pkgs/tools/misc/sacad/default.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ZJPcxKc0G8V7x9nyzKXaXpfNpMB3/qRoX0d4lfBZTFY="; + hash = "sha256-ZJPcxKc0G8V7x9nyzKXaXpfNpMB3/qRoX0d4lfBZTFY="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/misc/semiphemeral/default.nix b/pkgs/tools/misc/semiphemeral/default.nix index 7208dca81176..173431e526f7 100644 --- a/pkgs/tools/misc/semiphemeral/default.nix +++ b/pkgs/tools/misc/semiphemeral/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-KRi3zfRWGRZJjQ6KPqBI9wQ6yU8Ohx0TDtA5qoak35U="; + hash = "sha256-KRi3zfRWGRZJjQ6KPqBI9wQ6yU8Ohx0TDtA5qoak35U="; }; doCheck = false; # upstream has no tests diff --git a/pkgs/tools/misc/twspace-dl/default.nix b/pkgs/tools/misc/twspace-dl/default.nix index e0f2e8b5f581..1345a25eb1bb 100644 --- a/pkgs/tools/misc/twspace-dl/default.nix +++ b/pkgs/tools/misc/twspace-dl/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "twspace_dl"; - sha256 = "sha256-GLs+UGEOsdGcp/mEh+12Vs+XlY1goEql7UOAvVVi1pg="; + hash = "sha256-GLs+UGEOsdGcp/mEh+12Vs+XlY1goEql7UOAvVVi1pg="; }; nativeBuildInputs = with python3Packages; [ poetry-core ]; diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix index b285d18a90ed..9db7c9d2443e 100644 --- a/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { src = fetchPypi { inherit version pname; - sha256 = "sha256-hJl0OTE6kHucVGOxgOZBG0noYRfxma3yZSrUWEssLN4="; + hash = "sha256-hJl0OTE6kHucVGOxgOZBG0noYRfxma3yZSrUWEssLN4="; }; propagatedBuildInputs= [ diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix index 211bde7c240d..46683480de3c 100644 --- a/pkgs/tools/misc/wlc/default.nix +++ b/pkgs/tools/misc/wlc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-QMF41B6a2jMSdhjeFoRQq+K1YJAEz96msHLzX6wVqSc="; + hash = "sha256-QMF41B6a2jMSdhjeFoRQq+K1YJAEz96msHLzX6wVqSc="; }; propagatedBuildInputs = [ diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index 785c66db62f8..6f11442c496c 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-XNIUkgEqRGrBtSxvfkSUSqxltZ6ZdkWoTc9kz4BD6Zw="; + hash = "sha256-XNIUkgEqRGrBtSxvfkSUSqxltZ6ZdkWoTc9kz4BD6Zw="; }; patches = [ diff --git a/pkgs/tools/misc/ytmdl/default.nix b/pkgs/tools/misc/ytmdl/default.nix index 9baf2888d78b..3acaac1b3519 100644 --- a/pkgs/tools/misc/ytmdl/default.nix +++ b/pkgs/tools/misc/ytmdl/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-Im3rQAs/TYookv6FeGpU6tJxUGBMb6/UW1ZMDg9FW4s="; + hash = "sha256-Im3rQAs/TYookv6FeGpU6tJxUGBMb6/UW1ZMDg9FW4s="; }; postPatch = '' diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index 743ee82c2bd9..06d322b83869 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -8,7 +8,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-VtnVyJqrdGXTqcyzpHCOMUI9G7/BkXzihDrBrsxl7Eg="; + hash = "sha256-VtnVyJqrdGXTqcyzpHCOMUI9G7/BkXzihDrBrsxl7Eg="; }; propagatedBuildInputs = [ colorama veryprettytable pyperclip ]; diff --git a/pkgs/tools/security/ghdorker/default.nix b/pkgs/tools/security/ghdorker/default.nix index f00e9a60df81..61ac1f2cc852 100644 --- a/pkgs/tools/security/ghdorker/default.nix +++ b/pkgs/tools/security/ghdorker/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-wF4QoXxH55SpdYgKLHf4sCwUk1rkCpSdnIX5FvFi/BU="; + hash = "sha256-wF4QoXxH55SpdYgKLHf4sCwUk1rkCpSdnIX5FvFi/BU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/tools/security/kerbrute/default.nix b/pkgs/tools/security/kerbrute/default.nix index c020e0e5c4bc..626fe91a60c4 100644 --- a/pkgs/tools/security/kerbrute/default.nix +++ b/pkgs/tools/security/kerbrute/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-ok/yttRSkCaEdV4aM2670qERjgDBll6Oi3L5TV5YEEA="; + hash = "sha256-ok/yttRSkCaEdV4aM2670qERjgDBll6Oi3L5TV5YEEA="; }; # This package does not have any tests diff --git a/pkgs/tools/security/onlykey-agent/default.nix b/pkgs/tools/security/onlykey-agent/default.nix index f37073d602da..d78c1b89b4f6 100644 --- a/pkgs/tools/security/onlykey-agent/default.nix +++ b/pkgs/tools/security/onlykey-agent/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-SbGb7CjcD7cFPvASZtip56B4uxRiFKZBvbsf6sb8fds="; + hash = "sha256-SbGb7CjcD7cFPvASZtip56B4uxRiFKZBvbsf6sb8fds="; }; propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli setuptools ]; diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/tools/security/onlykey-cli/default.nix index 6d43a4df4aff..be95675dd66e 100644 --- a/pkgs/tools/security/onlykey-cli/default.nix +++ b/pkgs/tools/security/onlykey-cli/default.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication rec { src = fetchPypi { inherit version; pname = "onlykey"; - sha256 = "sha256-ZmQnyZx9YlIIxMMdZ0U2zb+QANfcwrtG7iR1LpgzmBQ="; + hash = "sha256-ZmQnyZx9YlIIxMMdZ0U2zb+QANfcwrtG7iR1LpgzmBQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index 6a8e5ec0be19..15bedadccef0 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-nSdpnM8ubodlPwmvdmNFTn9TsS8i7lWBZ2CifMHDe1c="; + hash = "sha256-nSdpnM8ubodlPwmvdmNFTn9TsS8i7lWBZ2CifMHDe1c="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix b/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix index 27830f9645ca..b0327b2b6052 100644 --- a/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix +++ b/pkgs/tools/virtualization/ec2instanceconnectcli/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-/U59a6od0JI27VHX+Bvue/7tQy+iwU+g8yt9/GgdoH4="; + hash = "sha256-/U59a6od0JI27VHX+Bvue/7tQy+iwU+g8yt9/GgdoH4="; }; propagatedBuildInputs = [ boto3 cryptography ]; From 6fd80c0cce0d431ddeec708b72c41839417e447e Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 14 Jul 2024 01:27:55 +0800 Subject: [PATCH 121/227] bepasty: fix overriding hash --- pkgs/tools/misc/bepasty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 907fcd6b3541..8e9b0ce6e094 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -13,7 +13,7 @@ let version = "4.7.0.0"; src = oldAttrs.src.override { inherit version; - sha256 = "sha256-4B+0gMqqfHlj3LMyikcA5jG+9gcNsOi2hYFtIg5oX2w="; + hash = "sha256-4B+0gMqqfHlj3LMyikcA5jG+9gcNsOi2hYFtIg5oX2w="; }; }); }; From f0beda55bb84458860dd0a96e3c957ac9be770e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 17:29:13 +0000 Subject: [PATCH 122/227] python312Packages.unearth: 0.16.0 -> 0.16.1 --- pkgs/development/python-modules/unearth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index 0fd4ba8cdc7b..957db7180d59 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.16.0"; + version = "0.16.1"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fbqR8SCat+n4pn8HoVveSa4tobikb9rYsCIroYuRAhI="; + hash = "sha256-mIpDQY+gt4rrYooV9qOwIVLBeH9j/m0lTH9OLM+NsKc="; }; build-system = [ pdm-backend ]; From 6aef61c2b003670405340962cb6154d70af13759 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 18:17:05 +0000 Subject: [PATCH 123/227] streamlink: 6.8.2 -> 6.8.3 --- pkgs/applications/video/streamlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 18edace4843f..209023bb14ce 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -7,12 +7,12 @@ python3Packages.buildPythonApplication rec { pname = "streamlink"; - version = "6.8.2"; + version = "6.8.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-nBtm8CRyeicPrwAm1xp+Y6vdiPEClXyhUsDSYgcXvJg="; + hash = "sha256-4/UaVnwIcDCS+R0El6P8Ku/jJ+/Ncl0D5m89zRHtm2g="; }; patches = [ From 3a4896b2319b0363021fcf55740f1b3c135fcd01 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 18:17:19 +0000 Subject: [PATCH 124/227] sbt-extras: 2024-05-06 -> 2024-07-10 --- .../development/tools/build-managers/sbt-extras/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index f3cbd6091ca1..7c44671a3b44 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "sbt-extras"; - rev = "7208170046457c70a67e4b86c833a074be9de958"; - version = "2024-05-06"; + rev = "ed4bce34420650fbc06cc161f1960b539f19289d"; + version = "2024-07-10"; src = fetchFromGitHub { owner = "paulp"; repo = "sbt-extras"; inherit rev; - sha256 = "Ci4V1GHKzGux5qU33Z6+NC+YApqlQfgjekGb+WHtLaQ="; + sha256 = "lsYFupTSZQe2id0wuy+E7lszG4IT3R6fuo+Yql91MkM="; }; dontBuild = true; From abed3337f7afa0999ddcb197376f416e468e78cf Mon Sep 17 00:00:00 2001 From: Redyf Date: Sat, 13 Jul 2024 13:32:44 -0300 Subject: [PATCH 125/227] ollama: 0.1.48 -> 0.2.1 --- pkgs/by-name/ol/ollama/package.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index e726239a2386..31edc28dc8fa 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -32,13 +32,13 @@ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.1.48"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-rMStHUFC88TXIH/1c9bCOU0csnEZHOhWKBlLKarmCmE="; + hash = "sha256-hzB/sS+6vsMuJfCPZucTQerytnq+TBzTtiWwwd+H+bE="; fetchSubmodules = true; }; @@ -48,13 +48,15 @@ let # `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream" # each update, these patches should be synchronized with the contents of `ollama/llm/patches/` llamacppPatches = [ - (preparePatch "01-load-progress.diff" "sha256-K4GryCH/1cl01cyxaMLX3m4mTE79UoGwLMMBUgov+ew=") + (preparePatch "01-load-progress.diff" "sha256-UTmnBS5hQjIL3eXDZc8RBDNJunLlkqJWH20LpXNiGRQ=") (preparePatch "02-clip-log.diff" "sha256-rMWbl3QgrPlhisTeHwD7EnGRJyOhLB4UeS7rqa0tdXM=") - (preparePatch "03-load_exception.diff" "sha256-0XfMtMyg17oihqSFDBakBtAF0JwhsR188D+cOodgvDk=") - (preparePatch "04-metal.diff" "sha256-Ne8J9R8NndUosSK0qoMvFfKNwqV5xhhce1nSoYrZo7Y=") - (preparePatch "05-default-pretokenizer.diff" "sha256-JnCmFzAkmuI1AqATG3jbX7nGIam4hdDKqqbG5oh7h70=") - (preparePatch "06-qwen2.diff" "sha256-nMtoAQUsjYuJv45uTlz8r/K1oF5NUsc75SnhgfSkE30=") - (preparePatch "07-gemma.diff" "sha256-dKJrRvg/XC6xtwxLHZ7lFkLNMwT8Ugmd5xRPuKQDXvU=") + (preparePatch "03-load_exception.diff" "sha256-NJkT/k8Mf8HcEMb0XkaLmyUNKV3T+384JRPnmwDI/sk=") + (preparePatch "04-metal.diff" "sha256-bPBCfoT3EjZPjWKfCzh0pnCUbM/fGTj37yOaQr+QxQ4=") + (preparePatch "05-default-pretokenizer.diff" "sha256-50+mzQBQZmYEhYvARHw/dliH0M/gDOYm2uy/yJupDF4=") + (preparePatch "06-qwen2.diff" "sha256-FdDqEIblPy47z3yavKUnaV93Yk+3oboEzj4vHq+R66M=") + (preparePatch "07-embeddings.diff" "sha256-lqg2SI0OapD9LCoAG6MJW6HIHXEmCTv7P75rE9yq/Mo=") + (preparePatch "08-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=") + (preparePatch "09-pooling.diff" "sha256-7meKWbr06lbVrtxau0AU9BwJ88Z9svwtDXhmHI+hYBk=") ]; preparePatch = patch: hash: fetchpatch { From f5443063a2a836637f75d1cedc45354ba705db86 Mon Sep 17 00:00:00 2001 From: Luis David Licea Torres Date: Sun, 12 May 2024 15:48:12 -0500 Subject: [PATCH 126/227] nixos/localsend: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/localsend.nix | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 nixos/modules/programs/localsend.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 25c48fa93a01..9194698d6ace 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -226,6 +226,7 @@ ./programs/less.nix ./programs/liboping.nix ./programs/light.nix + ./programs/localsend.nix ./programs/mdevctl.nix ./programs/mepo.nix ./programs/mininet.nix diff --git a/nixos/modules/programs/localsend.nix b/nixos/modules/programs/localsend.nix new file mode 100644 index 000000000000..5ad61a429479 --- /dev/null +++ b/nixos/modules/programs/localsend.nix @@ -0,0 +1,24 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.localsend; + firewallPort = 53317; +in +{ + options.programs.localsend = { + enable = lib.mkEnableOption "localsend, an open source cross-platform alternative to AirDrop"; + + openFirewall = lib.mkEnableOption "opening the firewall port ${toString firewallPort} for receiving files" // { + default = true; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.localsend ]; + networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ firewallPort ]; + }; +} From 1cbd2f94cb8493fd4ee0d70639425ff4068a1be0 Mon Sep 17 00:00:00 2001 From: Luis David Licea Torres Date: Sun, 12 May 2024 17:07:22 -0500 Subject: [PATCH 127/227] nixos/tests/localsend: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/localsend.nix | 21 +++++++++++++++++++ .../networking/localsend/default.nix | 6 +++++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/localsend.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b9a6311eaf35..eab4c40c0b74 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -516,6 +516,7 @@ in { listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix {}; litestream = handleTest ./litestream.nix {}; lldap = handleTest ./lldap.nix {}; + localsend = handleTest ./localsend.nix {}; locate = handleTest ./locate.nix {}; login = handleTest ./login.nix {}; logrotate = handleTest ./logrotate.nix {}; diff --git a/nixos/tests/localsend.nix b/nixos/tests/localsend.nix new file mode 100644 index 000000000000..8c0a6ac68190 --- /dev/null +++ b/nixos/tests/localsend.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ( + { ... }: + { + name = "localsend"; + + nodes.machine = + { ... }: + { + imports = [ ./common/x11.nix ]; + programs.localsend.enable = true; + }; + + testScript = '' + machine.wait_for_x() + machine.succeed("localsend_app >&2 &") + machine.wait_for_open_port(53317) + machine.wait_for_window("LocalSend", 10) + machine.succeed("netstat --listening --program --tcp | grep -P 'tcp.*53317.*localsend'") + ''; + } +) diff --git a/pkgs/applications/networking/localsend/default.nix b/pkgs/applications/networking/localsend/default.nix index bd681b74eebb..be540d58da81 100644 --- a/pkgs/applications/networking/localsend/default.nix +++ b/pkgs/applications/networking/localsend/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , flutter313 , makeDesktopItem +, nixosTests , pkg-config , libayatana-appindicator , undmg @@ -58,7 +59,10 @@ let categories = [ "Network" ]; }; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests.localsend = nixosTests.localsend; + }; meta = metaCommon // { mainProgram = "localsend_app"; From 3e8b6a47fb6b0a4a69b1d65130eebcfdcbb6162e Mon Sep 17 00:00:00 2001 From: Gavin John <> Date: Thu, 11 Jul 2024 16:35:20 -0400 Subject: [PATCH 128/227] nixos/doc/rl-2411: Document programs.localsend --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index dd8bf4b4695d..c3d48c1c2ef3 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -30,6 +30,8 @@ - [Envision](https://gitlab.com/gabmus/envision), a UI for building, configuring and running Monado, the open source OpenXR runtime. Available as [programs.envision](#opt-programs.envision.enable). +- [Localsend](https://localsend.org/), an open source cross-platform alternative to AirDrop. Available as [programs.localsend](#opt-programs.localsend.enable). + - [realm](https://github.com/zhboner/realm), a simple, high performance relay server written in rust. Available as [services.realm.enable](#opt-services.realm.enable). - [Playerctld](https://github.com/altdesktop/playerctl), a daemon to track media player activity. Available as [services.playerctld](option.html#opt-services.playerctld). From e69e59cbced22afdeebcd884ba41b1d2bce61e13 Mon Sep 17 00:00:00 2001 From: Gavin John <> Date: Thu, 11 Jul 2024 16:29:40 -0400 Subject: [PATCH 129/227] {nixos}localsend: Add pandapip1 as maintainer --- nixos/modules/programs/localsend.nix | 2 ++ pkgs/applications/networking/localsend/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/localsend.nix b/nixos/modules/programs/localsend.nix index 5ad61a429479..47f54246a40f 100644 --- a/nixos/modules/programs/localsend.nix +++ b/nixos/modules/programs/localsend.nix @@ -21,4 +21,6 @@ in environment.systemPackages = [ pkgs.localsend ]; networking.firewall.allowedTCPPorts = lib.optionals cfg.openFirewall [ firewallPort ]; }; + + meta.maintainers = with lib.maintainers; [ pandapip1 ]; } diff --git a/pkgs/applications/networking/localsend/default.nix b/pkgs/applications/networking/localsend/default.nix index be540d58da81..0a36cfa0c258 100644 --- a/pkgs/applications/networking/localsend/default.nix +++ b/pkgs/applications/networking/localsend/default.nix @@ -98,7 +98,7 @@ let homepage = "https://localsend.org/"; license = licenses.mit; mainProgram = "localsend"; - maintainers = with maintainers; [ sikmir linsui ]; + maintainers = with maintainers; [ sikmir linsui pandapip1 ]; }; in if stdenv.isDarwin From 2da41055fea0837bfe051fa90e71e4ec96f5caf9 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Sat, 13 Jul 2024 22:07:17 +0300 Subject: [PATCH 130/227] koboldcpp: remove march, mtune and mtune After going over a detailed conversation with @SomeoneSerge about `cc-warpper`, `march` `mtune` and `mcpu`, I've come to the conclusion that it is unnecessary to have those flags as ad hoc options. Instead, it's best for users to "merge" their own `env` on top of the current one Refs: https://github.com/NixOS/nixpkgs/pull/325540#discussion_r1674917673 Refs: https://github.com/NixOS/nixpkgs/pull/325540#discussion_r1676059901 Refs: https://github.com/NixOS/nixpkgs/pull/325540#discussion_r1676556732 Refs: https://github.com/NixOS/nixpkgs/pull/325540#discussion_r1676560445 Co-authored-by: SomeoneSerge --- pkgs/by-name/ko/koboldcpp/package.nix | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index decf34d27694..23b0f21bdac8 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -19,6 +19,9 @@ openblas, cublasSupport ? config.cudaSupport, + # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ + # For example if you're on an GTX 1080 that means you're using "Pascal" and you need to pass "sm_60" + arches ? cudaPackages.cudaFlags.arches or [ ], clblastSupport ? stdenv.isLinux, clblast, @@ -28,19 +31,6 @@ vulkan-loader, metalSupport ? stdenv.isDarwin && stdenv.isAarch64, - - # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ - # For example if you're on an GTX 1080 that means you're using "Pascal" and you need to pass "sm_60" - arches ? cudaPackages.cudaFlags.arches or [ ], - - # You can find list of x86_64 options here: https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html - # For ARM here: https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html - # If you set "march" to "native", specify "mtune" as well; otherwise, it will be set to "generic". (credit to: https://lemire.me/blog/2018/07/25/it-is-more-complicated-than-i-thought-mtune-march-in-gcc/) - march ? "", - # Apple Silicon Chips (M1, M2, M3 and so on DO NOT use mtune) - # For example, if you have an AMD Ryzen CPU, you will set "mtune" to "znver2" - mtune ? "", - mcpu ? "", }: let @@ -116,12 +106,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { env.NIX_LDFLAGS = lib.concatStringsSep " " (finalAttrs.darwinLdFlags ++ finalAttrs.metalLdFlags); - env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [ - (lib.optionalString (march != "") "-march=${march}") - (lib.optionalString (mtune != "") "-mtune=${mtune}") - (lib.optionalString (mcpu != "") "-mcpu=${mcpu}") - ]; - makeFlags = [ (makeBool "LLAMA_OPENBLAS" openblasSupport) (makeBool "LLAMA_CUBLAS" cublasSupport) From ce0088824b211e1e83421c2ff44f912fa7e14a3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 19:41:28 +0000 Subject: [PATCH 131/227] git-credential-manager: 2.5.0 -> 2.5.1 --- .../git-credential-manager/default.nix | 4 +- .../git-credential-manager/deps.nix | 206 +++++++++--------- 2 files changed, 105 insertions(+), 105 deletions(-) diff --git a/pkgs/applications/version-management/git-credential-manager/default.nix b/pkgs/applications/version-management/git-credential-manager/default.nix index e7594eee2f21..592074224f01 100644 --- a/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/pkgs/applications/version-management/git-credential-manager/default.nix @@ -20,13 +20,13 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-eRSTF9Ldj00cQbUzHzdMihte0+W4nZ9T/qg/L/yes/w="; + hash = "sha256-fD/HToyreYS8PG85CHHLPQOUKV1cDYGukxyVOr+7cKk="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; diff --git a/pkgs/applications/version-management/git-credential-manager/deps.nix b/pkgs/applications/version-management/git-credential-manager/deps.nix index 431c2326cf75..b22825173ddb 100644 --- a/pkgs/applications/version-management/git-credential-manager/deps.nix +++ b/pkgs/applications/version-management/git-credential-manager/deps.nix @@ -2,107 +2,107 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Avalonia"; version = "11.0.10"; sha256 = "0mvsc6fg8qbvdqkdkia61jkprb3yhvvgvq6s8hgd09v6lzjsbq8n"; }) - (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; sha256 = "1az4s1g22ipak9a3xfh55z2h3rm6lpqh7svbpw6ag4ysrgsjjsjd"; }) - (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; sha256 = "05mm7f0jssih3gbzqfgjnfq5cnqa85ihsg0z1897ciihv8qd3waq"; }) - (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.10"; sha256 = "0s2wn7sf0dsa861gh6ghfgf881p6bvyahfpl583rcnsi6ci2hjhv"; }) - (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.10"; sha256 = "13g5sac0ba8dy1pn21j2g4fin57x1vs1pl07gzgv53bl8nz1xznj"; }) - (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.10"; sha256 = "0s27ajknbrymnchv66rybrs3snzh825iy0nqby72yk726znp52vw"; }) - (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.10"; sha256 = "1c7hv9ypvn1ncg6cmzn2cs0nkax0y0pnbx1h1asjzn8rnbwcvnca"; }) - (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.10"; sha256 = "18f9vpsxfaak4qpqvcz9rdygx3k8dhzb64iqlhva88nhahwlwlxr"; }) - (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.10"; sha256 = "06pihfddbvdw1s3rs6v183ljch1bsxym80fclfqrh3npa3ag9n1z"; }) - (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.10"; sha256 = "0p75z6k4ivzhdn9y9gwqsqmja7x03d4mxaicbccjbnz06irybnxa"; }) - (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.10"; sha256 = "0w45j4ypqnwmsh3byzaghn43ycfkfnn8415i5lw2q5ip7vp3a9fm"; }) - (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.10"; sha256 = "1jqkwhpvnnbbjwr6992ahlkwgwj7l0k1141317qy1wprirn4mpv1"; }) - (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.10"; sha256 = "0vssdz6rng0k85qsv2xn6x0dldaalnnx718n7plwxg3j1pddr1z7"; }) - (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.10"; sha256 = "1gh3fad9ya56qwzhk7590bdzkky76yx1jjj60rqr013b97qbd3gs"; }) - (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.10"; sha256 = "1x09mp8q3mrj5fijqk7qp5qivrysqnbc2bkj2ssvawb9rjy6497w"; }) - (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; sha256 = "1rqcmdyzxz9kc0k8594hbpksjc23mkakmjybi4b8702qycxx0lrf"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; sha256 = "0i9gaiyjgmcpnfn1fixbxq8shqlh4ahng7j4dxlf38zlln1f6h80"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; sha256 = "1b5ng37bwk75cifw7p1hzn8z6sswi8h7h510qgwlbvgmlrs5r0ga"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; sha256 = "0dcmclnyryb82wzsky1dn0gbjsvx84mfx46v984f5fmg4v238lpm"; }) - (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; sha256 = "1hyvmz7rfbrxbcpnwyvb64gdk1hifcpz3rln58yyb7g1pnbpnw2s"; }) - (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; sha256 = "0p9c3m0zk59x9dcqw077hzd2yk60myisbacvm36mnwpcjwzjkp2m"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; sha256 = "0bbl0jpqywqmzz2gagld1p2gvdfldjfjmm25hil9wj2nq1zc4di8"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; sha256 = "12n7rvr39bzkf2maw7zplw8rwpxpxss4ich3bb2pw770rx4nyvyw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; sha256 = "1kmry65csvfn72zzc16vj1nfbfwam28wcmlrk3m5rzb8ydbzgylb"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; sha256 = "0w0yx0lpg54iw5jazqk46h48gx43ij32gwac8iywdj6kxfxm03vw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; sha256 = "0hjgxcsj5zy27lqk0986m59n5dbplx2vjjla2lsvg4bwg8qa7bpk"; }) - (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.60.3"; sha256 = "065iifhffri8wc5i4nfbnkzjrvflav9v5bfkwvmax8f35rks1mnn"; }) - (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.60.3"; sha256 = "19l92ynvrhb76r0zpj8qhyymxgz45knyhdqr6za4s7rzbssibi08"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; sha256 = "0i6kdvqdbzynzrr4g5idx4ph4ckggsbsy0869lwa10fhmyxrh73g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) - (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) - (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) - (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) - (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) - (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) - (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) - (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) - (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) - (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) - (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) - (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) - (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) - (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) - (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) - (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) - (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) - (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) - (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) - (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) - (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) - (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; sha256 = "0f6wbk9dnjiffb9ycjachy1m9zw3pai2m503nym07qgb0izxm792"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; sha256 = "0p0z6nxkkmabv46wmxhs3yr0xy24i6jzn54gk0hsm3h1a8vi3m21"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; sha256 = "05xwa1izzvqz4gznvx2x31qnpvl1lc65hm5p9sscjg5afisya0ss"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; sha256 = "1k2hfasgbv01navc55zzwdwzfxcw4186jni35c00zykgwhbwb250"; }) - (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; sha256 = "119mlbh5hmlis7vb111s95dwg5p1anm2hmv7cm6fz7gy18473d7v"; }) - (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) - (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; sha256 = "1iy5hwwgvx911g3yq65p4zsgpy08w4qz9j3h0igcf7yci44vw8yd"; }) - (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) - (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; }) - (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) - (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) - (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) - (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) - (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) - (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) - (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) - (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) - (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) - (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) - (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) - (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) - (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) - (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) - (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) - (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) - (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) - (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) - (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) + (fetchNuGet { pname = "Avalonia"; version = "11.0.11"; hash = "sha256-vyX1hwqHQBIckXl/IYctR7BtYzM/62iZ6Y3Hsrlgww8="; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2023020321"; hash = "sha256-TWop9cvak6cMv2vrA/GlpuYBxS8Fuj5UmupGIV7Q5Ks="; }) + (fetchNuGet { pname = "Avalonia.BuildServices"; version = "0.0.29"; hash = "sha256-WPHRMNowRnYSCh88DWNBCltWsLPyOfzXGzBqLYE7tRY="; }) + (fetchNuGet { pname = "Avalonia.Controls.ColorPicker"; version = "11.0.11"; hash = "sha256-eP8mwZx8kBOOXqy+rBzdhkNiI3g5u5CyYFXoNHWcMFg="; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "11.0.11"; hash = "sha256-PPs+D+dJ0OTay8gzDcucjWjfQWiizTHAluquzsFicZ4="; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "11.0.11"; hash = "sha256-62JpECNZV60qiS1KCTm9ojnUXOx5yEP4Mjo3/OZszMQ="; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "11.0.11"; hash = "sha256-OHh3hyB7EWZE2nPK7U6z+4MEbYPAdbW4G74poWUSDcc="; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "11.0.11"; hash = "sha256-fVM+D16obEbRwRu+QF617jpQQWiHpA/Lzx2m0qK7BZ4="; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "11.0.11"; hash = "sha256-8Co6wR74u5jdAeN0Fx7LJf8vOUt84auomZz3TFSdlWw="; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "11.0.11"; hash = "sha256-A4X9fY26YtydAn4TjJ7bYdBi7R+Ncghr4F2DTl/Riaw="; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "11.0.11"; hash = "sha256-s5fmFi207DZVRejw5PlvnPsdo9voet/l2VJtgwLDJYs="; }) + (fetchNuGet { pname = "Avalonia.Themes.Fluent"; version = "11.0.11"; hash = "sha256-cvLzWHt2P2dmJ690mv0wejk2VCa0n1xX4sYCim+7Gxo="; }) + (fetchNuGet { pname = "Avalonia.Themes.Simple"; version = "11.0.11"; hash = "sha256-y1BlGzCP03Waq9bVzKGVFr2L/1/rdpBeyHuHbB0kTbk="; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "11.0.11"; hash = "sha256-NvAN79jLjoqZrp5yWkJoihjO83r49j8N57PAWDY/kwE="; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "11.0.11"; hash = "sha256-1hsU8zBxQGUp/wAx3qSQfxte+fGsSmH9TN3OHW0rNOk="; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "7.3.0"; hash = "sha256-LlPQO/NYgIMWicvLOtWsQzCp512QpIImYDP9/n2rDOc="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "7.3.0"; hash = "sha256-AEHjgqX0o+Fob0SeZ6EikGKoEe6rRxess5fVJ31UL0U="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "7.3.0"; hash = "sha256-6oFcdKb17UX5wyAUeCCKXGvzkf0w3MNdZOVMvs54tqw="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "7.3.0"; hash = "sha256-9VI0xCavuuIIStuQ7ipBfWu5HrAt+Kk/F2j57C1llTU="; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "7.3.0"; hash = "sha256-WnB7l73hneU9Kpbm8S9zEYbZHjFre24vWz0vl8+v28M="; }) + (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.11.0"; hash = "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.0.0"; hash = "sha256-KDbCfsBWSJ5ohEXUKp1s1LX9xA2NPvXE/xVzj68EdC0="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.8.0"; hash = "sha256-3G9vSc/gHH7FWgOySLTut1+eEaf3H66qcPOvNPLOx4o="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.8.0"; hash = "sha256-i/r3V/No/VzqmJlWxpGoirvlbJDbBPa/ONZtzYrxuc4="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.8.0"; hash = "sha256-fA9Qu+vTyMZ9REzxJ4aMg/SHCDRk4q9k4ZGUdynoHnA="; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.8.0"; hash = "sha256-866jMHp8kbc1FYpKuUWnd7ViU6kGJTAxPcL/IjXrT0I="; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; hash = "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="; }) + (fetchNuGet { pname = "Microsoft.Identity.Client"; version = "4.61.3"; hash = "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA="; }) + (fetchNuGet { pname = "Microsoft.Identity.Client.Extensions.Msal"; version = "4.61.3"; hash = "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE="; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.35.0"; hash = "sha256-bxyYu6/QgaA4TQYBr5d+bzICL+ktlkdy/tb/1fBu00Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; hash = "sha256-gYQQO7zsqG+OtN4ywYQyfsiggS2zmxw4+cPXlK+FB5Q="; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.7"; hash = "sha256-Ip3afwTr4QOqtwOUKqK6g/9Ug4dMSebTci5K29Jc3Dg="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.7"; hash = "sha256-QdQRN1IBjqohmI8U+6WJRPgOsh8a9soN2UvVObs1H1w="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.7"; hash = "sha256-WgPldXSqPMm0TrdUWAyjge5rcRhd9G3/Ix/v/2NQvBc="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.7"; hash = "sha256-oIjFF+Rv+g8AKyNaaVAgnHX3eeP/l8K2sgHs9bRyUMw="; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.7"; hash = "sha256-+7RxCAr+ne9MZWdXKKpV4ZbHW0k6hLD20ZFWWOCiNYU="; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; hash = "sha256-GdwSIjLMM0uVfE56VUSLVNgpW0B//oCeSFj8/hSlbM8="; }) + (fetchNuGet { pname = "System.CommandLine"; version = "2.0.0-beta4.22272.1"; hash = "sha256-zSO+CYnMH8deBHDI9DHhCPj79Ce3GOzHCyH1/TiHxcc="; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; hash = "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; hash = "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; hash = "sha256-xfjF4UqTMJpf8KsBWUyJlJkzPTOO/H5MW023yTYNQSA="; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; hash = "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E="; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; hash = "sha256-Wo+MiqhcP9dQ6NuFGrQTw6hpbJORFwp+TBNTq2yhGp8="; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; hash = "sha256-UvyoDV8O0oY3HPG1GbA56YVdvwTGEfjYR5gW1O7IK4U="; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; hash = "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc="; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; hash = "sha256-PIhkv59IXjyiuefdhKxS9hQfEwO9YWRuNudpo53HQfw="; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; hash = "sha256-4gk2vXDjKFaBh82gTkwg3c/5GRjiH+bvM5elfDSbKTU="; }) ] From c84b739d75879132106d342c68496a7e2d9b8e82 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 20:22:47 +0000 Subject: [PATCH 132/227] mousam: 1.3.1 -> 1.3.2 --- pkgs/by-name/mo/mousam/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mousam/package.nix b/pkgs/by-name/mo/mousam/package.nix index bb57866d46cc..4cf91beffe49 100644 --- a/pkgs/by-name/mo/mousam/package.nix +++ b/pkgs/by-name/mo/mousam/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { pname = "mousam"; - version = "1.3.1"; + version = "1.3.2"; # built with meson, not a python format pyproject = false; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { owner = "amit9838"; repo = "mousam"; rev = "refs/tags/v${version}"; - hash = "sha256-QFEn7o3DRJyRLbEfb86AsS/ifYqzs3b5n2fZa/9Mm1A="; + hash = "sha256-1gFuMh5Poypmgyk2bpi9v6iK7WkO5KHLs+WsoDpJPeg="; }; nativeBuildInputs = [ From 06b93088f4b50bfb4e8746027f4566bf2509a976 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Sat, 13 Jul 2024 22:35:20 +0200 Subject: [PATCH 133/227] google-cloud-sdk: fish completions --- pkgs/tools/admin/google-cloud-sdk/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 8a9a26697773..7caa20a82ddb 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -7,7 +7,7 @@ # 3) used by `google-cloud-sdk` only on GCE guests # -{ stdenv, lib, fetchurl, makeWrapper, python, openssl, jq, callPackage, with-gce ? false }: +{ stdenv, lib, fetchurl, makeWrapper, python, openssl, jq, callPackage, installShellFiles, with-gce ? false }: let pythonEnv = python.withPackages (p: with p; [ @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { buildInputs = [ python ]; - nativeBuildInputs = [ jq makeWrapper ]; + nativeBuildInputs = [ jq makeWrapper installShellFiles ]; patches = [ # For kubectl configs, don't store the absolute path of the `gcloud` binary as it can be garbage-collected @@ -90,6 +90,12 @@ in stdenv.mkDerivation rec { # zsh doesn't load completions from $FPATH without #compdef as the first line sed -i '1 i #compdef gcloud' $out/share/zsh/site-functions/_gcloud + # setup fish completion + installShellCompletion --cmd gcloud \ + --fish <(echo "complete -c gcloud -f -a '(__fish_argcomplete_complete gcloud)'") + installShellCompletion --cmd gsutil \ + --fish <(echo "complete -c gsutil -f -a '(__fish_argcomplete_complete gsutil)'") + # This directory contains compiled mac binaries. We used crcmod from # nixpkgs instead. rm -r $out/google-cloud-sdk/platform/gsutil/third_party/crcmod \ From 8d2ecf9e25605ff1ac0c5d7ee66be7c6cd443040 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Sat, 13 Jul 2024 23:46:17 +0300 Subject: [PATCH 134/227] zmusic: 1.1.12 -> 1.1.13 --- pkgs/development/libraries/zmusic/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/zmusic/default.nix b/pkgs/development/libraries/zmusic/default.nix index e950c6ed3d7f..1b504515f9e6 100644 --- a/pkgs/development/libraries/zmusic/default.nix +++ b/pkgs/development/libraries/zmusic/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "zmusic"; - version = "1.1.12"; + version = "1.1.13"; src = fetchFromGitHub { owner = "ZDoom"; repo = "ZMusic"; rev = version; - hash = "sha256-waxgn4Dg8One2Hv7J2efMoYo5mmaMSMiPQSNq57kbvE="; + hash = "sha256-rvvMS5KciHEvoY4hSfgAEyWJiDMqBto4o09oIpQIGTQ="; }; outputs = [ "out" "dev" ]; @@ -29,15 +29,15 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "system-fluidsynth.patch"; - url = "https://git.alpinelinux.org/aports/plain/testing/zmusic/system-fluidsynth.patch?id=59bac94da374cb01bc2a0e49d9e9287812fa1ac0"; + url = "https://git.alpinelinux.org/aports/plain/community/zmusic/system-fluidsynth.patch?id=ca353107ef4f2e5c55c3cc824b0840e2838fb894"; hash = "sha256-xKaqiNk1Kt9yNLB22IVmSEtGeOtxrCi7YtFCmhNr0MI="; }) ]; postPatch = '' substituteInPlace source/mididevices/music_fluidsynth_mididevice.cpp \ - --replace "/usr/share/sounds/sf2" "${soundfont-fluid}/share/soundfonts" \ - --replace "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2" + --replace-fail "/usr/share/sounds/sf2" "${soundfont-fluid}/share/soundfonts" \ + --replace-fail "FluidR3_GM.sf2" "FluidR3_GM2-2.sf2" ''; nativeBuildInputs = [ @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { lgpl21Plus lgpl3Plus ]; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ azahi lassulus ]; }; } From 691c17abc8832305961e6bc39a0fe8c26f162114 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 22:46:57 +0200 Subject: [PATCH 135/227] nuclei-templates: 9.9.0 -> 9.9.1 Diff: https://github.com/projectdiscovery/nuclei-templates/compare/refs/tags/v9.9.0...v9.9.1 Changelog: https://github.com/projectdiscovery/nuclei-templates/releases/tag/v9.9.1 --- pkgs/by-name/nu/nuclei-templates/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix index 969a807bc5d2..0e6fe513d544 100644 --- a/pkgs/by-name/nu/nuclei-templates/package.nix +++ b/pkgs/by-name/nu/nuclei-templates/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "nuclei-templates"; - version = "9.9.0"; + version = "9.9.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei-templates"; rev = "refs/tags/v${version}"; - hash = "sha256-eXC496D45JAZrwnxDB7JlFTLd30MkpHrxkP1tsSc6Jk="; + hash = "sha256-zD+mW7l7Wv6re8X6YztEnfwBYbMSLWZgbVpOpjZWNXM="; }; installPhase = '' From cdad47b9eca34f7f5acbd83d5f86ecad26d25fc3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 13 Jul 2024 22:53:09 +0200 Subject: [PATCH 136/227] python313FreeThreading: init Expose a free-threading/GIL-free top-level attribute for Python 3.13. https://py-free-threading.github.io --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bd6f11e7a8a..f86afc78d3b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17254,6 +17254,12 @@ with pkgs; x11Support = true; }; + # https://py-free-threading.github.io + python313FreeThreading = python313.override { + pythonAttr = "python313FreeThreading"; + enableGIL = false; + }; + pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; From 0f4e1545bcfe70281c2675d02f96a4649fdb6960 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 22:58:53 +0200 Subject: [PATCH 137/227] python312Packages.boto3-stubs: 1.34.140 -> 1.34.144 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 2a2c66f1b73b..fd5431bdd931 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.140"; + version = "1.34.144"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-P9z8kOsm6l25evHKn8nSHFDMiA2e4A56uRQKWZajYZ0="; + hash = "sha256-wZ0MQ4bsFg5sBlZ7lgtvfHZazE7UDwHzccjnoLUUUgs="; }; build-system = [ setuptools ]; From acbd2ad67d06aa97d75e5ec0c34efc568a01c337 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 22:58:57 +0200 Subject: [PATCH 138/227] python312Packages.botocore-stubs: 1.34.140 -> 1.34.144 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 97cbd9642893..21a724a5f3a8 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.140"; + version = "1.34.144"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-+JQtUBHe7h+7ILdVoUzi8O88qZzlcS5Mi3VoUAjb/mM="; + hash = "sha256-PrMltLGG6NjknUhc/jg/R4q4wH4PRpDl7pvLb6zuxK8="; }; nativeBuildInputs = [ poetry-core ]; From 66651a7bb131afd9a10c36723f4da29963d89bb0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:12:22 +0200 Subject: [PATCH 139/227] aws-sam-cli: 1.119.0 -> 1.120.0 Changelog: https://github.com/aws/aws-sam-cli/releases/tag/v1.120.0 --- pkgs/development/tools/aws-sam-cli/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 9ad378db45e8..2c667b8b5d6d 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.119.0"; + version = "1.120.0"; pyproject = true; disabled = python3.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "aws"; repo = "aws-sam-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-0H1C2z01nwJtlSNjTCi2bH6ExBnmn8xNXD/jzYFxvCs="; + hash = "sha256-XFVh7e9ooIBhWRkVovPdrSuyosBMQ84PDRjV2o0x9ns="; }; build-system = with python3.pkgs; [ @@ -118,6 +118,9 @@ python3.pkgs.buildPythonApplication rec { "tests/regression" "tests/smoke" "tests/unit/lib/telemetry" + "tests/unit/hook_packages/terraform/hooks/prepare/" + "tests/unit/lib/observability/cw_logs/" + "tests/unit/lib/build_module/" # Disable flaky tests "tests/unit/lib/samconfig/test_samconfig.py" ]; From 689310ec502db3f5e96a15e912c93656ba1a0d8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:32:15 +0200 Subject: [PATCH 140/227] python312Packages.env-canada: 0.7.1 -> 0.7.2 Diff: https://github.com/michaeldavie/env_canada/compare/refs/tags/v0.7.1...v0.7.2 Changelog: https://github.com/michaeldavie/env_canada/blob/v0.7.2/CHANGELOG.md --- pkgs/development/python-modules/env-canada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix index 80c7f22cb33a..d2424a76c004 100644 --- a/pkgs/development/python-modules/env-canada/default.nix +++ b/pkgs/development/python-modules/env-canada/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "env-canada"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "michaeldavie"; repo = "env_canada"; rev = "refs/tags/v${version}"; - hash = "sha256-GWNGLhnXr8NOrR5stOjHbk9X+BObs1sbG6lWn2apPQI="; + hash = "sha256-3SVpzWii9/ViJ7mbrqzKmN5FkOOYTeYdhJll6q/IseU="; }; build-system = [ setuptools ]; From d474282faf0a0a0ade1f2e0b943b2d42440caae0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:33:10 +0200 Subject: [PATCH 141/227] python312Packages.aioraven: 0.6.0 -> 0.7.0 Diff: https://github.com/cottsay/aioraven/compare/refs/tags/0.6.0...0.7.0 Changelog: https://github.com/cottsay/aioraven/blob/0.7.0/CHANGELOG.md --- pkgs/development/python-modules/aioraven/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioraven/default.nix b/pkgs/development/python-modules/aioraven/default.nix index e4649a8d8ead..1d48f37e930c 100644 --- a/pkgs/development/python-modules/aioraven/default.nix +++ b/pkgs/development/python-modules/aioraven/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "aioraven"; - version = "0.6.0"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "cottsay"; repo = "aioraven"; rev = "refs/tags/${version}"; - hash = "sha256-RU2DRDjxl0EVmnNLADawEB/x6Zc3/IWH015xig5AIJY="; + hash = "sha256-ux2jeXkh8YsJ6mItXOx40pp0Tc+aJXMV7ZqyZg+iy2c="; }; build-system = [ setuptools ]; From e7d14c7f0dff5b8b94bb43a053e25a4b6bb9f0cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:34:16 +0200 Subject: [PATCH 142/227] python312Packages.aiolifx: 1.0.4 -> 1.0.5 Changelog: https://github.com/frawau/aiolifx/releases/tag/1.0.5 --- pkgs/development/python-modules/aiolifx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index c9c518a57d3b..34a10cb96cde 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "1.0.4"; + version = "1.0.5"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8EjmzidcxIOoH+88pEUuSJmbpU34B8dgz9csvlQf8Ks="; + hash = "sha256-95cCfmaYe8RgmkzqPlV4cufNS6Eb01304S2sSliRpQ0="; }; build-system = [ setuptools ]; From a8b78a50e9fb1f16c6c34d1bbe354d42f1b6fb29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:48:51 +0200 Subject: [PATCH 143/227] python312Packages.archinfo: 9.2.109 -> 9.2.110 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.109...v9.2.110 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 222a2a4567dd..e18244d15049 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.109"; + version = "9.2.110"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-hyUzJO8e2XMkz91wBt9PP0dx1uVDlX2KDBkT5v/M1YQ="; + hash = "sha256-+v1EbHW619wI+pUucQuhn6/8BmWZ2LBtsxN6CMxDZI8="; }; build-system = [ setuptools ]; From 9adb3d769a913dbadd879abbda77f73e6e541cfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:49:00 +0200 Subject: [PATCH 144/227] python312Packages.ailment: 9.2.109 -> 9.2.110 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.109...v9.2.110 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 309d04eef8a6..a957515fdc3a 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.109"; + version = "9.2.110"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-1/17bSpvhripv0wYEQnhW2Z52fFThPjl8mNPTu2DP5s="; + hash = "sha256-hW76M2Vzpyx2p0VHNKRKxH2Ec5aF0WJ5y7zkbteS9YE="; }; build-system = [ setuptools ]; From 98e9d9dfd6f84445923315500f7d867a5bb20533 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:50:47 +0200 Subject: [PATCH 145/227] python312Packages.pyvex: 9.2.109 -> 9.2.110 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 790c8fbabc2c..0e9eccd0cbb5 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.109"; + version = "9.2.110"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-GdKU+SbZbc81WSnqsxdiEuGUoBjmDPTrBfHs6zxehkg="; + hash = "sha256-odUalRvkRkS6rqh+x/qjCor629nIQNZnXiHJ4wYxDFU="; }; build-system = [ setuptools ]; From ed45ad62c1ee4958470cb422fc8c4a3a664da7c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:51:39 +0200 Subject: [PATCH 146/227] python312Packages.claripy: 9.2.109 -> 9.2.110 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.109...v9.2.110 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index e905189e9c05..974435e16955 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.109"; + version = "9.2.110"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; rev = "refs/tags/v${version}"; - hash = "sha256-loDB5y5j8hVmQL2zZf/az6jsRJKRRNWlcRp2WjS90Hc="; + hash = "sha256-6bozYqTt90sieBYK/RBw28m95BGeMeMEDe07AL6r+eI="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From de6db9d8f9d39a384e175762256c240834757d8f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:53:29 +0200 Subject: [PATCH 147/227] python312Packages.cle: 9.2.109 -> 9.2.110 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.110...v9.2.110 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index e64548c36850..b0ec6b2eba2a 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -18,14 +18,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.109"; + version = "9.2.110"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-zuEDi4+qd5Inrd0t8StgnvrDnrYGvEPk/I5yxfEErYk="; + hash = "sha256-pxyFTIMMlROcqa1h9vOJ0Ka6NcgsZNMnaW5QSMqF8Yk="; }; in buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-+4VJ1fqnYPvgiCmU/+aKM+7YZkvDbCMxbWO3YqnELA8="; + hash = "sha256-vr5qj2wDUKoo/IQtaD9JuT1hv+u6M6d7OHmTP96mixI="; }; build-system = [ setuptools ]; From 369eafd4fe21d1a3e285390f4ef1ac9dd62c1ee7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:56:31 +0200 Subject: [PATCH 148/227] python311Packages.angr: 9.2.109 -> 9.2.110 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.109...v9.2.110 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 41bf3abe2ee0..980861ae05d1 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.109"; + version = "9.2.110"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-hvWE812Gu63vTfDlOY80GuUMAS2jZDSxLs4EP0eSbQE="; + hash = "sha256-t0OgY8donh/axg3lgEENRxhx+qx9xNmV/oMBsy2DCa4="; }; pythonRelaxDeps = [ "capstone" ]; From 6985c126266e360608f5dd0c5aade5a439e0013e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 22:11:21 +0000 Subject: [PATCH 149/227] syncthingtray: 1.5.4 -> 1.5.5 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index b66c4f74d724..4d5252e455c8 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -35,14 +35,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.4"; + version = "1.5.5"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - hash = "sha256-3Z9heiQiuYzWtReKs/XeA+ENRKgxHR74ANzrDcdyjh4="; + hash = "sha256-NfFB+4cqe1rHqc+w0Enl9h33gPjJ3CfrFpyOhysmz0Q="; }; buildInputs = [ From ccbdc8d4093fbec72149f1d84ddb4f94bbe16d70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 22:46:03 +0000 Subject: [PATCH 150/227] flyctl: 0.2.79 -> 0.2.88 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index cde017c71e5d..58e17cd8a838 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.79"; + version = "0.2.88"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-mnLBSTzeDcxmKNile4Kfe0AABoLgK3EL9HU8r8OPsuc="; + hash = "sha256-eGeYCMwl4m9I+KYfLdh/zYb6xnJxYAI4bbJrtfv2ioA="; }; - vendorHash = "sha256-RSLwEOtZsYfTgBdkZIxccxehz8lbozWJV5UdKiMeoLU="; + vendorHash = "sha256-c4hTDqJ7ss8iCf3FVuQHTe1Nsbzb7R6f2+evhzey1PE="; subPackages = [ "." ]; From d8f05db5ac86a842c527b72bff965e7d7372977f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 23:27:02 +0000 Subject: [PATCH 151/227] fend: 1.4.9 -> 1.5.0 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 6986bc69645a..4d6da1d3694d 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.4.9"; + version = "1.5.0"; src = fetchFromGitHub { owner = "printfn"; repo = "fend"; rev = "v${version}"; - hash = "sha256-ZfDoDOHQlvuPSX6OWQOX7HdeSVUfAlOpHVwcNPDEeU8="; + hash = "sha256-owWBbeZtkjLiMYnXB5d4PfFX4i5BWo0OOnWd3C02VLE="; }; - cargoHash = "sha256-Xwf3Mxvso9mb1YYTuKMzLhtJNX5b2dmGi05TZ111cMc="; + cargoHash = "sha256-pxy6TPDvAnbXJ6QMxWUCwVeWVzKmvwYxysJWhZpeVvI="; nativeBuildInputs = [ pandoc installShellFiles pkg-config copyDesktopItems ]; buildInputs = [ pkg-config openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From 2f9ffba13a45f3b8cd9b35d51fa1c79cc91e6ce3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 23:48:52 +0000 Subject: [PATCH 152/227] lxd-ui: 0.10 -> 0.11 --- pkgs/by-name/lx/lxd-ui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lx/lxd-ui/package.nix b/pkgs/by-name/lx/lxd-ui/package.nix index 0402e61c3fb3..e946fceaedde 100644 --- a/pkgs/by-name/lx/lxd-ui/package.nix +++ b/pkgs/by-name/lx/lxd-ui/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "lxd-ui"; - version = "0.10"; + version = "0.11"; src = fetchFromGitHub { owner = "canonical"; repo = "lxd-ui"; rev = "refs/tags/${version}"; - hash = "sha256-lXuPU1WWhrjst5ZbdLWPMovncHkUMYSUDNpsaWvdPgM="; + hash = "sha256-PBCWZG8Yxjiw3cGLEfMBJZnHsc4hMZHdq7OqaJ8HYJY="; }; offlineCache = fetchYarnDeps { From 62cac25eeef6d6ec97d48e8d6c581f32c6016c5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 23:54:26 +0000 Subject: [PATCH 153/227] python312Packages.unstructured: 0.14.8 -> 0.14.10 --- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 98a2531fa4db..1201850f54b9 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -57,7 +57,7 @@ grpcio, }: let - version = "0.14.8"; + version = "0.14.10"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-cZBoGKjIWHJxbG6sDbkjJJt3nSYjrha+Lz9RFdq6d0c="; + hash = "sha256-h+sTqI0wLK+ZZR6bdQxKSVtXRvR2ovJ4YbvsXLTZ8Aw="; }; propagatedBuildInputs = [ From a59600b3bbdb1f2b7c159f3fa701466bc0f77558 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 00:39:26 +0000 Subject: [PATCH 154/227] timer: 1.4.1 -> 1.4.4 --- pkgs/tools/misc/timer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/timer/default.nix b/pkgs/tools/misc/timer/default.nix index 732c6358a2e0..956972c204e9 100644 --- a/pkgs/tools/misc/timer/default.nix +++ b/pkgs/tools/misc/timer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "timer"; - version = "1.4.1"; + version = "1.4.4"; src = fetchFromGitHub { owner = "caarlos0"; repo = "timer"; rev = "v${version}"; - hash = "sha256-8BVzijAXsJ8Q8BhDmhzFbEQ23fUEBdmbUsCPxfpXyBA="; + hash = "sha256-mA52lrtChPbEeZr7kh1RYJ8yTqe7PaShqQ/0aJ+o83E="; }; - vendorHash = "sha256-1n5vZKlOWoB2SFdDdv+pPWLybzCIJG/wdBYqLMatjNA="; + vendorHash = "sha256-bLGP9xAs0V6ttaU2duQVeiX7TQi/TX7Kjawh9nmtsl4="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 37e519fa37ef51f6c61d6705b5a6abdb89dac724 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 00:40:06 +0000 Subject: [PATCH 155/227] rkvm: 0.6.0 -> 0.6.1 --- pkgs/tools/misc/rkvm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/rkvm/default.nix b/pkgs/tools/misc/rkvm/default.nix index 162899b46e80..1e5376273ca8 100644 --- a/pkgs/tools/misc/rkvm/default.nix +++ b/pkgs/tools/misc/rkvm/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "rkvm"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "htrefil"; repo = pname; rev = version; - hash = "sha256-bWDVc5pWc5gtwGF3vwUgjDhqZP7E79nteKiuAEEbw6E="; + hash = "sha256-pGCoNmGOeV7ND4kcRjlJZbEMnmKQhlCtyjMoWIwVZrM="; }; - cargoHash = "sha256-FUaycVxW7QJ5gTZ/8bWjqSaMSepRF5iqlBNJLaDRNxc="; + cargoHash = "sha256-aq8Ky29jXY0cW5s0E4NDs29DY8RIA0Fvy2R72WPAYsk="; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook makeWrapper ]; buildInputs = [ libevdev ]; From 48b2d342e9e81a71a207c5103373b60b8bc2987e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 00:40:13 +0000 Subject: [PATCH 156/227] clipse: 1.0.3 -> 1.0.7 --- pkgs/by-name/cl/clipse/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix index 417ae4ea44f6..6bf93f1d9400 100644 --- a/pkgs/by-name/cl/clipse/package.nix +++ b/pkgs/by-name/cl/clipse/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "clipse"; - version = "1.0.3"; + version = "1.0.7"; src = fetchFromGitHub { owner = "savedra1"; repo = "clipse"; rev = "v${version}"; - hash = "sha256-EnT4gnP145FoUysL3L87vY1LrlJoPT1VqDEoH2Fqh2g="; + hash = "sha256-G26xPABF2Cdxk1N71EaMjKzju0jl5tDJ1WrISjebZVM="; }; vendorHash = "sha256-QEBRlwNS8K44chB3fMOJZxYnIaWMnuDySIhKfF7XtxM="; From 13144909978b8f2186bccd89470d519697830c5a Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Sat, 13 Jul 2024 20:41:27 -0400 Subject: [PATCH 157/227] icoextract: add missing -t to install command --- pkgs/by-name/ic/icoextract/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ic/icoextract/package.nix b/pkgs/by-name/ic/icoextract/package.nix index 2cb81016e56e..8565bff672fd 100644 --- a/pkgs/by-name/ic/icoextract/package.nix +++ b/pkgs/by-name/ic/icoextract/package.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace exe-thumbnailer.thumbnailer \ --replace Exec=exe-thumbnailer Exec=$out/bin/exe-thumbnailer - install -Dm644 exe-thumbnailer.thumbnailer $out/share/thumbnailers + install -Dm644 exe-thumbnailer.thumbnailer -t $out/share/thumbnailers ''; meta = with lib; { From e03e7e1826e236be0f0bea0f6a7555aba6d2d886 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 00:59:23 +0000 Subject: [PATCH 158/227] wavemon: 0.9.5 -> 0.9.6 --- pkgs/tools/networking/wavemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 259996d93540..6d05569de8ad 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wavemon"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "sha256-MvIFuPATI0Y7aIYZkb2Yr+iCco4gILHhDU5FWeMCk5Q="; + sha256 = "sha256-OnELXlnzXamQflCAWuc4fxwvqHZtl+nrlTpkKK4IGKw="; }; nativeBuildInputs = [ From 88d05be4a28ccad961faef5f85859882cbf7e5a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 01:03:31 +0000 Subject: [PATCH 159/227] shpool: 0.6.2 -> 0.6.3 --- pkgs/by-name/sh/shpool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sh/shpool/package.nix b/pkgs/by-name/sh/shpool/package.nix index 0b8be24fd452..34c59c05c563 100644 --- a/pkgs/by-name/sh/shpool/package.nix +++ b/pkgs/by-name/sh/shpool/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "shpool"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "shell-pool"; repo = "shpool"; rev = "v${version}"; - hash = "sha256-6gfK71uM6IOP571Jzv3QPPKITaRteXyySZAstH0e+/M="; + hash = "sha256-RzXlwzCMZ5nDnNfQHzqY9Wu7gvG8y39yR2W3cfl208w="; }; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { --replace-fail '/usr/bin/shpool' "$out/bin/shpool" ''; - cargoHash = "sha256-rJ+Avq/6y68xEcJ+EeFVhFaSWJyC+x0a46cclVsTE4Q="; + cargoHash = "sha256-Xb/ohGzgXR8B6Zfd2pUqgpxK6WQnk2xF4bbCyz1g2os="; buildInputs = [ linux-pam From 61a4cece05a27a5531fa7aaf88d942eb3461fb65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 01:17:14 +0000 Subject: [PATCH 160/227] python312Packages.plantuml-markdown: 3.9.7 -> 3.9.8 --- pkgs/development/python-modules/plantuml-markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index c4e53362c78c..cd9872c9fd5f 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "plantuml-markdown"; - version = "3.9.7"; + version = "3.9.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-/lsu7kiUyQ6LUFINX+/aCFSKm1pGyIfUzSuUehwCz7I="; + hash = "sha256-gBlHWAD8MIymCqtqxKRneScMztFzPStIMIO+IrHpgpc="; }; propagatedBuildInputs = [ From d2c4d79357b07d85201f9a582268d07671afc539 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 01:17:38 +0000 Subject: [PATCH 161/227] python312Packages.argh: 0.31.2 -> 0.31.3 --- pkgs/development/python-modules/argh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 9d4167a3ddf1..a4ab8087a612 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "argh"; - version = "0.31.2"; + version = "0.31.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-2xw0iFgE99RkbDhdwvsZtFKYVhMi9MFerhsTOZP54yM="; + hash = "sha256-8wAj2L4Uyl7msbPuq4KRUde72kZK4H3E3VNHkZxYkvk="; }; nativeBuildInputs = [ flit-core ]; From cf80bd7819d5dd80a3bcf5daa7803b0f9f28c749 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 01:41:16 +0000 Subject: [PATCH 162/227] mkvtoolnix: 85.0 -> 86.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 8aaa0cf1448a..79b16f06c6f1 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "85.0"; + version = "86.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - hash = "sha256-E8fULDUkEnh/0W/OIh+peO+JXSecgINPJclOTc5KYVo="; + hash = "sha256-h9rVs4A7JihnCj15XUus9xMvShKWyYhJN/90v/fl0PE="; }; nativeBuildInputs = [ From 0a1370d338361d35253dcc28cfe7b8f6112e405b Mon Sep 17 00:00:00 2001 From: Ingo Reitz <9l@9lo.re> Date: Sun, 14 Jul 2024 04:12:56 +0200 Subject: [PATCH 163/227] vscode: 1.91.0 -> 1.91.1 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index c2e41573c1ef..a57db1275abc 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0bzf0mx1rgndpdd4a97kr01xsgsgp86gyscg8js2cvaad4265bmv"; - x86_64-darwin = "1m7f91cqbbv00difvfqld8fqkj9kvyddihmzi3zyzn4gfkv8gvf0"; - aarch64-linux = "09mxsk4qkq34yg1sd67cdasfxwdhdzcfij50fv1nl3kdjzp2i0iz"; - aarch64-darwin = "1jxjzfz6gr0pcp2anwjqwm38ma2i8fnzf5zpscfdklrlbhf438k2"; - armv7l-linux = "1yp4npgw4dkx8halsr1vm5ll1w4phx67dwd4krz1914mddx7x2kr"; + x86_64-linux = "0ighhwwmc8cxdabq2wkzzr21sv6zaj90pnqi2cy8krfwm88w6jc0"; + x86_64-darwin = "1fbpw0xib9vm47ab028frg789vgmkpwcdxs8m2in7ywrckl6xycy"; + aarch64-linux = "0n0f518xl1fh17llsd159ldi50z2vihkghfq7plfnbnngpf0swy9"; + aarch64-darwin = "03v3869yblx03j0c3njlvg7qgdmqrg8jvj9s1iyhqw1xpb2lc41c"; + armv7l-linux = "12dv0vqqzriqr8ysjjx62hy2b41dky2p0rcr11wznqi259bryckr"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.91.0"; + version = "1.91.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "ea1445cc7016315d0f5728f8e8b12a45dc0a7286"; + rev = "f1e16e1e6214d7c44d078b1f0607b2388f29d729"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "08mgfrwiji16q8x8kwmw3pdmb0325hfr9pd2fa5g5kmy9gnfw38v"; + sha256 = "0k38pkfz9kpbpx0n50iq531mrm7qxqggks092cs4zicv815jk8wg"; }; }; From c8a81fe9a638ddd62edf0703a761d77160dcd63c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 02:32:06 +0000 Subject: [PATCH 164/227] trealla: 2.53.10 -> 2.53.48 --- pkgs/by-name/tr/trealla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 752e0447cb0e..b52d24a34178 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.53.10"; + version = "2.53.48"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-JUC8iIfISRKvVMZo2DjmuZ9g9TxSW2+lGIhUpfH6i5Y="; + hash = "sha256-yxx4Mi1CrgFWIWbRq2wsNs6D7OL1OkeA4QyTYf158aU="; }; postPatch = '' From 512e8afdb96591aacbe155974c92fb40d317d6af Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Fri, 5 Jul 2024 10:19:04 +0200 Subject: [PATCH 165/227] treewide: remove unused occurence of stdenv (and other) arguments format (will squash) --- pkgs/applications/graphics/cloudcompare/default.nix | 1 - pkgs/applications/kde/okular.nix | 2 +- pkgs/applications/misc/deckmaster/default.nix | 1 - pkgs/applications/misc/globe-cli/default.nix | 2 +- pkgs/applications/misc/gnome-frog/default.nix | 4 +--- pkgs/applications/misc/gradience/default.nix | 3 +-- pkgs/applications/misc/houdini/runtime.nix | 2 +- pkgs/applications/misc/imaginer/default.nix | 3 +-- pkgs/applications/misc/itd/default.nix | 3 +-- pkgs/applications/misc/matcha-rss-digest/default.nix | 3 +-- pkgs/applications/misc/nwg-look/default.nix | 2 -- pkgs/applications/misc/obs-cli/default.nix | 1 - pkgs/applications/misc/resp-app/default.nix | 3 +-- pkgs/applications/misc/rofi/wayland.nix | 3 +-- pkgs/applications/misc/rusty-psn/default.nix | 1 - pkgs/applications/misc/shavee/default.nix | 1 - .../misc/system76-keyboard-configurator/default.nix | 2 +- pkgs/applications/misc/variety/default.nix | 1 - pkgs/applications/misc/wtf/default.nix | 1 - pkgs/applications/misc/xmrig/moneroocean.nix | 1 - .../networking/browsers/firefox/mobile-config.nix | 2 +- .../networking/cluster/argocd-autopilot/default.nix | 2 +- pkgs/applications/networking/cluster/arkade/default.nix | 1 - pkgs/applications/networking/cluster/fetchit/default.nix | 1 - pkgs/applications/networking/cluster/fn-cli/default.nix | 2 +- pkgs/applications/networking/cluster/hubble/default.nix | 2 +- pkgs/applications/networking/cluster/kluctl/default.nix | 2 +- pkgs/applications/networking/cluster/ktunnel/default.nix | 2 +- pkgs/applications/networking/cluster/kubedog/default.nix | 1 - pkgs/applications/networking/coreth/default.nix | 1 - pkgs/applications/networking/gossa/default.nix | 1 - .../networking/mailreaders/notmuch/notmuch-mailmover.nix | 1 - pkgs/applications/networking/p2p/stig/default.nix | 1 - pkgs/applications/office/semantik/default.nix | 3 +-- pkgs/applications/office/todoman/default.nix | 1 - pkgs/applications/science/electronics/kingstvis/default.nix | 1 - pkgs/applications/terminal-emulators/darktile/default.nix | 3 +-- pkgs/applications/version-management/git-bars/default.nix | 2 +- pkgs/applications/version-management/gitsign/default.nix | 2 +- pkgs/applications/version-management/sourcehut/default.nix | 1 - pkgs/applications/virtualization/kraft/default.nix | 1 - pkgs/by-name/al/alertmanager-webhook-logger/package.nix | 1 - pkgs/by-name/al/alp/package.nix | 3 +-- pkgs/by-name/be/beatsabermodmanager/package.nix | 4 ---- pkgs/by-name/bs/bstone/package.nix | 1 - pkgs/by-name/ca/cargo-swift/package.nix | 1 - pkgs/by-name/cb/cbtemulator/package.nix | 1 - pkgs/by-name/cl/clojure-lsp/package.nix | 1 - pkgs/by-name/co/composer-require-checker/package.nix | 1 - pkgs/by-name/e1/e1s/package.nix | 2 +- pkgs/by-name/fm/fm-go/package.nix | 1 - pkgs/by-name/fr/french-numbers/package.nix | 1 - pkgs/by-name/ge/geesefs/package.nix | 1 - pkgs/by-name/ha/harmonia/package.nix | 1 - pkgs/by-name/ha/hashid/package.nix | 1 - pkgs/by-name/hy/hyperspeedcube/package.nix | 1 - pkgs/by-name/km/kminion/package.nix | 1 - pkgs/by-name/kn/knossosnet/package.nix | 1 - pkgs/by-name/le/letterpress/package.nix | 1 - pkgs/by-name/lo/loco-cli/package.nix | 2 +- pkgs/by-name/me/metadata/package.nix | 3 +-- pkgs/by-name/me/mev-boost/package.nix | 1 - pkgs/by-name/ni/nickel/package.nix | 1 - pkgs/by-name/nu/nuv/package.nix | 1 - pkgs/by-name/od/odoo/package.nix | 3 +-- pkgs/by-name/od/odoo15/package.nix | 2 +- pkgs/by-name/od/odoo16/package.nix | 3 +-- pkgs/by-name/pe/persepolis/package.nix | 1 - pkgs/by-name/qr/qrtool/package.nix | 1 - pkgs/by-name/re/reaction/package.nix | 1 - pkgs/by-name/re/readability-extractor/package.nix | 1 - pkgs/by-name/re/reproxy/package.nix | 2 +- pkgs/by-name/re/revup/package.nix | 1 - pkgs/by-name/ro/roon-tui/package.nix | 3 +-- pkgs/by-name/rs/rspamd-trainer/package.nix | 1 - pkgs/by-name/sn/snippetexpanderd/package.nix | 1 - pkgs/by-name/ta/tasks/package.nix | 1 - pkgs/by-name/tu/tuxmux/package.nix | 1 - pkgs/by-name/us/usql/package.nix | 1 - pkgs/by-name/wa/waf/hook.nix | 1 - pkgs/by-name/wi/wizer/package.nix | 1 - pkgs/by-name/yt/ytermusic/package.nix | 1 - pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix | 1 - pkgs/desktops/deepin/go-package/dde-api/default.nix | 3 +-- pkgs/desktops/deepin/go-package/dde-daemon/default.nix | 3 +-- pkgs/desktops/deepin/go-package/startdde/default.nix | 3 +-- .../gnome/extensions/gnome-browser-connector/default.nix | 3 +-- pkgs/development/libraries/qt-5/modules/qtdeclarative.nix | 1 - pkgs/development/libraries/qt-5/modules/qtimageformats.nix | 1 - pkgs/development/libraries/tix/default.nix | 1 - pkgs/development/libraries/tk/8.6.nix | 1 - pkgs/development/misc/resholve/resholve.nix | 1 - pkgs/development/misc/yelp-tools/default.nix | 1 - pkgs/development/python-modules/aocd/default.nix | 1 - pkgs/development/python-modules/augeas/default.nix | 1 - pkgs/development/python-modules/brother-ql/default.nix | 1 - pkgs/development/python-modules/cbor2/default.nix | 1 - .../python-modules/construct-classes/default.nix | 1 - pkgs/development/python-modules/cvxopt/default.nix | 1 - pkgs/development/python-modules/cypherpunkpay/default.nix | 1 - pkgs/development/python-modules/django-cacheops/default.nix | 1 - pkgs/development/python-modules/dogtag-pki/default.nix | 1 - pkgs/development/python-modules/durus/default.nix | 1 - pkgs/development/python-modules/e3-testsuite/default.nix | 1 - pkgs/development/python-modules/ezyrb/default.nix | 1 - pkgs/development/python-modules/faust-cchardet/default.nix | 1 - pkgs/development/python-modules/ftputil/default.nix | 1 - pkgs/development/python-modules/graphite-web/default.nix | 1 - pkgs/development/python-modules/horizon-eda/default.nix | 1 - pkgs/development/python-modules/importlab/default.nix | 1 - pkgs/development/python-modules/iopath/default.nix | 1 - pkgs/development/python-modules/jsonslicer/default.nix | 1 - pkgs/development/python-modules/k5test/default.nix | 1 - pkgs/development/python-modules/lazy-imports/default.nix | 1 - pkgs/development/python-modules/manhole/default.nix | 1 - .../python-modules/material-color-utilities/default.nix | 1 - pkgs/development/python-modules/matrix-common/default.nix | 1 - pkgs/development/python-modules/meep/default.nix | 1 - pkgs/development/python-modules/meson-python/default.nix | 1 - pkgs/development/python-modules/metawear/default.nix | 1 - pkgs/development/python-modules/mlx/default.nix | 1 - pkgs/development/python-modules/mysql-connector/default.nix | 1 - pkgs/development/python-modules/notebook/default.nix | 1 - pkgs/development/python-modules/notmuch2/default.nix | 1 - pkgs/development/python-modules/nutils/default.nix | 1 - pkgs/development/python-modules/okta/default.nix | 1 - pkgs/development/python-modules/optree/default.nix | 1 - pkgs/development/python-modules/osc-lib/default.nix | 1 - pkgs/development/python-modules/owslib/default.nix | 1 - pkgs/development/python-modules/pdoc3/default.nix | 1 - .../piano-transcription-inference/default.nix | 1 - pkgs/development/python-modules/plugp100/default.nix | 1 - pkgs/development/python-modules/pwndbg/default.nix | 1 - pkgs/development/python-modules/pyatem/default.nix | 1 - pkgs/development/python-modules/pyinstrument/default.nix | 1 - pkgs/development/python-modules/pynacl/default.nix | 1 - pkgs/development/python-modules/pyplatec/default.nix | 1 - pkgs/development/python-modules/pyqt3d/default.nix | 1 - pkgs/development/python-modules/pyqtchart/default.nix | 1 - .../python-modules/pyqtdatavisualization/default.nix | 1 - .../python-modules/pyramid-chameleon/default.nix | 1 - pkgs/development/python-modules/pystemd/default.nix | 1 - pkgs/development/python-modules/pytest-parallel/default.nix | 1 - pkgs/development/python-modules/qpsolvers/default.nix | 1 - pkgs/development/python-modules/remi/default.nix | 1 - pkgs/development/python-modules/robomachine/default.nix | 1 - pkgs/development/python-modules/rq/default.nix | 1 - pkgs/development/python-modules/samplerate/default.nix | 1 - pkgs/development/python-modules/servefile/default.nix | 1 - pkgs/development/python-modules/shiv/default.nix | 1 - pkgs/development/python-modules/signalslot/default.nix | 1 - pkgs/development/python-modules/slack-sdk/default.nix | 1 - .../development/python-modules/slither-analyzer/default.nix | 1 - pkgs/development/python-modules/softlayer/default.nix | 1 - pkgs/development/python-modules/swspotify/default.nix | 1 - pkgs/development/python-modules/telegram-text/default.nix | 1 - pkgs/development/python-modules/timetagger/default.nix | 1 - pkgs/development/python-modules/torchlibrosa/default.nix | 1 - pkgs/development/python-modules/tweedledum/default.nix | 1 - pkgs/development/python-modules/yubico/default.nix | 1 - pkgs/development/tools/analysis/panopticon/default.nix | 2 +- pkgs/development/tools/azcopy/default.nix | 1 - pkgs/development/tools/cambalache/default.nix | 3 +-- pkgs/development/tools/cbfmt/default.nix | 2 +- pkgs/development/tools/eltclsh/default.nix | 1 - pkgs/development/tools/gotraceui/default.nix | 2 +- pkgs/development/tools/jf/default.nix | 2 +- pkgs/development/tools/knightos/remkrom/default.nix | 2 +- .../language-servers/beancount-language-server/default.nix | 1 - .../language-servers/jsonnet-language-server/default.nix | 1 - pkgs/development/tools/misc/ninka/default.nix | 2 +- pkgs/development/tools/misc/topiary/default.nix | 1 - pkgs/development/tools/moq/default.nix | 2 +- pkgs/development/tools/regclient/default.nix | 3 +-- pkgs/development/tools/rust-code-analysis/default.nix | 2 +- pkgs/development/tools/rust/bootimage/default.nix | 1 - pkgs/development/tools/rust/cargo-apk/default.nix | 1 - pkgs/development/tools/rust/gitlab-clippy/default.nix | 3 +-- pkgs/development/tools/wasynth/default.nix | 1 - pkgs/games/cataclysm-dda/git.nix | 2 +- pkgs/games/deliantra/data.nix | 2 +- pkgs/games/mnemosyne/default.nix | 1 - pkgs/games/openttd/nml.nix | 3 +-- pkgs/games/tcl2048/default.nix | 2 +- pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix | 6 +----- pkgs/os-specific/bsd/netbsd/pkgs/make.nix | 1 - pkgs/os-specific/bsd/openbsd/default.nix | 1 - pkgs/os-specific/bsd/openbsd/pkgs/librthread.nix | 1 - pkgs/os-specific/bsd/openbsd/pkgs/libutil.nix | 1 - .../darwin/apple-source-releases/network_cmds/default.nix | 2 +- pkgs/os-specific/darwin/xattr/default.nix | 1 - pkgs/os-specific/linux/below/default.nix | 1 - pkgs/os-specific/linux/cpupower-gui/default.nix | 1 - pkgs/servers/ariang/default.nix | 1 - pkgs/servers/fishnet/default.nix | 1 - pkgs/servers/gonic/default.nix | 2 +- pkgs/servers/gotosocial/default.nix | 3 +-- pkgs/servers/monitoring/karma/default.nix | 1 - pkgs/servers/monitoring/phlare/default.nix | 2 +- pkgs/servers/search/khoj/default.nix | 1 - .../discourse/plugins/discourse-prometheus/default.nix | 2 +- pkgs/servers/web-apps/pixelfed/default.nix | 1 - pkgs/servers/webdav/default.nix | 2 +- pkgs/tools/audio/beets/builtin-plugins.nix | 3 +-- pkgs/tools/audio/beets/common.nix | 3 +-- pkgs/tools/compression/ouch/default.nix | 1 - pkgs/tools/misc/srisum/default.nix | 1 - pkgs/tools/networking/gost/default.nix | 2 +- pkgs/tools/networking/qrcp/default.nix | 1 - pkgs/tools/nix/nixos-render-docs/default.nix | 1 - pkgs/tools/security/kubescape/default.nix | 1 - pkgs/tools/text/frawk/default.nix | 1 - pkgs/tools/text/mw/default.nix | 1 - 213 files changed, 59 insertions(+), 247 deletions(-) diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix index 0ef3444fe78a..6517197504dc 100644 --- a/pkgs/applications/graphics/cloudcompare/default.nix +++ b/pkgs/applications/graphics/cloudcompare/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , mkDerivation , fetchFromGitHub , makeDesktopItem diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 927cdb737b98..bd2794af2421 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib +{ mkDerivation, lib , extra-cmake-modules, kdoctools , breeze-icons, chmlib, discount, djvulibre, ebook_tools, kactivities , karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons diff --git a/pkgs/applications/misc/deckmaster/default.nix b/pkgs/applications/misc/deckmaster/default.nix index 2261b7c516bc..5574b645d6ae 100644 --- a/pkgs/applications/misc/deckmaster/default.nix +++ b/pkgs/applications/misc/deckmaster/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , makeWrapper diff --git a/pkgs/applications/misc/globe-cli/default.nix b/pkgs/applications/misc/globe-cli/default.nix index 9d2a5bbc786f..66f15ca7781c 100644 --- a/pkgs/applications/misc/globe-cli/default.nix +++ b/pkgs/applications/misc/globe-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchCrate }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "globe-cli"; diff --git a/pkgs/applications/misc/gnome-frog/default.nix b/pkgs/applications/misc/gnome-frog/default.nix index 85dde662becd..5743054d4f80 100644 --- a/pkgs/applications/misc/gnome-frog/default.nix +++ b/pkgs/applications/misc/gnome-frog/default.nix @@ -1,9 +1,7 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3Packages , wrapGAppsHook4 -, gtk4 , meson , ninja , pkg-config diff --git a/pkgs/applications/misc/gradience/default.nix b/pkgs/applications/misc/gradience/default.nix index 3ddbe86cd78b..d4b4965aea87 100644 --- a/pkgs/applications/misc/gradience/default.nix +++ b/pkgs/applications/misc/gradience/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , wrapGAppsHook4 , meson diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index ef96a689b291..1e44b94e6d9f 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, requireFile, callPackage}: +{ lib, requireFile, callPackage}: callPackage ./runtime-build.nix rec { version = "20.0.688"; diff --git a/pkgs/applications/misc/imaginer/default.nix b/pkgs/applications/misc/imaginer/default.nix index 1b00bd0614bd..374815cd4279 100644 --- a/pkgs/applications/misc/imaginer/default.nix +++ b/pkgs/applications/misc/imaginer/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , appstream-glib , blueprint-compiler , desktop-file-utils diff --git a/pkgs/applications/misc/itd/default.nix b/pkgs/applications/misc/itd/default.nix index ce95eb69bc4f..772ebfc90d6c 100644 --- a/pkgs/applications/misc/itd/default.nix +++ b/pkgs/applications/misc/itd/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitea }: diff --git a/pkgs/applications/misc/matcha-rss-digest/default.nix b/pkgs/applications/misc/matcha-rss-digest/default.nix index d25824fefc15..72e599c3a699 100644 --- a/pkgs/applications/misc/matcha-rss-digest/default.nix +++ b/pkgs/applications/misc/matcha-rss-digest/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/applications/misc/nwg-look/default.nix b/pkgs/applications/misc/nwg-look/default.nix index ceaf6ce1a295..b4f272454591 100644 --- a/pkgs/applications/misc/nwg-look/default.nix +++ b/pkgs/applications/misc/nwg-look/default.nix @@ -1,9 +1,7 @@ { lib -, stdenv , fetchFromGitHub , wrapGAppsHook3 , buildGoModule -, go , glib , pkg-config , cairo diff --git a/pkgs/applications/misc/obs-cli/default.nix b/pkgs/applications/misc/obs-cli/default.nix index 8ff7e7a48157..03a984f82b46 100644 --- a/pkgs/applications/misc/obs-cli/default.nix +++ b/pkgs/applications/misc/obs-cli/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , makeWrapper diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix index efd279189351..38619a0a01cb 100644 --- a/pkgs/applications/misc/resp-app/default.nix +++ b/pkgs/applications/misc/resp-app/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, mkDerivation +{ mkDerivation , lib , fetchFromGitHub , fetchpatch diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix index 51702e521e81..892237be3a36 100644 --- a/pkgs/applications/misc/rofi/wayland.nix +++ b/pkgs/applications/misc/rofi/wayland.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , rofi-unwrapped , wayland-scanner diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/applications/misc/rusty-psn/default.nix index d72905fe094f..2a800910048a 100644 --- a/pkgs/applications/misc/rusty-psn/default.nix +++ b/pkgs/applications/misc/rusty-psn/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , makeDesktopItem diff --git a/pkgs/applications/misc/shavee/default.nix b/pkgs/applications/misc/shavee/default.nix index 1e4dadcf786b..6b6864669622 100644 --- a/pkgs/applications/misc/shavee/default.nix +++ b/pkgs/applications/misc/shavee/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , pam diff --git a/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 096f0589baed..05ecbe0b795d 100644 --- a/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook3, libusb1, hidapi, udev, pkg-config }: +{ lib, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook3, libusb1, hidapi, udev, pkg-config }: # system76-keyboard-configurator tries to spawn a daemon as root via pkexec, so # your system needs a PolicyKit authentication agent running for the diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 3a4d6ac76085..748dd7fcf18e 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , gexiv2 , gobject-introspection diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 5c130bb06982..e75ae315a557 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -3,7 +3,6 @@ , lib , makeWrapper , ncurses -, stdenv }: buildGoModule rec { diff --git a/pkgs/applications/misc/xmrig/moneroocean.nix b/pkgs/applications/misc/xmrig/moneroocean.nix index 47aee945971b..2ad32055707b 100644 --- a/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/pkgs/applications/misc/xmrig/moneroocean.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , fetchpatch , xmrig diff --git a/pkgs/applications/networking/browsers/firefox/mobile-config.nix b/pkgs/applications/networking/browsers/firefox/mobile-config.nix index 6e43295697ea..7d97a2e97d68 100644 --- a/pkgs/applications/networking/browsers/firefox/mobile-config.nix +++ b/pkgs/applications/networking/browsers/firefox/mobile-config.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, runCommand, fetchFromGitLab, wrapFirefox, firefox-unwrapped }: +{ runCommand, fetchFromGitLab, wrapFirefox, firefox-unwrapped }: let pkg = fetchFromGitLab { diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 63466a3efdbf..a5cb5ac1bfb4 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "argocd-autopilot"; diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index b3f3dd21b9e1..9be5204d9c96 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , installShellFiles diff --git a/pkgs/applications/networking/cluster/fetchit/default.nix b/pkgs/applications/networking/cluster/fetchit/default.nix index 263e52fc7c45..d772ba5f5ad6 100644 --- a/pkgs/applications/networking/cluster/fetchit/default.nix +++ b/pkgs/applications/networking/cluster/fetchit/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , installShellFiles diff --git a/pkgs/applications/networking/cluster/fn-cli/default.nix b/pkgs/applications/networking/cluster/fn-cli/default.nix index ea32ad32ce13..f699a53552ae 100644 --- a/pkgs/applications/networking/cluster/fn-cli/default.nix +++ b/pkgs/applications/networking/cluster/fn-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, docker }: +{ lib, buildGoModule, fetchFromGitHub, docker }: buildGoModule rec { pname = "fn"; diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index f678343834d4..7cd67fa00316 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "hubble"; diff --git a/pkgs/applications/networking/cluster/kluctl/default.nix b/pkgs/applications/networking/cluster/kluctl/default.nix index 7f8664fd8174..862934eea24f 100644 --- a/pkgs/applications/networking/cluster/kluctl/default.nix +++ b/pkgs/applications/networking/cluster/kluctl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, testers, kluctl }: +{ lib, buildGoModule, fetchFromGitHub, testers, kluctl }: buildGoModule rec { pname = "kluctl"; diff --git a/pkgs/applications/networking/cluster/ktunnel/default.nix b/pkgs/applications/networking/cluster/ktunnel/default.nix index f193e4d38e90..8641209e3417 100644 --- a/pkgs/applications/networking/cluster/ktunnel/default.nix +++ b/pkgs/applications/networking/cluster/ktunnel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: let version = "1.6.1"; in diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix index 5d31bc8e3350..9b9b5666bbb3 100644 --- a/pkgs/applications/networking/cluster/kubedog/default.nix +++ b/pkgs/applications/networking/cluster/kubedog/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , testers diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 2f4db7dcd5c1..f00d66ed14f9 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub , lib -, stdenv }: buildGoModule rec { diff --git a/pkgs/applications/networking/gossa/default.nix b/pkgs/applications/networking/gossa/default.nix index 66f024934b2a..0a4073781434 100644 --- a/pkgs/applications/networking/gossa/default.nix +++ b/pkgs/applications/networking/gossa/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildGoModule }: diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix index 2467e79255b5..0eec9fb0c1cb 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix @@ -1,6 +1,5 @@ { notmuch , lib -, stdenv , fetchFromGitHub , rustPlatform , installShellFiles diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index b36ad59194d2..36dc169b5887 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , python310Packages , testers diff --git a/pkgs/applications/office/semantik/default.nix b/pkgs/applications/office/semantik/default.nix index f4cc1670383b..b7007719a694 100644 --- a/pkgs/applications/office/semantik/default.nix +++ b/pkgs/applications/office/semantik/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , mkDerivation , fetchFromGitLab , wafHook diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index d53306e77904..76fb6b906bd1 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , glibcLocales , installShellFiles diff --git a/pkgs/applications/science/electronics/kingstvis/default.nix b/pkgs/applications/science/electronics/kingstvis/default.nix index 3699aebbbff0..0a39c66bc662 100644 --- a/pkgs/applications/science/electronics/kingstvis/default.nix +++ b/pkgs/applications/science/electronics/kingstvis/default.nix @@ -6,7 +6,6 @@ , glib , lib , libGL -, stdenv , xkeyboard_config , xorg , zlib diff --git a/pkgs/applications/terminal-emulators/darktile/default.nix b/pkgs/applications/terminal-emulators/darktile/default.nix index 4336c565afa1..9bd7e16d74b7 100644 --- a/pkgs/applications/terminal-emulators/darktile/default.nix +++ b/pkgs/applications/terminal-emulators/darktile/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, fetchFromGitHub +{ fetchFromGitHub , lib , pkg-config , libX11 diff --git a/pkgs/applications/version-management/git-bars/default.nix b/pkgs/applications/version-management/git-bars/default.nix index 79f103468dd8..66ae9bf2987b 100644 --- a/pkgs/applications/version-management/git-bars/default.nix +++ b/pkgs/applications/version-management/git-bars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python3Packages, git }: +{ lib, fetchFromGitHub, python3Packages, git }: python3Packages.buildPythonApplication { pname = "git-bars"; diff --git a/pkgs/applications/version-management/gitsign/default.nix b/pkgs/applications/version-management/gitsign/default.nix index d2c7b20aef87..abc1e6a32594 100644 --- a/pkgs/applications/version-management/gitsign/default.nix +++ b/pkgs/applications/version-management/gitsign/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, stdenv, makeWrapper, gitMinimal, testers, gitsign }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, gitMinimal, testers, gitsign }: buildGoModule rec { pname = "gitsign"; diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index c941cc7570da..050651556a72 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , python3 , callPackage , recurseIntoAttrs diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index 1e066477b721..a20f44bc9d88 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, stdenv , nix-update-script }: diff --git a/pkgs/by-name/al/alertmanager-webhook-logger/package.nix b/pkgs/by-name/al/alertmanager-webhook-logger/package.nix index e04759dda7d3..24e55e8b7607 100644 --- a/pkgs/by-name/al/alertmanager-webhook-logger/package.nix +++ b/pkgs/by-name/al/alertmanager-webhook-logger/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , nixosTests diff --git a/pkgs/by-name/al/alp/package.nix b/pkgs/by-name/al/alp/package.nix index 05fe009148dd..46fe7f979ee7 100644 --- a/pkgs/by-name/al/alp/package.nix +++ b/pkgs/by-name/al/alp/package.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub , runCommand diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index d21283e0952c..48e455acddaa 100644 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -1,9 +1,5 @@ { lib, - dotnet-sdk, - stdenv, - substituteAll, - buildDotnetModule, fetchFromGitHub, diff --git a/pkgs/by-name/bs/bstone/package.nix b/pkgs/by-name/bs/bstone/package.nix index f90864ed11a4..c43cc70bacf3 100644 --- a/pkgs/by-name/bs/bstone/package.nix +++ b/pkgs/by-name/bs/bstone/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , cmake , gcc12Stdenv diff --git a/pkgs/by-name/ca/cargo-swift/package.nix b/pkgs/by-name/ca/cargo-swift/package.nix index 18b2cecbd5cc..6d69053d1cd6 100644 --- a/pkgs/by-name/ca/cargo-swift/package.nix +++ b/pkgs/by-name/ca/cargo-swift/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/by-name/cb/cbtemulator/package.nix b/pkgs/by-name/cb/cbtemulator/package.nix index d3b3e02cfe74..7c7bf7ffb230 100644 --- a/pkgs/by-name/cb/cbtemulator/package.nix +++ b/pkgs/by-name/cb/cbtemulator/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , runCommand diff --git a/pkgs/by-name/cl/clojure-lsp/package.nix b/pkgs/by-name/cl/clojure-lsp/package.nix index 23c23f8065c5..fc5ca91fb740 100644 --- a/pkgs/by-name/cl/clojure-lsp/package.nix +++ b/pkgs/by-name/cl/clojure-lsp/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildGraalvmNativeImage, babashka, fetchurl, diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index 957cce378898..1a42cbd200e5 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , php }: diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix index 556268f7a85b..d6759b57deea 100644 --- a/pkgs/by-name/e1/e1s/package.nix +++ b/pkgs/by-name/e1/e1s/package.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: let pname = "e1s"; version = "1.0.38"; diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix index a92904a05611..e0bda5a43b17 100644 --- a/pkgs/by-name/fm/fm-go/package.nix +++ b/pkgs/by-name/fm/fm-go/package.nix @@ -1,7 +1,6 @@ { lib , buildGoModule , fetchFromGitHub -, stdenv }: let diff --git a/pkgs/by-name/fr/french-numbers/package.nix b/pkgs/by-name/fr/french-numbers/package.nix index 6589caeb6896..f1efc35ea2e6 100644 --- a/pkgs/by-name/fr/french-numbers/package.nix +++ b/pkgs/by-name/fr/french-numbers/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchCrate }: diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index 9c23f3234db7..c6ab0bec46af 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/by-name/ha/harmonia/package.nix b/pkgs/by-name/ha/harmonia/package.nix index a8f4c4b09d6b..d4f519ce344a 100644 --- a/pkgs/by-name/ha/harmonia/package.nix +++ b/pkgs/by-name/ha/harmonia/package.nix @@ -5,7 +5,6 @@ , nixVersions , pkg-config , rustPlatform -, stdenv , nix-update-script , nixosTests }: diff --git a/pkgs/by-name/ha/hashid/package.nix b/pkgs/by-name/ha/hashid/package.nix index 5679fb1a272d..5da915380ff1 100644 --- a/pkgs/by-name/ha/hashid/package.nix +++ b/pkgs/by-name/ha/hashid/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , python3Packages }: diff --git a/pkgs/by-name/hy/hyperspeedcube/package.nix b/pkgs/by-name/hy/hyperspeedcube/package.nix index 79cb640ce038..79616e0a6762 100644 --- a/pkgs/by-name/hy/hyperspeedcube/package.nix +++ b/pkgs/by-name/hy/hyperspeedcube/package.nix @@ -26,7 +26,6 @@ , python3 , rustPlatform , shaderc -, stdenv , vulkan-extension-layer , vulkan-headers , vulkan-loader diff --git a/pkgs/by-name/km/kminion/package.nix b/pkgs/by-name/km/kminion/package.nix index 04f66333e43c..58b6d11b1d05 100644 --- a/pkgs/by-name/km/kminion/package.nix +++ b/pkgs/by-name/km/kminion/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildGoModule }: diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index e08fc2416a39..a6a41e20fc73 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -4,7 +4,6 @@ , fontconfig , lib , openal - , stdenv , xorg }: diff --git a/pkgs/by-name/le/letterpress/package.nix b/pkgs/by-name/le/letterpress/package.nix index d68796e879dc..3286633f671e 100644 --- a/pkgs/by-name/le/letterpress/package.nix +++ b/pkgs/by-name/le/letterpress/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitLab, fetchpatch, wrapGAppsHook4, diff --git a/pkgs/by-name/lo/loco-cli/package.nix b/pkgs/by-name/lo/loco-cli/package.nix index fe8599a210d0..784039d66f70 100644 --- a/pkgs/by-name/lo/loco-cli/package.nix +++ b/pkgs/by-name/lo/loco-cli/package.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage { pname = "loco-cli"; version = "0.2.6"; diff --git a/pkgs/by-name/me/metadata/package.nix b/pkgs/by-name/me/metadata/package.nix index 3a85f8e5f443..23f20f53452c 100644 --- a/pkgs/by-name/me/metadata/package.nix +++ b/pkgs/by-name/me/metadata/package.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , pkg-config , ffmpeg_7 diff --git a/pkgs/by-name/me/mev-boost/package.nix b/pkgs/by-name/me/mev-boost/package.nix index 842c6b3b2a54..bb1a91010382 100644 --- a/pkgs/by-name/me/mev-boost/package.nix +++ b/pkgs/by-name/me/mev-boost/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index c55cc55cf3ea..e53a6e4cc6dd 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, stdenv , python3 , nix-update-script }: diff --git a/pkgs/by-name/nu/nuv/package.nix b/pkgs/by-name/nu/nuv/package.nix index 30ca0bfecfee..7e434984786a 100644 --- a/pkgs/by-name/nu/nuv/package.nix +++ b/pkgs/by-name/nu/nuv/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , symlinkJoin , callPackage , fetchFromGitHub diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo/package.nix index f2239bd5d59e..bf86f819290e 100644 --- a/pkgs/by-name/od/odoo/package.nix +++ b/pkgs/by-name/od/odoo/package.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchgit , fetchzip , python310 diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix index a3255c4aa101..ae39beb4a6d9 100644 --- a/pkgs/by-name/od/odoo15/package.nix +++ b/pkgs/by-name/od/odoo15/package.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchzip, python310, rtlcss, wkhtmltopdf +{ lib, fetchFromGitHub, fetchzip, python310, rtlcss, wkhtmltopdf , nixosTests }: let diff --git a/pkgs/by-name/od/odoo16/package.nix b/pkgs/by-name/od/odoo16/package.nix index 6e68228d7347..0dba5841035d 100644 --- a/pkgs/by-name/od/odoo16/package.nix +++ b/pkgs/by-name/od/odoo16/package.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchzip , python310 , rtlcss diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix index 0fa3a3ec41bf..105af13a299e 100644 --- a/pkgs/by-name/pe/persepolis/package.nix +++ b/pkgs/by-name/pe/persepolis/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , qt5 , python3 , fetchFromGitHub diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index b5cf53c4ebcd..2ae9805af816 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , rustPlatform , asciidoctor diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix index 84de0d125552..740a036d3c4d 100644 --- a/pkgs/by-name/re/reaction/package.nix +++ b/pkgs/by-name/re/reaction/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildGoModule, fetchFromGitLab, }: diff --git a/pkgs/by-name/re/readability-extractor/package.nix b/pkgs/by-name/re/readability-extractor/package.nix index 894eac1601f3..56a317c991f9 100644 --- a/pkgs/by-name/re/readability-extractor/package.nix +++ b/pkgs/by-name/re/readability-extractor/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildNpmPackage , fetchFromGitHub }: diff --git a/pkgs/by-name/re/reproxy/package.nix b/pkgs/by-name/re/reproxy/package.nix index c41334aa6be5..18485d991099 100644 --- a/pkgs/by-name/re/reproxy/package.nix +++ b/pkgs/by-name/re/reproxy/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "reproxy"; diff --git a/pkgs/by-name/re/revup/package.nix b/pkgs/by-name/re/revup/package.nix index 8b179fb5d0f5..4fb1e309b201 100644 --- a/pkgs/by-name/re/revup/package.nix +++ b/pkgs/by-name/re/revup/package.nix @@ -3,7 +3,6 @@ fetchPypi, gitUpdater, python3Packages, - stdenv, testers, }: diff --git a/pkgs/by-name/ro/roon-tui/package.nix b/pkgs/by-name/ro/roon-tui/package.nix index 5e51b5314bcc..6964f46eda32 100644 --- a/pkgs/by-name/ro/roon-tui/package.nix +++ b/pkgs/by-name/ro/roon-tui/package.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/by-name/rs/rspamd-trainer/package.nix b/pkgs/by-name/rs/rspamd-trainer/package.nix index 49dd46d29564..3ed3c7aaea08 100644 --- a/pkgs/by-name/rs/rspamd-trainer/package.nix +++ b/pkgs/by-name/rs/rspamd-trainer/package.nix @@ -3,7 +3,6 @@ , python3Packages , fetchFromGitLab , makeWrapper -, stdenv , fetchpatch , rspamd }: diff --git a/pkgs/by-name/sn/snippetexpanderd/package.nix b/pkgs/by-name/sn/snippetexpanderd/package.nix index 7cde3eaf527a..7e4099b8a99a 100644 --- a/pkgs/by-name/sn/snippetexpanderd/package.nix +++ b/pkgs/by-name/sn/snippetexpanderd/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromSourcehut , makeWrapper diff --git a/pkgs/by-name/ta/tasks/package.nix b/pkgs/by-name/ta/tasks/package.nix index 6a28ea7ee609..b027aaedc192 100644 --- a/pkgs/by-name/ta/tasks/package.nix +++ b/pkgs/by-name/ta/tasks/package.nix @@ -15,7 +15,6 @@ pango, sqlite, vulkan-loader, - stdenv, wayland, nix-update-script, }: diff --git a/pkgs/by-name/tu/tuxmux/package.nix b/pkgs/by-name/tu/tuxmux/package.nix index e3ed1eb1de2e..5e78c599c636 100644 --- a/pkgs/by-name/tu/tuxmux/package.nix +++ b/pkgs/by-name/tu/tuxmux/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , rustPlatform , libiconv diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 3206f6216f20..a91319183f00 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildGoModule , unixODBC diff --git a/pkgs/by-name/wa/waf/hook.nix b/pkgs/by-name/wa/waf/hook.nix index c53af17321c3..f97a4ed22146 100644 --- a/pkgs/by-name/wa/waf/hook.nix +++ b/pkgs/by-name/wa/waf/hook.nix @@ -1,5 +1,4 @@ { lib -, stdenv , pkgs , makeSetupHook , waf diff --git a/pkgs/by-name/wi/wizer/package.nix b/pkgs/by-name/wi/wizer/package.nix index 7ef6a9790600..04d4522ef3bc 100644 --- a/pkgs/by-name/wi/wizer/package.nix +++ b/pkgs/by-name/wi/wizer/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , testers diff --git a/pkgs/by-name/yt/ytermusic/package.nix b/pkgs/by-name/yt/ytermusic/package.nix index 7b325afb9be9..2611d46b849e 100644 --- a/pkgs/by-name/yt/ytermusic/package.nix +++ b/pkgs/by-name/yt/ytermusic/package.nix @@ -5,7 +5,6 @@ , openssl , pkg-config , rustPlatform -, stdenv , }: diff --git a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix index 5003129c1ea9..b211250bc9cf 100644 --- a/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix +++ b/pkgs/desktops/deepin/core/dde-gsettings-schemas/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , runCommand , glib , gtk3 diff --git a/pkgs/desktops/deepin/go-package/dde-api/default.nix b/pkgs/desktops/deepin/go-package/dde-api/default.nix index 890ce1b64f75..209a631ef394 100644 --- a/pkgs/desktops/deepin/go-package/dde-api/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-api/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , buildGoModule , pkg-config diff --git a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix index 14fe7c03c3e3..716f5b58fed3 100644 --- a/pkgs/desktops/deepin/go-package/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/go-package/dde-daemon/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , substituteAll , buildGoModule diff --git a/pkgs/desktops/deepin/go-package/startdde/default.nix b/pkgs/desktops/deepin/go-package/startdde/default.nix index 1f582a43b80a..0c95039ab823 100644 --- a/pkgs/desktops/deepin/go-package/startdde/default.nix +++ b/pkgs/desktops/deepin/go-package/startdde/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub , gettext diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix index 37e4d249d234..3d4108eafdf7 100644 --- a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix +++ b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchurl , meson , ninja diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index f4249b7f9505..fe548129b3fb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,5 +1,4 @@ { lib -, stdenv , qtModule, python3, qtbase, qtsvg }: qtModule { diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix index 4775bb0b0383..ae9b62ddc35d 100644 --- a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix +++ b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix @@ -1,5 +1,4 @@ { lib -, stdenv , qtModule , qtbase , libwebp diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 0a6adbb5882a..67cee0140de0 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchurl , fetchpatch , tcl diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix index c5317a8545dd..75e58dcff799 100644 --- a/pkgs/development/libraries/tk/8.6.nix +++ b/pkgs/development/libraries/tk/8.6.nix @@ -1,5 +1,4 @@ { lib -, stdenv , callPackage , fetchurl , tcl diff --git a/pkgs/development/misc/resholve/resholve.nix b/pkgs/development/misc/resholve/resholve.nix index 5c7984b66d22..9b2d0ad78100 100644 --- a/pkgs/development/misc/resholve/resholve.nix +++ b/pkgs/development/misc/resholve/resholve.nix @@ -1,5 +1,4 @@ { lib -, stdenv , callPackage , python27 , fetchFromGitHub diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 3d0f43258a05..4ad4b4e806ff 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchurl , libxml2 , libxslt diff --git a/pkgs/development/python-modules/aocd/default.nix b/pkgs/development/python-modules/aocd/default.nix index 3a6c506f6b11..b9fe52c10b85 100644 --- a/pkgs/development/python-modules/aocd/default.nix +++ b/pkgs/development/python-modules/aocd/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, aocd-example-parser, beautifulsoup4, buildPythonPackage, diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index 9da8e4a22dcc..6154b82465b9 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, unittestCheckHook, diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index 1aef851742c5..ccf512a05db2 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -1,5 +1,4 @@ { - stdenv, fetchPypi, fetchpatch, buildPythonPackage, diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 319d7feb44fa..e0230c0072e8 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pythonOlder, diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix index 14026a1957f1..a89f8f030a0e 100644 --- a/pkgs/development/python-modules/construct-classes/default.nix +++ b/pkgs/development/python-modules/construct-classes/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, poetry-core, diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index a33d19ff3135..e90fc29092c8 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/cypherpunkpay/default.nix b/pkgs/development/python-modules/cypherpunkpay/default.nix index 8228274ee171..fe5874db533f 100644 --- a/pkgs/development/python-modules/cypherpunkpay/default.nix +++ b/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, apscheduler, bitstring, buildPythonPackage, diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index 85b44d4523a9..ab29fb9d843c 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/dogtag-pki/default.nix b/pkgs/development/python-modules/dogtag-pki/default.nix index f2077050314f..04e5d4b219c7 100644 --- a/pkgs/development/python-modules/dogtag-pki/default.nix +++ b/pkgs/development/python-modules/dogtag-pki/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchPypi, buildPythonPackage, diff --git a/pkgs/development/python-modules/durus/default.nix b/pkgs/development/python-modules/durus/default.nix index 3c7fd696fa99..906579f9a645 100644 --- a/pkgs/development/python-modules/durus/default.nix +++ b/pkgs/development/python-modules/durus/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/e3-testsuite/default.nix b/pkgs/development/python-modules/e3-testsuite/default.nix index c0f3f2af57cd..bf8ba8850a3d 100644 --- a/pkgs/development/python-modules/e3-testsuite/default.nix +++ b/pkgs/development/python-modules/e3-testsuite/default.nix @@ -4,7 +4,6 @@ fetchFromGitHub, lib, setuptools, - stdenv, }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/ezyrb/default.nix b/pkgs/development/python-modules/ezyrb/default.nix index 51addca7efbf..3ed46178f1e8 100644 --- a/pkgs/development/python-modules/ezyrb/default.nix +++ b/pkgs/development/python-modules/ezyrb/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/faust-cchardet/default.nix b/pkgs/development/python-modules/faust-cchardet/default.nix index b84538900694..ff3cd46700c9 100644 --- a/pkgs/development/python-modules/faust-cchardet/default.nix +++ b/pkgs/development/python-modules/faust-cchardet/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, cython, diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index bc4e43e29c39..0a3329b02c50 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, freezegun, diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 8da175e4f573..2a861bd8d339 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, python, cairocffi, diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix index e02917523c22..dc0a91b6d757 100644 --- a/pkgs/development/python-modules/horizon-eda/default.nix +++ b/pkgs/development/python-modules/horizon-eda/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, callPackage, horizon-eda, diff --git a/pkgs/development/python-modules/importlab/default.nix b/pkgs/development/python-modules/importlab/default.nix index 72afded7d0c0..2341129dfec5 100644 --- a/pkgs/development/python-modules/importlab/default.nix +++ b/pkgs/development/python-modules/importlab/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/iopath/default.nix b/pkgs/development/python-modules/iopath/default.nix index ace7c4f03f09..53159f5a8457 100644 --- a/pkgs/development/python-modules/iopath/default.nix +++ b/pkgs/development/python-modules/iopath/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/jsonslicer/default.nix b/pkgs/development/python-modules/jsonslicer/default.nix index 53f5ddb70523..4cc5e559aca8 100644 --- a/pkgs/development/python-modules/jsonslicer/default.nix +++ b/pkgs/development/python-modules/jsonslicer/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index a7366d3851fb..982accf1459a 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, pythonOlder, fetchPypi, diff --git a/pkgs/development/python-modules/lazy-imports/default.nix b/pkgs/development/python-modules/lazy-imports/default.nix index 4efed32b70d6..f52db38bf30d 100644 --- a/pkgs/development/python-modules/lazy-imports/default.nix +++ b/pkgs/development/python-modules/lazy-imports/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pytestCheckHook, diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index 8dab6aa75520..eade21574e70 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pytest, diff --git a/pkgs/development/python-modules/material-color-utilities/default.nix b/pkgs/development/python-modules/material-color-utilities/default.nix index 527726401f82..992bf8c5d371 100644 --- a/pkgs/development/python-modules/material-color-utilities/default.nix +++ b/pkgs/development/python-modules/material-color-utilities/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/matrix-common/default.nix b/pkgs/development/python-modules/matrix-common/default.nix index 307ae00b4642..3f6b50d6e265 100644 --- a/pkgs/development/python-modules/matrix-common/default.nix +++ b/pkgs/development/python-modules/matrix-common/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/meep/default.nix b/pkgs/development/python-modules/meep/default.nix index fdb89697ce0c..d034595d03e4 100644 --- a/pkgs/development/python-modules/meep/default.nix +++ b/pkgs/development/python-modules/meep/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/meson-python/default.nix b/pkgs/development/python-modules/meson-python/default.nix index 31361667f45d..a2631209410e 100644 --- a/pkgs/development/python-modules/meson-python/default.nix +++ b/pkgs/development/python-modules/meson-python/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, colorama, diff --git a/pkgs/development/python-modules/metawear/default.nix b/pkgs/development/python-modules/metawear/default.nix index c95efd8e3188..e142beb7b973 100644 --- a/pkgs/development/python-modules/metawear/default.nix +++ b/pkgs/development/python-modules/metawear/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, gcc, diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix index b65f87105d2d..f922cecadd1b 100644 --- a/pkgs/development/python-modules/mlx/default.nix +++ b/pkgs/development/python-modules/mlx/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, fetchFromGitHub, buildPythonPackage, diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index b15a4559aa98..5ed645720199 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, django, diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 8d9095bc3c11..7718611df06c 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, pythonOlder, diff --git a/pkgs/development/python-modules/notmuch2/default.nix b/pkgs/development/python-modules/notmuch2/default.nix index 14eb6e67d09f..e2bba858580e 100644 --- a/pkgs/development/python-modules/notmuch2/default.nix +++ b/pkgs/development/python-modules/notmuch2/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, notmuch, diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix index 86185683c4ce..a4ca753766b7 100644 --- a/pkgs/development/python-modules/nutils/default.nix +++ b/pkgs/development/python-modules/nutils/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, numpy, diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix index 239a204c0fb4..b97c8580125d 100644 --- a/pkgs/development/python-modules/okta/default.nix +++ b/pkgs/development/python-modules/okta/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, aenum, aiohttp, buildPythonPackage, diff --git a/pkgs/development/python-modules/optree/default.nix b/pkgs/development/python-modules/optree/default.nix index 27a057b24ddd..aba72cf59ab9 100644 --- a/pkgs/development/python-modules/optree/default.nix +++ b/pkgs/development/python-modules/optree/default.nix @@ -1,5 +1,4 @@ { - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/osc-lib/default.nix b/pkgs/development/python-modules/osc-lib/default.nix index 84443f5b7733..7e03de25fabf 100644 --- a/pkgs/development/python-modules/osc-lib/default.nix +++ b/pkgs/development/python-modules/osc-lib/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 645715a4f0af..53f7f9f24e07 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/pdoc3/default.nix b/pkgs/development/python-modules/pdoc3/default.nix index 03fb3fd84c2f..e9def284c26c 100644 --- a/pkgs/development/python-modules/pdoc3/default.nix +++ b/pkgs/development/python-modules/pdoc3/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/piano-transcription-inference/default.nix b/pkgs/development/python-modules/piano-transcription-inference/default.nix index 4727cee21c43..788c3cf0bfc2 100644 --- a/pkgs/development/python-modules/piano-transcription-inference/default.nix +++ b/pkgs/development/python-modules/piano-transcription-inference/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/plugp100/default.nix b/pkgs/development/python-modules/plugp100/default.nix index cd2c09467ffd..b01229b2618a 100644 --- a/pkgs/development/python-modules/plugp100/default.nix +++ b/pkgs/development/python-modules/plugp100/default.nix @@ -1,5 +1,4 @@ { - stdenv, pkgs, lib, buildPythonPackage, diff --git a/pkgs/development/python-modules/pwndbg/default.nix b/pkgs/development/python-modules/pwndbg/default.nix index e4b77db14eab..110fd273fbe1 100644 --- a/pkgs/development/python-modules/pwndbg/default.nix +++ b/pkgs/development/python-modules/pwndbg/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, capstone, diff --git a/pkgs/development/python-modules/pyatem/default.nix b/pkgs/development/python-modules/pyatem/default.nix index e9bf94be5dc1..a605dd4b1a3d 100644 --- a/pkgs/development/python-modules/pyatem/default.nix +++ b/pkgs/development/python-modules/pyatem/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromSourcehut, diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix index bfeaab0146cb..78c5e4a33fb6 100644 --- a/pkgs/development/python-modules/pyinstrument/default.nix +++ b/pkgs/development/python-modules/pyinstrument/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 5db76ccd3d97..765b88154237 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/pkgs/development/python-modules/pyplatec/default.nix index b61fb265dcf7..486b980bd4cb 100644 --- a/pkgs/development/python-modules/pyplatec/default.nix +++ b/pkgs/development/python-modules/pyplatec/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, }: diff --git a/pkgs/development/python-modules/pyqt3d/default.nix b/pkgs/development/python-modules/pyqt3d/default.nix index 5c26e705bea6..abf60dcad115 100644 --- a/pkgs/development/python-modules/pyqt3d/default.nix +++ b/pkgs/development/python-modules/pyqt3d/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pyqt5, diff --git a/pkgs/development/python-modules/pyqtchart/default.nix b/pkgs/development/python-modules/pyqtchart/default.nix index db7e24eabcb6..1a6675b9ad80 100644 --- a/pkgs/development/python-modules/pyqtchart/default.nix +++ b/pkgs/development/python-modules/pyqtchart/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pyqt5, diff --git a/pkgs/development/python-modules/pyqtdatavisualization/default.nix b/pkgs/development/python-modules/pyqtdatavisualization/default.nix index 09d1ad6c752e..d0c1ba5b8d05 100644 --- a/pkgs/development/python-modules/pyqtdatavisualization/default.nix +++ b/pkgs/development/python-modules/pyqtdatavisualization/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchPypi, pyqt5, diff --git a/pkgs/development/python-modules/pyramid-chameleon/default.nix b/pkgs/development/python-modules/pyramid-chameleon/default.nix index 67ea57509b8b..dadd0e534a3f 100644 --- a/pkgs/development/python-modules/pyramid-chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid-chameleon/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, chameleon, diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 847679f2e996..86be5f000ed5 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -1,5 +1,4 @@ { - stdenv, buildPythonPackage, lib, fetchPypi, diff --git a/pkgs/development/python-modules/pytest-parallel/default.nix b/pkgs/development/python-modules/pytest-parallel/default.nix index a2cbf09d3b55..e3324bd91d8c 100644 --- a/pkgs/development/python-modules/pytest-parallel/default.nix +++ b/pkgs/development/python-modules/pytest-parallel/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index d8c20804134d..57a1962b8207 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, unittestCheckHook, diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix index 413c2563ee02..c529a288a90c 100644 --- a/pkgs/development/python-modules/remi/default.nix +++ b/pkgs/development/python-modules/remi/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index 69ca0941df4d..00f5bce3267d 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, allpairspy, buildPythonPackage, diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index c4e408cced64..313680149247 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchFromGitHub, buildPythonPackage, pythonOlder, diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 5323935b7c53..cfeface653ca 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix index d0d916708349..147c9953bc47 100644 --- a/pkgs/development/python-modules/servefile/default.nix +++ b/pkgs/development/python-modules/servefile/default.nix @@ -1,5 +1,4 @@ { - stdenv, buildPythonPackage, fetchFromGitHub, lib, diff --git a/pkgs/development/python-modules/shiv/default.nix b/pkgs/development/python-modules/shiv/default.nix index 010fd7aad999..804c33c3e744 100644 --- a/pkgs/development/python-modules/shiv/default.nix +++ b/pkgs/development/python-modules/shiv/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/signalslot/default.nix b/pkgs/development/python-modules/signalslot/default.nix index 0dcd54334666..7bf0f0ef5b7e 100644 --- a/pkgs/development/python-modules/signalslot/default.nix +++ b/pkgs/development/python-modules/signalslot/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 04c5081f3206..9f6e1cba8a5b 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, aiodns, aiohttp, boto3, diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 527cf726d39d..29ac72362016 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, crytic-compile, fetchFromGitHub, diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index a3adf24ecb7d..dfb536568af3 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, click, fetchFromGitHub, diff --git a/pkgs/development/python-modules/swspotify/default.nix b/pkgs/development/python-modules/swspotify/default.nix index fd5c524f18a6..21bd1348525c 100644 --- a/pkgs/development/python-modules/swspotify/default.nix +++ b/pkgs/development/python-modules/swspotify/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, dbus-python, fetchFromGitHub, diff --git a/pkgs/development/python-modules/telegram-text/default.nix b/pkgs/development/python-modules/telegram-text/default.nix index be123911f871..f14ed0d939b7 100644 --- a/pkgs/development/python-modules/telegram-text/default.nix +++ b/pkgs/development/python-modules/telegram-text/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder, diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index a775c3d01f25..20d70ed0c3b8 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, asgineer, bcrypt, buildPythonPackage, diff --git a/pkgs/development/python-modules/torchlibrosa/default.nix b/pkgs/development/python-modules/torchlibrosa/default.nix index 9ea19d6157a5..8587f6382b23 100644 --- a/pkgs/development/python-modules/torchlibrosa/default.nix +++ b/pkgs/development/python-modules/torchlibrosa/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/python-modules/tweedledum/default.nix b/pkgs/development/python-modules/tweedledum/default.nix index f31bee02bc17..bb7f83599ecd 100644 --- a/pkgs/development/python-modules/tweedledum/default.nix +++ b/pkgs/development/python-modules/tweedledum/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildPythonPackage, fetchFromGitHub, cmake, diff --git a/pkgs/development/python-modules/yubico/default.nix b/pkgs/development/python-modules/yubico/default.nix index 43f3a8994b66..b1ade6d71a32 100644 --- a/pkgs/development/python-modules/yubico/default.nix +++ b/pkgs/development/python-modules/yubico/default.nix @@ -1,5 +1,4 @@ { - stdenv, lib, buildPythonPackage, fetchPypi, diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 08dd8d397f98..02bfaf8bd338 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, qt5, git, cmake +{ lib, fetchFromGitHub, rustPlatform, qt5, git, cmake , pkg-config, makeWrapper }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 2ca6ed71c273..cfe38faafc45 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildGoModule }: diff --git a/pkgs/development/tools/cambalache/default.nix b/pkgs/development/tools/cambalache/default.nix index 66ee1edbd1d5..f25d7247369c 100644 --- a/pkgs/development/tools/cambalache/default.nix +++ b/pkgs/development/tools/cambalache/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitLab , python3 , meson diff --git a/pkgs/development/tools/cbfmt/default.nix b/pkgs/development/tools/cbfmt/default.nix index 6b13d852b201..6fc8526cabbd 100644 --- a/pkgs/development/tools/cbfmt/default.nix +++ b/pkgs/development/tools/cbfmt/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, testers, cbfmt }: +{ lib, rustPlatform, fetchFromGitHub, testers, cbfmt }: rustPlatform.buildRustPackage rec { pname = "cbfmt"; diff --git a/pkgs/development/tools/eltclsh/default.nix b/pkgs/development/tools/eltclsh/default.nix index 8b6b7678ecbe..ec54952406cf 100644 --- a/pkgs/development/tools/eltclsh/default.nix +++ b/pkgs/development/tools/eltclsh/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchgit , automake , autoconf diff --git a/pkgs/development/tools/gotraceui/default.nix b/pkgs/development/tools/gotraceui/default.nix index 30236dd5e225..3f162f246288 100644 --- a/pkgs/development/tools/gotraceui/default.nix +++ b/pkgs/development/tools/gotraceui/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchFromGitHub, pkg-config, buildGoModule, + lib, fetchFromGitHub, pkg-config, buildGoModule, libGL, libX11, libXcursor, libXfixes, libxkbcommon, vulkan-headers, wayland, }: diff --git a/pkgs/development/tools/jf/default.nix b/pkgs/development/tools/jf/default.nix index 71d0d806337e..8184883218f2 100644 --- a/pkgs/development/tools/jf/default.nix +++ b/pkgs/development/tools/jf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, installShellFiles }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "jf"; diff --git a/pkgs/development/tools/knightos/remkrom/default.nix b/pkgs/development/tools/knightos/remkrom/default.nix index bfc01c469b59..4e40364e6dc2 100644 --- a/pkgs/development/tools/knightos/remkrom/default.nix +++ b/pkgs/development/tools/knightos/remkrom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { pname = "remkrom"; diff --git a/pkgs/development/tools/language-servers/beancount-language-server/default.nix b/pkgs/development/tools/language-servers/beancount-language-server/default.nix index 6fa51c782e6e..eb561dae346b 100644 --- a/pkgs/development/tools/language-servers/beancount-language-server/default.nix +++ b/pkgs/development/tools/language-servers/beancount-language-server/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , rustPlatform -, stdenv }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix index 5e3759aba06b..5da093b61bea 100644 --- a/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jsonnet-language-server/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub }: diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index dcac08b08630..76729d71e401 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, perl, perlPackages }: +{ lib, fetchFromGitHub, perl, perlPackages }: perlPackages.buildPerlPackage { pname = "ninka"; diff --git a/pkgs/development/tools/misc/topiary/default.nix b/pkgs/development/tools/misc/topiary/default.nix index 49fc2081d4fe..6be5eedcca5f 100644 --- a/pkgs/development/tools/misc/topiary/default.nix +++ b/pkgs/development/tools/misc/topiary/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, stdenv , nix-update-script }: diff --git a/pkgs/development/tools/moq/default.nix b/pkgs/development/tools/moq/default.nix index bd78d3d92b56..b8a1e46d7431 100644 --- a/pkgs/development/tools/moq/default.nix +++ b/pkgs/development/tools/moq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "moq"; diff --git a/pkgs/development/tools/regclient/default.nix b/pkgs/development/tools/regclient/default.nix index 207060f1ffa8..4524c6dff6da 100644 --- a/pkgs/development/tools/regclient/default.nix +++ b/pkgs/development/tools/regclient/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildGoModule , fetchFromGitHub , installShellFiles diff --git a/pkgs/development/tools/rust-code-analysis/default.nix b/pkgs/development/tools/rust-code-analysis/default.nix index d558752d04e5..7427a8bd76d6 100644 --- a/pkgs/development/tools/rust-code-analysis/default.nix +++ b/pkgs/development/tools/rust-code-analysis/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchCrate, stdenv }: +{ lib, rustPlatform, fetchCrate }: rustPlatform.buildRustPackage rec { pname = "rust-code-analysis"; diff --git a/pkgs/development/tools/rust/bootimage/default.nix b/pkgs/development/tools/rust/bootimage/default.nix index 0a9fa1236545..9f1f51343914 100644 --- a/pkgs/development/tools/rust/bootimage/default.nix +++ b/pkgs/development/tools/rust/bootimage/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/development/tools/rust/cargo-apk/default.nix b/pkgs/development/tools/rust/cargo-apk/default.nix index 130894a72ade..d8231b876662 100644 --- a/pkgs/development/tools/rust/cargo-apk/default.nix +++ b/pkgs/development/tools/rust/cargo-apk/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchCrate }: diff --git a/pkgs/development/tools/rust/gitlab-clippy/default.nix b/pkgs/development/tools/rust/gitlab-clippy/default.nix index 62b3046f05d8..c045fcf59757 100644 --- a/pkgs/development/tools/rust/gitlab-clippy/default.nix +++ b/pkgs/development/tools/rust/gitlab-clippy/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitLab , rustPlatform }: diff --git a/pkgs/development/tools/wasynth/default.nix b/pkgs/development/tools/wasynth/default.nix index 0edefb233355..bf7f0250f405 100644 --- a/pkgs/development/tools/wasynth/default.nix +++ b/pkgs/development/tools/wasynth/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , rustPlatform }: diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix index 155f900e96f3..e577d1aa710f 100644 --- a/pkgs/games/cataclysm-dda/git.nix +++ b/pkgs/games/cataclysm-dda/git.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, CoreFoundation, fetchFromGitHub, fetchpatch, pkgs, wrapCDDA, attachPkgs +{ lib, callPackage, CoreFoundation, fetchFromGitHub, fetchpatch, pkgs, wrapCDDA, attachPkgs , tiles ? true, Cocoa , debug ? false , useXdgDir ? false diff --git a/pkgs/games/deliantra/data.nix b/pkgs/games/deliantra/data.nix index 8e8c7e310df7..ca1cec266837 100644 --- a/pkgs/games/deliantra/data.nix +++ b/pkgs/games/deliantra/data.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, deliantra-maps, deliantra-arch, deliantra-server, symlinkJoin }: +{ lib, deliantra-maps, deliantra-arch, deliantra-server, symlinkJoin }: symlinkJoin rec { name = "deliantra-data-${version}"; diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 938e6aa53aca..371ac99b4f66 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , python , fetchurl , anki diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix index b1ec87d8fdb3..da4a387a7d4f 100644 --- a/pkgs/games/openttd/nml.nix +++ b/pkgs/games/openttd/nml.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchFromGitHub , python3 }: diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 1937ccd0f040..c28c25958038 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, tcl, tcllib, runtimeShell }: +{ lib, fetchurl, tcl, tcllib, runtimeShell }: tcl.mkTclDerivation rec { pname = "tcl2048"; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix index 6df6fa740f45..b7600185ae07 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/libutil.nix @@ -1,8 +1,4 @@ -{ - mkDerivation, - lib, - stdenv, -}: +{ mkDerivation, lib }: mkDerivation { path = "lib/libutil"; extraPaths = [ "lib/libc/gen" ]; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix index 9612ca7ff489..6652d5454387 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/make.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/make.nix @@ -1,7 +1,6 @@ { lib, mkDerivation, - stdenv, make-rules, }: diff --git a/pkgs/os-specific/bsd/openbsd/default.nix b/pkgs/os-specific/bsd/openbsd/default.nix index 4db2df57bc26..cfe594d518ed 100644 --- a/pkgs/os-specific/bsd/openbsd/default.nix +++ b/pkgs/os-specific/bsd/openbsd/default.nix @@ -1,7 +1,6 @@ { lib, crossLibcStdenv, - stdenvNoCC, makeScopeWithSplicing', generateSplicesForMkScope, buildPackages, diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/librthread.nix b/pkgs/os-specific/bsd/openbsd/pkgs/librthread.nix index 1d42d55290c3..047877348f08 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/librthread.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/librthread.nix @@ -1,6 +1,5 @@ { lib, - stdenvLibcMinimal, mkDerivation, libcMinimal, }: diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libutil.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libutil.nix index 627fabe8cf2a..fbb3a66a5707 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/libutil.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/libutil.nix @@ -1,6 +1,5 @@ { lib, - stdenvLibcMinimal, mkDerivation, libcMinimal, bsdSetupHook, diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 600571f22256..c6ac966a65ca 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,4 +1,4 @@ -{ lib, appleDerivation, xcbuildHook, stdenv +{ lib, appleDerivation, xcbuildHook , Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation { diff --git a/pkgs/os-specific/darwin/xattr/default.nix b/pkgs/os-specific/darwin/xattr/default.nix index 7fe0f84606ce..eee87cdbeec7 100644 --- a/pkgs/os-specific/darwin/xattr/default.nix +++ b/pkgs/os-specific/darwin/xattr/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildPythonPackage , python diff --git a/pkgs/os-specific/linux/below/default.nix b/pkgs/os-specific/linux/below/default.nix index 5deb2f236005..dc7754a7793e 100644 --- a/pkgs/os-specific/linux/below/default.nix +++ b/pkgs/os-specific/linux/below/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , rustPlatform , clang diff --git a/pkgs/os-specific/linux/cpupower-gui/default.nix b/pkgs/os-specific/linux/cpupower-gui/default.nix index 754f8e139615..be11dff2bd35 100644 --- a/pkgs/os-specific/linux/cpupower-gui/default.nix +++ b/pkgs/os-specific/linux/cpupower-gui/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , fetchpatch , buildPythonApplication diff --git a/pkgs/servers/ariang/default.nix b/pkgs/servers/ariang/default.nix index 08094783c7a2..0427a823c7b8 100644 --- a/pkgs/servers/ariang/default.nix +++ b/pkgs/servers/ariang/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildNpmPackage , nix-update-script diff --git a/pkgs/servers/fishnet/default.nix b/pkgs/servers/fishnet/default.nix index 0d068aa1d832..95e90ed98b7a 100644 --- a/pkgs/servers/fishnet/default.nix +++ b/pkgs/servers/fishnet/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub , fetchurl diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix index d405e82be9b8..d23e130375de 100644 --- a/pkgs/servers/gonic/default.nix +++ b/pkgs/servers/gonic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub +{ lib, buildGoModule, fetchFromGitHub , nixosTests , pkg-config, taglib, zlib diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix index cf2e82a46db0..3f57180795ee 100644 --- a/pkgs/servers/gotosocial/default.nix +++ b/pkgs/servers/gotosocial/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , fetchurl , fetchFromGitHub , buildGoModule diff --git a/pkgs/servers/monitoring/karma/default.nix b/pkgs/servers/monitoring/karma/default.nix index c27bffa3598f..95f66e1dd7b3 100644 --- a/pkgs/servers/monitoring/karma/default.nix +++ b/pkgs/servers/monitoring/karma/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , fetchNpmDeps diff --git a/pkgs/servers/monitoring/phlare/default.nix b/pkgs/servers/monitoring/phlare/default.nix index 184b974abef5..b1290953a852 100644 --- a/pkgs/servers/monitoring/phlare/default.nix +++ b/pkgs/servers/monitoring/phlare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "phlare"; diff --git a/pkgs/servers/search/khoj/default.nix b/pkgs/servers/search/khoj/default.nix index 202eedb46f7b..5dad9fb101fd 100644 --- a/pkgs/servers/search/khoj/default.nix +++ b/pkgs/servers/search/khoj/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , python3 , postgresql diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix index d0fa5b690bb6..29812ea63b62 100644 --- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix +++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDiscoursePlugin, fetchFromGitHub }: +{ lib, mkDiscoursePlugin, fetchFromGitHub }: mkDiscoursePlugin { bundlerEnvArgs.gemdir = ./.; diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix index a8acd3c92de4..1c2f33117cc3 100644 --- a/pkgs/servers/web-apps/pixelfed/default.nix +++ b/pkgs/servers/web-apps/pixelfed/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , php , nixosTests diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix index 248c5e882cce..bcc80dd5ba53 100644 --- a/pkgs/servers/webdav/default.nix +++ b/pkgs/servers/webdav/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "webdav"; diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index 87b090d6f6de..61b5969701ca 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -1,5 +1,4 @@ -{ stdenv -, aacgain +{ aacgain , ffmpeg , flac , imagemagick diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index 6f45ece8bd59..ac1b59a4f289 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -1,5 +1,4 @@ -{ stdenv -, fetchpatch +{ fetchpatch , bashInteractive , diffPlugins , glibcLocales diff --git a/pkgs/tools/compression/ouch/default.nix b/pkgs/tools/compression/ouch/default.nix index 2db0c25c440b..aff44da469e6 100644 --- a/pkgs/tools/compression/ouch/default.nix +++ b/pkgs/tools/compression/ouch/default.nix @@ -7,7 +7,6 @@ , xz , zlib , zstd -, stdenv }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/misc/srisum/default.nix b/pkgs/tools/misc/srisum/default.nix index 905e5c9acaaa..f9f0a6b4a6b0 100644 --- a/pkgs/tools/misc/srisum/default.nix +++ b/pkgs/tools/misc/srisum/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub }: diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix index 0746e80e37ca..311aa1de3bbf 100644 --- a/pkgs/tools/networking/gost/default.nix +++ b/pkgs/tools/networking/gost/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, fetchpatch }: +{ lib, fetchFromGitHub, buildGoModule, fetchpatch }: buildGoModule rec { pname = "gost"; diff --git a/pkgs/tools/networking/qrcp/default.nix b/pkgs/tools/networking/qrcp/default.nix index f45c053c9662..c9b463d25298 100644 --- a/pkgs/tools/networking/qrcp/default.nix +++ b/pkgs/tools/networking/qrcp/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , installShellFiles diff --git a/pkgs/tools/nix/nixos-render-docs/default.nix b/pkgs/tools/nix/nixos-render-docs/default.nix index 43a953f76d9c..94d2e9b51bde 100644 --- a/pkgs/tools/nix/nixos-render-docs/default.nix +++ b/pkgs/tools/nix/nixos-render-docs/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , python3 , runCommand }: diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 6d147eab6d73..3d03be031a8c 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -1,6 +1,5 @@ { lib, - stdenv, buildGoModule, fetchFromGitHub, git, diff --git a/pkgs/tools/text/frawk/default.nix b/pkgs/tools/text/frawk/default.nix index 2b9f2e0beaa8..ed1da3f36039 100644 --- a/pkgs/tools/text/frawk/default.nix +++ b/pkgs/tools/text/frawk/default.nix @@ -6,7 +6,6 @@ , zlib , features ? [ "default" ] , llvmPackages_12 -, stdenv }: rustPlatform.buildRustPackage rec { diff --git a/pkgs/tools/text/mw/default.nix b/pkgs/tools/text/mw/default.nix index c85b01828037..f1b8b9dcf321 100644 --- a/pkgs/tools/text/mw/default.nix +++ b/pkgs/tools/text/mw/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , buildNpmPackage }: From b38eb1cc4d99b4f3b5fb0e14de1053f2777b1b24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 02:39:10 +0000 Subject: [PATCH 166/227] python312Packages.zigpy: 0.64.1 -> 0.64.3 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index 48455b0a6e94..b39bba71ddfd 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.64.1"; + version = "0.64.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - hash = "sha256-9hPJZQfLevV6zl7JvLtCJSspGl87ORlWLXoVJmRcEJU="; + hash = "sha256-bFCQAobzYdEFjr4dE2ANj6uHnhGzxz+Ij7wMT/nMH4I="; }; postPatch = '' From 56dd089226034c4f4bdb8af7a4c7cfd645da4f74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 02:51:03 +0000 Subject: [PATCH 167/227] star-history: 1.0.21 -> 1.0.22 --- pkgs/tools/misc/star-history/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index 0588301a521e..e2f51addf2ae 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.21"; + version = "1.0.22"; src = fetchCrate { inherit pname version; - sha256 = "sha256-jBeV5iZUKE70n/GTV+Bu9dy7B4pPmPhi5LHqw+YXJE0="; + sha256 = "sha256-Ymocx843DVxvtTHBS3PdyYDLgYJJtUMpmdOnOmFKJZE="; }; - cargoHash = "sha256-oHAHYNJZuD8j/VLmCwcLxv9FkfZdXnxI8cQsJ8sFmZA="; + cargoHash = "sha256-xDO+Qdg8gDj0Eny7QtaRiAxwdXycOsInf5L1YZKv++g="; nativeBuildInputs = [ pkg-config ]; From 26f32a0bdbb362428040ec5e51572b2e0bf039e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 03:01:15 +0000 Subject: [PATCH 168/227] vinegar: 1.7.4 -> 1.7.5 --- pkgs/by-name/vi/vinegar/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index f192e13cc489..a3f54e3e7312 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -60,16 +60,16 @@ let in buildGoModule rec { pname = "vinegar"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; rev = "v${version}"; - hash = "sha256-4tkcrUzW8la5WiDtGUvvsRzFqZM1gqnWWAzXc82hirM="; + hash = "sha256-eU6xlmgz8X7q51GSkQlz/kEQgTzzXYw5P6Yr47f7hbs="; }; - vendorHash = "sha256-pi9FjKYXH8cqTx2rTRCyT4+pOM5HnIKosEcmcpbuywQ="; + vendorHash = "sha256-O2AQFcJmYY3FtLXB3BPdzsplFbthYEyasfctpPOQVhs="; nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; buildInputs = [ libGL libxkbcommon xorg.libX11 xorg.libXcursor xorg.libXfixes wayland vulkan-headers wine ]; From aacbbe9116283eeebcb983112d172f0467f74fb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 03:30:18 +0000 Subject: [PATCH 169/227] roddhjav-apparmor-rules: 0-unstable-2024-07-02 -> 0-unstable-2024-07-12 --- pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix index 37d7c8c889b2..9fe79b3acc41 100644 --- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix +++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "roddhjav-apparmor-rules"; - version = "0-unstable-2024-07-02"; + version = "0-unstable-2024-07-12"; src = fetchFromGitHub { owner = "roddhjav"; repo = "apparmor.d"; - rev = "1675a26fbf06d3085759ccd63b102b3ce8583c3a"; - hash = "sha256-4GPEufI5j03jCN3N8AUtQIKAsFjPi4DbfNcdoMnbNQ0="; + rev = "bd1239b46a006d3cb227fc6fffcf95cf684e1ea2"; + hash = "sha256-gVm3z7bKUQlIBP6Jdy6OIYhb4juQ663gMzV5aoPr+iA="; }; dontConfigure = true; From 764b4cc6b4342a90d234e6481e478767860fe472 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sun, 14 Jul 2024 05:58:47 +0200 Subject: [PATCH 170/227] python312Packages.libsass: add sigmanificient to maintainers --- pkgs/development/python-modules/libsass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/libsass/default.nix b/pkgs/development/python-modules/libsass/default.nix index 13322dd79ba7..9c59c487d839 100644 --- a/pkgs/development/python-modules/libsass/default.nix +++ b/pkgs/development/python-modules/libsass/default.nix @@ -42,6 +42,6 @@ buildPythonPackage rec { mainProgram = "pysassc"; homepage = "https://sass.github.io/libsass-python/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sigmanificient ]; }; } From 42c8f494efcc082b15ef83e5cf40dbbf5ed84a03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 04:01:07 +0000 Subject: [PATCH 171/227] python312Packages.uiprotect: 5.2.0 -> 5.2.2 --- pkgs/development/python-modules/uiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 6a93690a5abf..ccbd1a82f1c6 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "5.2.0"; + version = "5.2.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; rev = "refs/tags/v${version}"; - hash = "sha256-VH8b++7C4bLLoZoefc9zd9S7HTkrDiE7Wle3wkwvjoA="; + hash = "sha256-XWsb/sEXJynb8NEdSm9LMPKTZbacwYHHTUaol1nR3kM="; }; postPatch = '' From f90841a7003432abc8cd27700461b8e910b65610 Mon Sep 17 00:00:00 2001 From: Bu Kun <65808665+pokon548@users.noreply.github.com> Date: Sat, 6 Jul 2024 11:18:15 +0800 Subject: [PATCH 172/227] sticky-notes: init at 0.2.5 --- pkgs/by-name/st/sticky-notes/package.nix | 89 ++ pkgs/by-name/st/sticky-notes/yarn.lock | 1093 ++++++++++++++++++++++ 2 files changed, 1182 insertions(+) create mode 100644 pkgs/by-name/st/sticky-notes/package.nix create mode 100644 pkgs/by-name/st/sticky-notes/yarn.lock diff --git a/pkgs/by-name/st/sticky-notes/package.nix b/pkgs/by-name/st/sticky-notes/package.nix new file mode 100644 index 000000000000..98fd7d387e64 --- /dev/null +++ b/pkgs/by-name/st/sticky-notes/package.nix @@ -0,0 +1,89 @@ +{ lib +, desktop-file-utils +, fetchFromGitHub +, fetchYarnDeps +, fixup_yarn_lock +, gjs +, glib-networking +, gobject-introspection +, gst_all_1 +, gtk4 +, libadwaita +, libsoup_3 +, meson +, ninja +, pkg-config +, stdenv +, wrapGAppsHook4 +, yarn +, nodejs +}: + +stdenv.mkDerivation rec { + pname = "sticky-notes"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "vixalien"; + repo = "sticky"; + rev = "v${version}"; + hash = "sha256-+++xUiMjO+19hmLLBamOL6tMUqB0a8ixTXca/6A8ZK8="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + desktop-file-utils + gobject-introspection + meson + ninja + nodejs + pkg-config + wrapGAppsHook4 + yarn + fixup_yarn_lock + ]; + + buildInputs = [ + gjs + glib-networking + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gtk4 + libadwaita + libsoup_3 + ]; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + hash = "sha256-GThcufSAr/VYL9AWFOBY2FDXQZGY5L7TbBdadPh7CAc="; + }; + + preConfigure = '' + export HOME="$PWD" + yarn config --offline set yarn-offline-mirror $yarnOfflineCache + fixup_yarn_lock yarn.lock + ''; + + mesonFlags = [ + "-Dyarnrc=../.yarnrc" + ]; + + postPatch = '' + meson rewrite kwargs set project / version '${version}' + ''; + + postFixup = '' + sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'com.vixalien.sticky';" $out/bin/.com.vixalien.sticky-wrapped + ''; + + meta = { + description = "Simple sticky notes app for GNOME"; + homepage = "https://github.com/vixalien/sticky"; + changelog = "https://github.com/vixalien/sticky/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pokon548 ]; + mainProgram = "com.vixalien.sticky"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/st/sticky-notes/yarn.lock b/pkgs/by-name/st/sticky-notes/yarn.lock new file mode 100644 index 000000000000..487cf869c895 --- /dev/null +++ b/pkgs/by-name/st/sticky-notes/yarn.lock @@ -0,0 +1,1093 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@adobe/css-tools@^4.0.1": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.2.0.tgz#e1a84fca468f4b337816fcb7f0964beb620ba855" + integrity sha512-E09FiIft46CmH5Qnjb0wsW54/YQd69LsxeKUOWawmws1XWvyFGURnAChH0mlr7YPFR1ofwvUQfcL0J3lMxXqPA== + +"@esbuild/android-arm64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.10.tgz#ad2ee47dd021035abdfb0c38848ff77a1e1918c4" + integrity sha512-ht1P9CmvrPF5yKDtyC+z43RczVs4rrHpRqrmIuoSvSdn44Fs1n6DGlpZKdK6rM83pFLbVaSUwle8IN+TPmkv7g== + +"@esbuild/android-arm@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.10.tgz#bb5a68af8adeb94b30eadee7307404dc5237d076" + integrity sha512-7YEBfZ5lSem9Tqpsz+tjbdsEshlO9j/REJrfv4DXgKTt1+/MHqGwbtlyxQuaSlMeUZLxUKBaX8wdzlTfHkmnLw== + +"@esbuild/android-x64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.10.tgz#751d5d8ae9ece1efa9627b689c888eb85b102360" + integrity sha512-CYzrm+hTiY5QICji64aJ/xKdN70IK8XZ6iiyq0tZkd3tfnwwSWTYH1t3m6zyaaBxkuj40kxgMyj1km/NqdjQZA== + +"@esbuild/darwin-arm64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.10.tgz#85601ee7efb2129cd3218d5bcbe8da1173bc1e8b" + integrity sha512-3HaGIowI+nMZlopqyW6+jxYr01KvNaLB5znXfbyyjuo4lE0VZfvFGcguIJapQeQMS4cX/NEispwOekJt3gr5Dg== + +"@esbuild/darwin-x64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.17.10.tgz#362c7e988c61fe72d5edef4f717e4b4fc728da98" + integrity sha512-J4MJzGchuCRG5n+B4EHpAMoJmBeAE1L3wGYDIN5oWNqX0tEr7VKOzw0ymSwpoeSpdCa030lagGUfnfhS7OvzrQ== + +"@esbuild/freebsd-arm64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.10.tgz#e8a85a46ede7c3a048a12f16b9d551d25adc8bb1" + integrity sha512-ZkX40Z7qCbugeK4U5/gbzna/UQkM9d9LNV+Fro8r7HA7sRof5Rwxc46SsqeMvB5ZaR0b1/ITQ/8Y1NmV2F0fXQ== + +"@esbuild/freebsd-x64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.10.tgz#cd0a1b68bffbcb5b65e65b3fd542e8c7c3edd86b" + integrity sha512-0m0YX1IWSLG9hWh7tZa3kdAugFbZFFx9XrvfpaCMMvrswSTvUZypp0NFKriUurHpBA3xsHVE9Qb/0u2Bbi/otg== + +"@esbuild/linux-arm64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.10.tgz#13b183f432512ed9d9281cc89476caeebe9e9123" + integrity sha512-g1EZJR1/c+MmCgVwpdZdKi4QAJ8DCLP5uTgLWSAVd9wlqk9GMscaNMEViG3aE1wS+cNMzXXgdWiW/VX4J+5nTA== + +"@esbuild/linux-arm@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.10.tgz#dd11e0a5faa3ea94dc80278a601c3be7b4fdf1da" + integrity sha512-whRdrrl0X+9D6o5f0sTZtDM9s86Xt4wk1bf7ltx6iQqrIIOH+sre1yjpcCdrVXntQPCNw/G+XqsD4HuxeS+2QA== + +"@esbuild/linux-ia32@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.10.tgz#4d836f87b92807d9292379963c4888270d282405" + integrity sha512-1vKYCjfv/bEwxngHERp7huYfJ4jJzldfxyfaF7hc3216xiDA62xbXJfRlradiMhGZbdNLj2WA1YwYFzs9IWNPw== + +"@esbuild/linux-loong64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.10.tgz#92eb2ee200c17ef12c7fb3b648231948699e7a4c" + integrity sha512-mvwAr75q3Fgc/qz3K6sya3gBmJIYZCgcJ0s7XshpoqIAIBszzfXsqhpRrRdVFAyV1G9VUjj7VopL2HnAS8aHFA== + +"@esbuild/linux-mips64el@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.10.tgz#14f7d50c40fe7f7ee545a9bd07c6f6e4cba5570e" + integrity sha512-XilKPgM2u1zR1YuvCsFQWl9Fc35BqSqktooumOY2zj7CSn5czJn279j9TE1JEqSqz88izJo7yE4x3LSf7oxHzg== + +"@esbuild/linux-ppc64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.10.tgz#1ab5802e93ae511ce9783e1cb95f37df0f84c4af" + integrity sha512-kM4Rmh9l670SwjlGkIe7pYWezk8uxKHX4Lnn5jBZYBNlWpKMBCVfpAgAJqp5doLobhzF3l64VZVrmGeZ8+uKmQ== + +"@esbuild/linux-riscv64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.10.tgz#4fae25201ef7ad868731d16c8b50b0e386c4774a" + integrity sha512-r1m9ZMNJBtOvYYGQVXKy+WvWd0BPvSxMsVq8Hp4GzdMBQvfZRvRr5TtX/1RdN6Va8JMVQGpxqde3O+e8+khNJQ== + +"@esbuild/linux-s390x@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.10.tgz#126254d8335bb3586918b1ca60beb4abb46e6d54" + integrity sha512-LsY7QvOLPw9WRJ+fU5pNB3qrSfA00u32ND5JVDrn/xG5hIQo3kvTxSlWFRP0NJ0+n6HmhPGG0Q4jtQsb6PFoyg== + +"@esbuild/linux-x64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.10.tgz#7fa4667b2df81ea0538e1b75e607cf04e526ce91" + integrity sha512-zJUfJLebCYzBdIz/Z9vqwFjIA7iSlLCFvVi7glMgnu2MK7XYigwsonXshy9wP9S7szF+nmwrelNaP3WGanstEg== + +"@esbuild/netbsd-x64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.10.tgz#2d24727ddc2305619685bf237a46d6087a02ee9a" + integrity sha512-lOMkailn4Ok9Vbp/q7uJfgicpDTbZFlXlnKT2DqC8uBijmm5oGtXAJy2ZZVo5hX7IOVXikV9LpCMj2U8cTguWA== + +"@esbuild/openbsd-x64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.10.tgz#bf3fc38ee6ecf028c1f0cfe11f61d53cc75fef12" + integrity sha512-/VE0Kx6y7eekqZ+ZLU4AjMlB80ov9tEz4H067Y0STwnGOYL8CsNg4J+cCmBznk1tMpxMoUOf0AbWlb1d2Pkbig== + +"@esbuild/sunos-x64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.10.tgz#8deabd6dfec6256f80bb101bc59d29dbae99c69b" + integrity sha512-ERNO0838OUm8HfUjjsEs71cLjLMu/xt6bhOlxcJ0/1MG3hNqCmbWaS+w/8nFLa0DDjbwZQuGKVtCUJliLmbVgg== + +"@esbuild/win32-arm64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.10.tgz#1ec1ee04c788c4c57a83370b6abf79587b3e4965" + integrity sha512-fXv+L+Bw2AeK+XJHwDAQ9m3NRlNemG6Z6ijLwJAAVdu4cyoFbBWbEtyZzDeL+rpG2lWI51cXeMt70HA8g2MqIg== + +"@esbuild/win32-ia32@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.10.tgz#a362528d7f3ad5d44fa8710a96764677ef92ebe9" + integrity sha512-3s+HADrOdCdGOi5lnh5DMQEzgbsFsd4w57L/eLKKjMnN0CN4AIEP0DCP3F3N14xnxh3ruNc32A0Na9zYe1Z/AQ== + +"@esbuild/win32-x64@0.17.10": + version "0.17.10" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.17.10.tgz#ac779220f2da96afd480fb3f3148a292f66e7fc3" + integrity sha512-oP+zFUjYNaMNmjTwlFtWep85hvwUu19cZklB3QsBOcZSs6y7hmH4LNCJ7075bsqzYaNvZFXJlAVaQ2ApITDXtw== + +"@eslint/eslintrc@^1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e" + integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== + dependencies: + ajv "^6.12.4" + debug "^4.3.2" + espree "^9.4.0" + globals "^13.19.0" + ignore "^5.2.0" + import-fresh "^3.2.1" + js-yaml "^4.1.0" + minimatch "^3.1.2" + strip-json-comments "^3.1.1" + +"@humanwhocodes/config-array@^0.11.8": + version "0.11.8" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" + integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== + dependencies: + "@humanwhocodes/object-schema" "^1.2.1" + debug "^4.1.1" + minimatch "^3.0.5" + +"@humanwhocodes/module-importer@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== + +"@humanwhocodes/object-schema@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== + +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + +"@types/json-schema@^7.0.9": + version "7.0.11" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== + +"@types/minimist@^1.2.2": + version "1.2.2" + resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" + integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== + +"@types/node@*": + version "18.14.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.1.tgz#90dad8476f1e42797c49d6f8b69aaf9f876fc69f" + integrity sha512-QH+37Qds3E0eDlReeboBxfHbX9omAcBCXEzswCu6jySP642jiM3cYSIkU/REqwhCUqXdonHFuBfJDiAJxMNhaQ== + +"@types/semver@^7.3.12": + version "7.3.13" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" + integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== + +"@types/stylus@^0.48.38": + version "0.48.38" + resolved "https://registry.yarnpkg.com/@types/stylus/-/stylus-0.48.38.tgz#6e62a59f9350f53a253aa42b038b6aa44a642c5b" + integrity sha512-B5otJekvD6XM8iTrnO6e2twoTY2tKL9VkL/57/2Lo4tv3EatbCaufdi68VVtn/h4yjO+HVvYEyrNQd0Lzj6riw== + dependencies: + "@types/node" "*" + +"@typescript-eslint/eslint-plugin@^5.33.0": + version "5.51.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.51.0.tgz#da3f2819633061ced84bb82c53bba45a6fe9963a" + integrity sha512-wcAwhEWm1RgNd7dxD/o+nnLW8oH+6RK1OGnmbmkj/GGoDPV1WWMVP0FXYQBivKHdwM1pwii3bt//RC62EriIUQ== + dependencies: + "@typescript-eslint/scope-manager" "5.51.0" + "@typescript-eslint/type-utils" "5.51.0" + "@typescript-eslint/utils" "5.51.0" + debug "^4.3.4" + grapheme-splitter "^1.0.4" + ignore "^5.2.0" + natural-compare-lite "^1.4.0" + regexpp "^3.2.0" + semver "^7.3.7" + tsutils "^3.21.0" + +"@typescript-eslint/parser@^5.33.0": + version "5.51.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.51.0.tgz#2d74626652096d966ef107f44b9479f02f51f271" + integrity sha512-fEV0R9gGmfpDeRzJXn+fGQKcl0inIeYobmmUWijZh9zA7bxJ8clPhV9up2ZQzATxAiFAECqPQyMDB4o4B81AaA== + dependencies: + "@typescript-eslint/scope-manager" "5.51.0" + "@typescript-eslint/types" "5.51.0" + "@typescript-eslint/typescript-estree" "5.51.0" + debug "^4.3.4" + +"@typescript-eslint/scope-manager@5.51.0": + version "5.51.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz#ad3e3c2ecf762d9a4196c0fbfe19b142ac498990" + integrity sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ== + dependencies: + "@typescript-eslint/types" "5.51.0" + "@typescript-eslint/visitor-keys" "5.51.0" + +"@typescript-eslint/type-utils@5.51.0": + version "5.51.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.51.0.tgz#7af48005531700b62a20963501d47dfb27095988" + integrity sha512-QHC5KKyfV8sNSyHqfNa0UbTbJ6caB8uhcx2hYcWVvJAZYJRBo5HyyZfzMdRx8nvS+GyMg56fugMzzWnojREuQQ== + dependencies: + "@typescript-eslint/typescript-estree" "5.51.0" + "@typescript-eslint/utils" "5.51.0" + debug "^4.3.4" + tsutils "^3.21.0" + +"@typescript-eslint/types@5.51.0": + version "5.51.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.51.0.tgz#e7c1622f46c7eea7e12bbf1edfb496d4dec37c90" + integrity sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw== + +"@typescript-eslint/typescript-estree@5.51.0": + version "5.51.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz#0ec8170d7247a892c2b21845b06c11eb0718f8de" + integrity sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA== + dependencies: + "@typescript-eslint/types" "5.51.0" + "@typescript-eslint/visitor-keys" "5.51.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.3.7" + tsutils "^3.21.0" + +"@typescript-eslint/utils@5.51.0": + version "5.51.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.51.0.tgz#074f4fabd5b12afe9c8aa6fdee881c050f8b4d47" + integrity sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw== + dependencies: + "@types/json-schema" "^7.0.9" + "@types/semver" "^7.3.12" + "@typescript-eslint/scope-manager" "5.51.0" + "@typescript-eslint/types" "5.51.0" + "@typescript-eslint/typescript-estree" "5.51.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + semver "^7.3.7" + +"@typescript-eslint/visitor-keys@5.51.0": + version "5.51.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz#c0147dd9a36c0de758aaebd5b48cae1ec59eba87" + integrity sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ== + dependencies: + "@typescript-eslint/types" "5.51.0" + eslint-visitor-keys "^3.3.0" + +acorn-jsx@^5.3.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== + +acorn@^8.8.0: + version "8.8.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" + integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== + +ajv@^6.10.0, ajv@^6.12.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ansi-regex@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== + +ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + +balanced-match@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== + +brace-expansion@^1.1.7: + version "1.1.11" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== + dependencies: + balanced-match "^1.0.0" + concat-map "0.0.1" + +braces@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + dependencies: + fill-range "^7.0.1" + +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +chalk@^4.0.0: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + +concat-map@0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== + +cross-spawn@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + +debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + +deep-is@^0.1.3: + version "0.1.4" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== + +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +esbuild@^0.17.10: + version "0.17.10" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.10.tgz#3be050561b34c5dc05b46978f4e1f326d5cc9437" + integrity sha512-n7V3v29IuZy5qgxx25TKJrEm0FHghAlS6QweUcyIgh/U0zYmQcvogWROitrTyZId1mHSkuhhuyEXtI9OXioq7A== + optionalDependencies: + "@esbuild/android-arm" "0.17.10" + "@esbuild/android-arm64" "0.17.10" + "@esbuild/android-x64" "0.17.10" + "@esbuild/darwin-arm64" "0.17.10" + "@esbuild/darwin-x64" "0.17.10" + "@esbuild/freebsd-arm64" "0.17.10" + "@esbuild/freebsd-x64" "0.17.10" + "@esbuild/linux-arm" "0.17.10" + "@esbuild/linux-arm64" "0.17.10" + "@esbuild/linux-ia32" "0.17.10" + "@esbuild/linux-loong64" "0.17.10" + "@esbuild/linux-mips64el" "0.17.10" + "@esbuild/linux-ppc64" "0.17.10" + "@esbuild/linux-riscv64" "0.17.10" + "@esbuild/linux-s390x" "0.17.10" + "@esbuild/linux-x64" "0.17.10" + "@esbuild/netbsd-x64" "0.17.10" + "@esbuild/openbsd-x64" "0.17.10" + "@esbuild/sunos-x64" "0.17.10" + "@esbuild/win32-arm64" "0.17.10" + "@esbuild/win32-ia32" "0.17.10" + "@esbuild/win32-x64" "0.17.10" + +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-scope@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" + integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint-visitor-keys@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" + integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== + +eslint@^8.21.0: + version "8.33.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.33.0.tgz#02f110f32998cb598c6461f24f4d306e41ca33d7" + integrity sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA== + dependencies: + "@eslint/eslintrc" "^1.4.1" + "@humanwhocodes/config-array" "^0.11.8" + "@humanwhocodes/module-importer" "^1.0.1" + "@nodelib/fs.walk" "^1.2.8" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.3.2" + doctrine "^3.0.0" + escape-string-regexp "^4.0.0" + eslint-scope "^7.1.1" + eslint-utils "^3.0.0" + eslint-visitor-keys "^3.3.0" + espree "^9.4.0" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + find-up "^5.0.0" + glob-parent "^6.0.2" + globals "^13.19.0" + grapheme-splitter "^1.0.4" + ignore "^5.2.0" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + is-path-inside "^3.0.3" + js-sdsl "^4.1.4" + js-yaml "^4.1.0" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.1.2" + natural-compare "^1.4.0" + optionator "^0.9.1" + regexpp "^3.2.0" + strip-ansi "^6.0.1" + strip-json-comments "^3.1.0" + text-table "^0.2.0" + +espree@^9.4.0: + version "9.4.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" + integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== + dependencies: + acorn "^8.8.0" + acorn-jsx "^5.3.2" + eslint-visitor-keys "^3.3.0" + +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-glob@^3.2.9: + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + +fast-levenshtein@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== + +fastq@^1.6.0: + version "1.15.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a" + integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw== + dependencies: + reusify "^1.0.4" + +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + +fill-range@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" + integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== + dependencies: + to-regex-range "^5.0.1" + +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatted@^3.1.0: + version "3.2.7" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" + integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== + +fs.realpath@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== + +glob-parent@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob-parent@^6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== + dependencies: + is-glob "^4.0.3" + +glob@^7.1.3, glob@^7.1.6: + version "7.2.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.1.1" + once "^1.3.0" + path-is-absolute "^1.0.0" + +globals@^13.19.0: + version "13.20.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82" + integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== + dependencies: + type-fest "^0.20.2" + +globby@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^3.0.0" + +grapheme-splitter@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" + integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== + +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + +ignore@^5.2.0: + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== + +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== + +inflight@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== + dependencies: + once "^1.3.0" + wrappy "1" + +inherits@2: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== + +is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== + dependencies: + is-extglob "^2.1.1" + +is-number@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" + integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== + +is-path-inside@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== + +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== + +js-sdsl@^4.1.4: + version "4.3.0" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" + integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== + +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + +linkifyjs@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.1.1.tgz#73d427e3bbaaf4ca8e71c589ad4ffda11a9a5fde" + integrity sha512-zFN/CTVmbcVef+WaDXT63dNzzkfRBKT1j464NJQkV7iSgJU0sLBus9W0HBwnXK13/hf168pbrx/V/bjEHOXNHA== + +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +merge2@^1.3.0, merge2@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + +micromatch@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== + dependencies: + braces "^3.0.2" + picomatch "^2.3.1" + +minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + +minimist@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" + integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== + +mkdirp@^2.1.3: + version "2.1.3" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.3.tgz#b083ff37be046fd3d6552468c1f0ff44c1545d1f" + integrity sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw== + +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + +natural-compare-lite@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" + integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g== + +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== + +once@^1.3.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== + dependencies: + wrappy "1" + +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + +path-is-absolute@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== + +path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + +path-type@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" + integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== + +picomatch@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" + integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== + +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + +punycode@^2.1.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" + integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== + +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + +regexpp@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + +sax@~1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + +semver@^7.3.7: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + dependencies: + lru-cache "^6.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +slash@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" + integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== + +source-map@^0.7.3: + version "0.7.4" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656" + integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA== + +strip-ansi@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + +stylus@^0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.59.0.tgz#a344d5932787142a141946536d6e24e6a6be7aa6" + integrity sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg== + dependencies: + "@adobe/css-tools" "^4.0.1" + debug "^4.3.2" + glob "^7.1.6" + sax "~1.2.4" + source-map "^0.7.3" + +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== + +to-regex-range@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + dependencies: + is-number "^7.0.0" + +tslib@^1.8.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== + +tsutils@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== + dependencies: + tslib "^1.8.1" + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +typescript@^4.7.4: + version "4.9.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" + integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + +word-wrap@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + +wrappy@1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== From 1c5ede15f3471ca00ede5126b714731f7be94755 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 05:34:07 +0000 Subject: [PATCH 173/227] python312Packages.adjusttext: 1.1.1 -> 1.2.0 --- pkgs/development/python-modules/adjusttext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adjusttext/default.nix b/pkgs/development/python-modules/adjusttext/default.nix index 233d5036dc98..334a10de460b 100644 --- a/pkgs/development/python-modules/adjusttext/default.nix +++ b/pkgs/development/python-modules/adjusttext/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "adjusttext"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Phlya"; repo = "adjusttext"; rev = "refs/tags/v${version}"; - hash = "sha256-o/TA/br7sJAcvfIR4uA7a6XRf/enJ/x7N4ys6Of0j3g="; + hash = "sha256-2EaFKvRdFPGnDlO8owjP1vCIY1hTQ3tep5oXV/JeU9M="; }; nativeBuildInputs = [ From 0f20077d2819cae2efe8ad71d027b6eec0f21404 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 05:35:31 +0000 Subject: [PATCH 174/227] balena-cli: 18.2.17 -> 18.2.29 --- pkgs/tools/admin/balena-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index f5850aa82c00..03cadd46a45f 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -18,16 +18,16 @@ let }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "18.2.17"; + version = "18.2.29"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-sWe7D89bL7mWanxCAOAso6J9fuxPFh3PHUL2mR8aOBs="; + hash = "sha256-y2dlyu/JEWeNQ8yBVO5pNwm3qnVe3BLAeW5poyOu0+A="; }; - npmDepsHash = "sha256-lYgt0du8OfJitVbfWiUqrEGulvs/OxqF4AdxyGCRCJY="; + npmDepsHash = "sha256-01w+fyepZbxpN3NvtXWYZDPsIbT6jm3DGNbJ6Ibm0dQ="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 4901473cb02d437d530e1568d7f39877910bd584 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 05:56:23 +0000 Subject: [PATCH 175/227] phrase-cli: 2.30.0 -> 2.31.0 --- pkgs/tools/misc/phrase-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/phrase-cli/default.nix b/pkgs/tools/misc/phrase-cli/default.nix index 79a7a221a947..20d8303f1979 100644 --- a/pkgs/tools/misc/phrase-cli/default.nix +++ b/pkgs/tools/misc/phrase-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.30.0"; + version = "2.31.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-eeGoOBLQMp44Y7z3VQN+gaL1uJmyKNV1BmYSOhhjDkw="; + sha256 = "sha256-Hz+bp/2Gq99ZQvOWU6ODbxThuqKmGN+abspsj1PvXHA="; }; vendorHash = "sha256-pBIAcEmEWmjy1TE8EwZ3vmNmDdolyam/vxY5XHMXU+E="; From ecb555f0770fd0e2597a6a37cef69fcc8917ddc6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 06:08:15 +0000 Subject: [PATCH 176/227] firebase-tools: 13.12.0 -> 13.13.2 --- pkgs/development/tools/firebase-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index c1fd0b4598f1..5ce768bad8b9 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.12.0"; + version = "13.13.2"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-w6tzqbNma7gTnUXOkPtcENO2XcchTXqueZlg08C8vF8="; + hash = "sha256-VjNH3eoJbgPkSDO3UqjxlXoaPE4ct0DMBxWhKbbjvVY="; }; - npmDepsHash = "sha256-7/5cZOYMQ3b77aRZkBA5jTDm+PnepzdW6I8RyBNr7oo="; + npmDepsHash = "sha256-BJuGunibUe5tCvoUAWR2WJlmjrOc1o3wbtfMp3WdK50="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 3e2f30fe5030960aa6baac90e4d20c2501feeca0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 06:13:50 +0000 Subject: [PATCH 177/227] namespace-cli: 0.0.381 -> 0.0.386 --- pkgs/by-name/na/namespace-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 45a9d0470aad..2a8f3e72425d 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "namespace-cli"; - version = "0.0.381"; + version = "0.0.386"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; rev = "v${version}"; - hash = "sha256-WQBA3NtkxrN3NzKl/DsIlp8gdqQpo05n1MZzIKNJdQc="; + hash = "sha256-UT5gCwMxnd/saK3n3jLJeF/ri9pq1KBP++T3lvAM7ng="; }; - vendorHash = "sha256-y+mXUzkY5w2hYECtfcBBUCWsRwhip6IhX617lRX698Q="; + vendorHash = "sha256-VG21dKoMsZefSXUP/itFbt0RGWjlVDwJbeJDmhJ47PA="; subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"]; From 23b3562191981c75d7d38050dc0373f9ff03a45c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 06:41:58 +0000 Subject: [PATCH 178/227] dub: 1.38.0 -> 1.38.1 --- pkgs/by-name/du/dub/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/du/dub/package.nix b/pkgs/by-name/du/dub/package.nix index 9f419d1e10f4..1416b06fc13f 100644 --- a/pkgs/by-name/du/dub/package.nix +++ b/pkgs/by-name/du/dub/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dub"; - version = "1.38.0"; + version = "1.38.1"; enableParallelBuilding = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "dlang"; repo = "dub"; rev = "v${finalAttrs.version}"; - hash = "sha256-+cG7tR4nAL4fhk9/1FMkfjQ8Rtqf+uTvGfVegmnjloY="; + hash = "sha256-8Lr/0sx4SKwU1aNOxZArta0RXpDM+EWl29ZsPDdPWFo="; }; postPatch = '' From af8f857e0fb5f1452b0309b8c1a642b8530fba6f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 06:56:05 +0000 Subject: [PATCH 179/227] goa: 3.17.1 -> 3.17.2 --- pkgs/development/tools/goa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 83b199138ba4..626276a40c3a 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.17.1"; + version = "3.17.2"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-7oUQLY2wb9+YPgVk7r9/N/5b9ytW6eJT5XV+pjzknDA="; + hash = "sha256-1ONgo7l2zHOyCFKa13R2zxUiD16aEQQTKVJex+P9fUM="; }; - vendorHash = "sha256-BRZSGEpIPgFlIAj01fXd7EyUqm7X0tCDCoAArRyeduA="; + vendorHash = "sha256-2aAOM8v2LOZOBfCjnUGN3frJloabmj5fBMpZxMHVFmk="; subPackages = [ "cmd/goa" ]; From 7fce0b5b3064d57d1ff69fb149a0ea2e9854c8a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jul 2024 08:57:34 +0200 Subject: [PATCH 180/227] lacus: 1.9.0 -> 1.10.0 Diff: https://github.com/ail-project/lacus/compare/refs/tags/v1.9.0...v1.10.0 Changelog: https://github.com/ail-project/lacus/releases/tag/v1.10.0 --- pkgs/by-name/la/lacus/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/la/lacus/package.nix b/pkgs/by-name/la/lacus/package.nix index 0f62ff18fed5..5350408e8c0a 100644 --- a/pkgs/by-name/la/lacus/package.nix +++ b/pkgs/by-name/la/lacus/package.nix @@ -5,16 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "lacus"; - version = "1.9.0"; + version = "1.10.0"; pyproject = true; src = fetchFromGitHub { owner = "ail-project"; repo = "lacus"; rev = "refs/tags/v${version}"; - hash = "sha256-VFNW13PupJOroIhqnuLOq3mqU9nXEy1hmjHBQfErSN8="; + hash = "sha256-5KddApwaN4t+QRaQTqIXuYStuPxKq3v6pRknBusAcbM="; }; + pythonRelaxDeps = [ + "psutil" + "redis" + ]; + build-system = with python3.pkgs; [ poetry-core ]; From 3470a1b29a99012103d7b9f400496359fe174eb2 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 14 Jul 2024 09:13:37 +0200 Subject: [PATCH 181/227] electrum{,-grs,-ltc}: drop tlslite-ng dependency not used since version 2.4.1 --- pkgs/applications/misc/electrum/default.nix | 1 - pkgs/applications/misc/electrum/grs.nix | 1 - pkgs/applications/misc/electrum/ltc.nix | 1 - 3 files changed, 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 96afa4d39a1b..859d7bb42b00 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -88,7 +88,6 @@ python.pkgs.buildPythonApplication { pysocks qrcode requests - tlslite-ng certifi jsonpatch # plugins diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index 4ca911126c5b..9d71a5886be6 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -54,7 +54,6 @@ python3.pkgs.buildPythonApplication { pysocks qrcode requests - tlslite-ng certifi jsonpatch # plugins diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index ef52f6211fda..d74f706cbf92 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -70,7 +70,6 @@ python3.pkgs.buildPythonApplication { pysocks qrcode requests - tlslite-ng certifi # plugins btchip-python From 1fe44815f35eb48ba976a5e3a25d6fe6e3fb852c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 07:24:08 +0000 Subject: [PATCH 182/227] cloud-nuke: 0.37.0 -> 0.37.1 --- pkgs/development/tools/cloud-nuke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 12471d9d4798..8bd22b537196 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.37.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5kQGUO0TBoqeQNc2gmaLDju7cE3wOz/DOO34vB405SA="; + hash = "sha256-+iDcUgyTt4AXDPh4S6YhXuWwvrbyvjXnyRmN3hm6hTc="; }; vendorHash = "sha256-4ZPLscZWF9GfNMU70TjR5+Hi/rvm43n+GvqxFUu13JU="; From d2f1b222132f71b16feb7f13bc4ea22824fccb4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 07:24:29 +0000 Subject: [PATCH 183/227] okta-aws-cli: 2.2.0 -> 2.3.0 --- pkgs/tools/admin/okta-aws-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/okta-aws-cli/default.nix b/pkgs/tools/admin/okta-aws-cli/default.nix index 0d4fe0759bba..872c214abf35 100644 --- a/pkgs/tools/admin/okta-aws-cli/default.nix +++ b/pkgs/tools/admin/okta-aws-cli/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "okta-aws-cli"; - version = "2.2.0"; + version = "2.3.0"; subPackages = [ "cmd/okta-aws-cli" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "okta"; repo = "okta-aws-cli"; rev = "v${version}"; - sha256 = "sha256-ECcBsFKs3QabQxURrGO1ZvJ10NzVL4J38rLRLO5y7Mw="; + sha256 = "sha256-+8+3VzMWBb6WQAX7788OWTYj1/E2ps6H7UtB5rO2fSY="; }; vendorHash = "sha256-2VTq8lzGYBKH410/mflloAphWTwFie3mdmz2kLkfuQ0="; From a9e1eaefc9cd2096f8bb20f40144296313dc9b4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 07:28:19 +0000 Subject: [PATCH 184/227] python312Packages.ytmusicapi: 1.7.4 -> 1.7.5 --- pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 7d442fec0af0..cf4f33fdaca0 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "1.7.4"; + version = "1.7.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sigma67"; repo = "ytmusicapi"; rev = "refs/tags/${version}"; - hash = "sha256-gD0VpT0hTymubKLRnl45/FkEZ+t9IPA7pY8eIkTnrKM="; + hash = "sha256-hj2pGT35LCotR96WnyyyRVEiixwru57e3gPhL8tptfk="; }; build-system = [ From 42ee7a84ebcd219ab0610591bce857dd3db14f24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 07:28:32 +0000 Subject: [PATCH 185/227] python312Packages.axisregistry: 0.4.9 -> 0.4.10 --- pkgs/development/python-modules/axisregistry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/axisregistry/default.nix b/pkgs/development/python-modules/axisregistry/default.nix index 453f1c27f8bd..463d704cd654 100644 --- a/pkgs/development/python-modules/axisregistry/default.nix +++ b/pkgs/development/python-modules/axisregistry/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "axisregistry"; - version = "0.4.9"; + version = "0.4.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-obpjiX86fzokao7UWQUXgarKYRNdxplr6/r2D2d7DCI="; + hash = "sha256-/N67VDr1ZFDRmZsxYCFT+KdUmc2ElgGNd8ljGWC5V0U="; }; propagatedBuildInputs = [ From 697d81e87587aa6af0c7cf2036ae61989e87e05e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 07:43:18 +0000 Subject: [PATCH 186/227] atlas: 0.24.1 -> 0.25.0 --- pkgs/development/tools/database/atlas/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/atlas/default.nix b/pkgs/development/tools/database/atlas/default.nix index d2476a3d88dc..65be462a2197 100644 --- a/pkgs/development/tools/database/atlas/default.nix +++ b/pkgs/development/tools/database/atlas/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "atlas"; - version = "0.24.1"; + version = "0.25.0"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; rev = "v${version}"; - hash = "sha256-SD4wWhFEyAOqffrJ2aowY96bLii02Z8PWGj8RNC6w7o="; + hash = "sha256-X8r1DCuKswM9C7HaSkPbyOs9uRG+KGTzWCxGgvajr6k="; }; modRoot = "cmd/atlas"; proxyVendor = true; - vendorHash = "sha256-z2+u6jPTP6MOs7PTF6UzPwhnofQOhRll0zrmsLrN+PQ="; + vendorHash = "sha256-wmvWdUqSPmTaGNDuTJPNEqlJcxy+ckAjHvHH9L7aAGg="; nativeBuildInputs = [ installShellFiles ]; From 87d8dc97a967a6abeea741b6ecfad17ce76e0b5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 07:44:36 +0000 Subject: [PATCH 187/227] eksctl: 0.184.0 -> 0.186.0 --- pkgs/by-name/ek/eksctl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index 9f040972eb3e..08b77a72d9af 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.184.0"; + version = "0.186.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-+PXD5QA18PCSxKMPub13dsIzfE6sKNjlBREvzRH6lE0="; + hash = "sha256-awXoD3Yy2nwOF4uhBlgCjLjmPmzU4uRPlWpsTDFu65I="; }; vendorHash = "sha256-aOLZQKhBy5uBmOhJPfk3ZDHp/YbZw9oN4DaAu1NFcvA="; From 597330e08b902ea6aab01b7b27fb5475c9e14aed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 07:47:12 +0000 Subject: [PATCH 188/227] cirrus-cli: 0.120.2 -> 0.120.3 --- .../tools/continuous-integration/cirrus-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 31299c031e8f..3f584030603c 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.120.2"; + version = "0.120.3"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - hash = "sha256-IVhO8F5KhwCDJ4cm/Iu9vSuAKAF3l1vIjIqSzfYn9Ck="; + hash = "sha256-xuNX2/OjgB2gIqK0wEj2s0867YBKXaz8fvDLJ/pd8U8="; }; vendorHash = "sha256-R5H48idKHTTECEffpQIZgj9xMlHgHCL5OFbe3ZAda/o="; From e5ae9af43965d278673a4fbbb37c6260044ad0c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 08:17:08 +0000 Subject: [PATCH 189/227] dracula-theme: 4.0.0-unstable-2024-06-27 -> 4.0.0-unstable-2024-07-13 --- pkgs/data/themes/dracula-theme/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix index efcaa5e3b210..74c743b9beeb 100644 --- a/pkgs/data/themes/dracula-theme/default.nix +++ b/pkgs/data/themes/dracula-theme/default.nix @@ -2,7 +2,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2024-06-27"; + version = "4.0.0-unstable-2024-07-13"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "bc1414a938652d04b9305b1300f5ceefcf3a3d72"; - hash = "sha256-QaMrcUuvHRisa58XaiNos6jpclp0jotFQJ3b375gKMU="; + rev = "938d3f5f804fa970b641483bd4ec5a299fce3ff4"; + hash = "sha256-308sO+azPD0zqh9Xdqdcm8I8KqYkoR9kGXbwV+HXN90="; }; propagatedUserEnvPkgs = [ From 6d604c960ff8e0862b076db5cc933bdbba564517 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 08:17:20 +0000 Subject: [PATCH 190/227] rbspy: 0.22.0 -> 0.23.0 --- pkgs/development/tools/rbspy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rbspy/default.nix b/pkgs/development/tools/rbspy/default.nix index b37f745e6808..2f154074714c 100644 --- a/pkgs/development/tools/rbspy/default.nix +++ b/pkgs/development/tools/rbspy/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "rbspy"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "rbspy"; repo = "rbspy"; rev = "refs/tags/v${version}"; - hash = "sha256-MZ6SN/zrcIKnpm2o5w6d5Vx0YmeuS+zMfsPdZmRKewY="; + hash = "sha256-qZXv7+gPA24U1gB++3Aq/H+JDmAwB4vBIb/WdXjSMqc="; }; - cargoHash = "sha256-+Jb+btXU+fsVXWCmafY5ZaGLvFIA/wFzVNkO0O8QaVw="; + cargoHash = "sha256-LcVxe2KpW8XOa9yoKROo1QHyu76/OUgq7Wf4bcs1+QQ="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' From a90a69dd39ec470e074927f967f3db7095dcb175 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 09:01:26 +0000 Subject: [PATCH 191/227] vencord: 1.9.3 -> 1.9.4 --- pkgs/by-name/ve/vencord/package-lock.json | 94 ++++++++++++----------- pkgs/by-name/ve/vencord/package.nix | 8 +- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/pkgs/by-name/ve/vencord/package-lock.json b/pkgs/by-name/ve/vencord/package-lock.json index e0c4ad411af7..8fe6a4df1331 100644 --- a/pkgs/by-name/ve/vencord/package-lock.json +++ b/pkgs/by-name/ve/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.9.3", + "version": "1.9.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.9.3", + "version": "1.9.4", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -165,9 +165,9 @@ } }, "node_modules/@csstools/css-parser-algorithms": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.6.3.tgz", - "integrity": "sha512-xI/tL2zxzEbESvnSxwFgwvy5HS00oCXxL4MLs6HUiDcYfwowsoQaABKxUElp1ARITrINzBnsECOc1q0eg2GOrA==", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.7.1.tgz", + "integrity": "sha512-2SJS42gxmACHgikc1WGesXLIT8d/q2l0UFM7TaEeIzdFCE/FPMtTiizcPGGJtlPo2xuQzY09OhrLTzRxqJqwGw==", "dev": true, "funding": [ { @@ -183,13 +183,13 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-tokenizer": "^2.3.1" + "@csstools/css-tokenizer": "^2.4.1" } }, "node_modules/@csstools/css-tokenizer": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.3.1.tgz", - "integrity": "sha512-iMNHTyxLbBlWIfGtabT157LH9DUx9X8+Y3oymFEuMj8HNc+rpE3dPFGFgHjpKfjeFDjLjYIAIhXPGvS2lKxL9g==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.4.1.tgz", + "integrity": "sha512-eQ9DIktFJBhGjioABJRtUucoWR2mwllurfnM8LuNGAqX3ViZXaUchqk+1s7jjtkFiT9ySdACsFEA3etErkALUg==", "dev": true, "funding": [ { @@ -206,9 +206,9 @@ } }, "node_modules/@csstools/media-query-list-parser": { - "version": "2.1.11", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.11.tgz", - "integrity": "sha512-uox5MVhvNHqitPP+SynrB1o8oPxPMt2JLgp5ghJOWf54WGQ5OKu47efne49r1SWqs3wRP8xSWjnO9MBKxhB1dA==", + "version": "2.1.13", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.13.tgz", + "integrity": "sha512-XaHr+16KRU9Gf8XLi3q8kDlI18d5vzKSKCY510Vrtc9iNR0NJzbY9hhTmwhzYZj/ZwGL4VmB3TA9hJW0Um2qFA==", "dev": true, "funding": [ { @@ -224,8 +224,8 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.6.3", - "@csstools/css-tokenizer": "^2.3.1" + "@csstools/css-parser-algorithms": "^2.7.1", + "@csstools/css-tokenizer": "^2.4.1" } }, "node_modules/@csstools/selector-specificity": { @@ -736,9 +736,9 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", "dev": true }, "node_modules/@jridgewell/trace-mapping": { @@ -1171,9 +1171,9 @@ } }, "node_modules/acorn": { - "version": "8.12.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz", - "integrity": "sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==", + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -2452,9 +2452,9 @@ } }, "node_modules/eslint-plugin-simple-header": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-header/-/eslint-plugin-simple-header-1.0.2.tgz", - "integrity": "sha512-K1EJ/ueBIjPRA8qR44Ymo+GDmPYYmfoODtainGxVr7PSbX6QiaY+pTuGCrOhO+AtVsYJs8GLSVdGUTXyAxAtOA==" + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-simple-header/-/eslint-plugin-simple-header-1.1.1.tgz", + "integrity": "sha512-xFK54pYcSEC2uULHTeo2aEgmTmdhZ9ry3zIV9OspLaEPb/Xg1oaFmOcmoNhk9WNJPwzUKrAmYyA8s4YDBfbD+g==" }, "node_modules/eslint-plugin-simple-import-sort": { "version": "10.0.0", @@ -2563,9 +2563,9 @@ } }, "node_modules/esquery": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, "dependencies": { "estraverse": "^5.1.0" @@ -2706,6 +2706,12 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, + "node_modules/fast-uri": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "dev": true + }, "node_modules/fastest-levenshtein": { "version": "1.0.16", "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", @@ -4177,9 +4183,9 @@ } }, "node_modules/postcss": { - "version": "8.4.38", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", - "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", + "version": "8.4.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", + "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", "dev": true, "funding": [ { @@ -4197,7 +4203,7 @@ ], "dependencies": { "nanoid": "^3.3.7", - "picocolors": "^1.0.0", + "picocolors": "^1.0.1", "source-map-js": "^1.2.0" }, "engines": { @@ -4227,9 +4233,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz", - "integrity": "sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz", + "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==", "dev": true, "dependencies": { "cssesc": "^3.0.0", @@ -5233,15 +5239,15 @@ } }, "node_modules/table/node_modules/ajv": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz", - "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -5283,9 +5289,9 @@ } }, "node_modules/terser": { - "version": "5.31.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz", - "integrity": "sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==", + "version": "5.31.2", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.2.tgz", + "integrity": "sha512-LGyRZVFm/QElZHy/CPr/O4eNZOZIzsrQ92y4v9UJe/pFJjypje2yI3C2FmPtvUEnhadlSbmG2nXtdcjHOjCfxw==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -5552,9 +5558,9 @@ } }, "node_modules/typescript": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", - "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", + "version": "5.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", + "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix index 9df3a62388bf..96dc94cb447f 100644 --- a/pkgs/by-name/ve/vencord/package.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.9.3"; - gitHash = "484d70f"; + version = "1.9.4"; + gitHash = "9f79cc0"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-My9jIjGA9+ax7TBHIlXavoWNhsenFGqtZ/ePmdMv1qQ="; + hash = "sha256-SbvxAkKos7f3AuU3VLmNTP6VO+CjvWX/kIO0WJzUX3k="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-+gcm570JtI8ErdTU+YFPLK4O0jKv7CWdkX7kBKbqfXI="; + npmDepsHash = "sha256-TeAuXJn07xCveoD5yaNLyULzhNZ8Mtdn4NNLfu2EwEg="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; From a828d5e0780120d37d5be6255b0e0dde8321b966 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 09:27:17 +0000 Subject: [PATCH 192/227] sequoia-sqop: 0.34.0 -> 0.35.0 --- pkgs/tools/security/sequoia-sqop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/sequoia-sqop/default.nix b/pkgs/tools/security/sequoia-sqop/default.nix index 2aba6b9043c9..2354a63d9737 100644 --- a/pkgs/tools/security/sequoia-sqop/default.nix +++ b/pkgs/tools/security/sequoia-sqop/default.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec { pname = "sequoia-sqop"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage rec { # generated etc repo = "sequoia-sop"; rev = "v${version}"; - hash = "sha256-RpXMF0Q5Dp0zDt1gPl2Z3RKyDa4NI0uZY7kIc230F48="; + hash = "sha256-JgLozj9LZwk6TRHj2d4kiq8j3aILBUWaE9ldzvlTBNs="; }; - cargoHash = "sha256-ccEnZPFUYU5F1PqkX1u7K2xuWYShhzJwEOfBEbi53gg="; + cargoHash = "sha256-Z0UqJRm4QepMl83zE1TI7g/pc7b9XxUWeaMVVrp0zZ8="; nativeBuildInputs = [ pkg-config From 67a4074b8c59faf99776db894405ec2d67ac37f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 10:08:15 +0000 Subject: [PATCH 193/227] ghauri: 1.3.4 -> 1.3.5 --- pkgs/tools/security/ghauri/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ghauri/default.nix b/pkgs/tools/security/ghauri/default.nix index 426cb66b7e6f..a60862deadcd 100644 --- a/pkgs/tools/security/ghauri/default.nix +++ b/pkgs/tools/security/ghauri/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ghauri"; - version = "1.3.4"; + version = "1.3.5"; pyproject = true; src = fetchFromGitHub { owner = "r0oth3x49"; repo = "ghauri"; rev = "refs/tags/${version}"; - hash = "sha256-1xrswAxavUz3ybmT0E00pjiR8pmHvuBXE4zhAPnz5MQ="; + hash = "sha256-ea0YJuHT4G6Y9AE9sZEHTa/Ljtw2fATFha/j4VmukcA="; }; build-system = with python3.pkgs; [ From bdf5d0a3be9b2aaecbc586ba34a46012cc35f2bd Mon Sep 17 00:00:00 2001 From: Vincent Vanlaer <13833860+VincentVanlaer@users.noreply.github.com> Date: Sun, 14 Jul 2024 12:33:38 +0200 Subject: [PATCH 194/227] numad: 0.5 -> 0.5-unstable-2023-09-06 (#315168) --- pkgs/os-specific/linux/numad/default.nix | 23 +++++++------ .../linux/numad/numad-linker-flags.patch | 33 ------------------- 2 files changed, 13 insertions(+), 43 deletions(-) delete mode 100644 pkgs/os-specific/linux/numad/numad-linker-flags.patch diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index 6ea970a11769..31ac82ea065f 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -1,26 +1,29 @@ -{ lib, stdenv, fetchgit }: +{ lib, stdenv, fetchgit, unstableGitUpdater, writeShellScript }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "numad"; - version = "0.5"; + version = "0.5-unstable-2023-09-06"; src = fetchgit { url = "https://pagure.io/numad.git"; - rev = "334278ff3d774d105939743436d7378a189e8693"; - sha256 = "sha256-6nrbfooUI1ufJhsPf68li5584oKQcznXQlxfpStuX5I="; + rev = "3399d89305b6560e27e70aff4ad9fb403dedf947"; + sha256 = "sha256-USEffVcakaAbilqijJmpro92ujvxbglcXxyBlntMxaI="; }; - hardeningDisable = [ "format" ]; - - patches = [ - ./numad-linker-flags.patch - ]; postPatch = '' substituteInPlace Makefile --replace "install -m" "install -Dm" ''; makeFlags = [ "prefix=$(out)" ]; + passthru.updateScript = unstableGitUpdater { + tagConverter = writeShellScript "tagConverter" '' + read tag + test "$tag" = "0" \ + && tag=0.5; echo "$tag" + ''; + }; + meta = with lib; { description = "User-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource access"; mainProgram = "numad"; diff --git a/pkgs/os-specific/linux/numad/numad-linker-flags.patch b/pkgs/os-specific/linux/numad/numad-linker-flags.patch deleted file mode 100644 index 97f3dc8b6cf7..000000000000 --- a/pkgs/os-specific/linux/numad/numad-linker-flags.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 9eb3cc5c51d846c8c8b750a4eb55545d7b5fea6c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Wed, 23 Apr 2014 15:41:26 -0400 -Subject: [PATCH] use LDLIBS for linker flags - -When you put -lfoo into the dependency line of make, it forces it to -search /lib and /usr/lib for files to link against. This can cause -problems when trying to cross-compile or build for different ABIs. -Use the standard LDLIBS variable instead. - -URL: https://bugs.gentoo.org/505760 -Reported-by: Georgi Georgiev -Signed-off-by: Mike Frysinger ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index f3838b4..f2e9a6e 100644 ---- a/Makefile -+++ b/Makefile -@@ -31,7 +31,8 @@ docdir := ${prefix}/share/doc - - all: numad - --numad: numad.o -lpthread -+LDLIBS := -lpthread -+numad: numad.o - - AR ?= ar - RANLIB ?= ranlib --- -1.9.2 From b15db499f204c54f6aff5a00d3810311710de067 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 10:39:38 +0000 Subject: [PATCH 195/227] python312Packages.meross-iot: 0.4.7.1 -> 0.4.7.3 --- pkgs/development/python-modules/meross-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meross-iot/default.nix b/pkgs/development/python-modules/meross-iot/default.nix index 523f034a9a59..1d06749f3dec 100644 --- a/pkgs/development/python-modules/meross-iot/default.nix +++ b/pkgs/development/python-modules/meross-iot/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.7.1"; + version = "0.4.7.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - hash = "sha256-BcWluaNyo6G7OuIV6yXzc7xcBgQlRR9HbjbNnLigZcE="; + hash = "sha256-Ne9m6umPmX3uXAyY9/Ucvi/rPdHrGJgD5IrZ+BBQweI="; }; build-system = [ setuptools ]; From d7d8834c651dd78b53d00874ae0a7aff72251bd4 Mon Sep 17 00:00:00 2001 From: Kacper Koniuszy <120419423+kkoniuszy@users.noreply.github.com> Date: Sun, 14 Jul 2024 12:45:09 +0200 Subject: [PATCH 196/227] kdePackages.kpipewire: pull upstream fix for screen recording freezes Fixes https://bugs.kde.org/show_bug.cgi?id=489434 https://invent.kde.org/plasma/kpipewire/-/commit/1977da38ed25aa15347eb9027cb1fde3d66b075f --- pkgs/kde/plasma/kpipewire/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix index c79bfc792d51..4f88f95289a3 100644 --- a/pkgs/kde/plasma/kpipewire/default.nix +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -6,10 +6,20 @@ ffmpeg, mesa, libva, + fetchpatch, }: mkKdeDerivation { pname = "kpipewire"; extraNativeBuildInputs = [pkg-config]; extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; + + patches = [ + # Fix for 489434: spectacle crash/freeze on finishing recording with PW 1.2+ + # https://bugs.kde.org/show_bug.cgi?id=489434 + (fetchpatch { + url = "https://invent.kde.org/plasma/kpipewire/-/commit/1977da38ed25aa15347eb9027cb1fde3d66b075f.diff"; + sha256 = "sha256-qAcd1C1AWddn5i0KAq85Ae+pU7ohfdAjOR7jKaNTYSo="; + }) + ]; } From cdf92faead4ca421a3465d3fef39a36e278f7ae9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 10:56:11 +0000 Subject: [PATCH 197/227] jx: 3.10.152 -> 3.10.154 --- pkgs/applications/networking/cluster/jx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index c3123ce5c460..9d71c2070708 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jx"; - version = "3.10.152"; + version = "3.10.154"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-rOpKaVn2D5UMYaVXLRxvwTRzo+nD1H/95FcQSeFgeFo="; + sha256 = "sha256-BrCErGsHJq9h2AijwhG8MwCxXGJ9sCDpCOqazsmi8hs="; }; vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14="; From 592e3845c4199072433821ce29f7d701149793ae Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 14 Jul 2024 18:59:26 +0800 Subject: [PATCH 198/227] treewide: sha256 -> hash attribute for fetchgit --- pkgs/applications/audio/bchoppr/default.nix | 2 +- pkgs/applications/audio/delayarchitect/default.nix | 2 +- pkgs/applications/audio/dexed/default.nix | 2 +- pkgs/applications/audio/dragonfly-reverb/default.nix | 2 +- pkgs/applications/audio/faust/faust2.nix | 2 +- pkgs/applications/audio/fire/default.nix | 2 +- pkgs/applications/audio/gxplugins-lv2/default.nix | 2 +- pkgs/applications/audio/helio-workstation/default.nix | 2 +- pkgs/applications/audio/jacktrip/default.nix | 2 +- pkgs/applications/audio/lollypop/default.nix | 2 +- pkgs/applications/audio/master_me/default.nix | 2 +- pkgs/applications/audio/noisetorch/default.nix | 2 +- pkgs/applications/audio/odin2/default.nix | 2 +- pkgs/applications/audio/sfizz/default.nix | 2 +- pkgs/applications/audio/sfxr-qt/default.nix | 2 +- pkgs/applications/audio/stochas/default.nix | 2 +- pkgs/applications/audio/surge-XT/default.nix | 2 +- pkgs/applications/audio/zam-plugins/default.nix | 2 +- pkgs/applications/audio/zynaddsubfx/default.nix | 2 +- pkgs/applications/blockchains/aeon/default.nix | 2 +- pkgs/applications/blockchains/haven-cli/default.nix | 2 +- pkgs/applications/editors/libresprite/default.nix | 2 +- pkgs/applications/editors/marker/default.nix | 2 +- pkgs/applications/editors/notepad-next/default.nix | 2 +- pkgs/applications/emulators/dolphin-emu/primehack.nix | 2 +- pkgs/applications/emulators/flycast/default.nix | 2 +- pkgs/applications/emulators/openmsx/default.nix | 2 +- pkgs/applications/graphics/foxotron/default.nix | 2 +- pkgs/applications/graphics/pizarra/default.nix | 2 +- pkgs/applications/graphics/tev/default.nix | 2 +- pkgs/applications/misc/albert/default.nix | 2 +- pkgs/applications/misc/barrier/default.nix | 2 +- pkgs/applications/misc/cubiomes-viewer/default.nix | 2 +- pkgs/applications/misc/edgetx/default.nix | 2 +- pkgs/applications/misc/junction/default.nix | 2 +- pkgs/applications/misc/makeself/default.nix | 2 +- pkgs/applications/misc/megacmd/default.nix | 2 +- pkgs/applications/misc/megasync/default.nix | 2 +- pkgs/applications/misc/moonlight-embedded/default.nix | 2 +- pkgs/applications/misc/p2pool/default.nix | 2 +- pkgs/applications/misc/pe-bear/default.nix | 2 +- pkgs/applications/misc/resp-app/default.nix | 2 +- pkgs/applications/misc/rofi-file-browser/default.nix | 2 +- pkgs/applications/misc/rofi/default.nix | 2 +- pkgs/applications/misc/rofi/wayland.nix | 2 +- pkgs/applications/misc/synergy/default.nix | 2 +- pkgs/applications/misc/taskwarrior/default.nix | 2 +- pkgs/applications/misc/timewarrior/default.nix | 2 +- pkgs/applications/networking/browsers/bombadillo/default.nix | 2 +- pkgs/applications/networking/cluster/starboard/default.nix | 2 +- .../networking/instant-messengers/chatterino2/default.nix | 2 +- pkgs/applications/networking/instant-messengers/mm/default.nix | 2 +- .../pidgin/pidgin-plugins/purple-lurch/default.nix | 2 +- .../pidgin/pidgin-plugins/purple-signald/default.nix | 2 +- .../instant-messengers/telegram/kotatogram-desktop/default.nix | 2 +- .../networking/instant-messengers/tensor/default.nix | 2 +- .../applications/networking/instant-messengers/utox/default.nix | 2 +- pkgs/applications/networking/libcoap/default.nix | 2 +- pkgs/applications/networking/mumble/default.nix | 2 +- pkgs/applications/science/biology/genmap/default.nix | 2 +- pkgs/applications/science/biology/sambamba/default.nix | 2 +- pkgs/applications/science/electronics/librepcb/default.nix | 2 +- pkgs/applications/science/electronics/openboardview/default.nix | 2 +- pkgs/applications/science/logic/redprl/default.nix | 2 +- pkgs/applications/science/machine-learning/shogun/default.nix | 2 +- pkgs/applications/science/math/scalp/default.nix | 2 +- pkgs/applications/science/math/singular/default.nix | 2 +- pkgs/applications/science/misc/openmvs/default.nix | 2 +- pkgs/applications/science/networking/sumo/default.nix | 2 +- pkgs/applications/science/robotics/qgroundcontrol/default.nix | 2 +- pkgs/applications/system/monitor/default.nix | 2 +- pkgs/applications/video/glaxnimate/default.nix | 2 +- pkgs/applications/video/hyperion-ng/default.nix | 2 +- pkgs/applications/video/minitube/default.nix | 2 +- pkgs/applications/video/obs-studio/default.nix | 2 +- pkgs/applications/video/obs-studio/plugins/input-overlay.nix | 2 +- .../applications/video/obs-studio/plugins/obs-freeze-filter.nix | 2 +- pkgs/applications/video/obs-studio/plugins/waveform/default.nix | 2 +- pkgs/applications/video/olive-editor/default.nix | 2 +- pkgs/applications/video/stremio/default.nix | 2 +- pkgs/applications/video/vdr/plugins.nix | 2 +- .../virtualization/looking-glass-client/default.nix | 2 +- pkgs/applications/virtualization/stratovirt/default.nix | 2 +- pkgs/by-name/an/ananicy-cpp/package.nix | 2 +- pkgs/by-name/be/beatsabermodmanager/package.nix | 2 +- pkgs/by-name/ch/chow-kick/package.nix | 2 +- pkgs/by-name/ch/chow-phaser/package.nix | 2 +- pkgs/by-name/ch/chow-tape-model/package.nix | 2 +- pkgs/by-name/ic/icomoon-feather/package.nix | 2 +- pkgs/by-name/ko/kontemplate/package.nix | 2 +- pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix | 2 +- pkgs/by-name/lo/logiops/package.nix | 2 +- pkgs/by-name/mo/moonlight-qt/package.nix | 2 +- pkgs/by-name/op/openmesh/package.nix | 2 +- pkgs/by-name/ti/tic-80/package.nix | 2 +- pkgs/by-name/vv/vvvvvv/package.nix | 2 +- pkgs/by-name/xm/xml-tooling-c/package.nix | 2 +- pkgs/data/fonts/material-design-icons/default.nix | 2 +- pkgs/data/fonts/rictydiminished-with-firacode/default.nix | 2 +- pkgs/data/icons/beauty-line-icon-theme/default.nix | 2 +- pkgs/data/icons/simp1e-cursors/default.nix | 2 +- pkgs/data/misc/colemak-dh/default.nix | 2 +- pkgs/desktops/budgie/budgie-control-center/default.nix | 2 +- pkgs/development/compilers/koka/default.nix | 2 +- pkgs/development/compilers/opendylan/default.nix | 2 +- pkgs/development/compilers/silice/default.nix | 2 +- pkgs/development/compilers/tinygo/default.nix | 2 +- pkgs/development/compilers/tvm/default.nix | 2 +- pkgs/development/compilers/z88dk/default.nix | 2 +- pkgs/development/interpreters/ceptre/default.nix | 2 +- pkgs/development/interpreters/micropython/default.nix | 2 +- pkgs/development/libraries/drogon/default.nix | 2 +- pkgs/development/libraries/hyphen/dictionaries.nix | 2 +- pkgs/development/libraries/kmsxx/default.nix | 2 +- pkgs/development/libraries/libbladeRF/default.nix | 2 +- pkgs/development/libraries/libcaption/default.nix | 2 +- pkgs/development/libraries/libsurvive/default.nix | 2 +- pkgs/development/libraries/libyuv/default.nix | 2 +- pkgs/development/libraries/rapidyaml/default.nix | 2 +- pkgs/development/libraries/science/math/osqp/default.nix | 2 +- pkgs/development/libraries/soqt/default.nix | 2 +- pkgs/development/libraries/spdk/default.nix | 2 +- pkgs/development/libraries/vkd3d-proton/default.nix | 2 +- pkgs/development/php-packages/gnupg/default.nix | 2 +- pkgs/development/python-modules/ifcopenshell/default.nix | 2 +- pkgs/development/python-modules/pcpp/default.nix | 2 +- pkgs/development/python-modules/rtmixer/default.nix | 2 +- pkgs/development/tools/analysis/pev/default.nix | 2 +- pkgs/development/tools/database/sqlcheck/default.nix | 2 +- pkgs/development/tools/glslviewer/default.nix | 2 +- pkgs/development/tools/ldid/default.nix | 2 +- pkgs/development/tools/mustache-go/default.nix | 2 +- pkgs/development/tools/out-of-tree/default.nix | 2 +- pkgs/development/tools/protoc-gen-twirp_php/default.nix | 2 +- pkgs/development/tools/revive/default.nix | 2 +- pkgs/development/tools/rtags/default.nix | 2 +- pkgs/development/tools/wabt/default.nix | 2 +- pkgs/games/leela-zero/default.nix | 2 +- pkgs/games/naev/default.nix | 2 +- pkgs/games/tennix/default.nix | 2 +- pkgs/games/unvanquished/default.nix | 2 +- pkgs/os-specific/linux/anbox/default.nix | 2 +- pkgs/os-specific/linux/kinect-audio-setup/default.nix | 2 +- pkgs/os-specific/linux/numad/default.nix | 2 +- pkgs/os-specific/linux/usbguard/default.nix | 2 +- pkgs/servers/domoticz/default.nix | 2 +- pkgs/servers/fedigroups/default.nix | 2 +- pkgs/servers/irc/atheme/default.nix | 2 +- pkgs/servers/nfd/default.nix | 2 +- pkgs/servers/nominatim/default.nix | 2 +- pkgs/servers/nosql/arangodb/default.nix | 2 +- pkgs/servers/nosql/eventstore/default.nix | 2 +- pkgs/servers/oxigraph/default.nix | 2 +- pkgs/servers/rpcbind/default.nix | 2 +- pkgs/servers/sql/postgresql/ext/smlar.nix | 2 +- pkgs/servers/sunshine/default.nix | 2 +- pkgs/servers/tarantool/default.nix | 2 +- pkgs/servers/trezord/default.nix | 2 +- pkgs/servers/zoneminder/default.nix | 2 +- pkgs/shells/zsh/zimfw/default.nix | 2 +- pkgs/tools/X11/xkb-switch-i3/default.nix | 2 +- pkgs/tools/admin/aliyun-cli/default.nix | 2 +- pkgs/tools/admin/bom/default.nix | 2 +- pkgs/tools/compression/efficient-compression-tool/default.nix | 2 +- pkgs/tools/filesystems/kdiskmark/default.nix | 2 +- pkgs/tools/filesystems/kio-fuse/default.nix | 2 +- pkgs/tools/filesystems/mtdutils/default.nix | 2 +- pkgs/tools/misc/convimg/default.nix | 2 +- pkgs/tools/misc/mmv/default.nix | 2 +- pkgs/tools/misc/sdl-jstest/default.nix | 2 +- pkgs/tools/networking/cnping/default.nix | 2 +- pkgs/tools/networking/owl/default.nix | 2 +- pkgs/tools/networking/simple-dlna-browser/default.nix | 2 +- pkgs/tools/networking/tinyfecvpn/default.nix | 2 +- pkgs/tools/package-management/appimagekit/default.nix | 2 +- pkgs/tools/security/fulcio/default.nix | 2 +- pkgs/tools/security/kdigger/default.nix | 2 +- pkgs/tools/security/libmodsecurity/default.nix | 2 +- pkgs/tools/security/shisho/default.nix | 2 +- pkgs/tools/security/vexctl/default.nix | 2 +- pkgs/tools/security/web-eid-app/default.nix | 2 +- pkgs/tools/system/datefudge/default.nix | 2 +- pkgs/tools/system/openseachest/default.nix | 2 +- pkgs/tools/text/xml/jing-trang/default.nix | 2 +- pkgs/tools/video/replay-sorcery/default.nix | 2 +- 185 files changed, 185 insertions(+), 185 deletions(-) diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index fc31d09b2dab..b841764f7961 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ="; + hash = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/delayarchitect/default.nix b/pkgs/applications/audio/delayarchitect/default.nix index a3a38c93953f..c422549d6617 100644 --- a/pkgs/applications/audio/delayarchitect/default.nix +++ b/pkgs/applications/audio/delayarchitect/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jpcima"; repo = "DelayArchitect"; rev = "5abf4dfb7f92ba604d591a2c388d2d69a9055fe3"; - sha256 = "sha256-LoK2pYPLzyJF7tDJPRYer6gKHNYzvFvX/d99TuOPECo="; + hash = "sha256-LoK2pYPLzyJF7tDJPRYer6gKHNYzvFvX/d99TuOPECo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/dexed/default.nix b/pkgs/applications/audio/dexed/default.nix index d7e8b0fd2380..9bb3937cc03d 100644 --- a/pkgs/applications/audio/dexed/default.nix +++ b/pkgs/applications/audio/dexed/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { repo = "dexed"; rev = "2c036316bcd512818aa9cc8129767ad9e0ec7132"; fetchSubmodules = true; - sha256 = "sha256-6buvA72YRlGjHWLPEZMr45lYYG6ZY+IWmylcHruX27g="; + hash = "sha256-6buvA72YRlGjHWLPEZMr45lYYG6ZY+IWmylcHruX27g="; }; postPatch = '' diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index a495e77651b0..3ec98c9bd717 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "sha256-YXJ4U5J8Za+DlXvp6QduvCHIVC2eRJ3+I/KPihCaIoY="; + hash = "sha256-YXJ4U5J8Za+DlXvp6QduvCHIVC2eRJ3+I/KPihCaIoY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index a1d1bd06ab75..68a9708e2842 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -29,7 +29,7 @@ let owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-0r7DjTrsNKZ5ZmWoA+Y9OXyJFUiUFZiPQb1skXXWYTw="; + hash = "sha256-0r7DjTrsNKZ5ZmWoA+Y9OXyJFUiUFZiPQb1skXXWYTw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/fire/default.nix b/pkgs/applications/audio/fire/default.nix index c1ccad191602..0d4691b9e4f1 100644 --- a/pkgs/applications/audio/fire/default.nix +++ b/pkgs/applications/audio/fire/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { repo = "Fire"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-X3pzTrNd0G6BouCDkr3dukQTFDzZ7qblIYxFQActKGE="; + hash = "sha256-X3pzTrNd0G6BouCDkr3dukQTFDzZ7qblIYxFQActKGE="; }; patches = [ diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 93ae0cbc2e04..8d3fb0046eed 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "brummer10"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag="; + hash = "sha256-NvmFoOAQtAnKrZgzG1Shy1HuJEWgjJloQEx6jw59hag="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 79f0c61af78e..45cf34588948 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4="; + hash = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4="; }; buildInputs = [ diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix index a7b3624546e0..afa5f592bf14 100644 --- a/pkgs/applications/audio/jacktrip/default.nix +++ b/pkgs/applications/audio/jacktrip/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { repo = "jacktrip"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-MUP+8Hjrj95D5SONIEsweB5j+kgEhLEWTKWBlEWLt94="; + hash = "sha256-MUP+8Hjrj95D5SONIEsweB5j+kgEhLEWTKWBlEWLt94="; }; preConfigure = '' diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 8b492e09cc5c..a3a0ce2b3759 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-VPHQwy2+XR9R7toIN5sNFB91ddROlL7Scr8AKLgUzuo="; + hash = "sha256-VPHQwy2+XR9R7toIN5sNFB91ddROlL7Scr8AKLgUzuo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/master_me/default.nix b/pkgs/applications/audio/master_me/default.nix index 8d8782eabdcc..6ed4a2efef60 100644 --- a/pkgs/applications/audio/master_me/default.nix +++ b/pkgs/applications/audio/master_me/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "master_me"; rev = version; fetchSubmodules = true; - sha256 = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE="; + hash = "sha256-FG3X1dOF9KRHHSnd5/zP+GrYCB2O0y+tnI5/l9tNhyE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/noisetorch/default.nix b/pkgs/applications/audio/noisetorch/default.nix index 78f50cbbedbc..5f3dfc7bf8fd 100644 --- a/pkgs/applications/audio/noisetorch/default.nix +++ b/pkgs/applications/audio/noisetorch/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { repo = "NoiseTorch"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A="; + hash = "sha256-gOPSMPH99Upi/30OnAdwSb7SaMV0i/uHB051cclfz6A="; }; vendorHash = null; diff --git a/pkgs/applications/audio/odin2/default.nix b/pkgs/applications/audio/odin2/default.nix index a6254d8c77e8..ae3a464f43b2 100644 --- a/pkgs/applications/audio/odin2/default.nix +++ b/pkgs/applications/audio/odin2/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { repo = "odin2"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY="; + hash = "sha256-N96Nb7G6hqfh8DyMtHbttl/fRZUkS8f2KfPSqeMAhHY="; }; postPatch = '' diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 3aa2b6cf6deb..a76654fdd909 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "sfztools"; repo = pname; rev = version; - sha256 = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI="; + hash = "sha256-/G9tvJ4AcBSTmo44xDDKf6et1nSn/FV5m27ztDu10kI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index 4a726e8bcc99..a204ad566d4d 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { owner = "agateau"; repo = "sfxr-qt"; rev = version; - sha256 = "sha256-JAWDk7mGkPtQ5yaA6UT9hlAy770MHrTBhBP9G8UqFKg="; + hash = "sha256-JAWDk7mGkPtQ5yaA6UT9hlAy770MHrTBhBP9G8UqFKg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/stochas/default.nix b/pkgs/applications/audio/stochas/default.nix index 4f7ff6b6b5b4..33d9b050a1ff 100644 --- a/pkgs/applications/audio/stochas/default.nix +++ b/pkgs/applications/audio/stochas/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "surge-synthesizer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg="; + hash = "sha256-L7dzUUQNCwcuQavUx9hBH0FX5KSocfeYUv5qBcPD2Vg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/surge-XT/default.nix b/pkgs/applications/audio/surge-XT/default.nix index 08dd794275d6..3169cddfa7d5 100644 --- a/pkgs/applications/audio/surge-XT/default.nix +++ b/pkgs/applications/audio/surge-XT/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "surge"; rev = "release_xt_${version}"; fetchSubmodules = true; - sha256 = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw="; + hash = "sha256-r8CZxjmH9lfCizc95jRB4je+R/74zMqRMlGIZxxxriw="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index 1638954c15c8..dc27db5ca8b3 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "zamaudio"; repo = pname; rev = version; - sha256 = "sha256-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y="; + hash = "sha256-wT1BXQrcD+TI+trqx0ZVUmVLZMTDQgJI3dAvN54wy6Y="; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index 20dcd0d491e8..096c3b0af25e 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { repo = pname; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg="; + hash = "sha256-0siAx141DZx39facXWmKbsi0rHBNpobApTdey07EcXg="; }; outputs = [ "out" "doc" ]; diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index 3939dbce3157..b380af13663a 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { repo = "aeon"; rev = "v${version}-aeon"; fetchSubmodules = true; - sha256 = "sha256-2MptLS12CUm9eUKm+V+yYpbLVwNyZeZ5HvAFyjEc4R4="; + hash = "sha256-2MptLS12CUm9eUKm+V+yYpbLVwNyZeZ5HvAFyjEc4R4="; }; nativeBuildInputs = [ cmake pkg-config git doxygen graphviz ]; diff --git a/pkgs/applications/blockchains/haven-cli/default.nix b/pkgs/applications/blockchains/haven-cli/default.nix index 69862f618bcd..4e0ae70425a2 100644 --- a/pkgs/applications/blockchains/haven-cli/default.nix +++ b/pkgs/applications/blockchains/haven-cli/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "haven-protocol-org"; repo = "haven-main"; rev = "v${version}"; - sha256 = "sha256-craPgQtavSatoVzduIQCWuakIBeXWFWa9E0ALau4AcI="; + hash = "sha256-craPgQtavSatoVzduIQCWuakIBeXWFWa9E0ALau4AcI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/editors/libresprite/default.nix b/pkgs/applications/editors/libresprite/default.nix index 70ce1fe48052..02e225a5ffe0 100644 --- a/pkgs/applications/editors/libresprite/default.nix +++ b/pkgs/applications/editors/libresprite/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "LibreSprite"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY="; + hash = "sha256-d8GmVHYomDb74iSeEhJEVTHvbiVXggXg7xSqIKCUSzY="; }; # Backport GCC 13 build fix diff --git a/pkgs/applications/editors/marker/default.nix b/pkgs/applications/editors/marker/default.nix index 7e1d61a3b172..aea005d7d906 100644 --- a/pkgs/applications/editors/marker/default.nix +++ b/pkgs/applications/editors/marker/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { repo = "Marker"; rev = version; fetchSubmodules = true; - sha256 = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0="; + hash = "sha256-HhDhigQ6Aqo8R57Yrf1i69sM0feABB9El5R5OpzOyB0="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index b60b421e5146..45004d470281 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-fwHTsTKcVaeIv0NQQBjzfXscGDfXr3X/yH07YnYh3fU="; + hash = "sha256-fwHTsTKcVaeIv0NQQBjzfXscGDfXr3X/yH07YnYh3fU="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index 95b06b960857..6a2727478389 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { owner = "shiiion"; repo = "dolphin"; rev = version; - sha256 = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk="; + hash = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/flycast/default.nix b/pkgs/applications/emulators/flycast/default.nix index 2ef186f3013c..18406054b280 100644 --- a/pkgs/applications/emulators/flycast/default.nix +++ b/pkgs/applications/emulators/flycast/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "flyinghead"; repo = "flycast"; rev = "v${version}"; - sha256 = "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU="; + hash = "sha256-YFLSUaEikwLPglHh3t8sHiKHRn5cchKzzkJlZDdgVsU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/openmsx/default.nix b/pkgs/applications/emulators/openmsx/default.nix index cc6992f7bccc..c05b882b9634 100644 --- a/pkgs/applications/emulators/openmsx/default.nix +++ b/pkgs/applications/emulators/openmsx/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "openMSX"; repo = "openMSX"; rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - sha256 = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc="; + hash = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/graphics/foxotron/default.nix b/pkgs/applications/graphics/foxotron/default.nix index c5f2d9c26fcc..d71c1999fa55 100644 --- a/pkgs/applications/graphics/foxotron/default.nix +++ b/pkgs/applications/graphics/foxotron/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { repo = "Foxotron"; rev = version; fetchSubmodules = true; - sha256 = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw="; + hash = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw="; }; patches = [ diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix index c636637763d7..5d06423b9fa4 100644 --- a/pkgs/applications/graphics/pizarra/default.nix +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { repo = "pizarra-gtk"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw="; + hash = "sha256-vnjhveX3EVIfJLiHWhlvhoPcRx1a8Nnjj7hIaPgU3Zw="; }; cargoHash = "sha256-btvMUKADGHlXLmeKF1K9Js44SljZ0MejGId8aDwPhVU="; diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 76c8b7f692af..ba4df38ab059 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs="; + hash = "sha256-+qCRHP0AbYOQBAE4zK2cmWPHZGWjjxC3DZPNm8sgBzs="; }; nativeBuildInputs = [ cmake wrapGAppsHook3 ]; diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 0c4193aa2e5d..101327cb6453 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Z88amcPb2jCJduRu8CGQ20y2o5cXmL4rpRL0hGCEYgM="; + hash = "sha256-Z88amcPb2jCJduRu8CGQ20y2o5cXmL4rpRL0hGCEYgM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index ee988b79f821..6c483c02f3c7 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -12,7 +12,7 @@ mkDerivation rec { owner = "debauchee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU="; + hash = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/cubiomes-viewer/default.nix b/pkgs/applications/misc/cubiomes-viewer/default.nix index 35d2ab711794..0d29b7921a66 100644 --- a/pkgs/applications/misc/cubiomes-viewer/default.nix +++ b/pkgs/applications/misc/cubiomes-viewer/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "Cubitect"; repo = pname; rev = version; - sha256 = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo="; + hash = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/edgetx/default.nix b/pkgs/applications/misc/edgetx/default.nix index 9e7cf60af1a1..186ad4be05c1 100644 --- a/pkgs/applications/misc/edgetx/default.nix +++ b/pkgs/applications/misc/edgetx/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E="; + hash = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E="; }; nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow qttools ]; diff --git a/pkgs/applications/misc/junction/default.nix b/pkgs/applications/misc/junction/default.nix index c59b8067b26c..66658cfe7402 100644 --- a/pkgs/applications/misc/junction/default.nix +++ b/pkgs/applications/misc/junction/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "sonnyp"; repo = "junction"; rev = "v${version}"; - sha256 = "sha256-qPseu2rzK6xp7eb/SrWK6fML/6xh4raP0MEreyZgqVI="; + hash = "sha256-qPseu2rzK6xp7eb/SrWK6fML/6xh4raP0MEreyZgqVI="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 91a2e11b3666..a516febc8ee1 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { repo = "makeself"; rev = "release-${version}"; fetchSubmodules = true; - sha256 = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g="; + hash = "sha256-15lUtErGsbXF2Gn0f0rvA18mMuVMmkKrGO2poeYZU9g="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 07cc3eb0df1a..3e2625e9a7a8 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; + hash = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index cb97ca672308..ef35db703087 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY="; + hash = "sha256-Y1nfY5iP64iSCYwzqxbjZAQNHyj4yVbSudSInm+yJzY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index e22923e2423f..a7ca6dce637d 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-Jc706BjIT3rS9zwntNOdgszP4CHuX+qxvPvWeU68Amg="; + hash = "sha256-Jc706BjIT3rS9zwntNOdgszP4CHuX+qxvPvWeU68Amg="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix index 96e0ffdfad28..1ab2edea7662 100644 --- a/pkgs/applications/misc/p2pool/default.nix +++ b/pkgs/applications/misc/p2pool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ="; + hash = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/pe-bear/default.nix b/pkgs/applications/misc/pe-bear/default.nix index 9a71d8add70e..3e55a0de0a93 100644 --- a/pkgs/applications/misc/pe-bear/default.nix +++ b/pkgs/applications/misc/pe-bear/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "hasherezade"; repo = "pe-bear"; rev = "v${version}"; - sha256 = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE="; + hash = "sha256-We3XxSsGL1mTK5DgI2wgRm7OaziI/cZRiLd+qrvZ7SE="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/resp-app/default.nix b/pkgs/applications/misc/resp-app/default.nix index efd279189351..fe4ecf32a058 100644 --- a/pkgs/applications/misc/resp-app/default.nix +++ b/pkgs/applications/misc/resp-app/default.nix @@ -39,7 +39,7 @@ mkDerivation rec { repo = "RedisDesktopManager"; fetchSubmodules = true; rev = version; - sha256 = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4="; + hash = "sha256-5eI3J2RsYE5Ejb1r8YkgzmGX2FyaCLFD0lc10J+fOT4="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix index 0dff62cca229..95eb5c77ca3a 100644 --- a/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "marvinkreis"; repo = pname; rev = version; - sha256 = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw="; + hash = "sha256-UEFv0skFzWhgFkmz1h8uV1ygW977zNq1Dw8VAawqUgw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index edd012034115..cad73779a85e 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "sha256-3XFusKeckagEPfbLtt1xAVTEfn1Qebdi/Iq1AYbHCR4="; + hash = "sha256-3XFusKeckagEPfbLtt1xAVTEfn1Qebdi/Iq1AYbHCR4="; }; preConfigure = '' diff --git a/pkgs/applications/misc/rofi/wayland.nix b/pkgs/applications/misc/rofi/wayland.nix index 51702e521e81..01a80551d953 100644 --- a/pkgs/applications/misc/rofi/wayland.nix +++ b/pkgs/applications/misc/rofi/wayland.nix @@ -16,7 +16,7 @@ rofi-unwrapped.overrideAttrs (oldAttrs: rec { repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "sha256-pKxraG3fhBh53m+bLPzCigRr6dBcH/A9vbdf67CO2d8="; + hash = "sha256-pKxraG3fhBh53m+bLPzCigRr6dBcH/A9vbdf67CO2d8="; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ]; diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 6b0d3e95721b..fe15ce3b98b0 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { owner = "symless"; repo = "synergy-core"; rev = version; - sha256 = "sha256-0QqklfSsvcXh7I2jaHk82k0nY8gQOj9haA4WOjGqBqY="; + hash = "sha256-0QqklfSsvcXh7I2jaHk82k0nY8gQOj9haA4WOjGqBqY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index 105d470d1358..0becdf511458 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "GothenburgBitFactory"; repo = "taskwarrior"; rev = "v${version}"; - sha256 = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw="; + hash = "sha256-0YveqiylXJi4cdDCfnPtwCVOJbQrZYsxnXES+9B4Yfw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix index beaf36465efe..f0cca927f753 100644 --- a/pkgs/applications/misc/timewarrior/default.nix +++ b/pkgs/applications/misc/timewarrior/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "sha256-sc4AfdXLuA9evoGU6Z97+Hq7zj9nx093+nPALRkhziQ="; + hash = "sha256-sc4AfdXLuA9evoGU6Z97+Hq7zj9nx093+nPALRkhziQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/browsers/bombadillo/default.nix b/pkgs/applications/networking/browsers/bombadillo/default.nix index f96d6014b5bc..bd39100aab38 100644 --- a/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { src = fetchgit { url = "https://tildegit.org/sloum/bombadillo.git"; rev = version; - sha256 = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0="; + hash = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix index 59b3a9de41e6..b72de922e985 100644 --- a/pkgs/applications/networking/cluster/starboard/default.nix +++ b/pkgs/applications/networking/cluster/starboard/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oOz7Dt+j2EmBL/aJUjqRST90wYpXkyREnKCcmNBQX18="; + hash = "sha256-oOz7Dt+j2EmBL/aJUjqRST90wYpXkyREnKCcmNBQX18="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 43b5e7600bce..ca8a163fd566 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c3Vhzes54xLjKV0Of7D1eFpQvIWJwcUBXvLT2p6VwBE="; + hash = "sha256-c3Vhzes54xLjKV0Of7D1eFpQvIWJwcUBXvLT2p6VwBE="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config qt6.wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index fd5fd66c66cc..c5ac50f675de 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -7,7 +7,7 @@ buildGoModule { src = fetchgit { url = "https://git.lost.host/meutraa/mm.git"; rev = "e5fa8eeb845aac8f28fc36013ee8a1dbe1e5710c"; - sha256 = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk="; + hash = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk="; }; vendorHash = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM="; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix index c0497ed86ce1..2348e1a877ec 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-lurch/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "gkdr"; repo = "lurch"; rev = "v${version}"; - sha256 = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g="; + hash = "sha256-yyzotKL1Z4B2BxloJndJKemONMPLG9pVDVe2K5AL05g="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix index 50ae99ceaecf..c3ff29cb09fb 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-signald/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "hoehermann"; repo = "libpurple-signald"; rev = "v${version}"; - sha256 = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc="; + hash = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index aaabf518b959..43f4d7adbd54 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { owner = "kotatogram"; repo = "kotatogram-desktop"; rev = "fbb22ebd3e39dfa4a036fa79a7a3f78b86b1cea2"; - sha256 = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0="; + hash = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index c8b38ccb35ec..e90b8b697130 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { owner = "davidar"; repo = "tensor"; rev = "f3f3056d770d7fb4a21c610cee7936ee900569f5"; - sha256 = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY="; + hash = "sha256-aR6TsfUxsxoSDaIWYgRCwd7BCgekSEqY6LpDoQ5DNqY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index c5aa13da0d33..d809337de02f 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "uTox"; repo = "uTox"; rev = "v${version}"; - sha256 = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc="; + hash = "sha256-DxnolxUTn+CL6TbZHKLHOUMTHhtTSWufzzOTRpKjOwc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index bae998f6cf88..5c3752046be3 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I="; + hash = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I="; }; nativeBuildInputs = [ automake diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 91ec4ee9c26e..e781ec1b1318 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -104,7 +104,7 @@ let owner = "mumble-voip"; repo = "mumble"; rev = "v${version}"; - sha256 = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4="; + hash = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4="; fetchSubmodules = true; }; }; diff --git a/pkgs/applications/science/biology/genmap/default.nix b/pkgs/applications/science/biology/genmap/default.nix index 235135cb6050..772975fc6450 100644 --- a/pkgs/applications/science/biology/genmap/default.nix +++ b/pkgs/applications/science/biology/genmap/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { repo = "genmap"; rev = "genmap-v${version}"; fetchSubmodules = true; - sha256 = "sha256-7sIKBRMNzyCrZ/c2nXkknb6a5YsXe6DRE2IFhp6AviY="; + hash = "sha256-7sIKBRMNzyCrZ/c2nXkknb6a5YsXe6DRE2IFhp6AviY="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/biology/sambamba/default.nix b/pkgs/applications/science/biology/sambamba/default.nix index b6635f02aacd..e62a5bb14aae 100644 --- a/pkgs/applications/science/biology/sambamba/default.nix +++ b/pkgs/applications/science/biology/sambamba/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "biod"; repo = "sambamba"; rev = "v${version}"; - sha256 = "sha256-3O9bHGpMuCgdR2Wm7Dv1VUjMT1QTn8K1hdwgjvwhFDw="; + hash = "sha256-3O9bHGpMuCgdR2Wm7Dv1VUjMT1QTn8K1hdwgjvwhFDw="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index cff52d67dc47..061043a67d41 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Vyp7asVqvKFkkEb67LXapMkT1AQSburN3+B2dXIPcEU="; + hash = "sha256-Vyp7asVqvKFkkEb67LXapMkT1AQSburN3+B2dXIPcEU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/electronics/openboardview/default.nix b/pkgs/applications/science/electronics/openboardview/default.nix index 4aa9ab2b66f2..60ee6cef7753 100644 --- a/pkgs/applications/science/electronics/openboardview/default.nix +++ b/pkgs/applications/science/electronics/openboardview/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "OpenBoardView"; repo = "OpenBoardView"; rev = version; - sha256 = "sha256-sKDDOPpCagk7rBRlMlZhx+RYYbtoLzJsrnL8qKZMKW8="; + hash = "sha256-sKDDOPpCagk7rBRlMlZhx+RYYbtoLzJsrnL8qKZMKW8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 03117d4e0328..a6354a091665 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { repo = "sml-redprl"; rev = "c72190de76f7ed1cfbe1d2046c96e99ac5022b0c"; fetchSubmodules = true; - sha256 = "sha256-xrQT5o0bsIN+mCYUOz9iY4+j3HGROb1I6R2ADcLy8n4="; + hash = "sha256-xrQT5o0bsIN+mCYUOz9iY4+j3HGROb1I6R2ADcLy8n4="; }; buildInputs = [ mlton ]; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 1e317fdec03e..75bd2278d606 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -53,7 +53,7 @@ let owner = "shogun-toolbox"; repo = "shogun"; rev = "shogun_${version}"; - sha256 = "sha256-38aULxK50wQ2+/ERosSpRyBmssmYSGv5aaWfWSlrSRc="; + hash = "sha256-38aULxK50wQ2+/ERosSpRyBmssmYSGv5aaWfWSlrSRc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/math/scalp/default.nix b/pkgs/applications/science/math/scalp/default.nix index fc230a11966f..f6ec20faff59 100644 --- a/pkgs/applications/science/math/scalp/default.nix +++ b/pkgs/applications/science/math/scalp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { url = "https://digidev.digi.e-technik.uni-kassel.de/git/scalp.git"; # mirrored at https://git.sr.ht/~weijia/scalp rev = "185b84e4ff967f42cf2de5db4db4e6fa0cc18fb8"; - sha256 = "sha256-NyMZdJwdD3FR6uweYCclJjfcf3Y24Bns1ViwsmJ5izg="; + hash = "sha256-NyMZdJwdD3FR6uweYCclJjfcf3Y24Bns1ViwsmJ5izg="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index d1b17eccee23..ee84ae440b30 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { # if a release is tagged (which sometimes does not happen), it will # be in the format below. rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; - sha256 = "sha256-5JZgI5lnfX4JlBSEAL7Wv6uao/57GBaMqwgslJt9Bjk="; + hash = "sha256-5JZgI5lnfX4JlBSEAL7Wv6uao/57GBaMqwgslJt9Bjk="; # the repository's .gitattributes file contains the lines "/Tst/ # export-ignore" and "/doc/ export-ignore" so some directories are diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index 35f46f7a4552..57c4367d2a82 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "cdcseacave"; repo = "openmvs"; rev = "v${version}"; - sha256 = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8="; + hash = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/networking/sumo/default.nix b/pkgs/applications/science/networking/sumo/default.nix index 6f5be3df816e..ad50200c1a83 100644 --- a/pkgs/applications/science/networking/sumo/default.nix +++ b/pkgs/applications/science/networking/sumo/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "eclipse"; repo = "sumo"; rev = "v${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-y/bkdDWrb1KB0EOVSJPfPVYHGp/zQ2+Shb6eLsFQRNQ="; + hash = "sha256-y/bkdDWrb1KB0EOVSJPfPVYHGp/zQ2+Shb6eLsFQRNQ="; fetchSubmodules = true; }; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 02849d098dd2..211cc66fb529 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LKERjHoIgJ4cF1MjB5nVW3FB/DrmKP4Xj58avsDobhc="; + hash = "sha256-LKERjHoIgJ4cF1MjB5nVW3FB/DrmKP4Xj58avsDobhc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index fdf353646717..55544e5f461f 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "stsdc"; repo = "monitor"; rev = version; - sha256 = "sha256-Eo0nwATKrx6SmTsaXe3oFIkp0BUTmjcjIc3Vjt+Cr20="; + hash = "sha256-Eo0nwATKrx6SmTsaXe3oFIkp0BUTmjcjIc3Vjt+Cr20="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index c09b2c8170d4..9e4eda8a0790 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { owner = "mattbas"; repo = "${pname}"; rev = version; - sha256 = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig="; + hash = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index 67df0dd420b0..00c2467624b8 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "hyperion-project"; repo = pname; rev = version; - sha256 = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc="; + hash = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc="; # needed for `dependencies/external/`: # * rpi_ws281x` - not possible to use as a "system" lib # * qmdnsengine - not in nixpkgs yet diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 557eba2b87b1..19546092459d 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -9,7 +9,7 @@ mkDerivation rec { version = "3.9.3"; src = fetchFromGitHub { - sha256 = "sha256-ROqROQsV8ddrxYT5mMdkf6rCgCoGr1jpxQ1ohcoEaQs="; + hash = "sha256-ROqROQsV8ddrxYT5mMdkf6rCgCoGr1jpxQ1ohcoEaQs="; rev = version; repo = "minitube"; owner = "flaviotordini"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 66e20b4e56ff..0897c0041f5a 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - sha256 = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo="; + hash = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix index 9f13de284740..bd47a3e94436 100644 --- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix +++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "univrsal"; repo = "input-overlay"; rev = "v${version}"; - sha256 = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o="; + hash = "sha256-9HqEz+KnTt8MyhwqFWjalbl3H/DCzumckXMctCGhs3o="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix index 1460e77fbf86..0bec9181e19c 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "exeldro"; repo = "obs-freeze-filter"; rev = finalAttrs.version; - sha256 = "sha256-CaHBTfdk8VFjmiclG61elj35glQafgz5B4ENo+7J35o="; + hash = "sha256-CaHBTfdk8VFjmiclG61elj35glQafgz5B4ENo+7J35o="; fetchSubmodules = true; }; diff --git a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix index 00fcf4298d5d..eca8ba6310e3 100644 --- a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "phandasm"; repo = "waveform"; rev = "v${version}"; - sha256 = "sha256-NcBtj+5X9tPH853a6oXzQCBH26hx8Yt17WjP9ryvgmc="; + hash = "sha256-NcBtj+5X9tPH853a6oXzQCBH26hx8Yt17WjP9ryvgmc="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 514da9c50d75..ea4c7a3f711d 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { owner = "olive-editor"; repo = "olive"; rev = "2036fffffd0e24b7458e724b9084ae99c9507c64"; - sha256 = "sha256-qee9/WTvTy5jWLowvZJOwAjrqznRhJR+u9dYsnCN/Qs="; + hash = "sha256-qee9/WTvTy5jWLowvZJOwAjrqznRhJR+u9dYsnCN/Qs="; }; cmakeFlags = [ diff --git a/pkgs/applications/video/stremio/default.nix b/pkgs/applications/video/stremio/default.nix index 0aa5ab26e653..1abb8f87bb29 100644 --- a/pkgs/applications/video/stremio/default.nix +++ b/pkgs/applications/video/stremio/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-Gky0/HaGm11PeV4twoQV71T99NG2o0mYzQxu/c9x5oE="; + hash = "sha256-Gky0/HaGm11PeV4twoQV71T99NG2o0mYzQxu/c9x5oE="; }; server = fetchurl { diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 6890df0bdca6..a0d12156f774 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -176,7 +176,7 @@ in { owner = "jowi24"; repo = "vdr-fritz"; rev = version; - sha256 = "sha256-DGD73i+ZHFgtCo+pMj5JaMovvb5vS1x20hmc5t29//o="; + hash = "sha256-DGD73i+ZHFgtCo+pMj5JaMovvb5vS1x20hmc5t29//o="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index a3eaea0cfd78..62e65aec3ad8 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "sha256-ne1Q+67+P8RHcTsqdiSSwkFf0g3pSNT91WN/lsSzssU="; + hash = "sha256-ne1Q+67+P8RHcTsqdiSSwkFf0g3pSNT91WN/lsSzssU="; fetchSubmodules = true; }; diff --git a/pkgs/applications/virtualization/stratovirt/default.nix b/pkgs/applications/virtualization/stratovirt/default.nix index d9324d455c5c..7070387fc585 100644 --- a/pkgs/applications/virtualization/stratovirt/default.nix +++ b/pkgs/applications/virtualization/stratovirt/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://gitee.com/openeuler/stratovirt.git"; rev = "v${version}"; - sha256 = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI="; + hash = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI="; }; cargoSha256 = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I="; diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix index 527e9ccd585a..1906773921b4 100644 --- a/pkgs/by-name/an/ananicy-cpp/package.nix +++ b/pkgs/by-name/an/ananicy-cpp/package.nix @@ -23,7 +23,7 @@ clangStdenv.mkDerivation rec { repo = "ananicy-cpp"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY="; + hash = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY="; }; patches = [ diff --git a/pkgs/by-name/be/beatsabermodmanager/package.nix b/pkgs/by-name/be/beatsabermodmanager/package.nix index d21283e0952c..1753d5b5862b 100644 --- a/pkgs/by-name/be/beatsabermodmanager/package.nix +++ b/pkgs/by-name/be/beatsabermodmanager/package.nix @@ -25,7 +25,7 @@ buildDotnetModule rec { owner = "affederaffe"; repo = "BeatSaberModManager"; rev = "v${version}"; - sha256 = "sha256-HHWC+MAwJ+AMCuBzSuR7FbW3k+wLri0B9J1DftyfNEU="; + hash = "sha256-HHWC+MAwJ+AMCuBzSuR7FbW3k+wLri0B9J1DftyfNEU="; fetchSubmodules = true; # It vendors BSIPA-Linux }; diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix index 990422f0ef4b..25eae2931c03 100644 --- a/pkgs/by-name/ch/chow-kick/package.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Chowdhury-DSP"; repo = "ChowKick"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-YYcNiJGGw21aVY03tyQLu3wHCJhxYiDNJZ+LWNbQdj4="; + hash = "sha256-YYcNiJGGw21aVY03tyQLu3wHCJhxYiDNJZ+LWNbQdj4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix index fd329070d0aa..87f22c9da1c5 100644 --- a/pkgs/by-name/ch/chow-phaser/package.nix +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "ChowPhaser"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-9wo7ZFMruG3QNvlpILSvrFh/Sx6J1qnlWc8+aQyS4tQ="; + hash = "sha256-9wo7ZFMruG3QNvlpILSvrFh/Sx6J1qnlWc8+aQyS4tQ="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 89c58fcaf4b1..a233e2352d7f 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "jatinchowdhury18"; repo = "AnalogTapeModel"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM="; + hash = "sha256-WriHi68Y6hAsrwE+74JtVlAKUR9lfTczj6UK9h2FOGM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ic/icomoon-feather/package.nix b/pkgs/by-name/ic/icomoon-feather/package.nix index 916b40eb3b0d..fd16c313bf50 100644 --- a/pkgs/by-name/ic/icomoon-feather/package.nix +++ b/pkgs/by-name/ic/icomoon-feather/package.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation { repo = "polybar-themes"; rev = "adb6a4546a8351a469fa779df173e46b69aa1ac3"; sparseCheckout = [ "fonts/panels/icomoon_feather.ttf" ]; - sha256 = "sha256-QL7/pfIqOd2JOm6rkH+P4rMg0AhGllfkReQ03YeGW+8="; + hash = "sha256-QL7/pfIqOd2JOm6rkH+P4rMg0AhGllfkReQ03YeGW+8="; }; installPhase = '' diff --git a/pkgs/by-name/ko/kontemplate/package.nix b/pkgs/by-name/ko/kontemplate/package.nix index 6ab1a96f3ad2..0b0689e44439 100644 --- a/pkgs/by-name/ko/kontemplate/package.nix +++ b/pkgs/by-name/ko/kontemplate/package.nix @@ -8,7 +8,7 @@ buildGoModule { src = fetchgit { url = "https://code.tvl.fyi/depot.git"; - sha256 = "sha256-Cv/y1Tj+hUKP0gi9ceS1Gml1WRYbUGSeWfJfXyX6dLA="; + hash = "sha256-Cv/y1Tj+hUKP0gi9ceS1Gml1WRYbUGSeWfJfXyX6dLA="; rev = "b16ddb54b0327606cec2df220eaabb1328e18e3e"; }; diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index 573fd5ad5b63..4c76d021a405 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "sha256-JrAYtoS8wNmmhbgnprD7vNz1N64ekIryjK77rAKTyaQ="; + hash = "sha256-JrAYtoS8wNmmhbgnprD7vNz1N64ekIryjK77rAKTyaQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/lo/logiops/package.nix b/pkgs/by-name/lo/logiops/package.nix index 0ed72e05b4ad..f342da11610d 100644 --- a/pkgs/by-name/lo/logiops/package.nix +++ b/pkgs/by-name/lo/logiops/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (oldAttrs: { owner = "PixlOne"; repo = "logiops"; rev = "v${oldAttrs.version}"; - sha256 = "sha256-IL7jQA3lGhxVLYCFRgeXdadaBlQr+Op9cedHBlLUCWY="; + hash = "sha256-IL7jQA3lGhxVLYCFRgeXdadaBlQr+Op9cedHBlLUCWY="; # In v0.3.0, the `ipcgull` submodule was added as a dependency # https://github.com/PixlOne/logiops/releases/tag/v0.3.0 fetchSubmodules = true; diff --git a/pkgs/by-name/mo/moonlight-qt/package.nix b/pkgs/by-name/mo/moonlight-qt/package.nix index f94a40ac220c..2f8749c82ca1 100644 --- a/pkgs/by-name/mo/moonlight-qt/package.nix +++ b/pkgs/by-name/mo/moonlight-qt/package.nix @@ -42,7 +42,7 @@ stdenv'.mkDerivation rec { owner = "moonlight-stream"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zrl8WPXvQ/7FTqFnpwoXEJ85prtgJWoWNsdckw5+JHI="; + hash = "sha256-zrl8WPXvQ/7FTqFnpwoXEJ85prtgJWoWNsdckw5+JHI="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/op/openmesh/package.nix b/pkgs/by-name/op/openmesh/package.nix index c391517d6044..2a1e065044a8 100644 --- a/pkgs/by-name/op/openmesh/package.nix +++ b/pkgs/by-name/op/openmesh/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "OpenMesh"; rev = "OpenMesh-${lib.versions.majorMinor finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-1FmAieCaskKaaAWjgEXr/CWpFxrhB2Rca1sXpxLrQHw="; + hash = "sha256-1FmAieCaskKaaAWjgEXr/CWpFxrhB2Rca1sXpxLrQHw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix index 27fcb0ebcfc8..0e82c4eb44d5 100644 --- a/pkgs/by-name/ti/tic-80/package.nix +++ b/pkgs/by-name/ti/tic-80/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { owner = "nesbox"; repo = "TIC-80"; rev = "v" + version; - sha256 = "sha256-p7OyuD/4KxAzylQDlXW681TvEZwKYDD4zq2KDRkcv48="; + hash = "sha256-p7OyuD/4KxAzylQDlXW681TvEZwKYDD4zq2KDRkcv48="; # TIC-80 vendors its dependencies as submodules, so to use its current build system, # we need to fetch them. Managing the dependencies ourselves would require a lot of # changes in the build system, which doesn't seem worth it right now. In future versions, diff --git a/pkgs/by-name/vv/vvvvvv/package.nix b/pkgs/by-name/vv/vvvvvv/package.nix index 6d11bafa746f..848a23919519 100644 --- a/pkgs/by-name/vv/vvvvvv/package.nix +++ b/pkgs/by-name/vv/vvvvvv/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "TerryCavanagh"; repo = "VVVVVV"; rev = version; - sha256 = "sha256-HosrYBzx1Kh7rQIH7IAoOTPgpm4lgYOVR3MWtWX3usQ="; + hash = "sha256-HosrYBzx1Kh7rQIH7IAoOTPgpm4lgYOVR3MWtWX3usQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/xm/xml-tooling-c/package.nix b/pkgs/by-name/xm/xml-tooling-c/package.nix index 1da208f9bc3d..921175c3e879 100644 --- a/pkgs/by-name/xm/xml-tooling-c/package.nix +++ b/pkgs/by-name/xm/xml-tooling-c/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://git.shibboleth.net/git/cpp-xmltooling.git"; rev = version; - sha256 = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU="; + hash = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU="; }; buildInputs = [ diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 0dfb560e3581..ebd33b88b650 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -12,7 +12,7 @@ stdenvNoCC.mkDerivation rec { owner = "Templarian"; repo = "MaterialDesign-Webfont"; rev = "v${version}"; - sha256 = "sha256-7t3i3nPJZ/tRslLBfY+9kXH8TR145GC2hPFYJeMHRL8="; + hash = "sha256-7t3i3nPJZ/tRslLBfY+9kXH8TR145GC2hPFYJeMHRL8="; sparseCheckout = [ "fonts" ]; }; diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index ad1b45061880..d5ff8b1513b1 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "hakatashi"; repo = "RictyDiminished-with-FiraCode"; rev = version; - sha256 = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4="; + hash = "sha256-twh3yLAM4MUjWzSDNmo8gNIRf01hieXeOS334sNdFk4="; fetchSubmodules = true; }; diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/data/icons/beauty-line-icon-theme/default.nix index dc332b0fc328..c46eddf5c356 100644 --- a/pkgs/data/icons/beauty-line-icon-theme/default.nix +++ b/pkgs/data/icons/beauty-line-icon-theme/default.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { sparseCheckout = [ "BeautyLine-V3" ]; - sha256 = "sha256-IkkypAj250+OXbf19TampCnqYsSbJVIjeYlxJoyhpzk="; + hash = "sha256-IkkypAj250+OXbf19TampCnqYsSbJVIjeYlxJoyhpzk="; }; sourceRoot = "${src.name}/BeautyLine-V3"; diff --git a/pkgs/data/icons/simp1e-cursors/default.nix b/pkgs/data/icons/simp1e-cursors/default.nix index 6e20c13465d1..fd2cd4fd9daa 100644 --- a/pkgs/data/icons/simp1e-cursors/default.nix +++ b/pkgs/data/icons/simp1e-cursors/default.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation rec { owner = "cursors"; repo = "simp1e"; rev = version; - sha256 = "sha256-3DCF6TwxWwYK5pF2Ykr3OwF76H7J03vLNZch/XoZZZk="; + hash = "sha256-3DCF6TwxWwYK5pF2Ykr3OwF76H7J03vLNZch/XoZZZk="; fetchSubmodules = true; }; diff --git a/pkgs/data/misc/colemak-dh/default.nix b/pkgs/data/misc/colemak-dh/default.nix index e37878888592..6acf1488d79b 100644 --- a/pkgs/data/misc/colemak-dh/default.nix +++ b/pkgs/data/misc/colemak-dh/default.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { owner = "ColemakMods"; repo = "mod-dh"; rev = "e846a5bd24d59ed15ba70b3a9d5363a38ca51d09"; - sha256 = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; + hash = "sha256-RFOpN+tIMfakb7AZN0ock9eq2mytvL0DWedvQV67+ks="; sparseCheckout = [ "console" ]; }; diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index 015b8ca97083..1964b0ce5230 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "budgie-control-center"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY="; + hash = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY="; }; patches = [ diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index c280d2fb7e70..524dfc209594 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -37,7 +37,7 @@ let owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-BNkMtYf5maWtKEZzob+218ke1SIkrP7/nboQ2sZKkxI="; + hash = "sha256-BNkMtYf5maWtKEZzob+218ke1SIkrP7/nboQ2sZKkxI="; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index b34f348519af..42bd79c90519 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { owner = "dylan-lang"; repo = "opendylan"; rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; - sha256 = "sha256-i1wr4mBUbZhL8ENFGz8gV/mMzSJsj1AdJLd4WU9tIQM="; + hash = "sha256-i1wr4mBUbZhL8ENFGz8gV/mMzSJsj1AdJLd4WU9tIQM="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/silice/default.nix b/pkgs/development/compilers/silice/default.nix index 871219a28dce..fd3d0ba1538d 100644 --- a/pkgs/development/compilers/silice/default.nix +++ b/pkgs/development/compilers/silice/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "sylefeb"; repo = "silice"; rev = "5ba9ef0d03b3c8d4a43efe10acfb51c97d3679ef"; - sha256 = "sha256-LrLUaCpwzaxH02TGyEfARIumPi0s2REc1g79fSxJjFc="; + hash = "sha256-LrLUaCpwzaxH02TGyEfARIumPi0s2REc1g79fSxJjFc="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 36412b7993a9..a2bbf561a379 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "sha256-e0zXxIdAtJZXJdP/S6lHRnPm5Rsf638Fhox8XcqOWrk="; + hash = "sha256-e0zXxIdAtJZXJdP/S6lHRnPm5Rsf638Fhox8XcqOWrk="; fetchSubmodules = true; }; diff --git a/pkgs/development/compilers/tvm/default.nix b/pkgs/development/compilers/tvm/default.nix index 97c335cff09f..cb8705eb4de0 100644 --- a/pkgs/development/compilers/tvm/default.nix +++ b/pkgs/development/compilers/tvm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { repo = "incubator-tvm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-g8Z5MRM3KIgCjGxtU9JLEsFUjFxPKmc6OwY17C59cxg="; + hash = "sha256-g8Z5MRM3KIgCjGxtU9JLEsFUjFxPKmc6OwY17C59cxg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/z88dk/default.nix b/pkgs/development/compilers/z88dk/default.nix index a3217f5732c2..cd95406c84d8 100644 --- a/pkgs/development/compilers/z88dk/default.nix +++ b/pkgs/development/compilers/z88dk/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "z88dk"; repo = "z88dk"; rev = "v${version}"; - sha256 = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44="; + hash = "sha256-CHTORgK6FYIO6n+cvTUX4huY2Ek5FuHrs40QN5NZX44="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index 702288637908..f73631ff8d3b 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "chrisamaphone"; repo = "interactive-lp"; rev = "e436fda2ccd44e9c9d226feced9d204311deacf5"; - sha256 = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w="; + hash = "sha256-COYrE9O/Y1/ZBNHNakBwrUVklCuk144RF9bjwa3rl5w="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/micropython/default.nix b/pkgs/development/interpreters/micropython/default.nix index 4b9893f228c9..25097e087606 100644 --- a/pkgs/development/interpreters/micropython/default.nix +++ b/pkgs/development/interpreters/micropython/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "micropython"; repo = "micropython"; rev = "v${version}"; - sha256 = "sha256-sfJohmsqq5FumUoVE8x3yWv12DiCJJXae62br0j+190="; + hash = "sha256-sfJohmsqq5FumUoVE8x3yWv12DiCJJXae62br0j+190="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 1710d6046e33..63f387db9046 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "drogonframework"; repo = "drogon"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-P6blu3EIBzmK1zikFPiV+tvFLfiQhK+cRdClQOhcBSU="; + hash = "sha256-P6blu3EIBzmK1zikFPiV+tvFLfiQhK+cRdClQOhcBSU="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/hyphen/dictionaries.nix b/pkgs/development/libraries/hyphen/dictionaries.nix index 39569441bdec..dcaa7f062a6a 100644 --- a/pkgs/development/libraries/hyphen/dictionaries.nix +++ b/pkgs/development/libraries/hyphen/dictionaries.nix @@ -16,7 +16,7 @@ let src = fetchgit { url = "https://anongit.freedesktop.org/git/libreoffice/dictionaries.git"; rev = "a2bf59878dd76685803ec260e15d875746ad6e25"; - sha256 = "sha256-3CvjgNjsrm4obATK6LmtYob8i2ngTbwP6FB4HlJMPCE="; + hash = "sha256-3CvjgNjsrm4obATK6LmtYob8i2ngTbwP6FB4HlJMPCE="; }; meta = with lib; { description = "Hyphen dictionary for ${shortDescription} from LibreOffice"; diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index a07bc73a64ce..78fd58f15141 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { repo = "kmsxx"; fetchSubmodules = true; rev = "54f591ec0de61dd192baf781c9b2ec87d5b461f7"; - sha256 = "sha256-j+20WY4a2iTKZnYjXhxbNnZZ53K3dHpDMTp+ZulS+7c="; + hash = "sha256-j+20WY4a2iTKZnYjXhxbNnZZ53K3dHpDMTp+ZulS+7c="; }; # Didn't detect pybind11 without cmake diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 158493b80e90..94d1257d0e7d 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "Nuand"; repo = "bladeRF"; rev = "libbladeRF_v${version}"; - sha256 = "sha256-H40w5YKp6M3QLrsPhILEnJiWutCYLtbgC4a63sV397Q="; + hash = "sha256-H40w5YKp6M3QLrsPhILEnJiWutCYLtbgC4a63sV397Q="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libcaption/default.nix b/pkgs/development/libraries/libcaption/default.nix index 78cf5214051d..0070aa3524ee 100644 --- a/pkgs/development/libraries/libcaption/default.nix +++ b/pkgs/development/libraries/libcaption/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "szatmary"; repo = "libcaption"; rev = finalAttrs.version; - sha256 = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo="; + hash = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/libsurvive/default.nix b/pkgs/development/libraries/libsurvive/default.nix index fae57569067a..53ebe6f18e41 100644 --- a/pkgs/development/libraries/libsurvive/default.nix +++ b/pkgs/development/libraries/libsurvive/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; # Fixes 'Unknown CMake command "cnkalman_generate_code"' fetchSubmodules = true; - sha256 = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk="; + hash = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libyuv/default.nix b/pkgs/development/libraries/libyuv/default.nix index 77e32c09de8f..68d3b5ff2789 100644 --- a/pkgs/development/libraries/libyuv/default.nix +++ b/pkgs/development/libraries/libyuv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://chromium.googlesource.com/libyuv/libyuv.git"; rev = "eb6e7bb63738e29efd82ea3cf2a115238a89fa51"; # refs/heads/stable - sha256 = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU="; + hash = "sha256-DtRYoaAXb9ZD2OLiKbzKzH5vzuu+Lzu4eHaDgPB9hjU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/rapidyaml/default.nix b/pkgs/development/libraries/rapidyaml/default.nix index 2af9968c842c..e67719d1428b 100644 --- a/pkgs/development/libraries/rapidyaml/default.nix +++ b/pkgs/development/libraries/rapidyaml/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { repo = pname; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-VpREG75d+Rmfu8B2VTWueJtfEZwKxGUFb8E3OwVy1L4="; + hash = "sha256-VpREG75d+Rmfu8B2VTWueJtfEZwKxGUFb8E3OwVy1L4="; }; nativeBuildInputs = [ cmake git ]; diff --git a/pkgs/development/libraries/science/math/osqp/default.nix b/pkgs/development/libraries/science/math/osqp/default.nix index d308302e2c9f..bcb103168466 100644 --- a/pkgs/development/libraries/science/math/osqp/default.nix +++ b/pkgs/development/libraries/science/math/osqp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "oxfordcontrol"; repo = "osqp"; rev = "v${version}"; - sha256 = "sha256-enkK5EFyAeLaUnHNYS3oq43HsHY5IuSLgsYP0k/GW8c="; + hash = "sha256-enkK5EFyAeLaUnHNYS3oq43HsHY5IuSLgsYP0k/GW8c="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index fe7901bddd58..3ce5f8e7bec1 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { repo = "soqt"; # rev = "SoQt-${version}"; rev = "fb8f655632bb9c9c60e0ff9fa69a5ba22d3ff99d"; - sha256 = "sha256-YoBq8P3Tag2Sepqxf/qIcJDBhH/gladBmDUj78aacZs="; + hash = "sha256-YoBq8P3Tag2Sepqxf/qIcJDBhH/gladBmDUj78aacZs="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 4541042ed5c5..abd87c03b1a8 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "sha256-kjZWaarvNSYXseJ/uH7Ak7DbWEgrLnAwXcL8byJ9fjU="; + hash = "sha256-kjZWaarvNSYXseJ/uH7Ak7DbWEgrLnAwXcL8byJ9fjU="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/vkd3d-proton/default.nix b/pkgs/development/libraries/vkd3d-proton/default.nix index 7616db1e021e..e930d19ba423 100644 --- a/pkgs/development/libraries/vkd3d-proton/default.nix +++ b/pkgs/development/libraries/vkd3d-proton/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { owner = "HansKristian-Work"; repo = pname; inherit rev; - sha256 = "sha256-iLpVvYmWhqy0rbbyJoT+kxzIqp68Vsb/TkihGtQQucU="; + hash = "sha256-iLpVvYmWhqy0rbbyJoT+kxzIqp68Vsb/TkihGtQQucU="; fetchSubmodules = true; }; diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix index 7e646e151cf2..6b5e7e326ec5 100644 --- a/pkgs/development/php-packages/gnupg/default.nix +++ b/pkgs/development/php-packages/gnupg/default.nix @@ -20,7 +20,7 @@ buildPecl { repo = "php-gnupg"; rev = "gnupg-${version}"; fetchSubmodules = true; - sha256 = "sha256-kEc0883sYgmAf1mkH0zRjHzUASnZgQvdYE6VzT5X2RI="; + hash = "sha256-kEc0883sYgmAf1mkH0zRjHzUASnZgQvdYE6VzT5X2RI="; }; buildInputs = [ gpgme ]; diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 5c67a8ee5c2d..6e17149079cf 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { repo = "IfcOpenShell"; rev = "refs/tags/blenderbim-${version}"; fetchSubmodules = true; - sha256 = "sha256-fCgxSambC01qb14EoZTrVxNNw8H3nX8oMi6gk0O/HmQ="; + hash = "sha256-fCgxSambC01qb14EoZTrVxNNw8H3nX8oMi6gk0O/HmQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index a0311740164d..0fb4547ffd01 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "ned14"; repo = "pcpp"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Fs+CMV4eRKcB+KdV93ncgcqaMnO5etnMY/ivmSJh3Wc="; + hash = "sha256-Fs+CMV4eRKcB+KdV93ncgcqaMnO5etnMY/ivmSJh3Wc="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/rtmixer/default.nix b/pkgs/development/python-modules/rtmixer/default.nix index 0f8be5e13d20..994cd103c18f 100644 --- a/pkgs/development/python-modules/rtmixer/default.nix +++ b/pkgs/development/python-modules/rtmixer/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "spatialaudio"; repo = "python-rtmixer"; rev = "refs/tags/${version}"; - sha256 = "sha256-S8aVfxoG0o5GarDX5ZIDQ3GKOT32NtttQJ449FI9Fy0="; + hash = "sha256-S8aVfxoG0o5GarDX5ZIDQ3GKOT32NtttQJ449FI9Fy0="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/analysis/pev/default.nix b/pkgs/development/tools/analysis/pev/default.nix index 75cdc15cdca0..56b72c24c421 100644 --- a/pkgs/development/tools/analysis/pev/default.nix +++ b/pkgs/development/tools/analysis/pev/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "merces"; repo = "pev"; rev = "beec2b4f09585fea919ed41ce466dee06be0b6bf"; - sha256 = "sha256-HrMbk9YbuqkoBBM7+rfXpqVEnd1rDl2rMePdcfU1WDg="; + hash = "sha256-HrMbk9YbuqkoBBM7+rfXpqVEnd1rDl2rMePdcfU1WDg="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/database/sqlcheck/default.nix b/pkgs/development/tools/database/sqlcheck/default.nix index 85be37cb19bc..0673061c486d 100644 --- a/pkgs/development/tools/database/sqlcheck/default.nix +++ b/pkgs/development/tools/database/sqlcheck/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "jarulraj"; repo = "sqlcheck"; rev = "v${version}"; - sha256 = "sha256-rGqCtEO2K+OT44nYU93mF1bJ07id+ixPkRSC8DcO6rY="; + hash = "sha256-rGqCtEO2K+OT44nYU93mF1bJ07id+ixPkRSC8DcO6rY="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index fd84492da6ae..809a674a36a9 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { repo = "glslViewer"; fetchSubmodules = true; rev = version; - sha256 = "sha256-Ve3wmX5+kABCu8IRe4ySrwsBJm47g1zvMqDbqrpQl88="; + hash = "sha256-Ve3wmX5+kABCu8IRe4ySrwsBJm47g1zvMqDbqrpQl88="; }; nativeBuildInputs = [cmake ninja pkg-config]; buildInputs = diff --git a/pkgs/development/tools/ldid/default.nix b/pkgs/development/tools/ldid/default.nix index 40cfc1e53ff5..fc8692205fc5 100644 --- a/pkgs/development/tools/ldid/default.nix +++ b/pkgs/development/tools/ldid/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.saurik.com/ldid.git"; rev = "v${version}"; - sha256 = "sha256-RM5pU3mrgyvwNfWKNvCT3UYVGKtVhD7ifgp8fq9xXiM="; + hash = "sha256-RM5pU3mrgyvwNfWKNvCT3UYVGKtVhD7ifgp8fq9xXiM="; }; strictDeps = true; diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index c6d8966d5014..6c93c272164b 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { repo = "mustache"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-A7LIkidhpFmhIjiDu9KdmSIdqFNsV3N8J2QEo7yT+DE="; + hash = "sha256-A7LIkidhpFmhIjiDu9KdmSIdqFNsV3N8J2QEo7yT+DE="; }; vendorHash = "sha256-FYdsLcW6FYxSgixZ5US9cBPABOAVwidC3ejUNbs1lbA="; diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 72f7d8b76a60..2d6fb694318f 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { src = fetchgit { rev = "refs/tags/v${version}"; url = "https://code.dumpstack.io/tools/${pname}.git"; - sha256 = "sha256-XzO8NU7A5m631PjAm0F/K7qLrD+ZDSdHXaNowGaZAPo="; + hash = "sha256-XzO8NU7A5m631PjAm0F/K7qLrD+ZDSdHXaNowGaZAPo="; }; vendorHash = "sha256-p1dqzng3ak9lrnzrEABhE1TP1lM2Ikc8bmvp5L3nUp0="; diff --git a/pkgs/development/tools/protoc-gen-twirp_php/default.nix b/pkgs/development/tools/protoc-gen-twirp_php/default.nix index 6833bd9a65a4..460f29bf5cf3 100644 --- a/pkgs/development/tools/protoc-gen-twirp_php/default.nix +++ b/pkgs/development/tools/protoc-gen-twirp_php/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { src = fetchgit { url = "https://github.com/twirphp/twirp.git"; rev = "v${version}"; - sha256 = "sha256-LUFwmxlbZVTlEyp82lm3ylh6KYtVlviYK13pxj4MH0M="; + hash = "sha256-LUFwmxlbZVTlEyp82lm3ylh6KYtVlviYK13pxj4MH0M="; }; vendorHash = "sha256-BPvKRIYvIxen0m8C9geFC4gIq4VH8mmdI0ZLMnlBB/I="; diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index 099bc7476c91..8acdef07d2fe 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z5areIRlCyjUbusAdfL49mm5+J0UryWrS5/9Ttw16Po="; + hash = "sha256-Z5areIRlCyjUbusAdfL49mm5+J0UryWrS5/9Ttw16Po="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index 7ee983ef6f9b..3710cb6122a8 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "andersbakken"; repo = "rtags"; rev = "v${version}"; - sha256 = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c="; + hash = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c="; fetchSubmodules = true; # unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index c6541eb5b30a..d4454dd5459b 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "sha256-oWyHR2HRDA/N5Rm9EXhOi+lZ2N7In6HmE74ZL2Nyu9A="; + hash = "sha256-oWyHR2HRDA/N5Rm9EXhOi+lZ2N7In6HmE74ZL2Nyu9A="; fetchSubmodules = true; }; diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index e7b6c7934188..073179e35b47 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "gcp"; repo = "leela-zero"; rev = "v${version}"; - sha256 = "sha256-AQRp2rkL9KCZdsJN6uz2Y+3kV4lyRLYjWn0p7UOjBMw="; + hash = "sha256-AQRp2rkL9KCZdsJN6uz2Y+3kV4lyRLYjWn0p7UOjBMw="; fetchSubmodules = true; }; diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 9f7f667ea39d..24f21f4df5d8 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "naev"; repo = "naev"; rev = "v${version}"; - sha256 = "sha256-vdPkACgLGSTb9E/HZR5KoXn/fro0iHV7hX9kJim1j/M="; + hash = "sha256-vdPkACgLGSTb9E/HZR5KoXn/fro0iHV7hX9kJim1j/M="; fetchSubmodules = true; }; diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index bcf30f947e23..3968751886ba 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://repo.or.cz/tennix.git"; rev = "refs/tags/tennix-${version}"; - sha256 = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk="; + hash = "sha256-U5+S1jEeg+7gdM1++dln6ePTqxZu2Zt0oUrH3DIlkgk="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 95603a9559fb..beb9044be116 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -40,7 +40,7 @@ let repo = "Unvanquished"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-F8U9UBFCe0PcFYZ2DThQwhouO22jKyWb0/ABhprHXCU="; + hash = "sha256-F8U9UBFCe0PcFYZ2DThQwhouO22jKyWb0/ABhprHXCU="; }; unvanquished-binary-deps = stdenv.mkDerivation rec { diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 8f963f34136a..35d8a071fe11 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { owner = pname; repo = pname; rev = "ddf4c57ebbe3a2e46099087570898ab5c1e1f279"; - sha256 = "sha256-QXWhatewiUDQ93cH1UZsYgbjUxpgB1ajtGFYZnKmabc="; + hash = "sha256-QXWhatewiUDQ93cH1UZsYgbjUxpgB1ajtGFYZnKmabc="; fetchSubmodules = true; }; diff --git a/pkgs/os-specific/linux/kinect-audio-setup/default.nix b/pkgs/os-specific/linux/kinect-audio-setup/default.nix index 94ae4806cf25..d8957f64dded 100644 --- a/pkgs/os-specific/linux/kinect-audio-setup/default.nix +++ b/pkgs/os-specific/linux/kinect-audio-setup/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.ao2.it/kinect-audio-setup.git"; rev = "v${version}"; - sha256 = "sha256-bFwmWh822KvFwP/0Gu097nF5K2uCwCLMB1RtP7k+Zt0="; + hash = "sha256-bFwmWh822KvFwP/0Gu097nF5K2uCwCLMB1RtP7k+Zt0="; }; # These patches are not upstream because the project has seen no diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index 31ac82ea065f..0a52222cebce 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://pagure.io/numad.git"; rev = "3399d89305b6560e27e70aff4ad9fb403dedf947"; - sha256 = "sha256-USEffVcakaAbilqijJmpro92ujvxbglcXxyBlntMxaI="; + hash = "sha256-USEffVcakaAbilqijJmpro92ujvxbglcXxyBlntMxaI="; }; postPatch = '' diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 139d6b63d8dc..755ea603e2a5 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "USBGuard"; repo = pname; rev = "usbguard-${version}"; - sha256 = "sha256-uwNoKczmVOMpkU4KcKTOtbcTHiYVGXjk/rVbqMl5pGk="; + hash = "sha256-uwNoKczmVOMpkU4KcKTOtbcTHiYVGXjk/rVbqMl5pGk="; fetchSubmodules = true; }; diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index bcfb13ad0dec..61fcc8762441 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "domoticz"; repo = pname; rev = version; - sha256 = "sha256-bIA7Dx8XV2zT2Cdm4CwKX6xfedBREhevE/bN76o4r78="; + hash = "sha256-bIA7Dx8XV2zT2Cdm4CwKX6xfedBREhevE/bN76o4r78="; fetchSubmodules = true; }; diff --git a/pkgs/servers/fedigroups/default.nix b/pkgs/servers/fedigroups/default.nix index c755feee178d..e823a5017ef0 100644 --- a/pkgs/servers/fedigroups/default.nix +++ b/pkgs/servers/fedigroups/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { owner = "MightyPork"; repo = "group-actor"; rev = "v${version}"; - sha256 = "sha256-NMqoYUNN2ntye9mNC3KAAc0DBg+QY7+6/DASwHPexY0="; + hash = "sha256-NMqoYUNN2ntye9mNC3KAAc0DBg+QY7+6/DASwHPexY0="; forceFetchGit = true; # Archive generation is disabled on this gitea instance leaveDotGit = true; # git command in build.rs }; diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix index fd4f4773d729..1b2f1a25ccfc 100644 --- a/pkgs/servers/irc/atheme/default.nix +++ b/pkgs/servers/irc/atheme/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/atheme/atheme.git"; rev = "v${version}"; - sha256 = "sha256-KAC1ZPNo4TqfVryKOYYef8cRWRgFmyEdvl1bgvpGNiM="; + hash = "sha256-KAC1ZPNo4TqfVryKOYYef8cRWRgFmyEdvl1bgvpGNiM="; leaveDotGit = true; }; diff --git a/pkgs/servers/nfd/default.nix b/pkgs/servers/nfd/default.nix index 30f1140ab50e..850934f466a4 100644 --- a/pkgs/servers/nfd/default.nix +++ b/pkgs/servers/nfd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "named-data"; repo = lib.toUpper pname; rev = "NFD-${version}"; - sha256 = "sha256-epY5qtET7rsKL3KIKvxfa+wF+AGZbYs+zRhy8SnIffk="; + hash = "sha256-epY5qtET7rsKL3KIKvxfa+wF+AGZbYs+zRhy8SnIffk="; fetchSubmodules = true; }; diff --git a/pkgs/servers/nominatim/default.nix b/pkgs/servers/nominatim/default.nix index 4b39480a4a9b..529849625d93 100644 --- a/pkgs/servers/nominatim/default.nix +++ b/pkgs/servers/nominatim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { repo = "Nominatim"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-GPMDbvTPl9SLpZi5gyRAPQ84NSTIRoSfGJeqWs1e9Oo="; + hash = "sha256-GPMDbvTPl9SLpZi5gyRAPQ84NSTIRoSfGJeqWs1e9Oo="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 41939884e997..5b965796de64 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -38,7 +38,7 @@ gcc10Stdenv.mkDerivation rec { repo = "arangodb"; owner = "arangodb"; rev = "v${version}"; - sha256 = "sha256-64iTxhG8qKTSrTlH/BWDJNnLf8VnaCteCKfQ9D2lGDQ="; + hash = "sha256-64iTxhG8qKTSrTlH/BWDJNnLf8VnaCteCKfQ9D2lGDQ="; fetchSubmodules = true; }; diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 4165a6ff4390..060b572c4112 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -20,7 +20,7 @@ buildDotnetModule rec { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "sha256-+Wxm6yusaCoqXIbsi0ZoALAviKUyNMQwbzsQtBK/PCo="; + hash = "sha256-+Wxm6yusaCoqXIbsi0ZoALAviKUyNMQwbzsQtBK/PCo="; leaveDotGit = true; }; diff --git a/pkgs/servers/oxigraph/default.nix b/pkgs/servers/oxigraph/default.nix index 879f65454816..868ec8f8bd39 100644 --- a/pkgs/servers/oxigraph/default.nix +++ b/pkgs/servers/oxigraph/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-zwUiUDWdrmLF+Qj9Jy6JGXHaBskRnm+pMKW2GKGGeN8="; + hash = "sha256-zwUiUDWdrmLF+Qj9Jy6JGXHaBskRnm+pMKW2GKGGeN8="; fetchSubmodules = true; }; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 90c0fc9b2cdf..00763ceee550 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchgit { url = "git://git.linux-nfs.org/projects/steved/rpcbind.git"; rev = "c0c89b3bf2bdf304a5fe3cab626334e0cdaf1ef2"; - sha256 = "sha256-aidETIZaQYzC3liDGM915wyBWpMrn4OudxEcFS/Iucw="; + hash = "sha256-aidETIZaQYzC3liDGM915wyBWpMrn4OudxEcFS/Iucw="; }; patches = [ diff --git a/pkgs/servers/sql/postgresql/ext/smlar.nix b/pkgs/servers/sql/postgresql/ext/smlar.nix index a3ce699b87e6..12fdd79cc8f4 100644 --- a/pkgs/servers/sql/postgresql/ext/smlar.nix +++ b/pkgs/servers/sql/postgresql/ext/smlar.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://sigaev.ru/smlar.git"; rev = "f2522d5f20a46a3605a761d34a3aefcdffb94e71"; - sha256 = "sha256-AC6w7uYw0OW70pQpWbK1A3rkCnMvTJzTCAdFiY3rO7A="; + hash = "sha256-AC6w7uYw0OW70pQpWbK1A3rkCnMvTJzTCAdFiY3rO7A="; }; buildInputs = [ postgresql ]; diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index d4145e22d088..0f36c3116935 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -58,7 +58,7 @@ stdenv'.mkDerivation rec { owner = "LizardByte"; repo = "Sunshine"; rev = "v${version}"; - sha256 = "sha256-D5ee5m2ZTKVqZDH07nzJuFEbZBQ4xW7m4nYnJQe0EaA="; + hash = "sha256-D5ee5m2ZTKVqZDH07nzJuFEbZBQ4xW7m4nYnJQe0EaA="; fetchSubmodules = true; }; diff --git a/pkgs/servers/tarantool/default.nix b/pkgs/servers/tarantool/default.nix index d3de20218550..6526fdefae69 100644 --- a/pkgs/servers/tarantool/default.nix +++ b/pkgs/servers/tarantool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "tarantool"; repo = pname; rev = version; - sha256 = "sha256-yCRU5IxC6gNS+O2KYtKWjFk35EHkBnnzWy5UnyuB9f4="; + hash = "sha256-yCRU5IxC6gNS+O2KYtKWjFk35EHkBnnzWy5UnyuB9f4="; fetchSubmodules = true; }; diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 9938658259d5..4055c505daac 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { repo = "trezord-go"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-3I6NOzDMhzRyVSOURl7TjJ1Z0P0RcKrSs5rNaZ0Ho9M="; + hash = "sha256-3I6NOzDMhzRyVSOURl7TjJ1Z0P0RcKrSs5rNaZ0Ho9M="; }; vendorHash = "sha256-wXgAmZEXdM4FcMCQbAs+ydXshCAMu7nl/yVv/3sqaXE="; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index d50563098355..11da0612260a 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "sha256-KUhFZrF7BuLB2Z3LnTcHEEZVA6iosam6YsOd8KWvx7E="; + hash = "sha256-KUhFZrF7BuLB2Z3LnTcHEEZVA6iosam6YsOd8KWvx7E="; fetchSubmodules = true; }; diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index fd83401ba59b..f1e7afa8c384 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-JBMrgUMGsvjYasEHJsZ0jZAHmrN3Z0d8T8agI9FiEPs="; + hash = "sha256-JBMrgUMGsvjYasEHJsZ0jZAHmrN3Z0d8T8agI9FiEPs="; }; strictDeps = true; dontConfigure = true; diff --git a/pkgs/tools/X11/xkb-switch-i3/default.nix b/pkgs/tools/X11/xkb-switch-i3/default.nix index 56c4e6af6338..3e7fc33c72d1 100644 --- a/pkgs/tools/X11/xkb-switch-i3/default.nix +++ b/pkgs/tools/X11/xkb-switch-i3/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "Zebradil"; repo = "xkb-switch-i3"; rev = version; - sha256 = "sha256-5d1DdRtz0QCWISSsWQt9xgTOekYUCkhfMsjG+/kyQK4="; + hash = "sha256-5d1DdRtz0QCWISSsWQt9xgTOekYUCkhfMsjG+/kyQK4="; fetchSubmodules = true; }; diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index 2ba92da8b049..066866dc7d01 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-6msh6bGL++nXVzwwNW6fFZbkN40ieL+SpgRownIs9aE="; + hash = "sha256-6msh6bGL++nXVzwwNW6fFZbkN40ieL+SpgRownIs9aE="; }; vendorHash = "sha256-wHdSDBxDArVbD5+EgGcIpQ+NLg5BKXo2v3WM4ni1efc="; diff --git a/pkgs/tools/admin/bom/default.nix b/pkgs/tools/admin/bom/default.nix index becef4d6468d..0cdc4f6ec6e4 100644 --- a/pkgs/tools/admin/bom/default.nix +++ b/pkgs/tools/admin/bom/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nYzBaFtOJhqO0O6MJsxTw/mxsIOa+cnU27nOFRe2/uI="; + hash = "sha256-nYzBaFtOJhqO0O6MJsxTw/mxsIOa+cnU27nOFRe2/uI="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/tools/compression/efficient-compression-tool/default.nix b/pkgs/tools/compression/efficient-compression-tool/default.nix index a4f4b9fd40da..52a0820abaea 100644 --- a/pkgs/tools/compression/efficient-compression-tool/default.nix +++ b/pkgs/tools/compression/efficient-compression-tool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { owner = "fhanau"; repo = "Efficient-Compression-Tool"; rev = "v${version}"; - sha256 = "sha256-TSV5QXf6GuHAwQrde3Zo9MA1rtpAhtRg0UTzMkBnHB8="; + hash = "sha256-TSV5QXf6GuHAwQrde3Zo9MA1rtpAhtRg0UTzMkBnHB8="; fetchSubmodules = true; }; diff --git a/pkgs/tools/filesystems/kdiskmark/default.nix b/pkgs/tools/filesystems/kdiskmark/default.nix index 287ef7debc58..95105b5ece1a 100644 --- a/pkgs/tools/filesystems/kdiskmark/default.nix +++ b/pkgs/tools/filesystems/kdiskmark/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "jonmagon"; repo = "kdiskmark"; rev = version; - sha256 = "sha256-JueY7zw9PIo9ETi7pQLpw8FGRhNXYXeXEvTzZGz9lbw="; + hash = "sha256-JueY7zw9PIo9ETi7pQLpw8FGRhNXYXeXEvTzZGz9lbw="; fetchSubmodules = true; }; diff --git a/pkgs/tools/filesystems/kio-fuse/default.nix b/pkgs/tools/filesystems/kio-fuse/default.nix index 3d5e7f509bc4..5d8e29059261 100644 --- a/pkgs/tools/filesystems/kio-fuse/default.nix +++ b/pkgs/tools/filesystems/kio-fuse/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { src = fetchgit { url = "https://invent.kde.org/system/kio-fuse.git"; - sha256 = "sha256-xVeDNkSeHCk86L07lPVokSgHNkye2tnLoCkdw4g2Jv0="; + hash = "sha256-xVeDNkSeHCk86L07lPVokSgHNkye2tnLoCkdw4g2Jv0="; rev = "v${version}"; }; diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix index 405cecfd6e64..cbf8e4f19287 100644 --- a/pkgs/tools/filesystems/mtdutils/default.nix +++ b/pkgs/tools/filesystems/mtdutils/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "git://git.infradead.org/mtd-utils.git"; rev = "v${version}"; - sha256 = "sha256-uYXzZnVL5PkyDAntH8YsocwmQ8tf1f0Vl78SdE2B+Oc="; + hash = "sha256-uYXzZnVL5PkyDAntH8YsocwmQ8tf1f0Vl78SdE2B+Oc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka; diff --git a/pkgs/tools/misc/convimg/default.nix b/pkgs/tools/misc/convimg/default.nix index 1e37c2636bbe..e10c2102fec5 100644 --- a/pkgs/tools/misc/convimg/default.nix +++ b/pkgs/tools/misc/convimg/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xnfMHlbQ7XG/mvnWoGkRHhxIK2u7kWJTVnLxd9c5oNU="; + hash = "sha256-xnfMHlbQ7XG/mvnWoGkRHhxIK2u7kWJTVnLxd9c5oNU="; fetchSubmodules = true; }; diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index f2d2bd81ae11..534e5f22cc2b 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "rrthomas"; repo = "mmv"; rev = "v${version}"; - sha256 = "sha256-hYSTENSmkJP5rAemDyTzbzMKFrWYcMpsJDRWq43etTM="; + hash = "sha256-hYSTENSmkJP5rAemDyTzbzMKFrWYcMpsJDRWq43etTM="; fetchSubmodules = true; }; diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index d6c336990cf0..5b71e441b878 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { owner = "Grumbel"; repo = "sdl-jstest"; rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b"; - sha256 = "sha256-Mw+ENOVZ0O8WercdDNLAAkNMPZ2NyxSa+nMtgNmXjFw="; + hash = "sha256-Mw+ENOVZ0O8WercdDNLAAkNMPZ2NyxSa+nMtgNmXjFw="; fetchSubmodules = true; }; diff --git a/pkgs/tools/networking/cnping/default.nix b/pkgs/tools/networking/cnping/default.nix index e998e94b3d70..ba22730a3ea0 100644 --- a/pkgs/tools/networking/cnping/default.nix +++ b/pkgs/tools/networking/cnping/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "cntools"; repo = "cnping"; rev = "6b89363e6b79ecbf612306d42a8ef94a5a2f756a"; - sha256 = "sha256-E3Wm5or6C4bHq7YoyaEbtDwyd+tDVYUOMeQrprlmL4A="; + hash = "sha256-E3Wm5or6C4bHq7YoyaEbtDwyd+tDVYUOMeQrprlmL4A="; fetchSubmodules = true; }; diff --git a/pkgs/tools/networking/owl/default.nix b/pkgs/tools/networking/owl/default.nix index 703859b8b1a3..3a4a05df341b 100644 --- a/pkgs/tools/networking/owl/default.nix +++ b/pkgs/tools/networking/owl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "seemoo-lab"; repo = "owl"; rev = "8e4e840b212ae5a09a8a99484be3ab18bad22fa7"; - sha256 = "sha256-kFk+JFLGWGBu5FPH3qp/Bxa6t04f1kpeHz3H8GNF3fg="; + hash = "sha256-kFk+JFLGWGBu5FPH3qp/Bxa6t04f1kpeHz3H8GNF3fg="; fetchSubmodules = true; }; diff --git a/pkgs/tools/networking/simple-dlna-browser/default.nix b/pkgs/tools/networking/simple-dlna-browser/default.nix index c59a1e28910a..ae6ccc4a4aaa 100644 --- a/pkgs/tools/networking/simple-dlna-browser/default.nix +++ b/pkgs/tools/networking/simple-dlna-browser/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { "sh/tools/simple-dlna-browser" ]; rev = "666e2c402723251ba19ce9d7c11b83b06c15a2c5"; - sha256 = "sha256-jwPAEgti5DrjNnNVW/61GGTP+QedGAjz9kPwYhMAdTk="; + hash = "sha256-jwPAEgti5DrjNnNVW/61GGTP+QedGAjz9kPwYhMAdTk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/tinyfecvpn/default.nix b/pkgs/tools/networking/tinyfecvpn/default.nix index fc95e944818a..896fbfc749bd 100644 --- a/pkgs/tools/networking/tinyfecvpn/default.nix +++ b/pkgs/tools/networking/tinyfecvpn/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "wangyu-"; repo = pname; rev = version; - sha256 = "sha256-g4dduREH64TDK3Y2PKc5RZiISW4h2ALRh8vQK7jvCZU="; + hash = "sha256-g4dduREH64TDK3Y2PKc5RZiISW4h2ALRh8vQK7jvCZU="; fetchSubmodules = true; }; diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index b1a25758cbb6..c540b8cfac1e 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -12,7 +12,7 @@ let owner = "AppImage"; repo = "AppImageKit"; rev = "8bbf694455d00f48d835f56afaa1dabcd9178ba6"; - sha256 = "sha256-pqg+joomC5CI9WdKP/h/XKPsruMgZEaIOjPLOqnNPZw="; + hash = "sha256-pqg+joomC5CI9WdKP/h/XKPsruMgZEaIOjPLOqnNPZw="; fetchSubmodules = true; }; diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 69fa3aa8c293..19a3a9fe53fb 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QBkb0pwNrzPCA7G+bmAjbBXQDooDDvJZuDMAlD2Gv44="; + hash = "sha256-QBkb0pwNrzPCA7G+bmAjbBXQDooDDvJZuDMAlD2Gv44="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/tools/security/kdigger/default.nix b/pkgs/tools/security/kdigger/default.nix index b73b62eeda27..8d942943d683 100644 --- a/pkgs/tools/security/kdigger/default.nix +++ b/pkgs/tools/security/kdigger/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { owner = "quarkslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hpLhtTENtOBQjm+CZRAcx1BG9831JUFIsLL57wZIrso="; + hash = "sha256-hpLhtTENtOBQjm+CZRAcx1BG9831JUFIsLL57wZIrso="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index f2abaaf7d8a7..06fc4e5c6d92 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "owasp-modsecurity"; repo = "ModSecurity"; rev = "v${version}"; - sha256 = "sha256-WIFAg9LvKAC8e3gpcIxtNHT53AIfPtUTyrv30woxP4M="; + hash = "sha256-WIFAg9LvKAC8e3gpcIxtNHT53AIfPtUTyrv30woxP4M="; fetchSubmodules = true; }; diff --git a/pkgs/tools/security/shisho/default.nix b/pkgs/tools/security/shisho/default.nix index ae61c2a249db..6cfbb8552b29 100644 --- a/pkgs/tools/security/shisho/default.nix +++ b/pkgs/tools/security/shisho/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { owner = "flatt-security"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY="; + hash = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY="; fetchSubmodules = true; }; cargoSha256 = "sha256-xd4andytmDMOIT+3DkmUC9fkxxGJ6yRY2WSdnGB6ZwY="; diff --git a/pkgs/tools/security/vexctl/default.nix b/pkgs/tools/security/vexctl/default.nix index 13086faf73d4..cc1d18ab74d6 100644 --- a/pkgs/tools/security/vexctl/default.nix +++ b/pkgs/tools/security/vexctl/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { owner = "chainguard-dev"; repo = "vex"; rev = "v${version}"; - sha256 = "sha256-f5UVX6x4DwjlcgMAv0GuKBH9UUzFhQ8pW8l+9pc7RQ4="; + hash = "sha256-f5UVX6x4DwjlcgMAv0GuKBH9UUzFhQ8pW8l+9pc7RQ4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/tools/security/web-eid-app/default.nix b/pkgs/tools/security/web-eid-app/default.nix index e2e09ed0146b..d7cef9cc0644 100644 --- a/pkgs/tools/security/web-eid-app/default.nix +++ b/pkgs/tools/security/web-eid-app/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { owner = "web-eid"; repo = "web-eid-app"; rev = "v${version}"; - sha256 = "sha256-CaMf7cRhZ8K6YAUG38B+ijNOKaOmaACqNabNfHZGT68="; + hash = "sha256-CaMf7cRhZ8K6YAUG38B+ijNOKaOmaACqNabNfHZGT68="; fetchSubmodules = true; }; diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 922fdbd2a1c6..fcc23229a9c1 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://salsa.debian.org/debian/${pname}.git"; rev = "debian/${version}"; - sha256 = "sha256-CVy5mOX3jNM1cNIn8HhVs8Mhh70pkz9pG08muFuPNfk="; + hash = "sha256-CVy5mOX3jNM1cNIn8HhVs8Mhh70pkz9pG08muFuPNfk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/openseachest/default.nix b/pkgs/tools/system/openseachest/default.nix index f1015683660c..d729f0a3e797 100644 --- a/pkgs/tools/system/openseachest/default.nix +++ b/pkgs/tools/system/openseachest/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "Seagate"; repo = "openSeaChest"; rev = "v${version}"; - sha256 = "sha256-2snxruIC/93+yI7g/9cCXcms8FaoXnoyWq9py8GTwrs="; + hash = "sha256-2snxruIC/93+yI7g/9cCXcms8FaoXnoyWq9py8GTwrs="; fetchSubmodules = true; }; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 1de721fb0b0e..0acc471b7017 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "relaxng"; repo = "jing-trang"; rev = "V${version}"; - sha256 = "sha256-Krupa3MGk5UaaQsaNpPMZuIUzHJytDiksz9ysCPkFS4="; + hash = "sha256-Krupa3MGk5UaaQsaNpPMZuIUzHJytDiksz9ysCPkFS4="; fetchSubmodules = true; }; diff --git a/pkgs/tools/video/replay-sorcery/default.nix b/pkgs/tools/video/replay-sorcery/default.nix index 23e3f77154c7..151ceda8b73c 100644 --- a/pkgs/tools/video/replay-sorcery/default.nix +++ b/pkgs/tools/video/replay-sorcery/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { repo = "ReplaySorcery"; rev = version; fetchSubmodules = true; - sha256 = "sha256-HPkSOwfwcg4jLUzKfqdXgLu7mgD5H4wb9d2BrqWQeHc="; + hash = "sha256-HPkSOwfwcg4jLUzKfqdXgLu7mgD5H4wb9d2BrqWQeHc="; }; patches = [ From 3d8dab8761e0854aa37aa6067f733967f4a4c68e Mon Sep 17 00:00:00 2001 From: aleksana Date: Sun, 14 Jul 2024 18:58:14 +0800 Subject: [PATCH 199/227] treewide: sha256 -> hash attribute for fetchgit (manually) --- pkgs/applications/misc/prusa-slicer/super-slicer.nix | 12 ++++++------ pkgs/development/ada-modules/gnatprove/default.nix | 8 ++++---- pkgs/development/compilers/haxe/default.nix | 10 +++++----- pkgs/tools/misc/qflipper/default.nix | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 218fe6f96bf3..50dcd18d738a 100644 --- a/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -14,7 +14,7 @@ let "src/slic3r/GUI/Tab.cpp" "src/slic3r/Utils/Http.cpp" ]; - sha256 = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; + hash = "sha256-v0q2MhySayij7+qBTE5q01IOq/DyUcWnjpbzB/AV34c="; }) ./meshboolean-const.patch ]; @@ -22,28 +22,28 @@ let versions = { stable = { version = "2.3.57.12"; - sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; + hash = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; patches = null; }; latest = { version = "2.4.58.5"; - sha256 = "sha256-UywxEGedXaBUTKojEkbkuejI6SdPSkPxTJMwUDNW6W0="; + hash = "sha256-UywxEGedXaBUTKojEkbkuejI6SdPSkPxTJMwUDNW6W0="; inherit patches; }; beta = { version = "2.5.59.6"; - sha256 = "sha256-4ivhkcvVw5NlPsDz3J840aWc0qnp/XzCnTTCICwi3/c="; + hash = "sha256-4ivhkcvVw5NlPsDz3J840aWc0qnp/XzCnTTCICwi3/c="; inherit patches; }; }; - override = { version, sha256, patches }: super: { + override = { version, hash, patches }: super: { inherit version pname patches; src = fetchFromGitHub { owner = "supermerill"; repo = "SuperSlicer"; - inherit sha256; + inherit hash; rev = version; fetchSubmodules = true; }; diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix index 319b295d58fd..d50baba1391f 100644 --- a/pkgs/development/ada-modules/gnatprove/default.nix +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -11,25 +11,25 @@ let gnat_version = lib.versions.major gnat.version; - fetchSpark2014 = { rev, sha256 } : fetchFromGitHub { + fetchSpark2014 = { rev, hash } : fetchFromGitHub { owner = "AdaCore"; repo = "spark2014"; fetchSubmodules = true; - inherit rev sha256; + inherit rev hash; }; spark2014 = { "12" = { src = fetchSpark2014 { rev = "ab34e07080a769b63beacc141707b5885c49d375"; # branch fsf-12 - sha256 = "sha256-7pe3eWitpxmqzjW6qEIEuN0qr2IR+kJ7Ssc9pTBcCD8="; + hash = "sha256-7pe3eWitpxmqzjW6qEIEuN0qr2IR+kJ7Ssc9pTBcCD8="; }; commit_date = "2022-05-25"; }; "13" = { src = fetchSpark2014 { rev = "12db22e854defa9d1c993ef904af1e72330a68ca"; # branch fsf-13 - sha256 = "sha256-mZWP9yF1O4knCiXx8CqolnS+93bM+hTQy40cd0HZmwI="; + hash = "sha256-mZWP9yF1O4knCiXx8CqolnS+93bM+hTQy40cd0HZmwI="; }; commit_date = "2023-01-05"; }; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index f7a05f8d1455..3d3e7593d05f 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -32,7 +32,7 @@ let --replace '"neko"' '"${neko}/bin/neko"' ''; - generic = { sha256, version, prePatch ? defaultPatch }: + generic = { hash, version, prePatch ? defaultPatch }: stdenv.mkDerivation { pname = "haxe"; inherit version; @@ -48,7 +48,7 @@ let repo = "haxe"; rev = version; fetchSubmodules = true; - inherit sha256; + inherit hash; }; inherit prePatch; @@ -119,14 +119,14 @@ let in { haxe_4_0 = generic { version = "4.0.5"; - sha256 = "0f534pchdx0m057ixnk07ab4s518ica958pvpd0vfjsrxg5yjkqa"; + hash = "sha256-Ck/py+tZS7dBu/uikhSLKBRNljpg2h5PARX0Btklozg="; }; haxe_4_1 = generic { version = "4.1.5"; - sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0"; + hash = "sha256-QP5/jwexQXai1A5Iiwiyrm+/vkdAc+9NVGt+jEQz2mY="; }; haxe_4_3 = generic { version = "4.3.4"; - sha256 = "sha256-XGV4VG8nUofHGjHbtrLA+2kIpnnPqw5IlcNrP3EsL+Q="; + hash = "sha256-XGV4VG8nUofHGjHbtrLA+2kIpnnPqw5IlcNrP3EsL+Q="; }; } diff --git a/pkgs/tools/misc/qflipper/default.nix b/pkgs/tools/misc/qflipper/default.nix index 171c5d7b3877..7a344e9b0c43 100644 --- a/pkgs/tools/misc/qflipper/default.nix +++ b/pkgs/tools/misc/qflipper/default.nix @@ -25,7 +25,7 @@ let pname = "qFlipper"; version = "1.3.3"; - sha256 = "sha256-/Xzy+OA0Nl/UlSkOOZW2YsOHdJvS/7X3Z3ITkPByAOc="; + hash = "sha256-/Xzy+OA0Nl/UlSkOOZW2YsOHdJvS/7X3Z3ITkPByAOc="; timestamp = "99999999999"; commit = "nix-${version}"; @@ -38,7 +38,7 @@ mkDerivation { repo = "qFlipper"; rev = version; fetchSubmodules = true; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ From b6daf6610f0c38eb8a0605a24d6a1e908a48ad9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 11:13:09 +0000 Subject: [PATCH 200/227] komikku: 1.50.0 -> 1.51.1 --- pkgs/applications/graphics/komikku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/komikku/default.nix b/pkgs/applications/graphics/komikku/default.nix index 73a15bdd291f..73578d3d0053 100644 --- a/pkgs/applications/graphics/komikku/default.nix +++ b/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.50.0"; + version = "1.51.1"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-lyBXMctEL8Z6rscsSDHh7xLhjvnpN2q4qMVV2ek9Cyk="; + hash = "sha256-b4RyAA32qQHbnX7AC0w64BM+y5uZCeZgd9SKQdJaJWc="; }; nativeBuildInputs = [ From f837ccac0e3d7a5a501f6198bfb7d2e7c9c876dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 11:19:19 +0000 Subject: [PATCH 201/227] renode-dts2repl: 0-unstable-2024-07-02 -> 0-unstable-2024-07-10 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index e166ef18f09d..ec24981e6ada 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-07-02"; + version = "0-unstable-2024-07-10"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "35aa35658558b759c909e32c713091d6617186bd"; - hash = "sha256-OySqcbrpqSOPJWTv3V2NM6DRbQ/wH55+z1SvHFQwe0U="; + rev = "e0a92f4225c7e94de288c6774763562fa46b2ad6"; + hash = "sha256-cqIZwzxhzdYIXEMo2tRUIQa6mmv3HbKzgQoFhUHL8vc="; }; nativeBuildInputs = [ From 3ea1ee73d04e33208e437ed5b452f7b9daf32bcd Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 14 Jul 2024 08:21:24 -0300 Subject: [PATCH 202/227] prowler: fix build --- pkgs/by-name/pr/prowler/package.nix | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 4b19cadb0e3a..1b3649775af8 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -16,23 +16,7 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-7aWWaGdHTveFwXsFNj4+tjX5g83/nD77jLAOrDOw8JE="; }; - pythonRelaxDeps = [ - "azure-identity" - "azure-keyvault-keys" - "azure-mgmt-compute" - "azure-mgmt-containerservice" - "azure-mgmt-network" - "azure-mgmt-security" - "azure-mgmt-storage" - "azure-storage-blob" - "boto3" - "botocore" - "google-api-python-client" - "jsonschema" - "pydantic" - "pydantic" - "slack-sdk" - ]; + pythonRelaxDeps = true; build-system = with python3.pkgs; [ poetry-core From 04967c307f06e7e6ad8157a16b3940cc79494d5d Mon Sep 17 00:00:00 2001 From: Shiva Kaul Date: Fri, 6 Jan 2023 15:15:08 -0500 Subject: [PATCH 203/227] nixos/spiped: remove broken chmod's from preStart Remove `chmod`s which were (1) broken and (2) no longer considered good Nix practice. --- nixos/modules/services/networking/spiped.nix | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/networking/spiped.nix b/nixos/modules/services/networking/spiped.nix index ada36ee9be0b..a5188d933995 100644 --- a/nixos/modules/services/networking/spiped.nix +++ b/nixos/modules/services/networking/spiped.nix @@ -62,11 +62,11 @@ in keyfile = mkOption { type = types.path; description = '' - Name of a file containing the spiped key. As the - daemon runs as the `spiped` user, the - key file must be somewhere owned by that user. By - default, we recommend putting the keys for any spipe - services in `/var/lib/spiped`. + Name of a file containing the spiped key. + As the daemon runs as the `spiped` user, + the key file must be readable by that user. + To securely manage the file within your configuration + consider a tool such as agenix or sops-nix. ''; }; @@ -185,22 +185,12 @@ in serviceConfig = { Restart = "always"; User = "spiped"; - PermissionsStartOnly = true; }; - preStart = '' - cd /var/lib/spiped - chmod -R 0660 * - chown -R spiped:spiped * - ''; scriptArgs = "%i"; script = "exec ${pkgs.spiped}/bin/spiped -F `cat /etc/spiped/$1.spec`"; }; - systemd.tmpfiles.rules = lib.mkIf (cfg.config != { }) [ - "d /var/lib/spiped -" - ]; - # Setup spiped config files environment.etc = mapAttrs' (name: cfg: nameValuePair "spiped/${name}.spec" { text = concatStringsSep " " From 4db17619ee8d7f51e409672f688419d063d96e69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 12:22:55 +0000 Subject: [PATCH 204/227] python312Packages.mistletoe: 1.3.0 -> 1.4.0 --- pkgs/development/python-modules/mistletoe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mistletoe/default.nix b/pkgs/development/python-modules/mistletoe/default.nix index 6a32ea2e058d..ec33d7bec839 100644 --- a/pkgs/development/python-modules/mistletoe/default.nix +++ b/pkgs/development/python-modules/mistletoe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mistletoe"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "miyuchina"; repo = "mistletoe"; rev = "refs/tags/v${version}"; - hash = "sha256-MMBfH4q5AtC/azQUj1a1tMz1MdUf4ad5/tl7lcQCTOw="; + hash = "sha256-jFU16vdASGVSPq+TJ/6cN7IGkE/61SL9BWCOPsVqNaU="; }; pythonImportsCheck = [ "mistletoe" ]; From d023d9b9571b7f4fa679d151bcac95e00025c8f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 12:24:28 +0000 Subject: [PATCH 205/227] invidtui: 0.4.5 -> 0.4.6 --- pkgs/by-name/in/invidtui/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/in/invidtui/package.nix b/pkgs/by-name/in/invidtui/package.nix index 11b17b76aa72..4ca39a938ae9 100644 --- a/pkgs/by-name/in/invidtui/package.nix +++ b/pkgs/by-name/in/invidtui/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "invidtui"; - version = "0.4.5"; + version = "0.4.6"; src = fetchFromGitHub { owner = "darkhz"; repo = "invidtui"; rev = "refs/tags/v${version}"; - hash = "sha256-ErdoAHXdptUCZ2aW4XT1Hul/OBfnK6dfncgQ8JRFHxg="; + hash = "sha256-C465lzbZIh8LYDUHNa5u66nFteFsKAffilvy1Danfpg="; }; vendorHash = "sha256-C7O2GJuEdO8geRPfHx1Sq6ZveDE/u65JBx/Egh3cnK4="; From 2a5d6a22e4ed5087528c05126d9343054ac2e7cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 12:25:45 +0000 Subject: [PATCH 206/227] python312Packages.pydal: 20240601.3 -> 20240713.1 --- pkgs/development/python-modules/pydal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix index e425d21f52e0..82ceccfc6699 100644 --- a/pkgs/development/python-modules/pydal/default.nix +++ b/pkgs/development/python-modules/pydal/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pydal"; - version = "20240601.3"; + version = "20240713.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-t7Sl81YpdQZk4Q2ERz6jiJsD3ERmC8QVlr0d/RrNmhU="; + hash = "sha256-KW44LUGgCE+KB3tE9ecYqOansjFN6F4A7TRCoKwOsRs="; }; nativeBuildInputs = [ setuptools ]; From 921035095f21ab4e397192c39eec5bacb5f281af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 12:29:38 +0000 Subject: [PATCH 207/227] python312Packages.pyexploitdb: 0.2.25 -> 0.2.26 --- pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix index 6eee2bfae7d5..3e22d72d1928 100644 --- a/pkgs/development/python-modules/pyexploitdb/default.nix +++ b/pkgs/development/python-modules/pyexploitdb/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyexploitdb"; - version = "0.2.25"; + version = "0.2.26"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "pyExploitDb"; inherit version; - hash = "sha256-1UDyJAXB6owD732vYpadv7w4j6ysorEH1SSewTgVPec="; + hash = "sha256-6sfFFOHb77Gef5K0f/7rmZhNvUFCMP+bcsmXuXVVRn4="; }; build-system = [ setuptools ]; From aa2f9b07c45b1bd7b8d2c01615c978ea0c2b3057 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 12:41:57 +0000 Subject: [PATCH 208/227] python312Packages.githubkit: 0.11.6 -> 0.11.7 --- pkgs/development/python-modules/githubkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix index 85e581200fde..b24eeacc4030 100644 --- a/pkgs/development/python-modules/githubkit/default.nix +++ b/pkgs/development/python-modules/githubkit/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "githubkit"; - version = "0.11.6"; + version = "0.11.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yanyongyu"; repo = "githubkit"; rev = "refs/tags/v${version}"; - hash = "sha256-bcQUms4nZ4BUowcF3YxTQPc6Ts6VoRumEA0DuCPQpfg="; + hash = "sha256-bh01m/L1ubQGc4EoHw8If/6yF64M5CsifSwVezZjFDQ="; }; postPatch = '' From b9dcf7227d91d2f8f3ce6204c48b2fc4b7ff164e Mon Sep 17 00:00:00 2001 From: pedohorse <13556996+pedohorse@users.noreply.github.com> Date: Thu, 11 Jul 2024 19:34:57 +0200 Subject: [PATCH 209/227] houdini: cleanup --- pkgs/applications/misc/houdini/runtime-build.nix | 8 ++------ pkgs/applications/misc/houdini/runtime.nix | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/houdini/runtime-build.nix b/pkgs/applications/misc/houdini/runtime-build.nix index 27e6f098574e..1c3083ebb738 100644 --- a/pkgs/applications/misc/houdini/runtime-build.nix +++ b/pkgs/applications/misc/houdini/runtime-build.nix @@ -1,9 +1,5 @@ -{ lib, stdenv, requireFile, bc, version, src, eulaDate }: - -let - license_dir = "~/.config/houdini"; -in -stdenv.mkDerivation rec { +{ stdenv, bc, version, src, eulaDate }: +stdenv.mkDerivation { inherit version src; pname = "houdini-runtime"; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 1e44b94e6d9f..8662c46964b1 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,9 +1,9 @@ -{ lib, requireFile, callPackage}: +{ requireFile, callPackage }: callPackage ./runtime-build.nix rec { version = "20.0.688"; eulaDate = "2021-10-13"; - src = requireFile rec { + src = requireFile { name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz"; sha256 = "99f9088824c328de9d351f037f26ff1cba960fbd9b4e2ed1d52601680d3512a6"; url = "https://www.sidefx.com/download/daily-builds/?production=true"; From 467e1d1dac1023b833b1906481231631b7f7a5b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 13:09:22 +0000 Subject: [PATCH 210/227] ircdog: 0.5.3 -> 0.5.4 --- pkgs/applications/networking/irc/ircdog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/ircdog/default.nix b/pkgs/applications/networking/irc/ircdog/default.nix index f08d6857799c..1ff1f0413d2b 100644 --- a/pkgs/applications/networking/irc/ircdog/default.nix +++ b/pkgs/applications/networking/irc/ircdog/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ircdog"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "goshuirc"; repo = "ircdog"; rev = "refs/tags/v${version}"; - hash = "sha256-TdMgt1ZgoEaweH8Cbb+wG/H1Bx9DpgHgzGO5dZfxvK8="; + hash = "sha256-X8DTwudgQyQQIpXCG7d+tdXMV33HG6ETzHsvIp3KFDo="; }; vendorHash = null; From d96be5a19b5915dbf0218cd231adbf3988bc2aec Mon Sep 17 00:00:00 2001 From: pedohorse <13556996+pedohorse@users.noreply.github.com> Date: Thu, 11 Jul 2024 19:35:46 +0200 Subject: [PATCH 211/227] houdini: 20.0.688 -> 20.5.278 --- pkgs/applications/misc/houdini/runtime.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 8662c46964b1..ed8f44f45266 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ { requireFile, callPackage }: callPackage ./runtime-build.nix rec { - version = "20.0.688"; + version = "20.5.278"; eulaDate = "2021-10-13"; src = requireFile { name = "houdini-${version}-linux_x86_64_gcc11.2.tar.gz"; - sha256 = "99f9088824c328de9d351f037f26ff1cba960fbd9b4e2ed1d52601680d3512a6"; + hash = "sha256-O5oAoiDiu+xrmDfTnilPqZue8+dXVTHnK0yrX6moTSc="; url = "https://www.sidefx.com/download/daily-builds/?production=true"; }; } From c757e22c0c4a080396adbba2c6b40c3dff2eae89 Mon Sep 17 00:00:00 2001 From: Himadri Bhattacharjee <107522312+lavafroth@users.noreply.github.com> Date: Sat, 13 Jul 2024 14:09:05 +0530 Subject: [PATCH 212/227] python3Packages.gocardless-pro: remove nose dependency Addresses #326513 Dependency `nose` was removed in favor of pytest in version 1.46.2. --- pkgs/development/python-modules/gocardless-pro/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gocardless-pro/default.nix b/pkgs/development/python-modules/gocardless-pro/default.nix index 8ae218aaa922..186b60918691 100644 --- a/pkgs/development/python-modules/gocardless-pro/default.nix +++ b/pkgs/development/python-modules/gocardless-pro/default.nix @@ -4,15 +4,15 @@ fetchFromGitHub, requests, six, + setuptools, pytestCheckHook, responses, - nose, }: buildPythonPackage rec { pname = "gocardless-pro"; version = "1.52.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "gocardless"; @@ -21,6 +21,8 @@ buildPythonPackage rec { hash = "sha256-Oi68s4x/rS8ahvJ9TsniYfDidCxtvcvsMwYhJirYlP0="; }; + build-system = [ setuptools ]; + propagatedBuildInputs = [ requests six @@ -31,7 +33,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook responses - nose ]; meta = with lib; { From 7c60d383feedb7798bdf2bd0969fe06fc1245e41 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 13:43:54 +0000 Subject: [PATCH 213/227] prometheus-node-exporter: 1.8.1 -> 1.8.2 --- pkgs/by-name/pr/prometheus-node-exporter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index eac863a9962a..7ddf75a893aa 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "node_exporter"; - version = "1.8.1"; + version = "1.8.2"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "node_exporter"; - hash = "sha256-dg4JSJx5xXEOLLb5xEgrNeDmh/En9G6qKA9G+3v9PH0="; + hash = "sha256-b2uior67RcCCpUE+qx55G1eWiT2wWDVsnosSH9fd3/I="; }; vendorHash = "sha256-sly8AJk+jNZG8ijTBF1Pd5AOOUJJxIG8jHwBUdlt8fM="; From 6c035531d475072b8879904b16c95b02f6d69399 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jul 2024 16:14:45 +0200 Subject: [PATCH 214/227] python312Packages.hishel: 0.0.29 -> 0.0.30 Diff: https://github.com/karpetrosyan/hishel/compare/refs/tags/0.0.29...0.0.30 Changelog: https://github.com/karpetrosyan/hishel/blob/0.0.30/CHANGELOG.md --- pkgs/development/python-modules/hishel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hishel/default.nix b/pkgs/development/python-modules/hishel/default.nix index 9c05025ddfd9..0edd09dc64ac 100644 --- a/pkgs/development/python-modules/hishel/default.nix +++ b/pkgs/development/python-modules/hishel/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "hishel"; - version = "0.0.29"; + version = "0.0.30"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "karpetrosyan"; repo = "hishel"; rev = "refs/tags/${version}"; - hash = "sha256-3RUbHVbnfC0L9u6/VMKK2BhTuc2y5kD83Cn8dQ24kQQ="; + hash = "sha256-+ine7Q60dT9GyFWGHtbH6G1E4TzTQaY5y9Yxxxbgnp8="; }; build-system = [ From 3c93bb5ce20e0941af4b31d05d21f2c8672db7e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 23:54:47 +0000 Subject: [PATCH 215/227] albert: 0.24.2 -> 0.24.3 --- pkgs/applications/misc/albert/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 101327cb6453..338f09ca8520 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z88amcPb2jCJduRu8CGQ20y2o5cXmL4rpRL0hGCEYgM="; + hash = "sha256-9vR6G/9FSy1mqZCo19Mf0RuvW63DbnhEzp/h0p6eXqs="; fetchSubmodules = true; }; From 7be8dd2857b99824571c570a9277ec341343150a Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Sun, 14 Jul 2024 18:36:07 +0200 Subject: [PATCH 216/227] maintainers: add rorosen --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2561cf449740..1ab6f4c1294f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17398,6 +17398,12 @@ githubId = 55679162; keys = [ { fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; } ]; }; + rorosen = { + email = "robert.rose@mailbox.org"; + github = "rorosen"; + githubId = 76747196; + name = "Robert Rose"; + }; rosehobgoblin = { name = "J. L. Bowden"; github = "rosehobgoblin"; From b9f397d445b52316eaf08b9d5072fe194ab482ec Mon Sep 17 00:00:00 2001 From: Robert Rose Date: Sun, 14 Jul 2024 18:36:25 +0200 Subject: [PATCH 217/227] k3s: add rorosen as maintainer --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index d5fd82892822..833aebadb86f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -502,6 +502,7 @@ with lib.maintainers; euank marcusramberg mic92 + rorosen superherointj wrmilling yajo From 0af9d835c27984b3265145f8e3cbc6c153479196 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 13:20:33 -0400 Subject: [PATCH 218/227] nodePackages.vue-cli: drop (#325110) * nodePackages.vue-cli: drop The Vue CLI is now deprecated, and create-vue(not package in nix) should be used to scaffold Vue projects. The last commit to the upstream repo for this tool was 2 years ago, and so it's no longer maintained and should be safe to drop. * Update pkgs/development/node-packages/aliases.nix --------- Co-authored-by: Sandro --- pkgs/development/node-packages/aliases.nix | 2 +- .../node-packages/main-programs.nix | 1 - .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 1921 ----------------- 4 files changed, 1 insertion(+), 1924 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 90e4d9d4f1fd..045a127d9818 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -182,8 +182,8 @@ mapAliases { vscode-html-languageserver-bin = throw "vscode-html-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 vscode-json-languageserver-bin = throw "vscode-json-languageserver-bin has been removed since the upstream repository is archived; consider using vscode-langservers-extracted instead."; # added 2024-06-26 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 - vue-cli = self."@vue/cli"; # added 2023-08-18 vue-language-server = self.vls; # added 2023-08-20 + vue-cli = throw "vue-cli has been removed since upstream no longer recommends using it; consider using create-vue and the new Vite-based tooling instead."; # added 2024-07-12 inherit (pkgs) web-ext; # added 2023-08-20 inherit (pkgs) wrangler; # added 2024-07-01 inherit (pkgs) write-good; # added 2023-08-20 diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 5983d3d099df..92b2d2271c70 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -14,7 +14,6 @@ "@gitbeaker/cli" = "gitbeaker"; "@prisma/language-server" = "prisma-language-server"; "@uppy/companion" = "companion"; - "@vue/cli" = "vue"; "@webassemblyjs/repl-1.11.1" = "wasm"; "@webassemblyjs/wasm-strip" = "wasm-strip"; "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 54a972262d84..b5b5e9c4549b 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -12,7 +12,6 @@ , "@tailwindcss/line-clamp" , "@tailwindcss/typography" , "@uppy/companion" -, "@vue/cli" , {"@webassemblyjs/cli": "1.11.1"} , {"@webassemblyjs/repl": "1.11.1"} , "@webassemblyjs/wasm-strip" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index c0ccec3ffee4..6e8749f751f5 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -13,15 +13,6 @@ let sha512 = "E3Qku4mTzdrlwVWGPxklDnME5ANrEGetvYw4i2GCRlppWXXE4QD66j7pwb8HelZwS6LnqEChhrSOGCXpbiu6MQ=="; }; }; - "@achrinza/node-ipc-9.2.9" = { - name = "_at_achrinza_slash_node-ipc"; - packageName = "@achrinza/node-ipc"; - version = "9.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz"; - sha512 = "7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ=="; - }; - }; "@adobe/css-tools-4.3.2" = { name = "_at_adobe_slash_css-tools"; packageName = "@adobe/css-tools"; @@ -31,15 +22,6 @@ let sha512 = "DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw=="; }; }; - "@akryum/winattr-3.0.0" = { - name = "_at_akryum_slash_winattr"; - packageName = "@akryum/winattr"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@akryum/winattr/-/winattr-3.0.0.tgz"; - sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; - }; - }; "@alcalzone/ansi-tokenize-0.1.3" = { name = "_at_alcalzone_slash_ansi-tokenize"; packageName = "@alcalzone/ansi-tokenize"; @@ -130,123 +112,6 @@ let sha512 = "9Kt7EuS/7WbMAUv2gSziqjvxwDbFSg3Xeyfuj5laUODX8o/k/CpsAKiQ8W7/R88eXFTMbJYg6+7uAmOWNKmwnw=="; }; }; - "@apollo/protobufjs-1.2.6" = { - name = "_at_apollo_slash_protobufjs"; - packageName = "@apollo/protobufjs"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.6.tgz"; - sha512 = "Wqo1oSHNUj/jxmsVp4iR3I480p6qdqHikn38lKrFhfzcDJ7lwd7Ck7cHRl4JE81tWNArl77xhnG/OkZhxKBYOw=="; - }; - }; - "@apollo/protobufjs-1.2.7" = { - name = "_at_apollo_slash_protobufjs"; - packageName = "@apollo/protobufjs"; - version = "1.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.7.tgz"; - sha512 = "Lahx5zntHPZia35myYDBRuF58tlwPskwHc5CWBZC/4bMKB6siTBWwtMrkqXcsNwQiFSzSx5hKdRPUmemrEp3Gg=="; - }; - }; - "@apollo/usage-reporting-protobuf-4.1.1" = { - name = "_at_apollo_slash_usage-reporting-protobuf"; - packageName = "@apollo/usage-reporting-protobuf"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/usage-reporting-protobuf/-/usage-reporting-protobuf-4.1.1.tgz"; - sha512 = "u40dIUePHaSKVshcedO7Wp+mPiZsaU6xjv9J+VyxpoU/zL6Jle+9zWeG98tr/+SZ0nZ4OXhrbb8SNr0rAPpIDA=="; - }; - }; - "@apollo/utils.dropunuseddefinitions-1.1.0" = { - name = "_at_apollo_slash_utils.dropunuseddefinitions"; - packageName = "@apollo/utils.dropunuseddefinitions"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz"; - sha512 = "jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg=="; - }; - }; - "@apollo/utils.keyvaluecache-1.0.2" = { - name = "_at_apollo_slash_utils.keyvaluecache"; - packageName = "@apollo/utils.keyvaluecache"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.2.tgz"; - sha512 = "p7PVdLPMnPzmXSQVEsy27cYEjVON+SH/Wb7COyW3rQN8+wJgT1nv9jZouYtztWW8ZgTkii5T6tC9qfoDREd4mg=="; - }; - }; - "@apollo/utils.logger-1.0.1" = { - name = "_at_apollo_slash_utils.logger"; - packageName = "@apollo/utils.logger"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-1.0.1.tgz"; - sha512 = "XdlzoY7fYNK4OIcvMD2G94RoFZbzTQaNP0jozmqqMudmaGo2I/2Jx71xlDJ801mWA/mbYRihyaw6KJii7k5RVA=="; - }; - }; - "@apollo/utils.printwithreducedwhitespace-1.1.0" = { - name = "_at_apollo_slash_utils.printwithreducedwhitespace"; - packageName = "@apollo/utils.printwithreducedwhitespace"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz"; - sha512 = "GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q=="; - }; - }; - "@apollo/utils.removealiases-1.0.0" = { - name = "_at_apollo_slash_utils.removealiases"; - packageName = "@apollo/utils.removealiases"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz"; - sha512 = "6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A=="; - }; - }; - "@apollo/utils.sortast-1.1.0" = { - name = "_at_apollo_slash_utils.sortast"; - packageName = "@apollo/utils.sortast"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz"; - sha512 = "VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA=="; - }; - }; - "@apollo/utils.stripsensitiveliterals-1.2.0" = { - name = "_at_apollo_slash_utils.stripsensitiveliterals"; - packageName = "@apollo/utils.stripsensitiveliterals"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz"; - sha512 = "E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w=="; - }; - }; - "@apollo/utils.usagereporting-1.0.1" = { - name = "_at_apollo_slash_utils.usagereporting"; - packageName = "@apollo/utils.usagereporting"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.1.tgz"; - sha512 = "6dk+0hZlnDbahDBB2mP/PZ5ybrtCJdLMbeNJD+TJpKyZmSY6bA3SjI8Cr2EM9QA+AdziywuWg+SgbWUF3/zQqQ=="; - }; - }; - "@apollographql/apollo-tools-0.5.4" = { - name = "_at_apollographql_slash_apollo-tools"; - packageName = "@apollographql/apollo-tools"; - version = "0.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.5.4.tgz"; - sha512 = "shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw=="; - }; - }; - "@apollographql/graphql-playground-html-1.6.29" = { - name = "_at_apollographql_slash_graphql-playground-html"; - packageName = "@apollographql/graphql-playground-html"; - version = "1.6.29"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz"; - sha512 = "xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA=="; - }; - }; "@ardatan/aggregate-error-0.0.6" = { name = "_at_ardatan_slash_aggregate-error"; packageName = "@ardatan/aggregate-error"; @@ -5899,15 +5764,6 @@ let sha512 = "BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg=="; }; }; - "@graphql-tools/merge-8.4.2" = { - name = "_at_graphql-tools_slash_merge"; - packageName = "@graphql-tools/merge"; - version = "8.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.4.2.tgz"; - sha512 = "XbrHAaj8yDuINph+sAfuq3QCZ/tKblrTLOpirK0+CAgNlZUCHs0Fa+xtMUURgwCVThLle1AF7svJCxFizygLsw=="; - }; - }; "@graphql-tools/merge-9.0.4" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; @@ -5917,15 +5773,6 @@ let sha512 = "MivbDLUQ+4Q8G/Hp/9V72hbn810IJDEZQ57F01sHnlrrijyadibfVhaQfW/pNH+9T/l8ySZpaR/DpL5i+ruZ+g=="; }; }; - "@graphql-tools/mock-8.7.20" = { - name = "_at_graphql-tools_slash_mock"; - packageName = "@graphql-tools/mock"; - version = "8.7.20"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.20.tgz"; - sha512 = "ljcHSJWjC/ZyzpXd5cfNhPI7YljRVvabKHPzKjEs5ElxWu2cdlLGvyNYepApXDsM/OJG/2xuhGM+9GWu5gEAPQ=="; - }; - }; "@graphql-tools/schema-10.0.4" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; @@ -5953,15 +5800,6 @@ let sha512 = "0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg=="; }; }; - "@graphql-tools/schema-9.0.19" = { - name = "_at_graphql-tools_slash_schema"; - packageName = "@graphql-tools/schema"; - version = "9.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-9.0.19.tgz"; - sha512 = "oBRPoNBtCkk0zbUsyP4GaIzCt8C0aCI4ycIRUL67KK5pOHljKLBBtGT+Jr6hkzA74C8Gco8bpZPe7aWFjiaK2w=="; - }; - }; "@graphql-tools/url-loader-6.10.1" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; @@ -6736,15 +6574,6 @@ let sha512 = "HOR9UOivlbFiANAVPeK5TNYRE5KQ3dCxVC7Sus8bcA+ZIrJxM0P73Ng1p96HkzsZAE71OEqVKn6HMd67gZOy4Q=="; }; }; - "@josephg/resolvable-1.0.1" = { - name = "_at_josephg_slash_resolvable"; - packageName = "@josephg/resolvable"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@josephg/resolvable/-/resolvable-1.0.1.tgz"; - sha512 = "CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg=="; - }; - }; "@jridgewell/gen-mapping-0.3.5" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; @@ -7213,15 +7042,6 @@ let sha512 = "V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg=="; }; }; - "@node-ipc/js-queue-2.0.3" = { - name = "_at_node-ipc_slash_js-queue"; - packageName = "@node-ipc/js-queue"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@node-ipc/js-queue/-/js-queue-2.0.3.tgz"; - sha512 = "fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw=="; - }; - }; "@node-red/editor-api-3.1.10" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; @@ -9598,15 +9418,6 @@ let sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ=="; }; }; - "@sindresorhus/is-0.7.0" = { - name = "_at_sindresorhus_slash_is"; - packageName = "@sindresorhus/is"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz"; - sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; - }; - }; "@sindresorhus/is-3.1.2" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; @@ -10831,15 +10642,6 @@ let sha512 = "qLOvfmlG2vCVw5fo/oz8WAZYlpe5a5OurgTj3diIxJCdjRHpapC+vQCz3er9LV79Vcat+DifBjeAhOAdmndtDQ=="; }; }; - "@types/accepts-1.3.7" = { - name = "_at_types_slash_accepts"; - packageName = "@types/accepts"; - version = "1.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Pay9fq2lM2wXPWbteBsRAGiWH2hig4ZE2asK+mm7kUzlxRTfL961rj89I6zV/E3PcIkDqyuBEcMxFT7rccugeQ=="; - }; - }; "@types/acorn-4.0.6" = { name = "_at_types_slash_acorn"; packageName = "@types/acorn"; @@ -10876,15 +10678,6 @@ let sha512 = "V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A=="; }; }; - "@types/body-parser-1.19.2" = { - name = "_at_types_slash_body-parser"; - packageName = "@types/body-parser"; - version = "1.19.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; - }; - }; "@types/body-parser-1.19.5" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -11002,15 +10795,6 @@ let sha512 = "he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q=="; }; }; - "@types/cors-2.8.12" = { - name = "_at_types_slash_cors"; - packageName = "@types/cors"; - version = "2.8.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"; - sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="; - }; - }; "@types/cors-2.8.17" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; @@ -11065,15 +10849,6 @@ let sha512 = "CZ5vepL87+M8PxRIvJjR181Erahch2w7Jev/XJm+Iot/SOvJh8QqH/N79b+vsKtYF6fFzoPieiiq2c5tzmXR9A=="; }; }; - "@types/ejs-3.1.5" = { - name = "_at_types_slash_ejs"; - packageName = "@types/ejs"; - version = "3.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz"; - sha512 = "nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg=="; - }; - }; "@types/es-aggregate-error-1.0.6" = { name = "_at_types_slash_es-aggregate-error"; packageName = "@types/es-aggregate-error"; @@ -11119,15 +10894,6 @@ let sha512 = "52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg=="; }; }; - "@types/express-4.17.14" = { - name = "_at_types_slash_express"; - packageName = "@types/express"; - version = "4.17.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz"; - sha512 = "TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg=="; - }; - }; "@types/express-4.17.21" = { name = "_at_types_slash_express"; packageName = "@types/express"; @@ -11137,15 +10903,6 @@ let sha512 = "ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ=="; }; }; - "@types/express-serve-static-core-4.17.31" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz"; - sha512 = "DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q=="; - }; - }; "@types/express-serve-static-core-4.19.3" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -11245,15 +11002,6 @@ let sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; }; }; - "@types/inquirer-8.2.10" = { - name = "_at_types_slash_inquirer"; - packageName = "@types/inquirer"; - version = "8.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.10.tgz"; - sha512 = "IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA=="; - }; - }; "@types/is-empty-1.2.3" = { name = "_at_types_slash_is-empty"; packageName = "@types/is-empty"; @@ -11308,15 +11056,6 @@ let sha512 = "jd+Q+sD20Qfu9e2aEXogiO3vpOC1PYJOUdyN9gvs4Qrvkg4wF43L5OhqrPeokdv8TL0/mXoYfpkcoGZMNN2pkQ=="; }; }; - "@types/jscodeshift-0.7.2" = { - name = "_at_types_slash_jscodeshift"; - packageName = "@types/jscodeshift"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/jscodeshift/-/jscodeshift-0.7.2.tgz"; - sha512 = "k4ih8ayQ65e26vhCxeMTKtZ808DzC0RFQ4unBvPEy9bcFhS4aPm3oXgWWZNmZ4u+H2WzHQDCNrRC5iNX+afiZw=="; - }; - }; "@types/json-schema-7.0.15" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -11353,15 +11092,6 @@ let sha512 = "MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw=="; }; }; - "@types/long-4.0.2" = { - name = "_at_types_slash_long"; - packageName = "@types/long"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz"; - sha512 = "MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="; - }; - }; "@types/lru-cache-5.1.1" = { name = "_at_types_slash_lru-cache"; packageName = "@types/lru-cache"; @@ -11488,15 +11218,6 @@ let sha512 = "ABoYdNQ/kBSsLvZAekMhIPMQ3YUZvavStpKYs7BjLLuKVmIMA0LUgZ7b54zzuWJRbHF80v1cNf4r90Vd6eMQDg=="; }; }; - "@types/node-10.17.60" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "10.17.60"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz"; - sha512 = "F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw=="; - }; - }; "@types/node-14.18.63" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -12397,42 +12118,6 @@ let sha512 = "pAiRN6qSAhDM5SVOIxgx+2xnoVUePHbRNC7OD2aOR3WltTKxxF25OfpK8h8UQ7A0BuRkSgREbB59DBlFk4iAeg=="; }; }; - "@vue/cli-shared-utils-5.0.8" = { - name = "_at_vue_slash_cli-shared-utils"; - packageName = "@vue/cli-shared-utils"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz"; - sha512 = "uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ=="; - }; - }; - "@vue/cli-ui-5.0.8" = { - name = "_at_vue_slash_cli-ui"; - packageName = "@vue/cli-ui"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-5.0.8.tgz"; - sha512 = "1eyL1h1T3LVejYplDqERO8TK03sjR3QTOTHa01ABreCdqFTZItiUVud34uEcuoZ6Gi69xdl+LSx6Hvo4t9tfrA=="; - }; - }; - "@vue/cli-ui-addon-webpack-5.0.8" = { - name = "_at_vue_slash_cli-ui-addon-webpack"; - packageName = "@vue/cli-ui-addon-webpack"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-5.0.8.tgz"; - sha512 = "sg+3a9vHGzpFRrv7MVZRQ9oDztFN9Mvx0MleidKyPIAWMSOskSQT8zTngy8bEyXjXwNv6mCn2jvUR/tgbldyow=="; - }; - }; - "@vue/cli-ui-addon-widgets-5.0.8" = { - name = "_at_vue_slash_cli-ui-addon-widgets"; - packageName = "@vue/cli-ui-addon-widgets"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-5.0.8.tgz"; - sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; - }; - }; "@vue/compiler-core-3.4.29" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; @@ -12451,15 +12136,6 @@ let sha512 = "A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w=="; }; }; - "@vue/compiler-sfc-2.7.16" = { - name = "_at_vue_slash_compiler-sfc"; - packageName = "@vue/compiler-sfc"; - version = "2.7.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz"; - sha512 = "KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg=="; - }; - }; "@vue/compiler-sfc-3.4.29" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; @@ -14251,78 +13927,6 @@ let sha512 = "FCAJojipPn0bXjuEpjOOOMN8FZDkxfWWp4JGN9mifU2IhxvKyXZYqpzPHdnTSUpmPDy+tsslB6Z1g+Vg6nVbYA=="; }; }; - "apollo-datasource-3.3.2" = { - name = "apollo-datasource"; - packageName = "apollo-datasource"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.3.2.tgz"; - sha512 = "L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg=="; - }; - }; - "apollo-reporting-protobuf-3.4.0" = { - name = "apollo-reporting-protobuf"; - packageName = "apollo-reporting-protobuf"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.4.0.tgz"; - sha512 = "h0u3EbC/9RpihWOmcSsvTW2O6RXVaD/mPEjfrPkxRPTEPWqncsgOoRJw+wih4OqfH3PvTJvoEIf4LwKrUaqWog=="; - }; - }; - "apollo-server-core-3.13.0" = { - name = "apollo-server-core"; - packageName = "apollo-server-core"; - version = "3.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.13.0.tgz"; - sha512 = "v/g6DR6KuHn9DYSdtQijz8dLOkP78I5JSVJzPkARhDbhpH74QNwrQ2PP2URAPPEDJ2EeZNQDX8PvbYkAKqg+kg=="; - }; - }; - "apollo-server-env-4.2.1" = { - name = "apollo-server-env"; - packageName = "apollo-server-env"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.2.1.tgz"; - sha512 = "vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g=="; - }; - }; - "apollo-server-errors-3.3.1" = { - name = "apollo-server-errors"; - packageName = "apollo-server-errors"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz"; - sha512 = "xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA=="; - }; - }; - "apollo-server-express-3.13.0" = { - name = "apollo-server-express"; - packageName = "apollo-server-express"; - version = "3.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.13.0.tgz"; - sha512 = "iSxICNbDUyebOuM8EKb3xOrpIwOQgKxGbR2diSr4HP3IW8T3njKFOoMce50vr+moOCe1ev8BnLcw9SNbuUtf7g=="; - }; - }; - "apollo-server-plugin-base-3.7.2" = { - name = "apollo-server-plugin-base"; - packageName = "apollo-server-plugin-base"; - version = "3.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.7.2.tgz"; - sha512 = "wE8dwGDvBOGehSsPTRZ8P/33Jan6/PmL0y0aN/1Z5a5GcbFhDaaJCjK5cav6npbbGL2DPKK0r6MPXi3k3N45aw=="; - }; - }; - "apollo-server-types-3.8.0" = { - name = "apollo-server-types"; - packageName = "apollo-server-types"; - version = "3.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.8.0.tgz"; - sha512 = "ZI/8rTE4ww8BHktsVpb91Sdq7Cb71rdSkXELSwdSR0eXu600/sY+1UXhTWdiJvk+Eq5ljqoHLwLbY2+Clq2b9A=="; - }; - }; "append-field-1.0.0" = { name = "append-field"; packageName = "append-field"; @@ -14404,15 +14008,6 @@ let sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; }; }; - "archive-type-4.0.0" = { - name = "archive-type"; - packageName = "archive-type"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archive-type/-/archive-type-4.0.0.tgz"; - sha512 = "zV4Ky0v1F8dBrdYElwTvQhweQ0P7Kwc1aluqJsYtOBP01jXcWCyW2IEfI1YiqsG+Iy7ZR+o5LF1N+PGECBxHWA=="; - }; - }; "archiver-3.1.1" = { name = "archiver"; packageName = "archiver"; @@ -14980,15 +14575,6 @@ let sha512 = "Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="; }; }; - "ast-types-0.12.1" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.12.1.tgz"; - sha512 = "H2izJAyT2xwew4TxShpmxe6f9R5hHgJQy1QloLiUC2yrJMtyraBWNJL7903rpeCY9keNUipORR/zIUC2XcYKng=="; - }; - }; "ast-types-0.13.4" = { name = "ast-types"; packageName = "ast-types"; @@ -14998,15 +14584,6 @@ let sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; }; }; - "ast-types-0.14.2" = { - name = "ast-types"; - packageName = "ast-types"; - version = "0.14.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.14.2.tgz"; - sha512 = "O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA=="; - }; - }; "astral-regex-1.0.0" = { name = "astral-regex"; packageName = "astral-regex"; @@ -15223,15 +14800,6 @@ let sha512 = "WfoBo4E/TbCX1G95XTjbWTE3X2XLG0m1Xbv2cwOtuPdyH9CZvnaA5nCt1ucjaKEgW2A5IF71hxrRhr83Je5xjA=="; }; }; - "async-retry-1.3.3" = { - name = "async-retry"; - packageName = "async-retry"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz"; - sha512 = "wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw=="; - }; - }; "async-sema-3.1.1" = { name = "async-sema"; packageName = "async-sema"; @@ -17257,15 +16825,6 @@ let sha512 = "zkDT5WAF4hSSoUgyfg5tFIxz8XQK+25W/TLVojJTMKBaxevLBBtLxgqguAuVQB8PVW79FVjHcU+GJ9tVbDZ9mQ=="; }; }; - "cacheable-request-2.1.4" = { - name = "cacheable-request"; - packageName = "cacheable-request"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz"; - sha512 = "vag0O2LKZ/najSoUwDbVlnlCFvhBE/7mGTY2B5FgCBDcRD+oVV1HYTOwM6JZfMg/hIcM6IwnTZ1uQQL5/X3xIQ=="; - }; - }; "cacheable-request-6.1.0" = { name = "cacheable-request"; packageName = "cacheable-request"; @@ -18607,15 +18166,6 @@ let sha512 = "beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q=="; }; }; - "clone-response-1.0.2" = { - name = "clone-response"; - packageName = "clone-response"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; - sha512 = "yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q=="; - }; - }; "clone-response-1.0.3" = { name = "clone-response"; packageName = "clone-response"; @@ -20822,15 +20372,6 @@ let sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; }; - "cssfilter-0.0.10" = { - name = "cssfilter"; - packageName = "cssfilter"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz"; - sha512 = "FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="; - }; - }; "cssnano-5.1.15" = { name = "cssnano"; packageName = "cssnano"; @@ -23252,15 +22793,6 @@ let sha512 = "rE0V29BV5FyylK3Uw5hmP90TBuwGHAqPYfaRHW/VHsKe9Xqi7RACVg0k0FokeE+MTWr9mtUy75GyszRACiD3Ow=="; }; }; - "download-7.1.0" = { - name = "download"; - packageName = "download"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/download/-/download-7.1.0.tgz"; - sha512 = "xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ=="; - }; - }; "download-git-repo-1.1.0" = { name = "download-git-repo"; packageName = "download-git-repo"; @@ -23270,15 +22802,6 @@ let sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA=="; }; }; - "download-git-repo-3.0.2" = { - name = "download-git-repo"; - packageName = "download-git-repo"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/download-git-repo/-/download-git-repo-3.0.2.tgz"; - sha512 = "N8hWXD4hXqmEcNoR8TBYFntaOcYvEQ7Bz90mgm3bZRTuteGQqwT32VDMnTyD0KTEvb8BWrMc1tVmzuV9u/WrAg=="; - }; - }; "draftlog-1.0.13" = { name = "draftlog"; packageName = "draftlog"; @@ -23405,15 +22928,6 @@ let sha512 = "8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q=="; }; }; - "easy-stack-1.0.1" = { - name = "easy-stack"; - packageName = "easy-stack"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.1.tgz"; - sha512 = "wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w=="; - }; - }; "eazy-logger-4.0.1" = { name = "eazy-logger"; packageName = "eazy-logger"; @@ -25026,15 +24540,6 @@ let sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="; }; }; - "event-pubsub-4.3.0" = { - name = "event-pubsub"; - packageName = "event-pubsub"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz"; - sha512 = "z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ=="; - }; - }; "event-stream-3.1.7" = { name = "event-stream"; packageName = "event-stream"; @@ -25548,15 +25053,6 @@ let sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg=="; }; }; - "express-history-api-fallback-2.2.1" = { - name = "express-history-api-fallback"; - packageName = "express-history-api-fallback"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/express-history-api-fallback/-/express-history-api-fallback-2.2.1.tgz"; - sha512 = "swxwm3aP8vrOOvlzOdZvHlSZtJGwHKaY94J6AkrAgCTmcbko3IRwbkhLv2wKV1WeZhjxX58aLMpP3atDBnKuZg=="; - }; - }; "express-interceptor-1.2.0" = { name = "express-interceptor"; packageName = "express-interceptor"; @@ -25638,15 +25134,6 @@ let sha512 = "a5CV1NyCQvSG+isfUoD4jrjIhwRIZ2E2htpZTXLhaHbmjd0ECduGGYOvXj3Fajus2DuZpjRSbPMlF5PBO4iqBA=="; }; }; - "ext-name-5.0.0" = { - name = "ext-name"; - packageName = "ext-name"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz"; - sha512 = "yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ=="; - }; - }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -26268,15 +25755,6 @@ let sha512 = "RLoqTXE8/vPmMuTI88DAzhMYC99I8BWv7zYP4A1puo5HIjEJ5EX48ighy4ZyKMG9EDXxBgW6e++cn7d1xuFghA=="; }; }; - "file-type-4.4.0" = { - name = "file-type"; - packageName = "file-type"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz"; - sha512 = "f2UbFQEk7LXgWpi5ntcO86OeA/cC80fuDDDaX/fZ2ZGel+AF7leRQqBBW1eJNiiQkrZlAoM6P+VYP5P6bOlDEQ=="; - }; - }; "file-type-5.2.0" = { name = "file-type"; packageName = "file-type"; @@ -26295,15 +25773,6 @@ let sha512 = "YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg=="; }; }; - "file-type-8.1.0" = { - name = "file-type"; - packageName = "file-type"; - version = "8.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-8.1.0.tgz"; - sha512 = "qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ=="; - }; - }; "file-uri-to-path-1.0.0" = { name = "file-uri-to-path"; packageName = "file-uri-to-path"; @@ -26637,15 +26106,6 @@ let sha512 = "OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A=="; }; }; - "fkill-7.2.1" = { - name = "fkill"; - packageName = "fkill"; - version = "7.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-7.2.1.tgz"; - sha512 = "eN9cmsIlRdq06wu3m01OOEgQf5Xh/M7REm0jfZ4eL3V3XisjXzfRq3iyqtKS+FhO6wB36FvWRiRGdeSx5KpLAQ=="; - }; - }; "fkill-9.0.0" = { name = "fkill"; packageName = "fkill"; @@ -26745,15 +26205,6 @@ let sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="; }; }; - "flow-parser-0.238.0" = { - name = "flow-parser"; - packageName = "flow-parser"; - version = "0.238.0"; - src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.238.0.tgz"; - sha512 = "VE7XSv1epljsIN2YeBnxCmGJihpNIAnLLu/pPOdA+Gkso7qDltJwUi6vfHjgxdBbjSdAuPGnhuOHJUQG+yYwIg=="; - }; - }; "fluent-ffmpeg-2.1.3" = { name = "fluent-ffmpeg"; packageName = "fluent-ffmpeg"; @@ -27366,15 +26817,6 @@ let sha512 = "WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg=="; }; }; - "fswin-2.17.1227" = { - name = "fswin"; - packageName = "fswin"; - version = "2.17.1227"; - src = fetchurl { - url = "https://registry.npmjs.org/fswin/-/fswin-2.17.1227.tgz"; - sha512 = "xNDktvwzSsXT8Xqnpz59VbuFwGHhtn1w+dS7QQ+wAu5cbH0p3WMGKU9Duf7cPna+nubhR+5ZG1MTl6/V6xgRgw=="; - }; - }; "fullname-4.0.1" = { name = "fullname"; packageName = "fullname"; @@ -27924,15 +27366,6 @@ let sha512 = "zs9rlfa7HyaJAKG9o+V7C6qfMzyc+tb1IIXdUFcOBcR1U7siKy/uPdauLlrH1mc0vOgUwIv4BF+QxPiiTYz3Rw=="; }; }; - "git-config-path-2.0.0" = { - name = "git-config-path"; - packageName = "git-config-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/git-config-path/-/git-config-path-2.0.0.tgz"; - sha512 = "qc8h1KIQbJpp+241id3GuAtkdyJ+IK+LIVtkiFTRKRrmddDzs3SI9CvP1QYmWBFvm1I/PWRwj//of8bgAc0ltA=="; - }; - }; "git-diff-tree-1.1.0" = { name = "git-diff-tree"; packageName = "git-diff-tree"; @@ -28627,15 +28060,6 @@ let sha512 = "Y/K3EDuiQN9rTZhBvPRWMLXIKdeD1Rj0nzunfoi0Yyn5WBEbzxXKU9Ub2X41oZBagVWOBU3MuDonFMgPWQFnwg=="; }; }; - "got-8.3.2" = { - name = "got"; - packageName = "got"; - version = "8.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-8.3.2.tgz"; - sha512 = "qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw=="; - }; - }; "got-9.6.0" = { name = "got"; packageName = "got"; @@ -29779,15 +29203,6 @@ let sha512 = "Jbx0+ejo2IOx+cRUYAGS1z6RGc6JfYUNkysZM4u4Sfk1uLlGv814F7/PIjQQAuThLdAWxb74JMGd5J8zex1VQg=="; }; }; - "http-cache-semantics-3.8.1" = { - name = "http-cache-semantics"; - packageName = "http-cache-semantics"; - version = "3.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz"; - sha512 = "5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w=="; - }; - }; "http-cache-semantics-4.1.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; @@ -30463,15 +29878,6 @@ let sha512 = "P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ=="; }; }; - "import-global-0.1.0" = { - name = "import-global"; - packageName = "import-global"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/import-global/-/import-global-0.1.0.tgz"; - sha512 = "8+hPJLML+m1ym9NSeZXTXFkY5+ml0fYFAzO5yhZiaFQvk9kO0NkE7vd7e7kCVjkTmAxsDPbrWwLQACMwGTDgIg=="; - }; - }; "import-in-the-middle-1.4.2" = { name = "import-in-the-middle"; packageName = "import-in-the-middle"; @@ -31084,15 +30490,6 @@ let sha512 = "qsc720yevCO+4NydrJWgEWKccAQwTOvj2m73O/VBA6iUL2HGZJ9XqBiyraNrBXX/W1IAjdpXdRZk24sq8TzBRg=="; }; }; - "into-stream-3.1.0" = { - name = "into-stream"; - packageName = "into-stream"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/into-stream/-/into-stream-3.1.0.tgz"; - sha512 = "TcdjPibTksa1NQximqep2r17ISRiNE9fwlfbg3F8ANdvP5/yrFTew86VcO//jk4QTaMlbjypPBq76HN2zaKfZQ=="; - }; - }; "into-stream-6.0.0" = { name = "into-stream"; packageName = "into-stream"; @@ -32902,15 +32299,6 @@ let sha512 = "61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w=="; }; }; - "javascript-stringify-2.1.0" = { - name = "javascript-stringify"; - packageName = "javascript-stringify"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz"; - sha512 = "JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg=="; - }; - }; "jest-diff-29.7.0" = { name = "jest-diff"; packageName = "jest-diff"; @@ -33118,15 +32506,6 @@ let sha512 = "X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g=="; }; }; - "js-message-1.0.7" = { - name = "js-message"; - packageName = "js-message"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz"; - sha512 = "efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA=="; - }; - }; "js-sdsl-4.3.0" = { name = "js-sdsl"; packageName = "js-sdsl"; @@ -33244,15 +32623,6 @@ let sha512 = "xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ=="; }; }; - "jscodeshift-0.11.0" = { - name = "jscodeshift"; - packageName = "jscodeshift"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.11.0.tgz"; - sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g=="; - }; - }; "jsdom-14.1.0" = { name = "jsdom"; packageName = "jsdom"; @@ -34099,15 +33469,6 @@ let sha512 = "VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ=="; }; }; - "keyv-3.0.0" = { - name = "keyv"; - packageName = "keyv"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz"; - sha512 = "eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA=="; - }; - }; "keyv-3.1.0" = { name = "keyv"; packageName = "keyv"; @@ -36016,15 +35377,6 @@ let sha512 = "WpG9CcFAOjz/FtNht+QJeGpvVl/cdR6P0z6OcXSkr8wFJOsV2GRj2j10JLfjuA4aYkcKCNIEqRGCyTife9R8/g=="; }; }; - "long-4.0.0" = { - name = "long"; - packageName = "long"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/long/-/long-4.0.0.tgz"; - sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; - }; - }; "long-5.2.3" = { name = "long"; packageName = "long"; @@ -36106,15 +35458,6 @@ let sha512 = "UFdqQF3jrmFgSx7JEPwbEbHh6T/LNBiJGjqrMtG0XN2UtFjCb6eVFOI2GMJO5PApowakhZlMUjWXuR9vWQcnkw=="; }; }; - "lowdb-1.0.0" = { - name = "lowdb"; - packageName = "lowdb"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz"; - sha512 = "2+x8esE/Wb9SQ1F9IHaYWfsC9FIecLOPrK4g17FGEayjUWH172H6nwicRovGvSE2CPZouc2MCIqCI7h9d+GftQ=="; - }; - }; "lowdb-7.0.1" = { name = "lowdb"; packageName = "lowdb"; @@ -36142,15 +35485,6 @@ let sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; }; }; - "lowercase-keys-1.0.0" = { - name = "lowercase-keys"; - packageName = "lowercase-keys"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz"; - sha512 = "RPlX0+PHuvxVDZ7xX+EBVAp4RsVxP/TdDSN2mJYdiq1Lc4Hz7EUSjUI7RZrKKlmrIzVhf6Jo2stj7++gVarS0A=="; - }; - }; "lowercase-keys-1.0.1" = { name = "lowercase-keys"; packageName = "lowercase-keys"; @@ -36268,15 +35602,6 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-cache-7.13.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "7.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.1.tgz"; - sha512 = "CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ=="; - }; - }; "lru-cache-7.18.3" = { name = "lru-cache"; packageName = "lru-cache"; @@ -39203,15 +38528,6 @@ let sha512 = "bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="; }; }; - "nanoid-2.1.11" = { - name = "nanoid"; - packageName = "nanoid"; - version = "2.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz"; - sha512 = "s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="; - }; - }; "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; @@ -39690,15 +39006,6 @@ let sha512 = "b6Uc6YN5We2/aZA6QGicxSdWUDSwlR+vcO/Dn44BY5gieF3AOwsL/zPD+Ril+1KvYDwVJkVbRIovbG76E4PpwA=="; }; }; - "node-dir-0.1.17" = { - name = "node-dir"; - packageName = "node-dir"; - version = "0.1.17"; - src = fetchurl { - url = "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz"; - sha512 = "tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg=="; - }; - }; "node-domexception-1.0.0" = { name = "node-domexception"; packageName = "node-domexception"; @@ -40257,15 +39564,6 @@ let sha512 = "dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw=="; }; }; - "normalize-url-2.0.1" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz"; - sha512 = "D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw=="; - }; - }; "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; @@ -41454,15 +40752,6 @@ let sha512 = "JAERcaMBLYKMq+voYw36+x5Dgh47+/o7yuv2oQYuSSUml4YeqJEFznBrY2UeEkoSHqBua6hz518n/PsowTYLLg=="; }; }; - "p-cancelable-0.4.1" = { - name = "p-cancelable"; - packageName = "p-cancelable"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz"; - sha512 = "HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ=="; - }; - }; "p-cancelable-1.1.0" = { name = "p-cancelable"; packageName = "p-cancelable"; @@ -41499,15 +40788,6 @@ let sha512 = "wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw=="; }; }; - "p-event-2.3.1" = { - name = "p-event"; - packageName = "p-event"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-event/-/p-event-2.3.1.tgz"; - sha512 = "NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA=="; - }; - }; "p-event-5.0.1" = { name = "p-event"; packageName = "p-event"; @@ -41544,15 +40824,6 @@ let sha512 = "vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw=="; }; }; - "p-is-promise-1.1.0" = { - name = "p-is-promise"; - packageName = "p-is-promise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz"; - sha512 = "zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg=="; - }; - }; "p-is-promise-2.1.0" = { name = "p-is-promise"; packageName = "p-is-promise"; @@ -41814,15 +41085,6 @@ let sha512 = "MF/HIbq6GeBqTrTIl5OJubzkGU+qfFhAFi0gnTAK6rgEIJIknEiABHOTtQu4e6JiXjIwuMPMUFQzyHh5QjCl1g=="; }; }; - "p-timeout-2.0.1" = { - name = "p-timeout"; - packageName = "p-timeout"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/p-timeout/-/p-timeout-2.0.1.tgz"; - sha512 = "88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA=="; - }; - }; "p-timeout-3.1.0" = { name = "p-timeout"; packageName = "p-timeout"; @@ -42111,15 +41373,6 @@ let sha512 = "FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q=="; }; }; - "parse-git-config-3.0.0" = { - name = "parse-git-config"; - packageName = "parse-git-config"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-git-config/-/parse-git-config-3.0.0.tgz"; - sha512 = "wXoQGL1D+2COYWCD35/xbiKma1Z15xvZL8cI25wvxzled58V51SJM04Urt/uznS900iQor7QO04SgdfT/XlbuA=="; - }; - }; "parse-github-url-1.0.2" = { name = "parse-github-url"; packageName = "parse-github-url"; @@ -43011,15 +42264,6 @@ let sha512 = "0ypsOQt9D4e3hziV8O4elD9uN0z/jtUEfxVRtNaAAtXIyUx9m/SzlO020i8YNL2aL/E6blOvvHQcin6HZlFy/w=="; }; }; - "pid-port-0.1.1" = { - name = "pid-port"; - packageName = "pid-port"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pid-port/-/pid-port-0.1.1.tgz"; - sha512 = "boqPJtSgZC6KOgXKNPC+/XR3xwVtpOtaLa7JLcdf8jfVe0ZM2TwllBXxxLUO8GQbOLJ4/hEtf2+L1QCKbaoHUg=="; - }; - }; "pid-port-1.0.0" = { name = "pid-port"; packageName = "pid-port"; @@ -46071,15 +45315,6 @@ let sha512 = "8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g=="; }; }; - "recast-0.17.2" = { - name = "recast"; - packageName = "recast"; - version = "0.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.17.2.tgz"; - sha512 = "YHFvn4rBXl8eIjALjUiOV/AP3xFpyGNGNHDw9mAncAWuIdgnBKjbZQ9+P3VlsKcNaNapRVFlTEX1dvDRlYwyxg=="; - }; - }; "recast-0.20.5" = { name = "recast"; packageName = "recast"; @@ -53406,15 +52641,6 @@ let sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; }; }; - "typescript-4.5.5" = { - name = "typescript"; - packageName = "typescript"; - version = "4.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; - sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; - }; - }; "typescript-4.9.5" = { name = "typescript"; packageName = "typescript"; @@ -56538,24 +55764,6 @@ let sha512 = "AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw=="; }; }; - "vue-2.7.16" = { - name = "vue"; - packageName = "vue"; - version = "2.7.16"; - src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz"; - sha512 = "4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw=="; - }; - }; - "vue-codemod-0.0.5" = { - name = "vue-codemod"; - packageName = "vue-codemod"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-codemod/-/vue-codemod-0.0.5.tgz"; - sha512 = "DE+24W1d3oanGqq7yna4ddOKXmVzjECgku2ddMcm7OS9Bp9QOblMHT88PzKiCc7npGiHf5+mTfrEW1JVIBbA2A=="; - }; - }; "vue-eslint-parser-7.11.0" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; @@ -57988,15 +57196,6 @@ let sha512 = "QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A=="; }; }; - "xss-1.0.15" = { - name = "xss"; - packageName = "xss"; - version = "1.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.15.tgz"; - sha512 = "FVdlVVC67WOIPvfOwhoMETV72f6GbW7aOabBC3WxN/oUdoEMDyLz4OgRv5/gck2ZeNqEQu+Tb0kloovXOfpYVg=="; - }; - }; "xstate-4.38.3" = { name = "xstate"; packageName = "xstate"; @@ -58123,15 +57322,6 @@ let sha512 = "aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg=="; }; }; - "yaml-front-matter-4.1.1" = { - name = "yaml-front-matter"; - packageName = "yaml-front-matter"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yaml-front-matter/-/yaml-front-matter-4.1.1.tgz"; - sha512 = "ULGbghCLsN8Hs8vfExlqrJIe8Hl2TUjD7/zsIGMP8U+dgRXEsDXk4yydxeZJgdGiimP1XB7zhmhOB4/HyfqOyQ=="; - }; - }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -61385,1117 +60575,6 @@ in bypassCache = true; reconstructLock = true; }; - "@vue/cli" = nodeEnv.buildNodePackage { - name = "_at_vue_slash_cli"; - packageName = "@vue/cli"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-5.0.8.tgz"; - sha512 = "c/QKPdC09bYkW22m/boXkLaiz10z0Z2WHZO7zEeNdfSduqyWINZhKc6hVQU3Vk0NXW7BJAd7zWmcUrC8L9TuAA=="; - }; - dependencies = [ - sources."@achrinza/node-ipc-9.2.9" - sources."@akryum/winattr-3.0.0" - sources."@ampproject/remapping-2.3.0" - sources."@apollo/protobufjs-1.2.7" - sources."@apollo/usage-reporting-protobuf-4.1.1" - sources."@apollo/utils.dropunuseddefinitions-1.1.0" - (sources."@apollo/utils.keyvaluecache-1.0.2" // { - dependencies = [ - sources."lru-cache-7.13.1" - ]; - }) - sources."@apollo/utils.logger-1.0.1" - sources."@apollo/utils.printwithreducedwhitespace-1.1.0" - sources."@apollo/utils.removealiases-1.0.0" - sources."@apollo/utils.sortast-1.1.0" - sources."@apollo/utils.stripsensitiveliterals-1.2.0" - sources."@apollo/utils.usagereporting-1.0.1" - sources."@apollographql/apollo-tools-0.5.4" - sources."@apollographql/graphql-playground-html-1.6.29" - sources."@babel/code-frame-7.24.7" - sources."@babel/compat-data-7.24.7" - (sources."@babel/core-7.24.7" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/generator-7.24.7" - sources."@babel/helper-annotate-as-pure-7.24.7" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.24.7" - (sources."@babel/helper-compilation-targets-7.24.7" // { - dependencies = [ - sources."lru-cache-5.1.1" - sources."semver-6.3.1" - sources."yallist-3.1.1" - ]; - }) - (sources."@babel/helper-create-class-features-plugin-7.24.7" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - (sources."@babel/helper-create-regexp-features-plugin-7.24.7" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/helper-define-polyfill-provider-0.6.2" - sources."@babel/helper-environment-visitor-7.24.7" - sources."@babel/helper-function-name-7.24.7" - sources."@babel/helper-hoist-variables-7.24.7" - sources."@babel/helper-member-expression-to-functions-7.24.7" - sources."@babel/helper-module-imports-7.24.7" - sources."@babel/helper-module-transforms-7.24.7" - sources."@babel/helper-optimise-call-expression-7.24.7" - sources."@babel/helper-plugin-utils-7.24.7" - sources."@babel/helper-remap-async-to-generator-7.24.7" - sources."@babel/helper-replace-supers-7.24.7" - sources."@babel/helper-simple-access-7.24.7" - sources."@babel/helper-skip-transparent-expression-wrappers-7.24.7" - sources."@babel/helper-split-export-declaration-7.24.7" - sources."@babel/helper-string-parser-7.24.7" - sources."@babel/helper-validator-identifier-7.24.7" - sources."@babel/helper-validator-option-7.24.7" - sources."@babel/helper-wrap-function-7.24.7" - sources."@babel/helpers-7.24.7" - (sources."@babel/highlight-7.24.7" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/parser-7.24.7" - sources."@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7" - sources."@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.7" - sources."@babel/plugin-proposal-class-properties-7.18.6" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" - sources."@babel/plugin-proposal-optional-chaining-7.21.0" - sources."@babel/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.24.7" - sources."@babel/plugin-syntax-import-assertions-7.24.7" - sources."@babel/plugin-syntax-import-attributes-7.24.7" - sources."@babel/plugin-syntax-import-meta-7.10.4" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.24.7" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-private-property-in-object-7.14.5" - sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.24.7" - sources."@babel/plugin-syntax-unicode-sets-regex-7.18.6" - sources."@babel/plugin-transform-arrow-functions-7.24.7" - sources."@babel/plugin-transform-async-generator-functions-7.24.7" - sources."@babel/plugin-transform-async-to-generator-7.24.7" - sources."@babel/plugin-transform-block-scoped-functions-7.24.7" - sources."@babel/plugin-transform-block-scoping-7.24.7" - sources."@babel/plugin-transform-class-properties-7.24.7" - sources."@babel/plugin-transform-class-static-block-7.24.7" - sources."@babel/plugin-transform-classes-7.24.7" - sources."@babel/plugin-transform-computed-properties-7.24.7" - sources."@babel/plugin-transform-destructuring-7.24.7" - sources."@babel/plugin-transform-dotall-regex-7.24.7" - sources."@babel/plugin-transform-duplicate-keys-7.24.7" - sources."@babel/plugin-transform-dynamic-import-7.24.7" - sources."@babel/plugin-transform-exponentiation-operator-7.24.7" - sources."@babel/plugin-transform-export-namespace-from-7.24.7" - sources."@babel/plugin-transform-flow-strip-types-7.24.7" - sources."@babel/plugin-transform-for-of-7.24.7" - sources."@babel/plugin-transform-function-name-7.24.7" - sources."@babel/plugin-transform-json-strings-7.24.7" - sources."@babel/plugin-transform-literals-7.24.7" - sources."@babel/plugin-transform-logical-assignment-operators-7.24.7" - sources."@babel/plugin-transform-member-expression-literals-7.24.7" - sources."@babel/plugin-transform-modules-amd-7.24.7" - sources."@babel/plugin-transform-modules-commonjs-7.24.7" - sources."@babel/plugin-transform-modules-systemjs-7.24.7" - sources."@babel/plugin-transform-modules-umd-7.24.7" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.24.7" - sources."@babel/plugin-transform-new-target-7.24.7" - sources."@babel/plugin-transform-nullish-coalescing-operator-7.24.7" - sources."@babel/plugin-transform-numeric-separator-7.24.7" - sources."@babel/plugin-transform-object-rest-spread-7.24.7" - sources."@babel/plugin-transform-object-super-7.24.7" - sources."@babel/plugin-transform-optional-catch-binding-7.24.7" - sources."@babel/plugin-transform-optional-chaining-7.24.7" - sources."@babel/plugin-transform-parameters-7.24.7" - sources."@babel/plugin-transform-private-methods-7.24.7" - sources."@babel/plugin-transform-private-property-in-object-7.24.7" - sources."@babel/plugin-transform-property-literals-7.24.7" - sources."@babel/plugin-transform-regenerator-7.24.7" - sources."@babel/plugin-transform-reserved-words-7.24.7" - sources."@babel/plugin-transform-shorthand-properties-7.24.7" - sources."@babel/plugin-transform-spread-7.24.7" - sources."@babel/plugin-transform-sticky-regex-7.24.7" - sources."@babel/plugin-transform-template-literals-7.24.7" - sources."@babel/plugin-transform-typeof-symbol-7.24.7" - sources."@babel/plugin-transform-typescript-7.24.7" - sources."@babel/plugin-transform-unicode-escapes-7.24.7" - sources."@babel/plugin-transform-unicode-property-regex-7.24.7" - sources."@babel/plugin-transform-unicode-regex-7.24.7" - sources."@babel/plugin-transform-unicode-sets-regex-7.24.7" - (sources."@babel/preset-env-7.24.7" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."@babel/preset-flow-7.24.7" - sources."@babel/preset-modules-0.1.6-no-external-plugins" - sources."@babel/preset-typescript-7.24.7" - (sources."@babel/register-7.24.6" // { - dependencies = [ - sources."make-dir-2.1.0" - sources."pify-4.0.1" - sources."semver-5.7.2" - ]; - }) - sources."@babel/regjsgen-0.8.0" - sources."@babel/runtime-7.24.7" - sources."@babel/template-7.24.7" - sources."@babel/traverse-7.24.7" - sources."@babel/types-7.24.7" - sources."@graphql-tools/merge-8.3.1" - (sources."@graphql-tools/mock-8.7.20" // { - dependencies = [ - sources."@graphql-tools/merge-8.4.2" - sources."@graphql-tools/schema-9.0.19" - sources."@graphql-tools/utils-9.2.1" - sources."value-or-promise-1.0.12" - ]; - }) - sources."@graphql-tools/schema-8.5.1" - sources."@graphql-tools/utils-8.9.0" - sources."@graphql-typed-document-node/core-3.2.0" - sources."@hapi/hoek-9.3.0" - sources."@hapi/topo-5.1.0" - sources."@josephg/resolvable-1.0.1" - sources."@jridgewell/gen-mapping-0.3.5" - sources."@jridgewell/resolve-uri-3.1.2" - sources."@jridgewell/set-array-1.2.1" - sources."@jridgewell/sourcemap-codec-1.4.15" - sources."@jridgewell/trace-mapping-0.3.25" - sources."@node-ipc/js-queue-2.0.3" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@protobufjs/aspromise-1.1.2" - sources."@protobufjs/base64-1.1.2" - sources."@protobufjs/codegen-2.0.4" - sources."@protobufjs/eventemitter-1.1.0" - sources."@protobufjs/fetch-1.1.0" - sources."@protobufjs/float-1.0.2" - sources."@protobufjs/inquire-1.1.0" - sources."@protobufjs/path-1.1.2" - sources."@protobufjs/pool-1.1.0" - sources."@protobufjs/utf8-1.1.0" - sources."@sideway/address-4.1.5" - sources."@sideway/formula-3.0.1" - sources."@sideway/pinpoint-2.0.0" - sources."@sindresorhus/is-0.7.0" - sources."@types/accepts-1.3.7" - sources."@types/body-parser-1.19.2" - sources."@types/connect-3.4.38" - sources."@types/cors-2.8.12" - sources."@types/ejs-3.1.5" - sources."@types/express-4.17.14" - sources."@types/express-serve-static-core-4.17.31" - sources."@types/http-errors-2.0.4" - sources."@types/inquirer-8.2.10" - (sources."@types/jscodeshift-0.7.2" // { - dependencies = [ - sources."ast-types-0.12.1" - sources."recast-0.17.2" - ]; - }) - sources."@types/long-4.0.2" - sources."@types/mime-1.3.5" - sources."@types/node-20.14.2" - sources."@types/normalize-package-data-2.4.4" - sources."@types/qs-6.9.15" - sources."@types/range-parser-1.2.7" - sources."@types/send-0.17.4" - sources."@types/serve-static-1.15.7" - sources."@types/through-0.0.33" - sources."@vue/cli-shared-utils-5.0.8" - (sources."@vue/cli-ui-5.0.8" // { - dependencies = [ - sources."clone-2.1.2" - ]; - }) - sources."@vue/cli-ui-addon-webpack-5.0.8" - sources."@vue/cli-ui-addon-widgets-5.0.8" - (sources."@vue/compiler-core-3.4.29" // { - dependencies = [ - sources."entities-4.5.0" - ]; - }) - sources."@vue/compiler-dom-3.4.29" - sources."@vue/compiler-sfc-2.7.16" - sources."@vue/shared-3.4.29" - sources."accepts-1.3.8" - sources."aggregate-error-3.1.0" - sources."ansi-align-3.0.1" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."apollo-datasource-3.3.2" - (sources."apollo-reporting-protobuf-3.4.0" // { - dependencies = [ - sources."@apollo/protobufjs-1.2.6" - sources."@types/node-10.17.60" - ]; - }) - sources."apollo-server-core-3.13.0" - sources."apollo-server-env-4.2.1" - sources."apollo-server-errors-3.3.1" - sources."apollo-server-express-3.13.0" - sources."apollo-server-plugin-base-3.7.2" - sources."apollo-server-types-3.8.0" - (sources."archive-type-4.0.0" // { - dependencies = [ - sources."file-type-4.4.0" - ]; - }) - sources."argparse-2.0.1" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-flatten-1.1.1" - sources."array-union-2.1.0" - sources."array-unique-0.3.2" - sources."arrify-2.0.1" - sources."assign-symbols-1.0.0" - sources."ast-types-0.14.2" - sources."async-2.6.4" - sources."async-retry-1.3.3" - sources."at-least-node-1.0.0" - sources."atob-2.1.2" - sources."babel-core-7.0.0-bridge.0" - (sources."babel-plugin-polyfill-corejs2-0.4.11" // { - dependencies = [ - sources."semver-6.3.1" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.10.4" - sources."babel-plugin-polyfill-regenerator-0.6.2" - sources."backo2-1.0.2" - sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."base64-js-1.5.1" - sources."bl-4.1.0" - (sources."body-parser-1.20.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."iconv-lite-0.4.24" - ]; - }) - (sources."boxen-5.1.2" // { - dependencies = [ - sources."type-fest-0.20.2" - ]; - }) - sources."brace-expansion-1.1.11" - sources."braces-3.0.3" - sources."browserslist-4.23.1" - sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" - sources."buffer-from-1.1.2" - sources."bufferutil-4.0.8" - sources."builtins-1.0.3" - sources."bytes-3.1.2" - sources."cache-base-1.0.1" - (sources."cacheable-request-2.1.4" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."lowercase-keys-1.0.0" - ]; - }) - sources."call-bind-1.0.7" - sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001634" - sources."caw-2.0.1" - sources."chalk-4.1.2" - sources."chardet-0.7.0" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-descriptor-0.1.7" - ]; - }) - sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.1" - sources."cli-cursor-3.1.0" - sources."cli-spinners-2.9.2" - sources."cli-width-3.0.0" - sources."cliui-7.0.4" - sources."clone-1.0.4" - sources."clone-deep-4.0.1" - sources."clone-response-1.0.2" - sources."collection-visit-1.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."colors-1.4.0" - sources."commander-7.2.0" - sources."commondir-1.0.1" - sources."component-emitter-1.3.1" - sources."concat-map-0.0.1" - (sources."config-chain-1.1.13" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."content-disposition-0.5.4" - sources."content-type-1.0.5" - sources."convert-source-map-2.0.0" - sources."cookie-0.6.0" - sources."cookie-signature-1.0.6" - sources."copy-descriptor-0.1.1" - sources."core-js-compat-3.37.1" - sources."core-util-is-1.0.3" - sources."cors-2.8.5" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - sources."cssfilter-0.0.10" - sources."csstype-3.1.3" - (sources."debug-4.3.5" // { - dependencies = [ - sources."ms-2.1.2" - ]; - }) - sources."decode-uri-component-0.2.2" - (sources."decompress-4.2.1" // { - dependencies = [ - sources."pify-2.3.0" - ]; - }) - sources."decompress-response-3.3.0" - (sources."decompress-tar-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - (sources."decompress-targz-4.1.1" // { - dependencies = [ - sources."file-type-5.2.0" - ]; - }) - (sources."decompress-unzip-4.0.1" // { - dependencies = [ - sources."file-type-3.9.0" - sources."get-stream-2.3.1" - sources."pify-2.3.0" - ]; - }) - sources."deepmerge-4.3.1" - sources."defaults-1.0.4" - sources."define-data-property-1.1.4" - sources."define-lazy-prop-2.0.0" - sources."define-property-2.0.2" - sources."depd-2.0.0" - sources."destroy-1.2.0" - sources."dir-glob-3.0.1" - (sources."download-7.1.0" // { - dependencies = [ - sources."get-stream-3.0.0" - ]; - }) - sources."download-git-repo-3.0.2" - sources."duplexer3-0.1.5" - sources."easy-stack-1.0.1" - sources."ee-first-1.1.1" - sources."ejs-3.1.10" - sources."electron-to-chromium-1.4.802" - sources."emoji-regex-8.0.0" - sources."encodeurl-1.0.2" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."entities-2.2.0" - sources."envinfo-7.13.0" - sources."error-ex-1.3.2" - sources."es-define-property-1.0.0" - sources."es-errors-1.3.0" - sources."escalade-3.1.2" - sources."escape-html-1.0.3" - sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."estree-walker-2.0.2" - sources."esutils-2.0.3" - sources."etag-1.8.1" - sources."event-pubsub-4.3.0" - sources."eventemitter3-3.1.2" - sources."execa-1.0.0" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - sources."is-descriptor-0.1.7" - ]; - }) - (sources."express-4.19.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."express-history-api-fallback-2.2.1" - sources."ext-list-2.2.2" - sources."ext-name-5.0.0" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."external-editor-3.1.0" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."fast-glob-3.3.2" - sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.17.1" - sources."fd-slicer-1.1.0" - sources."figures-3.2.0" - sources."file-type-8.1.0" - (sources."filelist-1.0.4" // { - dependencies = [ - sources."brace-expansion-2.0.1" - sources."minimatch-5.1.6" - ]; - }) - sources."filename-reserved-regex-2.0.0" - sources."filenamify-2.1.0" - sources."fill-range-7.1.1" - (sources."finalhandler-1.2.0" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - (sources."find-cache-dir-2.1.0" // { - dependencies = [ - sources."find-up-3.0.0" - sources."locate-path-3.0.0" - sources."make-dir-2.1.0" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."path-exists-3.0.0" - sources."pify-4.0.1" - sources."pkg-dir-3.0.0" - sources."semver-5.7.2" - ]; - }) - sources."find-up-5.0.0" - (sources."fkill-7.2.1" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-5.1.1" - sources."get-stream-6.0.1" - sources."is-stream-2.0.1" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."flow-parser-0.238.0" - sources."for-in-1.0.2" - sources."forwarded-0.2.0" - sources."fragment-cache-0.2.1" - sources."fresh-0.5.2" - (sources."from2-2.3.0" // { - dependencies = [ - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - sources."fs-constants-1.0.0" - sources."fs-extra-9.1.0" - sources."fs.realpath-1.0.0" - sources."fswin-2.17.1227" - sources."function-bind-1.1.2" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.2.4" - sources."get-proxy-2.1.0" - sources."get-stream-4.1.0" - sources."get-value-2.0.6" - sources."git-clone-0.1.0" - sources."git-config-path-2.0.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - (sources."global-dirs-0.1.1" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."globals-11.12.0" - sources."globby-11.1.0" - sources."gopd-1.0.1" - (sources."got-8.3.2" // { - dependencies = [ - sources."get-stream-3.0.0" - ]; - }) - sources."graceful-fs-4.2.11" - sources."graphql-15.8.0" - sources."graphql-subscriptions-1.2.1" - sources."graphql-tag-2.12.6" - sources."graphql-type-json-0.3.2" - sources."growly-1.3.0" - sources."has-flag-4.0.0" - sources."has-property-descriptors-1.0.2" - sources."has-proto-1.0.3" - sources."has-symbol-support-x-1.4.2" - sources."has-symbols-1.0.3" - sources."has-to-string-tag-x-1.4.1" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" - ]; - }) - sources."hasown-2.0.2" - sources."hosted-git-info-2.8.9" - sources."http-cache-semantics-3.8.1" - sources."http-errors-2.0.0" - sources."human-signals-2.1.0" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."ignore-5.3.1" - sources."import-global-0.1.0" - sources."imurmurhash-0.1.4" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-2.0.0" - (sources."inquirer-8.2.6" // { - dependencies = [ - sources."wrap-ansi-6.2.0" - ]; - }) - sources."into-stream-3.1.0" - sources."ipaddr.js-1.9.1" - sources."is-accessor-descriptor-1.0.1" - sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" - sources."is-core-module-2.13.1" - sources."is-data-descriptor-1.0.1" - sources."is-descriptor-1.0.3" - sources."is-docker-2.2.1" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" - sources."is-glob-4.0.3" - sources."is-interactive-1.0.0" - sources."is-natural-number-4.0.1" - sources."is-number-7.0.0" - sources."is-object-1.0.2" - sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-promise-2.2.2" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" - sources."is-unicode-supported-0.1.0" - sources."is-windows-1.0.2" - sources."is-wsl-2.2.0" - sources."isarray-1.0.0" - sources."isbinaryfile-4.0.10" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."isurl-1.0.0" - sources."iterall-1.3.0" - (sources."jake-10.9.1" // { - dependencies = [ - sources."async-3.2.5" - ]; - }) - sources."javascript-stringify-2.1.0" - sources."joi-17.13.1" - sources."js-message-1.0.7" - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - (sources."jscodeshift-0.11.0" // { - dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."is-number-3.0.0" - sources."kind-of-3.2.2" - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" - ]; - }) - sources."jsesc-2.5.2" - sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.3.1" - sources."json5-2.2.3" - sources."jsonfile-6.1.0" - sources."keyv-3.0.0" - sources."kind-of-6.0.3" - sources."launch-editor-2.6.1" - sources."leven-3.1.0" - sources."lines-and-columns-1.2.4" - sources."locate-path-6.0.0" - sources."lodash-4.17.21" - sources."lodash.clonedeep-4.5.0" - sources."lodash.debounce-4.0.8" - sources."lodash.merge-4.6.2" - sources."lodash.sortby-4.7.0" - sources."log-symbols-4.1.0" - sources."loglevel-1.9.1" - sources."long-4.0.0" - sources."lowdb-1.0.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - sources."make-dir-1.3.0" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."media-typer-0.3.0" - sources."merge-descriptors-1.0.1" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."methods-1.1.2" - sources."micromatch-4.0.7" - sources."mime-1.6.0" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.6" - sources."ms-2.0.0" - sources."mute-stream-0.0.8" - sources."nanoid-2.1.11" - sources."nanomatch-1.2.13" - sources."negotiator-0.6.3" - sources."neo-async-2.6.2" - sources."nice-try-1.0.5" - sources."node-abort-controller-3.1.1" - sources."node-dir-0.1.17" - sources."node-fetch-2.7.0" - sources."node-gyp-build-4.8.1" - (sources."node-notifier-10.0.1" // { - dependencies = [ - sources."uuid-8.3.2" - sources."which-2.0.2" - ]; - }) - sources."node-releases-2.0.14" - (sources."normalize-package-data-2.5.0" // { - dependencies = [ - sources."semver-5.7.2" - ]; - }) - (sources."normalize-url-2.0.1" // { - dependencies = [ - sources."sort-keys-2.0.0" - ]; - }) - sources."npm-conf-1.1.3" - sources."npm-run-path-2.0.2" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-descriptor-0.1.7" - sources."kind-of-3.2.2" - ]; - }) - sources."object-inspect-1.13.1" - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" - sources."on-finished-2.4.1" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."open-8.4.2" - sources."ora-5.4.1" - sources."os-tmpdir-1.0.2" - sources."p-cancelable-0.4.1" - sources."p-event-2.3.1" - sources."p-finally-1.0.0" - sources."p-is-promise-1.1.0" - sources."p-limit-3.1.0" - sources."p-locate-5.0.0" - sources."p-timeout-2.0.1" - sources."p-try-2.2.0" - (sources."parse-git-config-3.0.0" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) - sources."parse-json-5.2.0" - sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-2.0.1" - sources."path-parse-1.0.7" - sources."path-to-regexp-0.1.7" - sources."path-type-4.0.0" - sources."pend-1.2.0" - sources."picocolors-1.0.1" - sources."picomatch-2.3.1" - (sources."pid-port-0.1.1" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-5.1.1" - sources."get-stream-6.0.1" - sources."is-stream-2.0.1" - sources."npm-run-path-4.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - sources."pify-3.0.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."pirates-4.0.6" - sources."pkg-dir-5.0.0" - (sources."portfinder-1.0.32" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) - sources."posix-character-classes-0.1.1" - (sources."postcss-8.4.38" // { - dependencies = [ - sources."nanoid-3.3.7" - ]; - }) - sources."prepend-http-2.0.0" - sources."prettier-2.8.8" - sources."prismjs-1.29.0" - sources."private-0.1.8" - (sources."process-exists-4.1.0" // { - dependencies = [ - sources."ps-list-6.3.0" - ]; - }) - sources."process-nextick-args-2.0.1" - sources."proto-list-1.2.4" - sources."proxy-addr-2.0.7" - sources."ps-list-7.2.0" - sources."pump-3.0.0" - sources."qs-6.11.0" - sources."query-string-5.1.1" - sources."queue-microtask-1.2.3" - sources."range-parser-1.2.1" - (sources."raw-body-2.5.2" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) - sources."read-pkg-5.2.0" - sources."readable-stream-3.6.2" - sources."recast-0.20.5" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.1.1" - sources."regenerator-runtime-0.14.1" - sources."regenerator-transform-0.15.2" - sources."regex-not-1.0.2" - sources."regexpu-core-5.3.2" - (sources."regjsparser-0.9.1" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" - sources."require-directory-2.1.1" - sources."resolve-1.22.8" - sources."resolve-url-0.2.1" - sources."responselike-1.0.2" - sources."restore-cursor-3.1.0" - sources."ret-0.1.15" - sources."retry-0.13.1" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."rss-parser-3.13.0" - sources."run-async-2.4.1" - sources."run-parallel-1.2.0" - sources."rxjs-7.8.1" - sources."safe-buffer-5.2.1" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - sources."sax-1.4.1" - (sources."seek-bzip-1.0.6" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - sources."semver-7.6.2" - (sources."send-0.18.0" // { - dependencies = [ - (sources."debug-2.6.9" // { - dependencies = [ - sources."ms-2.0.0" - ]; - }) - sources."ms-2.1.3" - ]; - }) - sources."serve-static-1.15.0" - sources."set-function-length-1.2.2" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."setprototypeof-1.2.0" - sources."sha.js-2.4.11" - sources."shallow-clone-3.0.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."shell-quote-1.8.1" - sources."shellwords-0.1.1" - sources."shortid-2.2.16" - sources."side-channel-1.0.6" - sources."signal-exit-3.0.7" - sources."slash-3.0.0" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - sources."is-descriptor-0.1.7" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."sort-keys-1.1.2" - sources."sort-keys-length-1.0.1" - sources."source-map-0.6.1" - sources."source-map-js-1.2.0" - sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.21" - sources."source-map-url-0.4.1" - sources."spdx-correct-3.2.0" - sources."spdx-exceptions-2.5.0" - sources."spdx-expression-parse-3.0.1" - sources."spdx-license-ids-3.0.18" - sources."split-string-3.1.0" - sources."sprintf-js-1.0.3" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-descriptor-0.1.7" - ]; - }) - sources."statuses-2.0.1" - sources."steno-0.4.4" - sources."strict-uri-encode-1.1.0" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.1" - sources."strip-dirs-2.1.0" - sources."strip-eof-1.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-outer-1.0.1" - sources."subscriptions-transport-ws-0.11.0" - sources."supports-color-7.2.0" - sources."supports-preserve-symlinks-flag-1.0.0" - sources."symbol-observable-1.2.0" - (sources."tar-stream-1.6.2" // { - dependencies = [ - sources."bl-1.2.3" - sources."readable-stream-2.3.8" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) - (sources."taskkill-3.1.0" // { - dependencies = [ - sources."cross-spawn-7.0.3" - sources."execa-3.4.0" - sources."get-stream-5.2.0" - sources."human-signals-1.1.1" - sources."is-stream-2.0.1" - sources."npm-run-path-4.0.1" - sources."p-finally-2.0.1" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - }) - (sources."temp-0.8.4" // { - dependencies = [ - sources."rimraf-2.6.3" - ]; - }) - sources."through-2.3.8" - sources."timed-out-4.0.1" - sources."tmp-0.0.33" - sources."to-buffer-1.1.1" - sources."to-fast-properties-2.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-5.0.1" - sources."toidentifier-1.0.1" - sources."tr46-0.0.3" - sources."trim-repeated-1.0.0" - sources."tslib-2.6.3" - sources."tunnel-agent-0.6.0" - sources."type-fest-0.6.0" - sources."type-is-1.6.18" - sources."typescript-4.5.5" - sources."unbzip2-stream-1.4.3" - sources."undici-types-5.26.5" - sources."unicode-canonical-property-names-ecmascript-2.0.0" - sources."unicode-match-property-ecmascript-2.0.0" - sources."unicode-match-property-value-ecmascript-2.1.0" - sources."unicode-property-aliases-ecmascript-2.1.0" - sources."union-value-1.0.1" - sources."universalify-2.0.1" - sources."unpipe-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."update-browserslist-db-1.0.16" - sources."urix-0.1.0" - sources."url-parse-lax-3.0.0" - sources."url-to-options-1.0.1" - sources."use-3.1.1" - sources."utf-8-validate-5.0.10" - sources."util-deprecate-1.0.2" - sources."utils-merge-1.0.1" - sources."uuid-9.0.1" - sources."validate-npm-package-license-3.0.4" - sources."validate-npm-package-name-3.0.0" - sources."value-or-promise-1.0.11" - sources."vary-1.1.2" - sources."vue-2.7.16" - (sources."vue-codemod-0.0.5" // { - dependencies = [ - sources."inquirer-7.3.3" - sources."rxjs-6.6.7" - sources."tslib-1.14.1" - ]; - }) - sources."wcwidth-1.0.1" - sources."webidl-conversions-3.0.1" - sources."whatwg-mimetype-3.0.0" - sources."whatwg-url-5.0.0" - sources."which-1.3.1" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - sources."ws-7.5.9" - sources."xml2js-0.5.0" - sources."xmlbuilder-11.0.1" - (sources."xss-1.0.15" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) - sources."xtend-4.0.2" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - (sources."yaml-front-matter-4.1.1" // { - dependencies = [ - sources."argparse-1.0.10" - sources."commander-6.2.1" - sources."js-yaml-3.14.1" - ]; - }) - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - sources."yauzl-2.10.0" - sources."yocto-queue-0.1.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Command line interface for rapid Vue.js development"; - homepage = "https://cli.vuejs.org/"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@webassemblyjs/cli-1.11.1" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; packageName = "@webassemblyjs/cli"; From 4ee284a879304d202ac948456844d4fff8b78870 Mon Sep 17 00:00:00 2001 From: Breland Miley Date: Sat, 13 Jul 2024 22:03:25 -0400 Subject: [PATCH 219/227] home-assistant-custom-components.elevenlabs_tts: init at 2.3.0 --- .../custom-components/default.nix | 2 ++ .../elevenlabs_tts/default.nix | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 3a1184016f3e..13cca201ffbf 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -10,6 +10,8 @@ better_thermostat = callPackage ./better_thermostat {}; + elevenlabs_tts = callPackage ./elevenlabs_tts {}; + emporia_vue = callPackage ./emporia_vue {}; epex_spot = callPackage ./epex_spot {}; diff --git a/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix new file mode 100644 index 000000000000..f69117f21547 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/elevenlabs_tts/default.nix @@ -0,0 +1,26 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, +}: + +buildHomeAssistantComponent rec { + owner = "carleeno"; + domain = "elevenlabs_tts"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "carleeno"; + repo = "elevenlabs_tts"; + rev = "refs/tags/${version}"; + hash = "sha256-7/Di3K7b0IzxatqBXqgVeMziRwalOVmIJ5IuEWJVjkE="; + }; + + meta = with lib; { + changelog = "https://github.com/carleeno/elevenlabs_tts/releases/tag/${version}"; + description = "Home Assistant Eleven Labs TTS Integration"; + homepage = "https://github.com/carleeno/elevenlabs_tts"; + maintainers = with maintainers; [ mindstorms6 ]; + license = licenses.asl20; + }; +} From d6b008f3b0529189760c08c83d7210bd984c846f Mon Sep 17 00:00:00 2001 From: Breland Miley Date: Sat, 13 Jul 2024 22:24:44 -0400 Subject: [PATCH 220/227] home-assistant-custom-components.samsungtv-smart: init at 0.13.5 --- .../custom-components/default.nix | 2 + .../samsungtv-smart/default.nix | 37 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 3a1184016f3e..b6af82ffe197 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -42,6 +42,8 @@ prometheus_sensor = callPackage ./prometheus_sensor {}; + samsungtv-smart = callPackage ./samsungtv-smart {}; + sensi = callPackage ./sensi {}; smartir = callPackage ./smartir {}; diff --git a/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix new file mode 100644 index 000000000000..f4af035e51fe --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/samsungtv-smart/default.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + aiofiles, + casttube, + websocket-client, + wakeonlan, +}: + +buildHomeAssistantComponent rec { + owner = "ollo69"; + domain = "samsungtv_smart"; + version = "0.13.5"; + + src = fetchFromGitHub { + owner = "ollo69"; + repo = "ha-samsungtv-smart"; + rev = "refs/tags/v${version}"; + hash = "sha256-12wx8HaTEFQZOnxfcuAKFOXPdDpfAl608N1E6gmWqBI="; + }; + + dependencies = [ + aiofiles + casttube + websocket-client + wakeonlan + ]; + + meta = with lib; { + changelog = "https://github.com/ollo69/ha-samsungtv-smart/releases/tag/v${version}"; + description = "Home Assistant Samsung TV Integration "; + homepage = "https://github.com/ollo69/ha-samsungtv-smart"; + maintainers = with maintainers; [ mindstorms6 ]; + license = licenses.asl20; + }; +} From 4b72d38641bb75ee020da3e1222b6c592ecea891 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 14 Jul 2024 17:13:25 +0200 Subject: [PATCH 221/227] ruff: 0.5.1 -> 0.5.2 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.5.1...0.5.2 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.5.2 --- pkgs/development/tools/ruff/Cargo.lock | 85 +++++++++++++------------ pkgs/development/tools/ruff/default.nix | 40 +----------- 2 files changed, 47 insertions(+), 78 deletions(-) diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 07e945a5164c..77ac3ebd9783 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -666,7 +666,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.5", + "hashbrown", "lock_api", "once_cell", "parking_lot_core", @@ -680,7 +680,7 @@ checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" dependencies = [ "cfg-if", "crossbeam-utils", - "hashbrown 0.14.5", + "hashbrown", "lock_api", "once_cell", "parking_lot_core", @@ -928,12 +928,6 @@ dependencies = [ "crunchy", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.5" @@ -950,7 +944,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.5", + "hashbrown", ] [[package]] @@ -1037,12 +1031,12 @@ dependencies = [ [[package]] name = "imara-diff" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8" +checksum = "af13c8ceb376860ff0c6a66d83a8cdd4ecd9e464da24621bbffcd02b49619434" dependencies = [ "ahash", - "hashbrown 0.12.3", + "hashbrown", ] [[package]] @@ -1062,7 +1056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown", "serde", ] @@ -1532,6 +1526,15 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" +[[package]] +name = "ordermap" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5a8e22be64dfa1123429350872e7be33594dbf5ae5212c90c5890e71966d1d" +dependencies = [ + "indexmap", +] + [[package]] name = "os_str_bytes" version = "6.6.1" @@ -1861,6 +1864,7 @@ name = "red_knot" version = "0.0.0" dependencies = [ "anyhow", + "clap", "countme", "crossbeam", "ctrlc", @@ -1882,8 +1886,10 @@ name = "red_knot_module_resolver" version = "0.0.0" dependencies = [ "anyhow", + "camino", "compact_str", "insta", + "once_cell", "path-slash", "ruff_db", "ruff_python_stdlib", @@ -1901,8 +1907,8 @@ version = "0.0.0" dependencies = [ "anyhow", "bitflags 2.6.0", - "hashbrown 0.14.5", - "indexmap", + "hashbrown", + "ordermap", "red_knot_module_resolver", "ruff_db", "ruff_index", @@ -1995,7 +2001,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.5.1" +version = "0.5.2" dependencies = [ "anyhow", "argfile", @@ -2090,13 +2096,13 @@ dependencies = [ "dashmap 6.0.1", "filetime", "insta", - "once_cell", "ruff_python_ast", "ruff_python_parser", "ruff_source_file", "ruff_text_size", "rustc-hash 2.0.0", "salsa", + "tempfile", "tracing", "zip", ] @@ -2177,7 +2183,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.5.1" +version = "0.5.2" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2443,7 +2449,6 @@ version = "0.2.2" dependencies = [ "anyhow", "crossbeam", - "globset", "insta", "jod-thread", "libc", @@ -2587,11 +2592,12 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.4" +version = "0.23.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" dependencies = [ "log", + "once_cell", "ring", "rustls-pki-types", "rustls-webpki", @@ -2601,15 +2607,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.5.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beb461507cee2c2ff151784c52762cf4d9ff6a61f3e80968600ed24fa837fa54" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" [[package]] name = "rustls-webpki" -version = "0.102.3" +version = "0.102.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3bce581c0dd41bce533ce695a1437fa16a7ab5ac3ccfa99fe1a620a7885eabf" +checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" dependencies = [ "ring", "rustls-pki-types", @@ -2709,9 +2715,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] @@ -2729,9 +2735,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -2751,9 +2757,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.119" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -2791,9 +2797,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.8.2" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079f3a42cd87588d924ed95b533f8d30a483388c4e400ab736a7058e34f16169" +checksum = "e73139bc5ec2d45e6c5fd85be5a46949c1c39a4c18e56915f5eb4c12f975e377" dependencies = [ "serde", "serde_derive", @@ -2802,9 +2808,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.8.2" +version = "3.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc03aad67c1d26b7de277d51c86892e7d9a0110a2fe44bf6b26cc569fba302d6" +checksum = "b80d3d6b56b64335c0180e5ffde23b3c5e08c14c585b51a15bd0e95393f46703" dependencies = [ "darling", "proc-macro2", @@ -2911,9 +2917,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.68" +version = "2.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" dependencies = [ "proc-macro2", "quote", @@ -3305,9 +3311,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "ureq" -version = "2.9.7" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd" +checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea" dependencies = [ "base64", "flate2", @@ -3315,7 +3321,6 @@ dependencies = [ "once_cell", "rustls", "rustls-pki-types", - "rustls-webpki", "url", "webpki-roots", ] diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index c0d31e390d9d..aa96d8dbe363 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-2tW/p9A7jpQg8ZmSF7KRuN6kBNKK1cfjnS9KlvnCpQA="; + hash = "sha256-g71RqbEoCpmCjd0CKkc++yv00ohoORDeMYAwYEHKhW4="; }; cargoLock = { @@ -31,17 +31,6 @@ rustPlatform.buildRustPackage rec { }; }; - # Fix compatibility with cargo-auditable - # https://github.com/astral-sh/ruff/pull/12275 - # TODO: this will be included in the next release - patches = [ - (fetchpatch { - name = "fix-compatibility-with-cargo-auditable"; - url = "https://github.com/astral-sh/ruff/commit/d0298dc26d471666acc01dacdb603e3e95aca06f.patch"; - hash = "sha256-Shf1Gw1pY98ZE+h9OhlpkJwq/S52EAJqUUk/uHix2fg="; - }) - ]; - nativeBuildInputs = [ installShellFiles ]; @@ -52,31 +41,6 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.CoreServices ]; - # tests expect no colors - preCheck = '' - export NO_COLOR=1 - ''; - - # Failing for an unclear reason. - # According to the maintainers, those tests are from an experimental crate that isn't actually - # used by ruff currently and can thus be safely skipped. - checkFlags = [ - "--skip=semantic::tests::expression_scope" - "--skip=semantic::tests::reachability_trivial" - "--skip=semantic::types::infer::tests::follow_import_to_class" - "--skip=semantic::types::infer::tests::if_elif" - "--skip=semantic::types::infer::tests::if_elif_else" - "--skip=semantic::types::infer::tests::ifexpr_walrus" - "--skip=semantic::types::infer::tests::ifexpr_walrus_2" - "--skip=semantic::types::infer::tests::join_paths" - "--skip=semantic::types::infer::tests::literal_int_arithmetic" - "--skip=semantic::types::infer::tests::maybe_unbound" - "--skip=semantic::types::infer::tests::narrow_none" - "--skip=semantic::types::infer::tests::resolve_base_class_by_name" - "--skip=semantic::types::infer::tests::resolve_module_member" - "--skip=semantic::types::infer::tests::resolve_visible_def" - ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ruff \ --bash <($out/bin/ruff generate-shell-completion bash) \ From 2d284d65aae747cf618d42cdd93703b35cc0102a Mon Sep 17 00:00:00 2001 From: Breland Miley Date: Sat, 13 Jul 2024 21:54:25 -0400 Subject: [PATCH 222/227] home-assistant-custom-components.alarmo: init at 1.10.4 --- .../custom-components/alarmo/default.nix | 31 +++++++++++++++++++ .../custom-components/default.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/alarmo/default.nix diff --git a/pkgs/servers/home-assistant/custom-components/alarmo/default.nix b/pkgs/servers/home-assistant/custom-components/alarmo/default.nix new file mode 100644 index 000000000000..ace6633a8c6e --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/alarmo/default.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, +}: + +buildHomeAssistantComponent rec { + owner = "nielsfaber"; + domain = "alarmo"; + version = "1.10.4"; + + postInstall = '' + cd $out/custom_components/alarmo/frontend + ls . | grep -v dist | xargs rm -rf + ''; + + src = fetchFromGitHub { + owner = "nielsfaber"; + repo = "alarmo"; + rev = "refs/tags/v${version}"; + hash = "sha256-/hNzGPckLHUX0mrBF3ugAXstrOc1mWdati+nRJCwldc="; + }; + + meta = with lib; { + changelog = "https://github.com/nielsfaber/alarmo/releases/tag/v${version}"; + description = "Alarm System for Home Assistant"; + homepage = "https://github.com/nielsfaber/alarmo"; + maintainers = with maintainers; [ mindstorms6 ]; + license = licenses.unfree; + }; +} diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix index 3a1184016f3e..5138c56f5aaf 100644 --- a/pkgs/servers/home-assistant/custom-components/default.nix +++ b/pkgs/servers/home-assistant/custom-components/default.nix @@ -4,6 +4,8 @@ { adaptive_lighting = callPackage ./adaptive_lighting {}; + alarmo = callPackage ./alarmo {}; + auth-header = callPackage ./auth-header {}; awtrix = callPackage ./awtrix {}; From 965f4470a449924e6e2e4ab7b4bbaa75c7551cdf Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 14:39:08 -0400 Subject: [PATCH 223/227] python3Packages.pyaprilaire: init at 0.7.4 --- .../python-modules/pyaprilaire/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pyaprilaire/default.nix diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix new file mode 100644 index 000000000000..6c99394c31a3 --- /dev/null +++ b/pkgs/development/python-modules/pyaprilaire/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + crc, + setuptools, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "pyaprilaire"; + version = "0.7.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "chamberlain2007"; + repo = "pyaprilaire"; + rev = "refs/tags/${version}"; + hash = "sha256-+/yQO0JF2nkxaM71iNj6ODB8raM9s4qiLLi6/borcr4="; + }; + + build-system = [ setuptools ]; + + dependencies = [ crc ]; + + pythonImportsCheck = [ "pyaprilaire" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + meta = { + changelog = "https://github.com/chamberlain2007/pyaprilaire/releases/tag/${version}"; + description = "Python library for interacting with Aprilaire thermostats."; + homepage = "https://github.com/chamberlain2007/pyaprilaire"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..fd5062c253f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9928,6 +9928,8 @@ self: super: with self; { psrpcore = callPackage ../development/python-modules/psrpcore { }; + pyaprilaire = callPackage ../development/python-modules/pyaprilaire { }; + pybars3 = callPackage ../development/python-modules/pybars3 { }; pymeta3 = callPackage ../development/python-modules/pymeta3 { }; From 3f8d5446a12a49dd3c836adec001134101900c83 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 14:40:15 -0400 Subject: [PATCH 224/227] home-assistant: support pyaprilaire component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0b0ab903e34e..c8cdeeaaa561 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -209,7 +209,8 @@ apprise ]; "aprilaire" = ps: with ps; [ - ]; # missing inputs: pyaprilaire + pyaprilaire + ]; "aprs" = ps: with ps; [ aprslib geopy @@ -5266,6 +5267,7 @@ "apple_tv" "application_credentials" "apprise" + "aprilaire" "aprs" "aranet" "arcam_fmj" From 4b42512dc9273133997693a37fd410b642da86e2 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 14:49:31 -0400 Subject: [PATCH 225/227] python3Packages.apsystems-ez1: init at 1.3.3 --- .../python-modules/apsystems-ez1/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/apsystems-ez1/default.nix diff --git a/pkgs/development/python-modules/apsystems-ez1/default.nix b/pkgs/development/python-modules/apsystems-ez1/default.nix new file mode 100644 index 000000000000..d5005a1d1ca3 --- /dev/null +++ b/pkgs/development/python-modules/apsystems-ez1/default.nix @@ -0,0 +1,41 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + aiohttp, + poetry-core, + pytest-asyncio, +}: + +buildPythonPackage rec { + pname = "apsystems-ez1"; + version = "1.3.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "SonnenladenGmbH"; + repo = "APsystems-EZ1-API"; + rev = "refs/tags/${version}"; + hash = "sha256-V6GcTSupjhjGEOsO+C9pImYJRnvdDbttW3Zh0PDYt5I="; + }; + + build-system = [ poetry-core ]; + + dependencies = [ aiohttp ]; + + pythonImportsCheck = [ "APsystemsEZ1" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + ]; + + meta = { + changelog = "https://github.com/SonnenladenGmbH/APsystems-EZ1-API/releases/tag/${version}"; + description = "Streamlined interface for interacting with the local API of APsystems EZ1 Microinverters."; + homepage = "https://github.com/SonnenladenGmbH/APsystems-EZ1-API"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 960a53e4f1e0..93cb8bff2f51 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -701,6 +701,8 @@ self: super: with self; { apscheduler = callPackage ../development/python-modules/apscheduler { }; + apsystems-ez1 = callPackage ../development/python-modules/apsystems-ez1 { }; + apsw = callPackage ../development/python-modules/apsw { }; apycula = callPackage ../development/python-modules/apycula { }; From 7d6b2964f7395750768d7a49358f3d6127097100 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 14:50:15 -0400 Subject: [PATCH 226/227] home-assistant: support apsystems component --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0b0ab903e34e..ad2660db0a91 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -215,7 +215,8 @@ geopy ]; "apsystems" = ps: with ps; [ - ]; # missing inputs: apsystems-ez1 + apsystems-ez1 + ]; "aquacell" = ps: with ps; [ fnv-hash-fast ifaddr @@ -5267,6 +5268,7 @@ "application_credentials" "apprise" "aprs" + "apsystems" "aranet" "arcam_fmj" "aseko_pool_live" From dd1e81c7d399fc4a13f6500349b177779730814b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 16:17:25 +0000 Subject: [PATCH 227/227] trompeloeil: 47 -> 48 --- pkgs/development/libraries/trompeloeil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/trompeloeil/default.nix b/pkgs/development/libraries/trompeloeil/default.nix index 1a2ec33dae5f..09c7ff795d3d 100644 --- a/pkgs/development/libraries/trompeloeil/default.nix +++ b/pkgs/development/libraries/trompeloeil/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "trompeloeil"; - version = "47"; + version = "48"; src = fetchFromGitHub { owner = "rollbear"; repo = "trompeloeil"; rev = "v${version}"; - sha256 = "sha256-eVMlepthJuy9BQnR2u8PFSfuWNg8QxDOJyV5qzcztOE="; + sha256 = "sha256-7MXMbqksHqcyvwJsW8+wPWfnKTbQhUlGa4GcidpiBFw="; }; nativeBuildInputs = [ cmake ];