From 980281bd51bdba8c44595b43071d6395cf43eb6c Mon Sep 17 00:00:00 2001 From: Kiskae Date: Thu, 2 Jan 2025 20:03:37 +0100 Subject: [PATCH 01/82] linuxPackages.nvidiaPackages.legacy_390: update patches to 6.12 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 5232106bf7b65..ab8e7ee24fc76 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -46,6 +46,13 @@ let url = "https://github.com/Binary-Eater/open-gpu-kernel-modules/commit/8ac26d3c66ea88b0f80504bdd1e907658b41609d.patch"; hash = "sha256-+SfIu3uYNQCf/KXhv4PWvruTVKQSh4bgU1moePhe57U="; }; + + # Source corresponding to https://aur.archlinux.org/packages/nvidia-390xx-dkms + aurPatches = fetchgit { + url = "https://aur.archlinux.org/nvidia-390xx-utils.git"; + rev = "94dffc01e23a93c354a765ea7ac64484a3ef96c1"; + hash = "sha256-c94qXNZyMrSf7Dik7jvz2ECaGELqN7WEYNpnbUkzeeU="; + }; in rec { mkDriver = generic; @@ -151,15 +158,14 @@ rec { }; # Last one supporting x86 - legacy_390 = - let - # Source corresponding to https://aur.archlinux.org/packages/nvidia-390xx-dkms - aurPatches = fetchgit { - url = "https://aur.archlinux.org/nvidia-390xx-utils.git"; - rev = "ebb48c240ce329e89ad3b59e78c8c708f46f27b3"; - hash = "sha256-AGx3/EQ81awBMs6rrXTGWJmyq+UjBCPp6/9z1BQBB9E="; - }; - patchset = [ + legacy_390 = generic { + version = "390.157"; + sha256_32bit = "sha256-VdZeCkU5qct5YgDF8Qgv4mP7CVHeqvlqnP/rioD3B5k="; + sha256_64bit = "sha256-W+u8puj+1da52BBw+541HxjtxTSVJVPL3HHo/QubMoo="; + settingsSha256 = "sha256-uJZO4ak/w/yeTQ9QdXJSiaURDLkevlI81de0q4PpFpw="; + persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns="; + + patches = map (patch: "${aurPatches}/${patch}") [ "kernel-4.16+-memory-encryption.patch" "kernel-6.2.patch" "kernel-6.3.patch" @@ -169,17 +175,9 @@ rec { "kernel-6.8.patch" "gcc-14.patch" "kernel-6.10.patch" + "kernel-6.12.patch" ]; - in - generic { - version = "390.157"; - sha256_32bit = "sha256-VdZeCkU5qct5YgDF8Qgv4mP7CVHeqvlqnP/rioD3B5k="; - sha256_64bit = "sha256-W+u8puj+1da52BBw+541HxjtxTSVJVPL3HHo/QubMoo="; - settingsSha256 = "sha256-uJZO4ak/w/yeTQ9QdXJSiaURDLkevlI81de0q4PpFpw="; - persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns="; - - patches = map (patch: "${aurPatches}/${patch}") patchset; - broken = kernel.kernelAtLeast "6.11 "; + broken = kernel.kernelAtLeast "6.13"; # fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439 # see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651 From 13c1c5bcfa7c34a695daef07621c202bc6a20a07 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Thu, 2 Jan 2025 20:19:55 +0100 Subject: [PATCH 02/82] linuxPackages.nvidiaPackages.legacy_470: fix 6.6 to 6.12 fixes #370208 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 69 +++++++++++-------- .../linux/nvidia-x11/follow_pfn.patch | 61 ++++++++++++++++ 2 files changed, 102 insertions(+), 28 deletions(-) create mode 100644 pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ab8e7ee24fc76..ebed0c075faf5 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -155,38 +155,51 @@ rec { sha256_aarch64 = "sha256-e+QvE+S3Fv3JRqC9ZyxTSiCu8gJdZXSz10gF/EN6DY0="; settingsSha256 = "sha256-kftQ4JB0iSlE8r/Ze/+UMnwLzn0nfQtqYXBj+t6Aguk="; persistencedSha256 = "sha256-iYoSib9VEdwjOPBP1+Hx5wCIMhW8q8cCHu9PULWfnyQ="; + + patches = [ + "${aurPatches}/gcc-14.patch" + # fixes 6.10 follow_pfn + ./follow_pfn.patch + # https://gist.github.com/joanbm/a6d3f7f873a60dec0aa4a734c0f1d64e + (fetchpatch { + url = "https://gist.github.com/joanbm/a6d3f7f873a60dec0aa4a734c0f1d64e/raw/6bae5606c033b6c6c08233523091992370e357b7/nvidia-470xx-fix-linux-6.12.patch"; + hash = "sha256-6nbzcRTRCxW8GDAhB8Zwx9rVcCzwPtVYlqoUhL9gxlY="; + stripLen = 1; + extraPrefix = "kernel/"; + }) + ]; }; # Last one supporting x86 legacy_390 = generic { - version = "390.157"; - sha256_32bit = "sha256-VdZeCkU5qct5YgDF8Qgv4mP7CVHeqvlqnP/rioD3B5k="; - sha256_64bit = "sha256-W+u8puj+1da52BBw+541HxjtxTSVJVPL3HHo/QubMoo="; - settingsSha256 = "sha256-uJZO4ak/w/yeTQ9QdXJSiaURDLkevlI81de0q4PpFpw="; - persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns="; - - patches = map (patch: "${aurPatches}/${patch}") [ - "kernel-4.16+-memory-encryption.patch" - "kernel-6.2.patch" - "kernel-6.3.patch" - "kernel-6.4.patch" - "kernel-6.5.patch" - "kernel-6.6.patch" - "kernel-6.8.patch" - "gcc-14.patch" - "kernel-6.10.patch" - "kernel-6.12.patch" - ]; - broken = kernel.kernelAtLeast "6.13"; - - # fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439 - # see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651 - # and https://bbs.archlinux.org/viewtopic.php?pid=2083699#p2083699 - postInstall = '' - mv $out/lib/tls/* $out/lib - rmdir $out/lib/tls - ''; - }; + version = "390.157"; + sha256_32bit = "sha256-VdZeCkU5qct5YgDF8Qgv4mP7CVHeqvlqnP/rioD3B5k="; + sha256_64bit = "sha256-W+u8puj+1da52BBw+541HxjtxTSVJVPL3HHo/QubMoo="; + settingsSha256 = "sha256-uJZO4ak/w/yeTQ9QdXJSiaURDLkevlI81de0q4PpFpw="; + persistencedSha256 = "sha256-NuqUQbVt80gYTXgIcu0crAORfsj9BCRooyH3Gp1y1ns="; + + patches = map (patch: "${aurPatches}/${patch}") [ + "kernel-4.16+-memory-encryption.patch" + "kernel-6.2.patch" + "kernel-6.3.patch" + "kernel-6.4.patch" + "kernel-6.5.patch" + "kernel-6.6.patch" + "kernel-6.8.patch" + "gcc-14.patch" + "kernel-6.10.patch" + "kernel-6.12.patch" + ]; + broken = kernel.kernelAtLeast "6.13"; + + # fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439 + # see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651 + # and https://bbs.archlinux.org/viewtopic.php?pid=2083699#p2083699 + postInstall = '' + mv $out/lib/tls/* $out/lib + rmdir $out/lib/tls + ''; + }; legacy_340 = let diff --git a/pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch b/pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch new file mode 100644 index 0000000000000..19026229bd1d4 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch @@ -0,0 +1,61 @@ +diff -ruNb a/kernel/conftest.sh b/kernel/conftest.sh +--- a/kernel/conftest.sh 2024-07-19 04:36:26.183701185 -0500 ++++ b/kernel/conftest.sh 2024-07-19 04:36:26.230366381 -0500 +@@ -4464,20 +4464,22 @@ + compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_VMAP_HAS_MAP_ARG" "" "types" + ;; + +- unsafe_follow_pfn) ++ follow_pfn) + # +- # Determine if unsafe_follow_pfn() is present. ++ # Determine if follow_pfn() is present. + # +- # unsafe_follow_pfn() was added by commit 69bacee7f9ad +- # ("mm: Add unsafe_follow_pfn") in v5.13-rc1. ++ # follow_pfn() was added by commit 3b6748e2dd69 ++ # ("mm: introduce follow_pfn()") in v2.6.31-rc1, and removed ++ # by commit 233eb0bf3b94 ("mm: remove follow_pfn") ++ # from linux-next 233eb0bf3b94. + # + CODE=" + #include +- void conftest_unsafe_follow_pfn(void) { +- unsafe_follow_pfn(); ++ void conftest_follow_pfn(void) { ++ follow_pfn(); + }" + +- compile_check_conftest "$CODE" "NV_UNSAFE_FOLLOW_PFN_PRESENT" "" "functions" ++ compile_check_conftest "$CODE" "NV_FOLLOW_PFN_PRESENT" "" "functions" + ;; + + drm_plane_atomic_check_has_atomic_state_arg) +diff -ruNb a/kernel/nvidia/nvidia.Kbuild b/kernel/nvidia/nvidia.Kbuild +--- a/kernel/nvidia/nvidia.Kbuild 2022-10-12 04:29:57.000000000 -0500 ++++ b/kernel/nvidia/nvidia.Kbuild 2024-07-19 05:17:39.148448922 -0500 +@@ -164,7 +164,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += cc + NV_CONFTEST_FUNCTION_COMPILE_TESTS += iterate_fd + NV_CONFTEST_FUNCTION_COMPILE_TESTS += seq_read_iter + NV_CONFTEST_FUNCTION_COMPILE_TESTS += sg_page_iter_page +-NV_CONFTEST_FUNCTION_COMPILE_TESTS += unsafe_follow_pfn ++NV_CONFTEST_FUNCTION_COMPILE_TESTS += follow_pfn + NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_get + NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked + NV_CONFTEST_FUNCTION_COMPILE_TESTS += set_close_on_exec +diff -ruNb a/kernel/nvidia/os-mlock.c b/kernel/nvidia/os-mlock.c +--- a/kernel/nvidia/os-mlock.c 2022-10-12 04:30:26.000000000 -0500 ++++ b/kernel/nvidia/os-mlock.c 2024-07-19 04:36:26.230366381 -0500 +@@ -18,10 +18,10 @@ + unsigned long address, + unsigned long *pfn) + { +-#if defined(NV_UNSAFE_FOLLOW_PFN_PRESENT) +- return unsafe_follow_pfn(vma, address, pfn); +-#else ++#if defined(NV_FOLLOW_PFN_PRESENT) + return follow_pfn(vma, address, pfn); ++#else ++ return -1; + #endif + } \ No newline at end of file From 72fe607771901908ffea7f69f1cef2c681f770c9 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 10 Jan 2025 10:54:35 +0100 Subject: [PATCH 03/82] wipe: reformat --- pkgs/by-name/wi/wipe/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wi/wipe/package.nix b/pkgs/by-name/wi/wipe/package.nix index 3befb5541350d..27864e89ba6dd 100644 --- a/pkgs/by-name/wi/wipe/package.nix +++ b/pkgs/by-name/wi/wipe/package.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { patches = [ ./fix-install.patch ]; - meta = with lib; { + meta = { description = "Secure file wiping utility"; - mainProgram = "wipe"; homepage = "https://wipe.sourceforge.net/"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = [ maintainers.abbradar ]; + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.abbradar ]; + mainProgram = "wipe"; }; } From d542183f58a20ce59f9c40a60a34a83de2263abd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 13 Jan 2025 12:58:28 +0000 Subject: [PATCH 04/82] geonkick: 3.5.0 -> 3.5.1 --- pkgs/by-name/ge/geonkick/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/geonkick/package.nix b/pkgs/by-name/ge/geonkick/package.nix index 5142d83ed671f..5ee4ea15dc528 100644 --- a/pkgs/by-name/ge/geonkick/package.nix +++ b/pkgs/by-name/ge/geonkick/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitLab { owner = "Geonkick-Synthesizer"; repo = pname; rev = "v${version}"; - hash = "sha256-bqdqAr4NX5WZ6zp0Kq7GFHiy/JkBvDvzuZz7jxtru0Q="; + hash = "sha256-4nJ4yn64C44ExduPX2Iypf9Rw9MlAXFkmX5KZxySPSs="; }; nativeBuildInputs = [ From 1dfdc880438d056f1f4f7bcb045e48ce11042626 Mon Sep 17 00:00:00 2001 From: Friedrich Altheide Date: Tue, 14 Jan 2025 10:41:06 +0100 Subject: [PATCH 05/82] gnome-online-accounts: 3.52.2 -> 3.52.3.1 --- pkgs/by-name/gn/gnome-online-accounts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix index a13c1e0a549b6..7339926f7dc0d 100644 --- a/pkgs/by-name/gn/gnome-online-accounts/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts"; - version = "3.52.2"; + version = "3.52.3.1"; outputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz"; - hash = "sha256-+0E/SN7vu5/DACqRV53ulHzu7UH0nC9RMXr3SJtnb2c="; + hash = "sha256-Se1yfW/ElHSZb6ft8JGbIeT8hW6jfm4w8XtQsQOvlwE="; }; mesonFlags = [ From de9f837a2d8dbb720fc14816158501bdf59095d3 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Mon, 13 Jan 2025 12:38:31 +0100 Subject: [PATCH 06/82] ccze: fix cross build --- pkgs/by-name/cc/ccze/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/cc/ccze/package.nix b/pkgs/by-name/cc/ccze/package.nix index 113db4b49a071..88c9ee31abe93 100644 --- a/pkgs/by-name/cc/ccze/package.nix +++ b/pkgs/by-name/cc/ccze/package.nix @@ -39,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: { autoconf ''; + # provide correct pcre2-config for cross + env.PCRE_CONFIG = lib.getExe' (lib.getDev pcre2) "pcre2-config"; + meta = with lib; { mainProgram = "ccze"; description = "Fast, modular log colorizer"; From fd821c7eb38afb46dc5af74b59ffaa9b331a7e0b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Jan 2025 09:03:09 +0100 Subject: [PATCH 07/82] =?UTF-8?q?ocamlPackages.extlib:=201.7.9=20=E2=86=92?= =?UTF-8?q?=201.8.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/haxe/default.nix | 4 ++- .../compilers/haxe/extlib-1.8.0.patch | 26 +++++++++++++++++++ .../ocaml-modules/extlib/default.nix | 8 +++--- 3 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/compilers/haxe/extlib-1.8.0.patch diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 4613b90113efe..4756acfb425f4 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -53,6 +53,7 @@ let hash, version, prePatch ? defaultPatch, + patches ? [ ], }: stdenv.mkDerivation { pname = "haxe"; @@ -76,7 +77,7 @@ let inherit hash; }; - inherit prePatch; + inherit prePatch patches; buildFlags = [ "all" @@ -165,5 +166,6 @@ in haxe_4_3 = generic { version = "4.3.6"; hash = "sha256-m/A0xxB3fw+syPmH1GPKKCcj0a2G/HMRKOu+FKrO5jQ="; + patches = [ ./extlib-1.8.0.patch ]; }; } diff --git a/pkgs/development/compilers/haxe/extlib-1.8.0.patch b/pkgs/development/compilers/haxe/extlib-1.8.0.patch new file mode 100644 index 0000000000000..c95448f830acc --- /dev/null +++ b/pkgs/development/compilers/haxe/extlib-1.8.0.patch @@ -0,0 +1,26 @@ +diff --git a/src/context/typecore.ml b/src/context/typecore.ml +index dc38a5264..0c3ebde9f 100644 +--- a/src/context/typecore.ml ++++ b/src/context/typecore.ml +@@ -294,7 +294,7 @@ let add_local ctx k n t p = + begin try + let v' = PMap.find n ctx.locals in + (* ignore std lib *) +- if not (List.exists (ExtLib.String.starts_with p.pfile) ctx.com.std_path) then begin ++ if not (List.exists (ExtLib.String.starts_with ~prefix:p.pfile) ctx.com.std_path) then begin + warning ctx WVarShadow "This variable shadows a previously declared variable" p; + warning ~depth:1 ctx WVarShadow (compl_msg "Previous variable was here") v'.v_pos + end +diff --git a/src/optimization/dce.ml b/src/optimization/dce.ml +index 4e7b1fc98..90d8fc5d6 100644 +--- a/src/optimization/dce.ml ++++ b/src/optimization/dce.ml +@@ -76,7 +76,7 @@ let overrides_extern_field cf c = + loop c cf + + let is_std_file dce file = +- List.exists (ExtString.String.starts_with file) dce.std_dirs ++ List.exists (ExtString.String.starts_with ~prefix:file) dce.std_dirs + + let keep_metas = [Meta.Keep;Meta.Expose] + diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 9be2ca711fd7d..467a9188f9e31 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -7,13 +7,11 @@ buildDunePackage rec { pname = "extlib"; - version = "1.7.9"; - - minimalOCamlVersion = "4.02"; + version = "1.8.0"; src = fetchurl { - url = "https://ygrek.org/p/release/ocaml-${pname}/${pname}-${version}.tar.gz"; - hash = "sha512-I4asafA36lIINcBiTTmun7/+Q6ILGOJH3gMiMu1vQZ1me1PSMUxvVtxx02i/C2IBpWwvPypb39kzdmxabLmHaA=="; + url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz"; + hash = "sha256-lkJ38AEoCo7d/AjgcB1Zygxr3F0FIxOz5A5QiPbUXXA="; }; nativeBuildInputs = [ cppo ]; From 64df8841e0a13985191b1f562211f821ff910a66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jan 2025 21:19:12 +0000 Subject: [PATCH 08/82] renovate: 39.90.2 -> 39.107.0 --- pkgs/by-name/re/renovate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 464c1a254cf0f..b3d674f1f5849 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "renovate"; - version = "39.90.2"; + version = "39.107.0"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; tag = finalAttrs.version; - hash = "sha256-D0VoBkP+zMsJK5ZgoU4USF0qhrmLi2V1BU6k6czSr+o="; + hash = "sha256-I2ufRvx8NZavFMKpiwgx8q8yejRUE8r7TvpSw4q56Zo="; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-JkdfI7P4zWf0hYgurDrETAGic5nz38zQsAuBoFi9C8w="; + hash = "sha256-ginPQvnhB8dQStipi2kGL+cdDwqobvENnrLRbC5WIHc="; }; env.COREPACK_ENABLE_STRICT = 0; From 7b91faa1656d8e6c33f374d4c6c7d726cc251ad2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 01:34:37 +0000 Subject: [PATCH 09/82] victoriametrics: 1.108.1 -> 1.109.0 --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index 8ecaeba74b66b..118f84900d9c3 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.108.1"; + version = "1.109.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - hash = "sha256-UaWTBOlMf7SR3tBjeaNnokdSqtRrYm5rPQPi3UGxTvQ="; + hash = "sha256-ZeHQxJtUZSFwWeQgHcEXdq9GR26HH4NOuLnO8S4u21o="; }; vendorHash = null; From 9687eb77fef2a53208767ef37944e492b7ee3379 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 15 Jan 2025 12:24:15 +0100 Subject: [PATCH 10/82] nixos/home-assistant: update unit_system options Closes: #373674 --- nixos/modules/services/home-automation/home-assistant.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index 338c61f896774..247c3074d2c92 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -317,11 +317,11 @@ in { }; unit_system = mkOption { - type = types.nullOr (types.enum [ "metric" "imperial" ]); + type = types.nullOr (types.enum [ "metric" "us_customary" ]); default = null; example = "metric"; description = '' - The unit system to use. This also sets temperature_unit, Celsius for Metric and Fahrenheit for Imperial. + The unit system to use. This also sets temperature_unit, Celsius for Metric and Fahrenheit for US Customary. ''; }; From db2e774d9655333e06675804bc6b2de7630e85d1 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 15 Jan 2025 12:46:48 +0100 Subject: [PATCH 11/82] electron_31-bin: 31.7.6 -> 31.7.7 - Changelog: https://github.com/electron/electron/releases/tag/v31.7.7 - Diff: https://github.com/electron/electron/compare/refs/tags/v31.7.6...v31.7.7 - Fixes CVE-2024-12053 - Fixes CVE-2024-12693 - Fixes CVE-2024-12694 --- pkgs/development/tools/electron/binary/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json index 1e8f13f4730d8..b380af0f99f65 100644 --- a/pkgs/development/tools/electron/binary/info.json +++ b/pkgs/development/tools/electron/binary/info.json @@ -56,14 +56,14 @@ }, "31": { "hashes": { - "aarch64-darwin": "89bcc40bcc6a45410c2d6f83c6dce3c4d5caeead00b419755995258fa36fa26d", - "aarch64-linux": "b3d5842c3f571272666ab97f421246f41231adfdd66001eec65d6504f6793ca8", - "armv7l-linux": "0b4fa9ff90f10bfc9db7ac20b122d8d52d1ff8d6da7c39a4f8ed0d1c4951dda1", - "headers": "1cngqqcj2aggnwvgdqv9nn03k0hyc4y3346vgrnljfa9q8l1gs3d", - "x86_64-darwin": "22cdd766d1614aa9819987fccd477d51cefcf39bc1a1667571406c985bfe123b", - "x86_64-linux": "6a3ae7de546fa91b1925f2ee79475e7fb82856e596ab212e3f8ccf9719bc60ef" + "aarch64-darwin": "e81b75a185376effcc7dd15aef8877ab48474633e5ac7417810a3b28e694bbfa", + "aarch64-linux": "21dd1a8c37c7816d3ad945f2fc66fa6c5c56af44b6c06b5280e023ee0a663439", + "armv7l-linux": "530f0d146f962e7dd101dc08505933e781f21c42f3234e3f0d316a113faccfbc", + "headers": "1dakbhv1f1cc8zr8rvhjgbmly43db1l1gcf0l8c7yn8h0lb17aq5", + "x86_64-darwin": "3b08668fe88c47474be23df2c24674d68be79501b5552202462d16078f629bf0", + "x86_64-linux": "00a2e8e5f52fe39c37cfc9d7bd7629e560017d28ee94c51495bf7e39c84b2d47" }, - "version": "31.7.6" + "version": "31.7.7" }, "32": { "hashes": { From 893cf020ac899d1a092b06abe79f4c871a3c3ed7 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 15 Jan 2025 12:47:05 +0100 Subject: [PATCH 12/82] electron-chromedriver_31: 31.7.6 -> 31.7.7 - Changelog: https://github.com/electron/electron/releases/tag/v31.7.7 - Diff: https://github.com/electron/electron/compare/refs/tags/v31.7.6...v31.7.7 - Fixes CVE-2024-12053 - Fixes CVE-2024-12693 - Fixes CVE-2024-12694 --- .../tools/electron/chromedriver/info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index 9f99a2c1886b9..9477fed389b32 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -23,14 +23,14 @@ }, "31": { "hashes": { - "aarch64-darwin": "60787d55dcb2e565451c5237596e4d8e44ad859daee6fb07575949f5fa0ac224", - "aarch64-linux": "b3ef48d6caa1287ba9688c5c64cd3df4292dee6b1dfa117e789cc02cc53629fb", - "armv7l-linux": "8141b977a6cf8d8a8748ae53abbee606c4474c6ea45b29deef53842e67f06752", - "headers": "1cngqqcj2aggnwvgdqv9nn03k0hyc4y3346vgrnljfa9q8l1gs3d", - "x86_64-darwin": "fdd45e858db9de700b9feaa83a64a97b29b8b2ffbc7007690abffe9e4099c66a", - "x86_64-linux": "ee5225ab33396219cf8b72bc883a5a0791d9c9564f797163e84345ac561a5241" + "aarch64-darwin": "17015acc125d2a453ff9e7a6623ce856113c0f435bfffd65b60d73e9cd81d40e", + "aarch64-linux": "7a545397292b405153b2d73b525fcd0821ea5a2200330a9bb4f48cd83010a30b", + "armv7l-linux": "ace8b955b12b196d442d315ad62911eeda1ee4957cba4423e3cfe2703ff85673", + "headers": "1dakbhv1f1cc8zr8rvhjgbmly43db1l1gcf0l8c7yn8h0lb17aq5", + "x86_64-darwin": "7c8886bed6128791b6637a54a3d76712e9b37a34252376478d3c843ed93c9ff9", + "x86_64-linux": "39b59f8dbca6cb2f7d9c2299bd6885a7041d3242d18fe3beedf89028b7e0376a" }, - "version": "31.7.6" + "version": "31.7.7" }, "32": { "hashes": { From c2699af8e677fca093c1e372d812eeb66decb74b Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 3 Jan 2025 23:54:47 +0100 Subject: [PATCH 13/82] electron_31-bin: mark as insecure because it's EOL https://github.com/electron/electron/blob/2745771a22dc7aec4364fec758804e0b7f230357/docs/tutorial/electron-timelines.md --- pkgs/development/tools/electron/binary/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix index 1c0781841462a..d63bd6a7b1e52 100644 --- a/pkgs/development/tools/electron/binary/generic.nix +++ b/pkgs/development/tools/electron/binary/generic.nix @@ -53,7 +53,7 @@ let ++ optionals (versionOlder version "19.0.0") [ "i686-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; # https://www.electronjs.org/docs/latest/tutorial/electron-timelines - knownVulnerabilities = optional (versionOlder version "31.0.0") "Electron version ${version} is EOL"; + knownVulnerabilities = optional (versionOlder version "32.0.0") "Electron version ${version} is EOL"; }; fetcher = From cd1c17d82b2e669c4d2a22e7a12212502c523140 Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 4 Jan 2025 00:19:58 +0100 Subject: [PATCH 14/82] electron-source.electron_31: remove as it's EOL https://github.com/electron/electron/blob/2745771a22dc7aec4364fec758804e0b7f230357/docs/tutorial/electron-timelines.md Ref: aa01edd16171b78d740abcbe81ca5ad9ba44576b --- .../networking/browsers/chromium/common.nix | 30 +- .../networking/browsers/chromium/default.nix | 3 +- pkgs/development/tools/electron/common.nix | 36 +- .../tools/electron/disable-screen-ai.patch | 16 - ...1-perfetto-missing-template-arg-list.patch | 13 - pkgs/development/tools/electron/info.json | 941 ------------------ pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 4 insertions(+), 1037 deletions(-) delete mode 100644 pkgs/development/tools/electron/disable-screen-ai.patch delete mode 100644 pkgs/development/tools/electron/electron-31-perfetto-missing-template-arg-list.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e63dd5e56e4a2..0ba017a725f2f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -458,32 +458,6 @@ let # flag (declare_args) so we simply hardcode it to false. ./patches/widevine-disable-auto-download-allow-bundle.patch ] - ++ lib.optionals (versionRange "127" "128") [ - # Fix missing chrome/browser/ui/webui_name_variants.h dependency - # and ninja 1.12 compat in M127. - # https://issues.chromium.org/issues/345645751 - # https://issues.chromium.org/issues/40253918 - # https://chromium-review.googlesource.com/c/chromium/src/+/5641516 - (githubPatch { - commit = "2c101186b60ed50f2ba4feaa2e963bd841bcca47"; - hash = "sha256-luu3ggo6XoeeECld1cKZ6Eh8x/qQYmmKI/ThEhuutuY="; - }) - # https://chromium-review.googlesource.com/c/chromium/src/+/5644627 - (githubPatch { - commit = "f2b43c18b8ecfc3ddc49c42c062d796c8b563984"; - hash = "sha256-uxXxSsiS8R0827Oi3xsG2gtT0X+jJXziwZ1y8+7K+Qg="; - }) - # https://chromium-review.googlesource.com/c/chromium/src/+/5646245 - (githubPatch { - commit = "4ca70656fde83d2db6ed5a8ac9ec9e7443846924"; - hash = "sha256-iQuRRZjDDtJfr+B7MV+TvUDDX3bvpCnv8OpSLJ1WqCE="; - }) - # https://chromium-review.googlesource.com/c/chromium/src/+/5647662 - (githubPatch { - commit = "50d63ffee3f7f1b1b9303363742ad8ebbfec31fa"; - hash = "sha256-H+dv+lgXSdry3NkygpbCdTAWWdTVdKdVD3Aa62w091E="; - }) - ] ++ [ # Required to fix the build with a more recent wayland-protocols version # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): @@ -646,7 +620,7 @@ let + '' # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin - ln -s${lib.optionalString (chromiumVersionAtLeast "127") "f"} "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node + ln -sf "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node ln -s "${pkgsBuildHost.jdk17_headless}/bin/java" third_party/jdk/current/bin/ # Allow building against system libraries in official builds @@ -751,8 +725,6 @@ let use_system_libffi = true; # Use nixpkgs Rust compiler instead of the one shipped by Chromium. rust_sysroot_absolute = "${buildPackages.rustc}"; - } - // lib.optionalAttrs (chromiumVersionAtLeast "127") { rust_bindgen_root = "${buildPackages.rust-bindgen}"; } // { diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 884399fd6b748..24a55e28c3160 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -85,8 +85,7 @@ let url = "https://gn.googlesource.com/gn"; inherit (upstream-info.deps.gn) rev hash; }; - } - // lib.optionalAttrs (chromiumVersionAtLeast "127") { + # Relax hardening as otherwise gn unstable 2024-06-06 and later fail with: # cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security] hardeningDisable = [ "format" ]; diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix index 854055bbed09d..e6306e8d98dad 100644 --- a/pkgs/development/tools/electron/common.nix +++ b/pkgs/development/tools/electron/common.nix @@ -3,7 +3,6 @@ stdenv, chromium, nodejs, - fetchpatch, fetchYarnDeps, fetchNpmDeps, fixup-yarn-lock, @@ -67,40 +66,7 @@ in src = null; - patches = - base.patches - ++ lib.optionals (lib.versionOlder info.version "32") [ - # Backport a few fixes for -Wmissing-template-arg-list-after-template-kw - # which only effects the soon-to-be-EOLed electron 31 (chromium M126). - # https://issues.chromium.org/issues/344680447 - - # https://chromium-review.googlesource.com/c/chromium/src/+/5604664 - (fetchpatch { - url = "https://github.com/chromium/chromium/commit/b0088fa60970412160535c367e2ff53b25b8538e.patch"; - hash = "sha256-eEYO+IN1062iCqVr6eO3UZlGLN376lMXc6UQunJGpdQ="; - }) - - # https://android-review.googlesource.com/c/platform/external/perfetto/+/3114454 - (fetchpatch { - name = "perfetto-e2f661907a717551235563389977b7468da6d45e.patch"; - url = "https://android.googlesource.com/platform/external/perfetto/+/e2f661907a717551235563389977b7468da6d45e^!?format=TEXT"; - decode = "base64 -d"; - stripLen = 1; - extraPrefix = "third_party/perfetto/"; - hash = "sha256-5zSAZZI1tR7O4Aui22T/6uyk0RpuIy7XqDD0nwlDySQ="; - }) - - ./electron-31-perfetto-missing-template-arg-list.patch - - # And a finally fix for -Winvalid-constexpr that is happening within the electron patchset. - # https://github.com/electron/electron/pull/42413/commits/394a26f94a3fbce91e15e80e8e73b9a3ec1f04d1 - (fetchpatch { - url = "https://github.com/electron/electron/commit/394a26f94a3fbce91e15e80e8e73b9a3ec1f04d1.patch"; - stripLen = 1; - extraPrefix = "electron/"; - hash = "sha256-lllUUDm1thnC+rH8hBtPBVLRx6Pis5TPEUeQli9z1Mk="; - }) - ]; + patches = base.patches; unpackPhase = '' diff --git a/pkgs/development/tools/electron/disable-screen-ai.patch b/pkgs/development/tools/electron/disable-screen-ai.patch deleted file mode 100644 index 0738942fded06..0000000000000 --- a/pkgs/development/tools/electron/disable-screen-ai.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/chrome/test/BUILD.gn -+++ b/chrome/test/BUILD.gn -@@ -3114,13 +3114,6 @@ if (!is_android && !is_fuchsia) { - "//pdf/loader", - ] - -- if (is_linux) { -- # Add a data dependency for pdf_extension_accessibility_test.cc to -- # notify testing builders that this test needs this library, which will -- # need to be downloaded from CIPD as defined in //DEPS. -- data_deps += [ "//third_party/screen-ai:screen_ai_linux" ] -- } -- - if (enable_printing) { - sources += [ "../browser/pdf/pdf_extension_printing_test.cc" ] - diff --git a/pkgs/development/tools/electron/electron-31-perfetto-missing-template-arg-list.patch b/pkgs/development/tools/electron/electron-31-perfetto-missing-template-arg-list.patch deleted file mode 100644 index 3a75e608cadc8..0000000000000 --- a/pkgs/development/tools/electron/electron-31-perfetto-missing-template-arg-list.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/perfetto/tracing/internal/track_event_data_source.h b/include/perfetto/tracing/internal/track_event_data_source.h -index 1d924b271..dba896262 100644 ---- a/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h -+++ b/third_party/perfetto/include/perfetto/tracing/internal/track_event_data_source.h -@@ -1061,7 +1061,7 @@ class TrackEventDataSource - const TrackType& track, - std::function callback) { - TrackRegistry::Get()->UpdateTrack(track, std::move(callback)); -- Base::template Trace([&](typename Base::TraceContext ctx) { -+ Base::Trace([&](typename Base::TraceContext ctx) { - TrackEventInternal::WriteTrackDescriptor( - track, ctx.tls_inst_->trace_writer.get(), ctx.GetIncrementalState(), - *ctx.GetCustomTlsState(), TrackEventInternal::GetTraceTime()); diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index a531181ebd1fa..133b3ecb7f2f9 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -1,945 +1,4 @@ { - "31": { - "chrome": "126.0.6478.234", - "chromium": { - "deps": { - "gn": { - "hash": "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw=", - "rev": "df98b86690c83b81aedc909ded18857296406159", - "url": "https://gn.googlesource.com/gn", - "version": "2024-05-13" - } - }, - "version": "126.0.6478.234" - }, - "chromium_npm_hash": "sha256-oILlQlzTcc0YqAvK5htRvG/YXWJTDtJ60Z1EcBEj9dw=", - "deps": { - "src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-lepGVhzXrBAY5YWwobe18FroRiOD/Q9f8QqazHDmvTY=", - "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ", - "rev": "126.0.6478.234", - "url": "https://chromium.googlesource.com/chromium/src.git" - }, - "src/chrome/test/data/perf/canvas_bench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=", - "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732", - "url": "https://chromium.googlesource.com/chromium/canvas_bench.git" - }, - "src/chrome/test/data/perf/frame_rate/content": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=", - "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9", - "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git" - }, - "src/chrome/test/data/xr/webvr_info": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=", - "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248", - "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git" - }, - "src/docs/website": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-OSt8vyB1nPLMJaL47ouvS/R+VRxMixEL74TwrdDpJro=", - "rev": "b623150ede7e61bf949bd203b400f28012298274", - "url": "https://chromium.googlesource.com/website.git" - }, - "src/electron": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-orwZRf4p6qlKEtizag7nNpiVa1UAVUBtNFKnCmgMcjI=", - "owner": "electron", - "repo": "electron", - "rev": "v31.7.6" - }, - "src/media/cdm/api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6J6aSYW0or99VAgMNJJOdJqMJspoG7w1HxDN50MV5bw=", - "rev": "fef0b5aa1bd31efb88dfab804bdbe614f3d54f28", - "url": "https://chromium.googlesource.com/chromium/cdm.git" - }, - "src/net/third_party/quiche/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-viNzIM0zITYLVIdxjqqOhZcJZQiNLeZbPXBt12fGxAw=", - "rev": "ee237e96f18ef123af9992f74645a8a0ce9ef6ef", - "url": "https://quiche.googlesource.com/quiche.git" - }, - "src/testing/libfuzzer/fuzzers/wasm_corpus": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-qWsGQNUptbz0jYvUuxP7woNf5QQrfn9k3uvr82Yk0QM=", - "rev": "f650ff816f2ef227f61ea2e9f222aa69708ab367", - "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git" - }, - "src/third_party/accessibility_test_framework/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=", - "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe", - "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git" - }, - "src/third_party/angle": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-npgkeMJGP/VBgU13RBVihRziyD3GHXPR5kIgarIE7Yw=", - "rev": "efca5c3874f331bb1a82ed913f5691af7ff99d82", - "url": "https://chromium.googlesource.com/angle/angle.git" - }, - "src/third_party/angle/third_party/VK-GL-CTS/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-jpcUpskkhZ1uj+mKI+nNrrBg2Yk9SxWwLiTqDDqdzxM=", - "rev": "9d7b4c3d553331e316321942e2eb8413e4081c79", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS" - }, - "src/third_party/angle/third_party/glmark2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-L7+zWM0qn8WFhmON7DGvarTsN1YHt1sn5+hazTOZrrk=", - "rev": "ca8de51fedb70bace5351c6b002eb952c747e889", - "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2" - }, - "src/third_party/angle/third_party/rapidjson/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=", - "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f", - "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson" - }, - "src/third_party/anonymous_tokens/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-o/9lOnPR6vT0pkqWgenfyh9nI5Qoxyd030MNTfcoRSc=", - "rev": "76bfcccb6418239183df55111f2f24782d9f3680", - "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git" - }, - "src/third_party/beto-core/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7GkqH4hgTVmISjUy/Km/X28tBSsiMs3JRnDmol1zaag=", - "rev": "8bd72cfb219344308ee857bcbe65a27fe91acfe8", - "url": "https://beto-core.googlesource.com/beto-core.git" - }, - "src/third_party/boringssl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+G7BcdtU8AeNMY4NLQgKpgF28/CS9FIjf+vaOd+Wf6o=", - "rev": "2db0eb3f96a5756298dcd7f9319e56a98585bd10", - "url": "https://boringssl.googlesource.com/boringssl.git" - }, - "src/third_party/breakpad/breakpad": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-qAIXZ1jZous0Un0jVkOQ66nA2525NziV3Lbso2/+Z1Y=", - "rev": "76788faa4ef163081f82273bfca7fae8a734b971", - "url": "https://chromium.googlesource.com/breakpad/breakpad.git" - }, - "src/third_party/cast_core/public/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AalRQhJmornCqmvE2+36J/3LubaA0jr6P1PXy32lX4I=", - "rev": "71f51fd6fa45fac73848f65421081edd723297cd", - "url": "https://chromium.googlesource.com/cast_core/public" - }, - "src/third_party/catapult": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-A/mJDWPo2SijDiar3hleWOx0mZg7HxtdN9sjgsmiO60=", - "rev": "923a565b97768d3a51047c3f384f6a0d17990192", - "url": "https://chromium.googlesource.com/catapult.git" - }, - "src/third_party/ced/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=", - "rev": "ba412eaaacd3186085babcd901679a48863c7dd5", - "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git" - }, - "src/third_party/chromium-variations": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5XL7nKQPfzRNdtaQTtEG/syvQBdoVZhrNcyKAHu72Sg=", - "rev": "1545704ff52cfb5119f3693c9a9e971594e9cb43", - "url": "https://chromium.googlesource.com/chromium-variations.git" - }, - "src/third_party/clang-format/script": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-whD8isX2ZhLrFzdxHhFP1S/sZDRgyrzLFaVd7OEFqYo=", - "rev": "3c0acd2d4e73dd911309d9e970ba09d58bf23a62", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git" - }, - "src/third_party/cld_3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=", - "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661", - "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git" - }, - "src/third_party/colorama/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=", - "rev": "3de9f013df4b470069d03d250224062e8cf15c49", - "url": "https://chromium.googlesource.com/external/colorama.git" - }, - "src/third_party/content_analysis_sdk/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=", - "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc", - "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git" - }, - "src/third_party/cpu_features/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=", - "rev": "936b9ab5515dead115606559502e3864958f7f6e", - "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git" - }, - "src/third_party/cpuinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-eshoHmGiu5k0XE/A1SWf7OvBj7/YD9JNSZgoyGzGcLA=", - "rev": "3c8b1533ac03dd6531ab6e7b9245d488f13a82a5", - "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git" - }, - "src/third_party/crabbyavif/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-MNHqTBfQAV0WsoZzjHVa8F7o1OUuc8O3OOln+UKT58c=", - "rev": "ef17807890f60bee1398a752d53204c369076aca", - "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git" - }, - "src/third_party/crc32c/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-urg0bmnfMfHagLPELp4WrNCz1gBZ6DFOWpDue1KsMtc=", - "rev": "fa5ade41ee480003d9c5af6f43567ba22e4e17e6", - "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git" - }, - "src/third_party/cros-components/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ht/hkX4Nr0VfHq/dovI/CHgPRPpGflUz9KiZywh0MXg=", - "rev": "1985ff9dfd894b5cd958163bf9f4fde8716acbb4", - "url": "https://chromium.googlesource.com/external/google3/cros_components.git" - }, - "src/third_party/cros_system_api": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-p/eew0EIxSQOWuvEmzrk9BnDIps5y6R/cBR54sHhfcc=", - "rev": "8d58ca6b357e6827660dc26ca777c798f4426c2e", - "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git" - }, - "src/third_party/crossbench": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-4gQn5y/Z6ccYA/0VjIQfMpFMkEuPA78jyCgZ+FpmsFs=", - "rev": "acbea986f40578f43c88239c78c797f61842e642", - "url": "https://chromium.googlesource.com/crossbench.git" - }, - "src/third_party/dav1d/libdav1d": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-AA2bcrsW1xFspyl5TqYUJeAwKM06rWTNtXr/uMVIJmw=", - "rev": "006ca01d387ac6652825d6cce1a57b2de67dbf8d", - "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git" - }, - "src/third_party/dawn": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-7pYn8KbOAxAG5+OPNXNiW8aCUNxE55BgR67fNO6MaSI=", - "rev": "c9815acd5a88ae4853cd25f7cb8f2face7cace28", - "url": "https://dawn.googlesource.com/dawn.git" - }, - "src/third_party/dawn/third_party/dxc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-mwAZuGP2dIW1pup11wokABoE5xcicSNhFbz/TXfYGII=", - "rev": "9463ce9cd8d9b02b98edb746431c0bbcf9654ae4", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler" - }, - "src/third_party/dawn/third_party/dxheaders": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=", - "rev": "980971e835876dc0cde415e8f9bc646e64667bf7", - "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers" - }, - "src/third_party/dawn/third_party/glfw": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TwAPRjQxIz3J+zbNxzCp5Tek7MwisxdekMpY5QGsKyg=", - "rev": "62e175ef9fae75335575964c845a302447c012c7", - "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw" - }, - "src/third_party/dawn/third_party/khronos/EGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=", - "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry" - }, - "src/third_party/dawn/third_party/khronos/OpenGL-Registry": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=", - "rev": "5bae8738b23d06968e7c3a41308568120943ae77", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry" - }, - "src/third_party/dawn/third_party/webgpu-cts": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oc7Dt++zGJzpyueP3qMzI9YVA50MjFy6uIqO4eklYb4=", - "rev": "4629efe685b7b8db08e1c7aa2cafd1e9e5769ac2", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts" - }, - "src/third_party/dawn/third_party/webgpu-headers": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xQ+yqHyyxqCvZsX0nl8Thyc3MKRS3SRRhTaLLErcgfM=", - "rev": "aef5e428a1fdab2ea770581ae7c95d8779984e0a", - "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers" - }, - "src/third_party/depot_tools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-JNF2y81hdi0Q6BY+w00uf1iPbP/cq/N+uuOC+a2nPbg=", - "rev": "28ece72a5d752a5e36e62124979b18530e610f6b", - "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git" - }, - "src/third_party/devtools-frontend/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-IWKu2u06tUcLKZlvleCiZ63e6hYtsrnMNVNj9N07aLI=", - "rev": "c963f0c7472f41d9d4c3335fffdab4f9b8da25bb", - "url": "https://chromium.googlesource.com/devtools/devtools-frontend" - }, - "src/third_party/dom_distiller_js/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=", - "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d", - "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git" - }, - "src/third_party/eigen3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Q/5UIBdgoS0cIWPnlg41+8Wy4Z6B2cBqSqGfj5rNdII=", - "rev": "e16d70bd4e9cdebd2fbdae63b1a4d86493fbbde6", - "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git" - }, - "src/third_party/electron_node": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-gm0mJNq6RVWfSsy7vxz44zz0OKjoH50APKOkOnI+Is8=", - "owner": "nodejs", - "repo": "node", - "rev": "v20.18.0" - }, - "src/third_party/emoji-segmenter/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oT9mAKoKnrsFsBAeTRfPOXM76HRQQabFAlPpfKUGFhs=", - "rev": "9ba6d25d0d9313569665d4a9d2b34f0f39f9a50e", - "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git" - }, - "src/third_party/engflow-reclient-configs": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=", - "owner": "EngFlow", - "repo": "reclient-configs", - "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d" - }, - "src/third_party/expat/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-fr18LL/xX23t9TIn3q8jWdV9Y6coepbGsO3vJVdDW6k=", - "rev": "a59c3edffa54a77b8d7b268ef527da541076ca6a", - "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git" - }, - "src/third_party/farmhash/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=", - "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45", - "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git" - }, - "src/third_party/ffmpeg": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hFmeeCoUrsMsq3ARBKQCgITuotRCD0ro/feJpF/85Rk=", - "rev": "092f84b6141055bfab609b6b2666b724eee2e130", - "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git" - }, - "src/third_party/flac": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=", - "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c", - "url": "https://chromium.googlesource.com/chromium/deps/flac.git" - }, - "src/third_party/flatbuffers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-XT1DKfSFKK5Rp1fttm/aHOVBmUWD+wvcOfD+OYgEJpI=", - "rev": "c696275eaffec33796b5ca8755614fd9fec0a6a7", - "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git" - }, - "src/third_party/fontconfig/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=", - "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267", - "url": "https://chromium.googlesource.com/external/fontconfig.git" - }, - "src/third_party/fp16/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=", - "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git" - }, - "src/third_party/freetype-testing/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2aHPchIK5Oce5+XxdXVCC+8EM6i0XT0rFbjSIVa2L1A=", - "rev": "7a69b1a2b028476f840ab7d4a2ffdfe4eb2c389f", - "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git" - }, - "src/third_party/freetype/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ZFWYp9nD4kp/dYQm3SQXjej2do8QgWZMiV9Y4nTDcEY=", - "rev": "a46424228f0998a72c715f32e18dca8a7a764c1f", - "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git" - }, - "src/third_party/fuzztest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xMUZYJ0cTCvc9q4q0ZhfFOf2Yb1tHOQfPLrDMEf/YvA=", - "rev": "34584108adea9bb274f71cee34fc091f89d7b2d5", - "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git" - }, - "src/third_party/fxdiv/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=", - "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git" - }, - "src/third_party/gemmlowp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=", - "rev": "13d57703abca3005d97b19df1f2db731607a7dc2", - "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git" - }, - "src/third_party/google_benchmark/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=", - "rev": "344117638c8ff7e239044fd0fa7085839fc03021", - "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git" - }, - "src/third_party/googletest/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-OCJ62/IGZI9QCJu/eiytdNE/5keiaf2hbLEM3vmUbNI=", - "rev": "33af80a883ddc33d9c0fac0a5b4578301efb18de", - "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git" - }, - "src/third_party/grpc/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-64JEVCx/PCM0dvv7kAQvSjLc0QbRAZVBDzwD/FAV6T8=", - "rev": "822dab21d9995c5cf942476b35ca12a1aa9d2737", - "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git" - }, - "src/third_party/harfbuzz-ng/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-VAan6P8PHSq8RsGE4YbI/wCfFAhzl3nJMt0cQBYi5Ls=", - "rev": "155015f4bec434ecc2f94621665844218f05ce51", - "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git" - }, - "src/third_party/highway/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kNb9UVcFq2BIf9nftUgN8ciFFCzRCou/sLwVf08jf3E=", - "rev": "8f20644eca693cfb74aa795b0006b6779c370e7a", - "url": "https://chromium.googlesource.com/external/github.com/google/highway.git" - }, - "src/third_party/hunspell_dictionaries": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=", - "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e", - "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git" - }, - "src/third_party/icu": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-XQDU7A+43ywikpEt/fLNFnZ/wbU/vUEbm/K55qg180I=", - "rev": "98f2494518c2dbb9c488e83e507b070ea5910e95", - "url": "https://chromium.googlesource.com/chromium/deps/icu.git" - }, - "src/third_party/instrumented_libs": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-SGEB74fK9e0WWT77ZNISE9fVlXGGPvZMBUsQ3XD+DsA=", - "rev": "0172d67d98df2d30bd2241959d0e9569ada25abe", - "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git" - }, - "src/third_party/jsoncpp/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", - "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git" - }, - "src/third_party/leveldatabase/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TTX2FrmcWsgqrh4uzqMyGnnnG51cVC2ILfdLxD65MLY=", - "rev": "068d5ee1a3ac40dabd00d211d5013af44be55bea", - "url": "https://chromium.googlesource.com/external/leveldb.git" - }, - "src/third_party/libFuzzer/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-T0dO+1A0r6kLFoleMkY8heu80biPntCpvA6YfqA7b+E=", - "rev": "758bd21f103a501b362b1ca46fa8fcb692eaa303", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git" - }, - "src/third_party/libaddressinput/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xvUUQSPrvqUp5DI9AqlRTWurwDW087c6v4RvI+4sfOQ=", - "rev": "e8712e415627f22d0b00ebee8db99547077f39bd", - "url": "https://chromium.googlesource.com/external/libaddressinput.git" - }, - "src/third_party/libaom/source/libaom": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-zlzMsP86/BvcvfoZxdajZUZCvW/8nUvIkRuTdYXnUf8=", - "rev": "77665fee933b409dd94e35b0c216645f845b9fd9", - "url": "https://aomedia.googlesource.com/aom.git" - }, - "src/third_party/libavif/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-2vUxV4C9MrXVPgdSZjkEJ3YO9kkdwR0G5pgGZ+E+/60=", - "rev": "5d97130f0820dbc97738f5480e2dd00865a35744", - "url": "https://chromium.googlesource.com/external/github.com/AOMediaCodec/libavif.git" - }, - "src/third_party/libavifinfo/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-UAc4iYWrKWteH98hD3QLkD3JWmV/rsvWhFIVJN7tc+Q=", - "rev": "b496868f7c3fd17dfeeecc0364fe37e19edd548a", - "url": "https://aomedia.googlesource.com/libavifinfo.git" - }, - "src/third_party/libc++/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ocJqlENHw19VpkFxKwHneGw3aNh56nt+/JeopxLj2M8=", - "rev": "e3b94d0e5b86883fd77696bf10dc33ba250ba99b", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git" - }, - "src/third_party/libc++abi/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-71aEsBTsJl7XkH5y1s99eH3WpjVk+O1mHLtZE6dSIjQ=", - "rev": "a37a3aa431f132b02a58656f13984d51098330a2", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git" - }, - "src/third_party/libdrm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-NUxS2rBJ0nFblvHRQUfKT933+DAws5RUTDb+RLxRF4M=", - "rev": "98e1db501173303e58ef6a1def94ab7a2d84afc1", - "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git" - }, - "src/third_party/libgav1/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+ss9S5t+yoHzqbtX68+5OyyUbJVecYLwp+C3EXfAziE=", - "rev": "a2f139e9123bdb5edf7707ac6f1b73b3aa5038dd", - "url": "https://chromium.googlesource.com/codecs/libgav1.git" - }, - "src/third_party/libipp/libipp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=", - "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f", - "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git" - }, - "src/third_party/libjpeg_turbo": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+t75ZAdOXc7Nd1/8zEQLX+enZb8upqIQuR6qzb9z7Cg=", - "rev": "9b894306ec3b28cea46e84c32b56773a98c483da", - "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git" - }, - "src/third_party/liblouis/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=", - "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376", - "url": "https://chromium.googlesource.com/external/liblouis-github.git" - }, - "src/third_party/libphonenumber/dist": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-3hSnTFTD3KAdbyxfKg12qbIYTmw6YlTCH64gMP/HUJo=", - "rev": "140dfeb81b753388e8a672900fb7a971e9a0d362", - "url": "https://chromium.googlesource.com/external/libphonenumber.git" - }, - "src/third_party/libprotobuf-mutator/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ZyPweW+V5foxFQwjjMLkaRUo+FNV+kEDGIH/4oRV614=", - "rev": "a304ec48dcf15d942607032151f7e9ee504b5dcf", - "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git" - }, - "src/third_party/libsrtp": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-XOPiDAOHpWyCiXI+fi1CAie0Zaj4v14m9Kc8+jbzpUY=", - "rev": "7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a", - "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git" - }, - "src/third_party/libsync/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=", - "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6", - "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git" - }, - "src/third_party/libunwind/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-/4/Trextb4F9UMDVrg4uG9QZl6S0H9FiwnL+2S5+ZpE=", - "rev": "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad", - "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git" - }, - "src/third_party/libvpx/source/libvpx": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-R7AMqzNV92dnNsPV1mECVsi1dKh+0W8mo24NcPyMn0c=", - "rev": "108f5128e2969451f77b1523ce30bebe545cdd58", - "url": "https://chromium.googlesource.com/webm/libvpx.git" - }, - "src/third_party/libwebm/source": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-u/5nkJed0DzdhR5OLL2kIhZhOnrbyzL1Kx37vV/jcEo=", - "rev": "e4fbea0c9751ae8aa86629b197a28d8276a2b0da", - "url": "https://chromium.googlesource.com/webm/libwebm.git" - }, - "src/third_party/libwebp/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-xuRpEwOnaLGZmrPvfUn3DSoJANd94CG+JXcN7Mdmk5I=", - "rev": "845d5476a866141ba35ac133f856fa62f0b7445f", - "url": "https://chromium.googlesource.com/webm/libwebp.git" - }, - "src/third_party/libyuv": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hD5B9fPNwf8M98iS/PYeUJgJxtBvvf2BrrlnBNYXSg0=", - "rev": "a6a2ec654b1be1166b376476a7555c89eca0c275", - "url": "https://chromium.googlesource.com/libyuv/libyuv.git" - }, - "src/third_party/lss": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-hE8uZf9Fst66qJkoVYChiB8G41ie+k9M4X0W+5JUSdw=", - "rev": "ce877209e11aa69dcfffbd53ef90ea1d07136521", - "url": "https://chromium.googlesource.com/linux-syscall-support.git" - }, - "src/third_party/material_color_utilities/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=", - "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465", - "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git" - }, - "src/third_party/minigbm/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=", - "rev": "3018207f4d89395cc271278fb9a6558b660885f5", - "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git" - }, - "src/third_party/nan": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=", - "owner": "nodejs", - "repo": "nan", - "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213" - }, - "src/third_party/nasm": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-SiRXHsUlWXtH6dbDjDjqNAm105ibEB3jOfNtQAM4CaY=", - "rev": "f477acb1049f5e043904b87b825c5915084a9a29", - "url": "https://chromium.googlesource.com/chromium/deps/nasm.git" - }, - "src/third_party/nearby/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-oz+yloV78xpY71JzWKLEcJNmYT4QYh0IzNXdJwKc8mU=", - "rev": "f26d25ed0106bd8946f8bb380bb67fb552e7390d", - "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git" - }, - "src/third_party/neon_2_sse/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-299ZptvdTmCnIuVVBkrpf5ZTxKPwgcGUob81tEI91F0=", - "rev": "a15b489e1222b2087007546b4912e21293ea86ff", - "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git" - }, - "src/third_party/openh264/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-J7Eqe2QevZh1xfap19W8AVCcwfRu7ztknnbKFJUAH1c=", - "rev": "09a4f3ec842a8932341b195c5b01e141c8a16eb7", - "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264" - }, - "src/third_party/openscreen/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-FOawpIr8sXw3VNgYXCw5+NxFexE+lNVni7flp+BMJXA=", - "rev": "97d0a7fd9e51669930f8376e069599acc1c2de2e", - "url": "https://chromium.googlesource.com/openscreen" - }, - "src/third_party/openscreen/src/buildtools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-suuxUL//BfAMmG8os8ChI7ic9EjGTi7y5kjxiAyrEQc=", - "rev": "4e0e9c73a0f26735f034f09a9cab2a5c0178536b", - "url": "https://chromium.googlesource.com/chromium/src/buildtools" - }, - "src/third_party/openscreen/src/third_party/tinycbor/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=", - "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7", - "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git" - }, - "src/third_party/ots/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=", - "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33", - "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git" - }, - "src/third_party/pdfium": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-jhDbR0COFpErzHiWD66rcQRWqmf3IgqBU4/aklUEDG4=", - "rev": "ecbab85b3c5285b971b9801c7e197284dca5d144", - "url": "https://pdfium.googlesource.com/pdfium.git" - }, - "src/third_party/perfetto": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-kqpwwf/havZpzxBjJFWNcPnGqvu7KSC6DE3xBbdiK9Q=", - "rev": "6aaa8a1fb15659d1b68179e20993e969d9f500f8", - "url": "https://android.googlesource.com/platform/external/perfetto.git" - }, - "src/third_party/protobuf-javascript/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-TmP6xftUVTD7yML7UEM/DB8bcsL5RFlKPyCpcboD86U=", - "rev": "e34549db516f8712f678fcd4bc411613b5cc5295", - "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript" - }, - "src/third_party/pthreadpool/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=", - "rev": "4fe0e1e183925bf8cfa6aae24237e724a96479b8", - "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/pthreadpool.git" - }, - "src/third_party/pyelftools": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=", - "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae", - "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git" - }, - "src/third_party/pywebsocket3/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=", - "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git" - }, - "src/third_party/quic_trace/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Nf9ZDLcE1JunhbpEMHhrY2ROnbgrvVZoRkPwWq1DU0g=", - "rev": "caa0a6eaba816ecb737f9a70782b7c80b8ac8dbc", - "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git" - }, - "src/third_party/re2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+xqIFlDDx0FjHt82Gj/7UVKz8KCaTvhTg4Pg/MKwu8w=", - "rev": "f31c2c6f380331ddc862e37c7dea0bcf440b29dc", - "url": "https://chromium.googlesource.com/external/github.com/google/re2.git" - }, - "src/third_party/ruy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-4NVvqUZn2BdwTxJINTHwPeRqbGXZrWdcd7jv1Y+eoKY=", - "rev": "c08ec529fc91722bde519628d9449258082eb847", - "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git" - }, - "src/third_party/securemessage/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=", - "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84", - "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git" - }, - "src/third_party/skia": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-MmguxmkiZkICHvx76J2bHM6BaXQh9vzWNRQExa5PScg=", - "rev": "be621ea04206d8fae23952783d1d588d6ce0d9b3", - "url": "https://skia.googlesource.com/skia.git" - }, - "src/third_party/smhasher/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-RyC//me08hwGXRrWcK8GZ1uhIkBq4FByA7fHCVDsniw=", - "rev": "e87738e57558e0ec472b2fc3a643b838e5b6e88f", - "url": "https://chromium.googlesource.com/external/smhasher.git" - }, - "src/third_party/snappy/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5fV6NfO8vmqK+iCwpLtE2YjYOzjsshctauyjNIOxrH0=", - "rev": "c9f9edf6d75bb065fa47468bf035e051a57bec7c", - "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git" - }, - "src/third_party/speedometer/v3.0": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=", - "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d", - "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git" - }, - "src/third_party/sqlite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-NyYVUWJTfZ069Po70vgOssJEGXdoFgdrxg1IhYNtXPA=", - "rev": "1ee793e63351333e2089d4b272e15574502ff0c2", - "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git" - }, - "src/third_party/squirrel.mac": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=", - "owner": "Squirrel", - "repo": "Squirrel.Mac", - "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38" - }, - "src/third_party/squirrel.mac/vendor/Mantle": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=", - "owner": "Mantle", - "repo": "Mantle", - "rev": "78d3966b3c331292ea29ec38661b25df0a245948" - }, - "src/third_party/squirrel.mac/vendor/ReactiveObjC": { - "fetcher": "fetchFromGitHub", - "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=", - "owner": "ReactiveCocoa", - "repo": "ReactiveObjC", - "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76" - }, - "src/third_party/swiftshader": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-z4bu4cohPSBV8qluLBQau/C65GC+OGWq6bBeMR/TCFA=", - "rev": "da334852e70510d259bfa8cbaa7c5412966b2f41", - "url": "https://swiftshader.googlesource.com/SwiftShader.git" - }, - "src/third_party/text-fragments-polyfill/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=", - "rev": "c036420683f672d685e27415de0a5f5e85bdc23f", - "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git" - }, - "src/third_party/tflite/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-k846rWmLlNmnQxZHPzaFHDv5xu3AQt+9ynQIor4fFfw=", - "rev": "1187fe26a8a52029b23e0832356989ab44a540c3", - "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git" - }, - "src/third_party/ukey2/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=", - "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47", - "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git" - }, - "src/third_party/vulkan-deps": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-EU8/UkMiD8TAlXjzg0bqn7DRijSm+y0W+7fpaP/gDkI=", - "rev": "f1dcf238ad742f936794809f28b0ad0511b6585b", - "url": "https://chromium.googlesource.com/vulkan-deps" - }, - "src/third_party/vulkan-deps/glslang/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-/2t8GbVf+GnOK8p+KFKXyWc26SEAD+UxPCGuhqZsRpg=", - "rev": "b3e9bdbe1656b37611585e0a1523678f089bc31e", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang" - }, - "src/third_party/vulkan-deps/spirv-cross/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=", - "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross" - }, - "src/third_party/vulkan-deps/spirv-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+svEwPqaUxZeg/JF9DYfwx0N1g9eTzHkIEyW5rZ1DaA=", - "rev": "49a1fceb9b1d087f3c25ad5ec077bb0e46231297", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers" - }, - "src/third_party/vulkan-deps/spirv-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-+HKyvortwE3LT1T+vwfhLWOjBu4QUIj0mSuRK/WhFqI=", - "rev": "199038f10cbe56bf7cbfeb5472eb0a25af2f09f5", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools" - }, - "src/third_party/vulkan-deps/vulkan-headers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-bbILp733ddwEStJB0nr+cyAV8Px0kie7rLQ4eS7kUoI=", - "rev": "5677bafb820e476441e9e1f745371b72133407d3", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers" - }, - "src/third_party/vulkan-deps/vulkan-loader/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-8N0xdcT2BtjECOMytAkkydbYCIYsJZ9JnQMt1fq1Iso=", - "rev": "eb8c7b071a449be3d1331e0961c8fdd0a78efca9", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader" - }, - "src/third_party/vulkan-deps/vulkan-tools/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-6Pu0oSqrCIUCQUlYEqaNsQt583fipG+3SYXtM4oa9RE=", - "rev": "df8e710224f563a04b7db2680f72d31619c4b259", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools" - }, - "src/third_party/vulkan-deps/vulkan-utility-libraries/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-QAYYpIH82F1OaUsTFCgBDHMWAdWpaTBMLvNgK+QRMBQ=", - "rev": "358a107a6ff284906dcccbabe5b0183c03fd85b6", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries" - }, - "src/third_party/vulkan-deps/vulkan-validation-layers/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-ysOCZ3XKVt0bhtF0J20cbumFTXzk3qqgfZFjA9qU/9s=", - "rev": "944660e342cfafb6c318d11731751d9a291434d4", - "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers" - }, - "src/third_party/vulkan_memory_allocator": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=", - "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21", - "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git" - }, - "src/third_party/wayland-protocols/gtk": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=", - "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0", - "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git" - }, - "src/third_party/wayland-protocols/kde": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=", - "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e", - "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git" - }, - "src/third_party/wayland-protocols/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-5gWBte8oiuXM01StvyXFAsxFwuQZHjZT/LZ6l0mvrwI=", - "rev": "c7e9c4f5d396cda4051e49b15d7d0e4f91e4efac", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git" - }, - "src/third_party/wayland/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Cxu9+Kzw2t1BDfuGzNobaraT4eJcSPO7jvnHpuUANoo=", - "rev": "31577177454b89db37ceabd94e1640d398adbc87", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git" - }, - "src/third_party/webdriver/pylib": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=", - "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04", - "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git" - }, - "src/third_party/webgl/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-Yn0e1bpvtD4mGdZaRiBytc+upLulYVyHJqXJiTWEfmA=", - "rev": "1b6371436a0a60e6b9a4ae2a40a8eba198e3af02", - "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git" - }, - "src/third_party/webgpu-cts/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-POFEg+sjEvogLgu0tGpMHFiMy244QBJInr+Ix2MgtYs=", - "rev": "762a3dfb42095c6084da99b630eea6bef9dc1db8", - "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git" - }, - "src/third_party/webrtc": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-zSB7M1YbAdQaBJzJVJKkE+ZPdqiJRPPBCOoZk+IH3Yo=", - "rev": "a18e38fed2307edd6382760213fa3ddf199fa181", - "url": "https://webrtc.googlesource.com/src.git" - }, - "src/third_party/weston/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=", - "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7", - "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git" - }, - "src/third_party/wuffs/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=", - "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", - "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git" - }, - "src/third_party/xdg-utils": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=", - "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44", - "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git" - }, - "src/third_party/xnnpack/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-DFASq5yiHHrda3iAIJ6spcw12HQfwsVJs37XsxIcers=", - "rev": "e73fb4a03f658fd48cc10c8a7cf48fe7eeab9114", - "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git" - }, - "src/third_party/zstd/src": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-B/zsEY8mUV86xzf6fOclTdjBFBD+ErkjYAmTNn2r+18=", - "rev": "ff7a151f2e6c009b657d9f798c2d9962b0e3feb5", - "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git" - }, - "src/tools/page_cycler/acid3": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-s/49EaYQRsyxuLejXc1zGDYTD7uO0ddaQIJBP50Bvw0=", - "rev": "a926d0a32e02c4c03ae95bb798e6c780e0e184ba", - "url": "https://chromium.googlesource.com/chromium/deps/acid3.git" - }, - "src/v8": { - "fetcher": "fetchFromGitiles", - "hash": "sha256-WitoqX3tFf3ty0pXaoGAtKV7Jr0cAZ/m+MxET4kpMzQ=", - "rev": "65b1674f955694c83b9a3e579c23ae0ea35258db", - "url": "https://chromium.googlesource.com/v8/v8.git" - } - }, - "electron_yarn_hash": "1wh9axmlhfw2d66gvxzcwbcg07amjrzs7yjh8f47irvszgbw2vxk", - "modules": "125", - "node": "20.18.0", - "version": "31.7.6" - }, "32": { "chrome": "128.0.6613.186", "chromium": { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 01119dedd5df1..51567a2b2906b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7604,7 +7604,7 @@ with pkgs; electron_28 = electron_28-bin; electron_29 = electron_29-bin; electron_30 = electron_30-bin; - electron_31 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_31 then electron-source.electron_31 else electron_31-bin; + electron_31 = electron_31-bin; electron_32 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_32 then electron-source.electron_32 else electron_32-bin; electron_33 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_33 then electron-source.electron_33 else electron_33-bin; electron = electron_33; From 78f48dd71e6c22b934f69a1a664254dec23e496e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 12:38:39 +0000 Subject: [PATCH 15/82] apktool: 2.10.0 -> 2.11.0 --- pkgs/by-name/ap/apktool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apktool/package.nix b/pkgs/by-name/ap/apktool/package.nix index 77973b83683b4..ce6e8582edc70 100644 --- a/pkgs/by-name/ap/apktool/package.nix +++ b/pkgs/by-name/ap/apktool/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "apktool"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { urls = [ "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar" "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar" ]; - hash = "sha256-wDUKu6tTFCSN/i7gyQfe9O3RT2+u8fXTctPUq9KPBDE="; + hash = "sha256-j9wXxv4ubYDXG4cY6ypdA3nxzHE5rnd/akmc45eyb1Q="; }; dontUnpack = true; From ed3c41de76a56de9f6599cba88c2d7970c1e4eb7 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 15 Jan 2025 13:40:10 +0100 Subject: [PATCH 16/82] cosmic-notifications: 1.0.0-alpha.2 -> 1.0.0-alpha.5.1 --- pkgs/by-name/co/cosmic-notifications/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index c27427c89c782..7ce7cf3d6e904 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-notifications"; - version = "1.0.0-alpha.2"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-notifications"; rev = "epoch-${version}"; - hash = "sha256-tCizZePze94tbJbR91N9rfUhrLFTAMW2oL9ByKOeDAU="; + hash = "sha256-xUyBXHhpYgwr3A34oLF5l1xB8f++wtx0mTr2p8WX89o="; }; useFetchCargoVendor = true; - cargoHash = "sha256-36M7hDt8kd2Q94AR3IJhC2lKDLW2wRWWeqh3rEaRPTo="; + cargoHash = "sha256-froRGGsK5qoia5wHtxLhljKueMCYafhika9Drsp906E="; postPatch = '' substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" From e259d494723f3b0ec2fd0883ae460334490f1a50 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 12:49:08 +0000 Subject: [PATCH 17/82] mongodb-compass: 1.45.0 -> 1.45.1 --- pkgs/by-name/mo/mongodb-compass/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 61bbec71d6fdd..86e87742f8cf5 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -34,7 +34,7 @@ }: let - version = "1.45.0"; + version = "1.45.1"; rpath = lib.makeLibraryPath [ alsa-lib @@ -84,7 +84,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - hash = "sha256-p8EcsjAyzrwPfVgpmY5OlDYoikdblJDFKwtD0bCq0sA="; + hash = "sha256-EEpP1M51Lyki4MJ3iMNpcxJbqPYl4bZGE3frax8kD0k="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From 10e1ea3aa00c1731afaddf07c0b2a0148773022f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 13:05:46 +0000 Subject: [PATCH 18/82] websurfx: 1.20.13 -> 1.22.2 --- pkgs/by-name/we/websurfx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index 936cbb19aac87..6bafceffe315e 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.20.13"; + version = "1.22.2"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-NuhSpUe1PzJTBsX91LSOIh4N20eTs7MLl4ueIoGoC6o="; + hash = "sha256-Kwf4lIY99dnF8p59qOUefHIyhQHBb/ZasidswETLICM="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; - cargoHash = "sha256-SRRZoK7zsSDTvOyqJ+YLNkhzTseAgK0KGCoAECmuDa8="; + cargoHash = "sha256-DK5eYgz/+FieauE7bCXXOs7RQUQWEphq3wP8QD0S9QQ="; postPatch = '' substituteInPlace src/handler/mod.rs \ From 1f9a92d204bb616efd3638021abcf26871d7ced6 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Tue, 14 Jan 2025 16:47:06 +0100 Subject: [PATCH 19/82] cruft: 2.15.0 -> 2.16.0 --- pkgs/by-name/cr/cruft/package.nix | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/cr/cruft/package.nix b/pkgs/by-name/cr/cruft/package.nix index 496afcc4939da..fb64c38e861b5 100644 --- a/pkgs/by-name/cr/cruft/package.nix +++ b/pkgs/by-name/cr/cruft/package.nix @@ -5,30 +5,38 @@ }: python3Packages.buildPythonApplication rec { pname = "cruft"; - version = "2.15.0"; + version = "2.16.0"; pyproject = true; src = fetchFromGitHub { owner = "cruft"; repo = "cruft"; - rev = version; - hash = "sha256-qIVyNMoI3LsoOV/6XPa60Y1vTRvkezesF7wF9WVSLGk="; + tag = version; + hash = "sha256-hUucSfgDBlT5jVk/oF8JjbcYhjHgkprfGRwsSNfgjfg="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'version = "0.0.0"' 'version = "${version}"' + ''; + build-system = with python3Packages; [ - poetry-core + hatchling ]; nativeCheckInputs = with python3Packages; [ pytest7CheckHook ]; - dependencies = with python3Packages; [ - click - cookiecutter - gitpython - typer - ]; + dependencies = + with python3Packages; + [ + click + cookiecutter + gitpython + typer + ] + ++ lib.optional (pythonOlder "3.11") python3Packages.toml; pythonImportsCheck = "cruft"; From bc5b78f993292d10df62792d41dbdf1568fe1793 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Wed, 15 Jan 2025 15:34:42 +0100 Subject: [PATCH 20/82] nixos/systemd-tmpfiles: fix ordering of systemd-tmpfiles-setup-sysroot Prior to this change a service failure would occur when this tmpfiles service did not finish fast enough and receive a SIGTERM from systemd. Additionally, `initrd-nixos-activation` is already ordered with `After=initrd-switch-root.target`. --- nixos/modules/system/boot/systemd/tmpfiles.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index 10d58dc0c706e..5e35e63e96c11 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -322,7 +322,7 @@ in description = "Create Volatile Files and Directories in the Real Root"; after = [ "initrd-fs.target" ]; before = [ - "initrd-nixos-activation.service" + "initrd.target" "shutdown.target" "initrd-switch-root.target" ]; conflicts = [ "shutdown.target" "initrd-switch-root.target" ]; From a3f102cd3f9b3ca5f29cf9be77a5ffe141d7659d Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 15 Jan 2025 15:37:40 +0100 Subject: [PATCH 21/82] mate.mate-panel: fix cross build --- pkgs/desktops/mate/mate-panel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index f351965af1d16..b89dff709e618 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { gobject-introspection gettext itstool + libxml2 # xmllint pkg-config wrapGAppsHook3 ]; @@ -46,7 +47,6 @@ stdenv.mkDerivation rec { libmateweather libwnck librsvg - libxml2 dconf mate-desktop mate-menus From 51c98efa3fe7c98a207b1db8405780f1a8a70195 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 15:08:44 +0000 Subject: [PATCH 22/82] sickgear: 3.32.14 -> 3.32.15 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index ddbf2c0945113..a8c7602a01309 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "sickgear"; - version = "3.32.14"; + version = "3.32.15"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - hash = "sha256-EcIxY1MLKNiHCMPMwytSb+azzn0jaBdPEPoAFsA99T4="; + hash = "sha256-0/HxWll7J9Ku/7Sm36gsr7bmPsUr7vCC6MjoRJL+lx4="; }; patches = [ From 6137f5b09b6d15b9ce8b2bb6b724f84a9ed4edd8 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 15 Jan 2025 16:16:55 +0100 Subject: [PATCH 23/82] cosmic-settings-daemon: 1.0.0-alpha.4 -> 1.0.0-alpha.5.1 --- pkgs/by-name/co/cosmic-settings-daemon/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 4c1139ca7b7dc..992dc9df980f2 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "cosmic-settings-daemon"; - version = "1.0.0-alpha.4"; + version = "1.0.0-alpha.5.1"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings-daemon"; rev = "epoch-${version}"; - hash = "sha256-wwrbZJ/FA6qjeo9M/gIlzVyygiLT3R5OTLhTwr/QSSw="; + hash = "sha256-MlBnwbszwJCa/FQNihSKsy7Bllw807C8qQL9ziYS3fE="; }; useFetchCargoVendor = true; - cargoHash = "sha256-zAVBkH6ADs8uXqHD1gHQJl1e5l+g6NdnhEJa5fSvHDE="; + cargoHash = "sha256-ianyD+ws/t2Qg+UG3eGE1WP2dHS2iWdCTolk/ZH/Ddg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 093c47089063fc1621c2713649ed70828e0c1255 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 16:20:53 +0000 Subject: [PATCH 24/82] python312Packages.trainer: 0.2.0 -> 0.2.2 --- pkgs/development/python-modules/trainer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trainer/default.nix b/pkgs/development/python-modules/trainer/default.nix index e81a974a0e1ad..bc33c993bffa6 100644 --- a/pkgs/development/python-modules/trainer/default.nix +++ b/pkgs/development/python-modules/trainer/default.nix @@ -20,7 +20,7 @@ let pname = "coqui-tts-trainer"; - version = "0.2.0"; + version = "0.2.2"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { owner = "idiap"; repo = "coqui-ai-Trainer"; tag = "v${version}"; - hash = "sha256-zm8BTfXvfwuWpmHFcSxuu+/V4bKanSBU2dniQboVdLY="; + hash = "sha256-MQCLeTruTlXfs3QZxsMC2Gju5rlwWDfZjkyokiIgmOI="; }; nativeBuildInputs = [ From 5fd2557dc682b1e4cf660a2d6a87d462f63c0d51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 18:14:57 +0000 Subject: [PATCH 25/82] python312Packages.textblob: 0.18.0.post0 -> 0.19.0 --- pkgs/development/python-modules/textblob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textblob/default.nix b/pkgs/development/python-modules/textblob/default.nix index ff55bb7f1a2ed..239f27d4fe754 100644 --- a/pkgs/development/python-modules/textblob/default.nix +++ b/pkgs/development/python-modules/textblob/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "textblob"; - version = "0.18.0.post0"; + version = "0.19.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gTHFLGMLzfYdBMNZ+TnJjVuDagH7oiTZ564i/CdODMs="; + hash = "sha256-Cj0GpHz3dZRB2jQYxIQ67TeXqZi+uiEIxiRaICD4OwE="; }; build-system = [ flit-core ]; From 0371b937995beabb34d1533d87289f8fe37dc9cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 21:14:14 +0000 Subject: [PATCH 26/82] python312Packages.buienradar: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/buienradar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix index 4ecf5a6abd221..f6e884be082a4 100644 --- a/pkgs/development/python-modules/buienradar/default.nix +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "buienradar"; - version = "1.0.6"; + version = "1.0.7"; format = "setuptools"; src = fetchFromGitHub { owner = "mjj4791"; repo = "python-buienradar"; # https://github.com/mjj4791/python-buienradar/issues/14 - rev = "6081a860e190eb59c2ea3ebdcb8a50f6133a0b53"; - hash = "sha256-5bFGPR8StyQTMRcvECdHGC33oAR/9noeCbpwx3DSquQ="; + tag = version; + hash = "sha256-DwOysdA6B9DMH1j/1Oetx2rCgqwk/UggCdH0lBVS6Hw="; }; propagatedBuildInputs = [ From 507145d1761a397a57df3808b02bce0b5d89aafe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 15 Jan 2025 22:32:25 +0000 Subject: [PATCH 27/82] terraform-providers.sysdig: 1.42.0 -> 1.44.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fd83133630b7c..9023bb82f53ed 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1237,11 +1237,11 @@ "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, "sysdig": { - "hash": "sha256-TvZ7x4dWOERkqTWtjmbILdcWy12kqsV+OzLJ4siQ7mA=", + "hash": "sha256-AedvLVOnAGQ33TJ2o5AI+LixvrLpK/C90vS8jsXadbk=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v1.42.0", + "rev": "v1.44.0", "spdx": "MPL-2.0", "vendorHash": "sha256-nfVS4EXpPoriXyPpBK8k5OU9MTWxxrvTIwsF2uyQE/0=" }, From b521260126e73152784363e72841c62bb198082b Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Wed, 15 Jan 2025 23:44:17 +0100 Subject: [PATCH 28/82] webdav: 5.7.1 -> 5.7.2 Release: https://github.com/hacdias/webdav/releases/tag/v5.7.2 Diff: https://github.com/hacdias/webdav/compare/refs/tags/v5.7.1...v5.7.2 --- pkgs/by-name/we/webdav/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix index 03606ad615cb0..6f29b60882a40 100644 --- a/pkgs/by-name/we/webdav/package.nix +++ b/pkgs/by-name/we/webdav/package.nix @@ -2,13 +2,13 @@ buildGo123Module rec { pname = "webdav"; - version = "5.7.1"; + version = "5.7.2"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; tag = "v${version}"; - hash = "sha256-nLQ77RuOGYaL+U3X3yb4Kq47NA1A3SSUMKBbFnRP6o4="; + hash = "sha256-Xr42ZGzgwt0ipllpsnTsEOP1IxCBaDMd19rYpI7R19o="; }; vendorHash = "sha256-x5CUy46c4SunzMw/v2DWpdahuXFZnJdGInQ0lSho/es="; From 769fe6b829bdcad3390a36078c8c2741dd4cf15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 15 Jan 2025 15:48:56 -0800 Subject: [PATCH 29/82] python313Packages.buienradar: add changelog --- pkgs/development/python-modules/buienradar/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/buienradar/default.nix b/pkgs/development/python-modules/buienradar/default.nix index f6e884be082a4..cbaf33dfcd0fe 100644 --- a/pkgs/development/python-modules/buienradar/default.nix +++ b/pkgs/development/python-modules/buienradar/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/mjj4791/python-buienradar/blob/${src.tag}/CHANGLOG.rst"; description = "Library and CLI tools for interacting with buienradar"; mainProgram = "buienradar"; homepage = "https://github.com/mjj4791/python-buienradar"; From cd565f7da304e3e4ff159633fcbcbf0e7cb77d98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 00:38:02 +0000 Subject: [PATCH 30/82] postgresqlPackages.pgsql-http: 1.6.1 -> 1.6.2 --- pkgs/servers/sql/postgresql/ext/pgsql-http.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix index 50daa0d3e826f..6eb36eebfa4b3 100644 --- a/pkgs/servers/sql/postgresql/ext/pgsql-http.nix +++ b/pkgs/servers/sql/postgresql/ext/pgsql-http.nix @@ -9,13 +9,13 @@ buildPostgresqlExtension rec { pname = "pgsql-http"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "pramsey"; repo = "pgsql-http"; rev = "v${version}"; - hash = "sha256-C8eqi0q1dnshUAZjIsZFwa5FTYc7vmATF3vv2CReWPM="; + hash = "sha256-I9NDCXA6jColx/iFsvc3ujVbh3tjpqTgoW9VIzD2OTk="; }; buildInputs = [ curl ]; From 3a1200917f09c44494b411398978b2e2bb12944a Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 16 Jan 2025 02:39:00 +0200 Subject: [PATCH 31/82] yt-dlp: 2025.1.12 -> 2025.1.15 Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.01.15 Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.01.12...2025.01.15 --- pkgs/by-name/yt/yt-dlp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix index c0613c53eefd5..fa3143f315914 100644 --- a/pkgs/by-name/yt/yt-dlp/package.nix +++ b/pkgs/by-name/yt/yt-dlp/package.nix @@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2025.1.12"; + version = "2025.1.15"; pyproject = true; src = fetchPypi { inherit version; pname = "yt_dlp"; - hash = "sha256-jn4kbipaLP8KnBPbRoRKN6VHaAcCASBYyU7Bj84Molo="; + hash = "sha256-6OxRXUm7YnBJFdE6Iu5v4DpWWNZR5OZFdOOhfuAfbjs="; }; build-system = with python3Packages; [ From 1ea4c422d4d1d27c4767055a49d126cc82299bf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 02:03:27 +0000 Subject: [PATCH 32/82] go-containerregistry: 0.20.2 -> 0.20.3 --- pkgs/by-name/go/go-containerregistry/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/go-containerregistry/package.nix b/pkgs/by-name/go/go-containerregistry/package.nix index 2b1a28f408ad4..bd307c577a148 100644 --- a/pkgs/by-name/go/go-containerregistry/package.nix +++ b/pkgs/by-name/go/go-containerregistry/package.nix @@ -14,13 +14,13 @@ in buildGoModule rec { pname = "go-containerregistry"; - version = "0.20.2"; + version = "0.20.3"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5f5zheFPSKmpUaVmcAfeZgFSDu3rvdtQh8mau9jdqz4="; + sha256 = "sha256-HiksVzVuY4uub7Lwfyh3GN8wpH2MgIjKSO4mQJZeNvs="; }; vendorHash = null; From 5d4e9568bc3d36434f1d7876ea79ae4561b41aa9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 02:03:57 +0000 Subject: [PATCH 33/82] vhs: 0.8.0 -> 0.9.0 --- pkgs/by-name/vh/vhs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/vh/vhs/package.nix b/pkgs/by-name/vh/vhs/package.nix index b68f95947b3b3..14729aa532b6b 100644 --- a/pkgs/by-name/vh/vhs/package.nix +++ b/pkgs/by-name/vh/vhs/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "vhs"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = pname; rev = "v${version}"; - hash = "sha256-kUsh+jy4dXYW1uAUfFv/HKBqIIyVogLKUYNjBhIKlls="; + hash = "sha256-ceY4zLd+4EwXpwunKiWnaAB25qutSK1b1SyIriAbAI0="; }; - vendorHash = "sha256-1UBhiRemJ+dQNm20+8pbOJus5abvTwVcuzxNMzrniN8="; + vendorHash = "sha256-2vRAI+Mm8Pzk3u4rndtwYnUlrAtjffe0kpoA1EHprQk="; nativeBuildInputs = [ installShellFiles From f7d7be581d44657b518e58effc14c9a6dede2b46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 02:47:58 +0000 Subject: [PATCH 34/82] kubecfg: 0.35.1 -> 0.35.2 --- pkgs/by-name/ku/kubecfg/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubecfg/package.nix b/pkgs/by-name/ku/kubecfg/package.nix index 9475af2ce9ed5..277433078cb9a 100644 --- a/pkgs/by-name/ku/kubecfg/package.nix +++ b/pkgs/by-name/ku/kubecfg/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.35.1"; + version = "0.35.2"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-5xs9iE6sfFzoTq24DTNKOj4D+A5ezBKN1lfIdJCt+pk="; + hash = "sha256-iCeeS6CVGEFrNqa0NvdV2AqViDQIfG02Hx8yOBO1Vsk="; }; - vendorHash = "sha256-K2IyljE5QS/SZ6EXV42q/a5ru+0UXZ69oLNi94XKxw4="; + vendorHash = "sha256-nAjm4AotRYZGRv05A+dviNq6Moo53Zo/bOiQf972ZF8="; ldflags = [ "-s" From c5a6e156e2869946502231a19b3e14217fa454d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 02:51:14 +0000 Subject: [PATCH 35/82] delly: 1.3.2 -> 1.3.3 --- pkgs/by-name/de/delly/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/delly/package.nix b/pkgs/by-name/de/delly/package.nix index 2bcb0954ad5fc..cb5f86e2ef25e 100644 --- a/pkgs/by-name/de/delly/package.nix +++ b/pkgs/by-name/de/delly/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "delly"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "dellytools"; repo = "delly"; rev = "v${finalAttrs.version}"; - hash = "sha256-nMMEQwsaRidv5MMbGF2s1wuRQX2COvWsJA67N8HiCZA="; + hash = "sha256-e1dGiJeOLMFJ9oO7iMvKZHpg4XtrLJBpy8lECx5/iDE="; }; postPatch = lib.optionalString stdenv.cc.isClang '' From 03035691fa33365e0882fd9fd507cf65148c8bfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 03:14:22 +0000 Subject: [PATCH 36/82] pinniped: 0.36.0 -> 0.37.0 --- pkgs/by-name/pi/pinniped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pinniped/package.nix b/pkgs/by-name/pi/pinniped/package.nix index 11db3267ce570..579b40897ad7b 100644 --- a/pkgs/by-name/pi/pinniped/package.nix +++ b/pkgs/by-name/pi/pinniped/package.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "pinniped"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-/jnqOSfrONoKFpyS4OHmgXgypA8bUSIsu7qf9EJIl4Q="; + sha256 = "sha256-8GMVJR3Rmn7z+EH6avbdSifcnEC6aH4eTEVacgyY1sE="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-L1QdMZ52rnOm2EcQkwdUIZ4SSizRhgRYSNqJ0TvRyjs="; + vendorHash = "sha256-aejhRVW5Y0qsVEQbOBi75iQP9uAMS4U0tktatzagwIo="; ldflags = [ "-s" From 924758a3f707fa4872d54c795df647ade4bc11f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 04:28:32 +0000 Subject: [PATCH 37/82] yamlscript: 0.1.87 -> 0.1.88 --- pkgs/by-name/ya/yamlscript/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index 0e7b6ff149584..2575060ee1314 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "yamlscript"; - version = "0.1.87"; + version = "0.1.88"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar"; - hash = "sha256-ItliRQzfVrtRdq5txxj2/JV3d7sHoO0m+ofO6cKrUZ4="; + hash = "sha256-yG6KcMyCq8HTJk+nY+zkHOrzsNbiUDW+9ms5ZA0pmz8="; }; executable = "ys"; From bc94115131e42fa2ce1a65fb7c0dd807de92eb0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 06:06:59 +0000 Subject: [PATCH 38/82] python312Packages.aw-client: 0.5.14 -> 0.5.15 --- pkgs/development/python-modules/aw-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aw-client/default.nix b/pkgs/development/python-modules/aw-client/default.nix index bec43cbf2dbef..13ab29480788f 100644 --- a/pkgs/development/python-modules/aw-client/default.nix +++ b/pkgs/development/python-modules/aw-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aw-client"; - version = "0.5.14"; + version = "0.5.15"; format = "pyproject"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ActivityWatch"; repo = "aw-client"; rev = "v${version}"; - sha256 = "sha256-HTyhQz/RaNdCtJIV6YHEd6Yhu9VRJ8E9XdN7NcoO8ao="; + sha256 = "sha256-AS29DIfEQ6/vh8idcMMQoGmiRM8MMf3eVQzvNPsXgpA="; }; disabled = pythonOlder "3.8"; From 0fec5918ba141bcb4489908257b75fa011d4c08a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 07:17:04 +0000 Subject: [PATCH 39/82] python312Packages.pyaprilaire: 0.7.7 -> 0.8.0 --- pkgs/development/python-modules/pyaprilaire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix index 4df4f7be73937..99f6fce28c0cd 100644 --- a/pkgs/development/python-modules/pyaprilaire/default.nix +++ b/pkgs/development/python-modules/pyaprilaire/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyaprilaire"; - version = "0.7.7"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "chamberlain2007"; repo = "pyaprilaire"; tag = version; - hash = "sha256-1cTbmpRB4PzjqCPmHULLVEs7r7IWxIglnHkXsLksp0I="; + hash = "sha256-W94NsL3hPIsi0WJ9EL4Z+IuoU9e0gZq3m+ntz+vShno="; }; build-system = [ setuptools ]; From 1e7ddefce308cdcc8af698e09ff901edac2fa26f Mon Sep 17 00:00:00 2001 From: misilelab Date: Thu, 16 Jan 2025 16:25:15 +0900 Subject: [PATCH 40/82] gitleaks: 8.23.0 -> 8.23.1 Signed-off-by: misilelab --- pkgs/by-name/gi/gitleaks/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index 6cd196123deff..1849d92aef0e2 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.23.0"; + version = "8.23.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-+9aZXjinvDYbPw+yjkQ/BH3LB0xbY1eual/zKoWMlJc="; + hash = "sha256-gz/2DwkvSY6vOKW1ttJcLjjtii0jWIdQC1/xzU5vCRA="; }; vendorHash = "sha256-hq3v//fhCUOvKPBZ/+YrLIc4nDLxR9Yc+MeIXY7TArA="; From 94044ee87fec8d3b62e2ed6385a9caf84718a194 Mon Sep 17 00:00:00 2001 From: Cryolitia PukNgae Date: Thu, 16 Jan 2025 15:27:53 +0800 Subject: [PATCH 41/82] maa-assistant-arknights: 5.10.2 -> 5.12.0-beta-1 Temporarily updated to beta version to fix build errors on gcc14. The next time it will be automatically switched back to the stable channel by the update script. I sign this commit both as the upstream committer and as the package's maintainer in nixpkgs. Upstream commit: https://github.com/MaaAssistantArknights/MaaAssistantArknights/commit/86d422087fd7a97b75519d3f21326c34bca06b4f Reported-by: https://hydra.nixos.org/build/282160825/nixlog/4 --- pkgs/by-name/ma/maa-assistant-arknights/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index af51ef299e24c..ea11daff98632 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.10.2", - "hash": "sha256-Qyhl6uZy70208j07vaWdwN5GGmX66kkOpA3Ny48PdtI=" + "version": "5.12.0-beta.1", + "hash": "sha256-ZiC6UCXsB+Czb+RAuvv3zENDxgaOKtNZQUEQuV86ggI=" }, "beta": { - "version": "5.11.0-beta.1", - "hash": "sha256-qpzbnfAd7P4f2jFgnCx7gTmZXYUUGreEHRY3/HGbZco=" + "version": "5.12.0-beta.1", + "hash": "sha256-ZiC6UCXsB+Czb+RAuvv3zENDxgaOKtNZQUEQuV86ggI=" } } From 7ac2597ee95e24acc852d8c4cacec97b1d95c9a1 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 15 Jan 2025 22:52:11 +0100 Subject: [PATCH 42/82] libhangul: fix cross build --- pkgs/by-name/li/libhangul/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/li/libhangul/package.nix b/pkgs/by-name/li/libhangul/package.nix index af66dc6c49979..f08e47b21d05d 100644 --- a/pkgs/by-name/li/libhangul/package.nix +++ b/pkgs/by-name/li/libhangul/package.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; }; + configureFlags = [ + # detection doesn't work for cross builds + "ac_cv_func_realloc_0_nonnull=yes" + ]; + meta = with lib; { description = "Core algorithm library for Korean input routines"; mainProgram = "hangul"; From 932ad13dc32dc23f1beaabf8c1365bb6263e04d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Jan 2025 09:37:35 +0100 Subject: [PATCH 43/82] python313Packages.tencentcloud-sdk-python: 3.0.1303 -> 3.0.1304 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1303...3.0.1304 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1304/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 2ca7a0559ce0d..57ab8522e78af 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1303"; + version = "3.0.1304"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-eXvdFvOiBpOwd7/7SpoOm1aWZmvE1517eJaiEdjFjTo="; + hash = "sha256-51tRvvavAYGa6XTyB6bL9a7TOZsv6DvVrFgrma5aJq8="; }; build-system = [ setuptools ]; From 4ea0d443c6523416e6e56f69d8d194f28ac3f422 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Jan 2025 09:41:40 +0100 Subject: [PATCH 44/82] cnspec: 11.36.2 -> 11.37.0 Diff: https://github.com/mondoohq/cnspec/compare/refs/tags/v11.36.2...v11.37.0 Changelog: https://github.com/mondoohq/cnspec/releases/tag/v11.37.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index 22320eef193b3..6929501267f06 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.36.2"; + version = "11.37.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-VwGD9qfz8WdUl6nxTw0SuA5sfahdt2eIaryfPbI4NY4="; + hash = "sha256-hecPYaQqDBieqNE+d9mMNGvFOwXLLC64aL0a7c2aCrE="; }; proxyVendor = true; - vendorHash = "sha256-Uivl9RzshS2FkdoGdVWKzLvch1d+JQxG1tcT83yU0hs="; + vendorHash = "sha256-aYEXtNRHU/QpDhlJSfKGmOhSXzEA70+CtPb/ICv+Fhw="; subPackages = [ "apps/cnspec" ]; From 021b5ba349a808b1ba6a8042e28e1c0e5e829906 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Wed, 15 Jan 2025 22:52:11 +0100 Subject: [PATCH 45/82] libskk: fix cross build This ensures the proper configureFlags are passed to autogen.sh --- pkgs/by-name/li/libskk/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/by-name/li/libskk/package.nix b/pkgs/by-name/li/libskk/package.nix index 6ef8dcbe86f31..236ffc1dc0255 100644 --- a/pkgs/by-name/li/libskk/package.nix +++ b/pkgs/by-name/li/libskk/package.nix @@ -55,9 +55,7 @@ stdenv.mkDerivation rec { json-glib ]; - preConfigure = '' - ./autogen.sh - ''; + configureScript = "./autogen.sh"; # link SKK-JISYO.L from skkdicts for the bundled tool `skk` preInstall = '' From 3e274af9706ef6a171ce632be2141f4a80901fdf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Jan 2025 09:47:29 +0100 Subject: [PATCH 46/82] python313Packages.caio: 0.9.17 -> 0.9.21 Diff: https://github.com/mosquito/caio/compare/refs/tags/0.9.17...0.9.21 Changelog: https://github.com/mosquito/caio/releases/tag/0.9.21 --- pkgs/development/python-modules/caio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/caio/default.nix b/pkgs/development/python-modules/caio/default.nix index 6b98481247177..afe44020b9ce4 100644 --- a/pkgs/development/python-modules/caio/default.nix +++ b/pkgs/development/python-modules/caio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "caio"; - version = "0.9.17"; + version = "0.9.21"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = "caio"; tag = version; - hash = "sha256-aTJ02dCLb3CsT6KmJxkmOzwtg5nuXeBwz+mT7ZTTU9o="; + hash = "sha256-WP4LfC0VCpR5HiMmxPSeZbcCbTbSpmwEjEGdDptuOQY="; }; build-system = [ setuptools ]; From c0a8c8aaa60c3b5a789bc7f973b051cfe308d703 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Jan 2025 10:16:40 +0100 Subject: [PATCH 47/82] python312Packages.pyaprilaire: fix description --- pkgs/development/python-modules/pyaprilaire/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyaprilaire/default.nix b/pkgs/development/python-modules/pyaprilaire/default.nix index 99f6fce28c0cd..ed0892acf1f4a 100644 --- a/pkgs/development/python-modules/pyaprilaire/default.nix +++ b/pkgs/development/python-modules/pyaprilaire/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { changelog = "https://github.com/chamberlain2007/pyaprilaire/releases/tag/${version}"; - description = "Python library for interacting with Aprilaire thermostats."; + description = "Python library for interacting with Aprilaire thermostats"; homepage = "https://github.com/chamberlain2007/pyaprilaire"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pyrox0 ]; From 2ed93509653648922d2ead0c5cc340f371fa8af5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Jan 2025 10:20:15 +0100 Subject: [PATCH 48/82] python312Packages.aw-client: refactor --- .../python-modules/aw-client/default.nix | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/aw-client/default.nix b/pkgs/development/python-modules/aw-client/default.nix index 13ab29480788f..e0fa37d3e20a1 100644 --- a/pkgs/development/python-modules/aw-client/default.nix +++ b/pkgs/development/python-modules/aw-client/default.nix @@ -11,28 +11,25 @@ tabulate, typing-extensions, pytestCheckHook, - gitUpdater, }: buildPythonPackage rec { pname = "aw-client"; version = "0.5.15"; + pyproject = true; - format = "pyproject"; + disabled = pythonOlder "3.8"; - # pypi distribution doesn't include tests, so build from source instead src = fetchFromGitHub { owner = "ActivityWatch"; repo = "aw-client"; - rev = "v${version}"; - sha256 = "sha256-AS29DIfEQ6/vh8idcMMQoGmiRM8MMf3eVQzvNPsXgpA="; + tag = "v${version}"; + hash = "sha256-AS29DIfEQ6/vh8idcMMQoGmiRM8MMf3eVQzvNPsXgpA="; }; - disabled = pythonOlder "3.8"; - - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aw-core requests persist-queue @@ -54,13 +51,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "aw_client" ]; - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; - meta = with lib; { description = "Client library for ActivityWatch"; - mainProgram = "aw-client"; homepage = "https://github.com/ActivityWatch/aw-client"; - maintainers = with maintainers; [ huantian ]; + changelog = "https://github.com/ActivityWatch/aw-client/releases/tag/v${version}"; license = licenses.mpl20; + maintainers = with maintainers; [ huantian ]; + mainProgram = "aw-client"; }; } From 6184410b2e9e17103388214e0b3e4371ad559fe9 Mon Sep 17 00:00:00 2001 From: Pau Kailfer Date: Mon, 25 Nov 2024 15:23:14 +0100 Subject: [PATCH 49/82] maintainers: add paukaifler --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ddc939565bc7d..6c73bc2e6fa62 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17521,6 +17521,12 @@ githubId = 25278658; name = "Patrick Widmer"; }; + paukaifler = { + email = "pau@kaifler.me"; + github = "PauKaifler"; + githubId = 81905706; + name = "Pau Kaifler"; + }; paulsmith = { email = "paulsmith@pobox.com"; github = "paulsmith"; From 0e80b9af0ff2a3ef3d02e575dd4b6a02eb6abc68 Mon Sep 17 00:00:00 2001 From: Pau Kailfer Date: Mon, 25 Nov 2024 15:23:14 +0100 Subject: [PATCH 50/82] typespec: init at 0.64.0 --- pkgs/by-name/ty/typespec/package.nix | 105 +++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 pkgs/by-name/ty/typespec/package.nix diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix new file mode 100644 index 0000000000000..6ab5ac96ddd71 --- /dev/null +++ b/pkgs/by-name/ty/typespec/package.nix @@ -0,0 +1,105 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + makeWrapper, + nix-update-script, + nodejs, + pnpm_9, + testers, +}: + +let + workspace = "compiler..."; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "typespec"; + version = "0.64.0"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "typespec"; + tag = "typespec@${finalAttrs.version}"; + hash = "sha256-zZTZdnmRTjhnoz/5JHnn4h/YlMpXF/I7o1mDeiRVPUA="; + }; + + nativeBuildInputs = [ + makeWrapper + nodejs + pnpm_9.configHook + ]; + + pnpmWorkspaces = [ workspace ]; + pnpmDeps = pnpm_9.fetchDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + hash = "sha256-W8m6ibiy9Okga0qWpZWDYklXAwpHwk85Q6UTaFJhDrU="; + }; + + postPatch = '' + # `fetchFromGitHub` doesn't clone via git and thus installing would otherwise fail. + substituteInPlace packages/compiler/scripts/generate-manifest.js \ + --replace-fail 'execSync("git rev-parse HEAD").toString().trim()' '"${finalAttrs.src.rev}"' + ''; + + buildPhase = '' + runHook preBuild + + pnpm -r --filter ${workspace} build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" "$out/lib/typespec/packages/compiler" + cp -r --parents \ + node_modules \ + package.json \ + packages/compiler/cmd \ + packages/compiler/dist \ + packages/compiler/entrypoints \ + packages/compiler/lib \ + packages/compiler/node_modules \ + packages/compiler/templates \ + packages/compiler/package.json \ + "$out/lib/typespec" + + makeWrapper "${lib.getExe nodejs}" "$out/bin/tsp" \ + --add-flags "$out/lib/typespec/packages/compiler/cmd/tsp.js" + makeWrapper "${lib.getExe nodejs}" "$out/bin/tsp-server" \ + --add-flags "$out/lib/typespec/packages/compiler/cmd/tsp-server.js" + + runHook postInstall + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + + passthru.updateScript = nix-update-script { + extraArgs = [ ''--version-regex=typespec@(\d+\.\d+\.\d+)'' ]; + }; + + meta = { + description = "Language for defining cloud service APIs and shapes"; + longDescription = '' + TypeSpec is a highly extensible language with primitives that can describe + API shapes common among REST, OpenAPI, gRPC, and other protocols. + + TypeSpec is excellent for generating many different API description + formats, client and service code, documentation, and many other assets. + All this while keeping your TypeSpec definition as a single source of truth. + ''; + homepage = "https://typespec.io/"; + changelog = "https://github.com/microsoft/typespec/releases/tag/typespec@${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ paukaifler ]; + mainProgram = "tsp"; + }; +}) From a84c233e15b9ce4af773b9320c63d41735046d0a Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Thu, 16 Jan 2025 18:27:08 +0800 Subject: [PATCH 51/82] arkenfox-userjs: 128.0 -> 133.0 --- pkgs/by-name/ar/arkenfox-userjs/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arkenfox-userjs/package.nix b/pkgs/by-name/ar/arkenfox-userjs/package.nix index d60b82110dc83..3e3f9795ecddc 100644 --- a/pkgs/by-name/ar/arkenfox-userjs/package.nix +++ b/pkgs/by-name/ar/arkenfox-userjs/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "arkenfox-userjs"; - version = "128.0"; + version = "133.0"; src = fetchurl { url = "https://raw.githubusercontent.com/arkenfox/user.js/${finalAttrs.version}/user.js"; - hash = "sha256-CJk9sni0+cYC9rBHSL2mDQRtpsQJobQ1u3tq991Oi1c="; + hash = "sha256-rPcH24YqEBOzoPB9yxMlke/3tqpi9L7GVMsZ3MUP8WY="; }; dontUnpack = true; From 9ca9394a64f76ec0eedb37ba20407a6e78afe23d Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Tue, 10 Dec 2024 22:06:35 +0200 Subject: [PATCH 52/82] gradle: reformat default.nix --- .../tools/build-managers/gradle/default.nix | 313 ++++++++++-------- 1 file changed, 178 insertions(+), 135 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index dbe40de5183ef..8245da6875d37 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,9 +1,15 @@ -{ jdk11, jdk17, jdk21 }: +{ + jdk11, + jdk17, + jdk21, +}: rec { gen = - { version, hash, + { + version, + hash, # The default JDK/JRE that will be used for derived Gradle packages. # A current LTS version of a JDK is a good choice. @@ -27,28 +33,29 @@ rec { # Extra attributes to be merged into the resulting derivation's # meta attribute. - meta ? {} + meta ? { }, }: - { lib - , stdenv - , fetchurl - , makeWrapper - , unzip - , ncurses5 - , ncurses6 - , udev - , testers - , runCommand - , writeText - , autoPatchelfHook - - # The JDK/JRE used for running Gradle. - , java ? defaultJava - - # Additional JDK/JREs to be registered as toolchains. - # See https://docs.gradle.org/current/userguide/toolchains.html - , javaToolchains ? [ ] + { + lib, + stdenv, + fetchurl, + makeWrapper, + unzip, + ncurses5, + ncurses6, + udev, + testers, + runCommand, + writeText, + autoPatchelfHook, + + # The JDK/JRE used for running Gradle. + java ? defaultJava, + + # Additional JDK/JREs to be registered as toolchains. + # See https://docs.gradle.org/current/userguide/toolchains.html + javaToolchains ? [ ], }: stdenv.mkDerivation (finalAttrs: { @@ -57,18 +64,19 @@ rec { src = fetchurl { inherit hash; - url = - "https://services.gradle.org/distributions/gradle-${version}-bin.zip"; + url = "https://services.gradle.org/distributions/gradle-${version}-bin.zip"; }; dontBuild = true; - nativeBuildInputs = [ - makeWrapper - unzip - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - autoPatchelfHook - ]; + nativeBuildInputs = + [ + makeWrapper + unzip + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ]; buildInputs = [ java @@ -80,20 +88,21 @@ rec { # We only need to patchelf some libs embedded in JARs. dontAutoPatchelf = true; - installPhase = with builtins; + installPhase = + with builtins; let toolchain = rec { prefix = x: "JAVA_TOOLCHAIN_NIX_${toString x}"; - varDefs = (lib.imap0 (i: x: "${prefix i} ${x}") javaToolchains); + varDefs = (lib.imap0 (i: x: "${prefix i} ${x}") javaToolchains); varNames = lib.imap0 (i: x: prefix i) javaToolchains; - property = " -Porg.gradle.java.installations.fromEnv='${ - concatStringsSep "," varNames - }'"; + property = " -Porg.gradle.java.installations.fromEnv='${concatStringsSep "," varNames}'"; }; - varDefs = concatStringsSep "\n" (map (x: " --set ${x} \\") - ([ "JAVA_HOME ${java}" ] ++ toolchain.varDefs)); + varDefs = concatStringsSep "\n" ( + map (x: " --set ${x} \\") ([ "JAVA_HOME ${java}" ] ++ toolchain.varDefs) + ); jnaLibraryPath = lib.makeLibraryPath [ udev ]; - in '' + in + '' mkdir -pv $out/lib/gradle/ cp -rv lib/ $out/lib/gradle/ @@ -107,33 +116,42 @@ rec { dontFixup = !stdenv.hostPlatform.isLinux; - fixupPhase = let arch = if stdenv.hostPlatform.is64bit then "amd64" else "i386"; - in '' - . ${./patching.sh} + fixupPhase = + let + arch = if stdenv.hostPlatform.is64bit then "amd64" else "i386"; + in + '' + . ${./patching.sh} + + nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)" + for variant in "" "-ncurses5" "-ncurses6"; do + autoPatchelfInJar \ + $out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \ + "${lib.getLib stdenv.cc.cc}/lib64:${ + lib.makeLibraryPath [ + stdenv.cc.cc + ncurses5 + ncurses6 + ] + }" + done - nativeVersion="$(extractVersion native-platform $out/lib/gradle/lib/native-platform-*.jar)" - for variant in "" "-ncurses5" "-ncurses6"; do + # The file-events library _seems_ to follow the native-platform version, but + # we won’t assume that. + fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" autoPatchelfInJar \ - $out/lib/gradle/lib/native-platform-linux-${arch}$variant-''${nativeVersion}.jar \ - "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ncurses5 ncurses6 ]}" - done - - # The file-events library _seems_ to follow the native-platform version, but - # we won’t assume that. - fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" - autoPatchelfInJar \ - $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ - "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" - - # The scanner doesn't pick up the runtime dependency in the jar. - # Manually add a reference where it will be found. - mkdir $out/nix-support - echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies - # Gradle will refuse to start without _both_ 5 and 6 versions of ncurses. - echo ${ncurses5} >> $out/nix-support/manual-runtime-dependencies - echo ${ncurses6} >> $out/nix-support/manual-runtime-dependencies - echo ${udev} >> $out/nix-support/manual-runtime-dependencies - ''; + $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ + "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" + + # The scanner doesn't pick up the runtime dependency in the jar. + # Manually add a reference where it will be found. + mkdir $out/nix-support + echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies + # Gradle will refuse to start without _both_ 5 and 6 versions of ncurses. + echo ${ncurses5} >> $out/nix-support/manual-runtime-dependencies + echo ${ncurses6} >> $out/nix-support/manual-runtime-dependencies + echo ${udev} >> $out/nix-support/manual-runtime-dependencies + ''; passthru.tests = { version = testers.testVersion { @@ -147,40 +165,53 @@ rec { java-application = testers.testEqualContents { assertion = "can build and run a trivial Java application"; expected = writeText "expected" "hello\n"; - actual = runCommand "actual" { - nativeBuildInputs = [ finalAttrs.finalPackage ]; - src = ./tests/java-application; - } '' - cp -a $src/* . - env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ - gradle run --no-daemon --quiet --console plain > $out - ''; + actual = + runCommand "actual" + { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + src = ./tests/java-application; + } + '' + cp -a $src/* . + env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ + gradle run --no-daemon --quiet --console plain > $out + ''; }; }; passthru.jdk = defaultJava; - meta = with lib; { - inherit platforms; - description = "Enterprise-grade build system"; - longDescription = '' - Gradle is a build system which offers you ease, power and freedom. - You can choose the balance for yourself. It has powerful multi-project - build support. It has a layer on top of Ivy that provides a - build-by-convention integration for Ivy. It gives you always the choice - between the flexibility of Ant and the convenience of a - build-by-convention behavior. - ''; - homepage = "https://www.gradle.org/"; - changelog = "https://docs.gradle.org/${version}/release-notes.html"; - downloadPage = "https://gradle.org/next-steps/?version=${version}"; - sourceProvenance = with sourceTypes; [ - binaryBytecode - binaryNativeCode - ]; - license = licenses.asl20; - maintainers = with maintainers; [ britter liff lorenzleutgeb ] ++ lib.teams.java.members; - mainProgram = "gradle"; - } // meta; + meta = + with lib; + { + inherit platforms; + description = "Enterprise-grade build system"; + longDescription = '' + Gradle is a build system which offers you ease, power and freedom. + You can choose the balance for yourself. It has powerful multi-project + build support. It has a layer on top of Ivy that provides a + build-by-convention integration for Ivy. It gives you always the choice + between the flexibility of Ant and the convenience of a + build-by-convention behavior. + ''; + homepage = "https://www.gradle.org/"; + changelog = "https://docs.gradle.org/${version}/release-notes.html"; + downloadPage = "https://gradle.org/next-steps/?version=${version}"; + sourceProvenance = with sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = licenses.asl20; + maintainers = + with maintainers; + [ + britter + liff + lorenzleutgeb + ] + ++ lib.teams.java.members; + mainProgram = "gradle"; + } + // meta; }); # NOTE: Default JDKs that are hardcoded below must be LTS versions @@ -199,49 +230,61 @@ rec { defaultJava = jdk17; }; - wrapGradle = { - lib, callPackage, mitm-cache, substituteAll, symlinkJoin, concatTextFile, makeSetupHook, nix-update-script + wrapGradle = + { + lib, + callPackage, + mitm-cache, + substituteAll, + symlinkJoin, + concatTextFile, + makeSetupHook, + nix-update-script, }: - gradle-unwrapped: - updateAttrPath: - 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 - ]; + gradle-unwrapped: updateAttrPath: + lib.makeOverridable ( + args: + let + gradle = gradle-unwrapped.override args; + in + symlinkJoin { + name = "gradle-${gradle.version}"; - passthru = { - fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; }; - inherit (gradle) jdk tests; - unwrapped = gradle; - } // lib.optionalAttrs (updateAttrPath != null) { - updateScript = nix-update-script { - attrPath = updateAttrPath; - extraArgs = [ "--url=https://github.com/gradle/gradle" ]; - }; - }; + 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 + ]; - 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 lib.meta.defaultPriority) + 1; - }; - }) { }; + passthru = + { + fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; }; + inherit (gradle) jdk tests; + unwrapped = gradle; + } + // lib.optionalAttrs (updateAttrPath != null) { + updateScript = nix-update-script { + attrPath = updateAttrPath; + extraArgs = [ "--url=https://github.com/gradle/gradle" ]; + }; + }; + + 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 lib.meta.defaultPriority) + 1; + }; + } + ) { }; } From 6082098609b0c9ef65939c5e64523043a69a7947 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Fri, 15 Nov 2024 10:51:05 +0200 Subject: [PATCH 53/82] gradle: remove old update script --- .../tools/build-managers/gradle/update.sh | 55 ------------------- 1 file changed, 55 deletions(-) delete mode 100755 pkgs/development/tools/build-managers/gradle/update.sh diff --git a/pkgs/development/tools/build-managers/gradle/update.sh b/pkgs/development/tools/build-managers/gradle/update.sh deleted file mode 100755 index 4e247954f0289..0000000000000 --- a/pkgs/development/tools/build-managers/gradle/update.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix-prefetch curl jq - -# Generates Gradle release specs from GitHub Releases. -# -# As of 2021-11, this script has very poor error handling, -# it is expected to be run by maintainers as one-off job -# only. -# -# NOTE: The earliest Gradle release that has a -# corresponding entry as GitHub Release is 6.8-rc-1. - -for v in $(curl -s "https://api.github.com/repos/gradle/gradle/releases" | jq -r '.[].tag_name' | sort -n -r) -do - # Tag names and download filenames are not the same, - # we modify the tag name slightly to translate it - # to the naming scheme of download filenames. - # This translation assumes a tag naming scheme. - # As of 2021-11 it works from 6.8-rc-1 to 7.3-rc-3. - - # Remove first letter (assumed to be "v"). - v=${v:1} - - # To lower case. - v=${v,,} - - # Add dash after "rc". - v=${v/-rc/-rc-} - - # Remove trailing ".0" - v=${v%.0} - - # Remove trailing ".0" for release candidates. - v=${v/.0-rc/-rc} - - f="gradle-${v}-spec.nix" - - if [[ -n "$1" && "$1" != "$v" ]] - then - echo "$v SKIP (nomatch)" - continue - elif [ "$1" == "" ] && [ -f "$f" ] - then - echo "$v SKIP (exists)" - continue - fi - - url="https://services.gradle.org/distributions/gradle-${v}-bin.zip" - read -d "\n" gradle_hash gradle_path < <(nix-prefetch-url --print-path $url) - gradle_hash=$(nix-hash --to-sri --type sha256 "$gradle_hash") - - echo -e "{\\n version = \"$v\";\\n sha256 = \"$gradle_hash\";\\n}" > $f - - echo "$v DONE" -done From 29503f955b8e94ce97824a20192484eb10e6f1ff Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Fri, 15 Nov 2024 10:48:24 +0200 Subject: [PATCH 54/82] gradle: handle updates to .0 versions --- pkgs/development/tools/build-managers/gradle/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 8245da6875d37..4d5bd1870e8d1 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -276,7 +276,13 @@ rec { // lib.optionalAttrs (updateAttrPath != null) { updateScript = nix-update-script { attrPath = updateAttrPath; - extraArgs = [ "--url=https://github.com/gradle/gradle" ]; + extraArgs = [ + "--url=https://github.com/gradle/gradle" + # Gradle’s .0 releases are tagged as `vX.Y.0`, but the actual + # release version omits the `.0`, so we’ll wanto to only capture + # the version up but not including the the trailing `.0`. + "--version-regex=^v(\\d+\\.\\d+(?:\\.[1-9]\\d?)?)(\\.0)?$" + ]; }; }; From 779b6255fd6e477290b9bd3e3956bfe79d60d7a9 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 13 Dec 2024 16:31:05 +0530 Subject: [PATCH 55/82] gradle: remove unused jdk11 argument --- pkgs/development/tools/build-managers/gradle/default.nix | 1 - pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 4d5bd1870e8d1..f6835cf6f3582 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,5 +1,4 @@ { - jdk11, jdk17, jdk21, }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 886f3fee91b2c..bfba51b7cd31b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7996,7 +7996,7 @@ with pkgs; gnumake = callPackage ../development/tools/build-managers/gnumake { }; gradle-packages = import ../development/tools/build-managers/gradle { - inherit jdk11 jdk17 jdk21; + inherit jdk17 jdk21; }; gradleGen = gradle-packages.gen; wrapGradle = callPackage gradle-packages.wrapGradle { }; From cd6a44e1b73455c5abe91482e57e10609853c904 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 13 Dec 2024 16:36:44 +0530 Subject: [PATCH 56/82] gradle: add support for the new file-events library format --- .../tools/build-managers/gradle/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f6835cf6f3582..f89e386e74129 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -118,6 +118,7 @@ rec { fixupPhase = let arch = if stdenv.hostPlatform.is64bit then "amd64" else "i386"; + newFileEvents = toString (lib.versionAtLeast version "8.12"); in '' . ${./patching.sh} @@ -137,10 +138,17 @@ rec { # The file-events library _seems_ to follow the native-platform version, but # we won’t assume that. - fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" - autoPatchelfInJar \ - $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ - "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" + if [ -n "${newFileEvents}" ]; then + fileEventsVersion="$(extractVersion gradle-fileevents $out/lib/gradle/lib/gradle-fileevents-*.jar)" + autoPatchelfInJar \ + $out/lib/gradle/lib/gradle-fileevents-''${fileEventsVersion}.jar \ + "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" + else + fileEventsVersion="$(extractVersion file-events $out/lib/gradle/lib/file-events-*.jar)" + autoPatchelfInJar \ + $out/lib/gradle/lib/file-events-linux-${arch}-''${fileEventsVersion}.jar \ + "${lib.getLib stdenv.cc.cc}/lib64:${lib.makeLibraryPath [ stdenv.cc.cc ]}" + fi # The scanner doesn't pick up the runtime dependency in the jar. # Manually add a reference where it will be found. From a3b161e1f6aef25df3ae51a5f9eee8fc338fd011 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Fri, 15 Nov 2024 10:48:47 +0200 Subject: [PATCH 57/82] gradle: 8.10.2 -> 8.12 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index f89e386e74129..ea87dd8e7a3f4 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -226,8 +226,8 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.10.2"; - hash = "sha256-McVXE+QCM6gwOCfOtCykikcmegrUurkXcSMSHnFSTCY="; + version = "8.12"; + hash = "sha256-egDVH7kxR4Gaq3YCT+7OILa4TkIGlBAfJ2vpUuCL7wM="; defaultJava = jdk21; }; From eb43df3e281f05d50107e5771a3b1ddc47bb62e6 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 17 Nov 2024 16:43:03 +0200 Subject: [PATCH 58/82] jadx: update gradle plugin dependencies --- pkgs/by-name/ja/jadx/deps.json | 247 ++++++++++++++++++--------------- 1 file changed, 133 insertions(+), 114 deletions(-) diff --git a/pkgs/by-name/ja/jadx/deps.json b/pkgs/by-name/ja/jadx/deps.json index f91f061ccc9a4..d4c912cc84e73 100644 --- a/pkgs/by-name/ja/jadx/deps.json +++ b/pkgs/by-name/ja/jadx/deps.json @@ -97,6 +97,13 @@ "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" }, + "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=" @@ -248,13 +255,13 @@ "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/4.5.0": { - "jar": "sha256-Ga92VnnptJN0uyg6xE81O4EJrZz+ZmjO1tmmZFVA4vo=", - "module": "sha256-G2X3c4EI7gxE5qUNjMJUpPHFpzmAtuh7D14uxMt6qDY=", - "pom": "sha256-D4Du3/O101e+rs5h8enK1Le/b4EVrWRIfYp2x/GwDBw=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.1.2": { + "jar": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=", + "module": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=", + "pom": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/4.5.0": { - "pom": "sha256-WPAIDJzwTgVq1U0Ok91KI0KGXnihMR6TVAVk90wgDjc=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2": { + "pom": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" }, "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", @@ -272,109 +279,117 @@ "jar": "sha256-Yf12SPkx/06b2/9JvwmHcFdj+7qce7ALJkgRo20RGsE=", "pom": "sha256-0+vFk7FzrT4tHiVgtpwzFKRpDI2jJ0ch6DqWrtwWEaA=" }, - "org/jetbrains/kotlin#kotlin-android-extensions/1.9.24": { - "jar": "sha256-4z5UUlSR0ZgdRODKmnxTIWh91QRDPsVJZhqb5UYKEW4=", - "pom": "sha256-6QmjYHLn/lbQULgKdXEDwdP4dz+2wb0GcrxKr7hRCEs=" + "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=", + "pom": "sha256-rIU9chaJ+vEV8RiBCjU2/CcvE1to0CdFOqpW6eY79wc=" + }, + "org/jetbrains/kotlin#kotlin-assignment/2.0.21": { + "module": "sha256-8638yrZURNtqqzwNfSVoZG7AyS8kWCh/KLKu5POXNtw=", + "pom": "sha256-QBfCQqfb3Oca6ApXB7S/OyOoIr8jpodahFp7UTYhzQ8=" }, - "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/1.9.24": { - "jar": "sha256-AoVjJSRkxIYBkX8rbFTRuOQhzcfya/L5zzCIlcgSSgY=", - "pom": "sha256-Hzfc9EhcI3qtLk70O40RQJleMTKduiTJ9qa3uEBrg9Q=" + "org/jetbrains/kotlin#kotlin-assignment/2.0.21/gradle85": { + "jar": "sha256-USUeNCELiNTJCAXKZS6Xe93IR4OkVAY5ydIQkJhbrOY=" }, - "org/jetbrains/kotlin#kotlin-assignment/1.9.24": { - "module": "sha256-qa+tevGbZXAv892pBdPJt/mem9rqadY1+s2f3mi7VQU=", - "pom": "sha256-U5l+9NCcNhmm32TaPftTdngenYSMck+DLIDPCoCjLA8=" + "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { + "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", + "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" }, - "org/jetbrains/kotlin#kotlin-assignment/1.9.24/gradle82": { - "jar": "sha256-897/fRYVZp9m+jeTnLZJBOex+LBgNReZDH8IEs40oNs=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { + "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", + "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" }, "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.23": { "jar": "sha256-gvhH4lRXtGSDfv7x2oUC7JJTLedAbnkgUWbODs9PxSE=", "pom": "sha256-CWkjtiXJfGZzZ5ZsxM6Sv5TE6f98U8sdOEhgEax1DVg=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.24": { - "jar": "sha256-ZUX99qL/t4jN3O3KymMiOdx+XmHD90SCNzXjse2cG1Q=", - "pom": "sha256-efIYZmDsHYeQhu4jEEeY2M1PthcsJ5xeVuAsqeVbxHU=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { + "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", + "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" }, "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.23": { "jar": "sha256-zJQGSXS/nr9ZlF4xIXzy0WoM66rySH6wdI/By9F4eUM=", "pom": "sha256-WLI81NgtWqkWpcnMmbMhjuxVaWBoova3C+3fbDaR/RU=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.24": { - "jar": "sha256-5x/xnmsUGrhakyj9AQlBUxowJUMCa9QkTJWtwgjVAfY=", - "pom": "sha256-1w0fiFkkQ/R1eVFUVqTWwxBRztoK0RRGkjrK/kwMldE=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" }, "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.23": { "jar": "sha256-yFlaPhcRx0U8f5YKrxKhcNtL2j1vy6Sf/I4yy/0ADKE=", "pom": "sha256-KebjEpGbdf6aOHjflRHPQhDcJuWTQcsu4iSDt7Tgcv4=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.24": { - "jar": "sha256-g4Q5dMH/0NNmbTxkk0Hb/TB32eFAZlVKakR7laMB3S0=", - "pom": "sha256-wb508udfB+SamqaJA+DctogA0iRkBBi0hHfuQsvDWQQ=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" }, "org/jetbrains/kotlin#kotlin-daemon-client/1.9.23": { "jar": "sha256-5jFUJUkZ/XBv6ZN8SNuTfqkGimMfht5lWlFLwWIPmI0=", "pom": "sha256-X70GastuQIU5gCdsaDUWmSj2Zqt8RlEsJvJMnQMIF9M=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/1.9.24": { - "jar": "sha256-WIqveo7Y55uL8+qLknj/Enii1ZKFpF4Jjxz8v7Dc080=", - "pom": "sha256-tv4ne9GuP/zAzriOxmZZmHpc0TeaiXaDEvXe3x8uH+U=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" }, "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.23": { "jar": "sha256-bztmG5gmetJOL4+3rV0Gvn0u1hpdBcJn9OTKp433g9k=", "pom": "sha256-WFRgOL5Go4NmOFPRMd12xPsnQ4MLqXt0sno1zxAtPQI=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.24": { - "jar": "sha256-F3vIsqQHbcznh4rQ2P0HFjrzF44/qQ7mPU9zO7R7/ck=", - "pom": "sha256-T7V/xqxyCVGzIkd0s7sqVFSelj0vTf3GhB6Ex77WKrE=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/1.9.23": { "jar": "sha256-HaitBgpbw4KwTxVycdPNrWgwcUovTfSvfEAIjUuSIWQ=", "pom": "sha256-69aRc06Qr9Wj6PoqkTrw+Q6YL4a6IYWhcDIqGwiQpgU=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/1.9.24": { - "jar": "sha256-syBxajMCclSau65oGoD14P5YBLo5TQ8kW1s3f6JWNVk=", - "pom": "sha256-fHb3hHzJ5bWOGoJbbqAZV7QoHpHmzXBcFmy+afvDtYs=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { + "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", + "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.23": { "jar": "sha256-WTzAhC1fwJe5XgpgK/+Mekifc3Q7hzywuO7JL86KQVs=", "module": "sha256-zmi7IanW8gt7DnKf4y+aVHu2SyXjEPD14vcMUJ1n7cQ=", "pom": "sha256-WMjnhsjGUvTpgqQlh5FZTL4L+JKiaGCVTKa1Ue7mN+8=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.24": { - "jar": "sha256-LV53JHoKf1klIL64gx6OPrl0m/OIhfgv+9Y8f/BRPhI=", - "module": "sha256-kB+s0LsPLdJ9XzvJDkQvJ3OrEuHOcgnT78HlhWNsfWQ=", - "pom": "sha256-r9FlfZ0Vx2BxZ1InnZEdG73PjfTPXZYEUGHjCunBMX4=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", + "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", + "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.24/gradle82": { - "jar": "sha256-LV53JHoKf1klIL64gx6OPrl0m/OIhfgv+9Y8f/BRPhI=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.9.23": { "jar": "sha256-i7/a0U08PFCzK/a/4PHHAnvlQoXEba95gnz5O1y0PX8=", "pom": "sha256-x0cp9NYFkAEhZptBEO1FuvVeB1q1O2OmQrkLOv95NCI=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.9.24": { - "jar": "sha256-hR4BJ+5ixRDpf4UB6Q/V6yTQ15bHCcv5SvM5R0Fre/4=", - "pom": "sha256-3gafD+sze0Nbc/GdKaISONBW5oegumvivczlmvqSa7Y=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { + "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", + "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.9.23": { "jar": "sha256-jRr4djLZUUjxIqn6CuKQPBnub6t9AeAX924NLJoCLCA=", "module": "sha256-G+uiuitRE94FM+UV4X9W1TZOm1QiX/MftNj+yfcV2Cw=", "pom": "sha256-KemtQ1rc9Q/ljTiQ65lePyuNdQEZqaEsIfwwo2DNCOA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.9.24": { - "jar": "sha256-jRr4djLZUUjxIqn6CuKQPBnub6t9AeAX924NLJoCLCA=", - "module": "sha256-4Jx9wdImjqtl5EGtLjgWDzGHsNjAv5zxrUyF+nUjm6Q=", - "pom": "sha256-aTnfzQ6JgI3AA25alaOPcb+EKF53bpEFIdVWJnp8sMc=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { + "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", + "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", + "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.9.23": { "jar": "sha256-Pljfrl5D/Ig2X1LfOjRCCMAQDJdacqlKLEoJ9mHTIxc=", "module": "sha256-Evmlol5YCDEXnl2jBJoBMRi9B2zeCkUuZo8qsWCaz70=", "pom": "sha256-sh8qITWUXCtLatLIi+Dnl1WH9HVgiTnn23sG2CfQNXg=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.9.24": { - "jar": "sha256-VbEQENUcmcMXybbvXpVJrUhXEhjN5hvYRIGMti0aPxk=", - "module": "sha256-cQXlShB2dqp9KAzFqUl0QX4qO1cD1w3WH8yr6wccSug=", - "pom": "sha256-rquP4uqM+lwumZi1/nU4MaeYfCx4Q6U1MjYqB/pvABg=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { + "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", + "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", + "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.23": { "module": "sha256-YL2BUHBNWByO6tTBlAh26LAor+ixS0lAEMUJIEclRKc=", @@ -383,103 +398,99 @@ "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.23/gradle82": { "jar": "sha256-vMdKB8ad0RyUsmCx7ophiWlinMrqwubqCnedo8P37D8=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.24": { - "module": "sha256-txNZQoRrVH+xtZaGQXBGPC81+hW1qtkzX60P/YamE3s=", - "pom": "sha256-ilwTAHAhV//cHyV1hDZZbsVsM3Z8GqLouOskamWs9SM=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { + "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", + "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.24/gradle82": { - "jar": "sha256-6K7ZqBLmU2zu+z7VaPE0ZPoF8ka/0TaTONZDyDKUAks=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" }, "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/1.9.23": { "module": "sha256-1yNF4lW/IKOperXQEIa2CMXX0M8/Z3inHoXKy61BQlo=", "pom": "sha256-2Ive7tm5RMrHGM3PKUD4FdgiXuzNIb7KB93QgfDSQow=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/1.9.24": { - "module": "sha256-BEh8cNHIzCkBwDdNgarX+k/Rp5NeJa200LH69WkKzNs=", - "pom": "sha256-wqVTvkQFNLjTMOV69hNjc1WLXgIPppzPsDsuWDx1nAA=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { + "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", + "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" }, "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.9.23": { "jar": "sha256-XfEWTbHDRdhtChqkFJCeNnr7l4L+P7yvDir3qL9iuDk=", "pom": "sha256-sSWp19ccGThHr5KiJxxlUbPSl1VFSxyF03SySudVwz4=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.9.24": { - "jar": "sha256-U791bL22Uj3LTA16syrLZBR5bBz0nOQxvkC3DMV9tUk=", - "pom": "sha256-6pO4z4DdKXdKf7GEeclxH7uWPqhqwjq2FOepQAUsZ34=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { + "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", + "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" }, "org/jetbrains/kotlin#kotlin-native-utils/1.9.23": { "jar": "sha256-X9AUhb1z5he+VWv/SZL/ASquufDZwAhPN8tdiKO8rYQ=", "pom": "sha256-eCaL6luL9QqV7nYxKuNjzAvWqt1d9HQwrBNaIG7467Y=" }, - "org/jetbrains/kotlin#kotlin-native-utils/1.9.24": { - "jar": "sha256-I1WvMJo7FgeymmF02Fe05umxs2EH1sHvu8PMSbpDRQw=", - "pom": "sha256-uvA25RxRge8Q8wVRXRnfawKWsLcIS0g9I4oImN630i0=" + "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { + "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", + "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" }, "org/jetbrains/kotlin#kotlin-project-model/1.9.23": { "jar": "sha256-j8s85RKrtFLX1DHbssMS1cRQXRdiSTtRsQavwUfZk2c=", "pom": "sha256-nvSy89nZ9Zqwwr9+uO92MgUUmTjg540qIxxHiSHHl0U=" }, - "org/jetbrains/kotlin#kotlin-project-model/1.9.24": { - "jar": "sha256-Nri/x5EqvuVIWSxcI5keVRQODS17OhqTTdPOj6Q0+N0=", - "pom": "sha256-sF4O4QAsGO3t626JrwfjvheFB9sT2hutbs52vmDz7es=" - }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-reflect/1.9.24": { - "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=", - "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk=" + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/1.9.24": { - "jar": "sha256-mbinMB9ylR2d5sJW1cBSMowL/zndEm7/tQ/nhkq3CWM=", - "pom": "sha256-XBTVgzip+Vu/dZ2qibp0lC3PoawzFI68tPALrA9kHjg=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=", + "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/1.9.24": { - "module": "sha256-8qBhnZRfeYWlBM1xxwH9/Kwu97M8otTDxGyuJl5CTzQ=", - "pom": "sha256-fqbN1ffpu5RtdIKwn+vDBmLNmXDG0CbYhA3Nqwy+PY8=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": { + "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=", + "pom": "sha256-7lYZBmzLB5zDMy4kcnQ1n9dQXeLVQPuRtyd5ICW2Siw=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/1.9.24/gradle82": { - "jar": "sha256-RYZmqqT/D73L7l77+enlM2cf6/4UKaxsqNEypmuo8wo=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": { + "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/1.9.24": { - "jar": "sha256-MUx9MI/nUGVDZbrGFEeAYTyRac89nh2vurkc+AvcNXw=", - "pom": "sha256-mGDF58qg5AlxmVCQEtoD01GX/teewKkKUOKPjeh1QE0=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { + "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", + "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" }, "org/jetbrains/kotlin#kotlin-scripting-common/1.9.23": { "jar": "sha256-ii5Wfz2/Nz5hwBrNeIRjHshThGWrjul4rGMpb4zJr0Y=", "pom": "sha256-/CiXW5TcQMDZD9EXXiKxtka60sY368+fT2qy1Oe8XdU=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/1.9.24": { - "jar": "sha256-KqeY6XgokBDYByTdGdn+GQtSQkFIEQT89RjAO8OdTks=", - "pom": "sha256-S9rpUqslCWFRsfqERCooGupzwW0dTNVdigLDccqJusQ=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { + "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", + "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.23": { "jar": "sha256-e4A5/wt3nVVs7QCSMDWr0TNPDl8qiHlhgtArpF+SbSA=", "pom": "sha256-7Y6//r5Ume1iSG+oGBJ7td1QHXTEq5XFfnwB7z+NuWg=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.24": { - "jar": "sha256-02gR+1yZeXaEH/PQqxnGt96RkomeQIK6Hz/7oH6UBfQ=", - "pom": "sha256-FUgOkd8v/sfFfOHgpfFBBltFIrbbyJsv2yk9xsVwwMU=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { + "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", + "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.23": { "jar": "sha256-kOU90S9i3NgjQ8EsDLMUrc/wy8OYjtsRjR5miZYOnWM=", "pom": "sha256-923kmO12xGroZlZnmAf3J2EiPD+hChExgyAGpKs5Xe0=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.24": { - "jar": "sha256-i/2A2RNqKjJhALC3O/saG7NX7d+uDYEiDkYSa4im7no=", - "pom": "sha256-Sg6yUXF8Sih6ZBfp/QRBZ4xJatxnAdhasPFi8W0s+4c=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { + "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", + "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" }, "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.23": { "jar": "sha256-0/yn7JUf94Jvl6dZifjcr/YM+eHna73CIO33eDdqbmQ=", "pom": "sha256-4u8r+y628hp7croS7cWaFQx/IXbCssVP4uhg7oAjDYc=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.24": { - "jar": "sha256-G9aQBgqUhDl3N0pFds2J10nk7srx+3pYA2/rOuVRxKw=", - "pom": "sha256-kkM+M+MLpFvMS/hKxUsX0p8Dlkp2BwYW1sZS3WxhySU=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { + "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", + "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.24": { - "module": "sha256-6Y6oxE+zaCDQG7iwAxaOI6IhtAHLQyVtcjo/C3fWFsI=", - "pom": "sha256-XZfiDNWGLoR6aYF1uTno3Fxr11vtmZ1vPU6ghIESFsA=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { + "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", + "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" @@ -495,40 +506,48 @@ "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.24": { - "jar": "sha256-hYuQJpbanPWFq52Y/8HCcSJpgoNU3+kQfjcRsISjZGg=", - "module": "sha256-8uKmVztbUmXEEtXFgfv46gDGKxC5yS1WdMnpfy8zNbM=", - "pom": "sha256-uc6tTCIt7pDHT28BPTFqnlD4EaApMxPDNRrssvfM7V8=" + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" }, "org/jetbrains/kotlin#kotlin-tooling-core/1.9.23": { "jar": "sha256-iTjrl+NjINqj5vsqYP0qBbIy/0pVcXPFAZ8EW4gy2fQ=", "pom": "sha256-fiA0VIj7v1uf6ZeHNgvT7HRKb+qRppm9EbVhwygbB9g=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/1.9.24": { - "jar": "sha256-iTjrl+NjINqj5vsqYP0qBbIy/0pVcXPFAZ8EW4gy2fQ=", - "pom": "sha256-dbytE+kWgPzwEsjuGqGqxxn1m2IbOUyj/DLGJf+YclY=" + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { + "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", + "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" }, "org/jetbrains/kotlin#kotlin-util-io/1.9.23": { "jar": "sha256-em3OQOeKy+Zvx9Z463Qch3hFo8/Rx2xNK7+OyEXS2Sk=", "pom": "sha256-rNHyN4Ce4nWpwJ5EAt1FOdBN7DaMCQbsecP4A6vwZ8g=" }, - "org/jetbrains/kotlin#kotlin-util-io/1.9.24": { - "jar": "sha256-u0z0H/UG5Q+bLDQiBkmIFupO3f6ImYqQtotDlLT6xfo=", - "pom": "sha256-82VnN3kyTzMtOTkMeAd1h4BNEeznKv5K7uMlOtZTPFE=" + "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { + "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", + "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" }, "org/jetbrains/kotlin#kotlin-util-klib/1.9.23": { "jar": "sha256-5AGLa4+8keTQo3q4HAUKgTloaAdRCM2FCCuSXHnTvG0=", "pom": "sha256-+z5FhH1dIS5MK120RFGQPJ4fDjL2mH4fWbnMEcTDiYo=" }, - "org/jetbrains/kotlin#kotlin-util-klib/1.9.24": { - "jar": "sha256-4NqKfwZIV8BIOmVyfRYtPtV84m1+R3ix8ADg0MDck3E=", - "pom": "sha256-krQjr9XnKbsRT3G1ip4DhF3+K9pWJFTrvbg8nYOyMHE=" + "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { + "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", + "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" }, "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/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + }, "org/junit#junit-bom/5.7.2": { "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" @@ -1182,8 +1201,8 @@ "org/eclipse/jdt/ecj/maven-metadata": { "xml": { "groupId": "org.eclipse.jdt", - "lastUpdated": "20240910031942", - "release": "3.39.0" + "lastUpdated": "20241203050026", + "release": "3.40.0" } }, "org/eclipse/sisu#org.eclipse.sisu.inject/0.3.5": { From f26a825e8bba322f0862e2cd4c6f86d548637e97 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Sun, 17 Nov 2024 17:04:36 +0200 Subject: [PATCH 59/82] keyguard: update gradle plugin dependencies --- pkgs/by-name/ke/keyguard/deps.json | 299 +++++++++++++++-------------- 1 file changed, 156 insertions(+), 143 deletions(-) diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index e55dfddc85aaa..f558f6d9d41a0 100644 --- a/pkgs/by-name/ke/keyguard/deps.json +++ b/pkgs/by-name/ke/keyguard/deps.json @@ -1133,23 +1133,30 @@ "com/google/code/gson#gson-parent/2.10.1": { "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" }, + "com/google/code/gson#gson-parent/2.8.9": { + "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + }, "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.8.9": { + "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", + "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + }, "com/google/devtools/ksp#com.google.devtools.ksp.gradle.plugin/2.1.0-1.0.29": { "pom": "sha256-BU0VQVgnkIeWCnbSwDxUzpIGoyxkR1bQAcHUSJaVzCc=" }, "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/0.8.5": { "pom": "sha256-a+z8hpHftExSYVqCqWeS8TQBpXXleMkBkR1/qjMPgoo=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/4.5.0": { - "jar": "sha256-Ga92VnnptJN0uyg6xE81O4EJrZz+ZmjO1tmmZFVA4vo=", - "module": "sha256-G2X3c4EI7gxE5qUNjMJUpPHFpzmAtuh7D14uxMt6qDY=", - "pom": "sha256-D4Du3/O101e+rs5h8enK1Le/b4EVrWRIfYp2x/GwDBw=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.1.2": { + "jar": "sha256-tYw+XDWgAln9QC3r89pHqjrQhcP0vnL5AuoSYbNQGa4=", + "module": "sha256-CPnVxzwOvolk4aq3z59G93inhCcxnZJ52ZKoRBPIXPM=", + "pom": "sha256-Y4Th1GwfBKl4Go/Pl6nFQ5YPNNoKZ/XQI2x8EubcvqU=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/4.5.0": { - "pom": "sha256-WPAIDJzwTgVq1U0Ok91KI0KGXnihMR6TVAVk90wgDjc=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.1.2": { + "pom": "sha256-1JPwqwDRfMB4Zduo3oQAo5CJ1SpxzkFtyQOlEsXe1V0=" }, "org/gradle/toolchains#foojay-resolver/0.9.0": { "jar": "sha256-woQImj+HVX92Ai2Z8t8oNlaKpIs/5OKSI5LVZrqBQXY=", @@ -1170,125 +1177,105 @@ "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" }, - "org/jetbrains/kotlin#kotlin-android-extensions/1.9.24": { - "jar": "sha256-4z5UUlSR0ZgdRODKmnxTIWh91QRDPsVJZhqb5UYKEW4=", - "pom": "sha256-6QmjYHLn/lbQULgKdXEDwdP4dz+2wb0GcrxKr7hRCEs=" - }, - "org/jetbrains/kotlin#kotlin-assignment/1.9.24": { - "module": "sha256-qa+tevGbZXAv892pBdPJt/mem9rqadY1+s2f3mi7VQU=", - "pom": "sha256-U5l+9NCcNhmm32TaPftTdngenYSMck+DLIDPCoCjLA8=" + "org/jetbrains/kotlin#kotlin-assignment/2.0.21": { + "module": "sha256-8638yrZURNtqqzwNfSVoZG7AyS8kWCh/KLKu5POXNtw=", + "pom": "sha256-QBfCQqfb3Oca6ApXB7S/OyOoIr8jpodahFp7UTYhzQ8=" }, - "org/jetbrains/kotlin#kotlin-assignment/1.9.24/gradle82": { - "jar": "sha256-897/fRYVZp9m+jeTnLZJBOex+LBgNReZDH8IEs40oNs=" + "org/jetbrains/kotlin#kotlin-assignment/2.0.21/gradle85": { + "jar": "sha256-USUeNCELiNTJCAXKZS6Xe93IR4OkVAY5ydIQkJhbrOY=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.24": { - "jar": "sha256-ZUX99qL/t4jN3O3KymMiOdx+XmHD90SCNzXjse2cG1Q=", - "pom": "sha256-efIYZmDsHYeQhu4jEEeY2M1PthcsJ5xeVuAsqeVbxHU=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.0.21": { + "jar": "sha256-gBILdN8DYz1veeCIZBMe7jt6dIb2wF0vLtyGg3U8VNo=", + "pom": "sha256-/iTcYG/sg+yY3Qi8i7HPmeVAXejpF8URnVoMt++sVZ0=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.24": { - "jar": "sha256-5x/xnmsUGrhakyj9AQlBUxowJUMCa9QkTJWtwgjVAfY=", - "pom": "sha256-1w0fiFkkQ/R1eVFUVqTWwxBRztoK0RRGkjrK/kwMldE=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.24": { - "jar": "sha256-g4Q5dMH/0NNmbTxkk0Hb/TB32eFAZlVKakR7laMB3S0=", - "pom": "sha256-wb508udfB+SamqaJA+DctogA0iRkBBi0hHfuQsvDWQQ=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/1.9.24": { - "jar": "sha256-WIqveo7Y55uL8+qLknj/Enii1ZKFpF4Jjxz8v7Dc080=", - "pom": "sha256-tv4ne9GuP/zAzriOxmZZmHpc0TeaiXaDEvXe3x8uH+U=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.24": { - "jar": "sha256-F3vIsqQHbcznh4rQ2P0HFjrzF44/qQ7mPU9zO7R7/ck=", - "pom": "sha256-T7V/xqxyCVGzIkd0s7sqVFSelj0vTf3GhB6Ex77WKrE=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/1.9.24": { - "jar": "sha256-syBxajMCclSau65oGoD14P5YBLo5TQ8kW1s3f6JWNVk=", - "pom": "sha256-fHb3hHzJ5bWOGoJbbqAZV7QoHpHmzXBcFmy+afvDtYs=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.24": { - "jar": "sha256-LV53JHoKf1klIL64gx6OPrl0m/OIhfgv+9Y8f/BRPhI=", - "module": "sha256-kB+s0LsPLdJ9XzvJDkQvJ3OrEuHOcgnT78HlhWNsfWQ=", - "pom": "sha256-r9FlfZ0Vx2BxZ1InnZEdG73PjfTPXZYEUGHjCunBMX4=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.0.21": { + "jar": "sha256-W0cHoy5GfvvhIsMY/2q9yhei/H2Mg/ZgN8mhILbcvC8=", + "pom": "sha256-P+CLlUN7C074sWt39hqImzn1xGt+lx1N+63mbUQOodg=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/1.9.24/gradle82": { - "jar": "sha256-LV53JHoKf1klIL64gx6OPrl0m/OIhfgv+9Y8f/BRPhI=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", + "module": "sha256-z29dNExVVVS/rGQFHq0AhcvUM4Z2uqP8h7UD6eSrvjQ=", + "pom": "sha256-gV5yqZ4ZFD1mLSTkYlKlnOdWMC18W9/FlIF9fMexI3g=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/1.9.24": { - "jar": "sha256-hR4BJ+5ixRDpf4UB6Q/V6yTQ15bHCcv5SvM5R0Fre/4=", - "pom": "sha256-3gafD+sze0Nbc/GdKaISONBW5oegumvivczlmvqSa7Y=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21/gradle85": { + "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/1.9.24": { - "jar": "sha256-jRr4djLZUUjxIqn6CuKQPBnub6t9AeAX924NLJoCLCA=", - "module": "sha256-4Jx9wdImjqtl5EGtLjgWDzGHsNjAv5zxrUyF+nUjm6Q=", - "pom": "sha256-aTnfzQ6JgI3AA25alaOPcb+EKF53bpEFIdVWJnp8sMc=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.0.21": { + "jar": "sha256-UzVXQrV7qOFvvfCiBDn4s0UnYHHtsUTns9puYL42MYg=", + "pom": "sha256-OMyaLLf55K/UOcMQdvgzFThIsfftITMgCDXRtCDfbqs=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/1.9.24": { - "jar": "sha256-VbEQENUcmcMXybbvXpVJrUhXEhjN5hvYRIGMti0aPxk=", - "module": "sha256-cQXlShB2dqp9KAzFqUl0QX4qO1cD1w3WH8yr6wccSug=", - "pom": "sha256-rquP4uqM+lwumZi1/nU4MaeYfCx4Q6U1MjYqB/pvABg=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.0.21": { + "jar": "sha256-wfTqDBkmfx7tR0tUGwdxXEkWes+/AnqKL9B8u8gbjnI=", + "module": "sha256-YqcNAg27B4BkexFVGIBHE+Z2BkBa6XoQ2P2jgpOI0Uk=", + "pom": "sha256-1GjmNf3dsw9EQEuFixCyfcVm6Z1bVIusEMIjOp7OF74=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.24": { - "module": "sha256-txNZQoRrVH+xtZaGQXBGPC81+hW1qtkzX60P/YamE3s=", - "pom": "sha256-ilwTAHAhV//cHyV1hDZZbsVsM3Z8GqLouOskamWs9SM=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.0.21": { + "jar": "sha256-lR13mJs1cAljH/HvsSsBYczzKcUpxUalKfih0x+bwDw=", + "module": "sha256-6qn9n4b71E/2BwoZfce90ZgPDUHo20myUoA9A6pMVaw=", + "pom": "sha256-5RVeYOyr2v1kUmVKaYALyyp37n0fxucH+tOo5p8HTCw=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.24/gradle82": { - "jar": "sha256-6K7ZqBLmU2zu+z7VaPE0ZPoF8ka/0TaTONZDyDKUAks=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { + "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", + "pom": "sha256-RenM7OM+TY36mUHMkS81RYIBqdPwQ3IMMket3lf0f/Y=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/1.9.24": { - "module": "sha256-BEh8cNHIzCkBwDdNgarX+k/Rp5NeJa200LH69WkKzNs=", - "pom": "sha256-wqVTvkQFNLjTMOV69hNjc1WLXgIPppzPsDsuWDx1nAA=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21/gradle85": { + "jar": "sha256-nfXH/xOx/GislFDKY8UxEYkdb2R73ewPQ5iz5yJb9tk=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/1.9.24": { - "jar": "sha256-U791bL22Uj3LTA16syrLZBR5bBz0nOQxvkC3DMV9tUk=", - "pom": "sha256-6pO4z4DdKXdKf7GEeclxH7uWPqhqwjq2FOepQAUsZ34=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.0.21": { + "module": "sha256-8JRUh/5RlZ/fi2oUQXB6Ke1fGsMaIxx/3r4sPd0i/fE=", + "pom": "sha256-Z1AT1Mvu4JyIkgriuiRvmfKKeJuHT2NASeAS+j7r9Mg=" }, - "org/jetbrains/kotlin#kotlin-native-utils/1.9.24": { - "jar": "sha256-I1WvMJo7FgeymmF02Fe05umxs2EH1sHvu8PMSbpDRQw=", - "pom": "sha256-uvA25RxRge8Q8wVRXRnfawKWsLcIS0g9I4oImN630i0=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.0.21": { + "jar": "sha256-R1eJEWW2mPvazo9NpvK8DpiOrvnvNnE1SIZajycGmv0=", + "pom": "sha256-Y/6HvSI1sSlAnHIqCbYsIKe3eueQGeIgMSSK9zawPFQ=" }, - "org/jetbrains/kotlin#kotlin-project-model/1.9.24": { - "jar": "sha256-Nri/x5EqvuVIWSxcI5keVRQODS17OhqTTdPOj6Q0+N0=", - "pom": "sha256-sF4O4QAsGO3t626JrwfjvheFB9sT2hutbs52vmDz7es=" + "org/jetbrains/kotlin#kotlin-native-utils/2.0.21": { + "jar": "sha256-ResIo5Kfl8SKkpEsliV3nRVAvG8/IS+56UYg0DJrzAA=", + "pom": "sha256-ZpB3PnZJ0dD61V0GCaTiHh68mF3Q+iYenG/9OJhnBh0=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/1.9.24": { - "module": "sha256-8qBhnZRfeYWlBM1xxwH9/Kwu97M8otTDxGyuJl5CTzQ=", - "pom": "sha256-fqbN1ffpu5RtdIKwn+vDBmLNmXDG0CbYhA3Nqwy+PY8=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21": { + "module": "sha256-kJCVCx7oa4b+KWmV2AKG6opPN5+yshjoVvzt0ErS1Hk=", + "pom": "sha256-7lYZBmzLB5zDMy4kcnQ1n9dQXeLVQPuRtyd5ICW2Siw=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/1.9.24/gradle82": { - "jar": "sha256-RYZmqqT/D73L7l77+enlM2cf6/4UKaxsqNEypmuo8wo=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.0.21/gradle85": { + "jar": "sha256-HSNuNiIzuaJx5QsiOlDI2+rdA1C2OiRkYIJWhS2jaKM=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/1.9.24": { - "jar": "sha256-KqeY6XgokBDYByTdGdn+GQtSQkFIEQT89RjAO8OdTks=", - "pom": "sha256-S9rpUqslCWFRsfqERCooGupzwW0dTNVdigLDccqJusQ=" + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.24": { - "jar": "sha256-02gR+1yZeXaEH/PQqxnGt96RkomeQIK6Hz/7oH6UBfQ=", - "pom": "sha256-FUgOkd8v/sfFfOHgpfFBBltFIrbbyJsv2yk9xsVwwMU=" + "org/jetbrains/kotlin#kotlin-tooling-core/2.0.21": { + "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", + "pom": "sha256-MiVe/o/PESl703OozHf4sYXXOYTpGxieeRZlKb36XVo=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.24": { - "jar": "sha256-i/2A2RNqKjJhALC3O/saG7NX7d+uDYEiDkYSa4im7no=", - "pom": "sha256-Sg6yUXF8Sih6ZBfp/QRBZ4xJatxnAdhasPFi8W0s+4c=" + "org/jetbrains/kotlin#kotlin-util-io/2.0.21": { + "jar": "sha256-Dv7kwg8+f5ErMceWxOR/nRTqaIA+x+1OXU8kJY46ph4=", + "pom": "sha256-4gD5F2fbCFJsjZSt3OB7kPNCVBSwTs/XzPjkHJ8QmKA=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.24": { - "jar": "sha256-G9aQBgqUhDl3N0pFds2J10nk7srx+3pYA2/rOuVRxKw=", - "pom": "sha256-kkM+M+MLpFvMS/hKxUsX0p8Dlkp2BwYW1sZS3WxhySU=" - }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.24": { - "jar": "sha256-hYuQJpbanPWFq52Y/8HCcSJpgoNU3+kQfjcRsISjZGg=", - "module": "sha256-8uKmVztbUmXEEtXFgfv46gDGKxC5yS1WdMnpfy8zNbM=", - "pom": "sha256-uc6tTCIt7pDHT28BPTFqnlD4EaApMxPDNRrssvfM7V8=" - }, - "org/jetbrains/kotlin#kotlin-tooling-core/1.9.24": { - "jar": "sha256-iTjrl+NjINqj5vsqYP0qBbIy/0pVcXPFAZ8EW4gy2fQ=", - "pom": "sha256-dbytE+kWgPzwEsjuGqGqxxn1m2IbOUyj/DLGJf+YclY=" - }, - "org/jetbrains/kotlin#kotlin-util-io/1.9.24": { - "jar": "sha256-u0z0H/UG5Q+bLDQiBkmIFupO3f6ImYqQtotDlLT6xfo=", - "pom": "sha256-82VnN3kyTzMtOTkMeAd1h4BNEeznKv5K7uMlOtZTPFE=" - }, - "org/jetbrains/kotlin#kotlin-util-klib/1.9.24": { - "jar": "sha256-4NqKfwZIV8BIOmVyfRYtPtV84m1+R3ix8ADg0MDck3E=", - "pom": "sha256-krQjr9XnKbsRT3G1ip4DhF3+K9pWJFTrvbg8nYOyMHE=" + "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { + "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", + "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" }, "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.1.0": { "pom": "sha256-luAHs+yyLMbZYX5BRIRTn+W3eyjmZZyMkWtP3fiWHO0=" @@ -1311,10 +1298,13 @@ "org/jetbrains/kotlin/plugin/serialization#org.jetbrains.kotlin.plugin.serialization.gradle.plugin/2.1.0": { "pom": "sha256-DhNlO2nJN6z/dPLQdvUvCVhVJzp0+5L6H7q/w4rAeKo=" }, - "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/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { + "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { + "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", + "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", + "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" }, "org/jlleitschuh/gradle#ktlint-gradle/12.1.2": { "jar": "sha256-ih3K23CHvkvrFY5M93zE1DAIQ4Ksil2MNwasYgp7Mpw=", @@ -1323,6 +1313,9 @@ }, "org/jlleitschuh/gradle/ktlint#org.jlleitschuh.gradle.ktlint.gradle.plugin/12.1.2": { "pom": "sha256-91IKYM+S8i0Cge4aq9qDPX9obowdiAGEEdtgQd1Dmm4=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" } }, "https://repo.maven.apache.org/maven2": { @@ -3009,9 +3002,13 @@ "org/jetbrains/kotlin#compose-compiler-gradle-plugin/2.1.0/gradle85": { "jar": "sha256-zIwJYqry8Yb5Mw3sMrJgfzHBN/IwccyXtfSMM1uRlck=" }, - "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/1.9.24": { - "jar": "sha256-AoVjJSRkxIYBkX8rbFTRuOQhzcfya/L5zzCIlcgSSgY=", - "pom": "sha256-Hzfc9EhcI3qtLk70O40RQJleMTKduiTJ9qa3uEBrg9Q=" + "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=", + "pom": "sha256-rIU9chaJ+vEV8RiBCjU2/CcvE1to0CdFOqpW6eY79wc=" + }, + "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { + "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", + "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" }, "org/jetbrains/kotlin#kotlin-build-common/2.1.0": { "jar": "sha256-Ol006LHti4DuItVEiMKkJc97aFSBkW1yb/uZlAiNLLk=", @@ -3021,22 +3018,34 @@ "jar": "sha256-MrwDdkU13bwtsfmINlea9rYxyL6mIHGGSrAhRfJ2n7s=", "pom": "sha256-LIxqxM9TTqyrqf9e0/pF2AKdOjGyEengAt/Oefx6Ico=" }, + "org/jetbrains/kotlin#kotlin-build-tools-api/2.0.21": { + "jar": "sha256-j8orSvbEzyRWXZp/ZMMXhIlRjQSeEGmB22cY7yLK4Y4=", + "pom": "sha256-zL2XaTA2Y0gWKVGY5JRFNPr7c9d4+M1NQ588h7CQ9JQ=" + }, "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.0": { "jar": "sha256-8UW4FPnAEyjCw2mmuPx3Q0ysAqfWjw4F0N1MraeLusc=", "pom": "sha256-48/I2o3fO70/DKBxg6Uf60iT6Ly4/ugB9LjOBe+UQ6k=" }, + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.0.21": { + "jar": "sha256-um6iTa7URxf1AwcqkcWbDafpyvAAK9DsG+dzKUwSfcs=", + "pom": "sha256-epPI22tqqFtPyvD0jKcBa5qEzSOWoGUreumt52eaTkE=" + }, "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.0": { "jar": "sha256-lYgnvDcR/Dw0kfx382epma1Vg1KxorMtGPWRbM4V7Tk=", "pom": "sha256-WO6VNCDFPh6jq4lqrvmWSWC0RMqOCgf3bpUeBcYhAvk=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.24": { - "jar": "sha256-5x/xnmsUGrhakyj9AQlBUxowJUMCa9QkTJWtwgjVAfY=", - "pom": "sha256-1w0fiFkkQ/R1eVFUVqTWwxBRztoK0RRGkjrK/kwMldE=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.0.21": { + "jar": "sha256-n6jN0d4NzP/hVMmX1CPsa19TzW2Rd+OnepsN4D+xvIE=", + "pom": "sha256-vUZWpG7EGCUuW8Xhwg6yAp+yqODjzJTu3frH6HyM1bY=" }, "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.0": { "jar": "sha256-wbE5pvJRw7mekr76Mmy3XZOgAddMOsYBFVqM2w0lN4M=", "pom": "sha256-AET6RQRvunyoCNmPmJXyWxZRDttTweKCEH2wBtEm1n8=" }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.0.21": { + "jar": "sha256-COYFvoEGD/YS0K65QFihm8SsmWJcNcRhxsCzAlYOkQQ=", + "pom": "sha256-+Wdq1JVBFLgc39CR6bW0J7xkkc+pRIRmjWU9TRkCPm0=" + }, "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.0": { "jar": "sha256-kVhyyFES31vAjsJaGvXYai0/grHYRTEO7mK+VQjBNJc=", "pom": "sha256-E60b/OpHeNuDNtML2O3wIjk1RHXyxNMond/7WhgyBdU=" @@ -3045,13 +3054,17 @@ "jar": "sha256-eVY6fQOA9EScl3O2CFQaZ64Q06Nyy1ozVoKqV0h74O8=", "pom": "sha256-U65R+Cq5oPxqmY8TQesL/Qkji+YePm8NlujtGKo2190=" }, + "org/jetbrains/kotlin#kotlin-daemon-client/2.0.21": { + "jar": "sha256-Nx6gjk8DaILMjgZP/PZEWZDfREKVuh7GiSjnzCtbwBU=", + "pom": "sha256-8oY4JGtQVSC/6TXxXz7POeS6VSb6RcjzKsfeejEjdAA=" + }, "org/jetbrains/kotlin#kotlin-daemon-client/2.1.0": { "jar": "sha256-F1Hav812tY+Hi5DfamAiQexOTNb+1g4tXCIBxQaEUeM=", "pom": "sha256-Q66+UTV21R9IEpzYXIYNCBPeahzHWRrKfCjlQyz43xs=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.24": { - "jar": "sha256-F3vIsqQHbcznh4rQ2P0HFjrzF44/qQ7mPU9zO7R7/ck=", - "pom": "sha256-T7V/xqxyCVGzIkd0s7sqVFSelj0vTf3GhB6Ex77WKrE=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.0.21": { + "jar": "sha256-saCnPFAi+N0FpjjGt2sr1zYYGKHzhg/yZEEzsd0r2wM=", + "pom": "sha256-jbZ7QN1gJaLtBpKU8sm8+2uW2zFZz+927deEHCZq+/A=" }, "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.0": { "jar": "sha256-aqWBvVPDUA44Dku2skB/bSM5EAEvQlNJwu1ajdvinqw=", @@ -3114,49 +3127,49 @@ "jar": "sha256-dHwpJ6Yjtuu3NLRl1qJoYukg3dGCjvQ3Foh8CEmjEx8=", "pom": "sha256-WXD72CdKWAyk6I/nhkeMR8i5ufo3TFsK3ekyhFYiX2o=" }, - "org/jetbrains/kotlin#kotlin-reflect/1.9.24": { - "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=", - "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk=" + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/1.9.24": { - "jar": "sha256-mbinMB9ylR2d5sJW1cBSMowL/zndEm7/tQ/nhkq3CWM=", - "pom": "sha256-XBTVgzip+Vu/dZ2qibp0lC3PoawzFI68tPALrA9kHjg=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.0.21": { + "jar": "sha256-x88d6VXfIqFihyImvQZ3yaDItmMKLi1z0R0UfNDFO3M=", + "pom": "sha256-cWKsEOFFTpJ2c7FcrQMp2jgvt1jmVPWfy0AHRZ2eyEE=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/1.9.24": { - "jar": "sha256-MUx9MI/nUGVDZbrGFEeAYTyRac89nh2vurkc+AvcNXw=", - "pom": "sha256-mGDF58qg5AlxmVCQEtoD01GX/teewKkKUOKPjeh1QE0=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.0.21": { + "jar": "sha256-nBEfjQit5FVWYnLVYZIa3CsstrekzO442YKcXjocpqM=", + "pom": "sha256-lbLpKa+hBxvZUv0Tey5+gdBP4bu4G3V+vtBrIW5aRSQ=" }, "org/jetbrains/kotlin#kotlin-script-runtime/2.1.0": { "jar": "sha256-FaK4IRnp8UXqAoApvTEWZYRkikGRV8IJSMEk+jPUDlA=", "pom": "sha256-8zMvwPXpYvau/gosCNPE16s1sToF2shMS8aRTibtJ80=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/1.9.24": { - "jar": "sha256-KqeY6XgokBDYByTdGdn+GQtSQkFIEQT89RjAO8OdTks=", - "pom": "sha256-S9rpUqslCWFRsfqERCooGupzwW0dTNVdigLDccqJusQ=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.0.21": { + "jar": "sha256-+H3rKxTQaPmcuhghfYCvhUgcApxzGthwRFjprdnKIPg=", + "pom": "sha256-hP6ezqjlV+/6iFbJAhMlrWPCHZ0TEh6q6xGZ9qZYZXU=" }, "org/jetbrains/kotlin#kotlin-scripting-common/2.1.0": { "jar": "sha256-0+vhVpnsGn+2w7X6k562uIizJz5sBZfSwuOqoORq+kU=", "pom": "sha256-qysj8Mty7AQsK4CPsYmFp+vnWmWqoAUnlp6UMlxsAGs=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/1.9.24": { - "jar": "sha256-02gR+1yZeXaEH/PQqxnGt96RkomeQIK6Hz/7oH6UBfQ=", - "pom": "sha256-FUgOkd8v/sfFfOHgpfFBBltFIrbbyJsv2yk9xsVwwMU=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.0.21": { + "jar": "sha256-JBPCMP3YzUfrvronPk35TPO0TLPsldLLNUcsk3aMnxw=", + "pom": "sha256-1Ch6fUD4+Birv3zJhH5/OSeC0Ufb7WqEQORzvE9r8ug=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.0": { "jar": "sha256-sqvG2VnJFa+Soomu0UpTDq8J5IYT8oPaCk6NNEQ0D8M=", "pom": "sha256-y/rs2waTmDq1tq6rXnCBOWn5miOccxxG+PdATAVdcic=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/1.9.24": { - "jar": "sha256-i/2A2RNqKjJhALC3O/saG7NX7d+uDYEiDkYSa4im7no=", - "pom": "sha256-Sg6yUXF8Sih6ZBfp/QRBZ4xJatxnAdhasPFi8W0s+4c=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.0.21": { + "jar": "sha256-btD6W+slRmiDmJtWQfNoCUeSYLcBRTVQL9OHzmx7qDM=", + "pom": "sha256-0ysb8kupKaL6MqbjRDIPp7nnvgbON/z3bvOm3ITiNrE=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.0": { "jar": "sha256-ipAEBgErpe2oklhWJT9yI1RR2zh/DOUO0x1lXJ5cZtY=", "pom": "sha256-i1SasqratJ02m/6PGAb3H/mP+voVcGcq2PeosBsjbHs=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/1.9.24": { - "jar": "sha256-G9aQBgqUhDl3N0pFds2J10nk7srx+3pYA2/rOuVRxKw=", - "pom": "sha256-kkM+M+MLpFvMS/hKxUsX0p8Dlkp2BwYW1sZS3WxhySU=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.0.21": { + "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", + "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" }, "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.0": { "jar": "sha256-xaIbbQfvZ3lwsyj56/8RUoIoXmLIX6GGboTk1746RKM=", @@ -3180,9 +3193,9 @@ "jar": "sha256-KDJ0IEvXwCB4nsRvj45yr0JE1/VQszkqV+XKAGrXqiw=", "pom": "sha256-NmDTanD+s6vknxG5BjPkHTYnNXbwcbDhCdqbOg3wgqU=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.24": { - "module": "sha256-6Y6oxE+zaCDQG7iwAxaOI6IhtAHLQyVtcjo/C3fWFsI=", - "pom": "sha256-XZfiDNWGLoR6aYF1uTno3Fxr11vtmZ1vPU6ghIESFsA=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { + "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", + "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" }, "org/jetbrains/kotlin#kotlin-stdlib-common/2.1.0": { "module": "sha256-K5pa54X4UTqT+M7D9uXgf4sXZvhJezpIfzRBolHWdWM=", @@ -3241,15 +3254,15 @@ "module": "sha256-UZUZOzfc2touHAqw1RLEIrKtdq81V4Q6G5w0gPTnHQ4=", "pom": "sha256-wm0n8mcQrUDiPu2f/gpkuFkejBPSI8ypDFk+5j87KKs=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.24": { - "jar": "sha256-hYuQJpbanPWFq52Y/8HCcSJpgoNU3+kQfjcRsISjZGg=", - "module": "sha256-8uKmVztbUmXEEtXFgfv46gDGKxC5yS1WdMnpfy8zNbM=", - "pom": "sha256-uc6tTCIt7pDHT28BPTFqnlD4EaApMxPDNRrssvfM7V8=" - }, "org/jetbrains/kotlin#kotlin-stdlib/2.0.20": { "module": "sha256-3AUdwExqGW8tBtDTya8zufErybT+E5rhKQFAUII2tns=", "pom": "sha256-Cu6WIJHn3QKIzDykz0qSjFYgcUYCEb+PQXkAkwbmGf4=" }, + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" + }, "org/jetbrains/kotlin#kotlin-stdlib/2.1.0": { "jar": "sha256-1vkbew8wbMopn+x0+3w05IdNb17FuSWgtN4hkB4RnD8=", "module": "sha256-3PvI6L8yzWen763ZHTEVK86YcJEdbsUIePT9tuA+cOI=", From abf3eaf9337a04b5cadd960fa9f9936b43123b76 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Fri, 27 Dec 2024 13:14:58 +0200 Subject: [PATCH 60/82] slimevr-server: update gradle plugin dependencies --- pkgs/by-name/sl/slimevr-server/deps.json | 68 +++++++++++------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/sl/slimevr-server/deps.json b/pkgs/by-name/sl/slimevr-server/deps.json index fd9ae28a6a6de..da1e488c68848 100644 --- a/pkgs/by-name/sl/slimevr-server/deps.json +++ b/pkgs/by-name/sl/slimevr-server/deps.json @@ -339,9 +339,9 @@ "jar": "sha256-wWbyBR6R0ZnpYP/HsnZEhcFRDNF2dN17jOPC/NBqhys=", "pom": "sha256-mISZMftwkWhS6qfCDm2Pr1IsUNd627r9k2T1JrfN7EI=" }, - "org/jetbrains/kotlin#kotlin-reflect/1.9.24": { - "jar": "sha256-plFmRFu4XvgWzeEnJ5/gAX0rfMQ5s7lyOQ4bc21k6Uw=", - "pom": "sha256-CghcMAUb1tSrdlrVoMUXnEE7NfdBjyiDFy+9m6GrzMk=" + "org/jetbrains/kotlin#kotlin-reflect/2.0.21": { + "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=", + "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk=" }, "org/jetbrains/kotlin#kotlin-serialization/2.0.20": { "module": "sha256-rsyQ8DJ7IQJTYRNdyJQBDmHDVzVFBtLTP3pZeakRxGQ=", @@ -353,9 +353,9 @@ "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.10": { "pom": "sha256-fUtwVHkQZ2s738iSWojztr+yRYLJeEVCgFVEzu9JCpI=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.24": { - "module": "sha256-6Y6oxE+zaCDQG7iwAxaOI6IhtAHLQyVtcjo/C3fWFsI=", - "pom": "sha256-XZfiDNWGLoR6aYF1uTno3Fxr11vtmZ1vPU6ghIESFsA=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": { + "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", + "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" @@ -371,10 +371,10 @@ "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.24": { - "jar": "sha256-hYuQJpbanPWFq52Y/8HCcSJpgoNU3+kQfjcRsISjZGg=", - "module": "sha256-8uKmVztbUmXEEtXFgfv46gDGKxC5yS1WdMnpfy8zNbM=", - "pom": "sha256-uc6tTCIt7pDHT28BPTFqnlD4EaApMxPDNRrssvfM7V8=" + "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": { + "jar": "sha256-8xzFPxBafkjAk2g7vVQ3Vh0SM5IFE3dLRwgFZBvtvAk=", + "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=", + "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o=" }, "org/jetbrains/kotlin#kotlin-tooling-core/2.0.20": { "jar": "sha256-W28UhUj+ngdN9R9CJTREM78DdaxbOf/NPXvX1/YC1ik=", @@ -717,26 +717,26 @@ "jar": "sha256-HTFpZEVpdyBScJF1Q2kIKmZRvUl4G2AF3rlOVnU0Bvk=", "pom": "sha256-O5Wj083TqkuRqzJ921ob/gPYHic3lONqoUQEcdXXDl4=" }, - "net/java/dev/jna#jna-platform/5.15.0": { - "jar": "sha256-GLf259NM6JMJptkFKuGph+jmQFfi9oPgHlDy8rWc0VM=", - "pom": "sha256-oNnHuB/tH6i+iLAv16dWDeGxrFlYOh4sWiGopdxs32c=" + "net/java/dev/jna#jna-platform/5.16.0": { + "jar": "sha256-5aeVI5ZFCXV1VXgrtgKD5JAmEQE/EH5GANyTKY9z84I=", + "pom": "sha256-R3eT3wLGgn3+Ab2wjwBqVXdeb6BS3ErN7aNMmTYopJY=" }, - "net/java/dev/jna#jna/5.15.0": { - "jar": "sha256-pWQVjSirUSf8apWAKO1UJ5/gmZZixGQltqOwmipSCU0=", - "pom": "sha256-J2YC/zZ6TDkVXa7MHoy1T0eJ5dgN+Qo6i2YD8d61ngU=" + "net/java/dev/jna#jna/5.16.0": { + "jar": "sha256-P1IzWJp5nrZtwpaa+jQz+1aFnT14fFi5vH3Z6G8KJQw=", + "pom": "sha256-9h/SxEqlg/Kiy8X8Z7DxmpIDyofV8OGNPVAwy+OQgIM=" }, "net/java/dev/jna/jna-platform/maven-metadata": { "xml": { "groupId": "net.java.dev.jna", - "lastUpdated": "20240915160458", - "release": "5.15.0" + "lastUpdated": "20241222102859", + "release": "5.16.0" } }, "net/java/dev/jna/jna/maven-metadata": { "xml": { "groupId": "net.java.dev.jna", - "lastUpdated": "20240915160455", - "release": "5.15.0" + "lastUpdated": "20241222102857", + "release": "5.16.0" } }, "org/apache#apache/16": { @@ -795,15 +795,15 @@ "jar": "sha256-zoEmabbVjLruJv9M0WM96ksc7hrf5JJ1Gdj9Z64vqVQ=", "pom": "sha256-77xJr8wr9ZM+6aE7PK/8d3t8/wzuJOS0iPCQIQQMv68=" }, - "org/java-websocket#Java-WebSocket/1.5.7": { - "jar": "sha256-KNg5KogmYOY2YDwKctPh7V2hmTIQIUZFdU6TZVwNgGo=", - "pom": "sha256-FrB1dUjtbkqDQpPWICqJZHChRaekCDJQtNZMlgzetBE=" + "org/java-websocket#Java-WebSocket/1.6.0": { + "jar": "sha256-6uKSE+TxZRVjnCiVcgDwEbOWf//K2hlizwJV0kkZwi8=", + "pom": "sha256-qOhNVTw015Pi6n5KVLBz9E3bC7RC9N1vrQzs11XRzqw=" }, "org/java-websocket/Java-WebSocket/maven-metadata": { "xml": { "groupId": "org.java-websocket", - "lastUpdated": "20240708212417", - "release": "1.5.7" + "lastUpdated": "20241215143722", + "release": "1.6.0" } }, "org/jetbrains#annotations/13.0": { @@ -1037,13 +1037,12 @@ "org/slf4j#slf4j-api/1.7.25": { "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4=" }, - "org/slf4j#slf4j-api/2.0.6": { - "jar": "sha256-LyqS1BCyaBOdfWO3XtJeIZlc/kEAwZvyNXfP28gHe9o=", - "pom": "sha256-i06GxT0ng2CPGuohPZBsW6xcBDPgCxkjm7FnZLn6NzY=" + "org/slf4j#slf4j-api/2.0.13": { + "jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=", + "pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE=" }, - "org/slf4j#slf4j-api/2.0.7": { - "jar": "sha256-XWKYuToZBcMs2mR4gIrBTC1KR+kVNeU8Qff+64XZRvQ=", - "pom": "sha256-LUA8zw4KAtXBqGZ7DiozyN/GA4qyh7lnHdaBwgUmeYE=" + "org/slf4j#slf4j-bom/2.0.13": { + "pom": "sha256-evJy16c44rmHY3kf/diWBA6L6ymKiP1gYhRAeXbNMQo=" }, "org/slf4j#slf4j-ext/1.7.25": { "jar": "sha256-nfTqTTkOtVnxU3Fvp3ZYwmVA9Pg2NZc7jA4Npw1vqUQ=", @@ -1056,11 +1055,8 @@ "org/slf4j#slf4j-parent/1.7.25": { "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY=" }, - "org/slf4j#slf4j-parent/2.0.6": { - "pom": "sha256-FIJlDL4x5AjB3IkCHLrh0wRK1KAb+PYro2C2qBOhMSQ=" - }, - "org/slf4j#slf4j-parent/2.0.7": { - "pom": "sha256-wYK7Ns068ck8FgPN/v54iRV9swuotYT0pEU1/NIuRec=" + "org/slf4j#slf4j-parent/2.0.13": { + "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo=" }, "org/sonatype/oss#oss-parent/9": { "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" From fb05f9b503e1e7049d655a4cc17ab4ade903929e Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 16 Jan 2025 12:16:23 +0100 Subject: [PATCH 61/82] pay-respects: 0.4.18 -> 0.6.10 --- pkgs/by-name/pa/pay-respects/package.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index 50b0f6398a2a2..754e39ab8114e 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -2,20 +2,31 @@ lib, fetchFromGitea, rustPlatform, + pkg-config, + openssl, }: rustPlatform.buildRustPackage rec { pname = "pay-respects"; - version = "0.4.18"; + version = "0.6.10"; src = fetchFromGitea { domain = "codeberg.org"; owner = "iff"; repo = "pay-respects"; rev = "v${version}"; - hash = "sha256-8YQgNOqZAMhn93rk0fw1SV02XhI/Wt9D5Rzo64cCs7s="; + hash = "sha256-cyd0MF5pxa3FhSUmjNtiIwAWrE0/rqtOm8dJxqdwPSk="; }; - cargoHash = "sha256-xLAJLwzX923E7Pzfwdw38moLOlY0Q4xK8himbKHQ7O8="; + cargoHash = "sha256-7j6rRCMazMFbPnzt4/0Lz1BDJP3xtq1ycb+41f2qhe0="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + meta = { description = "Terminal command correction, alternative to `thefuck`, written in Rust"; From 703c51a6223cc3dbb2b35e18c7772e278d56fd42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 11:28:53 +0000 Subject: [PATCH 62/82] python312Packages.laces: 0.1.1 -> 0.1.2 --- pkgs/development/python-modules/laces/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/laces/default.nix b/pkgs/development/python-modules/laces/default.nix index 9f5c74af83295..3c802209cd34f 100644 --- a/pkgs/development/python-modules/laces/default.nix +++ b/pkgs/development/python-modules/laces/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "laces"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; src = fetchFromGitHub { owner = "tbrlpld"; repo = "laces"; - rev = "v${version}"; - hash = "sha256-N3UUJomlihdM+6w9jmn9t10Q2meIqEOjW/rf3ZLrD78="; + tag = "v${version}"; + hash = "sha256-ELpPq7pqcLfAqUuHh8NOAOOiGPDImTFsA7WUHvVfMiI="; }; nativeBuildInputs = [ flit-core ]; From 026824ef9b88fb61666c3bae7ae14c4c5a67966e Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Thu, 16 Jan 2025 12:16:55 +0100 Subject: [PATCH 63/82] pay-respects: add bloxx12 to maintainers --- pkgs/by-name/pa/pay-respects/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pa/pay-respects/package.nix b/pkgs/by-name/pa/pay-respects/package.nix index 754e39ab8114e..84d4acd89e437 100644 --- a/pkgs/by-name/pa/pay-respects/package.nix +++ b/pkgs/by-name/pa/pay-respects/package.nix @@ -27,12 +27,14 @@ rustPlatform.buildRustPackage rec { openssl ]; - meta = { description = "Terminal command correction, alternative to `thefuck`, written in Rust"; homepage = "https://codeberg.org/iff/pay-respects"; license = lib.licenses.agpl3Plus; - maintainers = with lib.maintainers; [ sigmasquadron ]; + maintainers = with lib.maintainers; [ + sigmasquadron + bloxx12 + ]; mainProgram = "pay-respects"; }; } From 604fa77ed8f3b1a94dc4590ad54907498d36019e Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Thu, 16 Jan 2025 11:36:58 +0000 Subject: [PATCH 64/82] pmount: add debian patches; fix gcc-14 build https://salsa.debian.org/debian/pmount/-/tree/debian/master/debian/patches --- pkgs/by-name/pm/pmount/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/by-name/pm/pmount/package.nix b/pkgs/by-name/pm/pmount/package.nix index 7e52083021d4f..dcef177fad429 100644 --- a/pkgs/by-name/pm/pmount/package.nix +++ b/pkgs/by-name/pm/pmount/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, intltool, ntfs3g, util-linux, @@ -22,6 +23,35 @@ stdenv.mkDerivation rec { sha256 = "db38fc290b710e8e9e9d442da2fb627d41e13b3ee80326c15cc2595ba00ea036"; }; + patches = + let + # https://salsa.debian.org/debian/pmount/-/tree/debian/master/debian/patches + fetchDebPatch = + { name, hash }: + fetchpatch { + inherit name hash; + url = "https://salsa.debian.org/debian/pmount/-/raw/ba05283d4a53aba5349d4397a98d9f45206fb29f/debian/patches/${name}"; + }; + in + map fetchDebPatch [ + { + name = "10_fix-spelling-binary-errors.patch"; + hash = "sha256-G4GsUe1ZdYB7Qv333X1hUjOELITR8A2pqyfEnMDTwHI="; + } + { + name = "20_fix-spelling-manpage-error.patch"; + hash = "sha256-9phF8s7MFSjkhPP24cipeBUps5W1L7YmAE0B1QPx5jk="; + } + { + name = "fix-implicit-function-declaration.patch"; + hash = "sha256-kdwdS9G1X5RtQFKzF6oMIUubGNP7n1ZQNHu8sN1oV4Q="; + } + { + name = "30_exfat-support.patch"; + hash = "sha256-kg9gLhOtdrEDlZfUnT910xI5rNR1zgKKRx2kvFQjbi8="; + } + ]; + nativeBuildInputs = [ intltool util-linux From f292fa21d79a410a8d75808fd8a033edd11d8dd9 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 13 Jan 2025 13:59:20 +0100 Subject: [PATCH 65/82] wipe: Do not strip binary during install --- pkgs/by-name/wi/wipe/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/wi/wipe/package.nix b/pkgs/by-name/wi/wipe/package.nix index 27864e89ba6dd..889b6beaf0954 100644 --- a/pkgs/by-name/wi/wipe/package.nix +++ b/pkgs/by-name/wi/wipe/package.nix @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { sha256 = "180snqvh6k6il6prb19fncflf2jcvkihlb4w84sbndcv1wvicfa6"; }; + postPatch = '' + # Do not strip binary during install + substituteInPlace Makefile.in \ + --replace-fail '$(INSTALL_BIN) -s' '$(INSTALL_BIN)' + ''; + nativeBuildInputs = [ autoreconfHook ]; # fdatasync is undocumented on darwin with no header file which breaks the build. From b4b3c73a946d7e20d7afcaba8e08cef87c4c1412 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 13 Jan 2025 14:00:32 +0100 Subject: [PATCH 66/82] wipe: Switch from sha256 to hash --- pkgs/by-name/wi/wipe/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wi/wipe/package.nix b/pkgs/by-name/wi/wipe/package.nix index 889b6beaf0954..c707e5c022ac9 100644 --- a/pkgs/by-name/wi/wipe/package.nix +++ b/pkgs/by-name/wi/wipe/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/wipe/${version}/${pname}-${version}.tar.bz2"; - sha256 = "180snqvh6k6il6prb19fncflf2jcvkihlb4w84sbndcv1wvicfa6"; + hash = "sha256-RjkWNw+bNbs0QZwsCuPcTApHHbMuhZWvodFMAze2GqA="; }; postPatch = '' From 16238201caa1cb65e68f3dd7bfb0ec1f7152bf9c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 14 Jan 2025 16:38:38 +0100 Subject: [PATCH 67/82] wipe: Set platform to Unix --- pkgs/by-name/wi/wipe/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/wi/wipe/package.nix b/pkgs/by-name/wi/wipe/package.nix index c707e5c022ac9..117a32fec6bb7 100644 --- a/pkgs/by-name/wi/wipe/package.nix +++ b/pkgs/by-name/wi/wipe/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Secure file wiping utility"; homepage = "https://wipe.sourceforge.net/"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.abbradar ]; mainProgram = "wipe"; }; From 310c5c4d3fd457d80365f52c71ac80b9d54a7cc4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 16 Jan 2025 11:40:34 +0100 Subject: [PATCH 68/82] bluez: re-disable test on x86_64-unknown-linux-musl I optimistically removed this because I could no longer reproduce it, but it seems that it is still happening on some machines. :( Fixes: 83b7cf4a00c0 ("bluez: 5.78 -> 5.79") --- pkgs/by-name/bl/bluez/package.nix | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix index 2f7b200b4634b..dc0ed33f38fb0 100644 --- a/pkgs/by-name/bl/bluez/package.nix +++ b/pkgs/by-name/bl/bluez/package.nix @@ -35,13 +35,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-QWSlMDqfcccPSMA/9gvjQjG1aNk6mtXnmSjTTmqg6oo="; }; - patches = [ - (fetchpatch { - name = "musl.patch"; - url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee"; - hash = "sha256-yMXPRPK8aT+luVoXNxx9zIa4c6E0BKYKS55DCfr8EQ0="; - }) - ]; + patches = + [ + (fetchpatch { + name = "musl.patch"; + url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee"; + hash = "sha256-yMXPRPK8aT+luVoXNxx9zIa4c6E0BKYKS55DCfr8EQ0="; + }) + ] + ++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) + # Disable one failing test with musl libc, also seen by alpine + # https://github.com/bluez/bluez/issues/726 + ( + fetchurl { + url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48"; + hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4="; + } + ); buildInputs = [ alsa-lib From 9818cc03f77175b86da85192403d8653f68ada88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 13:06:00 +0000 Subject: [PATCH 69/82] inputplumber: 0.40.0 -> 0.40.1 --- pkgs/by-name/in/inputplumber/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index 358c94e328867..c241ee65b31c3 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage rec { pname = "inputplumber"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${version}"; - hash = "sha256-qo22x+eTqUUJ8Qnjv91QgBTy2SHFYv8JxPaGSnpIN9M="; + hash = "sha256-XDeWdvixxOT1lft4ErprZo/lX8cLiiLu4jWWvWzWnT4="; }; useFetchCargoVendor = true; - cargoHash = "sha256-atGFfl20FrEDVAO422fGsP6+ONLcH5XXOAWD/aWUup4="; + cargoHash = "sha256-+iYEoOdQT5o3xqcZct9U2c5qu5L+/IjGEdH0jwLZVPE="; nativeBuildInputs = [ pkg-config From 7241ef10ca5e8891cdfc3af8c47e733cf6877b42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 13:43:29 +0000 Subject: [PATCH 70/82] kubeseal: 0.27.3 -> 0.28.0 --- pkgs/by-name/ku/kubeseal/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubeseal/package.nix b/pkgs/by-name/ku/kubeseal/package.nix index 1108a67d59967..0c80cb98dc021 100644 --- a/pkgs/by-name/ku/kubeseal/package.nix +++ b/pkgs/by-name/ku/kubeseal/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.27.3"; + version = "0.28.0"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-MPNoYKqY9L+RO+iWMhTF5ZX4JbwXqIOaNSMgwLYLwFY="; + sha256 = "sha256-YyiYryNLSY8XnrA+3AWeQR2p55YNHFfp/sWCevATdZ0="; }; - vendorHash = "sha256-SADHoQULpR+1il1LkqQuvsndpl22FTDBhv54tn9B6jY="; + vendorHash = "sha256-jul74GJivJnL3wjHOqpweezMPZwf8RnLkqkYO44mtHo="; subPackages = [ "cmd/kubeseal" ]; From bb2d0a6b4d7c22337c8167f120ddb308d7f6e479 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 13:45:05 +0000 Subject: [PATCH 71/82] lint-staged: 15.3.0 -> 15.4.0 --- pkgs/by-name/li/lint-staged/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index dd5fa728e8f6c..6130c19dbabcc 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "15.3.0"; + version = "15.4.0"; src = fetchFromGitHub { owner = "okonet"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-TcjJtNELI7jOVpQJJovVTKrrQtHlECUaX6/CeoCXgsA="; + hash = "sha256-upCbaGoP/O2j3PrZzxMneRBNvz/24sUpUOZK8C7R/Bc="; }; - npmDepsHash = "sha256-FWbXo8io35nGk8baYtL7FIx7DI7QQk2JsAoJPQ9dWp8="; + npmDepsHash = "sha256-V/AUZV7Ru0TrD0PIm82ppWlqKwzbeiFm+CZO/PtSI+s="; dontNpmBuild = true; From 69d90485a54d76090e1ac5b9444d69242cc9d01a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Jan 2025 00:04:13 +0100 Subject: [PATCH 72/82] python3Packages.unicodedata2: 15.1.0 -> 16.0.0 https://github.com/fonttools/unicodedata2/releases/tag/16.0.0 --- pkgs/development/python-modules/unicodedata2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix index 4857edc8d73ee..b2ef805de809b 100644 --- a/pkgs/development/python-modules/unicodedata2/default.nix +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "unicodedata2"; - version = "15.1.0"; + version = "16.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit version pname; - hash = "sha256-yzDxia1mSC+FKaRdpxsqiEHpvSuzdswpMwA6SlWgdkg="; + sha256 = "05488d6592b59cd78b61ec37d38725416b2df62efafa6a0d63a631b27aa474fc"; }; nativeCheckInputs = [ pytestCheckHook ]; From ee1fe43d4e473e1f7487eb678c9713b4006edb24 Mon Sep 17 00:00:00 2001 From: Vladyslav Pekker Date: Thu, 16 Jan 2025 11:22:39 -0300 Subject: [PATCH 73/82] bloop: 2.0.6 -> 2.0.7 --- pkgs/by-name/bl/bloop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix index 3494fc604e7a8..66f5cf6ed7987 100644 --- a/pkgs/by-name/bl/bloop/package.nix +++ b/pkgs/by-name/bl/bloop/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "2.0.6"; + version = "2.0.7"; platform = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then - "sha256-9AhQpaahhUvWVZBx2O6KsCON60EXC1bJlMxxgJj9oMA=" + "sha256-ztQEzW8bGhTURPpZmYcax8Ms2HJ78XkgEfdFBUQ6rLQ=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then - "sha256-qu8Q7GqEkWCRHyslTCRPe5EdBH7GTXyonaXnJ6DYSlw=" + "sha256-t/+TnMSkJCLYM0nqJVBzdpARqPHB3ojRQZ8iPp0EPlM=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then - "sha256-j4lM32BLF6aPH/7Y7H18HHmvprjKUqdmbqvdWXpD9uE=" + "sha256-qnyZxE/Bt+tXz08N60BQaLn7zzGE5eV/5mJ/BHHE8nU=" else throw "unsupported platform"; }; From d719fb1c4cbdd5155d9a91e4c5d925c0da992b1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 14:45:49 +0000 Subject: [PATCH 74/82] orchard: 0.26.2 -> 0.26.3 --- pkgs/by-name/or/orchard/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix index 8c3518c74f0a5..16139e4c6f4c8 100644 --- a/pkgs/by-name/or/orchard/package.nix +++ b/pkgs/by-name/or/orchard/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "orchard"; - version = "0.26.2"; + version = "0.26.3"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = version; - hash = "sha256-j072161KN/4VjHnxF6fqnVOoWhKlDTNzDZKzX2TK5Y0="; + hash = "sha256-jBsNJLHgeUn3Mw257shNzaCzl3YahZ2gGpneGMMyxfA="; # 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; From 0dd7f3032e326dfb2f1a3ffbe597ec2ce198efff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 16 Jan 2025 14:53:09 +0000 Subject: [PATCH 75/82] jcli: 0.0.46 -> 0.0.47 --- pkgs/by-name/jc/jcli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/jc/jcli/package.nix b/pkgs/by-name/jc/jcli/package.nix index d32957e245380..1aa9731b5bd3d 100644 --- a/pkgs/by-name/jc/jcli/package.nix +++ b/pkgs/by-name/jc/jcli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "jcli"; - version = "0.0.46"; + version = "0.0.47"; src = fetchFromGitHub { owner = "jenkins-zh"; repo = "jenkins-cli"; tag = "v${version}"; - hash = "sha256-l0qpyrggDJSzaJMbhgJYVK2Y3A/R+xS0Qoy3afA/eGo="; + hash = "sha256-HsuYTgGe0cDRAG5FP77CGJG+xCDSWjBthPeAclmqd44="; }; - vendorHash = "sha256-0x0Cl6cqullGIvtQTlHTGnWz9dBCT7aMEIRSB/Cuy8k="; + vendorHash = "sha256-Ld59i91k1tyR9BhlRohHiRPB8Zt3rQWMtRw+J+13TFw="; ldflags = [ "-s" From c8ba1d6fa042515d2f26bdf03fea613c6c7dcca9 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 16 Jan 2025 14:55:50 +0000 Subject: [PATCH 76/82] raycast: 1.88.4 -> 1.89.0 Changelog: https://www.raycast.com/changelog/1-89-0 --- pkgs/by-name/ra/raycast/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/raycast/package.nix b/pkgs/by-name/ra/raycast/package.nix index 828ac219fd307..2e794fc3a8de0 100644 --- a/pkgs/by-name/ra/raycast/package.nix +++ b/pkgs/by-name/ra/raycast/package.nix @@ -12,19 +12,19 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.88.4"; + version = "1.89.0"; src = { aarch64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=arm"; - hash = "sha256-q3pX/mOl/u9KMcAfvXm4giYKjnTB903N1ibubvaO9Uw="; + hash = "sha256-v/0Sg7f/pf7wt7r0+ewSXGKgBqMFnOwldKQUwKQ8Fz0="; }; x86_64-darwin = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=x86_64"; - hash = "sha256-l61AVKx+aYmgnVK8d+by2pKiu1cIAueLipRjOzCvib4="; + hash = "sha256-UIdoFcnXeCpf1CSBTmdxkP5uKz+WoJt5u5u6MXCqnG4="; }; } .${stdenvNoCC.system} or (throw "raycast: ${stdenvNoCC.system} is unsupported."); From 0b0a0bbaf13ea2cc26b9c1c9f558cafcebbd8c2b Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Wed, 15 Jan 2025 21:07:30 -0800 Subject: [PATCH 77/82] cargo: fix install check phase when cross --- pkgs/development/compilers/rust/cargo.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 6ece7c304fc57..7000f1daadd45 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -65,7 +65,7 @@ rustPlatform.buildRustPackage.override { doInstallCheck = !stdenv.hostPlatform.isStatic && stdenv.hostPlatform.isElf; installCheckPhase = '' runHook preInstallCheck - readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so' + ${stdenv.cc.targetPrefix}readelf -a $out/bin/.cargo-wrapped | grep -F 'Shared library: [libcurl.so' runHook postInstallCheck ''; From f1d2f766844c65dead454a55ce443dd244061ea1 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 16 Jan 2025 02:08:35 +0800 Subject: [PATCH 78/82] v2ray-geoip: 202403140037 -> 202501160051 --- pkgs/by-name/v2/v2ray-geoip/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/v2/v2ray-geoip/package.nix b/pkgs/by-name/v2/v2ray-geoip/package.nix index 8c17c7395b98c..249fe0e26581b 100644 --- a/pkgs/by-name/v2/v2ray-geoip/package.nix +++ b/pkgs/by-name/v2/v2ray-geoip/package.nix @@ -11,22 +11,22 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-geoip"; - version = "202403140037"; + version = "202501160051"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = version; - hash = "sha256-nqobjgeDvD5RYvCVVd14XC/tb/+SVfvdQUFZ3gfeDrI="; + tag = version; + hash = "sha256-WSi7xsjKqQT37lzkOY1WZwvx5RXNKO3aMwnMiMBwMdA="; }; - vendorHash = "sha256-cuKcrYAzjIt6Z4wYg5R6JeL413NDwTub2fZndXEKdTo="; + vendorHash = "sha256-nvJsifXF6u3eWqd9X0kGZxASEs/LX2dQraZAwgnw060="; - meta = with lib; { + meta = { description = "GeoIP for V2Ray"; homepage = "https://github.com/v2fly/geoip"; - license = licenses.cc-by-sa-40; - maintainers = with maintainers; [ nickcao ]; + license = lib.licenses.cc-by-sa-40; + maintainers = with lib.maintainers; [ nickcao ]; }; }; input = { @@ -37,6 +37,7 @@ let }; }; in + stdenvNoCC.mkDerivation { inherit (generator) pname src; inherit (dbip-country-lite) version; @@ -52,13 +53,17 @@ stdenvNoCC.mkDerivation { buildPhase = '' runHook preBuild + ${generator}/bin/geoip + runHook postBuild ''; installPhase = '' runHook preInstall - install -Dm444 -t "$out/share/v2ray" output/dat/{cn,geoip-only-cn-private,geoip,private}.dat + + install -Dm444 -t "$out/share/v2ray" output/{cn,geoip-only-cn-private,geoip,private}.dat + runHook postInstall ''; From 2599327bc48f151f3c725a4a92902561af98da73 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 16 Jan 2025 16:54:07 +0100 Subject: [PATCH 79/82] ruff: 0.9.1 -> 0.9.2 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.9.1...0.9.2 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.9.2 --- pkgs/by-name/ru/ruff/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index dba3649e164ab..aa97ab3e25537 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -17,17 +17,17 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = version; - hash = "sha256-QLg86MDeIykILChyYaOPUEV2hZmeJkIPztNW5t+StFE="; + hash = "sha256-DKDSjiN7Ve/1mHWXoYOIdJ67MRoJYDR59VuVmfwYJHs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-dLZADdLWZtlN+vK2zyk2mH6GyMqRsm3cWtRJmr3NKWU="; + cargoHash = "sha256-eIiR7pvSOZdB1lTPLtdriO9lkufFY/gX5d2ku53g2vE="; nativeBuildInputs = [ installShellFiles ]; From a453c04f594b1a6d62a970024ae4503dd3d874f9 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Thu, 16 Jan 2025 13:47:25 +0100 Subject: [PATCH 80/82] coq: keep compiling master --- .../science/logic/coq/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 24d9f8bd27968..0edbc90dfa6c3 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -231,17 +231,29 @@ self = stdenv.mkDerivation { mainProgram = "coqide"; }; }; in -if coqAtLeast "8.17" then self.overrideAttrs(_: let - core-stdlib-package = if coqAtLeast "8.21" then "rocq-core" else "coq-stdlib"; in { +if coqAtLeast "8.21" then self.overrideAttrs(_: { + # coq-core is now a shim for rocq buildPhase = '' runHook preBuild make dunestrap - dune build -p coq-core${lib.optionalString (coqAtLeast "8.21") ",rocq-runtime"},${core-stdlib-package},coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES + dune build -p rocq-runtime,rocq-core,coq-core,coqide-server${lib.optionalString buildIde ",rocqide"} -j $NIX_BUILD_CORES runHook postBuild ''; installPhase = '' runHook preInstall - dune install --prefix $out coq-core ${lib.optionalString (coqAtLeast "8.21") "rocq-runtime"} ${core-stdlib-package} coqide-server${lib.optionalString buildIde " coqide"} + dune install --prefix $out rocq-runtime rocq-core coq-core coqide-server${lib.optionalString buildIde " rocqide"} + runHook postInstall + ''; +}) else if coqAtLeast "8.17" then self.overrideAttrs(_: { + buildPhase = '' + runHook preBuild + make dunestrap + dune build -p coq-core,coq-stdlib,coqide-server${lib.optionalString buildIde ",coqide"} -j $NIX_BUILD_CORES + runHook postBuild + ''; + installPhase = '' + runHook preInstall + dune install --prefix $out coq-core coq-stdlib coqide-server${lib.optionalString buildIde " coqide"} runHook postInstall ''; }) else self From 76792578741f30411be306105879bcddb0f9db33 Mon Sep 17 00:00:00 2001 From: Pierre Roux Date: Thu, 16 Jan 2025 13:16:21 +0100 Subject: [PATCH 81/82] coqPackages.stdlib: keep compiling with master --- pkgs/development/coq-modules/stdlib/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/coq-modules/stdlib/default.nix b/pkgs/development/coq-modules/stdlib/default.nix index e75d62a0ce34b..a443daef68f1a 100644 --- a/pkgs/development/coq-modules/stdlib/default.nix +++ b/pkgs/development/coq-modules/stdlib/default.nix @@ -7,7 +7,7 @@ (mkCoqDerivation { pname = "stdlib"; - repo = "coq"; + repo = "stdlib"; owner = "coq"; opam-name = "coq-stdlib"; @@ -30,16 +30,15 @@ useDune = true; configurePhase = '' - patchShebangs stdlib/dev/with-rocq-wrap.sh - ''; # don't run Coq's configure + patchShebangs dev/with-rocq-wrap.sh + ''; buildPhase = '' - cd stdlib - dev/with-rocq-wrap.sh dune build -p coq-stdlib @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + dev/with-rocq-wrap.sh dune build -p rocq-stdlib,coq-stdlib @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} ''; installPhase = '' - dev/with-rocq-wrap.sh dune install --root . coq-stdlib --prefix=$out --libdir $OCAMLFIND_DESTDIR + dev/with-rocq-wrap.sh dune install --root . rocq-stdlib coq-stdlib --prefix=$out --libdir $OCAMLFIND_DESTDIR mkdir $out/lib/coq/ mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version} ''; From dfb1fdf35f6382b2cc261248d6af44dd4df56e5c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 16 Jan 2025 20:45:34 +0400 Subject: [PATCH 82/82] jcli: modernize --- pkgs/by-name/jc/jcli/package.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/jc/jcli/package.nix b/pkgs/by-name/jc/jcli/package.nix index 1aa9731b5bd3d..8d542ff949d50 100644 --- a/pkgs/by-name/jc/jcli/package.nix +++ b/pkgs/by-name/jc/jcli/package.nix @@ -2,6 +2,7 @@ lib, stdenv, buildGoModule, + buildPackages, fetchFromGitHub, installShellFiles, }: @@ -30,21 +31,27 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = + let + jcliBin = + if stdenv.buildPlatform.canExecute stdenv.hostPlatform then + "$out" + else + lib.getBin buildPackages.jcli; + in '' mv $out/bin/{jenkins-cli,jcli} - '' - + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd jcli \ - --bash <($out/bin/jcli completion --type bash) \ - --fish <($out/bin/jcli completion --type fish) \ - --zsh <($out/bin/jcli completion --type zsh) + --bash <(${jcliBin}/bin/jcli completion --type bash) \ + --fish <(${jcliBin}/bin/jcli completion --type fish) \ + --zsh <(${jcliBin}/bin/jcli completion --type zsh) ''; meta = { description = "Jenkins CLI allows you to manage your Jenkins in an easy way"; mainProgram = "jcli"; homepage = "https://github.com/jenkins-zh/jenkins-cli"; - changelog = "https://github.com/jenkins-zh/jenkins-cli/releases/tag/${src.tag}"; + changelog = "https://github.com/jenkins-zh/jenkins-cli/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sikmir ]; };