diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md index 58515087c59a..4bd65746e0dd 100644 --- a/doc/hooks/zig.section.md +++ b/doc/hooks/zig.section.md @@ -1,10 +1,10 @@ -# zig.hook {#zig-hook} +# Zig {#zig} [Zig](https://ziglang.org/) is a general-purpose programming language and toolchain for maintaining robust, optimal and reusable software. -In Nixpkgs, `zig.hook` overrides the default build, check and install phases. +In Nixpkgs, `zig` overrides the default build, check and install phases. -## Example code snippet {#zig-hook-example-code-snippet} +## Example code snippet {#zig-example-code-snippet} ```nix { @@ -16,7 +16,7 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. stdenv.mkDerivation { # . . . - nativeBuildInputs = [ zig.hook ]; + nativeBuildInputs = [ zig ]; zigBuildFlags = [ "-Dman-pages=true" ]; @@ -26,11 +26,11 @@ stdenv.mkDerivation { } ``` -## Variables controlling zig.hook {#zig-hook-variables-controlling} +## Variables controlling zig {#zig-variables-controlling} -### `zig.hook` Exclusive Variables {#zig-hook-exclusive-variables} +### `zig` Exclusive Variables {#zig-exclusive-variables} -The variables below are exclusive to `zig.hook`. +The variables below are exclusive to `zig`. #### `dontUseZigBuild` {#dont-use-zig-build} @@ -44,19 +44,23 @@ Disables using `zigCheckPhase`. Disables using `zigInstallPhase`. -### Similar variables {#zig-hook-similar-variables} +#### `dontSetZigDefaultFlags` {#dont-set-zig-default-flags} + +Disables using a set of default flags when performing zig builds. + +### Similar variables {#zig-similar-variables} The following variables are similar to their `stdenv.mkDerivation` counterparts. -| `zig.hook` Variable | `stdenv.mkDerivation` Counterpart | +| `zig` Variable | `stdenv.mkDerivation` Counterpart | |---------------------|-----------------------------------| | `zigBuildFlags` | `buildFlags` | | `zigCheckFlags` | `checkFlags` | | `zigInstallFlags` | `installFlags` | -### Variables honored by zig.hook {#zig-hook-variables-honored} +### Variables honored by zig {#zig-variables-honored} -The following variables commonly used by `stdenv.mkDerivation` are honored by `zig.hook`. +The following variables commonly used by `stdenv.mkDerivation` are honored by `zig`. - `prefixKey` - `dontAddPrefix` diff --git a/doc/redirects.json b/doc/redirects.json index bc0bf5521384..d52ae8a8f047 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -2713,16 +2713,20 @@ "waf-hook-honored-variables": [ "index.html#waf-hook-honored-variables" ], - "zig-hook": [ + "zig": [ + "index.html#zig", "index.html#zig-hook" ], - "zig-hook-example-code-snippet": [ + "zig-example-code-snippet": [ + "index.html#zig-example-code-snippet", "index.html#zig-hook-example-code-snippet" ], - "zig-hook-variables-controlling": [ + "zig-variables-controlling": [ + "index.html#zig-variables-controlling", "index.html#zig-hook-variables-controlling" ], - "zig-hook-exclusive-variables": [ + "zig-exclusive-variables": [ + "index.html#zig-exclusive-variables", "index.html#zig-hook-exclusive-variables" ], "dont-use-zig-build": [ @@ -2734,10 +2738,15 @@ "dont-use-zig-install": [ "index.html#dont-use-zig-install" ], - "zig-hook-similar-variables": [ + "dont-set-zig-default-flags": [ + "index.html#dont-set-zig-default-flags" + ], + "zig-similar-variables": [ + "index.html#zig-similar-variables", "index.html#zig-hook-similar-variables" ], - "zig-hook-variables-honored": [ + "zig-variables-honored": [ + "index.html#zig-variables-honored", "index.html#zig-hook-variables-honored" ], "xcbuildhook": [ diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 700be9716f53..221dbf6b7028 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -111,7 +111,7 @@ _0x5a4 = { email = "bej86nug@hhu.de"; name = "0x5a4"; - github = "0x5a4"; + github = "einetuer"; githubId = 54070204; }; _0xB10C = { @@ -382,7 +382,7 @@ }; aaravrav = { name = "aaravrav"; - github = "aaravrav"; + github = "Aarav"; githubId = 3279912; }; aarnphm = { @@ -610,7 +610,7 @@ name = "Adam Perkowski"; email = "me@adamperkowski.dev"; matrix = "@adam:matrix.system72.dev"; - github = "adamperkowski"; + github = "koibtw"; githubId = 75480869; keys = [ { fingerprint = "00F6 1623 FB56 BC5B B709 4E63 4CE6 C117 2DF6 BE79"; } @@ -2049,7 +2049,7 @@ }; aprl = { email = "aprl@acab.dev"; - github = "CutestNekoAqua"; + github = "aprilthepink"; githubId = 30842467; name = "April John"; }; @@ -2157,7 +2157,7 @@ }; argrat = { email = "n.bertazzo@protonmail.com"; - github = "argo-v5"; + github = "brtz-cs"; githubId = 98821629; name = "Nicolò Bertazzo"; }; @@ -2326,7 +2326,7 @@ }; asauzeau = { email = "antoine.sauzeau3@gmail.com"; - github = "AntoineSauzeau"; + github = "asauzeau"; githubId = 72159603; name = "Antoine Sauzeau"; }; @@ -2906,7 +2906,7 @@ baileylu = { name = "Luke Bailey"; email = "baileylu@tcd.ie"; - github = "baileyluTCD"; + github = "baileylu121"; githubId = 156000062; }; baitinq = { @@ -5325,7 +5325,7 @@ }; connerohnesorge = { email = "conneroisu@outlook.com"; - github = "conneroisu"; + github = "connerohnesorge"; githubId = 88785126; name = "Conner Ohnesorge"; }; @@ -6070,7 +6070,7 @@ }; davidarmstronglewis = { email = "davidlewis@mac.com"; - github = "oceanlewis"; + github = "hazel-ocean"; githubId = 6754950; name = "Ocean Armstrong Lewis"; }; @@ -6863,7 +6863,7 @@ }; dmvianna = { email = "dmlvianna@gmail.com"; - github = "dmvianna"; + github = "pasunboneleve"; githubId = 1708810; name = "Daniel Vianna"; }; @@ -9133,6 +9133,13 @@ githubId = 23723926; name = "Dash R"; }; + fulsomenko = { + email = "max.blomstervall@gmail.com"; + github = "fulsomenko"; + githubId = 14945057; + name = "Max Emil Yoon Blomstervall"; + keys = [ { fingerprint = "D14A 78F2 AAC5 9A1B 3E1F 0547 044B 046E 5745 CC2B"; } ]; + }; funkeleinhorn = { email = "git@funkeleinhorn.com"; github = "funkeleinhorn"; @@ -11875,7 +11882,7 @@ jayesh-bhoot = { name = "Jayesh Bhoot"; email = "jb@jayeshbhoot.com"; - github = "jbhoot"; + github = "bhootd"; githubId = 1915507; }; jayman2000 = { @@ -16217,7 +16224,7 @@ }; marsupialgutz = { email = "mars@possums.xyz"; - github = "pupbrained"; + github = "skulldogged"; githubId = 33522919; name = "Marshall Arruda"; }; @@ -18788,7 +18795,7 @@ }; nikitavoloboev = { email = "nikita.voloboev@gmail.com"; - github = "nikitavoloboev"; + github = "nikivdev"; githubId = 6391776; name = "Nikita Voloboev"; }; @@ -20355,7 +20362,7 @@ githubId = 6771175; }; pedohorse = { - github = "pedohorse"; + github = "permahorse"; githubId = 13556996; name = "pedohorse"; }; @@ -22644,7 +22651,7 @@ }; robwalt = { email = "robwalter96@gmail.com"; - github = "robwalt"; + github = "JasmineLowen"; githubId = 26892280; name = "Robert Walter"; }; @@ -24242,7 +24249,7 @@ shreerammodi = { name = "Shreeram Modi"; email = "shreerammodi10@gmail.com"; - github = "shrimpram"; + github = "shreerammodi"; githubId = 67710369; keys = [ { fingerprint = "EA88 EA07 26E9 6CBF 6365 3966 163B 16EE 76ED 24CE"; } ]; }; @@ -24977,7 +24984,7 @@ name = "Seraphim Pardee"; matrix = "@xsrp:matrix.org"; email = "me@srp.life"; - github = "SeraphimRP"; + github = "RdrSeraphim"; githubId = 8297347; }; srv6d = { @@ -25083,6 +25090,12 @@ github = "stasjok"; githubId = 1353637; }; + staticdev = { + email = "staticdev-support@proton.me"; + github = "staticdev"; + githubId = 1446633; + name = "Thiago A."; + }; StayBlue = { name = "StayBlue"; email = "blue@spook.rip"; @@ -29179,7 +29192,7 @@ keys = [ { fingerprint = "9270 66BD 8125 A45B 4AC4 0326 6180 7181 F60E FCB2"; } ]; }; yusuf-duran = { - github = "yusuf-duran"; + github = "postgnostic"; githubId = 37774475; name = "Yusuf Duran"; }; @@ -29456,7 +29469,7 @@ ziguana = { name = "Zig Uana"; email = "git@ziguana.dev"; - github = "nomadic-stare"; + github = "Jingles52"; githubId = 45833444; }; zimbatm = { diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index 2b2905bb2f0c..79955a03ef2f 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -32,15 +32,15 @@ in default = { }; example = { "application/pdf" = "firefox.desktop"; - "text/xml" = [ + "text/*" = [ "nvim.desktop" "codium.desktop" ]; }; description = '' Adds associations between mimetypes and applications. See the - [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information. + [specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information. + Globs in all variations are supported. ''; }; @@ -49,15 +49,15 @@ in default = { }; example = { "application/pdf" = "firefox.desktop"; - "image/png" = [ + "image/*" = [ "sxiv.desktop" "gimp.desktop" ]; }; description = '' Sets the default applications for given mimetypes. See the - [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/default) for more information. + [specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/default) for more information. + Globs in all variations are supported. ''; }; @@ -65,7 +65,7 @@ in type = associationOptions; default = { }; example = { - "audio/mp3" = [ + "audio/*" = [ "mpv.desktop" "umpv.desktop" ]; @@ -73,22 +73,55 @@ in }; description = '' Removes associations between mimetypes and applications. See the - [ - specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information. + [specifications](https://specifications.freedesktop.org/mime-apps-spec/latest/associations) for more information. + Globs in all variations are supported. ''; }; }; config = lib.mkIf cfg.enable { environment.etc."xdg/mimeapps.list" = + let + generateMimeScript = + title: attrs: + lib.optionalString (attrs != { }) '' + echo "[${title}]" >> $out + '' + + (lib.concatStringsSep "\n" ( + lib.attrValues ( + lib.mapAttrs ( + k: v: ''generateMimeItem "${k}" "${if lib.isList v then lib.concatStringsSep ";" v else v}"'' + ) attrs + ) + )); + in lib.mkIf (cfg.addedAssociations != { } || cfg.defaultApplications != { } || cfg.removedAssociations != { }) { - text = lib.generators.toINI { } { - "Added Associations" = cfg.addedAssociations; - "Default Applications" = cfg.defaultApplications; - "Removed Associations" = cfg.removedAssociations; - }; + source = pkgs.runCommandLocal "mimeapps.list" { } '' + function generateMimeItem() { + mime=$1 + app=$2 + if [[ $mime == *"*"* ]]; then + while read line; do + if [[ $line == $mime ]]; then + echo "$line=$app" >> $out + fi + done < ${pkgs.shared-mime-info}/share/mime/types + else + echo "$mime=$app" >> $out + fi + } + ${lib.concatStringsSep "\n" ( + lib.attrValues ( + lib.mapAttrs generateMimeScript { + "Added Associations" = cfg.addedAssociations; + "Default Applications" = cfg.defaultApplications; + "Removed Associations" = cfg.removedAssociations; + } + ) + )} + ''; }; environment.pathsToLink = [ "/share/mime" ]; diff --git a/nixos/modules/hardware/xpad-noone.nix b/nixos/modules/hardware/xpad-noone.nix index b229f4fb4b27..7b33d7b1c8b0 100644 --- a/nixos/modules/hardware/xpad-noone.nix +++ b/nixos/modules/hardware/xpad-noone.nix @@ -9,7 +9,7 @@ let in { options.hardware.xpad-noone = { - enable = lib.mkEnableOption "The Xpad driver from the Linux kernel with support for Xbox One controllers removed"; + enable = lib.mkEnableOption "the Xpad driver from the Linux kernel with support for Xbox One controllers removed"; }; config = lib.mkIf cfg.enable { diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 861c8ac8081e..a479b7242f56 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -846,19 +846,33 @@ in environment.etc = lib.genAttrs - (map (file: "zfs/zed.d/${file}") [ - "all-syslog.sh" - "pool_import-led.sh" - "resilver_finish-start-scrub.sh" - "statechange-led.sh" - "vdev_attach-led.sh" - "zed-functions.sh" - "data-notify.sh" - "resilver_finish-notify.sh" - "scrub_finish-notify.sh" - "statechange-notify.sh" - "vdev_clear-led.sh" - ]) + (map (file: "zfs/zed.d/${file}") ( + [ + "all-syslog.sh" + "data-notify.sh" + "history_event-zfs-list-cacher.sh" + "resilver_finish-notify.sh" + "resilver_finish-start-scrub.sh" + "scrub_finish-notify.sh" + "statechange-notify.sh" + ] + ++ lib.optionals (lib.versionOlder cfgZfs.package.version "2.4") [ + "deadman-slot_off.sh" + "pool_import-led.sh" + "statechange-led.sh" + "statechange-slot_off.sh" + "vdev_attach-led.sh" + "vdev_clear-led.sh" + ] + ++ lib.optionals (lib.versionAtLeast cfgZfs.package.version "2.4") [ + "deadman-sync-slot_off.sh" + "pool_import-sync-led.sh" + "statechange-sync-led.sh" + "statechange-sync-slot_off.sh" + "vdev_attach-sync-led.sh" + "vdev_clear-sync-led.sh" + ] + )) (file: { source = "${cfgZfs.package}/etc/${file}"; }) diff --git a/pkgs/applications/editors/jetbrains/builder/linux.nix b/pkgs/applications/editors/jetbrains/builder/linux.nix index bb406773d834..22e2443e020b 100644 --- a/pkgs/applications/editors/jetbrains/builder/linux.nix +++ b/pkgs/applications/editors/jetbrains/builder/linux.nix @@ -62,11 +62,10 @@ lib.makeOverridable mkDerivation ( mainProgram = pname; }; - # FIXME: Do not use meta attributes, see README (`TODO` section) desktopItem = makeDesktopItem { name = pname; exec = pname; - comment = lib.replaceStrings [ "\n" ] [ " " ] meta.longDescription; + comment = lib.trim (lib.replaceString "\n" " " meta.longDescription); desktopName = product; genericName = meta.description; categories = [ "Development" ]; diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix index 0391c23f03ce..a65f4a9eba66 100644 --- a/pkgs/applications/editors/jetbrains/ides/clion.nix +++ b/pkgs/applications/editors/jetbrains/ides/clion.nix @@ -68,7 +68,7 @@ in xz ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/clion/"; description = "C/C++ IDE from JetBrains"; diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix index 15be98d7cfd3..127c4b202003 100644 --- a/pkgs/applications/editors/jetbrains/ides/datagrip.nix +++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix @@ -45,11 +45,14 @@ mkJetBrainsProduct { src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/datagrip/"; description = "Database IDE from JetBrains"; - longDescription = "DataGrip is a new IDE from JetBrains built for database admins. It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more."; + longDescription = '' + DataGrip is an IDE from JetBrains built for database admins. + It allows you to quickly migrate and refactor relational databases, construct efficient, statically checked SQL queries and much more. + ''; maintainers = [ ]; license = lib.licenses.unfree; sourceProvenance = diff --git a/pkgs/applications/editors/jetbrains/ides/dataspell.nix b/pkgs/applications/editors/jetbrains/ides/dataspell.nix index 2b9bc50d6508..63fe6cd3541d 100644 --- a/pkgs/applications/editors/jetbrains/ides/dataspell.nix +++ b/pkgs/applications/editors/jetbrains/ides/dataspell.nix @@ -55,11 +55,14 @@ mkJetBrainsProduct { '') ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/dataspell/"; description = "Data science IDE from JetBrains"; - longDescription = "DataSpell is a new IDE from JetBrains built for Data Scientists. Mainly it integrates Jupyter notebooks in the IntelliJ platform."; + longDescription = '' + DataSpell is an IDE from JetBrains built for Data Scientists. + Mainly it integrates Jupyter notebooks in the IntelliJ platform. + ''; maintainers = with lib.maintainers; [ leona ]; license = lib.licenses.unfree; sourceProvenance = diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/applications/editors/jetbrains/ides/gateway.nix index 57ba1d01f4f1..bb51cce64b4c 100644 --- a/pkgs/applications/editors/jetbrains/ides/gateway.nix +++ b/pkgs/applications/editors/jetbrains/ides/gateway.nix @@ -50,11 +50,11 @@ mkJetBrainsProduct { libgcc ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/remote-development/gateway/"; description = "Remote development for JetBrains products"; - longDescription = "JetBrains Gateway is a lightweight launcher that connects a remote server with your local machine, downloads necessary components on the backend, and opens your project in JetBrains Client."; + longDescription = "JetBrains Gateway is a lightweight launcher that connects a remote server with your local machine and opens your project in JetBrains Client."; maintainers = [ ]; license = lib.licenses.unfree; sourceProvenance = diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix index e9ebf44bb7dd..ed4ed7320743 100644 --- a/pkgs/applications/editors/jetbrains/ides/goland.nix +++ b/pkgs/applications/editors/jetbrains/ides/goland.nix @@ -53,12 +53,14 @@ in libgcc ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/go/"; description = "Go IDE from JetBrains"; - longDescription = "Goland is the codename for a new commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development. - The new IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language"; + longDescription = '' + Goland is a commercial IDE by JetBrains aimed at providing an ergonomic environment for Go development. + The IDE extends the IntelliJ platform with the coding assistance and tool integrations specific for the Go language. + ''; maintainers = with lib.maintainers; [ tymscar ]; license = lib.licenses.unfree; sourceProvenance = diff --git a/pkgs/applications/editors/jetbrains/ides/idea-oss.nix b/pkgs/applications/editors/jetbrains/ides/idea-oss.nix index 0be07638ad8f..25c3da649f0c 100644 --- a/pkgs/applications/editors/jetbrains/ides/idea-oss.nix +++ b/pkgs/applications/editors/jetbrains/ides/idea-oss.nix @@ -57,11 +57,14 @@ mkJetBrainsProduct { ''--set M2 "${maven}/maven/bin"'' ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/idea/"; - description = "Free Java, Kotlin, Groovy and Scala IDE from Jetbrains (built from source)"; - longDescription = "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ."; + description = "Free Java, Kotlin, Groovy and Scala IDE from JetBrains (built from source)"; + longDescription = '' + IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. + Also known as IntelliJ. + ''; maintainers = with lib.maintainers; [ gytis-ivaskevicius tymscar diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix index beea85af05ef..07ecdd65c560 100644 --- a/pkgs/applications/editors/jetbrains/ides/idea.nix +++ b/pkgs/applications/editors/jetbrains/ides/idea.nix @@ -60,11 +60,14 @@ mkJetBrainsProduct { musl ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/idea/"; - description = "Java, Kotlin, Groovy and Scala IDE from Jetbrains"; - longDescription = "IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. Also known as IntelliJ."; + description = "Java, Kotlin, Groovy and Scala IDE from JetBrains"; + longDescription = '' + IDE for Java SE, Groovy & Scala development Powerful environment for building Google Android apps Integration with JUnit, TestNG, popular SCMs, Ant & Maven. + Also known as IntelliJ. + ''; maintainers = with lib.maintainers; [ gytis-ivaskevicius tymscar diff --git a/pkgs/applications/editors/jetbrains/ides/mps.nix b/pkgs/applications/editors/jetbrains/ides/mps.nix index d01b9ad29d85..52e18be29bcd 100644 --- a/pkgs/applications/editors/jetbrains/ides/mps.nix +++ b/pkgs/applications/editors/jetbrains/ides/mps.nix @@ -45,7 +45,7 @@ mkJetBrainsProduct { src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/mps/"; description = "IDE for building domain-specific languages from JetBrains"; diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix index ca54b511614e..a121ce982e89 100644 --- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix @@ -49,11 +49,11 @@ mkJetBrainsProduct { musl ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/phpstorm/"; description = "PHP IDE from JetBrains"; - longDescription = "PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code. "; + longDescription = "PhpStorm provides an editor for PHP, HTML and JavaScript with on-the-fly code analysis, error prevention and automated refactorings for PHP and JavaScript code."; maintainers = with lib.maintainers; [ dritter tymscar diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm-oss.nix b/pkgs/applications/editors/jetbrains/ides/pycharm-oss.nix index 9b79a69e0ed9..48b70636f4b5 100644 --- a/pkgs/applications/editors/jetbrains/ides/pycharm-oss.nix +++ b/pkgs/applications/editors/jetbrains/ides/pycharm-oss.nix @@ -50,11 +50,15 @@ in product = "PyCharm Open Source"; productShort = "PyCharm"; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/pycharm/"; description = "Free Python IDE from JetBrains (built from source)"; - longDescription = "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!"; + longDescription = '' + Python IDE with complete set of tools for productive development with Python programming language. + In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. + It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing and powerful Debugger. + ''; maintainers = with lib.maintainers; [ genericnerdyusername tymscar diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm.nix b/pkgs/applications/editors/jetbrains/ides/pycharm.nix index 222642ace59d..fdc519f52406 100644 --- a/pkgs/applications/editors/jetbrains/ides/pycharm.nix +++ b/pkgs/applications/editors/jetbrains/ides/pycharm.nix @@ -38,7 +38,6 @@ in wmClass = "jetbrains-pycharm"; product = "PyCharm"; - productShort = "PyCharm"; # update-script-start: version version = "2025.3.1"; @@ -51,11 +50,15 @@ in musl ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/pycharm/"; description = "Python IDE from JetBrains"; - longDescription = "Python IDE with complete set of tools for productive development with Python programming language. In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing, powerful all-singing all-dancing Debugger and entire customization. PyCharm is developer driven IDE. It was developed with the aim of providing you almost everything you need for your comfortable and productive development!"; + longDescription = '' + Python IDE with complete set of tools for productive development with Python programming language. + In addition, the IDE provides high-class capabilities for professional Web development with Django framework and Google App Engine. + It has powerful coding assistance, navigation, a lot of refactoring features, tight integration with various Version Control Systems, Unit testing and powerful Debugger. + ''; maintainers = with lib.maintainers; [ genericnerdyusername tymscar diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix index 9b454d68c509..5fde0c16fbff 100644 --- a/pkgs/applications/editors/jetbrains/ides/rider.nix +++ b/pkgs/applications/editors/jetbrains/ides/rider.nix @@ -78,11 +78,15 @@ in libX11 ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/rider/"; description = ".NET IDE from JetBrains"; - longDescription = "JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper. Rider supports .NET Core, .NET Framework and Mono based projects. This lets you develop a wide array of applications including .NET desktop apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications."; + longDescription = '' + JetBrains Rider is a new .NET IDE based on the IntelliJ platform and ReSharper. + Rider supports .NET Core, .NET Framework and Mono based projects. + This lets you develop a wide array of applications including .NET desktop apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications. + ''; maintainers = with lib.maintainers; [ raphaelr ]; license = lib.licenses.unfree; sourceProvenance = diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix index 84dc6cb1d887..5de4e0300216 100644 --- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix +++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix @@ -49,7 +49,7 @@ mkJetBrainsProduct { musl ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/ruby/"; description = "Ruby IDE from JetBrains"; diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix index 30289c80def1..613242d5b46b 100644 --- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix +++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix @@ -63,7 +63,7 @@ in xz ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/rust/"; description = "Rust IDE from JetBrains"; diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix index bce2d34a87b0..f702f1397bfe 100644 --- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix @@ -49,7 +49,7 @@ mkJetBrainsProduct { musl ]; - # NOTE: meta attrs are currently used by the desktop entry, so changing them may cause rebuilds (see TODO in README) + # NOTE: meta attrs are used for the Linux desktop entries and may cause rebuilds when changed meta = { homepage = "https://www.jetbrains.com/webstorm/"; description = "Web IDE from JetBrains"; diff --git a/pkgs/applications/editors/jetbrains/readme.md b/pkgs/applications/editors/jetbrains/readme.md index 220c2b210d9c..17960628356b 100644 --- a/pkgs/applications/editors/jetbrains/readme.md +++ b/pkgs/applications/editors/jetbrains/readme.md @@ -56,8 +56,6 @@ Any comments or other manual changes between these markers will be removed when - Add it to `default.nix` ### TODO: - - remove the usage of `meta.` properties for building the Linux desktop files - (JetBrains already provides their own Desktop files, we can just use those probably?) - drop the community IDEs - Switch `mkJetbrainsProduct` to use `lib.extendMkDerivation`, see also: - https://github.com/NixOS/nixpkgs/pull/475183#discussion_r2655305961 diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index dff3b671517b..8e270b905249 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1965,8 +1965,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.62.1"; - hash = "sha256-Sbtrmla1vRZ7isSvr5QhDiP519/IG/VJ5zI9Y28UFx4="; + version = "6.64.1"; + hash = "sha256-kJqn7xNI6DF10h+CemsO0E80oJBifMdKKxpKJ3Y6PJ4="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -3196,8 +3196,8 @@ let mktplcRef = { name = "vscode-kubernetes-tools"; publisher = "ms-kubernetes-tools"; - version = "1.3.28"; - hash = "sha256-5O0WxTuAIDeTk2/YospejjvHWVkCcMvVwiVYQWQYZKc="; + version = "1.3.29"; + hash = "sha256-FzNVg925O76GTmc/14W/IjC5VLkKoRIlK1p/b+xRsiw="; }; meta = { license = lib.licenses.mit; @@ -3854,8 +3854,8 @@ let mktplcRef = { publisher = "redhat"; name = "java"; - version = "1.50.0"; - hash = "sha256-QF9CTfhhwq+Ld3M31VRaZaAUsBDiUTNdbbOwjlE66Zk="; + version = "1.51.0"; + hash = "sha256-uOTvQjLDkMjzTfc98cq+WlvKwRQfPpTrlXKbWG7Gy+c="; }; buildInputs = [ jdk ]; meta = { @@ -5048,8 +5048,8 @@ let mktplcRef = { name = "vscode-gradle"; publisher = "vscjava"; - version = "3.17.1"; - hash = "sha256-3AGa1S6WN7zVaKxjHVba+CjXhEq8PjTD5HU5WY9pF4c="; + version = "3.17.2"; + hash = "sha256-oBtUDkuGMu7/CvxiHxvbiHHTQ2dG85VY08es9u3xKJk="; }; meta = { diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index ef5747902b28..fdb6fffad5be 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -144,9 +144,9 @@ rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "10.19"; + version = "10.20"; url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz"; - hash = "sha256-fOxYMjxvKq7nrKk1Fzecu/75biwsWAxo/4XdAAy73UY="; + hash = "sha256-gbShU5WPYkf+UEHV32Xq3Lvuoba6jNok6349fOLR/jw="; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE @@ -156,7 +156,7 @@ rec { # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { inherit version; - hash = "sha256-GmHeqHZPnFZkntMOJJzRDUN9H+G1qXdacy/Al6T5eZU="; + hash = "sha256-Ys0VNYj568qMHq56ZCprnsbpb/iqtiDlU3w0er8Ol5g="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index f30c4262a176..20b7886b74d5 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -7,6 +7,7 @@ openjdk17-bootstrap, jdk11, jdk8, + writeScript, }: let @@ -16,6 +17,7 @@ let hash, platform ? "", jdk, + updateScript ? null, ... }@attrs: let @@ -83,21 +85,34 @@ let maintainers = with lib.maintainers; [ kalbasit kashw2 + Misaka13514 ]; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.unfree; platforms = lib.platforms.unix; }; + passthru.updateScript = updateScript; }; in { charles5 = ( generic { - version = "5.0"; - hash = "sha256-gvspRI3uF7bjE4UBuTGS5+n2h0nKudLtW3sqs2GZIyM="; + version = "5.0.3"; + hash = "sha256-SiZ15ekuAW7AyXBHN5Zel4ZFL/4oNy1td64NQ0GNUhE="; platform = "_x86_64"; jdk = openjdk17-bootstrap; + + updateScript = writeScript "update-charles" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + + set -eu -o pipefail + + version=$(curl -A "Mozilla/5.0" -s https://www.charlesproxy.com/download/ | grep -oP 'Version \K[0-9.]+' | head -n1) + + update-source-version charles5 "$version" + ''; } ); charles4 = ( diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 50ce905b8fbe..9626070a3dd0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1130,11 +1130,11 @@ "vendorHash": "sha256-33NOGIvqLpgndG68GxAeoiISjWV7ApR4jmvqyZHjPKo=" }, "rootlyhq_rootly": { - "hash": "sha256-aAZTcZ97/rPOfvBwmPTp3BF/G0IkrCrx0u4yPiTfXrY=", + "hash": "sha256-v/CdJiEmMmmtQ0EhDxg6IT3FGWs3jeuZ/BKhmcHi9XM=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v5.2.1", + "rev": "v5.2.2", "spdx": "MPL-2.0", "vendorHash": "sha256-H0ohTNvSeFYEhHFIJoY37asNWwe+s2RKsDzYbx1CkJw=" }, diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index c9cbd659aafc..0d93c3d9b056 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -42,14 +42,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "6.3.4"; + version = "6.4.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-0d5PFo0tv8yayHqsd44gvodgbyRb1b5IPXtJahkWjHU="; + hash = "sha256-jmUj0kTyok5CsOe/to6bTN3jH/RMF7jE+AnFJi2nW90="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/softmaker/softmaker-office-nx.nix b/pkgs/applications/office/softmaker/softmaker-office-nx.nix index 0c0a8369d922..e6e4e1c33937 100644 --- a/pkgs/applications/office/softmaker/softmaker-office-nx.nix +++ b/pkgs/applications/office/softmaker/softmaker-office-nx.nix @@ -6,9 +6,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. officeVersion ? { - version = "1228"; + version = "1230"; edition = ""; - hash = "sha256-Va0QkLQtsPbDAo3ygfp6UKr0OkLLBS0yAup+xLoLD0s="; + hash = "sha256-/4qKFnLoou1ZuGkRt+2Yf/FPGOnYhx7fnE+8D3gutaY="; }, ... diff --git a/pkgs/applications/office/softmaker/softmaker-office.nix b/pkgs/applications/office/softmaker/softmaker-office.nix index ef178c0ce109..e92103a3bd1a 100644 --- a/pkgs/applications/office/softmaker/softmaker-office.nix +++ b/pkgs/applications/office/softmaker/softmaker-office.nix @@ -7,9 +7,9 @@ # Softmaker Office or when the upstream archive was replaced and # nixpkgs is not in sync yet. officeVersion ? { - version = "1228"; + version = "1230"; edition = "2024"; - hash = "sha256-3/pdn3LLYy5U6GZp5jABH2oMpP/kDU9oAO9KvMwo9V8="; + hash = "sha256-xaXS22feHbRVPWP43vGbfptoT2S6jLUrGVFQ3xY7SJY="; }, ... diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix index 8a64403ef504..ee4ffc8d32ef 100644 --- a/pkgs/by-name/_2/_2ship2harkinian/package.nix +++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix @@ -106,15 +106,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "2ship2harkinian"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "HarbourMasters"; repo = "2ship2harkinian"; tag = finalAttrs.version; - hash = "sha256-EC8o5FIP/eXa+0LZt0C8EWHzKVAniv9SIXkZdbibcxg="; + hash = "sha256-3TmgOhlcYpu5FYvn9xblmNxwYUVSLjyE4VKbddR6D9s="; fetchSubmodules = true; - fetchTags = true; deepClone = true; postFetch = '' cd $out diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index b96402195205..d0e5002c6115 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -10,13 +10,13 @@ telegram-desktop.override { inherit withWebkit; unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec { pname = "64gram-unwrapped"; - version = "1.1.88"; + version = "1.1.93"; src = fetchFromGitHub { owner = "TDesktop-x64"; repo = "tdesktop"; tag = "v${version}"; - hash = "sha256-zC51hlfi4EwqaDBTQev7KAYvQmUMJl1RBWh5/By2GUU="; + hash = "sha256-AwzTmEaN6MsJNq1W+cyAbg+QkYrPaV2LXmt3NzKc/vQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index 5f955f2f4b48..c6c8a6cd5192 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "3.3.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; tag = "v${version}"; - hash = "sha256-MzQ8Tefwct4/LlTWA8BpnnHMSzWmKvnf0OO5exAzIfI="; + hash = "sha256-2xrued35FRqmtZjrMTBtl5r/TB/pXNhhcKOfuwjxrhc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ag/agate/package.nix b/pkgs/by-name/ag/agate/package.nix index 7489c98e1ae1..346303f5200f 100644 --- a/pkgs/by-name/ag/agate/package.nix +++ b/pkgs/by-name/ag/agate/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "agate"; - version = "3.3.19"; + version = "3.3.20"; __darwinAllowLocalNetworking = true; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "mbrubeck"; repo = "agate"; tag = "v${finalAttrs.version}"; - hash = "sha256-MPBjGtrQFM24ilBYJubfnfVHmTTIkNuWbfdbVYAXvtI="; + hash = "sha256-MV0fZo5tpRA5mkxzo5bGM5ASh+zxQbqrg1lL65IcUg8="; }; - cargoHash = "sha256-8llvdpF8kQtLxsu5Ynn7Cw/LXXdE0N7ACVVeJtccwuQ="; + cargoHash = "sha256-gteG7Oa15MtQPTu5/fZCmul1cDz7Lf19jEt7jELR6X4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ai/airshipper/package.nix b/pkgs/by-name/ai/airshipper/package.nix index aba284758545..4731be7ce016 100644 --- a/pkgs/by-name/ai/airshipper/package.nix +++ b/pkgs/by-name/ai/airshipper/package.nix @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage { makeWrapper ]; - RUSTC_BOOTSTRAP = 1; # We need rust unstable features + env.RUSTC_BOOTSTRAP = 1; # We need rust unstable features postInstall = '' install -Dm444 -t "$out/share/applications" "client/assets/net.veloren.airshipper.desktop" diff --git a/pkgs/by-name/al/alistral/package.nix b/pkgs/by-name/al/alistral/package.nix index 95a5cfb11253..5fae411a7640 100644 --- a/pkgs/by-name/al/alistral/package.nix +++ b/pkgs/by-name/al/alistral/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "alistral"; - version = "0.6.3"; + version = "0.6.5"; src = fetchFromGitHub { owner = "RustyNova016"; repo = "Alistral"; tag = "v${finalAttrs.version}"; - hash = "sha256-lbdyE/k28fJzrOQEKDL8ZLnm6tNcAM4tsfHpcGlJB9s="; + hash = "sha256-X+yTt/oaV0ev0yexTcS0egcv0SQHFMysqSNEhZgikV0="; }; - cargoHash = "sha256-smoUGJSMmRKdnUz4L+LvPOH/A6CHVmkiHxdyesu+BTw="; + cargoHash = "sha256-XFBBtTF9V5l2CIyCRbvJqNkbPAT+Yi6PtnN1hjpKrsI="; buildNoDefaultFeatures = true; # Would be cleaner with an "--all-features" option diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index f8065398b1f5..8cc12149f9e8 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "0.30.34"; + version = "0.30.35"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-kKYjy3Z5Irel+P2B2Ri6hyPJZ+UuWg7vJypOSN0Rdqw="; + hash = "sha256-2jgIJ1vEaIdfWouQeK/WnHXymcNRwawW9nnsXkamQaQ="; # 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; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-+rgkyTmuD3OMil5vO9xDcAvNl19JfvqPz3zotDiGPCU="; + vendorHash = "sha256-KBLthYP5dwtuzfa4f1KARmG5ecStzTwsnX2E95z3S2Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix index 1a10f8224352..38a5f7b4f486 100644 --- a/pkgs/by-name/ay/ayugram-desktop/package.nix +++ b/pkgs/by-name/ay/ayugram-desktop/package.nix @@ -12,13 +12,13 @@ telegram-desktop.override { unwrapped = telegram-desktop.unwrapped.overrideAttrs ( finalAttrs: previousAttrs: { pname = "ayugram-desktop-unwrapped"; - version = "6.2.4"; + version = "6.3.10"; src = fetchFromGitHub { owner = "AyuGram"; repo = "AyuGramDesktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-bFGk8lqPlNlaxbrulYe0+8ayj33frctruce3/TZ+W2c="; + hash = "sha256-kyxnr246bhxHpDUhhEnraDtHZDnF2uU2tdmfIvPnKHo="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/b3/b3sum/package.nix b/pkgs/by-name/b3/b3sum/package.nix index 6d7d5d0730fa..8b079ab90923 100644 --- a/pkgs/by-name/b3/b3sum/package.nix +++ b/pkgs/by-name/b3/b3sum/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage rec { pname = "b3sum"; - version = "1.8.2"; + version = "1.8.3"; src = fetchCrate { inherit version pname; - hash = "sha256-/qyBs+t8n5I6uf1dSc3E0yHpdlUz77pvlqV5+r4dRBc="; + hash = "sha256-mU2r5xbYf6A1RibWqhow/637YxybCFMT3UzYcUMjhdg="; }; - cargoHash = "sha256-PKVDfBFWQY95FxJ66vl6E26GEZChNCsA3ST++iieYSM="; + cargoHash = "sha256-w9l8dn4Ahck3NXuN4Ph9qmGoS767/mQRBgO9AT0CH3Y="; meta = { description = "BLAKE3 cryptographic hash function"; diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 5a4f2a4cc8c5..ef2b407dbfbc 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -9,10 +9,10 @@ }: let pname = "beeper"; - version = "4.2.367"; + version = "4.2.455"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-t2knYAy6G/Xd/dOAvqA+wiTa6K//maHiwjY7Apshjhk="; + hash = "sha256-3FHaPIJb40ta/+sguolz2QQBKkGgd1P3CgyEHHxX5xA="; }; appimageContents = appimageTools.extract { inherit pname version src; diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix index a59ef46cfc20..ad6b054a84b1 100644 --- a/pkgs/by-name/ca/caprine/package.nix +++ b/pkgs/by-name/ca/caprine/package.nix @@ -11,18 +11,18 @@ buildNpmPackage rec { pname = "caprine"; - version = "2.60.3"; + version = "2.61.0"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "caprine"; rev = "v${version}"; - hash = "sha256-yfCilJ62m7nKe8B+4puwAbNgr2g1P7HaKIhFINdv0/k="; + hash = "sha256-hBGsqOqKMHNy2SNw1kHCQq1lPDd2S36L5pdKgD2O8FA="; }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - npmDepsHash = "sha256-hNOAplCSXrO4NZqDTkmhf0oZVeGRUHr2Y/Qdx2RIV9c="; + npmDepsHash = "sha256-FgOHuMMUX92VHF6hdznoi7bhO/27t6+l038kmpqjctQ="; nativeBuildInputs = [ copyDesktopItems ]; diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index da9f27c63749..dbfd245e1717 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-deny"; - version = "0.18.9"; + version = "0.19.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; tag = finalAttrs.version; - hash = "sha256-2ZexBVt3+tnEwxtRuzS6f7BQyu/nvjC098221hadKw8="; + hash = "sha256-kDjRP+UXYzsXTrcsPbomtATzDVTSZqXoRXf6qqCGOZw="; }; - cargoHash = "sha256-2u1DQtvjRfwbCXnX70M7drrMEvNsrVxsbikgrnNOkUE="; + cargoHash = "sha256-Lu1KhQmsQGvzgozFTcv9/hY3ZXOuaxkv0I+QPmAdZBU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ce/celeste/package.nix b/pkgs/by-name/ce/celeste/package.nix index 911d3f54429a..e3535bf41e09 100644 --- a/pkgs/by-name/ce/celeste/package.nix +++ b/pkgs/by-name/ce/celeste/package.nix @@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec { --replace-warn 'edition = "2021"' 'edition = "2024"' ''; - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ just diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index 1b6a2c7cea40..f9658022a785 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cfspeedtest"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "code-inflation"; repo = "cfspeedtest"; tag = "v${finalAttrs.version}"; - hash = "sha256-MWVWYA++gxcKcCvBynVmm+l3qoSb6JKUtGUbRWEGrP8="; + hash = "sha256-KeJ/p9kXfI3OuAyNUx2C6DKpmtL3239uHpWAf4mDr4Q="; }; - cargoHash = "sha256-Oa+k+iBkKFdDcMAxrDdLNWhy2CakbX1G+AMlwGQFBsk="; + cargoHash = "sha256-mXSbbY3nuhEw+QUk6gt71HIh2gKNBO6C0trZbyzbpnM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/cn/cnsprcy/package.nix b/pkgs/by-name/cn/cnsprcy/package.nix index 662df4a1f5ca..4e4f8778bef4 100644 --- a/pkgs/by-name/cn/cnsprcy/package.nix +++ b/pkgs/by-name/cn/cnsprcy/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = ./update.sh; - RUSTC_BOOTSTRAP = true; + env.RUSTC_BOOTSTRAP = true; buildInputs = [ sqlite ]; meta = { diff --git a/pkgs/by-name/co/coc-pyright/package.nix b/pkgs/by-name/co/coc-pyright/package.nix index 23eb4be6fdc4..4ed1a55251c2 100644 --- a/pkgs/by-name/co/coc-pyright/package.nix +++ b/pkgs/by-name/co/coc-pyright/package.nix @@ -7,17 +7,17 @@ buildNpmPackage { pname = "coc-pyright"; - version = "0-unstable-2026-01-01"; + version = "0-unstable-2026-01-04"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-pyright"; # No tagged releases, this commit corresponds to the latest release of the package. - rev = "33184c03e543b29227df989cf893752bae5f3ea2"; - hash = "sha256-fj6iSQHprf/lkDGI5aFsogMAPv6a3Ghp9uDqnTM3/MY="; + rev = "767eebcb9f9b828412b9ec02e80558f3e748798a"; + hash = "sha256-PNCh6EiXQxIYgU6hOG1/ialhP0p2uGTQAgipiDpgI6s="; }; - npmDepsHash = "sha256-0KKEPl0H0HxNCw7GTaxE+voQhS5J1TSpd4JjyWW62UI="; + npmDepsHash = "sha256-D5e17ubJ8leB5zoNO0DbZ1rUf/JpSJlezOldA3pvtFo="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index b9fcc520ddc5..37d6a1241ae7 100644 --- a/pkgs/by-name/co/copilot-language-server/package.nix +++ b/pkgs/by-name/co/copilot-language-server/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "copilot-language-server"; - version = "1.406.0"; + version = "1.408.0"; src = fetchzip { url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip"; - hash = "sha256-GGTERNSfg/XgM+5URVin05ocNe3JuH6+8JB7hBOqPrE="; + hash = "sha256-sO6ea8SV3/7V0wgotEp7eLs5BUjQlFxBgOdWF1aoHuY="; stripRoot = false; }; diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index 8c5e041b53f6..2b1cb397ea57 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "coroot"; - version = "1.17.6"; + version = "1.17.7"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${version}"; - hash = "sha256-MeHRWrRGvp5oOSiMXtXNMZtKA6Q2577ty47HOxtBGJk="; + hash = "sha256-rfAJIRisLKkS6SuVJFLWjVnTAqbP+axuk3ECJ5n/7ek="; }; vendorHash = "sha256-DCdrE8UYkuUN+rUuxVSGbAnAeLivZ2Xp8xjM+56ZF+A="; diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix index 5f0e06f3690f..22e004a969dd 100644 --- a/pkgs/by-name/ct/ctranslate2/package.nix +++ b/pkgs/by-name/ct/ctranslate2/package.nix @@ -28,14 +28,14 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "ctranslate2"; - version = "4.6.2"; + version = "4.6.3"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-AUi/MODxCSVuJhFjlhbMUyrGnK0X28B2+uTIHIg7oMg="; + hash = "sha256-J9h4G+4jv02/gbpHd/THLAxxII/hlmsFuaJUTU8TMgQ="; }; # Fix CMake 4 compatibility diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index 6991ffd251f2..cf5419c434aa 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -12,20 +12,20 @@ }: let pname = "dependabot-cli"; - version = "1.80.0"; + version = "1.81.0"; # `tag` is what `dependabot` uses to find the relevant docker images. tag = "nixpkgs-dependabot-cli-${version}"; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag} - updateJobProxy.imageDigest = "sha256:3a7868b09318bef45224e475c3a018deba34f65f451f3ddd5b852b440c65fb83"; - updateJobProxy.hash = "sha256-PVFo/PT7l3iR5FTt+jDrGVupc6zPoDpiw9Pxqp3yprU="; + updateJobProxy.imageDigest = "sha256:d26fd269228ce287141aef81ef54e23a0001d2c6c6a3e16db286488c7d769c8c"; + updateJobProxy.hash = "sha256-6mmiI2AjKxopeC5SfTa9XOR4hatxEu6M/28wycRnz2w="; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag} - updaterGitHubActions.imageDigest = "sha256:a791d0ef463a059dc371ef62c6d1ac341a7e1197ed871a0a6451371a8710cd0e"; - updaterGitHubActions.hash = "sha256-uNqif7HesnXeiGOrc4sC2fgSAHNFJwVwrA3iIv8fVYc="; + updaterGitHubActions.imageDigest = "sha256:5964979027fe1d6fc358e89774074bfe34fa89b2b53ce7d45b44b4ebf71b7953"; + updaterGitHubActions.hash = "sha256-dmMq/T7DLomvzPtOGIBQnrv+k5/NpfxbcXFxxo5ij6o="; in buildGoModule { inherit pname version; @@ -34,7 +34,7 @@ buildGoModule { owner = "dependabot"; repo = "cli"; rev = "v${version}"; - hash = "sha256-5SD4VIa11r2P9YbURby6Sgi58lv03UB9X5UDOZxjVLQ="; + hash = "sha256-9//TW+56UM/5J6psJWcS6lJqyKwQUEOWftTOJxEaCcQ="; }; vendorHash = "sha256-dD48OKpuGAJAro7qV4tqpf/uENV2X1VQ2kUvAuJLXc0="; diff --git a/pkgs/by-name/do/docker-credential-helpers/package.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix index ccbd8eb99099..a8c135d0e815 100644 --- a/pkgs/by-name/do/docker-credential-helpers/package.nix +++ b/pkgs/by-name/do/docker-credential-helpers/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "docker-credential-helpers"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "docker"; repo = "docker-credential-helpers"; rev = "v${version}"; - sha256 = "sha256-cDpo3hw0yP9QnFvlGUIpjfMzni57KNkY+S+SIYOKBKQ="; + sha256 = "sha256-iZETkZK7gY5dQOT4AN341wfzeaol9HT4kr/G4o2oWzw="; }; vendorHash = null; diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 9f8739ea741f..8656401e6a45 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { cargoTestFlags = cargoBuildFlags; # requires unstable rust features - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd eww \ diff --git a/pkgs/by-name/fl/flow-control/package.nix b/pkgs/by-name/fl/flow-control/package.nix index 838dd3d62847..159ad3f3a4ca 100644 --- a/pkgs/by-name/fl/flow-control/package.nix +++ b/pkgs/by-name/fl/flow-control/package.nix @@ -6,11 +6,6 @@ callPackage, }: -let - zig_hook = zig_0_15.hook.overrideAttrs { - zig_default_flags = "-Dcpu=baseline -Doptimize=ReleaseSafe --color off"; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "flow-control"; version = "0.6.0"; @@ -29,12 +24,16 @@ stdenv.mkDerivation (finalAttrs: { } $ZIG_GLOBAL_CACHE_DIR/p ''; - nativeBuildInputs = [ - zig_hook - ]; + nativeBuildInputs = [ zig_0_15 ]; passthru.updateScript = ./update.sh; + dontSetZigDefaultFlags = true; + zigBuildFlags = [ + "-Dcpu=baseline" + "-Doptimize=ReleaseSafe" + ]; + env.VERSION = finalAttrs.version; meta = { diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index a2978255d517..f3eff48d9700 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -114,6 +114,9 @@ buildGoModule rec { getGoDirs() { make show-backend-tests } + + # TestRunHookPrePostReceive (cmd/hook_test.go) needs .git to pass + git init ''; checkFlags = diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index fed399a9e8f6..7b6b3636237e 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "11.0.8"; - hash = "sha256-KwVk4kRvrPQWsDWxX5L9pKjC+VwywLKKd2oYH+vlg74="; + version = "11.0.9"; + hash = "sha256-1jp0FT/T+j1CAPc99lTRSUd4R4YhgLMjZr4k3jW6ho8="; npmDepsHash = "sha256-Qs1aZxgjlsjdxfBpa4pOrwEfDfb/96L49uJd29Ysn/I="; vendorHash = "sha256-TVp4WxrGBlKVaPIbsj4EP/3pt5iseXLY7xIVum71ZXU="; lts = true; diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 1caa89c2d2e7..0a57dd155d85 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "13.0.3"; - hash = "sha256-ViqwTEVZkccNx5Pt+lrWvAqzD5RRTzwfBhUTfWyDhtE="; - npmDepsHash = "sha256-7WjcMsKPtKUWJfDrJc65ZXq2tjK8+8DnqwINj+0XyiQ="; - vendorHash = "sha256-gHdggzCJlYvs8JXs4CJ/AyqYMPCC2o4uRwDiem3rNFM="; + version = "13.0.4"; + hash = "sha256-AZQ4ppJES4CsvlkzBX82KfEp3PlFa2Ypd1KmTj/SXJk="; + npmDepsHash = "sha256-v+vl0fxcnqH8Jp4BILDYe5ioFQTQkB2XnFVEtkgadPc="; + vendorHash = "sha256-tq/72teHKowp6jwOKIJxS0OkcFI7UV19uTAv/OB/rm8"; lts = false; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/fr/freshfetch/package.nix b/pkgs/by-name/fr/freshfetch/package.nix index dd6b7510d7b9..d61bbb398d22 100644 --- a/pkgs/by-name/fr/freshfetch/package.nix +++ b/pkgs/by-name/fr/freshfetch/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-LKltHVig33zUSWoRgCb1BgeKiJsDnlYEuPfQfrnhafI="; # freshfetch depends on rust nightly features - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; meta = { description = "Fresh take on neofetch"; diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix index 6175f66772b3..bb6632c0f710 100644 --- a/pkgs/by-name/fu/fuc/package.nix +++ b/pkgs/by-name/fu/fuc/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-OoTWGeF96BpPDx1Y9AEVOIBK7kCz6pjw24pLiNcKmOc="; - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; cargoBuildFlags = [ "--workspace" diff --git a/pkgs/by-name/ge/genact/package.nix b/pkgs/by-name/ge/genact/package.nix index bd365a949579..007413f7c5e5 100644 --- a/pkgs/by-name/ge/genact/package.nix +++ b/pkgs/by-name/ge/genact/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "genact"; rev = "v${version}"; - sha256 = "sha256-Rn9kJWutWKPj9cLu2ZJKITmC+I8/ikhCAoIp00Yg6ZA="; + sha256 = "sha256-6d8p+Hon9zZMNRLX9+eBB3K5PffsX7w5PcbIiesCvSc="; }; - cargoHash = "sha256-Ttg9stfiIYCXk35+GWdGOzQrM/aYZPZK+e9y+zw1ZXQ="; + cargoHash = "sha256-umb+hf61k/sSfPVUCS1qJ0p+NLfjgZffuEWoQj1NIVY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gh/ghi/package.nix b/pkgs/by-name/gh/ghi/package.nix index a26fbbf47c84..48b77ecff925 100644 --- a/pkgs/by-name/gh/ghi/package.nix +++ b/pkgs/by-name/gh/ghi/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, makeWrapper, bundlerEnv, - tree, }: let version = "1.2.1"; diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index 7c14a55ba528..b08023c70e1c 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -29,13 +29,7 @@ # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options optimizeLevel ? "ReleaseFast", }: -let - zig = zig_0_14; - zig_hook = zig.hook.overrideAttrs { - zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off"; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "ghostty"; version = "1.2.3"; @@ -66,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { pandoc pkg-config removeReferencesTo - zig_hook + zig_0_14 # GTK frontend glib # Required for `glib-compile-schemas` @@ -93,10 +87,14 @@ stdenv.mkDerivation (finalAttrs: { harfbuzz ]; + dontSetZigDefaultFlags = true; + zigBuildFlags = [ "--system" "${finalAttrs.deps}" "-Dversion-string=${finalAttrs.version}" + "-Dcpu=baseline" + "-Doptimize=${optimizeLevel}" ] ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") { inherit glslang; diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix index 623e88a58967..69f20085ad29 100644 --- a/pkgs/by-name/gi/ginkgo/package.nix +++ b/pkgs/by-name/gi/ginkgo/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "ginkgo"; - version = "2.27.3"; + version = "2.27.4"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-qEGV5QLRVuy0pNBat19u3kp8jUrUHFjyY1pC1nkyZC0="; + sha256 = "sha256-bPGWqWNXvl+kHi5/LLdZ8zw/OXxg06mr6ZWjIQH4QJg="; }; vendorHash = "sha256-Vmcva/iMaOszQi87avO7utD0ahlB2gFBmVEI86hvnyQ="; diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix index ba669b4cc79d..202d0b94cf1e 100644 --- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix +++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix @@ -28,12 +28,12 @@ stdenv.mkDerivation rec { pname = "gpu-screen-recorder"; - version = "5.11.2"; + version = "5.11.5"; src = fetchgit { url = "https://repo.dec05eba.com/${pname}"; tag = version; - hash = "sha256-9hmuaqa6HQogL4OwDOID/kL4ZYaDDKJeFrEtrDS9ZYg="; + hash = "sha256-o9IjuKuE2/41I52vpR7EOLCDSLJty/Wq0k7UiFHHlDk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hi/highlight-assertions/package.nix b/pkgs/by-name/hi/highlight-assertions/package.nix index 50d48e31db33..4f03a55c63a6 100644 --- a/pkgs/by-name/hi/highlight-assertions/package.nix +++ b/pkgs/by-name/hi/highlight-assertions/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-egrxcnDVKKgk1sL5WNMIR2FPwQbjjMy20VWizcTBEtM="; # requires nightly features - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; meta = { description = "Tool for unit testing tree sitter highlights for nvim-treesitter"; diff --git a/pkgs/by-name/ho/holo-cli/package.nix b/pkgs/by-name/ho/holo-cli/package.nix index 44dc53470480..e3efcf600528 100644 --- a/pkgs/by-name/ho/holo-cli/package.nix +++ b/pkgs/by-name/ho/holo-cli/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; # Use rust nightly features - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ho/holo-daemon/package.nix b/pkgs/by-name/ho/holo-daemon/package.nix index c71f737c54f8..10b86b93b7a1 100644 --- a/pkgs/by-name/ho/holo-daemon/package.nix +++ b/pkgs/by-name/ho/holo-daemon/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-YZ2c6W6CCqgyN+6i7Vh5fWLKw8L4pUqvq/tDO/Q/kf0="; # Use rust nightly features - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index ce64e7075190..f2b43c190aad 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.154.2"; + version = "0.154.3"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-DVNuVhybpi9LOSciCftEVzWdMYsnQKREKFlalB4QMX8="; + hash = "sha256-bUOzm1Uj1z2WN9MRqaKXyi/t+4JROdTwPEYV0bxibtM="; }; - vendorHash = "sha256-7hI2FblqJQYhoWX2K+J+/HIY8CzQ+tBZmForS6gEnoE="; + vendorHash = "sha256-Olkrmi26U4fq/JmYSow5ET4YyCPS10eS+L99t/bLo4g="; checkFlags = let diff --git a/pkgs/by-name/ja/jadx/deps.json b/pkgs/by-name/ja/jadx/deps.json index e9f5b34f86d7..1744bf519097 100644 --- a/pkgs/by-name/ja/jadx/deps.json +++ b/pkgs/by-name/ja/jadx/deps.json @@ -2,38 +2,42 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://dl.google.com/dl/android/maven2/com/android": { - "tools#r8/8.3.37": { - "jar": "sha256-WXU+cKdPkYOJzIfxt9ZrXAhikyVZFnQlcI3tFZ495Dk=", - "pom": "sha256-d6TAZPkYOrtfhr4g6uYTGICen8MvQaXDY4dp72hQ5T4=" + "tools#r8/8.9.35": { + "jar": "sha256-IEsvwrD06IjcDvdItYCQ3vG/QYUGjTaru5SEHbxxB6g=", + "pom": "sha256-dG9URao8wRhFrn5dcpjONck47PiN/hBTnBcsCOeeGvg=" }, - "tools/build#aapt2-proto/8.3.2-10880808": { - "jar": "sha256-3iKdOHj8HSnfyghsigs3FNhY9wS7ifl/F/ZN2n8aEuI=", - "module": "sha256-ERjGfn1J9h/AsfZLVbSrHqVfi5zGPoeaDmbS6eAcKTw=", - "pom": "sha256-A4Lzmo++ffYXuIO/f53Rxg0i7kMp3/0iDhMoi6yZM4w=" + "tools/build#aapt2-proto/8.11.1-12782657": { + "jar": "sha256-n88uWsIG9jBEkYRJiBQkbYKvYb2jnEhHmczLZ2HPKeA=", + "module": "sha256-PjgNHiOeNAL2/OxRYkZbgkfooUAhCnz0wYPYJ2Wy0+k=", + "pom": "sha256-v9tyG77jP3DGfOAjuwe39T6oNW+wdGZ7f7DHV8c7MbU=" }, - "tools/build#apksig/8.3.2": { - "jar": "sha256-Ro7hhS+hJGHGYpYI/ke+cOUPYL58R0S7f2LKSOhcCmw=", - "pom": "sha256-2MOEEEQeeDYadm+kHqunUfrEH60WcbrNfqS7abiKKCE=" + "tools/build#apksig/8.11.1": { + "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=", + "pom": "sha256-CGN4s6ET2qhsY7c06Wmk8oBZvJXpIVyg5D+JBv8EIm8=" }, - "tools/smali#smali-baksmali/3.0.5": { - "jar": "sha256-iZSrXXrULWJCu00p+o3IGhG511roC3jJnvY9B3k3+jo=", - "module": "sha256-5EA3mfVRU9YZIRr/lO5mqxX/SrSfXWUHV9LrraJt7lc=", - "pom": "sha256-shudIzWeaZizhVDoGbbDmukFdGRUapUDkoBOzq+omWo=" + "tools/build#bundletool/1.18.1": { + "jar": "sha256-pzNBp5RavLDmuJccexsoAb12UAZEfKDSQ3pCYNVyzqw=", + "pom": "sha256-XE33suMfF/IOS429YqK3hloJpJof0pMaNZ/TlOy5taU=" }, - "tools/smali#smali-dexlib2/3.0.5": { - "jar": "sha256-j2seZoneVWYbd7wo641xBe6N8mFHktby5Qhm1Y0A3WI=", - "module": "sha256-zY7utICIrsZsSPv4g9qD+LhxYIAZqqRYSCK9s0zvge8=", - "pom": "sha256-nErnF9igv3TjT7iIbd6tQi885vi4SU3iDz5dtubUbD0=" + "tools/smali#smali-baksmali/3.0.9": { + "jar": "sha256-59AWaUVWWofzmX0a6od5IC27bLBYWjnuILq4ovW6h/Y=", + "module": "sha256-EUuFno80MDaDxZeXFjDZjhN4uqECyDLKaqWV6crpmFc=", + "pom": "sha256-zQln7+wAUQbcgIDEaH6kzd9uDlLXFZy+h2V9IfmrMCg=" }, - "tools/smali#smali-util/3.0.5": { - "jar": "sha256-gX2qXYe/ejne1ZeIubZ5P49e32pPSrAiYJgAiSHpqws=", - "module": "sha256-VPXL9pRllG21X3f7mSADg+uvTKFOnrMNhgKWqxIuLXY=", - "pom": "sha256-AGspI+VNhCw80NB5AejYtvODplboeiSZwBMKa1TI0hA=" + "tools/smali#smali-dexlib2/3.0.9": { + "jar": "sha256-i1R1BvYvkddLcPS+tJibmeH/YfxQslJel5bKNfCjUdw=", + "module": "sha256-VibaJU2AesYjncWu1J9uJ/AH7HxIQjgD/I+KceW0xmg=", + "pom": "sha256-ZwJyNJ5d+QqERMG+a2vYuNO4vsvXnKQycYaWQebE15s=" }, - "tools/smali#smali/3.0.5": { - "jar": "sha256-mi8PtL9o18ISBsImnaMLjckpcdGE6Dshpk+4X95anUo=", - "module": "sha256-MLc8dXT76IQo+olKXTqAKqsI3qREr1Lje/A7Jn1bOc8=", - "pom": "sha256-/dFrTiATTBzK1fz+w5ROrTk4sUZKT7nzv3scnQUUYy0=" + "tools/smali#smali-util/3.0.9": { + "jar": "sha256-RnN2KJS6QVYIH8XGQvdNbniu+LGpx3AtaR4xcdjMEVM=", + "module": "sha256-Y4tY28VAfLfHrK6mOrFQXQAOrFRmH3afsyjETxmk3Iw=", + "pom": "sha256-w9KFOqrcCdefH2UollwTAscc0O8s7GUkxMqN3iMmmhs=" + }, + "tools/smali#smali/3.0.9": { + "jar": "sha256-mOkXsbHk9apI50yX/ueGZFcl6beemELj1+UPZYllU/E=", + "module": "sha256-kw/ZTn4NmhcgCH8JfQhYDEzYe6nLi5zH7bb38cLAb3Q=", + "pom": "sha256-XWBbBHicxEd6s91kzPcHExEa+gZ757x434suD7fFzVw=" } }, "https://plugins.gradle.org/m2": { @@ -72,38 +76,61 @@ "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" }, - "com/fasterxml#oss-parent/48": { - "pom": "sha256-EbuiLYYxgW4JtiOiAHR0U9ZJGmbqyPXAicc9ordJAU8=" + "com/fasterxml#oss-parent/55": { + "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" }, - "com/fasterxml/jackson#jackson-bom/2.14.1": { - "pom": "sha256-eP35nlBQ/EhfQRfauMzL+2+mxoOF6184oJtlU3HUpsw=" + "com/fasterxml#oss-parent/58": { + "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" }, - "com/fasterxml/jackson#jackson-parent/2.14": { - "pom": "sha256-CQat2FWuOfkjV9Y/SFiJsI/KTEOl/kM1ItdTROB1exk=" + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" }, - "com/github/ben-manes#gradle-versions-plugin/0.51.0": { - "jar": "sha256-hDFJ4yuRdmIcz38dtEOECMWp+bWM1XIQU32bc4BUAh4=", - "module": "sha256-vUrCdcs524F7R32ZqxzkZ+BGdOdck8bWiScY1L7PnG4=", - "pom": "sha256-gzhEJF79GHeytCHNoI7uv1zx5O8SBcMXEEe1QGbdkB8=" + "com/fasterxml/jackson#jackson-bom/2.17.2": { + "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" }, - "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.51.0": { - "pom": "sha256-oy92kCcy9iIN27EhlfozbDMfT2190MRscHcLOu4dR0E=" + "com/fasterxml/jackson#jackson-parent/2.17": { + "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" }, - "com/github/johnrengelman#shadow/8.1.1": { - "jar": "sha256-CEGXVVWQpTuyG1lQijMwVZ9TbdtEjq/R7GdfVGIDb88=", - "module": "sha256-nQ87SqpniYcj6vbF6c0nOHj5V03azWSqNwJDYgzgLko=", - "pom": "sha256-Mu55f8hDI3xM5cSeX0FSxYoIlK/OCg6SY25qLU/JjDU=" + "com/fasterxml/woodstox#woodstox-core/7.1.0": { + "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=", + "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU=" }, - "com/github/johnrengelman/shadow#com.github.johnrengelman.shadow.gradle.plugin/8.1.1": { - "pom": "sha256-PLOIa5ffbgZvEIwxayGfJiyXw8st9tp4kn5kXetkPLA=" + "com/github/ben-manes#gradle-versions-plugin/0.52.0": { + "jar": "sha256-zuihUdLgvp86hcouXYeg2lyRpIHt8bx/e1e1Ywj9PA0=", + "module": "sha256-r6cL5O0h646QJ2hPFfpeKXXz0uRtIpN76jmhDkj3nd0=", + "pom": "sha256-WESi8/+pqARY0m7ex3EjeuYxXN3yBp1Qp+hUFj5A8Q0=" + }, + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.52.0": { + "pom": "sha256-sLbWCz+UCuWgFAfwNJ6d86Ayph+FXkoXt9vakSprU3Y=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" }, "com/google/code/gson#gson-parent/2.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.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, "com/google/code/gson#gson/2.8.9": { "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" + }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, "com/googlecode/concurrent-trees#concurrent-trees/2.6.1": { "jar": "sha256-BONySYTipcv1VgbPo3KlvT08XSohUzpwBOPN5Tl2H6U=", "pom": "sha256-Q8K5sULnBV0fKlgn8QlEkl0idH2XVrMlDAeqtHU4qXE=" @@ -112,6 +139,14 @@ "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" }, + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.8": { + "pom": "sha256-NmeaNDsKVsypSJCF8DHTkDXKf/e7cO4Fr3WBdje0JTM=" + }, + "com/gradleup/shadow#shadow-gradle-plugin/8.3.8": { + "jar": "sha256-wnObOTJnIDIJdNZ3yLFhjHyQpUVys/24cdbEDlOEphs=", + "module": "sha256-hfNPgoHsUWqBpvKFhILqz0p9JwuC9j5f42nLT6nVI0A=", + "pom": "sha256-IW0s1jeg6+c7BOanrcW7sXOcuHUg/ER7hQimRaSCgoY=" + }, "com/squareup/moshi#moshi-kotlin/1.12.0": { "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=", "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=", @@ -122,32 +157,16 @@ "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=", "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k=" }, - "com/squareup/okhttp3#okhttp/4.11.0": { - "module": "sha256-VnwltR13eWF0Q5GE11JBK6l+2f22X8cYQNvFVjvrj6g=", - "pom": "sha256-ei1Cezixfgdtpk7o0hAuZIiNyyOK7l4tukp3UslKP94=" - }, "com/squareup/okhttp3#okhttp/4.12.0": { "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=", "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg=" }, - "com/squareup/okio#okio-jvm/3.2.0": { - "module": "sha256-p3jzkIXtar/NaHESmGxjhapXrC2IQLIdlGs8IJXzDqQ=", - "pom": "sha256-XEUflKdr6oYbbvK/hOj1cgBUWWjIZVWr3+0Tx8otSJ0=" - }, "com/squareup/okio#okio-jvm/3.6.0": { "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=", "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=", "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8=" }, - "com/squareup/okio#okio/2.10.0": { - "module": "sha256-EcvqvDp2XJqAMkL6ICShGFPrCGXaU2xLBa/c27I0Y3A=", - "pom": "sha256-S5YGC20aK5bpDkKtcVitvjRpMWuA/qCBfGwzmT7hzHI=" - }, - "com/squareup/okio#okio/3.2.0": { - "module": "sha256-aB9c7BcN5FuVST6e5wWGjrNa34mO4G+W4i0ZclDBsQQ=", - "pom": "sha256-i0b1jZua6xF4Nh1YpoZfTa1mWTDF/3tV4LqmHvOpcqE=" - }, "com/squareup/okio#okio/3.6.0": { "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" @@ -156,69 +175,76 @@ "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" }, - "commons-io#commons-io/2.11.0": { - "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", - "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + "commons-io#commons-io/2.19.0": { + "jar": "sha256-gkJokZtLYvn0DwjFQ4HeWZOwePWGZ+My0XNIrgGdcrk=", + "pom": "sha256-VCt6UC7WGVDRuDEStRsWF9NAfjpN9atWqY12Dg+MWVA=" }, "dev/equo/ide#solstice/1.7.5": { "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" }, - "io/fabric8#kubernetes-client-bom/5.12.2": { - "pom": "sha256-6qA8FpVlaNVKa6Q31J1Ay/DdjpOXf5hDGCQldrZQvDs=" + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" }, - "io/netty#netty-bom/4.1.86.Final": { - "pom": "sha256-EnFsH+ZM9b2qcETTfROq46iIIbkdR5hCDEanR2kXiv0=" - }, - "jakarta/platform#jakarta.jakartaee-bom/9.0.0": { - "pom": "sha256-kZA9Ddh23sZ/i5I/EzK6cr8pWwa9OX0Y868ZMHzhos4=" - }, - "jakarta/platform#jakartaee-api-parent/9.0.0": { - "pom": "sha256-9l3PFLbh2RSOGYo5D6/hVfrKCTJT3ekAMH8+DqgsrTs=" - }, - "org/apache#apache/23": { - "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" - }, - "org/apache#apache/27": { - "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" }, "org/apache#apache/29": { "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" }, - "org/apache/ant#ant-launcher/1.10.13": { - "jar": "sha256-zXaVs7+2lkq3G2oLMdrWAAWud/5QITI2Rnmqzwj3eXA=", - "pom": "sha256-ApkvvDgFU1bzyU0B6qJJmcsCoJuqnB/fXqx2t8MVY8o=" + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, - "org/apache/ant#ant-parent/1.10.13": { - "pom": "sha256-blv8hwgiFD8f+7LG8I7EiHctsxSlKDMC9IFLEms0aTk=" + "org/apache/ant#ant-launcher/1.10.15": { + "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", + "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" }, - "org/apache/ant#ant/1.10.13": { - "jar": "sha256-vvv8eedE6Yks+n25bfO26C3BfSVxr0KqQnl2/CIpmDg=", - "pom": "sha256-J5NR7tkLj3QbtIyVvmHD7CRU48ipr7Q7zB0LrB3aE3o=" + "org/apache/ant#ant-parent/1.10.15": { + "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" }, - "org/apache/commons#commons-parent/52": { - "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + "org/apache/ant#ant/1.10.15": { + "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", + "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" }, "org/apache/commons#commons-parent/58": { "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" }, - "org/apache/logging#logging-parent/7": { - "pom": "sha256-5YkR3J/GsXOhDlqp7bk8eZStBmAnBd0Gftz8bh6eFys=" + "org/apache/commons#commons-parent/81": { + "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ=" }, - "org/apache/logging/log4j#log4j-api/2.20.0": { - "jar": "sha256-L0PupnnqZvFMoPE/7CqGAKwST1pSMdy034OT7dy5dVA=", - "pom": "sha256-zUWDKj1s0hlENcDWPKAV8ZSWjy++pPKRVTv3r7hOFjc=" + "org/apache/groovy#groovy-bom/4.0.22": { + "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", + "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" }, - "org/apache/logging/log4j#log4j-bom/2.20.0": { - "pom": "sha256-+LtpLpWmt72mAehxAJWOg9AGG38SMlC2gSiUOhlenaE=" + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" }, - "org/apache/logging/log4j#log4j-core/2.20.0": { - "jar": "sha256-YTffhIza7Z9NUHb3VRPGyF2oC5U/TnrMo4CYt3B2P1U=", - "pom": "sha256-3nGsEAVR9KB3rsrQd70VPnHfeqacMELXZRbMXM4Ice4=" + "org/apache/logging/log4j#log4j-api/2.24.1": { + "jar": "sha256-bne7Ip/I3K8JA4vutekDCyLp4BtRtFiwGDzmaevMku8=", + "pom": "sha256-IzAaISnUEAiZJfSvQa7LUlhKPcxFJoI+EyNOyst+c+M=" }, - "org/apache/logging/log4j#log4j/2.20.0": { - "pom": "sha256-mje0qPZ+jUG8JHNxejAhYz1qPD8xBXnbmtC+PyRlnGk=" + "org/apache/logging/log4j#log4j-bom/2.24.1": { + "pom": "sha256-vGPPsrS5bbS9cwyWLoJPtpKMuEkCwUFuR3q1y3KwsNM=" + }, + "org/apache/logging/log4j#log4j-core/2.24.1": { + "jar": "sha256-ALzziEcsqApocBQYF2O2bXdxd/Isu/F5/WDhsaybybA=", + "pom": "sha256-JyQstBek3xl47t/GlYtFyJgg+WzH9NFtH0gr/CN24M0=" + }, + "org/apache/logging/log4j#log4j/2.24.1": { + "pom": "sha256-+NcAm1Rl2KhT0QuEG8Bve3JnXwza71OoDprNFDMkfto=" + }, + "org/apache/maven#maven-api-annotations/4.0.0-rc-3": { + "jar": "sha256-XTSQ9yrTp+gr6IsnYp83xZ/SUxuuURw7E4ZkINXYYr0=", + "pom": "sha256-83HUqkRgxMwP4x0W20WC2+eGHvzS5nqvGEPimR8Xx0I=" + }, + "org/apache/maven#maven-api-xml/4.0.0-rc-3": { + "jar": "sha256-8+OzZCNzxp1MdEHUDroHZeHXROmStiGURS9epUUd/bo=", + "pom": "sha256-XxSOOelo08K3a4426hN3mJ8KeetDpqWa5yPZElzLXGE=" + }, + "org/apache/maven#maven-xml/4.0.0-rc-3": { + "jar": "sha256-BjxCTLR/dRZBJdXuolFnuTHdaU40Jo1QJHN050IR3Rk=", + "pom": "sha256-nZZekiyqwDYkl9J7v6UaRI+UydcTYjZnnGhSNwb3KYI=" }, "org/beryx#badass-runtime-plugin/1.13.1": { "jar": "sha256-IW3RL1SacHD31B2wTupXAaF5Z0mzVerAzkMVLs0DGBc=", @@ -228,21 +254,23 @@ "org/beryx/runtime#org.beryx.runtime.gradle.plugin/1.13.1": { "pom": "sha256-7SsiPX22wuiujLyvq8E96b0kKfwfNMtEFVh0jJCBu+U=" }, - "org/codehaus/groovy#groovy-bom/3.0.14": { - "pom": "sha256-JODptzjecRjennNWD/0GA0u1zwfKE6fgNFnoi6nRric=" + "org/codehaus/plexus#plexus-utils/4.0.2": { + "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=", + "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8=" }, - "org/codehaus/plexus#plexus-utils/3.5.1": { - "jar": "sha256-huAlXUyHnGG0gz7X8TEk6LtnnfR967EnMm59t91JoHs=", - "pom": "sha256-lP9o7etIIE0SyZGJx2cWTTqfd4oTctHc4RpBRi5iNvI=" + "org/codehaus/plexus#plexus-xml/4.1.0": { + "jar": "sha256-huan8HSE6LH3r2bZfTujyz1pKlRhtLHQordnDPV0jok=", + "pom": "sha256-uKO6h7WsMXVJUEngIXiIDKJczJ6rGkR9OKGbU3xXgk4=" }, - "org/codehaus/plexus#plexus/10": { - "pom": "sha256-u6nFIQZLnKEyzpfMHMfrSvwtvjK8iMuHLIjpn2FiMB8=" + "org/codehaus/plexus#plexus/20": { + "pom": "sha256-p7WUsAL8eRczyOlEcNCQRfT9aak61cN1dS8gV/hGM7Q=" }, - "org/eclipse/ee4j#project/1.0.6": { - "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + "org/codehaus/woodstox#stax2-api/4.2.2": { + "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=", + "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI=" }, - "org/eclipse/jetty#jetty-bom/9.4.50.v20221201": { - "pom": "sha256-TN5uUz1gHq+LZazulWt3BsGBkvJ1XQI9fo0Zu31bOUM=" + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" @@ -263,6 +291,14 @@ "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/5.2.0": { "pom": "sha256-pXu0ObpCYKJW8tYIRx1wgRiQd6Ck3fsCjdGBe+W8Ejc=" }, + "org/gradle/toolchains#foojay-resolver/0.8.0": { + "jar": "sha256-+Q5pNRY46QueyYSOdZ0hhjWQfAklQRkRUAN7CyLlFAw=", + "module": "sha256-jDzPVNoHLGSkDgaIKqplIzbLKe7C6iMPBtaEOrs4TVE=", + "pom": "sha256-pxZyrK0MCu4576V1P1yU+aSjWh2sBl4ii8rDQt6nxUg=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.8.0": { + "pom": "sha256-O2ciN72cwejoyobvWnkgpnj2nQTS9L+9DFouedRcXLU=" + }, "org/jdom#jdom2/2.0.6.1": { "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" @@ -275,9 +311,16 @@ "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" }, - "org/jetbrains/kotlin#kotlin-android-extensions/1.9.23": { - "jar": "sha256-Yf12SPkx/06b2/9JvwmHcFdj+7qce7ALJkgRo20RGsE=", - "pom": "sha256-0+vFk7FzrT4tHiVgtpwzFKRpDI2jJ0ch6DqWrtwWEaA=" + "org/jetbrains/kotlin#abi-tools-api/2.2.0": { + "jar": "sha256-hxeDiGZkLjvdR+yeAmC70wdujH6GvgXirahoMesq+Qo=", + "pom": "sha256-UwmmvuGytgrDtfXTXMS2zDiKFzOA17jeqgIJ6wgUnpA=" + }, + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.2.0": { + "module": "sha256-5d0u34ivdW30d1ra13xS0AkDUav1EZLPGdP+YsZnyrg=", + "pom": "sha256-Qejc6FcbX7TuAzURlYL+IoBQqP8ZPiRg1SmMX5Dj1nU=" + }, + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.2.0/gradle813": { + "jar": "sha256-0M+f8jrTjCEO7QzCWlExWjhOYf3BWlP+uGwAvuaRqug=" }, "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.0.21": { "jar": "sha256-VNSBSyF3IXiP2GU5gSMImi/P91FQ17NdjnMKI34my9E=", @@ -290,6 +333,9 @@ "org/jetbrains/kotlin#kotlin-assignment/2.0.21/gradle85": { "jar": "sha256-USUeNCELiNTJCAXKZS6Xe93IR4OkVAY5ydIQkJhbrOY=" }, + "org/jetbrains/kotlin#kotlin-bom/2.0.21": { + "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g=" + }, "org/jetbrains/kotlin#kotlin-build-common/2.0.21": { "jar": "sha256-cLmHScMJc9O3YhCL37mROSB4swhzCKzTwa0zqg9GIV0=", "pom": "sha256-qNP7huk2cgYkCh2+6LMBCteRP+oY+9Rtv2EB+Yvj4V0=" @@ -298,62 +344,53 @@ "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-statistics/2.2.0": { + "jar": "sha256-klfy37x4iCf2AnUPrijX6UWTLq2QQVP3f09sTE2Y5RE=", + "pom": "sha256-8Uct+ZZDqe4VJrFEka0vaNz8Zunr9WywFuSFzaj69sI=" }, "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.2.0": { + "jar": "sha256-HezZmyKUN3QfNqAIxnip2PrjBxbodyFRMI9W9owQ844=", + "pom": "sha256-I6QFgttMPijHq6X8fpZHvI1e/d+dAFWp5CyaCJbVzjM=" + }, "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/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/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-compiler-runner/2.2.0": { + "jar": "sha256-kHBq6Gcd77oBQI3RxUG6MJEskHDN8d3aGMUero1nkwQ=", + "pom": "sha256-iQfZfcaLv0CgrmZ5RZAvDtwWYdvPdDuuDf2nw7mp1Mg=" }, "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-client/2.2.0": { + "jar": "sha256-ISk9oBbkuhKhKKwm/ZIKdOi4f1dM+bxDxgo9LnZFp64=", + "pom": "sha256-HESKBvDKmGiVi+CHesnof8TgG8uTaHp8rBLTxNCd7uY=" }, "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/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-annotations/2.2.0": { + "jar": "sha256-nRsH2uVVnD/JwtzhW9hcNtwedt/zd/ExJIm9ZmDBZUQ=", + "pom": "sha256-uvxt1O1fRcLhvCgXfCxkDie/t8WQEZ6GW7nkCZOLrEA=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.0.21": { "jar": "sha256-Uur1LOMDtSneZ6vDusE+TxNZY1dUPfqDHE1y0tYxDlA=", @@ -363,40 +400,41 @@ "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-api/2.2.0": { + "jar": "sha256-u6au4h0YX3LfiW80jw6nsRdcEc1mNzeZid+JnLSMl+E=", + "module": "sha256-AmOgtdQFEGmmFjJYOK5CGmxNAG3JsVWnpCkmYIiAC6c=", + "pom": "sha256-iG8sRJ+dvmQc0kPxk3FNegQlNrMCrEHHLVYOWmZmDIg=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.2.0/gradle813": { + "jar": "sha256-u6au4h0YX3LfiW80jw6nsRdcEc1mNzeZid+JnLSMl+E=" }, "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-proto/2.2.0": { + "jar": "sha256-QY4hdjJ20qlGFr6ZCCanRdWdTF2WY48LviERDSxWSTs=", + "pom": "sha256-w5AgQre9S2t3oY8+4f6ol9N7vroloD0Uqe7//hWCXn0=" }, "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-idea/2.2.0": { + "jar": "sha256-7JacXwsJn4I4RiMiOPm9ZPPTdB5i6pBQrS5DL6150KA=", + "module": "sha256-r+m2AUJwBIVJuyAySjGdYkoFoLnmtBfmm2kHldfPDUs=", + "pom": "sha256-/ewxpJDZDsNuf5qj12xVDgqVq9Otg3lTvUn6E9pwFQ0=" }, "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=", - "pom": "sha256-TgznuA0cN7kRzb/kFf77ZdzvGCalGLF3vWAvlaloqMU=" - }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/1.9.23/gradle82": { - "jar": "sha256-vMdKB8ad0RyUsmCx7ophiWlinMrqwubqCnedo8P37D8=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.2.0": { + "jar": "sha256-Z6FKxCSqGWo0ax3Jn0QqbVc0WCrXt+epzN8oqc0rIJs=", + "module": "sha256-LC4w2DDqdpq6iX9PlvGeHoLY1qI/UzaJugn0GTMASYY=", + "pom": "sha256-bBzMOzcGY8KHIUn12briW/fpLqcVFepzxSlwlzbKMYk=" }, "org/jetbrains/kotlin#kotlin-gradle-plugin/2.0.21": { "module": "sha256-D5iXoGwHo+h9ZHExzDSQofctGuVMEH8T9yJp1TRLCHo=", @@ -405,33 +443,36 @@ "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-plugin/2.2.0": { + "module": "sha256-Y3w/yuVyOnQnAmwO2z3GeW3T/nmQ3CKG1PdJbt9dKYU=", + "pom": "sha256-E2FqOVx9n8Xc7iclKn9ocX2MaZTNEldL0dsxelGG1yE=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.2.0/gradle813": { + "jar": "sha256-g1xNwYoHMl9XkwUMfy52XSNcWWdJVo5HtZe0Sdhnlo0=" }, "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-gradle-plugins-bom/2.2.0": { + "module": "sha256-ur08SXopcd/GjlAlT/lwZak6Ixg+jto8OY+E9gzsErI=", + "pom": "sha256-2cRaL1cw6E6bhPpCxkoYdNy6ZmjyEsT+KXvqJdwAeHg=" }, "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-klib-commonizer-api/2.2.0": { + "jar": "sha256-8FcCw6bq725+hCNTvmT1jTMHGX4Vp/F5gE08VQcZ7mk=", + "pom": "sha256-6R0DUNf9G+4pyP9OP9bxcZBS7P6V98wXZtnVwnD3iQk=" }, "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-native-utils/2.2.0": { + "jar": "sha256-pOlvczba6EnznPK2NKU20CoqvfARS3M5Wty4yIGFDp4=", + "pom": "sha256-DafPXrsb0m4u/IkRhLzqM8tPKxwpNYEnr1MGHNataZY=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", @@ -456,34 +497,18 @@ "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/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/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/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/2.0.21": { "jar": "sha256-iEJ/D3pMR4RfoiIdKfbg4NfL5zw+34vKMLTYs6M2p3w=", "pom": "sha256-opCFi++0KZc09RtT7ZqUFaKU55um/CE8BMQnzch5nA0=" @@ -492,88 +517,92 @@ "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.8.21": { - "pom": "sha256-m7EH1dXjkwvFl38AekPNILfSTZGxweUo6m7g8kjxTTY=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": { + "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=", + "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.9.10": { - "jar": "sha256-rGNhv5rR7TgsIQPZcSxHzewWYjK0kD7VluiHawaBybc=", - "pom": "sha256-x/pnx5YTILidhaPKWaLhjCxlhQhFWV3K5LRq9pRe3NU=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { - "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.9.10": { - "jar": "sha256-pMdNlNZM4avlN2D+A4ndlB9vxVjQ2rNeR8CFoR7IDyg=", - "pom": "sha256-X0uU3TBlp3ZMN/oV3irW2B9A1Z+Msz8X0YHGOE+3py4=" + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": { + "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=", + "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc=" }, "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/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-tooling-core/2.2.0": { + "jar": "sha256-dAFOxPPveM59p+Pmlk8sUmoxIdXFj++MopeeXzRFgvQ=", + "pom": "sha256-Fiq+zmN9Egvzs1mfJIETV3zey68Q1bInq3cFLmYykpM=" }, "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-io/2.2.0": { + "jar": "sha256-h//zwBlwqqkBGr3lZbtSoXmqbckDjFh4koHtK2jVji0=", + "pom": "sha256-NcfaTe0E3/GCIeDzgPo/NhIOvq2hOYOmEQtGWWaKbr0=" + }, + "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.2.0": { + "jar": "sha256-nOOw3gU8uf8HoPcXyhQvKQp05NGdkzLbImq+D+thyB4=", + "pom": "sha256-XVJ2wbYor7xCBZ80CoTe/Uv7XroYJm3zdDYH5XftX4c=" }, "org/jetbrains/kotlin#kotlin-util-klib/2.0.21": { "jar": "sha256-oTtziWVUtI5L702KRjDqfpQBSaxMrcysBpFGORRlSeo=", "pom": "sha256-724nWZiUO5b1imSWQIUyDxAxdNYJ7GakqUnmASPHmPU=" }, + "org/jetbrains/kotlin#kotlin-util-klib/2.2.0": { + "jar": "sha256-FPB+vZrfvk6F+06/MSJSULL8P1Qo7OQ31O1j7D+prE0=", + "pom": "sha256-NU7YchvXXwfcCyQbiFg+7oLCTZIdN+lrctmNpi1ISEo=" + }, "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-bom/1.8.0": { + "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" }, "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=" + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { + "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", + "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", + "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" }, - "org/junit#junit-bom/5.9.1": { - "module": "sha256-kCbBZWaQ+hRa117Og2dCEaoSrYkwqRsQfC9c3s4vGxw=", - "pom": "sha256-sWPBz8j8H9WLRXoA1YbATEbphtdZBOnKVMA6l9ZbSWw=" + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" }, "org/junit#junit-bom/5.9.3": { "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, "org/ow2#ow2/1.5.1": { "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" }, - "org/ow2/asm#asm-commons/9.4": { - "jar": "sha256-DBKKnsPzPJiVknL20WzxQke1CPWJUVdLzb0rVtYyY2Q=", - "pom": "sha256-tCyiq8+IEXdqXdwCkPIQbX8xP4LHiw3czVzOTGOjUXk=" + "org/ow2/asm#asm-commons/9.8": { + "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=", + "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI=" }, - "org/ow2/asm#asm-tree/9.4": { - "jar": "sha256-xC1HnPJFZqIesgr37q7vToa9tKiGMGz3L0g7ZedbKs8=", - "pom": "sha256-x+nvk73YqzYwMs5TgvzGTQAtbFicF1IzI2zSmOUaPBY=" + "org/ow2/asm#asm-tree/9.8": { + "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=", + "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c=" }, - "org/ow2/asm#asm/9.4": { - "jar": "sha256-OdDis9xFr2Wgmwl5RXUKlKEm4FLhJPk0aEQ6HQ4V84E=", - "pom": "sha256-SDdR5I+y0fQ8Ya06sA/6Rm7cAzPY/C/bWibpXTKYI5Q=" + "org/ow2/asm#asm/9.8": { + "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", + "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" }, "org/slf4j#slf4j-api/1.7.32": { "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=", @@ -595,17 +624,17 @@ "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" }, - "org/springframework#spring-framework-bom/5.3.24": { - "module": "sha256-GZbh9hfLA/p26hGFD+Kh4gsOMKEEa6bV2zvbv0QRP84=", - "pom": "sha256-U1ITVmu77+Jjag1OjdGnOt5hLiQwyP/TENzCo7O5ukE=" + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" }, "org/tukaani#xz/1.9": { "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" }, - "org/vafer#jdependency/2.8.0": { - "jar": "sha256-v9LMfhv8eKqDtEwKVL8s3jikOC7CRyivaD2Y3GvngZI=", - "pom": "sha256-EBhn8/npJlei74mjELYE1D0JDJuQqj4LBS3NFqO78y0=" + "org/vafer#jdependency/2.13": { + "jar": "sha256-FFxghksjansSllUNMaSap1rWEpWBOO4NRxufywu+3T4=", + "pom": "sha256-3Ip1HRudXz2imiihDmKF62+3Q/TW46MleRsZX9B4eXs=" }, "se/patrikerdes#gradle-use-latest-versions-plugin/0.2.18": { "jar": "sha256-P9Qm3NYf3dX9FvhkBJyopVQtN1FAfhLNJs/FyeFay60=", @@ -624,45 +653,46 @@ "jar": "sha256-Ct3sZw/tzT8RPFyAkdeDKA0j9146y4QbYanNsHk3agg=", "pom": "sha256-JugjMBV9a4RLZ6gGSUXiBlgedyl3GD4+Mf7GBYqppZs=" }, - "ch/qos/logback#logback-classic/1.5.6": { - "jar": "sha256-YRXGysXtHZ24ENFPL39N1qnyHwrLuoAW5NqsoroPXrg=", - "pom": "sha256-SysA32EjwOKmHnG1vis/AHOWeLtLBplA1cScJN9T9Zo=" + "ch/qos/logback#logback-classic/1.5.18": { + "jar": "sha256-PhUz0DIfiBXu9GdQruARG0FVT5pGRMPE0tQEdEsJ9g8=", + "pom": "sha256-1VfNKrI95KR+zocGQhYqn5Rzn80LHDE+J4MlFO4gODM=" }, - "ch/qos/logback#logback-core/1.5.6": { - "jar": "sha256-iYx9EgGZ834azIEY2XqxWk0CsOcuJ7qfBYQ8s3ThYMY=", - "pom": "sha256-BpPQaN02h3R1rYCQbjHHvA1RlbgtTAB1HcGcHqUR5xE=" + "ch/qos/logback#logback-core/1.5.18": { + "jar": "sha256-hROee1e0ZPjl42Mm3YExdki+0ZnMxPmM1CWF+NdXECc=", + "pom": "sha256-x3JHKX1dm7ngTpLUyC51xujqviRUNokvkRQzW4t5DIM=" }, - "ch/qos/logback#logback-parent/1.5.6": { - "pom": "sha256-e9/LJJJGgaSRRNujSpJ7i9B5INCS6sw972H55kevTeg=" + "ch/qos/logback#logback-parent/1.5.18": { + "pom": "sha256-U8PiGxI7vTijAbQNDYFAlOrUehAj0h1hPMdI1w57nGk=" }, - "com/fifesoft#autocomplete/3.3.1": { - "jar": "sha256-C44PYoZELz7ejDWd1CAy75/fGmu6zoUSQY98ypCstck=", - "module": "sha256-L1G7pxftqDgbD+DkTUgZXiRO6lMjVNePJIhbLsicC3M=", - "pom": "sha256-+tECFvCORJesDE3pkY7IHBT7X7WiZlCd6K+G+n9cSP4=" + "com/fifesoft#autocomplete/3.3.2": { + "jar": "sha256-bn+4bT9V9p8TogCk2qagTht1P4/TadoFe015KtxpQ1A=", + "module": "sha256-fOqonK0zGDCGxKuU/sJF9outzqpxDfy2PZ8ajmJ9kao=", + "pom": "sha256-bKhazD7s8LTdfQIA0cMm+ZHInY4KADqVbI9dS4kc7t0=" }, - "com/fifesoft#rsyntaxtextarea/3.4.0": { - "jar": "sha256-5ng+3vkxIHl2TTDcpgdImWaBiUYQnfMjzdB9f6+sWEw=", - "module": "sha256-04S6z91b5oIuhBFEgtlsT0htPC6fHExgK4a12kM6urk=", - "pom": "sha256-9zzLgNZ8ZouF6jFU8wQVxzKjOBNA9nMfrLRRK4Dn4gQ=" + "com/fifesoft#rsyntaxtextarea/3.6.0": { + "jar": "sha256-vwDsEBV5jt1DPD363ww0oSo5W4wBD4+f2Oxv9PROuUw=", + "module": "sha256-xmVm3lcpsQkmEimKqWaVtUVpPUEILd60RR/sASa4/Ao=", + "pom": "sha256-Mqfj1XMX7NOR6CDwohJLT5jOHONfMnVRkuxDPDUH3bA=" }, - "com/formdev#flatlaf-extras/3.4.1": { - "jar": "sha256-dNrV+g2VLSxTWRHXYrC4GASAFtsI9fD+eafRzKGDBR8=", - "module": "sha256-7Ilq8ao7FDgpXP/7qonr1EDlmsPJJCeriVgf//mkrqk=", - "pom": "sha256-kTixZ2T8lnEAYetgExKlrG+RNMIxoZaEwHbAJ6r6OG8=" + "com/formdev#flatlaf-extras/3.6.1": { + "jar": "sha256-dmhnNOb5/Ol/Y5Im5fwl5eVDr3ImbveHqOHkxCJH88Y=", + "module": "sha256-hwgeutrjWeRL8vdhZkxF79z1xp3teqoo+xTr1YXu9yE=", + "pom": "sha256-aDdHBv0cyESicT7bzc4I8WXVpEvi13uQaeL5GfOIm48=" }, - "com/formdev#flatlaf-intellij-themes/3.4.1": { - "jar": "sha256-VuTWi5tRVrm3B7b9cV8DoRXv5+Bi9ep54j21HjQvfVI=", - "module": "sha256-tqXOKz+zuARVMSftJdybbvb9T5Nag5DsVhdymT30DWc=", - "pom": "sha256-CR+0CuMik01CkYtivUsLMr48YE/nL4bniFAdRMkKWwA=" + "com/formdev#flatlaf-intellij-themes/3.6.1": { + "jar": "sha256-YHXCEQhEQ4GDHIJhP62TYlLlpsUEtbLO+XMKbUMVfEo=", + "module": "sha256-g0//zIdFt5QhhAUrqR/BALgZvRN4BW1oce5lAh0nrEY=", + "pom": "sha256-PYMP6kurJWAhz8FBz/g/iX/dvMZCjIf6lGQaBLjBBIc=" }, - "com/formdev#flatlaf/3.4.1": { - "jar": "sha256-i0u9NHJ/gOdFVbK+PY3LmUQ0ZUmGxk9CmBYiR6nTX/w=", - "module": "sha256-502kfUULFIuZ6nNQZF59eq6gowVRb+S0AqKeNHLrdug=", - "pom": "sha256-/TzfkQf7kvOfkh3VrjNuddNKQiz3khC7dzX4a1coiHE=" + "com/formdev#flatlaf/3.6.1": { + "jar": "sha256-aHvjPh4++s4Wgf0ZRzLRbgCBJqR7YRa0MB5wcMkYxMk=", + "module": "sha256-phK1Rc8f/jb1GX7p5yXf6q96zvHPmHLOrMHlecqOf50=", + "pom": "sha256-u6AoVRioQLrEe0uVJIOcy35nOIuadLEylayrCsTEz3U=" }, - "com/github/akarnokd#rxjava2-swing/0.3.7": { - "jar": "sha256-umWvI1GP+Ucha7S+kDC7AavSQkHOEy3oPoUdC81S7n4=", - "pom": "sha256-VCbDiy18y9Z5qiBuF6TPrxPrk3IPPnjPjdckAjfNnLE=" + "com/github/akarnokd#rxjava3-swing/3.1.1": { + "jar": "sha256-2H3T5XYXeUxIRk1lpvp3kCWambem9Z0Geih+3fq9Pww=", + "module": "sha256-xMli/6423UM7+nbvHfXgd7g4uaVZlwczeMt4ND+IXsQ=", + "pom": "sha256-yL7WB6VweQo4smB1TTX5bOww/qPT+F5ocUXOM5t3MQ4=" }, "com/github/javafaker#javafaker/1.0.2": { "jar": "sha256-75WuRoCX83iIC+aajGdW+NFRgODwdUf7Cplhf/Qhsqw=", @@ -672,9 +702,9 @@ "jar": "sha256-j4ziM8M14I4ROj+Ved4QRvsZkn6CRosbvrzWy6h2C4E=", "pom": "sha256-R2QJlPzU46EZStsn0s/kEQII7qlCwgSDTZailCVt5hQ=" }, - "com/github/weisj#jsvg/1.4.0": { - "jar": "sha256-Lx6hn7lhHMovfQaGqbAxPLDfjNy6Bz31dLXNGmyKhqI=", - "pom": "sha256-GMmalZVvTdu7NNN5YLI7va+bbWNDWQgPVCCU7JQISPM=" + "com/github/weisj#jsvg/2.0.0": { + "jar": "sha256-gfya2lefw/SSTsNfkEwEPeE+6PuigDIuY4xwkgBvG1I=", + "pom": "sha256-Guxlwy/utQYjbKc4rAoRwCwdslicZZzWFfDomcAyFic=" }, "com/google#google/5": { "pom": "sha256-4J00XnPKP7yn8+BfMN63Tp053Wt5qT/ujFEfI0F7aCg=" @@ -683,23 +713,30 @@ "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, - "com/google/code/gson#gson-parent/2.10.1": { - "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + "com/google/code/gson#gson-parent/2.13.1": { + "pom": "sha256-+IEKzlDd/j/ag9ESbeZdmdXSUVoUo2uIvrG5mkdpeDY=" }, - "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.13.1": { + "jar": "sha256-lIVZQtSZLxEpRtPeHDNOcJI3uBJtgTC/B4B8AYpKISA=", + "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo=" }, - "com/google/errorprone#error_prone_annotations/2.26.1": { - "jar": "sha256-3iXy2aIVZSm9dl9R2O/fwN+nMB4E77nMdbfxDPXQ4Ps=", - "pom": "sha256-rqfpkeLf3LR/X71QhYdTX3gCvLni/C1Ou1C+QbaE2p8=" + "com/google/errorprone#error_prone_annotations/2.36.0": { + "jar": "sha256-d0QOJwsLyaJJkDxaB2w2pyLEiGyk9CZ18pA6HFPtYaU=", + "pom": "sha256-15z9N8hfdta3VMdQHuHchEe3smQsI4LXeCUhZr0zHpw=" + }, + "com/google/errorprone#error_prone_annotations/2.38.0": { + "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=", + "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc=" }, "com/google/errorprone#error_prone_annotations/2.7.1": { "jar": "sha256-zVJXwIokbPhiiBeuccuCK+GS75H2iByko/z/Tx3hz/M=", "pom": "sha256-Mahy4RScXzqLwF+03kVeXqYI7PrRryIst2N8psdi7iU=" }, - "com/google/errorprone#error_prone_parent/2.26.1": { - "pom": "sha256-SmrQDTGwpa3Nmk9gUGXVtEX65KBMv4J+XRrBB34vgU0=" + "com/google/errorprone#error_prone_parent/2.36.0": { + "pom": "sha256-Okz8imvtYetI6Wl5b8MeoNJwtj5nBZmUamGIOttwlNw=" + }, + "com/google/errorprone#error_prone_parent/2.38.0": { + "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" }, "com/google/errorprone#error_prone_parent/2.7.1": { "pom": "sha256-Cm4kLigQToCTQFrjeWlmCkOLccTBtz/E/3FtuJ2ojeY=" @@ -708,9 +745,9 @@ "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" }, - "com/google/guava#failureaccess/1.0.2": { - "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", - "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + "com/google/guava#failureaccess/1.0.3": { + "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=", + "pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s=" }, "com/google/guava#guava-parent/26.0-android": { "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" @@ -718,17 +755,20 @@ "com/google/guava#guava-parent/31.0.1-jre": { "pom": "sha256-s7a2qnCZwRgXrO6FsyL9kffuMq6mn+CD7jbIc17AZ4g=" }, - "com/google/guava#guava-parent/33.1.0-jre": { - "pom": "sha256-D73wcsyo4Fa6MVQrt18MFJCRRABYbUukIuz8fR38ecY=" + "com/google/guava#guava-parent/33.4.0-android": { + "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM=" + }, + "com/google/guava#guava-parent/33.4.8-jre": { + "pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA=" }, "com/google/guava#guava/31.0.1-jre": { "jar": "sha256-1b6U1l6HvSGfsxk60VF7qlWjuI/JHSHPc1gmq1rwh7k=", "pom": "sha256-K+VmkgwhxgxcyvKCeGfK/3ZmRuIRO3/MPunCSkCy85Y=" }, - "com/google/guava#guava/33.1.0-jre": { - "jar": "sha256-NGrsDrjImHNgyKJk5w/xDC+6dgRG6yfoqwfnjnh6df4=", - "module": "sha256-6qUNmCgORsANUYq/FUgp3pm1lm0bb+KLffHVvZB+dKg=", - "pom": "sha256-VXQa0W+Yzubm3Ard3UOAacxeP/KaJuMXXU/qKHaSVLc=" + "com/google/guava#guava/33.4.8-jre": { + "jar": "sha256-89f1f2f9Yi9NRo391pKzpeOQkkbCgBesMmNAXw/mF+0=", + "module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=", + "pom": "sha256-BDZdS27yLIz5NJ/mKAafw+gaLIODUUAu9OlfnnV77rw=" }, "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", @@ -754,47 +794,90 @@ "com/google/protobuf#protobuf-bom/3.25.3": { "pom": "sha256-tG4/Jv4PRz/zMHfuEkX4jUuNs1zHn1VM0P2Td2akXlg=" }, + "com/google/protobuf#protobuf-bom/3.25.5": { + "pom": "sha256-CA4phBcyOLUOBkwiav/7sbAjNSApXHkKf9PWrkWT8GM=" + }, "com/google/protobuf#protobuf-java/3.25.3": { "jar": "sha256-6Q2N25Y7IKlypqWbUJOt4rB8vlRsqzJ5qvQ4MmA4X1g=", "pom": "sha256-we+sGuAPC7q2VkKOGWtjaYyRTQ3SK+EgcQvv/EgctUc=" }, + "com/google/protobuf#protobuf-java/3.25.5": { + "jar": "sha256-hUAkf62eBrrvqPtF6zE4AtAZ9IXxQwDg+da1Vu2I51M=", + "pom": "sha256-51IDIVeno5vpvjeGaEB1RSpGzVhrKGWr0z5wdWikyK8=" + }, "com/google/protobuf#protobuf-parent/3.25.3": { "pom": "sha256-vCdEYIzqOnotTNC3Thw/iBOMZM5aphudfwr9hGiCvno=" }, + "com/google/protobuf#protobuf-parent/3.25.5": { + "pom": "sha256-ZMwOOtboX1rsj53Pk0HRN56VJTZP9T4j4W2NWCRnPvc=" + }, "com/jakewharton/android/repackaged#dalvik-dx/14.0.0_r21": { "jar": "sha256-mxO8gL+G8ZP43pyVn1Ko/4P8haHMVS9RJvEUDam4WjY=", "module": "sha256-8Q+igZNroSWzuB8fbmJoN2l1y5JmY90lKT4zF1TiMMc=", "pom": "sha256-73W51oRyNhwuRsFGzwTSBjeicvTKTFEGqXBIcZn3aY4=" }, - "com/pinterest/ktlint#ktlint-cli-ruleset-core/1.2.1": { - "jar": "sha256-5O9GJ/nf6CD16tU35SVH2g5VYovaYakmdg8Mm8TqUAY=", - "module": "sha256-g3XiwjEiwLDsPtUmTSaTlX+/CGb2hpY3CWAK+gLf0m0=", - "pom": "sha256-A6DNgrSvn7+apstQemJBdvdEs6T/w7t3iisiE/aM95Q=" + "com/pinterest/ktlint#ktlint-cli-ruleset-core/1.7.0": { + "jar": "sha256-aSE1PN1bpHXYCnOdq8cRG+A1bCY71iUzOIytLhkaLx8=", + "module": "sha256-Luc8GbjqvMN3Q5uchyvvabocQoGcnkYeIXzA+1KQYbc=", + "pom": "sha256-BtZCBH2tttyxCPbScugcUQIDQvps9Vd6MTaUGhUXKGw=" }, - "com/pinterest/ktlint#ktlint-logger/1.2.1": { - "jar": "sha256-5jQ4/lurR/Gy/dmAV34yx8ANcBm1QywGoPHCzbwJa3w=", - "module": "sha256-fDiaF+bGkYRv60Rz/vwyz8Oeklk4UmkwDq3M2y8EW/A=", - "pom": "sha256-9lFUgbaf8dX/DxsAqldcN6Rvjz50k+MYHSM1pM1r42U=" + "com/pinterest/ktlint#ktlint-logger/1.7.0": { + "jar": "sha256-nQGDNMqltOMSvCrBB/HXftRIhTst7E58Fd/EUOq5haM=", + "module": "sha256-CDFkZ7kh8GXHcmSokGJC9C+GI9yQHzlpnoG4jVkOp1c=", + "pom": "sha256-aU9M6U00dtJSTyiglfKEzblHUg7C8RPlWzDA5j2hWvY=" }, - "com/pinterest/ktlint#ktlint-rule-engine-core/1.2.1": { - "jar": "sha256-7v513SmnxlyZFe9WZ5w6v9MEZeqKLSg0msepyW6AIsk=", - "module": "sha256-ejPrG4FlwhAEDn/ZsFtmRGphmGY/syZ+a0Re5gfQhHU=", - "pom": "sha256-E4IT0LNF7LNQaVLkMaOGV+84bz4Ou3jZR+jcs1ZB3Nw=" + "com/pinterest/ktlint#ktlint-rule-engine-core/1.7.0": { + "jar": "sha256-i+H0o/B4TLKBYRUegYPd9SfI+w17LcyrfhJihlRZ2TA=", + "module": "sha256-dSltcScSQp40bHV20PFr1xeFjz/YX2Tt0gjSa99wPUg=", + "pom": "sha256-Ad9xiZtE9FFVYi5KvBSRJh9+OzInhHypoyTfrvthlsw=" }, - "com/pinterest/ktlint#ktlint-rule-engine/1.2.1": { - "jar": "sha256-Aj/1a/e7WRYNECVrmooE8q++LcZDxA8qCZEVVKSRUrQ=", - "module": "sha256-Oxa+KQvuSddVUNz3jWWvCwm9W+LWaxh5kZSU3HH99y4=", - "pom": "sha256-iwzFIes9tn1sULMFiz1Gerket9Ko9JnfPg8iRaG8RSA=" + "com/pinterest/ktlint#ktlint-rule-engine/1.7.0": { + "jar": "sha256-JrQ2K546xfZ8rFsxcR+75s84P05Q0ukHrY3s+QSQWT8=", + "module": "sha256-+a25UlPFYcgDaNwMCl/wH5R+y6TjdkbWGJQkk+hBdEQ=", + "pom": "sha256-OYIMXIqpU1YlzGZsYNLLtxEQ1dxMpZP2/T6/JFssyl0=" }, - "com/pinterest/ktlint#ktlint-ruleset-standard/1.2.1": { - "jar": "sha256-ip6NR4pSAdmxmMLpQtWgs2ck9mJsxvgHkTLeugN2DBs=", - "module": "sha256-qK8UNNcp5XrEo0u11SoLNN1nCBmovG3m8MhxTxw8D9Q=", - "pom": "sha256-wdTdk387yItHaK0Vn9PO7BU6h5RsAo8tn65nrvAYLc4=" + "com/pinterest/ktlint#ktlint-ruleset-standard/1.7.0": { + "jar": "sha256-Glx/pWr/+1jAgfyDXz4iTKa74e9yAGReio8qMmS0u/E=", + "module": "sha256-kaym0lyJxMkR/uioivXjrW6f+gvekTD3pQ8K1bnJSEo=", + "pom": "sha256-/nAz5KR6NDQk5uRj1z268WxewmJD3cGUPvctYa99FNo=" }, "com/puppycrawl/tools#checkstyle/9.3": { "jar": "sha256-BGPjBJgPVGC5ZPSBzMJaEPslO2AQDBnlD8mSiSiVl38=", "pom": "sha256-p9y0ZmVtZ/oKUNkE/d8U/GtTmEa4FO3/djXHRdW9MDQ=" }, + "com/twelvemonkeys#twelvemonkeys/3.12.0": { + "pom": "sha256-ttCYdPvd2bslDReBepMe+OCTvBjnQob/BrBAVBmAxzA=" + }, + "com/twelvemonkeys/common#common-image/3.12.0": { + "jar": "sha256-YqOCHHJPrf2jRsHi2DsMUGoMQHS+JppSv04xksfdkrw=", + "pom": "sha256-Mvxj0YSlsUAz7Z6uKPTH91cL6IUMZ+80q1DIpb3qlX8=" + }, + "com/twelvemonkeys/common#common-io/3.12.0": { + "jar": "sha256-v6z+sCrKxH2/0fqwAC6uymVUfQQklJi2VDIMng/fZkc=", + "pom": "sha256-X7G3pgrtAmv+FsK7u0MDlUfe3Q1OYT6AEnuTtKLFY1k=" + }, + "com/twelvemonkeys/common#common-lang/3.12.0": { + "jar": "sha256-XGXlBLW2TYBoPg+nCh3RVN2D1N59o38h6VD1qcA7xm0=", + "pom": "sha256-nFFSKc9KTl73IdpjR/+hm5wCetXeEHmQWUBdf6MtjVI=" + }, + "com/twelvemonkeys/common#common/3.12.0": { + "pom": "sha256-2prJlYu3TvpH0EAuhjHAw4djh0qVMDcP9X8HMTLJVv8=" + }, + "com/twelvemonkeys/imageio#imageio-core/3.12.0": { + "jar": "sha256-NMb5G/OyF+0BFbzoKDI4+9AmRWKqaCtCJqOWDQ7emBU=", + "pom": "sha256-N9att80pHm9n9inza8bpGiV6VFjj7lgf7BJ/aZIYG3g=" + }, + "com/twelvemonkeys/imageio#imageio-metadata/3.12.0": { + "jar": "sha256-eX0Ca2fQfm1esAoatTpVrKq2+Apxxe4yVXIJPrkMDKo=", + "pom": "sha256-kIUqjzz4kZBqjShwC8/EQ/EZd1iEbm7lZR1pHBNCrpw=" + }, + "com/twelvemonkeys/imageio#imageio-webp/3.12.0": { + "jar": "sha256-Q9xEfM/jTFxcb10xGQJw4fm/ZfYDddaXriqP9DNGhSY=", + "pom": "sha256-YciGwb7ZmY5w46JD9w11sWV7CIAgf+FdOgbEh7LhQfg=" + }, + "com/twelvemonkeys/imageio#imageio/3.12.0": { + "pom": "sha256-ZI62q9rpluXh0kjqy1Gk3LYD4uwnHK6Mjh8PnLpK+Pk=" + }, "commons-beanutils#commons-beanutils/1.9.4": { "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" @@ -807,26 +890,22 @@ "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" }, - "commons-io#commons-io/2.11.0": { - "jar": "sha256-lhsvbYfbrMXVSr9Fq3puJJX4m3VZiWLYxyPOqbwhCQg=", - "pom": "sha256-LgFv1+MkS18sIKytg02TqkeQSG7h5FZGQTYaPoMe71k=" + "commons-io#commons-io/2.18.0": { + "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=", + "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o=" }, - "commons-io#commons-io/2.16.1": { - "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", - "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" + "commons-io#commons-io/2.20.0": { + "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=", + "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio=" }, - "dev/dirs#directories/26": { - "jar": "sha256-bRj+Jaowt+CLkIzSEVHY+W4illxkCs13Ua3Zu/5hN9Q=", - "pom": "sha256-/I3n/GawcvT21bNv67uZx1DG75JxViX1o9hJlAWpRoI=" + "dev/drewhamilton/poko#poko-annotations-jvm/0.19.1": { + "jar": "sha256-cdioOz1YNLjnJqOB7m/aLRGdj2fqg91bs25Z1kSdJZk=", + "module": "sha256-JkMLbthSQENpG84PSk6kbY9UEn45bk7X014OAdGeo/Q=", + "pom": "sha256-XjiDNrVdrYtNO2UeNwBiYyKkijl+z6er8AD4BpKCtII=" }, - "dev/drewhamilton/poko#poko-annotations-jvm/0.15.2": { - "jar": "sha256-O8uWdwrFIHXEMSAeKf1eZ5JENVVd8i9eWrJgK3t3NjU=", - "module": "sha256-ZFxFBOI647Y2QStpkR6E8nK81dVDR+MStHVQPyKW/ow=", - "pom": "sha256-DoYUpIzw8+CiAxa0mUdqHrNL2j56gYMHk2NWNnf+x3E=" - }, - "dev/drewhamilton/poko#poko-annotations/0.15.2": { - "module": "sha256-uvNQLqdKKd+usAFL9ZL3zOpwdo6pl53mKwzsqlqqgdo=", - "pom": "sha256-HMwGrmeHr3B+lJIsKfUDXxWcHq/vZSlENWM/gktbqs0=" + "dev/drewhamilton/poko#poko-annotations/0.19.1": { + "module": "sha256-VDz/aksLlGs9IVBl/bWhx4vJv7+sec9q1YNYHaGXbRw=", + "pom": "sha256-MRkz5tRuSyQP0JEzo/vLDaUfhRoekSsF3dXf3lpu1UE=" }, "dk/brics/automaton#automaton/1.11-8": { "jar": "sha256-okR19sz+HMek/p404Fzmh7DODG6Mt4Hg7O07GGSCxh4=", @@ -840,10 +919,29 @@ "jar": "sha256-R1TZbq9TFPNaKH2lxnhIsoUGeGj8ptH1Ehp09n8GW2E=", "pom": "sha256-3q4p2lxR4/6dla9ujzkVbCvBt0niQtATbp4jIINIF5k=" }, - "io/github/oshai#kotlin-logging-jvm/6.0.9": { - "jar": "sha256-sJ09vL00jonj5Q41QCUVmB5qeaZHsQckg272yA64sUo=", - "module": "sha256-MM7rf5aCBVhG5DxreIDTwDdSbfHg54+P5w5B0xYsiTs=", - "pom": "sha256-Iu9UimQeopwR8p66nswpXd0tcJ2UKotZuqh0meyB+QE=" + "io/get-coursier/jniutils#windows-jni-utils/0.3.3": { + "jar": "sha256-q2jvzxYjVeIAB7I42BCLf/7AwGtGfuRMu0TsP4rDp+Y=", + "pom": "sha256-rVOQD5JoPzcUvkQuy0ZEIaX4+iiQwakbH74+Ds1ikUs=" + }, + "io/get-coursier/util#directories-jni/0.1.4": { + "jar": "sha256-1CoDcD6UwXUY7ww2opWkrvA+l3tbTY18J2/kqxc4fHY=", + "pom": "sha256-E1CMjTD6Y4XE9ckH1mG1UeIePnwSpCYaqYWJMK4q0Wk=" + }, + "io/get-coursier/util#directories/0.1.4": { + "jar": "sha256-j8ztl85qQSaEG7/j/RkFwIV98XqCYWBkd97RZATsshg=", + "pom": "sha256-sqk4rw2MgPXGuWdwwEEBCDrwxgJB4a+sLqnMy01k29c=" + }, + "io/github/java-diff-utils#java-diff-utils-parent/4.12": { + "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk=" + }, + "io/github/java-diff-utils#java-diff-utils/4.12": { + "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=", + "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw=" + }, + "io/github/oshai#kotlin-logging-jvm/7.0.7": { + "jar": "sha256-w3P39MnvyFxPcPEVGfKht4eLwO11oyU2TQNK8/oh93Y=", + "module": "sha256-QO2e6r7AizgleZTXK0wOsvBwVYVzkPGaTvPjlX8Crw8=", + "pom": "sha256-22vD1rbK+1kdW7F3jJbFMPmFjR66+tJ8XJCBFVgdoho=" }, "io/github/skylot#jdwp/2.0.0": { "jar": "sha256-Z01piJwpSc+I/MIGr38ur7FTMWsy5GzO8Tz5FRw3jqw=", @@ -865,9 +963,10 @@ "module": "sha256-c/sJjfFrydnSxRr6bzwZ86n6PsYbZYS49oqimBD7cuU=", "pom": "sha256-kts/606ZJ53gDIRJPJTJhlOQMfRjdnvx63nwOymxQyM=" }, - "io/reactivex/rxjava2#rxjava/2.2.21": { - "jar": "sha256-Wd9lQahAAY8PTImark9MH0OD9MFv61JoYV++OE0oUBw=", - "pom": "sha256-slvs5QSD3po+Hf0lARwthTMCFu+Kgbhvar69vfmw8Sc=" + "io/reactivex/rxjava3#rxjava/3.1.11": { + "jar": "sha256-bipWqYGdD8L+DXjv7NPXyBpjxjneM8qlY5KTvP/umXo=", + "module": "sha256-tDIZwIxsAgw+sN8lRtrqd5IZP4lgRtVcozqZhfvajuc=", + "pom": "sha256-fpMFhj0zE0zUpy0It/Evre4hda2ef3Jzi0nIptw8BVA=" }, "javax/annotation#javax.annotation-api/1.2": { "jar": "sha256-WQmzlso6K+ENDuoyx073jYFuG06tId4deN4fiQ0DPgQ=", @@ -877,20 +976,16 @@ "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" }, - "net/bytebuddy#byte-buddy-agent/1.14.12": { - "jar": "sha256-KzCakwAJLgtpb3xHH9UdmWkAHfeEyKufB5l0N9dXrW0=", - "pom": "sha256-ZpifcNNV1gD9TZJtiDXke30b7/Z47r7FnRljY7XNTCw=" + "net/bytebuddy#byte-buddy-parent/1.15.11": { + "pom": "sha256-jcUZ16PnkhEqfNhB6vvsTwDbxjPQha3SDEXwq0dspJY=" }, - "net/bytebuddy#byte-buddy-parent/1.14.12": { - "pom": "sha256-m3/SvyklMayw6XTZVeSjbKQTMt0Nr+icJNj+Q5uuV7A=" + "net/bytebuddy#byte-buddy/1.15.11": { + "jar": "sha256-+giZiq4ee9roO94HEsUOhETXHA4MGWuyJHrejUrQ65A=", + "pom": "sha256-IFuLJUGWcX6B2tZyu4aacZr8lt8pf5fYEe/+H0NlPa4=" }, - "net/bytebuddy#byte-buddy/1.14.12": { - "jar": "sha256-lwY2E01hwYOxn49Y+mMeMNLyq8o0SzeEijk8rHhj3XA=", - "pom": "sha256-XamVxw3nt/SoSKhUN8fd7oA9GrfKwtfY33GUw9XicU0=" - }, - "net/fabricmc#mapping-io/0.6.1": { - "jar": "sha256-NN1+onSH7zXXAANQnBtIh/9fi/9yCjQ5gSrhvnUl5Ts=", - "pom": "sha256-e7jCDWqclH8GcXzKVjmdHaettyb9jPOvJ7iVVnckras=" + "net/fabricmc#mapping-io/0.7.1": { + "jar": "sha256-FBno7nlco8+G9wemovEOYTJX6cHOkaEQFgLAe3z/ekg=", + "pom": "sha256-/aPWtbhGGzJ4fdbZ2kiXw14usvGi093bSYRQu4t4SGs=" }, "net/java#jvnet-parent/3": { "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" @@ -943,27 +1038,28 @@ "org/apache#apache/25": { "pom": "sha256-5o/BmkjOxYKmcy/QsQ2/6f7KJQYJY974nlR/ijdZ03k=" }, - "org/apache#apache/27": { - "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" }, - "org/apache#apache/30": { - "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, - "org/apache#apache/31": { - "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + "org/apache#apache/35": { + "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" }, - "org/apache/commons#commons-lang3/3.12.0": { - "jar": "sha256-2RnZBEhsA3+NGTQS2gyS4iqfokIwudZ6V4VcXDHH6U4=", - "pom": "sha256-gtMfHcxFg+/9dE6XkWWxbaZL+GvKYj/F0bA+2U9FyFo=" + "org/apache/commons#commons-lang3/3.17.0": { + "jar": "sha256-bucx31yOWil2ocoCO2uzIOqNNTn75kyKHVy3ZRJ8M7Q=", + "pom": "sha256-NRxuSUDpObHzMN9H9g8Tujg9uB7gCBga9UHzoqbSpWw=" }, - "org/apache/commons#commons-lang3/3.14.0": { - "jar": "sha256-e5a/PuaJSau1vEZVWawnDgVRWW+jRSP934kOxBjd4Tw=", - "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" + "org/apache/commons#commons-lang3/3.18.0": { + "jar": "sha256-Tu6ujSDAeKu2SwFewVit04OsWBVxzdxFxo8MmuAjByA=", + "pom": "sha256-qiVLNztvbUa8ncqGMxsHKoq4brJeqZIf1Dlhg5LpihY=" }, "org/apache/commons#commons-lang3/3.5": { "pom": "sha256-Ref7ssIx25A6XVqtr8Y2oXOk1UVg94oR/0mAKO+eNF4=" }, "org/apache/commons#commons-lang3/3.8.1": { + "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=", "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU=" }, "org/apache/commons#commons-parent/39": { @@ -978,18 +1074,21 @@ "org/apache/commons#commons-parent/47": { "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" }, - "org/apache/commons#commons-parent/52": { - "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + "org/apache/commons#commons-parent/73": { + "pom": "sha256-TtRFYLB/hEhHnf0eg6Qiuk6D5gs25RsocaxQKm1cG+o=" }, - "org/apache/commons#commons-parent/64": { - "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + "org/apache/commons#commons-parent/78": { + "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4=" }, - "org/apache/commons#commons-parent/69": { - "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + "org/apache/commons#commons-parent/81": { + "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ=" }, - "org/apache/commons#commons-text/1.12.0": { - "jar": "sha256-3gIyV/8WYESla9GqkSToQ80F2sWAbMcFqTEfNVbVoV8=", - "pom": "sha256-stQ0HJIZgcs11VcPT8lzKgijSxUo3uhMBQfH8nGaM08=" + "org/apache/commons#commons-parent/85": { + "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U=" + }, + "org/apache/commons#commons-text/1.13.1": { + "jar": "sha256-dkNL0t13irFA2Es8b/pAxA/mIZkJ9e0di4l3xa6OUMg=", + "pom": "sha256-IN2vRd2WmBsCi9dVqlwE0xrjd1pjNB4Wpq2x5oiqAFw=" }, "org/apache/httpcomponents#httpclient/4.5.14": { "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", @@ -1008,25 +1107,25 @@ "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" }, - "org/apache/maven#maven-artifact/3.8.7": { - "jar": "sha256-I+scXCbz0bRpRkewcb6r/ZYIMZGwBjlHB3U68s7Y2wE=", - "pom": "sha256-gxFk5/0k5bBbLcO4l6ylvr6TV2odk8iUXzpEHJTg7VM=" + "org/apache/maven#maven-artifact/3.8.8": { + "jar": "sha256-gTIzqEhcuvl7H5osF873I7Bo9yYKQxnPSVjyIdBLmTc=", + "pom": "sha256-PGKRS2E++Q+BwFaN7kCNIlVrTZmoHnqk1yqlxO4r96U=" }, - "org/apache/maven#maven-builder-support/3.8.7": { - "jar": "sha256-JrRlNUXsw/A5mCssjxO8Km4OD6E3LAQb1FGUbMN6WcE=", - "pom": "sha256-eF8rsf6hlzTjoOogfGoJa2gYgzfv3M+kdZdH8dHexcM=" + "org/apache/maven#maven-builder-support/3.8.8": { + "jar": "sha256-xCXKFp1nIXJWqNGZEURpH88jNR4JQxiQryQL/u0zuQI=", + "pom": "sha256-5yV1kZJC/vDOa4r3vKjVCbySqR74GB/henR7ALSsJLg=" }, - "org/apache/maven#maven-core/3.8.7": { - "jar": "sha256-x2f6zVSrj27qlyzPqcHT86XaohD/M1PJitAj9SBWKUA=", - "pom": "sha256-Fapj0KvMZJA1ymqCqXHoAvKtPgLPohnhudlSDws0Edc=" + "org/apache/maven#maven-core/3.8.8": { + "jar": "sha256-UvAHZNJtyXrJ/68gtOmZgtVoI4SQ+Ulr17nVzBB0ARM=", + "pom": "sha256-T8+CkzH2CovIlcNn3SfXS7i1FRX7v3RqfaIgaf2sZrY=" }, - "org/apache/maven#maven-model-builder/3.8.7": { - "jar": "sha256-8cR7SinTJnUyxqHkmfDM1TB7MhqX6YWvRXMTjqXN62k=", - "pom": "sha256-tjB9TvfAo4Q2ojYY5fXJ6byIjHQWeEoRrIeHprx/QYw=" + "org/apache/maven#maven-model-builder/3.8.8": { + "jar": "sha256-KIwprNodJhOMilP/8ybuebvOhwxjyayHbn/owpRARNM=", + "pom": "sha256-TZejrh20z6o6m7JYeKm/EwWChhPT6p7PG5EZUu83K4U=" }, - "org/apache/maven#maven-model/3.8.7": { - "jar": "sha256-b8ra7iqIXEOxWPLjgz0KPsto78YuJepbEfd8wHFqey0=", - "pom": "sha256-4dR3hYwG/DpXn8LFga9XIG6xWH2MEFMHFbmJb2S3kPU=" + "org/apache/maven#maven-model/3.8.8": { + "jar": "sha256-w5JUi8Gj8MahgPiIvSNJYC3lseMAWf4OxG+B7UzhQSk=", + "pom": "sha256-jnOB7w/mmO2OAoKuvfL7LoZOSQTDBMJn5vBrfvlBhpA=" }, "org/apache/maven#maven-parent/34": { "pom": "sha256-Go+vemorhIrLJqlZlU7hFcDXnb51piBvs7jHwvRaI38=" @@ -1034,78 +1133,78 @@ "org/apache/maven#maven-parent/35": { "pom": "sha256-0u3UB3wKvJzIICiDxFlQMYBCRjbLOagwMewREjlLJXY=" }, - "org/apache/maven#maven-parent/37": { - "pom": "sha256-vPNwAwHoIh7xTaJ6Lwz/cfzQP8RSdr/YStrOQB6Ivrw=" + "org/apache/maven#maven-parent/42": { + "pom": "sha256-BFNN6jUKIYeXClt0REM4vPeLqOU31E8mKs+6FuuzMFY=" }, - "org/apache/maven#maven-plugin-api/3.8.7": { - "jar": "sha256-TwhLIvdvFOuKeVEB+4Nif/Ebbyx8sX9ADVQyLn0AD3Q=", - "pom": "sha256-SlHibCSg2IbD3uYyu1o3K9y5i51ExA6xL5eyTTR+YtM=" + "org/apache/maven#maven-plugin-api/3.8.8": { + "jar": "sha256-ssbRU9ArNcHzDXLfI3L8XSOrzOw8Hmib5tYAR+E5fsw=", + "pom": "sha256-toRbJDq/3eToUFDcZGLPkNFcxvKwPjy5Dnng3W9KJeQ=" }, - "org/apache/maven#maven-repository-metadata/3.8.7": { - "jar": "sha256-rgfBgNpa53hJFc85gOkN42HqTRvFM3uWlpT1Aznv2eE=", - "pom": "sha256-ApdQ3NGyUFtbQ2nJDiMpNfjCJB4TYCJw+PUhFHfpOVc=" + "org/apache/maven#maven-repository-metadata/3.8.8": { + "jar": "sha256-s5bTsIGzU1QeqaFHqy0+7lcjtGDRMO98sdlTZq6rfDE=", + "pom": "sha256-GdnwyEbhlBAvYMnufkQxedieKXo9Y3HjS+VeoTrSi7c=" }, - "org/apache/maven#maven-resolver-provider/3.8.7": { - "jar": "sha256-mKX0OimIB4VYzCL4ZBEkx0Vy3Z5gC8fX233projMEbo=", - "pom": "sha256-l+KYz4V0qpqrMqAV8f+EGCQhxYar5F3aBL4p7LXmz+c=" + "org/apache/maven#maven-resolver-provider/3.8.8": { + "jar": "sha256-GXqKbnx99m3R+nC7SVrHYW8OlvQ9NU1p/0eU1yXUdCc=", + "pom": "sha256-fUZO9DMa7AaZQZmz3HuIaCAGApMznhlKoIiLVsoOd5Y=" }, - "org/apache/maven#maven-settings-builder/3.8.7": { - "jar": "sha256-LNPZ0Q6EhrKdRu9Dbclru/r0NaRd0yjM+VX1r5acir4=", - "pom": "sha256-KYMgyvMQ6dhvd1H9ZJiwtCsO/VO8f6Z39e54Y+SJDTA=" + "org/apache/maven#maven-settings-builder/3.8.8": { + "jar": "sha256-52Wxca0/DZnCQmq/+JC0asGsaMeFY276tfYfzXPs1P8=", + "pom": "sha256-v1XOufu3YrVl0yo26kokuysPhbsab5f7OvteGAdJVuk=" }, - "org/apache/maven#maven-settings/3.8.7": { - "jar": "sha256-AMCY0r47gdoDf6LUEXm/FJOO2xLsOtosjfZAxKZ3ELs=", - "pom": "sha256-8QndYx6IMsCi8zplYaZtV4fRpC3n/tectirzGYpK/do=" + "org/apache/maven#maven-settings/3.8.8": { + "jar": "sha256-cNtcB0JaXmbtzqwSr23WDPYUMwl4zBlcMAnHXG/25Hw=", + "pom": "sha256-y/zk0UwU6bJYjGkyl3XZy7tvomXkFjIQgjWBljd7zBw=" }, - "org/apache/maven#maven/3.8.7": { - "pom": "sha256-Rz512QcJ1/0osDhELhNxzEsiA9ygKYSG/Iz6c9r6k7U=" + "org/apache/maven#maven/3.8.8": { + "pom": "sha256-6eaacQwJjVAXAdPwqqWnGJ/mfkb2yaeoVyGPpzHScyw=" }, "org/apache/maven/resolver#maven-resolver-api/1.6.3": { "pom": "sha256-EWZ4Z526PTbXmfZywm7iRDSA76Gxu7glDwbg3VqRp5U=" }, - "org/apache/maven/resolver#maven-resolver-api/1.9.2": { - "jar": "sha256-EponhdJmdE1jvMCy9gNMZYclsJwW6oq9tiB1++FcaVM=", - "pom": "sha256-6uSCfjoen3KyJkZ3MI3ri4lLwlBRQcQMo2DLhF5cYrs=" + "org/apache/maven/resolver#maven-resolver-api/1.9.22": { + "jar": "sha256-Y/X2ZeRKCe9VRjs7kf2gt4/wfdJLEGDVbnnBC24yy/s=", + "pom": "sha256-33XQa/rgI5QhTC2wja5mFcU/hLRWSHoo6nIt4/cIhgw=" }, - "org/apache/maven/resolver#maven-resolver-connector-basic/1.9.2": { - "jar": "sha256-Dp27II8dms3ER1V342+b8xDrTHAmRtb1FFsiNUQgu7c=", - "pom": "sha256-kJg8BUhLbAEIp4WnPZnsQMePvqlcA7GlWNASPmz0So4=" + "org/apache/maven/resolver#maven-resolver-connector-basic/1.9.22": { + "jar": "sha256-SraL3sl+7DGLKjvSfnyVTjFviQ35LVRLaK/Qv2ZslYg=", + "pom": "sha256-0bccYKNDZmPBG8IpuZD7qhUthp2kFKCnudv0Pitf5Jo=" }, - "org/apache/maven/resolver#maven-resolver-impl/1.9.2": { - "jar": "sha256-W7+Ig2GsjEwB7HkWkzby9fN0nuqFuz82uZwEXZdxeQk=", - "pom": "sha256-5D8kzPHEQYddzq8q27zReUNRAd2+ddcYxIAkkRDIwwg=" + "org/apache/maven/resolver#maven-resolver-impl/1.9.22": { + "jar": "sha256-5Nr7iswT1zY3fALSFw2GlDjddLmLhgdFkJ0jhya6vLs=", + "pom": "sha256-0MUBku9qyZ/kTgLFm3AIFsRQF7N623xufPQt3GHCgmQ=" }, - "org/apache/maven/resolver#maven-resolver-named-locks/1.9.2": { - "jar": "sha256-CH+Q13Vn9x6EwxUTrITYBJpghBIoO9q2DBIpggbxnsU=", - "pom": "sha256-DYWW4EC3N8qDTtljAPFU2mEMR1aA8NO4/LTFNTXvqhA=" + "org/apache/maven/resolver#maven-resolver-named-locks/1.9.22": { + "jar": "sha256-BoXynsO1SNm2kXxSfxPGZ2haM5S5Vaqlsl0FWYGLf8U=", + "pom": "sha256-AHMPD9M9VcKNALQX3s7nILAMrk0nUwgZsHE6XF2dnzc=" }, "org/apache/maven/resolver#maven-resolver-spi/1.6.3": { "pom": "sha256-H4lGxHHBZwPLsIBAvH0F1wcroiFQSnfWS+54Wj9T18M=" }, - "org/apache/maven/resolver#maven-resolver-spi/1.9.2": { - "jar": "sha256-foQ7A8TtWn2sxuPlIDcRoqo9p+W5JH420Dh/6Hee4VE=", - "pom": "sha256-B0inuyAQ2gaTPTiYaRXyBRvEOUfZdCuoxApXhBcmvQU=" + "org/apache/maven/resolver#maven-resolver-spi/1.9.22": { + "jar": "sha256-ma1yHkYx2b0MT54pyGlnJXfGbypnSlcjzjjv8Tx1y/0=", + "pom": "sha256-hBlkE6FTaSVD3GW9GfCnXcUKDctCotQW9NCpc/1uDtU=" }, - "org/apache/maven/resolver#maven-resolver-transport-file/1.9.2": { - "jar": "sha256-UH8quj6VSy1OwJrlQRNhpbNJ2EfFj1KlztaMm6575uY=", - "pom": "sha256-vA0UoJ1oUDOagAEwkqHq6ksp2r7X3EpnBG9/Zw2a+84=" + "org/apache/maven/resolver#maven-resolver-transport-file/1.9.22": { + "jar": "sha256-TyqFfYuDJJS66e9tfbe7hAk3iyiqvTYV8D+uvkKkrR0=", + "pom": "sha256-OFtpusk/R2tkT+Z0bdJgL4mYGKKWFgZaD4Xvi6glH6g=" }, - "org/apache/maven/resolver#maven-resolver-transport-wagon/1.9.2": { - "jar": "sha256-JKrTRTrDVxlzMLS1PJHkpkxL9QZcAT7TXx9pmwF5slY=", - "pom": "sha256-xMe/JvLjG7XSpIyXiABHW9sOV8J3WoYm0mr40CZ+VCc=" + "org/apache/maven/resolver#maven-resolver-transport-wagon/1.9.22": { + "jar": "sha256-JB6diNHTriQrC3/m6oIiYFkNetkFv/GHITj7zeecsho=", + "pom": "sha256-y7WYphz+zzYCdKmNv24l8J3YilS5K6o/jR0cdao2NLU=" }, "org/apache/maven/resolver#maven-resolver-util/1.6.3": { "pom": "sha256-0cNedvQWbxOwpR1WWs+Wfpw8eeLMtpzL9PrAmOS3xGY=" }, - "org/apache/maven/resolver#maven-resolver-util/1.9.2": { - "jar": "sha256-Rt5yjW4446EBmDZ1JEoith1NLIZqGdUCoPpncCE6K/U=", - "pom": "sha256-GPziLjKecX5/iPzIrqhCaUzwOMRkDrEVvRZEGUikTAc=" + "org/apache/maven/resolver#maven-resolver-util/1.9.22": { + "jar": "sha256-Sq6hWEw5KUypJvxHRyPZaERzYJ70SQxOsWnW6n2sprU=", + "pom": "sha256-qmEFB6UPNUewgQwY83GKxBxjbG4LqERfFhGjxuiD/tM=" }, "org/apache/maven/resolver#maven-resolver/1.6.3": { "pom": "sha256-lzl+51sTDuK7Sijg+7EllZWoNhM4q6CC+K8Uc5joo+w=" }, - "org/apache/maven/resolver#maven-resolver/1.9.2": { - "pom": "sha256-yjWN3m5VIZS7sOXRDbHH9cYiLda1v+PSPfmNqmxusNc=" + "org/apache/maven/resolver#maven-resolver/1.9.22": { + "pom": "sha256-MsdIma6Rm1K9wHysKKuixmUbcxcqufQRH3xSe2B2Cts=" }, "org/apache/maven/shared#maven-shared-components/34": { "pom": "sha256-ZNDttfIc//YAscOrfUX5dUzRi6X7+Ds9G7fEhJQ32OM=" @@ -1137,20 +1236,15 @@ "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "org/assertj#assertj-core/3.25.3": { - "jar": "sha256-f73/oZltQ8wI4lduAQCLB+V7utK0dBqmw6tzzoUREw4=", - "pom": "sha256-ORcjDqozvPE+oz3TN6yvqdMmxzlmC/S2/FbIjXj+ufI=" + "org/assertj#assertj-core/3.27.3": { + "jar": "sha256-W4omIF9tXqYK2c5lzkpAoq/kxIq+7GG9B0CgiMJOifU=", + "pom": "sha256-jrN+QWt4B+e/833QN8QMBrlWk6dgWcX7m+uFSaTO19w=" }, "org/checkerframework#checker-qual/3.12.0": { "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" }, - "org/checkerframework#checker-qual/3.42.0": { - "jar": "sha256-zK7dM68LeJTZ8vO2RPTRnkOSjjKQLmGsTRB3eDD1qsc=", - "module": "sha256-4PpiK33mPq4RBH726RtMKtDx8OE8uQP/UggKR/V6V0Y=", - "pom": "sha256-v1/KqycvVMvPG753w72WPIIcmrrSBYcIvwvtPIdUlMo=" - }, "org/codehaus/plexus#plexus-cipher/2.0": { "jar": "sha256-mn8bXFqe/9Yerf2HMUUqL3ao55ER+sOR73XqgBvqIDo=", "pom": "sha256-BIQvMxsCJbhaXiBDlxDSKOp6YwKr5tU8nJhG+8W/mf8=" @@ -1187,12 +1281,16 @@ "org/codehaus/plexus#plexus/8": { "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw=" }, - "org/ec4j/core#ec4j-core-parent/0.3.0": { - "pom": "sha256-kKMRBDNTwIfbP/LzSAKWc1ii5IgkXYh7OcIbZvc+3mU=" + "org/drjekyll#fontchooser/3.1.0": { + "jar": "sha256-RYqkEi6dlGd8zws9uZ20MSrUnSn8xoFd/biHq9klZYc=", + "pom": "sha256-l6K6GCYwhF2BknHP6GP08mPoGoh5DC3aopHpsdsbhaQ=" }, - "org/ec4j/core#ec4j-core/0.3.0": { - "jar": "sha256-yt7wIHB3B0sRoSvkQviats+T+8L4SHAtk3GpYRQU1Vg=", - "pom": "sha256-/RtdTKFRGzy8nJGvde82Eii0+fsQAZLTyGVHGETdxuk=" + "org/ec4j/core#ec4j-core-parent/1.1.1": { + "pom": "sha256-Id3ekeuJfAN3XBAVMgdn4mCWjuGRm6a4qYAuK6GX2VM=" + }, + "org/ec4j/core#ec4j-core/1.1.1": { + "jar": "sha256-1z3uRP77cl38ZYJnRl/lp2imZjE9is1wEgn1g28UMdg=", + "pom": "sha256-ms07s8BonmCVaYv2bmQxJkaReICt/2HTSSgQEmEpuTo=" }, "org/eclipse/jdt#ecj/3.33.0": { "jar": "sha256-92hsSWDPcMLrxcUApzqM/ARUG3MMGPHFwhMpiJsTf0U=", @@ -1201,8 +1299,8 @@ "org/eclipse/jdt/ecj/maven-metadata": { "xml": { "groupId": "org.eclipse.jdt", - "lastUpdated": "20241203050026", - "release": "3.40.0" + "lastUpdated": "20251208072715", + "release": "3.44.0" } }, "org/eclipse/sisu#org.eclipse.sisu.inject/0.3.5": { @@ -1219,26 +1317,42 @@ "org/eclipse/sisu#sisu-plexus/0.3.5": { "pom": "sha256-broJAu/Yma7A2NGaw8vFMSPNQROf4OHSnMXIdKeRud4=" }, - "org/hamcrest#hamcrest-core/2.2": { - "jar": "sha256-CU9dkrS32ciiv1PMadNWJDronDSZRXvLS5L37Tv5WHk=", - "pom": "sha256-9/3i//UQGl/Do54ogQuRHC2iAt3CvVB2X4nnxv+M590=" + "org/exbin/auxiliary#binary_data-array/0.2.2": { + "jar": "sha256-E5SjC6S8EJ3IJf9aMZSyEWMscaaT82vAd33avycWBd0=", + "pom": "sha256-kvRjJ0EaMLAQ33Zdvsfjj52DE76LqHX1B4BYoCb6eig=" }, - "org/hamcrest#hamcrest-library/2.2": { - "jar": "sha256-OFFSOiAaDUglwlphpu3FBxKCWjm9PQM5G5jEjKPLOWw=", - "pom": "sha256-9YrYNdJCZDElnYbk/jpPUWHmcdkWxcvs81c4vN6C/P8=" + "org/exbin/auxiliary#binary_data/0.2.2": { + "jar": "sha256-rgAvcDLYd1YeLscZ3V2k2sQUJ1pnIetMxp0LAo0mlYo=", + "pom": "sha256-EEVff+yMFFu9AWFQNVUoLkohKka26J16qlB52PHcXNM=" }, - "org/hamcrest#hamcrest/2.2": { - "jar": "sha256-XmKEaonwXNeM2cGlU/NA0AJFg4DDIEVd0fj8VJeoocE=", - "pom": "sha256-s2E3N2xLP8923DN+KhvFtpGirBqpZqtdJiCak4EvpX0=" + "org/exbin/bined#bined-core/0.2.2": { + "jar": "sha256-s2EfHQZ5gq91qKBt4fDgOCxqv4df9ULKcerdx6iZWQc=", + "pom": "sha256-qi0WGBuxvmpkEXlJmQVulE65yz6s3SA1Fxs/0If+pVM=" + }, + "org/exbin/bined#bined-highlight-swing/0.2.2": { + "jar": "sha256-nWFhxlGjovqhiVWGBoMM3Wm08GHZGfVfSobU89DUV60=", + "pom": "sha256-msvWUndKEQElhKRBNLDZdsfNvhLopzw4uJhiT+sAi6E=" + }, + "org/exbin/bined#bined-section/0.2.2": { + "jar": "sha256-WlgYCiy2PvXX6yJ9MjOwWrkAk5g+eadlhMxRHJNuYRs=", + "pom": "sha256-IUnZCF4LlMAtlSWTb+KdfaS1Km2sejVewz1FbQbszJU=" + }, + "org/exbin/bined#bined-swing-section/0.2.2": { + "jar": "sha256-Mqi1bgigoai2Zw1ov9K0CY0WEwSQFqJk08SACpZJlPc=", + "pom": "sha256-1iMUd4xy/0fwVzoQb+6H+QYLwnRr0WD+51YGzlVNxfM=" + }, + "org/exbin/bined#bined-swing/0.2.2": { + "jar": "sha256-Lr1LEy0t7rqVeHdBLsAXbjGEPhs79ZabG/s8goDKq5U=", + "pom": "sha256-ZWXG9Y5EVc/ZQGkQWR3HcpKQUd4Iqn4/GxM9nHhSJyI=" }, "org/javassist#javassist/3.28.0-GA": { "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=", "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0=" }, - "org/jcommander#jcommander/1.83": { - "jar": "sha256-5l9JwhGaGFm5B2Bh5WH7WVii+m/9tJ8FHKjVmgs/h+Q=", - "module": "sha256-4nbeXr/WJFWAgvhhhFxhYTNryhu8MNXFZIUeNR2bE0U=", - "pom": "sha256-BYh7BLFe8u4t+gZozEfCRaO4kLZzM+gjNgJEVAKLMCA=" + "org/jcommander#jcommander/2.0": { + "jar": "sha256-Yvwe3ArESwM9cGmEQ3UONv/rhzhssdeylLDqNDhOEiw=", + "module": "sha256-cnpzaYXHVZ6A3O6EQqd4SWAuzdb/9wGD5/7jIhaljIA=", + "pom": "sha256-pUoNL5BnLA3bVhrlKYANm1BjcqDNcoWwgm5jwxbC4aA=" }, "org/jetbrains#annotations/13.0": { "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", @@ -1248,190 +1362,203 @@ "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" }, - "org/jetbrains#annotations/24.1.0": { - "jar": "sha256-J6dw3HzlBQCRi7jDwGYMmCkGMOx5a1489rkPQDswM8Y=", - "pom": "sha256-Ljf9cCCkNkueXZ93xbZ0Kjvqkn3VYMoeOQ3IFcnFCCA=" + "org/jetbrains#annotations/26.0.2": { + "jar": "sha256-IDe+N4mA07qTM+l5VfOyzeOSqhJNBMpzzi7uZlcZkpc=", + "module": "sha256-vvC4NSst/Uy3FV7MKjkie/FqPghme6vsZQx2sau/zss=", + "pom": "sha256-fr7Oreja2nyxfv8+AUkiw5Ai0qN44+LSRh8o8Bb/x/c=" }, - "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { - "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", - "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + "org/jetbrains#annotations/26.0.2/common": { + "jar": "sha256-T8x8YEE2qfo0VjsgfIj2tGjAHXgU6fcJeYpl7XYG7rI=" }, - "org/jetbrains/kotlin#kotlin-build-common/1.9.23": { - "jar": "sha256-IoJaHv4VSRN9GBPtedycyvVLSoonAKSsf3CNxmAki68=", - "pom": "sha256-2ePH5h9YSUkAFP6BC/wQSp6aRNVl7RhsWGu7P0/D0/s=" + "org/jetbrains/kotlin#abi-tools-api/2.2.0": { + "jar": "sha256-hxeDiGZkLjvdR+yeAmC70wdujH6GvgXirahoMesq+Qo=", + "pom": "sha256-UwmmvuGytgrDtfXTXMS2zDiKFzOA17jeqgIJ6wgUnpA=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/1.9.23": { - "jar": "sha256-gvhH4lRXtGSDfv7x2oUC7JJTLedAbnkgUWbODs9PxSE=", - "pom": "sha256-CWkjtiXJfGZzZ5ZsxM6Sv5TE6f98U8sdOEhgEax1DVg=" + "org/jetbrains/kotlin#abi-tools/2.2.0": { + "jar": "sha256-Pngn8qdqgpa3vvfzyzrPxJJA1gtTNwidRHyJIfbgi00=", + "pom": "sha256-avzEJec8EEvnrSCQF1u1wgHGQWV1sdX1suMFEDl6o1c=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/1.9.23": { - "jar": "sha256-6sLwRmWHGVWn0K5FcZad8rCOfTN7LxIhAGb9PuAfWYE=", - "pom": "sha256-/OLyPE6fBzshdovfVqMa2W0zjNwD0FoVekWl/bL/7bE=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.2.0": { + "jar": "sha256-HezZmyKUN3QfNqAIxnip2PrjBxbodyFRMI9W9owQ844=", + "pom": "sha256-I6QFgttMPijHq6X8fpZHvI1e/d+dAFWp5CyaCJbVzjM=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/1.9.22": { - "jar": "sha256-K/6t7lmrGYjDNtvW5l2ZH3Zq4d2Gg/Km3tX6oCefDKA=", - "pom": "sha256-s9o0u29ClqzzoPRDRm8FBsbJnaXNliTW4LdFsiKHhOs=" + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.2.0": { + "jar": "sha256-SofzwCcvFyhdYOmGQ+whn1Ppta1aI/O8TFQ6hkT4bxc=", + "pom": "sha256-6DgEIFq2l7pyL0YiprG1GS70ejDL35ApdwFJQ3hQTv8=" }, - "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/2.2.0": { + "jar": "sha256-svdD6luhL2ng815djUYGnXTI4oYQh1SKfg4Up4S8TPE=", + "pom": "sha256-FqFd0ZfPJBNJT3iMuWFE2aFGJnw9b38cFbejweBSNGo=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/1.9.23": { - "jar": "sha256-yFlaPhcRx0U8f5YKrxKhcNtL2j1vy6Sf/I4yy/0ADKE=", - "pom": "sha256-KebjEpGbdf6aOHjflRHPQhDcJuWTQcsu4iSDt7Tgcv4=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.2.0": { + "jar": "sha256-kHBq6Gcd77oBQI3RxUG6MJEskHDN8d3aGMUero1nkwQ=", + "pom": "sha256-iQfZfcaLv0CgrmZ5RZAvDtwWYdvPdDuuDf2nw7mp1Mg=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/1.9.23": { - "jar": "sha256-5jFUJUkZ/XBv6ZN8SNuTfqkGimMfht5lWlFLwWIPmI0=", - "pom": "sha256-X70GastuQIU5gCdsaDUWmSj2Zqt8RlEsJvJMnQMIF9M=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.2.0": { + "jar": "sha256-ISk9oBbkuhKhKKwm/ZIKdOi4f1dM+bxDxgo9LnZFp64=", + "pom": "sha256-HESKBvDKmGiVi+CHesnof8TgG8uTaHp8rBLTxNCd7uY=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/1.9.23": { - "jar": "sha256-bztmG5gmetJOL4+3rV0Gvn0u1hpdBcJn9OTKp433g9k=", - "pom": "sha256-WFRgOL5Go4NmOFPRMd12xPsnQ4MLqXt0sno1zxAtPQI=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.2.0": { + "jar": "sha256-omzI4thhkZfMTRFb6ndm6aqODx54duoETuG58wVlRgE=", + "pom": "sha256-vSrk4skWBWVKilUn2nV/KyJ2WA0fXq6+q9M0OvjVxGc=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/1.9.23": { - "jar": "sha256-uAo4tLuB+wPQ8wdHPQMtc7J3j6drA0Y4floQ3YM9co4=", - "pom": "sha256-iLBAO2Z/cVJX6gDXdiFkkzggk+727vUBslU6HVIHG2g=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.2.0": { + "jar": "sha256-KEF+GZd6pJjcCJk6riAf/CG5Tp/0IvUiUi1gj2BrkgY=", + "pom": "sha256-DDfkh0Gs5zKbymh/4hRTg4vRn+ZhE1uE5o5dBkM7ZIE=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.2.0": { + "jar": "sha256-UBIirn1jUn5V8uXmRfGNTv8sGQdMhbm8BVhm4+0rF78=", + "pom": "sha256-Vav6RtrO+hAxYMwE4MUeVgq6DKIyAD/bz7TtjN05m0U=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/1.9.23": { - "jar": "sha256-dRN+QUoaW0tNCQ+BLQ416zC08MkjpT1pWFRWuyT8Hfg=", - "pom": "sha256-LWx0sGpUDpicq9BTChbnZYGQUl8vTVpDq5sa/nQU/F8=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.2.0": { + "jar": "sha256-Ttl/0eDJux0JSO1eY8yRRWMTpZUYKVuSssFRSu9VYVA=", + "pom": "sha256-5QdIv0Z09lRgPnsbuDBjTsmevZwzDeukytzuwHZ8u1Y=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/1.9.23": { - "jar": "sha256-ii5Wfz2/Nz5hwBrNeIRjHshThGWrjul4rGMpb4zJr0Y=", - "pom": "sha256-/CiXW5TcQMDZD9EXXiKxtka60sY368+fT2qy1Oe8XdU=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.2.0": { + "jar": "sha256-fJrISZ+pGyAep4NlN8Yl3VKoJUnlfms/F1zAx56atgQ=", + "pom": "sha256-1M1vjH2tiOZ9iVzT23qNTH3I6N3Y6WeOH1619gHZsO0=" }, - "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/2.2.0": { + "jar": "sha256-ksfW7HxfBdisAcN+dHrGd9iS6ZusDeXlFmg7jzZAdys=", + "pom": "sha256-VjapUSxI/NqPgm+ypKwXPCnW6zV0ZHE9VNJaTUbsbBM=" }, - "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/2.2.0": { + "jar": "sha256-HSbL3a7rb/1FgIU5bs6gsID8Io/gBtz4MD2ldxHzN0U=", + "pom": "sha256-oeMpM4wq8LRweB0ECGnpsZdS+KTesi9D9qiR68dPH4I=" }, - "org/jetbrains/kotlin#kotlin-scripting-dependencies-maven/1.9.23": { - "jar": "sha256-15BHfNrTlUm3vlMKHXBaa0RUgEFvYUMWLzIoaiqoeGI=", - "pom": "sha256-5FD5GXKvpLES34ljPbiGRj0XG01WNZx5lDT3Z5eRjb0=" + "org/jetbrains/kotlin#kotlin-scripting-dependencies-maven/2.2.0": { + "jar": "sha256-1/YC5xsRzjhWr2NNRzEEQJ3aywzqUciUi17WPGFZ5bE=", + "pom": "sha256-vHvp9GJDpRtWyXsLIaAOwOxxySBinhlMdzTkQCLzuf4=" }, - "org/jetbrains/kotlin#kotlin-scripting-dependencies/1.9.23": { - "jar": "sha256-b7saKennTbMR0UVWAsWG7ySIcG4ysN966mdMb87ZC90=", - "pom": "sha256-QmyeCV1+xxiGq0Ia/keHbTXG0H2HSvMtDvEJJjR7UwM=" + "org/jetbrains/kotlin#kotlin-scripting-dependencies/2.2.0": { + "jar": "sha256-WFLGye6JbeGFQqOe4WWGnMduAQ5FqicM8qbRsR2Dg/A=", + "pom": "sha256-SXIbK1M2aOnXhukKsJQhVII+JD+nHPpAvOJSq2IJp98=" }, - "org/jetbrains/kotlin#kotlin-scripting-ide-services/1.9.23": { - "jar": "sha256-NbieJKmqscF//YMTW8qrPvr2a1YIjw8UhqNV4bE/37k=", - "pom": "sha256-ZbprfsFiGKOpst4RgwSPCleY8bJKII9O/EGWBo/wViE=" + "org/jetbrains/kotlin#kotlin-scripting-ide-services/2.2.0": { + "jar": "sha256-19TCbvqj28E/dFm2z1RlD0QjLOMONg9UzLRW0NJ64C0=", + "pom": "sha256-Jgb5tbK1ENd5fmDmhIEzFTkkl/XuUslyyR/4zkHSKW0=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm-host/1.9.23": { - "jar": "sha256-GGE2U4yx0RFatixSOe2uz/R+ZFByPpch10z8wcvmSI8=", - "pom": "sha256-zlETvo0uISJ1iCOzwX24YciRO/ZmDkj3FY8pgT72pSo=" + "org/jetbrains/kotlin#kotlin-scripting-jvm-host/2.2.0": { + "jar": "sha256-np+Jt+aKK8uCADvZusX+/nBSZ7C/cwvVExKZ7XwKnZM=", + "pom": "sha256-8z74nSCrE/wI9GDiE7zWFrDMU2vA5PfUsgFNSMx5H/g=" }, - "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/2.2.0": { + "jar": "sha256-YKjHQtYfRPIxH73IqGt2fRcboJ2XvnLWukUNN/fj/b8=", + "pom": "sha256-dii0nV53BennadESYAZtmmlXPW2Av4Iw0FRvWo54yJ4=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/1.9.23": { - "module": "sha256-hjnwBfqZd67wjDL8jnonedoi7iYkZNcnMpiq/Ug3Fc0=", - "pom": "sha256-OuBxRYdw47aGCafTGet5emeJ9fBAyqQUQJgJmGhb5PY=" + "org/jetbrains/kotlin#kotlin-stdlib-common/2.2.0": { + "module": "sha256-WPwNZk/Dpn5+a+n9vq7b0hLfo+Un90T4YeeSzacsDkc=", + "pom": "sha256-U3q0BzqEelm6dtmaZFqGCbU4L/pdJZGjVLL6MR9JlzM=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.23": { - "jar": "sha256-iRDMI4gH2G71UMsfCxDdXtQLNaTsGlJSX3YK7ehOrTc=", - "module": "sha256-UZUZOzfc2touHAqw1RLEIrKtdq81V4Q6G5w0gPTnHQ4=", - "pom": "sha256-wm0n8mcQrUDiPu2f/gpkuFkejBPSI8ypDFk+5j87KKs=" + "org/jetbrains/kotlin#kotlin-stdlib/2.2.0": { + "jar": "sha256-ZdEthaO4ZcFg25FHhRcSpksQ2t1osi7qIqlb+KhnDco=", + "module": "sha256-pbmP3NnbAX1ULhlyJdzuGNZYpW3h2yzEHhMZbWsXaaQ=", + "pom": "sha256-jDyCEAfBNBFVhzm589U4LrgVUds4lc/7iVYeVsD03BY=" }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.23/all": { - "jar": "sha256-zsOLwzAucqiq+c3kNrWpBx7gMx4q0F6E2LuJczTX6dQ=" + "org/jetbrains/kotlin#kotlin-stdlib/2.2.0/all": { + "jar": "sha256-4jAPqlnJNSk9q7Chg9LmEIqbARxCcHbD97oQ0ktzugo=" }, "org/jetbrains/kotlinx#atomicfu/0.23.1": { "jar": "sha256-fbhmDr5LkbtHjts2FsTjpQulnAfcpRfR4ShMA/6GrFc=", "module": "sha256-Pokf5ja1UQgZIQD884saObzRwlM+I8Ri/AdkTur8sg8=", "pom": "sha256-aIt5ABn0F87APmldZWexc7o7skGJVBZi8U/2ZEG1Pas=" }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": { + "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY=" + }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" }, - "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.10.2": { + "jar": "sha256-XKF1s43zMf1kFVs1zYyuElH6nuNpcJs21C4KKIzM4/0=", + "module": "sha256-6eSnS02/4PXr7tiNSfNUbD7DCJQZsg5SUEAxNcLGTFM=", + "pom": "sha256-ZY9Xa5bIMuc4JAatsZfWTY4ul94Q6W36NwDez6KmDe8=" }, "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.8.0": { - "jar": "sha256-IKpDS2qTDqZtLmGwDe764J/qPTL5ZA0uDCcTEogOCt0=", - "module": "sha256-FE7s1TZd4+MNe0YibAWAUeOZVbXBieMfpMfP+5nWILo=", - "pom": "sha256-yglaS/iLR0+trOgzLBCXC3nLgBu/XfBHo5Ov4Ql28yE=" + "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.2": { + "jar": "sha256-MZtlMAnUnHCYL5jfKcyE/HAlsJLLBXHI51MuOtQ2ba4=", + "module": "sha256-j+JUF35xGnzRijwG2CQvzpRfQcLMoT3BmzOuQqVDUBY=", + "pom": "sha256-UZ2lQACW80YqTa6AeDrQUEE9S8gex65T+udq7wzL7Uw=" }, "org/jetbrains/kotlinx#kotlinx-metadata-jvm/0.9.0": { "jar": "sha256-1C9LrGC4HE/c7xxmau1BgdAEAeXmluSW9Ek1/jL+pY8=", "pom": "sha256-stGZ96s08Nie6VlCizjwl2iJfasjZno+Ou+DgaHCfwM=" }, - "org/junit#junit-bom/5.10.0": { - "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", - "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + "org/jspecify#jspecify/1.0.0": { + "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", + "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", + "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" }, "org/junit#junit-bom/5.10.2": { "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" }, - "org/junit#junit-bom/5.7.1": { - "module": "sha256-mFTjiU1kskhSB+AEa8oHs9QtFp54L0+oyc4imnj67gQ=", - "pom": "sha256-C5sUo9YhBvr+jGinF7h7h60YaFiZRRt1PAT6QbaFd4Q=" + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" }, - "org/junit#junit-bom/5.7.2": { - "module": "sha256-87zrHFndT2mT9DBN/6WAFyuN9lp2zTb6T9ksBXjSitg=", - "pom": "sha256-zRSqqGmZH4ICHFhdVw0x/zQry6WLtEIztwGTdxuWSHs=" + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" }, - "org/junit/jupiter#junit-jupiter-api/5.10.2": { - "jar": "sha256-r/93wYbNMXJ1gDhy+lEzqoAf1qxAvZHHimz4AJtLF8w=", - "module": "sha256-QRtKlsKm2wmY1uWOiZNn8NElQWPzBBydmOeu38o3RBk=", - "pom": "sha256-u12jBgImsbPOtUCEldxptZRlv1DX6+Y+75TyWQnPGQA=" + "org/junit#junit-bom/5.11.2": { + "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", + "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" }, - "org/junit/jupiter#junit-jupiter-engine/5.10.2": { - "jar": "sha256-tt812nUKVGrpMjdvEbPA34QfDJDHyylEzTmttDKIbks=", - "module": "sha256-FD7yda5mlRGdeCEqkyRazrv5I1tTdbn0wdSvcy87Uwo=", - "pom": "sha256-q+csj7+anI+e55usKbpkedMrDf+quICApQKRHSTTlGM=" + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" }, - "org/junit/jupiter#junit-jupiter-params/5.10.2": { - "jar": "sha256-7bHkP/C4BnYm/7VeXp7sodmrJHgUGnx/JT0RWynMfPI=", - "module": "sha256-IMLmXVKjnIVJbo4XDgjG7Sk1x/NeZRAT2WTcG7dcgns=", - "pom": "sha256-8n19CW20igXW56/YQalUVEJOVcUj167RZoF4szpjy9c=" + "org/junit#junit-bom/5.13.1": { + "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=", + "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM=" }, - "org/junit/jupiter#junit-jupiter/5.10.2": { - "jar": "sha256-Jj5DRH9LQPEmrWsdy9ffN5RIQTve244NJAxby7p8ek8=", - "module": "sha256-cjF2bPGyuJLGehQsljkU5rc/u1BhpschROt/jnJ3DsE=", - "pom": "sha256-1bcMXC10Ui2mEM04d28iW6wDSsJZGEO+6Xl6urOIDqs=" + "org/junit#junit-bom/5.13.3": { + "module": "sha256-XchNdO+YHQI8Y56wy8Sx+e+JEDQofOGxAe/7vA8VNLQ=", + "pom": "sha256-47k+m7iHGWnPEcDo/xD1B4QdsYhcoQV44pCEb2YP1o4=" }, - "org/junit/platform#junit-platform-commons/1.10.2": { - "jar": "sha256-tWpewACked9Jc7GLuiTJj+Dbj6oUyJB9PvRR2Mcf2K4=", - "module": "sha256-HoFCGmL4cryk0gIgs56hniexNfNre3gXBPkvrVQxlhg=", - "pom": "sha256-8/glx8o72JcU1IlEfHfHbifqOPAoX195ahAAoX/KS+c=" + "org/junit/jupiter#junit-jupiter-api/5.13.3": { + "jar": "sha256-GhWlIlOpcsgsDb93dZqYP1r+0Fg1hc3FsqO+qh9K4Kw=", + "module": "sha256-hUq9STPlOKRnrmaPQIXiLq9JobVWx7qTlcJPaGLo7go=", + "pom": "sha256-Fgjmn2le6NrTY+qN70VXEDixBTJlrJXCPMWXU8wXieA=" }, - "org/junit/platform#junit-platform-engine/1.10.2": { - "jar": "sha256-kFy6m0mYzMKdEjkIWn+x/g4oAk11JhUjVtgQ7ewKSaM=", - "module": "sha256-4dG63P7cJyRFQeC+XV6EtyoicNevYWhrJvEc/Edw2kI=", - "pom": "sha256-EqqGyhwNZIoiXU58aWBUwfx26IeCxcOft983muI7728=" + "org/junit/jupiter#junit-jupiter-engine/5.13.3": { + "jar": "sha256-CAfuJtQ4dXUYt978ojwDfyXIDZPkWecrmrmTlvtLR4s=", + "module": "sha256-uDM8bgb/7qSuxJ85np68jm6wKQf45t/4tQqhTy6jMKs=", + "pom": "sha256-Ce5Dgl8ueUIcFwdxEuScFRMn7qG7yGF2yG8nDSoS59g=" }, - "org/junit/platform#junit-platform-launcher/1.10.2": { - "jar": "sha256-rtT0L7kK2ps0fCMfE2VvwJEhuiDattxkamvZ1Nox5Ko=", - "module": "sha256-/1YhIQJQJSv9rbYiu+LqZuzsMahnc2zqSz1K3yGcp/8=", - "pom": "sha256-WjEXCOeQa7l0YpwayHC8EWV0ZbmJ2koHfkVBa9mHJeQ=" + "org/junit/jupiter#junit-jupiter-params/5.13.3": { + "jar": "sha256-34m86CksRP0zQlZK616On0XmR04rNB6JPOj/GGCJpRw=", + "module": "sha256-LdOgQUDf0bj7/9YiEoIFudRVN56Z5Agbns7ICDgK/E4=", + "pom": "sha256-uhWqOvoOKWedkNCL0jIgU/FtNIA3QMgdhBGH/cMrN4c=" }, - "org/mockito#mockito-core/5.11.0": { - "jar": "sha256-8HbJax9JuNm8QuRrCWmq9WhMQMi1tnnUAOXYgAc6DgA=", - "pom": "sha256-ugsbXXA1CUlPmo5EWCIjh54zSKTElmfwx35odG5IHHg=" + "org/junit/jupiter#junit-jupiter/5.13.3": { + "jar": "sha256-XPa4dfJ4pieolV8ttdvIuxpTu8azmjO25YGht7B5j1g=", + "module": "sha256-Mnri3hS5q1rQoIdUVdEFOb2gTlxXLm9KNYj6whBPhQA=", + "pom": "sha256-+miNXIymuGV9h2ZpDqq5n/oIVbqT3pjxEnYPj+GntpE=" }, - "org/objenesis#objenesis-parent/3.3": { - "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8=" + "org/junit/platform#junit-platform-commons/1.13.3": { + "jar": "sha256-As1mpV33UKEj2Pdh5lA+RVrBCP8bNl1EbodLo7xWyok=", + "module": "sha256-MmJyJpoK1TOz9tUlhMcPa8E0XRZ2xgxkO1IgGOXOvdM=", + "pom": "sha256-8DzdBrvQUhqlwlI20iAup4caOmajwFcDQFNORENpyXI=" }, - "org/objenesis#objenesis/3.3": { - "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=", - "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM=" + "org/junit/platform#junit-platform-engine/1.13.3": { + "jar": "sha256-SQoqNyvSSR0KmzxgUx2E8TgbGh18oJ7rO/5542b46to=", + "module": "sha256-OQuYuO1TJ5k4x+T4L7+sLksnkKs7OPKjjRG+oj6GrG4=", + "pom": "sha256-zsTGtvETYww1W8+Yk3ltgCokl4v0ABt4XFKOWeFmZ8s=" + }, + "org/junit/platform#junit-platform-launcher/1.13.3": { + "jar": "sha256-rWJM6tV+q7CBE9e2GqGfkWrHJaTujH+zJeIgd2KwyH8=", + "module": "sha256-BZrZXmcB3PToGp9ki1uhBWU5TDy5r5bFfG2vcpE+KN0=", + "pom": "sha256-o1I7XgaHhSfkRj0Z7S3JtHo4pC1d7dTCfLIu8lxcOm0=" }, "org/opentest4j#opentest4j/1.3.0": { "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", @@ -1457,13 +1584,13 @@ "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" }, - "org/ow2/asm#asm/9.7": { - "jar": "sha256-rfRtXjSUC98Ujs3Sap7o7qlElqcgNP9xQQZrPupcTp0=", - "pom": "sha256-3gARXx2E86Cy7jpLb2GS0Gb4bRhdZ7nRUi8sgP6sXwA=" + "org/ow2/asm#asm/9.8": { + "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", + "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" }, - "org/reactivestreams#reactive-streams/1.0.3": { - "jar": "sha256-He4EgQctGckptiPhVeFNL2CF3AEVKaCg2+/ITPVx2GU=", - "pom": "sha256-zO1GcXX0JXgz9ssHUQ/5ezx1oG4aWNiCo515hT1RxgI=" + "org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" }, "org/reflections#reflections/0.10.2": { "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=", @@ -1473,18 +1600,18 @@ "jar": "sha256-q1fKj9IjdywXNl0SH1npTsvwrlnQjAOjy1uBBxwBkZU=", "pom": "sha256-vZYkPX1CGM18x9RcDjD6E0gKGk+R01bt19/pPx/7aOY=" }, - "org/slf4j#slf4j-api/2.0.13": { - "jar": "sha256-58KkjoUVuh9J+mN9V7Ti9ZCz9b2XQHrGmcOqXvsSBKk=", - "pom": "sha256-UYBc/agMoqyCBBuQbZhl056YI+NYoO62I3nf7UdcFXE=" + "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", + "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" }, - "org/slf4j#slf4j-bom/2.0.13": { - "pom": "sha256-evJy16c44rmHY3kf/diWBA6L6ymKiP1gYhRAeXbNMQo=" + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" }, "org/slf4j#slf4j-parent/1.7.36": { "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" }, - "org/slf4j#slf4j-parent/2.0.13": { - "pom": "sha256-Z/rP1R8Gk1zqhWFaBHddcNgL/QOtDzdnA1H5IO0LtYo=" + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" @@ -1498,9 +1625,9 @@ "org/yaml#snakeyaml/1.23/android": { "jar": "sha256-wPepBigXKXDT/21+qnoE9ztXKQs7jbqRbIKBp28iFMo=" }, - "tools/profiler#async-profiler/3.0": { - "jar": "sha256-j3mIYASdAfSi+FNZbSjIXSmD8MCY8WWjKQm32px0IJ8=", - "pom": "sha256-kcs0wRa8nJ0jcynAw9TJdrLcby37mv6e8uRUO5aJiVU=" + "tools/profiler#async-profiler/4.0": { + "jar": "sha256-F380ABWw5Stmc6+zigftsS1YzyeSCk3Jup526dDsqYY=", + "pom": "sha256-qdVKkeNTQa6fXHSe1n2we6ty/0wHeZIz0QSYCMYc1E4=" } } } diff --git a/pkgs/by-name/ja/jadx/nix-build.patch b/pkgs/by-name/ja/jadx/nix-build.patch new file mode 100644 index 000000000000..30beaa9135b9 --- /dev/null +++ b/pkgs/by-name/ja/jadx/nix-build.patch @@ -0,0 +1,216 @@ +diff --git a/build.gradle.kts b/build.gradle.kts +index 7e4d28a9..0fe94ff6 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -115,46 +115,11 @@ fun isNonStable(version: String): Boolean { + destinationDirectory.set(layout.buildDirectory) + } + +-val distWin by tasks.registering(Zip::class) { +- group = "jadx" +- description = "Build Windows bundle" +- +- val guiTask = tasks.getByPath("jadx-gui:copyDistWin") +- dependsOn(guiTask) +- from(guiTask.outputs) +- +- destinationDirectory.set(layout.buildDirectory.dir("distWin")) +- archiveFileName.set("jadx-gui-$jadxVersion-win.zip") +- duplicatesStrategy = DuplicatesStrategy.EXCLUDE +-} +- +-val distWinWithJre by tasks.registering(Zip::class) { +- description = "Build Windows with JRE bundle" +- +- val guiTask = tasks.getByPath(":jadx-gui:copyDistWinWithJre") +- dependsOn(guiTask) +- from(guiTask.outputs) +- +- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre")) +- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip") +- duplicatesStrategy = DuplicatesStrategy.EXCLUDE +-} +- + val dist by tasks.registering { + group = "jadx" + description = "Build jadx distribution zip bundles" + + dependsOn(pack) +- +- val os = DefaultNativePlatform.getCurrentOperatingSystem() +- if (os.isWindows) { +- if (project.hasProperty("bundleJRE")) { +- println("Build win bundle with JRE") +- dependsOn(distWinWithJre) +- } else { +- dependsOn(distWin) +- } +- } + } + + val cleanBuildDir by tasks.registering(Delete::class) { +diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts +index ff9e7e36..7a63af40 100644 +--- a/buildSrc/build.gradle.kts ++++ b/buildSrc/build.gradle.kts +@@ -4,8 +4,6 @@ + + dependencies { + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0") +- +- implementation("org.openrewrite:plugin:6.19.1") + } + + repositories { +diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts +index ad65de18..ecb53db1 100644 +--- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts ++++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts +@@ -3,8 +3,6 @@ + plugins { + java + checkstyle +- +- id("jadx-rewrite") + } + + val jadxVersion: String by rootProject.extra +diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts +deleted file mode 100644 +index aab46d55..00000000 +--- a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts ++++ /dev/null +@@ -1,35 +0,0 @@ +-plugins { +- id("org.openrewrite.rewrite") +-} +- +-repositories { +- mavenCentral() +-} +- +-dependencies { +- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.13.0") +- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.11.0") +- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.13.0") +- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.12.0") +-} +- +-tasks { +- rewrite { +- // exclusion("src/test/java/jadx/tests/integration") +- +- // activeRecipe("org.openrewrite.java.migrate.Java8toJava11") +- +- // checkstyle auto fix +- // activeRecipe("org.openrewrite.staticanalysis.CodeCleanup") +- // setCheckstyleConfigFile(file("$rootDir/config/checkstyle/checkstyle.xml")) +- +- // logging +- // activeRecipe("org.openrewrite.java.logging.slf4j.Slf4jBestPractices") +- // activeRecipe("org.openrewrite.java.logging.slf4j.LoggersNamedForEnclosingClass") +- // activeRecipe("org.openrewrite.java.logging.slf4j.ParameterizedLogging") +- // activeRecipe("org.openrewrite.java.logging.PrintStackTraceToLogError") +- +- // testing +- activeRecipe("org.openrewrite.java.testing.assertj.Assertj") +- } +-} +diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts +index b9d64ae7..4c1c23f8 100644 +--- a/jadx-gui/build.gradle.kts ++++ b/jadx-gui/build.gradle.kts +@@ -2,7 +2,6 @@ + id("jadx-kotlin") + id("application") + id("jadx-library") +- id("edu.sc.seis.launch4j") version "3.0.6" + id("com.gradleup.shadow") version "8.3.8" + id("org.beryx.runtime") version "1.13.1" + } +@@ -136,36 +135,6 @@ + } + } + +-launch4j { +- mainClassName.set(application.mainClass.get()) +- copyConfigurable.set(listOf()) +- dontWrapJar.set(true) +- icon.set("$projectDir/src/main/resources/logos/jadx-logo.ico") +- outfile.set("jadx-gui-$jadxVersion.exe") +- version.set(jadxVersion) +- copyright.set("Skylot") +- windowTitle.set("jadx") +- companyName.set("jadx") +- jreMinVersion.set("11") +- jvmOptions.set(escapeJVMOptions()) +- requires64Bit.set(true) +- downloadUrl.set("https://www.oracle.com/java/technologies/downloads/#jdk21-windows") +- supportUrl.set("https://github.com/skylot/jadx") +- +- bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%") +- classpath.set(tasks.getByName("shadowJar").outputs.files.map { "%EXEDIR%/lib/${it.name}" }.sorted().toList()) +- println("Launch4J classpath: ${classpath.get()}") +- +- chdir.set("") // don't change current dir +- libraryDir.set("") // don't add any libs +-} +- +-fun escapeJVMOptions(): List { +- return application.applicationDefaultJvmArgs +- .toList() +- .map { if (it.startsWith("-D")) "\"$it\"" else it } +-} +- + runtime { + addOptions("--strip-debug", "--compress", "zip-9", "--no-header-files", "--no-man-pages") + addModules( +@@ -186,48 +155,6 @@ fun escapeJVMOptions(): List { + } + } + +-val copyDistWin by tasks.registering(Copy::class) { +- description = "Copy files for Windows bundle" +- +- val libTask = tasks.getByName("shadowJar") +- dependsOn(libTask) +- from(libTask.outputs) { +- include("*.jar") +- into("lib") +- } +- val exeTask = tasks.getByName("createExe") +- dependsOn(exeTask) +- from(exeTask.outputs) { +- include("*.exe") +- } +- into(layout.buildDirectory.dir("jadx-gui-win")) +- duplicatesStrategy = DuplicatesStrategy.EXCLUDE +-} +- +-val copyDistWinWithJre by tasks.registering(Copy::class) { +- description = "Copy files for Windows with JRE bundle" +- +- val jreTask = tasks.runtime.get() +- dependsOn(jreTask) +- from(jreTask.jreDir) { +- include("**/*") +- into("jre") +- } +- val libTask = tasks.getByName("shadowJar") +- dependsOn(libTask) +- from(libTask.outputs) { +- include("*.jar") +- into("lib") +- } +- val exeTask = tasks.getByName("createExe") +- dependsOn(exeTask) +- from(exeTask.outputs) { +- include("*.exe") +- } +- into(layout.buildDirectory.dir("jadx-gui-with-jre-win")) +- duplicatesStrategy = DuplicatesStrategy.EXCLUDE +-} +- + val syncNLSLines by tasks.registering(JavaExec::class) { + group = "jadx-dev" + description = "Utility task to sync new/missing translation using EN as a reference" diff --git a/pkgs/by-name/ja/jadx/no-native-deps.diff b/pkgs/by-name/ja/jadx/no-native-deps.diff deleted file mode 100644 index e507c10133fd..000000000000 --- a/pkgs/by-name/ja/jadx/no-native-deps.diff +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts -index 09f2c05f..bdb641b0 100644 ---- a/jadx-gui/build.gradle.kts -+++ b/jadx-gui/build.gradle.kts -@@ -1,7 +1,6 @@ - plugins { - id("jadx-kotlin") - id("application") -- id("edu.sc.seis.launch4j") version "3.0.5" - id("com.github.johnrengelman.shadow") version "8.1.1" - id("org.beryx.runtime") version "1.13.1" - } -@@ -101,24 +100,6 @@ - } - } - --launch4j { -- mainClassName.set(application.mainClass.get()) -- copyConfigurable.set(listOf()) -- setJarTask(tasks.shadowJar.get()) -- icon.set("$projectDir/src/main/resources/logos/jadx-logo.ico") -- outfile.set("jadx-gui-$jadxVersion.exe") -- copyright.set("Skylot") -- windowTitle.set("jadx") -- companyName.set("jadx") -- jreMinVersion.set("11") -- jvmOptions.set(application.applicationDefaultJvmArgs.toSet()) -- requires64Bit.set(true) -- initialHeapPercent.set(5) -- maxHeapSize.set(4096) -- maxHeapPercent.set(70) -- downloadUrl.set("https://www.oracle.com/java/technologies/downloads/#jdk17-windows") -- bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%") --} - - runtime { - addOptions("--strip-debug", "--compress", "2", "--no-header-files", "--no-man-pages") -@@ -137,30 +118,6 @@ - } - } - --val copyDistWinWithJre by tasks.registering(Copy::class) { -- group = "jadx" -- dependsOn(tasks.named("runtime"), tasks.named("createExe")) -- from(runtime.jreDir) { -- include("**/*") -- into("jre") -- } -- from(tasks.named("createExe").get().outputs) { -- include("*.exe") -- } -- into(layout.buildDirectory.dir("jadx-gui-$jadxVersion-with-jre-win")) -- duplicatesStrategy = DuplicatesStrategy.EXCLUDE --} -- --val distWinWithJre by tasks.registering(Zip::class) { -- group = "jadx" -- dependsOn(copyDistWinWithJre) -- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip") -- from(copyDistWinWithJre.get().outputs) { -- include("**/*") -- } -- into(layout.buildDirectory.asFile) -- duplicatesStrategy = DuplicatesStrategy.EXCLUDE --} - - val addNewNLSLines by tasks.registering(JavaExec::class) { - group = "jadx" diff --git a/pkgs/by-name/ja/jadx/package.nix b/pkgs/by-name/ja/jadx/package.nix index 13d6f05ac71d..979dd20f82a3 100644 --- a/pkgs/by-name/ja/jadx/package.nix +++ b/pkgs/by-name/ja/jadx/package.nix @@ -17,18 +17,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jadx"; - version = "1.5.0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "skylot"; repo = "jadx"; rev = "v${finalAttrs.version}"; - hash = "sha256-+F+PHAd1+FmdAlQkjYDBsUYCUzKXG19ZUEorfvBUEg0="; + hash = "sha256-YfA0o25A3jtqVTB8LsJGCS6+dk7zt9kWnxlzDceHjeg="; }; patches = [ - # Remove use of launch4j - contains platform binaries not able to be cached by mitmCache - ./no-native-deps.diff + # Remove launch4j (uncacheable Windows binaries) and OpenRewrite (build failures) + ./nix-build.patch ]; nativeBuildInputs = [ @@ -106,6 +106,9 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; platforms = lib.platforms.unix; mainProgram = "jadx-gui"; - maintainers = with lib.maintainers; [ emilytrau ]; + maintainers = with lib.maintainers; [ + emilytrau + Misaka13514 + ]; }; }) diff --git a/pkgs/by-name/ja/jaxodraw/package.nix b/pkgs/by-name/ja/jaxodraw/package.nix new file mode 100644 index 000000000000..4f4b9b864ab4 --- /dev/null +++ b/pkgs/by-name/ja/jaxodraw/package.nix @@ -0,0 +1,76 @@ +{ + lib, + maven, + fetchsvn, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + jdk, + jre, +}: + +let + version = "2.1-0-unstable-2025-01-18"; + description = "Java program for drawing Feynman diagrams"; +in +maven.buildMavenPackage { + pname = "jaxodraw"; + inherit version; + + # pom.xml in the 2.1-0 source refers to non-existent ../pom/pom.xml and fails to build. + # src = fetchurl { + # url = "mirror://sourceforge/jaxodraw/jaxodraw-${version}-src.tar.gz"; + # hash = "sha256-EE0amcFKm/zUO4PzPhkPYZYykZw+ARJFu0/hlUOhu5s="; + # }; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/jaxodraw/code/trunk/jaxodraw"; + rev = "3346"; + hash = "sha256-jZ2Jvrysb5TeoAw5gubhtn39gMxdAGh/vTsaSIEZ7zs="; + }; + + mvnJdk = jdk; + mvnParameters = "-PskipTests"; # Tests fail + mvnHash = "sha256-QfMyiz0zWFi3kUwH8pcgu7FiXleP/KO111avs1WWWG0="; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "jaxodraw"; + desktopName = "JaxoDraw"; + exec = "jaxodraw"; + icon = "jaxodraw"; + categories = [ + "Science" + "Education" + "Physics" + ]; + comment = description; + }) + ]; + + installPhase = '' + runHook preInstall + + install -Dm644 target/jaxodraw-*-with-deps.jar $out/lib/jaxodraw/jaxodraw.jar + makeWrapper ${lib.getExe jre} $out/bin/jaxodraw \ + --add-flags "-jar $out/lib/jaxodraw/jaxodraw.jar" + + install -Dm644 src/site/resources/images/top.png $out/share/icons/hicolor/128x128/apps/jaxodraw.png + + runHook postInstall + ''; + + meta = { + inherit description; + homepage = "https://jaxodraw.sourceforge.io"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ulysseszhan ]; + mainProgram = "jaxodraw"; + }; +} diff --git a/pkgs/by-name/js/json-fortran/package.nix b/pkgs/by-name/js/json-fortran/package.nix index 039f864779c9..c92f24d2ce4e 100644 --- a/pkgs/by-name/js/json-fortran/package.nix +++ b/pkgs/by-name/js/json-fortran/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "json-fortran"; - version = "9.1.0"; + version = "9.2.0"; src = fetchFromGitHub { owner = "jacobwilliams"; repo = "json-fortran"; rev = version; - hash = "sha256-MumYG9kfbtIMT0BQzHF2jZRT1yAUkfbQ/I0/LqRKnKk="; + hash = "sha256-DjNBB1qYXZcUSvjcWqunFeI275F3YojRDCRf61pIkYs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ka/kanban/package.nix b/pkgs/by-name/ka/kanban/package.nix new file mode 100644 index 000000000000..b531fa012254 --- /dev/null +++ b/pkgs/by-name/ka/kanban/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "kanban"; + version = "0.1.16"; + + src = fetchFromGitHub { + owner = "fulsomenko"; + repo = "kanban"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WksL0AhooBTV+W1knU+tns/qvHDd0z6mE2HkC57BAcU="; + }; + + GIT_COMMIT_HASH = finalAttrs.src.rev; + + cargoHash = "sha256-Q/o5MHjVRrJpfhkzNNJ6j4oASV5wDg/0Zi43zPlp5p8="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal-based project management solution"; + longDescription = '' + A terminal-based kanban/project management tool inspired by lazygit, + built with Rust. Features include file persistence, keyboard-driven + navigation, multi-select capabilities, and sprint management. + ''; + homepage = "https://github.com/fulsomenko/kanban"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fulsomenko ]; + mainProgram = "kanban"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ki/kind2/package.nix b/pkgs/by-name/ki/kind2/package.nix index 34ae627b4597..c571fd6d0058 100644 --- a/pkgs/by-name/ki/kind2/package.nix +++ b/pkgs/by-name/ki/kind2/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { ''; # requires nightly features - RUSTC_BOOTSTRAP = true; + env.RUSTC_BOOTSTRAP = true; meta = { description = "Functional programming language and proof assistant"; diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix index ad3862b6f54f..682215044f71 100644 --- a/pkgs/by-name/ko/kord/package.nix +++ b/pkgs/by-name/ko/kord/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { version = "0.6.1"; # kord depends on nightly features - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; src = fetchFromGitHub { owner = "twitchax"; diff --git a/pkgs/by-name/le/lemon-graph/package.nix b/pkgs/by-name/le/lemon-graph/package.nix index 36a20337fb16..35c1e268a125 100644 --- a/pkgs/by-name/le/lemon-graph/package.nix +++ b/pkgs/by-name/le/lemon-graph/package.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation rec { # fix cmake compatibility. vendored from https://github.com/The-OpenROAD-Project/lemon-graph/pull/2 ./cmake_version.patch + + # fix C++20 compatibility. vendored from https://github.com/The-OpenROAD-Project/lemon-graph/commit/f871b10396270cfd09ffddc4b6ead07722e9c232 + ./update_cxx20.patch ]; meta = { diff --git a/pkgs/by-name/le/lemon-graph/update_cxx20.patch b/pkgs/by-name/le/lemon-graph/update_cxx20.patch new file mode 100644 index 000000000000..a93e292c8fbf --- /dev/null +++ b/pkgs/by-name/le/lemon-graph/update_cxx20.patch @@ -0,0 +1,127 @@ +From f871b10396270cfd09ffddc4b6ead07722e9c232 Mon Sep 17 00:00:00 2001 +From: Matt Liberty +Date: Wed, 13 Nov 2024 03:48:00 +0000 +Subject: [PATCH] Update for c++20 + +Signed-off-by: Matt Liberty +--- + lemon/bits/array_map.h | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +diff --git a/lemon/bits/array_map.h b/lemon/bits/array_map.h +index 355ee00..f8a7133 100644 +--- a/lemon/bits/array_map.h ++++ b/lemon/bits/array_map.h +@@ -75,6 +75,7 @@ namespace lemon { + typedef typename Notifier::ObserverBase Parent; + + typedef std::allocator Allocator; ++ typedef std::allocator_traits AllocatorTraits; + + public: + +@@ -88,7 +89,7 @@ namespace lemon { + Item it; + for (nf->first(it); it != INVALID; nf->next(it)) { + int id = nf->id(it);; +- allocator.construct(&(values[id]), Value()); ++ AllocatorTraits::construct(allocator, &(values[id]), Value()); + } + } + +@@ -102,7 +103,7 @@ namespace lemon { + Item it; + for (nf->first(it); it != INVALID; nf->next(it)) { + int id = nf->id(it);; +- allocator.construct(&(values[id]), value); ++ AllocatorTraits::construct(allocator, &(values[id]), value); + } + } + +@@ -121,7 +122,7 @@ namespace lemon { + Item it; + for (nf->first(it); it != INVALID; nf->next(it)) { + int id = nf->id(it);; +- allocator.construct(&(values[id]), copy.values[id]); ++ AllocatorTraits::construct(allocator, &(values[id]), copy.values[id]); + } + } + +@@ -218,15 +219,15 @@ namespace lemon { + for (nf->first(it); it != INVALID; nf->next(it)) { + int jd = nf->id(it);; + if (id != jd) { +- allocator.construct(&(new_values[jd]), values[jd]); +- allocator.destroy(&(values[jd])); ++ AllocatorTraits::construct(allocator, &(new_values[jd]), values[jd]); ++ AllocatorTraits::destroy(allocator, &(values[jd])); + } + } + if (capacity != 0) allocator.deallocate(values, capacity); + values = new_values; + capacity = new_capacity; + } +- allocator.construct(&(values[id]), Value()); ++ AllocatorTraits::construct(allocator, &(values[id]), Value()); + } + + // \brief Adds more new keys to the map. +@@ -260,8 +261,8 @@ namespace lemon { + } + } + if (found) continue; +- allocator.construct(&(new_values[id]), values[id]); +- allocator.destroy(&(values[id])); ++ AllocatorTraits::construct(allocator, &(new_values[id]), values[id]); ++ AllocatorTraits::destroy(allocator, &(values[id])); + } + if (capacity != 0) allocator.deallocate(values, capacity); + values = new_values; +@@ -269,7 +270,7 @@ namespace lemon { + } + for (int i = 0; i < int(keys.size()); ++i) { + int id = nf->id(keys[i]); +- allocator.construct(&(values[id]), Value()); ++ AllocatorTraits::construct(allocator, &(values[id]), Value()); + } + } + +@@ -279,7 +280,7 @@ namespace lemon { + // and it overrides the erase() member function of the observer base. + virtual void erase(const Key& key) { + int id = Parent::notifier()->id(key); +- allocator.destroy(&(values[id])); ++ AllocatorTraits::destroy(allocator, &(values[id])); + } + + // \brief Erase more keys from the map. +@@ -289,7 +290,7 @@ namespace lemon { + virtual void erase(const std::vector& keys) { + for (int i = 0; i < int(keys.size()); ++i) { + int id = Parent::notifier()->id(keys[i]); +- allocator.destroy(&(values[id])); ++ AllocatorTraits::destroy(allocator, &(values[id])); + } + } + +@@ -303,7 +304,7 @@ namespace lemon { + Item it; + for (nf->first(it); it != INVALID; nf->next(it)) { + int id = nf->id(it);; +- allocator.construct(&(values[id]), Value()); ++ AllocatorTraits::construct(allocator, &(values[id]), Value()); + } + } + +@@ -317,7 +318,7 @@ namespace lemon { + Item it; + for (nf->first(it); it != INVALID; nf->next(it)) { + int id = nf->id(it); +- allocator.destroy(&(values[id])); ++ AllocatorTraits::destroy(allocator, &(values[id])); + } + allocator.deallocate(values, capacity); + capacity = 0; +-- +2.52.0 + diff --git a/pkgs/by-name/li/libamplsolver/package.nix b/pkgs/by-name/li/libamplsolver/package.nix index 7f4343dea2aa..129307101b48 100644 --- a/pkgs/by-name/li/libamplsolver/package.nix +++ b/pkgs/by-name/li/libamplsolver/package.nix @@ -25,9 +25,15 @@ stdenv.mkDerivation { }) ]; - # Allow install_name_tool rewrite paths on darwin. - # error: install_name_tool: changing install names or rpaths can't be redone for: /nix/store/...-libamplsolver-.../lib/libamplsolver.dylib (for architecture arm64) because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names) - NIX_LDFLAGS = lib.optional stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; + env = { + # For non-trapping FP architectures like loongarch64 and riscv64 + NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.hostPlatform.isRiscV64 || stdenv.hostPlatform.isLoongArch64 + ) "-DNO_fpu_control"; + # Allow install_name_tool rewrite paths on darwin. + # error: install_name_tool: changing install names or rpaths can't be redone for: /nix/store/...-libamplsolver-.../lib/libamplsolver.dylib (for architecture arm64) because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names) + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; + }; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/li/librespot-ma/package.nix b/pkgs/by-name/li/librespot-ma/package.nix index dd1f8160d429..83f0c936bff8 100644 --- a/pkgs/by-name/li/librespot-ma/package.nix +++ b/pkgs/by-name/li/librespot-ma/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage { pname = "librespot-ma"; - version = "0.7.1-unstable-2025-11-06"; + version = "0.8.0-unstable-2025-12-05"; src = fetchFromGitHub { owner = "music-assistant"; repo = "librespot"; - rev = "2af61256649d6c1ed149791a53a20a595b617704"; - hash = "sha256-sarxS6YArK5luX4TRXJUKhreMqhZbsS/3fCVWHxPNpY="; + rev = "1d68d603027d89d1a60bf5a15f180e28382e2cfc"; + hash = "sha256-quKAiXqTwf6cgKi9qqksQRaGqV9UZjerHQZfqDVHCIs="; }; - cargoHash = "sha256-CI2BFmQNK1+J2qaKg6u6WM83jwBuWjeh9dROnrF3Kv0="; + cargoHash = "sha256-Kf3w6tD/MQaXXegtiCkFbUcYwr4OMw6ipLxNLxJ2NTQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/materialgram/package.nix b/pkgs/by-name/ma/materialgram/package.nix index 23250c7b9066..c84e123cb96d 100644 --- a/pkgs/by-name/ma/materialgram/package.nix +++ b/pkgs/by-name/ma/materialgram/package.nix @@ -11,12 +11,12 @@ telegram-desktop.override { unwrapped = telegram-desktop.unwrapped.overrideAttrs ( finalAttrs: previousAttrs: { pname = "materialgram-unwrapped"; - version = "6.2.3.1"; + version = "6.4.0.1"; src = fetchFromGitHub { owner = "kukuruzka165"; repo = "materialgram"; - hash = "sha256-wWg45n6Da/f2j3rT8PNNEN5uuX8rMzZNbHAA2wL8NLA="; + hash = "sha256-aNgvuuowyhEYUm5ie2vxCsdpaDuuZ/3xZJqWA0bN5Lc="; tag = "v${finalAttrs.version}"; fetchSubmodules = true; }; diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index e206610d2580..22fae8337576 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2026.1.0"; + version = "2026.1.1"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-AxNVHWqvLePR4SeVuzUZxLoR0ZGo97I3SJzGOCchjeU="; + hash = "sha256-z2sk7g0XleaV83udcxqvlyqit3NPcqbcttN6Zo9asdI="; }; - cargoHash = "sha256-Z8qZEmtFUeT4c78gIWxanVRJEjArLD65j3eaO7fjfz0="; + cargoHash = "sha256-zau4N7TsgcKmG5AUdUm1WL3AKqT7d8CqTnjnUgqYDvU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mm/mmtui/package.nix b/pkgs/by-name/mm/mmtui/package.nix index 732117b1dc8c..c2b7c12ac7ea 100644 --- a/pkgs/by-name/mm/mmtui/package.nix +++ b/pkgs/by-name/mm/mmtui/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mmtui"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "SL-RU"; repo = "mmtui"; - tag = "v${version}"; - hash = "sha256-s+50kz6OODZ0xKz8oNF2YEzk+mLZ6gXXynl8g6Uwdo4="; + tag = "mmt-v${version}"; + hash = "sha256-ESnxy3TUWBb0akP471dK6wFQyJQSnjlIevA7ndLAjoE="; }; - cargoHash = "sha256-9F1YMepkWksTQRrkziNhLxVJnhoDH17lSKef5kOjp3Y="; + cargoHash = "sha256-Ck2mQ8PuA4apF6XKDtISmEtNFEHFRRlZwpYCDKCR/rc="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 41d2264f6e92..949e7a8ec225 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -31,13 +31,13 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "modrinth-app-unwrapped"; - version = "0.10.23"; + version = "0.10.25"; src = fetchFromGitHub { owner = "modrinth"; repo = "code"; tag = "v${finalAttrs.version}"; - hash = "sha256-Or2KkcZnZCZOnUd++SmDgbUOwa6ZmRDaoo7gF3XvN6I="; + hash = "sha256-e+Oienb0jhz7XT9NZB5IAELi+YU3i60JIWBDG8LCEZw="; }; patches = [ @@ -67,7 +67,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '1.0.0-local' '${finalAttrs.version}' ''; - cargoHash = "sha256-hWjoNwKA39YYhPSrQUNaM1nS+CtV9vff+aXpoQLPCOM="; + cargoHash = "sha256-pZwWqWkcq142iIO0Ier9NH56P1EWXAoRiqDCNyElXCA="; mitmCache = gradle.fetchDeps { inherit (finalAttrs) pname; data = ./deps.json; @@ -77,7 +77,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-jLuI8qNJgFkuBbKuBNKGuk/6v62iY7fNZX2t3U3olk0="; + hash = "sha256-4MRVk5k/HkCMA/OeRMZwwkCyqmSWkujqLe/8sPfYcwc="; }; nativeBuildInputs = [ @@ -160,7 +160,10 @@ rustPlatform.buildRustPackage (finalAttrs: { gpl3Plus unfreeRedistributable ]; - maintainers = with lib.maintainers; [ getchoo ]; + maintainers = with lib.maintainers; [ + getchoo + hythera + ]; mainProgram = "ModrinthApp"; platforms = with lib.platforms; linux ++ darwin; # This builds on architectures like aarch64, but the launcher itself does not support them yet. diff --git a/pkgs/by-name/ms/msedit/package.nix b/pkgs/by-name/ms/msedit/package.nix index 8b9a2ed13745..3319b3e30d9a 100644 --- a/pkgs/by-name/ms/msedit/package.nix +++ b/pkgs/by-name/ms/msedit/package.nix @@ -19,14 +19,18 @@ rustPlatform.buildRustPackage (finalAttrs: { }; cargoHash = "sha256-U8U70nzTmpY6r8J661EJ4CGjx6vWrGovu5m25dvz5sY="; - # Requires nightly features - env.RUSTC_BOOTSTRAP = 1; - # Without -headerpad, the following error occurs on x86_64-darwin - # error: install_name_tool: changing install names or rpaths can't be redone for: ... because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names) - NIX_LDFLAGS = lib.optionals (with stdenv.hostPlatform; isDarwin && isx86_64) [ - "-headerpad_max_install_names" - ]; + # Requires nightly features + env = { + RUSTC_BOOTSTRAP = 1; + # Without -headerpad, the following error occurs on x86_64-darwin + # error: install_name_tool: changing install names or rpaths can't be redone for: ... because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names) + NIX_LDFLAGS = toString ( + lib.optionals (with stdenv.hostPlatform; isDarwin && isx86_64) [ + "-headerpad_max_install_names" + ] + ); + }; buildInputs = [ icu diff --git a/pkgs/by-name/my/mysql-workbench/package.nix b/pkgs/by-name/my/mysql-workbench/package.nix index f5c055528b47..42973cbfee3e 100644 --- a/pkgs/by-name/my/mysql-workbench/package.nix +++ b/pkgs/by-name/my/mysql-workbench/package.nix @@ -53,11 +53,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mysql-workbench"; - version = "8.0.43"; + version = "8.0.45"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/MySQLGUITools/mysql-workbench-community-${finalAttrs.version}-src.tar.gz"; - hash = "sha256-E9fn72r35WrGzIOoDouIvJFZdpfw9sgDNHwEe/0DdUI="; + hash = "sha256-00sswmBIBtNmxMrJBDqzOhPLErXuXGs634JRHML/aKE="; }; patches = [ diff --git a/pkgs/by-name/ni/nix-ld/package.nix b/pkgs/by-name/ni/nix-ld/package.nix index 3c69baf06241..8290aaa03212 100644 --- a/pkgs/by-name/ni/nix-ld/package.nix +++ b/pkgs/by-name/ni/nix-ld/package.nix @@ -21,8 +21,10 @@ rustPlatform.buildRustPackage rec { hardeningDisable = [ "stackprotector" ]; - NIX_SYSTEM = stdenv.system; - RUSTC_BOOTSTRAP = "1"; + env = { + NIX_SYSTEM = stdenv.system; + RUSTC_BOOTSTRAP = "1"; + }; preCheck = '' export NIX_LD=${stdenv.cc.bintools.dynamicLinker} diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix index 0e85981ae346..f7ba0cfc44c3 100644 --- a/pkgs/by-name/nn/nnd/package.nix +++ b/pkgs/by-name/nn/nnd/package.nix @@ -8,16 +8,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "nnd"; - version = "0.67"; + version = "0.68"; src = fetchFromGitHub { owner = "al13n321"; repo = "nnd"; tag = "v${finalAttrs.version}"; - hash = "sha256-qiWzTZlv01IjNUwjzcNRfQrmVyUMTsKtfhXuZydg/Pc="; + hash = "sha256-77WKsk/kKWJjSwikXtLDWY0pRf1pC6YkY9c9xDtheUI="; }; - cargoHash = "sha256-cx4V/DNafoqjfbtPl43Y09eF4fJ89x/ldx6qe70Qn/g="; + cargoHash = "sha256-I9TcZQqKjR4awufmT8fM883YDeyNZUozHaoZfEaE6+0="; meta = { description = "Debugger for Linux"; diff --git a/pkgs/by-name/op/openbao/ui.nix b/pkgs/by-name/op/openbao/ui.nix index 31e229ae1eba..cfb8e311e1cd 100644 --- a/pkgs/by-name/op/openbao/ui.nix +++ b/pkgs/by-name/op/openbao/ui.nix @@ -2,33 +2,52 @@ stdenvNoCC, openbao, yarn-berry_3, - nodejs, + nodejs_22, }: +let + yarn = yarn-berry_3.override { nodejs = nodejs_22; }; + +in stdenvNoCC.mkDerivation (finalAttrs: { pname = openbao.pname + "-ui"; inherit (openbao) version src; sourceRoot = "${finalAttrs.src.name}/ui"; - offlineCache = yarn-berry_3.fetchYarnBerryDeps { + offlineCache = yarn.fetchYarnBerryDeps { inherit (finalAttrs) src sourceRoot; hash = "sha256-ZG/br4r2YzPPgsysx7MBy1WtUBkar1U84nkKecZ5bvU="; }; nativeBuildInputs = [ - yarn-berry_3.yarnBerryConfigHook - nodejs - yarn-berry_3 + yarn.yarnBerryConfigHook + nodejs_22 + yarn ]; env.YARN_ENABLE_SCRIPTS = 0; + preConfigure = '' + printYarnErrors() { + cat /build/*.log + } + failureHooks+=(printYarnErrors) + ''; + postConfigure = '' substituteInPlace .ember-cli \ --replace-fail "../http/web_ui" "$out" ''; - buildPhase = "yarn run ember build --environment=production"; + buildPhase = '' + runHook preBuild + yarn run ember build --environment=production + runHook postBuild + ''; dontInstall = true; + + meta = (builtins.removeAttrs openbao.meta [ "mainProgram" ]) // { + description = openbao.meta.description + " - web UI"; + }; }) diff --git a/pkgs/by-name/op/opkssh/package.nix b/pkgs/by-name/op/opkssh/package.nix index 91194e4ef660..dfe71e26bbbb 100644 --- a/pkgs/by-name/op/opkssh/package.nix +++ b/pkgs/by-name/op/opkssh/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "opkssh"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "openpubkey"; repo = "opkssh"; tag = "v${finalAttrs.version}"; - hash = "sha256-av8XmHRNttZ17y9DnUQkMG+ZHjEytvfetBDPjhn+6+o="; + hash = "sha256-l1FizvOO4oCNHEJEClwOupnjQzthvGO/vRTq1PhJDao="; }; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-vZb94nwfrqoWnFk1STDDiyqGn1Esqz5VvoQemXIzlNg="; + vendorHash = "sha256-AdQtYqhwhkvvr9bbSWylACg75nC/K7hxb13bP5itusM="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index bf10486eceda..6f0534320bd0 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.52.0"; + version = "2.53.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-y4AsxCtjm3E1nwmSgGelUAa5jajNXfpKLvEjxW7uNrI="; + sha256 = "sha256-G7hIJUGzgMB202Unzrycv9KTkJ88bmRbgVT0v5jA99M="; }; - vendorHash = "sha256-cdoSsESxH1twepMQHg+pl6az6pipbb1LxkpMyMxSCW4="; + vendorHash = "sha256-LyPS2E5v3n7RVV3YEsEUZJZWB5x32TTfeOHAZProuCs="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix index 1cf10145d3e8..741aa951fb68 100644 --- a/pkgs/by-name/pk/pkarr/package.nix +++ b/pkgs/by-name/pk/pkarr/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "pkarr"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "pubky"; repo = "pkarr"; rev = "v${version}"; - hash = "sha256-564JL7EG/RB2k2JdxAENpP5UZtKtaGlrZfeYOgsLBEY="; + hash = "sha256-Sh7ly4jmW7XTizsxGV/iDsWjbhxEEall+dUNkEtYahc="; }; - cargoHash = "sha256-HG4cmKQleiWdYBrOgv1Aj/erWjZX5PMwIZpQSQc+sFU="; + cargoHash = "sha256-ikLXNXnU3ysZrB6pcZcusOziBlYM9fCaFvWM6CKe9Zg="; meta = { description = "Public Key Addressable Resource Records (sovereign TLDs) "; diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix index d6de3256a338..bf33f009ded7 100644 --- a/pkgs/by-name/po/poutine/package.nix +++ b/pkgs/by-name/po/poutine/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "poutine"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "boostsecurityio"; repo = "poutine"; tag = "v${version}"; - hash = "sha256-Rk4Fd/h83NKIVlz/QXOSLnCKfxfKFXUfvUF5FSjomQY="; + hash = "sha256-lAnErnkJY2qU+felYqsbeEBOlCj54unX2iycTWqVAhs="; }; vendorHash = "sha256-qp3Ko+01kk9AH0oCT2Si/si+74gT5KFtPFslwih/IBE="; diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix index 1e05c1408633..885bf4d5de3d 100644 --- a/pkgs/by-name/pr/proxysql/package.nix +++ b/pkgs/by-name/pr/proxysql/package.nix @@ -227,7 +227,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "proxysql"; homepage = "https://proxysql.com/"; license = with lib.licenses; [ gpl3Only ]; - teams = [ lib.teams.helsinki-systems ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/servers/x11/quartz-wm/default.nix b/pkgs/by-name/qu/quartz-wm/package.nix similarity index 93% rename from pkgs/servers/x11/quartz-wm/default.nix rename to pkgs/by-name/qu/quartz-wm/package.nix index 185cf1831f5a..65b3708a7f1b 100644 --- a/pkgs/servers/x11/quartz-wm/default.nix +++ b/pkgs/by-name/qu/quartz-wm/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + clangStdenv, fetchgit, autoreconfHook, pixman, @@ -13,7 +13,7 @@ libXext, }: -stdenv.mkDerivation (finalAttrs: { +clangStdenv.mkDerivation (finalAttrs: { pname = "quartz-wm"; version = "1.3.2"; diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix index 656340a378d1..af6438144b46 100644 --- a/pkgs/by-name/re/regal/package.nix +++ b/pkgs/by-name/re/regal/package.nix @@ -6,29 +6,32 @@ buildGoModule rec { name = "regal"; - version = "0.34.1"; + version = "0.37.0"; src = fetchFromGitHub { - owner = "StyraInc"; + owner = "open-policy-agent"; repo = "regal"; rev = "v${version}"; - hash = "sha256-gdoQ+u9YbwTq28b3gYsNA0SxYFigeKK2JUd0paz8WYQ="; + hash = "sha256-zAp4v1bKz+q+29jlhEccl7o9RWLA+Hn3Kp/UGBQlmA8="; }; - vendorHash = "sha256-FycDMCfvpUkW7KcTLMUBOjbU4JnKCJrWQalNKSY1RkM="; + vendorHash = "sha256-yvUvv8EL3WrsyBnzaGQK4DR+O5Ner9ehkZYCMnfRwRU="; + + # Only build the main binary, exclude build/lsp/main.go + subPackages = [ "." ]; ldflags = [ "-s" "-w" - "-X github.com/styrainc/regal/pkg/version.Version=${version}" - "-X github.com/styrainc/regal/pkg/version.Commit=${version}" + "-X github.com/open-policy-agent/regal/pkg/version.Version=${version}" + "-X github.com/open-policy-agent/regal/pkg/version.Commit=${version}" ]; meta = { description = "Linter and language server for Rego"; mainProgram = "regal"; - homepage = "https://github.com/StyraInc/regal"; - changelog = "https://github.com/StyraInc/regal/releases/tag/${src.rev}"; + homepage = "https://github.com/open-policy-agent/regal"; + changelog = "https://github.com/open-policy-agent/regal/releases/tag/${src.rev}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ rinx ]; }; diff --git a/pkgs/by-name/ri/river-classic/package.nix b/pkgs/by-name/ri/river-classic/package.nix index 36672107c75f..4fb8c9af942d 100644 --- a/pkgs/by-name/ri/river-classic/package.nix +++ b/pkgs/by-name/ri/river-classic/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "river-classic"; - version = "0.3.13"; + version = "0.3.14"; outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "codeberg.org"; owner = "river"; repo = "river-classic"; - hash = "sha256-XLWvxSChYN5wyhr8R8/3Pfykw61k451XmvgoM45zkEk="; + hash = "sha256-UhWA7jmBDhktHqHds06C0GY+xzlQZZezYopsLmIAGgI="; tag = "v${finalAttrs.version}"; }; diff --git a/pkgs/by-name/ro/roc/package.nix b/pkgs/by-name/ro/roc/package.nix index 0081612abc77..687a63744e9c 100755 --- a/pkgs/by-name/ro/roc/package.nix +++ b/pkgs/by-name/ro/roc/package.nix @@ -31,6 +31,10 @@ rustPlatform.buildRustPackage { hash = "sha256-pPnOM4hpbAkGCV47aw5eHbpOujjFtJa3v/3/D8gybO8="; }; + dontUseZigBuild = true; + dontUseZigCheck = true; + dontUseZigInstall = true; + nativeBuildInputs = [ cmake zig_0_13 @@ -53,9 +57,6 @@ rustPlatform.buildRustPackage { cargoHash = "sha256-wJViSHcezoIchWe4Py9j+9U+YJUA5ja/x94UipuWO2g="; - # prevents zig AccessDenied error github.com/ziglang/zig/issues/6810 - XDG_CACHE_HOME = "xdg_cache"; - preBuild = let llvmVersion = builtins.splitVersion llvmPackages.release_version; diff --git a/pkgs/by-name/sb/sbom2dot/package.nix b/pkgs/by-name/sb/sbom2dot/package.nix index f7f95abe2661..0b3d64c3dafc 100644 --- a/pkgs/by-name/sb/sbom2dot/package.nix +++ b/pkgs/by-name/sb/sbom2dot/package.nix @@ -2,6 +2,4 @@ python3Packages, }: -(python3Packages.toPythonApplication python3Packages.sbom2dot).overrideAttrs (previousAttrs: { - meta.mainProgram = "sbom2dot"; -}) +python3Packages.toPythonApplication python3Packages.sbom2dot diff --git a/pkgs/by-name/sb/sbom4files/package.nix b/pkgs/by-name/sb/sbom4files/package.nix index e02ab1880926..46a151b7f97a 100644 --- a/pkgs/by-name/sb/sbom4files/package.nix +++ b/pkgs/by-name/sb/sbom4files/package.nix @@ -2,6 +2,4 @@ python3Packages, }: -(python3Packages.toPythonApplication python3Packages.sbom4files).overrideAttrs (previousAttrs: { - meta.mainProgram = "sbom4files"; -}) +python3Packages.toPythonApplication python3Packages.sbom4files diff --git a/pkgs/by-name/sh/shadow-tls/package.nix b/pkgs/by-name/sh/shadow-tls/package.nix index 960372fdf6b5..f985456e6329 100644 --- a/pkgs/by-name/sh/shadow-tls/package.nix +++ b/pkgs/by-name/sh/shadow-tls/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-1oJCdqBa1pWpQ7QvZ0vZaOd73R+SzR9OPf+yoI+RwCY="; - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; # network required doCheck = false; diff --git a/pkgs/by-name/sk/sketchybar-app-font/package.nix b/pkgs/by-name/sk/sketchybar-app-font/package.nix index a3b517410dce..aa0ac0ab42ec 100644 --- a/pkgs/by-name/sk/sketchybar-app-font/package.nix +++ b/pkgs/by-name/sk/sketchybar-app-font/package.nix @@ -10,20 +10,20 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "2.0.49"; + version = "2.0.51"; src = fetchFromGitHub { owner = "kvndrsslr"; repo = "sketchybar-app-font"; tag = "v${finalAttrs.version}"; - hash = "sha256-Dsp7cv9+g8PDunDnTGnWF4z88SmlJYErfWWylU9mAag="; + hash = "sha256-5HJ5dusFyWIljT6V2/hizwbkdBfFeMHrSJ1cyT+Xtno="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_9; fetcherVersion = 1; - hash = "sha256-NGAgueJ+cuK/csjdf94KNklu+Xf91BHoWKVgEctX6eA="; + hash = "sha256-43VIPcLNPCUMxDmWnt3fRuriOKFp7w5rzxVHdjEz3lU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix index 90220aff68be..07b8548b7409 100644 --- a/pkgs/by-name/sn/snac2/package.nix +++ b/pkgs/by-name/sn/snac2/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "snac2"; - version = "2.85"; + version = "2.86"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = "snac2"; tag = finalAttrs.version; - hash = "sha256-jD3OnK37p7lgG116J0E9Mp8mWDxlqndKIYzxbCZBOhk="; + hash = "sha256-q2sdG8QGIZWCHpEM0MFaC6/K9Rcv2AW6W07c+40tFuM="; }; buildInputs = [ diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index b531989299cf..236118c73f33 100644 --- a/pkgs/by-name/sn/snakemake/package.nix +++ b/pkgs/by-name/sn/snakemake/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "9.14.5"; + version = "9.14.6"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake"; tag = "v${version}"; - hash = "sha256-/OUlUT/5Exe24ZqBq8hKN6w5Tf9GV0JUpS6Gam4znm0="; + hash = "sha256-eGHhyMkPnC0QTxwWIWjNqX9fhzhQ3QPRAdboQVWwrRA="; }; postPatch = '' diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 058a18c22b6f..07ecf04cee85 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "surrealdb"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; tag = "v${finalAttrs.version}"; - hash = "sha256-I9TVV+gSn/VCId0Ar3Yn9NWLw6GPOJvwPi8RIedIQ0U="; + hash = "sha256-woItGD998p8EWerkrWESqGON0HQp7Vrbl/kiQi+IT7g="; }; - cargoHash = "sha256-aZb2+6Xnn7gq4Lwo411yBfOFlo3YabkdewYNJ2TGbzo="; + cargoHash = "sha256-RbmhhJ+bJcCM8h2mkc2dK2Xlm+izESXwvbNvxuVC7vg="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/sw/swaynotificationcenter/package.nix b/pkgs/by-name/sw/swaynotificationcenter/package.nix index 61e505607a8b..02fc19e7eee7 100644 --- a/pkgs/by-name/sw/swaynotificationcenter/package.nix +++ b/pkgs/by-name/sw/swaynotificationcenter/package.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation (finalAttrs: { sassc scdoc vala + wayland-scanner wrapGAppsHook3 ]; @@ -81,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { librsvg pantheon.granite7 # systemd # ends with broken permission - wayland-scanner ]; postPatch = '' @@ -90,6 +90,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/functions.vala --replace "/usr/local/etc/xdg/swaync" "$out/etc/xdg/swaync" ''; + strictDeps = true; + passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; command = "${xvfb-run}/bin/xvfb-run swaync --version"; diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index 7ffd9540356c..5d75c3fa90db 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "syft"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; tag = "v${version}"; - hash = "sha256-T+oaNXudP+Rj4X2VuSzIjBGsWLrWCwEZMJUs90G87gQ="; + hash = "sha256-aU7i+bjOB6lM5/i/lDuncbCiCQdwkQxglgr4lawof1Q="; # 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; @@ -29,7 +29,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-2bOgqu4mAq8ig4M4fuTz4u/Jql9vJjILxBy3JsnPZsk="; + vendorHash = "sha256-W2Ea+2Pq2zPhVSWI/7NlG1/LeNfOE1kUnAB8Kp7AqgM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix index b5e83f20b5df..f3c334731130 100644 --- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix +++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix @@ -17,18 +17,18 @@ assert lib.asserts.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "synapse-admin-etkecc"; - version = "0.11.1-etke51"; + version = "0.11.1-etke52"; src = fetchFromGitHub { owner = "etkecc"; repo = "synapse-admin"; tag = "v${finalAttrs.version}"; - hash = "sha256-bKfWQ/lz8ms6xNUsZaNUNNhq/mNy4P7bk8dnd7dXiJ8="; + hash = "sha256-iK277gNgeAnv4V4D3J/9ozrw/yEH8jWESb2xJ6gbOfg="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-TmZ/DoNXEa+o6uVZoXybt0JFoo3hpiiLHoUwbrNdpag="; + hash = "sha256-X26s09KrV37HVd6cImJK9i/emNp7PV2fKq1ys2+t7ak="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sy/syndicate-server/package.nix b/pkgs/by-name/sy/syndicate-server/package.nix index 025b446e0e81..4f6219b3596a 100644 --- a/pkgs/by-name/sy/syndicate-server/package.nix +++ b/pkgs/by-name/sy/syndicate-server/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { ]; buildInputs = [ openssl ]; - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; doCheck = false; doInstallCheck = true; diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix index 90c2282f89b9..55ee5d1f6b75 100644 --- a/pkgs/by-name/to/topgrade/package.nix +++ b/pkgs/by-name/to/topgrade/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "16.7.0"; + version = "16.8.0"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; tag = "v${version}"; - hash = "sha256-1RbOb8YW17g+iqd/jbN5fZBBJmUgvefrm+b8zwpvMJg="; + hash = "sha256-6TimSkPxmDvXAPDlLbPYpnXg20dTbBKzv1Lj0tI973U="; }; - cargoHash = "sha256-naObSjHmUpx6JyjLt16xT+c4qeCtRDkJhSdcgIA8pBU="; + cargoHash = "sha256-DehLOUrqxGvlNw/12PyDOtyGuZThx/jqqjmKltqk7Ck="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index bd19dbd99a6d..a0625bf19b1f 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.10"; + version = "0.0.11"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-nloCLGxW1T4INzBSx5BJR8sCUWK3c7lGE9D5SgCW7PQ="; + hash = "sha256-lelhsc6zl6Qe7W7YsXviqB3NEOuJAzewnOgFPtsCYGA="; }; # For Darwin platforms, remove the integration test for file notifications, @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoBuildFlags = [ "--package=ty" ]; - cargoHash = "sha256-Tg4MYpbRjW9qvIzRCceX0lEMLThe4bo1/+xyNOzb+T0="; + cargoHash = "sha256-BceNALWxHXxylbssvAbY0CMcQBHnOX22ckgGta1wTsc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix index bf4f93244bd0..519f01d1efc1 100644 --- a/pkgs/by-name/ud/udiskie/package.nix +++ b/pkgs/by-name/ud/udiskie/package.nix @@ -17,15 +17,15 @@ python3Packages.buildPythonApplication rec { pname = "udiskie"; - version = "2.5.8"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; - rev = "v${version}"; - hash = "sha256-FFp1+7cCfkMI74rEAez8aJsaplEUa3madoSx+lwplzE="; + tag = "v${version}"; + hash = "sha256-ZagfjzSikXuVGeJdQm0YpW+IqbUfJ2b9Pnj/RLUmsik="; }; patches = [ @@ -90,7 +90,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "https://github.com/coldfix/udiskie"; - changelog = "https://github.com/coldfix/udiskie/blob/${src.rev}/CHANGES.rst"; + changelog = "https://github.com/coldfix/udiskie/blob/${src.tag}/CHANGES.rst"; description = "Removable disk automounter for udisks"; longDescription = '' udiskie is a udisks2 front-end that allows to manage removeable media such diff --git a/pkgs/by-name/un/unpfs/package.nix b/pkgs/by-name/un/unpfs/package.nix index 4cf96dbdd0de..99d7d9662bdf 100644 --- a/pkgs/by-name/un/unpfs/package.nix +++ b/pkgs/by-name/un/unpfs/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jRe1lgzfhzBUsS6wwwlqxxomap2TIDOyF3YBv20GJ14="; - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; postInstall = '' install -D -m 0444 ../../README* -t "$out/share/doc/${pname}" diff --git a/pkgs/by-name/un/untrunc-anthwlock/package.nix b/pkgs/by-name/un/untrunc-anthwlock/package.nix index f18f9df61fe6..bcdc5e6c7bed 100644 --- a/pkgs/by-name/un/untrunc-anthwlock/package.nix +++ b/pkgs/by-name/un/untrunc-anthwlock/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { pname = "untrunc-anthwlock"; - version = "0-unstable-2024-08-14"; + version = "0-unstable-2026-01-09"; src = fetchFromGitHub { owner = "anthwlock"; repo = "untrunc"; - rev = "13cafedf59369db478af537fb909f0d7fd0eb85f"; - hash = "sha256-4GIPj8so7POEwxKZzFBoJTu76XKbGHYmXC/ILeo0dVE="; + rev = "8dc8ee2eb3ba5655906d6f462e8f5fc89fcbff97"; + hash = "sha256-WgzqHFryNbKbMusKVLYhOMCuAYDH1P9/l1K5PJi7E6U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/up/upsun/versions.json b/pkgs/by-name/up/upsun/versions.json index 0d0a79c2bd3a..fc3506cc4d12 100644 --- a/pkgs/by-name/up/upsun/versions.json +++ b/pkgs/by-name/up/upsun/versions.json @@ -1,19 +1,19 @@ { - "version": "5.7.2", + "version": "5.8.0", "darwin-amd64": { - "hash": "sha256-o0bvIc9oaxT4g6IB0FlSwnPvRRhhQbd/+THGiB1Qcxc=", - "url": "https://github.com/platformsh/cli/releases/download/5.7.2/upsun_5.7.2_darwin_all.tar.gz" + "hash": "sha256-2nPuxOHrCa0j2HMYV8yeKfsRQOFdksp6KNQVQmSiS4I=", + "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_darwin_all.tar.gz" }, "darwin-arm64": { - "hash": "sha256-o0bvIc9oaxT4g6IB0FlSwnPvRRhhQbd/+THGiB1Qcxc=", - "url": "https://github.com/platformsh/cli/releases/download/5.7.2/upsun_5.7.2_darwin_all.tar.gz" + "hash": "sha256-2nPuxOHrCa0j2HMYV8yeKfsRQOFdksp6KNQVQmSiS4I=", + "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_darwin_all.tar.gz" }, "linux-amd64": { - "hash": "sha256-0VrFZOqfCRvGwjPkQVbKakEELu82BI/InnA6aeJMwIg=", - "url": "https://github.com/platformsh/cli/releases/download/5.7.2/upsun_5.7.2_linux_amd64.tar.gz" + "hash": "sha256-9t4dktUu0u3+bUuYLlhfUOyHbfIizLeOUj7AXQ0VQGI=", + "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_linux_amd64.tar.gz" }, "linux-arm64": { - "hash": "sha256-0n1e+1ebJKFE7phtk0OWyVMgE4uz0K8RELOPmmRGUD0=", - "url": "https://github.com/platformsh/cli/releases/download/5.7.2/upsun_5.7.2_linux_arm64.tar.gz" + "hash": "sha256-8p1SUUuwaSLbt6j+tjcefom08dyW0NW/F2uxDMWaiv4=", + "url": "https://github.com/platformsh/cli/releases/download/5.8.0/upsun_5.8.0_linux_arm64.tar.gz" } } diff --git a/pkgs/by-name/us/usage/package.nix b/pkgs/by-name/us/usage/package.nix index ba22f86b1c85..16ec3b452c15 100644 --- a/pkgs/by-name/us/usage/package.nix +++ b/pkgs/by-name/us/usage/package.nix @@ -5,22 +5,23 @@ fetchFromGitHub, installShellFiles, nix-update-script, + nodejs, usage, testers, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "usage"; - version = "2.8.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "jdx"; repo = "usage"; tag = "v${finalAttrs.version}"; - hash = "sha256-/yDypNQdw6YS1M8YtwjdFyG8Lfh3wKkvVWyH2b/G65o="; + hash = "sha256-AFfI843y1fKdw2f4alz7WoeMQR2IPWDJ3SofCCMJVpQ="; }; - cargoHash = "sha256-3tSMgTVmoiME/wWE8uHZEjnfeS8Hqbm0DeUaWNgN944="; + cargoHash = "sha256-WC/q9yd1XJT/EtC9ES5fw6j45gyRo3k2eNEDwGmvDWo="; postPatch = '' substituteInPlace ./examples/*.sh \ @@ -29,8 +30,13 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; + nativeCheckInputs = [ + # for some tests + nodejs + ]; + checkFlags = [ - # tries to build usage-cli itself + # has --include-bash-completion-lib so requires external lib downloaded on runtime "--skip=test_bash_completion_integration" ]; diff --git a/pkgs/by-name/uu/uutils-procps/package.nix b/pkgs/by-name/uu/uutils-procps/package.nix index 12c3a05b1a33..18527522dbe8 100644 --- a/pkgs/by-name/uu/uutils-procps/package.nix +++ b/pkgs/by-name/uu/uutils-procps/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-procps"; - version = "0.0.1-unstable-2025-12-31"; + version = "0.0.1-unstable-2026-01-08"; src = fetchFromGitHub { owner = "uutils"; repo = "procps"; - rev = "644666759ec3e8f038a0d376b594e67a8780dc29"; - hash = "sha256-U/5thGk/1h4CkI63DllLUc3scrHbV4+djcxLiTC+3lM="; + rev = "d0dd746491844b5de4724bcb7d0a28674a8b33f9"; + hash = "sha256-gRkXVc3+0dqlvt/hAsAXnDFsOeN83ozPjieU4yLlOms="; }; - cargoHash = "sha256-kWT5PYE68TUcYnz82zxhiMIZFAn8Rf00Oj7oLsmzsG8="; + cargoHash = "sha256-wh9GHj/F/v1kTyZim7nGuuuFm92OsX8Mxj01GL0H/CE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix index 6457b79eb00f..3f13265bb8bd 100644 --- a/pkgs/by-name/va/vacuum-tube/package.nix +++ b/pkgs/by-name/va/vacuum-tube/package.nix @@ -10,16 +10,17 @@ buildNpmPackage rec { pname = "vacuum-tube"; - version = "1.4.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "shy1132"; repo = "VacuumTube"; tag = "v${version}"; - hash = "sha256-F1F1p+jQnCiVTZZez30JmykgC8oQLdZ8GEZTkdf3qRs="; + hash = "sha256-OHjTccQNrZZoXf26ABn9sIOVzTsVmBKdcRLsXUvnS6k="; }; - npmDepsHash = "sha256-BzoKKDllytCByjou48KzyLU1wtAzJoJwRNJb9OwRT9o="; + npmDepsHash = "sha256-1RfCyV0GSaI8UAnlPvepBU4LN2CkbvYt+JCtQy4B8LY="; + makeCacheWritable = true; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = true; diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix index 4934c99eeea7..e625496ae164 100644 --- a/pkgs/by-name/vu/vulkan-tools/package.nix +++ b/pkgs/by-name/vu/vulkan-tools/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; - env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = lib.getExe buildPackages.wayland-scanner; + env.PKG_CONFIG_PATH = "${lib.getDev buildPackages.wayland-scanner}/lib/pkgconfig"; cmakeFlags = [ # Don't build the mock ICD as it may get used instead of other drivers, if installed diff --git a/pkgs/by-name/wi/witr/package.nix b/pkgs/by-name/wi/witr/package.nix index 48e2bc9bd00c..d6acbbcf4b66 100644 --- a/pkgs/by-name/wi/witr/package.nix +++ b/pkgs/by-name/wi/witr/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "witr"; - version = "0.1.8"; + version = "0.2.0"; src = fetchFromGitHub { owner = "pranshuparmar"; repo = "witr"; tag = "v${finalAttrs.version}"; - hash = "sha256-GRgbqZ3G/cpCzsm4/T7IB/XoT1K7Gqique908W31lhg="; + hash = "sha256-gxfoqa7Q1kb9sIN3zwxmjAHQeWdoGNg0yxc5j8unp5g="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/by-name/xc/xcbutilxrm/package.nix similarity index 100% rename from pkgs/servers/x11/xorg/xcb-util-xrm.nix rename to pkgs/by-name/xc/xcbutilxrm/package.nix diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index 74c88e380d57..fe69c9dcdc5e 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "yara-x"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; tag = "v${finalAttrs.version}"; - hash = "sha256-aRFDutYFD476xq2TTVWB5CxF1pi3C24NJpfc5kD+aNA="; + hash = "sha256-UE5x9w9I4l9OqRVv6klveEvIap+El6vea6OsnnOJHus="; }; - cargoHash = "sha256-CT+walpFIFTaO480ATHO1E38K9Tw14QqLRYzztWQmeA="; + cargoHash = "sha256-rQ8uBgsJ86K0Qc3uTiFDPmcRU+dF5gu0b5pzMcGAAVU="; CARGO_PROFILE_RELEASE_LTO = "fat"; CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; diff --git a/pkgs/by-name/yo/yosys/fix-clang-build.patch b/pkgs/by-name/yo/yosys/fix-clang-build.patch deleted file mode 100644 index 63cec283ad65..000000000000 --- a/pkgs/by-name/yo/yosys/fix-clang-build.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/tests/cxxrtl/run-test.sh b/tests/cxxrtl/run-test.sh -index ee299fc82..595cd3f88 100755 ---- a/tests/cxxrtl/run-test.sh -+++ b/tests/cxxrtl/run-test.sh -@@ -5,7 +5,7 @@ set -ex - run_subtest () { - local subtest=$1; shift - -- ${CC:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++ -+ ${CXX:-gcc} -std=c++11 -O2 -o cxxrtl-test-${subtest} -I../../backends/cxxrtl/runtime test_${subtest}.cc -lstdc++ - ./cxxrtl-test-${subtest} - } - -@@ -14,4 +14,4 @@ run_subtest value_fuzz - - # Compile-only test. - ../../yosys -p "read_verilog test_unconnected_output.v; select =*; proc; clean; write_cxxrtl cxxrtl-test-unconnected_output.cc" --${CC:-gcc} -std=c++11 -c -o cxxrtl-test-unconnected_output -I../../backends/cxxrtl/runtime cxxrtl-test-unconnected_output.cc -+${CXX:-gcc} -std=c++11 -c -o cxxrtl-test-unconnected_output -I../../backends/cxxrtl/runtime cxxrtl-test-unconnected_output.cc -diff --git a/tests/fmt/run-test.sh b/tests/fmt/run-test.sh -index 998047f83..2a4a59f01 100644 ---- a/tests/fmt/run-test.sh -+++ b/tests/fmt/run-test.sh -@@ -51,7 +51,7 @@ test_cxxrtl () { - local subtest=$1; shift - - ../../yosys -p "read_verilog ${subtest}.v; proc; clean; write_cxxrtl -print-output std::cerr yosys-${subtest}.cc" -- ${CC:-gcc} -std=c++11 -o yosys-${subtest} -I../../backends/cxxrtl/runtime ${subtest}_tb.cc -lstdc++ -+ ${CXX:-gcc} -std=c++11 -o yosys-${subtest} -I../../backends/cxxrtl/runtime ${subtest}_tb.cc -lstdc++ - ./yosys-${subtest} 2>yosys-${subtest}.log - iverilog -o iverilog-${subtest} ${subtest}.v ${subtest}_tb.v - ./iverilog-${subtest} |grep -v '\$finish called' >iverilog-${subtest}.log -@@ -69,7 +69,7 @@ diff iverilog-always_full.log iverilog-always_full-1.log - - ../../yosys -p "read_verilog display_lm.v" >yosys-display_lm.log - ../../yosys -p "read_verilog display_lm.v; write_cxxrtl yosys-display_lm.cc" --${CC:-gcc} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++ -+${CXX:-gcc} -std=c++11 -o yosys-display_lm_cc -I../../backends/cxxrtl/runtime display_lm_tb.cc -lstdc++ - ./yosys-display_lm_cc >yosys-display_lm_cc.log - for log in yosys-display_lm.log yosys-display_lm_cc.log; do - grep "^%l: \\\\bot\$" "$log" diff --git a/pkgs/by-name/yo/yosys/package.nix b/pkgs/by-name/yo/yosys/package.nix index f70bbde3d051..c4e06f4131bc 100644 --- a/pkgs/by-name/yo/yosys/package.nix +++ b/pkgs/by-name/yo/yosys/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch2, # nativeBuildInputs bison, @@ -88,13 +87,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.55"; + version = "0.60"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; tag = "v${finalAttrs.version}"; - hash = "sha256-GddNbAtH5SPm7KTa5kCm/vGq4xOczx+jCnOSQl55gUI="; + hash = "sha256-BVrSq9nWbdu/PIXfwLW7ZkHTz6SrmsqJMSkVa6CsBm8="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' @@ -126,6 +125,8 @@ stdenv.mkDerivation (finalAttrs: { (python3.withPackages ( pp: with pp; [ click + cxxheaderparser + pybind11 ] )) ] @@ -135,19 +136,6 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ]; - patches = [ - # Backport fix amaranth code compilation - # TODO remove when updating to 0.56 - # https://github.com/YosysHQ/yosys/pull/5182 - (fetchpatch2 { - name = "treat-zero-width-constant-as-zero.patch"; - url = "https://github.com/YosysHQ/yosys/commit/478b6a2b3fbab0fd4097b841914cbe8bb9f67268.patch"; - hash = "sha256-KeLoZfkXMk2KIPN9XBQdqWqohywQONlWUIvrGwgphKs="; - }) - ./plugin-search-dirs.patch - ./fix-clang-build.patch - ]; - postPatch = '' substituteInPlace ./Makefile \ --replace-fail 'echo UNKNOWN' 'echo ${builtins.substring 0 10 finalAttrs.src.rev}' @@ -165,6 +153,7 @@ stdenv.mkDerivation (finalAttrs: { fi '' + lib.optionalString enablePython '' + echo "PYOSYS_USE_UV := 0" >> Makefile.conf echo "ENABLE_PYOSYS := 1" >> Makefile.conf echo "PYTHON_DESTDIR := $out/${python3.sitePackages}" >> Makefile.conf echo "BOOST_PYTHON_LIB := -lboost_python${lib.versions.major python3.version}${lib.versions.minor python3.version}" >> Makefile.conf diff --git a/pkgs/by-name/yo/yosys/plugin-search-dirs.patch b/pkgs/by-name/yo/yosys/plugin-search-dirs.patch deleted file mode 100644 index 354eeddbc2e1..000000000000 --- a/pkgs/by-name/yo/yosys/plugin-search-dirs.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git i/passes/cmds/plugin.cc w/passes/cmds/plugin.cc -index 08b4aa8c4..f00f540e9 100644 ---- i/passes/cmds/plugin.cc -+++ w/passes/cmds/plugin.cc -@@ -87,15 +87,33 @@ void load_plugin(std::string filename, std::vector aliases) - - // We were unable to open the file, try to do so from the plugin directory - if (hdl == NULL && orig_filename.find('/') == std::string::npos) { -- hdl = dlopen([orig_filename]() { -- std::string new_path = proc_share_dirname() + "plugins/" + orig_filename; -+ std::string install_dir = proc_share_dirname() + "plugins"; - -- // Check if we need to append .so -- if (new_path.find(".so") == std::string::npos) -- new_path.append(".so"); -+ vector all_dirs; -+ all_dirs.push_back(install_dir); - -- return new_path; -- }().c_str(), RTLD_LAZY|RTLD_LOCAL); -+ char* plugin_dirs = getenv("NIX_YOSYS_PLUGIN_DIRS"); -+ if (plugin_dirs != NULL) { -+ std::string p(plugin_dirs), t; -+ std::stringstream ss(p); -+ -+ while(std::getline(ss, t, ':')) { -+ all_dirs.push_back(t); -+ } -+ } -+ -+ for (auto dir : all_dirs) { -+ hdl = dlopen([dir, orig_filename]() { -+ std::string new_path = dir + "/" + orig_filename; -+ -+ // Check if we need to append .so -+ if (new_path.find(".so") == std::string::npos) -+ new_path.append(".so"); -+ -+ return new_path; -+ }().c_str(), RTLD_LAZY|RTLD_LOCAL); -+ if (hdl != NULL) break; -+ } - } - - if (hdl == NULL) diff --git a/pkgs/by-name/zf/zf/package.nix b/pkgs/by-name/zf/zf/package.nix index 1f3cea51152d..1090bc7267c1 100644 --- a/pkgs/by-name/zf/zf/package.nix +++ b/pkgs/by-name/zf/zf/package.nix @@ -8,12 +8,6 @@ callPackage, }: -let - zig = zig_0_15; - zig_hook = zig.hook.overrideAttrs { - zig_default_flags = "-Dcpu=baseline -Doptimize=ReleaseFast --color off"; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "zf"; upstreamVersion = "0.10.3"; @@ -29,16 +23,20 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles - zig_hook + zig_0_15 ]; deps = callPackage ./deps.nix { name = "${finalAttrs.pname}-cache-${finalAttrs.version}"; }; + dontSetZigDefaultFlags = true; + zigBuildFlags = [ "--system" "${finalAttrs.deps}" + "-Dcpu=baseline" + "-Doptimize=ReleaseFast" ]; postInstall = '' diff --git a/pkgs/by-name/zx/zx/package.nix b/pkgs/by-name/zx/zx/package.nix index ada370da25cd..32a8094310d6 100644 --- a/pkgs/by-name/zx/zx/package.nix +++ b/pkgs/by-name/zx/zx/package.nix @@ -4,6 +4,7 @@ buildGoModule, fetchFromGitHub, esbuild, + nodejs_22, versionCheckHook, nix-update-script, }: @@ -45,6 +46,8 @@ buildNpmPackage (finalAttrs: { npmDepsHash = "sha256-yr4oPr4tTFfl+uUc2RJnVkmzSVHrw2adzWuZ+R2bQaU="; + nodejs = nodejs_22; + makeCacheWritable = true; npmFlags = [ "--legacy-peer-deps" ]; diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix index 472c4de0d005..e174ec60d954 100644 --- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lomiri-content-hub"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-content-hub"; - rev = finalAttrs.version; - hash = "sha256-L0CX383AMu8XlNbGL01VvBxvawJwAWHhTh3ak0sjo20="; + tag = finalAttrs.version; + hash = "sha256-ukaEur2RgdIVPYm90OUCs0L+F9OQ3zaypreyx33iD5M="; }; outputs = [ @@ -59,10 +59,6 @@ stdenv.mkDerivation (finalAttrs: { # Don't override default theme search path (which honours XDG_DATA_DIRS) with a FHS assumption substituteInPlace import/Lomiri/Content/contenthubplugin.cpp \ --replace-fail 'QIcon::setThemeSearchPaths(QStringList() << ("/usr/share/icons/"));' "" - - # https://gitlab.com/ubports/development/core/lomiri-content-hub/-/merge_requests/54 - substituteInPlace src/com/lomiri/content/service/registry.h \ - --replace-fail '' '' ''; strictDeps = true; diff --git a/pkgs/development/compilers/ghc/9.6.6-debian-binary.nix b/pkgs/development/compilers/ghc/9.6.6-debian-binary.nix index 81af893586d7..e73d7b11dae2 100644 --- a/pkgs/development/compilers/ghc/9.6.6-debian-binary.nix +++ b/pkgs/development/compilers/ghc/9.6.6-debian-binary.nix @@ -24,9 +24,11 @@ let # We're using Debian's binary package, and patching it into a usable-in-Nixpkgs state. ghcDebs = { powerpc64-linux = { - variantSuffix = ""; src = { - url = "http://ftp.ports.debian.org/debian-ports/pool-ppc64/main/g/ghc/ghc_9.6.6-4_ppc64.deb"; + urls = [ + "http://ftp.ports.debian.org/debian-ports/pool-ppc64/main/g/ghc/ghc_9.6.6-4_ppc64.deb" + "https://snapshot.debian.org/archive/debian-ports/20250917T193713Z/pool-ppc64/main/g/ghc/ghc_9.6.6-4_ppc64.deb" + ]; sha256 = "722cc301b6ba70b342e5e3d9d0671440bcd749cd2f13dcccbd23c3f6a6060171"; }; exePathForLibraryCheck = null; @@ -76,7 +78,7 @@ in stdenv.mkDerivation (finalAttrs: { inherit version; - pname = "ghc-debian-binary${debUsed.variantSuffix}"; + pname = "ghc-debian-binary"; src = fetchurl debUsed.src; diff --git a/pkgs/development/compilers/rust/clippy.nix b/pkgs/development/compilers/rust/clippy.nix index fa33c9e9f315..e5f1b3544f0b 100644 --- a/pkgs/development/compilers/rust/clippy.nix +++ b/pkgs/development/compilers/rust/clippy.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { buildInputs = [ rustc.llvm ]; # fixes: error: the option `Z` is only accepted on the nightly compiler - RUSTC_BOOTSTRAP = 1; + env.RUSTC_BOOTSTRAP = 1; # Without disabling the test the build fails with: # error: failed to run custom build command for `rustc_llvm v0.0.0 diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index b002d665518a..0398dcc9fe0a 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -38,13 +38,15 @@ rustPlatform.buildRustPackage { install_name_tool -add_rpath "${rustc.unwrapped}/lib" "$out/bin/git-rustfmt" ''; - # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler - RUSTC_BOOTSTRAP = 1; + env = { + # As of 1.0.0 and rustc 1.30 rustfmt requires a nightly compiler + RUSTC_BOOTSTRAP = 1; - # As of rustc 1.45.0, these env vars are required to build rustfmt (due to - # https://github.com/rust-lang/rust/pull/72001) - CFG_RELEASE = rustc.version; - CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable"; + # As of rustc 1.45.0, these env vars are required to build rustfmt (due to + # https://github.com/rust-lang/rust/pull/72001) + CFG_RELEASE = rustc.version; + CFG_RELEASE_CHANNEL = if asNightly then "nightly" else "stable"; + }; postInstall = '' wrapProgram $out/bin/cargo-fmt \ diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix index 3e9d5143824b..98a331a32fbd 100644 --- a/pkgs/development/compilers/zig/generic.nix +++ b/pkgs/development/compilers/zig/generic.nix @@ -5,7 +5,6 @@ cmake, llvmPackages, xcbuild, - targetPackages, libxml2, ninja, zlib, @@ -126,17 +125,52 @@ stdenv.mkDerivation (finalAttrs: { passthru = import ./passthru.nix { inherit - lib stdenv callPackage wrapCCWith wrapBintoolsWith overrideCC - targetPackages ; zig = finalAttrs.finalPackage; }; + env = { + # This zig_default_optimize_flag below is meant to avoid CPU feature impurity in + # Nixpkgs. However, this flagset is "unstable": it is specifically meant to + # be controlled by the upstream development team - being up to that team + # exposing or not that flags to the outside (especially the package manager + # teams). + + # Because of this hurdle, @andrewrk from Zig Software Foundation proposed + # some solutions for this issue. Hopefully they will be implemented in + # future releases of Zig. When this happens, this flagset should be + # revisited accordingly. + + # Below are some useful links describing the discovery process of this 'bug' + # in Nixpkgs: + + # https://github.com/NixOS/nixpkgs/issues/169461 + # https://github.com/NixOS/nixpkgs/issues/185644 + # https://github.com/NixOS/nixpkgs/pull/197046 + # https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 + # https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 + zig_default_cpu_flag = "-Dcpu=baseline"; + + zig_default_optimize_flag = + if lib.versionAtLeast finalAttrs.version "0.12" then + "--release=safe" + else if lib.versionAtLeast finalAttrs.version "0.11" then + "-Doptimize=ReleaseSafe" + else + "-Drelease-safe=true"; + }; + + setupHook = ./setup-hook.sh; + + # while xcrun is already included in the darwin stdenv, Zig also needs + # xcode-select (provided by xcbuild) for SDK detection + propagatedNativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; + meta = { description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; homepage = "https://ziglang.org/"; diff --git a/pkgs/development/compilers/zig/hook.nix b/pkgs/development/compilers/zig/hook.nix deleted file mode 100644 index 2620414b6a2e..000000000000 --- a/pkgs/development/compilers/zig/hook.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - makeSetupHook, - zig, - stdenv, - xcbuild, - globalBuildFlags ? [ "-Dcpu=baseline" ], -}: - -makeSetupHook { - name = "zig-hook"; - - propagatedBuildInputs = [ - zig - ] - # while xcrun is already included in the darwin stdenv, Zig also needs - # xcode-select (provided by xcbuild) for SDK detection - ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; - - substitutions = { - # This zig_default_flags below is meant to avoid CPU feature impurity in - # Nixpkgs. However, this flagset is "unstable": it is specifically meant to - # be controlled by the upstream development team - being up to that team - # exposing or not that flags to the outside (especially the package manager - # teams). - - # Because of this hurdle, @andrewrk from Zig Software Foundation proposed - # some solutions for this issue. Hopefully they will be implemented in - # future releases of Zig. When this happens, this flagset should be - # revisited accordingly. - - # Below are some useful links describing the discovery process of this 'bug' - # in Nixpkgs: - - # https://github.com/NixOS/nixpkgs/issues/169461 - # https://github.com/NixOS/nixpkgs/issues/185644 - # https://github.com/NixOS/nixpkgs/pull/197046 - # https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 - # https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 - - zig_default_flags = - let - releaseType = - if lib.versionAtLeast zig.version "0.12" then - "--release=safe" - else if lib.versionAtLeast zig.version "0.11" then - "-Doptimize=ReleaseSafe" - else - "-Drelease-safe=true"; - in - globalBuildFlags ++ [ releaseType ]; - }; - - passthru = { inherit zig; }; - - meta = { - description = "Setup hook for using the Zig compiler in Nixpkgs"; - inherit (zig.meta) maintainers platforms broken; - }; -} ./setup-hook.sh diff --git a/pkgs/development/compilers/zig/passthru.nix b/pkgs/development/compilers/zig/passthru.nix index 439df42d31d5..dbe371008f48 100644 --- a/pkgs/development/compilers/zig/passthru.nix +++ b/pkgs/development/compilers/zig/passthru.nix @@ -1,15 +1,15 @@ { - lib, stdenv, zig, callPackage, wrapCCWith, wrapBintoolsWith, overrideCC, - targetPackages, }: { - hook = callPackage ./hook.nix { inherit zig; }; + # Provided for backward compatibility, as the `zig` derivation now sets + # setupHook. + hook = zig; bintools-unwrapped = callPackage ./bintools.nix { inherit zig; }; bintools = wrapBintoolsWith { bintools = zig.bintools-unwrapped; }; diff --git a/pkgs/development/compilers/zig/setup-hook.sh b/pkgs/development/compilers/zig/setup-hook.sh index 1f6d8567838a..bbd322c5641c 100644 --- a/pkgs/development/compilers/zig/setup-hook.sh +++ b/pkgs/development/compilers/zig/setup-hook.sh @@ -1,96 +1,113 @@ # shellcheck shell=bash # shellcheck disable=SC2034 -readonly zigDefaultFlagsArray=(@zig_default_flags@) +readonly zigDefaultCpuFlag=@zig_default_cpu_flag@ +readonly zigDefaultOptimizeFlag=@zig_default_optimize_flag@ function zigSetGlobalCacheDir { - ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) - export ZIG_GLOBAL_CACHE_DIR + ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + export ZIG_GLOBAL_CACHE_DIR } function zigBuildPhase { - runHook preBuild + runHook preBuild - local buildCores=1 + local buildCores=1 - # Parallel building is enabled by default. - if [ "${enableParallelBuilding-1}" ]; then - buildCores="$NIX_BUILD_CORES" - fi + # Parallel building is enabled by default. + if [ "${enableParallelBuilding-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi - local flagsArray=( - "-j$buildCores" - ) - concatTo flagsArray zigDefaultFlagsArray \ - zigBuildFlags zigBuildFlagsArray + local flagsArray=( + "-j$buildCores" + ) + concatTo flagsArray \ + zigBuildFlags zigBuildFlagsArray - echoCmd 'zig build flags' "${flagsArray[@]}" - TERM=dumb zig build "${flagsArray[@]}" --verbose + if [ -z "${dontSetZigDefaultFlags:-}" ]; then + concatTo flagsArray \ + zigDefaultCpuFlag zigDefaultOptimizeFlag + fi - runHook postBuild + echoCmd 'zig build flags' "${flagsArray[@]}" + TERM=dumb zig build "${flagsArray[@]}" --verbose + + runHook postBuild } function zigCheckPhase { - runHook preCheck + runHook preCheck - local buildCores=1 + local buildCores=1 - # Parallel building is enabled by default. - if [ "${enableParallelChecking-1}" ]; then - buildCores="$NIX_BUILD_CORES" - fi + # Parallel building is enabled by default. + if [ "${enableParallelChecking-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi - local flagsArray=( - "-j$buildCores" - ) - concatTo flagsArray zigDefaultFlagsArray \ - zigCheckFlags zigCheckFlagsArray + local flagsArray=( + "-j$buildCores" + ) + concatTo flagsArray \ + zigCheckFlags zigCheckFlagsArray - echoCmd 'zig check flags' "${flagsArray[@]}" - TERM=dumb zig build test "${flagsArray[@]}" --verbose + if [ -z "${dontSetZigDefaultFlags:-}" ]; then + concatTo flagsArray \ + zigDefaultCpuFlag zigDefaultOptimizeFlag + fi - runHook postCheck + echoCmd 'zig check flags' "${flagsArray[@]}" + TERM=dumb zig build test "${flagsArray[@]}" --verbose + + runHook postCheck } function zigInstallPhase { - runHook preInstall + runHook preInstall - local buildCores=1 + local buildCores=1 - # Parallel building is enabled by default. - if [ "${enableParallelInstalling-1}" ]; then - buildCores="$NIX_BUILD_CORES" - fi + # Parallel building is enabled by default. + if [ "${enableParallelInstalling-1}" ]; then + buildCores="$NIX_BUILD_CORES" + fi - local flagsArray=( - "-j$buildCores" - ) - concatTo flagsArray zigDefaultFlagsArray \ - zigBuildFlags zigBuildFlagsArray \ - zigInstallFlags zigInstallFlagsArray + local flagsArray=( + "-j$buildCores" + ) - if [ -z "${dontAddPrefix-}" ]; then - # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` - flagsArray+=("${prefixKey:---prefix}" "$prefix") - fi + concatTo flagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray - echoCmd 'zig install flags' "${flagsArray[@]}" - TERM=dumb zig build install "${flagsArray[@]}" --verbose + if [ -z "${dontSetZigDefaultFlags:-}" ]; then + concatTo flagsArray \ + zigDefaultCpuFlag zigDefaultOptimizeFlag + fi - runHook postInstall + if [ -z "${dontAddPrefix-}" ] && [ -n "$prefix" ]; then + # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` + flagsArray+=("${prefixKey:---prefix}" "$prefix") + fi + + echoCmd 'zig install flags' "${flagsArray[@]}" + TERM=dumb zig build install "${flagsArray[@]}" --verbose + + runHook postInstall } # shellcheck disable=SC2154 -addEnvHooks "$targetOffset" zigSetGlobalCacheDir +addEnvHooks "$hostOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then - buildPhase=zigBuildPhase + buildPhase=zigBuildPhase fi if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then - checkPhase=zigCheckPhase + checkPhase=zigCheckPhase fi if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then - installPhase=zigInstallPhase + installPhase=zigInstallPhase fi diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index c124a4e5fc1f..faa5ce5d223d 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -124,3 +124,19 @@ self: super: # android is not currently allowed as 'supported-platforms' by hackage2nix android-activity = unmarkBroken super.android-activity; } +// lib.optionalAttrs (with pkgs.stdenv.hostPlatform; !isDarwin) { + # 2026-01-09: RNG tests that need rng-instruction support fail on NixOS's + # aarch64-linux build infrastructure + botan-low = overrideCabal (drv: { + testFlags = + drv.testFlags or [ ] + ++ (lib.concatMap (x: [ "--skip" ] ++ [ x ]) [ + # botan-low-rng-tests + "/rdrand/rngInit/" + "/rdrand/rngGet/" + "/rdrand/rngReseed/" + "/rdrand/rngReseedFromRNGCtx/" + "/rdrand/rngAddEntropy/" + ]); + }) super.botan-low; +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index dedbc842ebb3..6a020a153442 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -3376,146 +3376,6 @@ with haskellLib; stripe-concepts = doJailbreak super.stripe-concepts; stripe-signature = doJailbreak super.stripe-signature; stripe-wreq = doJailbreak super.stripe-wreq; - - # 2025-08-04: Disable failing testcases. It would feel bad to disable all the - # checks in a cryptography related package. - botan-low = overrideCabal (drv: { - testFlags = - drv.testFlags or [ ] - ++ (lib.concatMap (x: [ "--skip" ] ++ [ x ]) [ - # botan-low-cipher-tests - "/AES-128/SIV/can incrementally / online encipher a message/" - "/AES-128/SIV/can incrementally / online decipher a message/" - "/AES-128/SIV/has parity between online and offline/" - "/AES-192/SIV/can incrementally / online encipher a message/" - "/AES-192/SIV/can incrementally / online decipher a message/" - "/AES-192/SIV/has parity between online and offline/" - "/AES-256/SIV/can incrementally / online encipher a message/" - "/AES-256/SIV/can incrementally / online decipher a message/" - "/AES-256/SIV/has parity between online and offline/" - "/ARIA-128/SIV/can incrementally / online encipher a message/" - "/ARIA-128/SIV/can incrementally / online decipher a message/" - "/ARIA-128/SIV/has parity between online and offline/" - "/ARIA-192/SIV/can incrementally / online encipher a message/" - "/ARIA-192/SIV/can incrementally / online decipher a message/" - "/ARIA-192/SIV/has parity between online and offline/" - "/ARIA-256/SIV/can incrementally / online encipher a message/" - "/ARIA-256/SIV/can incrementally / online decipher a message/" - "/ARIA-256/SIV/has parity between online and offline/" - "/Camellia-128/SIV/can incrementally / online encipher a message/" - "/Camellia-128/SIV/can incrementally / online decipher a message/" - "/Camellia-128/SIV/has parity between online and offline/" - "/Camellia-192/SIV/can incrementally / online encipher a message/" - "/Camellia-192/SIV/can incrementally / online decipher a message/" - "/Camellia-192/SIV/has parity between online and offline/" - "/Camellia-256/SIV/can incrementally / online encipher a message/" - "/Camellia-256/SIV/can incrementally / online decipher a message/" - "/Camellia-256/SIV/has parity between online and offline/" - "/Noekeon/SIV/can incrementally / online encipher a message/" - "/Noekeon/SIV/can incrementally / online decipher a message/" - "/Noekeon/SIV/has parity between online and offline/" - "/SEED/SIV/can incrementally / online encipher a message/" - "/SEED/SIV/can incrementally / online decipher a message/" - "/SEED/SIV/has parity between online and offline/" - "/SM4/SIV/can incrementally / online encipher a message/" - "/SM4/SIV/can incrementally / online decipher a message/" - "/SM4/SIV/has parity between online and offline/" - "/Serpent/SIV/can incrementally / online encipher a message/" - "/Serpent/SIV/can incrementally / online decipher a message/" - "/Serpent/SIV/has parity between online and offline/" - "/Twofish/SIV/can incrementally / online encipher a message/" - "/Twofish/SIV/can incrementally / online decipher a message/" - "/Twofish/SIV/has parity between online and offline/" - "/AES-128/CCM/can incrementally / online encipher a message/" - "/AES-128/CCM/can incrementally / online decipher a message/" - "/AES-128/CCM/has parity between online and offline/" - "/AES-192/CCM/can incrementally / online encipher a message/" - "/AES-192/CCM/can incrementally / online decipher a message/" - "/AES-192/CCM/has parity between online and offline/" - "/AES-256/CCM/can incrementally / online encipher a message/" - "/AES-256/CCM/can incrementally / online decipher a message/" - "/AES-256/CCM/has parity between online and offline/" - "/ARIA-128/CCM/can incrementally / online encipher a message/" - "/ARIA-128/CCM/can incrementally / online decipher a message/" - "/ARIA-128/CCM/has parity between online and offline/" - "/ARIA-192/CCM/can incrementally / online encipher a message/" - "/ARIA-192/CCM/can incrementally / online decipher a message/" - "/ARIA-192/CCM/has parity between online and offline/" - "/ARIA-256/CCM/can incrementally / online encipher a message/" - "/ARIA-256/CCM/can incrementally / online decipher a message/" - "/ARIA-256/CCM/has parity between online and offline/" - "/Camellia-128/CCM/can incrementally / online encipher a message/" - "/Camellia-128/CCM/can incrementally / online decipher a message/" - "/Camellia-128/CCM/has parity between online and offline/" - "/Camellia-192/CCM/can incrementally / online encipher a message/" - "/Camellia-192/CCM/can incrementally / online decipher a message/" - "/Camellia-192/CCM/has parity between online and offline/" - "/Camellia-256/CCM/can incrementally / online encipher a message/" - "/Camellia-256/CCM/can incrementally / online decipher a message/" - "/Camellia-256/CCM/has parity between online and offline/" - "/Noekeon/CCM/can incrementally / online encipher a message/" - "/Noekeon/CCM/can incrementally / online decipher a message/" - "/Noekeon/CCM/has parity between online and offline/" - "/SEED/CCM/can incrementally / online encipher a message/" - "/SEED/CCM/can incrementally / online decipher a message/" - "/SEED/CCM/has parity between online and offline/" - "/SM4/CCM/can incrementally / online encipher a message/" - "/SM4/CCM/can incrementally / online decipher a message/" - "/SM4/CCM/has parity between online and offline/" - "/Serpent/CCM/can incrementally / online encipher a message/" - "/Serpent/CCM/can incrementally / online decipher a message/" - "/Serpent/CCM/has parity between online and offline/" - "/Twofish/CCM/can incrementally / online encipher a message/" - "/Twofish/CCM/can incrementally / online decipher a message/" - "/Twofish/CCM/has parity between online and offline/" - # botan-low-mpi-tests - "/can compute the modular inverse/" - # botan-low-pubkey-dsa-tests - "/modp/srp/1024/privKeyLoadDSA/" - "/modp/srp/1024/pubKeyLoadDSA/" - "/modp/srp/1536/privKeyLoadDSA/" - "/modp/srp/1536/pubKeyLoadDSA/" - "/modp/srp/2048/privKeyLoadDSA/" - "/modp/srp/2048/pubKeyLoadDSA/" - "/modp/srp/3072/privKeyLoadDSA/" - "/modp/srp/3072/pubKeyLoadDSA/" - "/modp/srp/4096/privKeyLoadDSA/" - "/modp/srp/4096/pubKeyLoadDSA/" - "/modp/srp/6144/privKeyLoadDSA/" - "/modp/srp/6144/pubKeyLoadDSA/" - "/modp/srp/8192/privKeyLoadDSA/" - "/modp/srp/8192/pubKeyLoadDSA/" - # botan-low-pubkey-decrypt-tests - "/SM2 sm2p256v1 SHA-256/decrypt/" - # botan-low-pubkey-encrypt-tests - "/SM2 sm2p256v1 SHA-256/encrypt/" - # botan-low-pwdhash-tests - "/Scrypt/pwdhashTimed/" - # botan-low-srp6-tests - "/ffdhe/ietf/2048/can negotiate a shared secret/" - "/ffdhe/ietf/3072/can negotiate a shared secret/" - "/ffdhe/ietf/4096/can negotiate a shared secret/" - "/ffdhe/ietf/6144/can negotiate a shared secret/" - "/ffdhe/ietf/8192/can negotiate a shared secret/" - "/modp/ietf/1024/can negotiate a shared secret/" - "/modp/ietf/1536/can negotiate a shared secret/" - "/modp/ietf/2048/can negotiate a shared secret/" - "/modp/ietf/3072/can negotiate a shared secret/" - "/modp/ietf/4096/can negotiate a shared secret/" - "/modp/ietf/6144/can negotiate a shared secret/" - "/modp/ietf/8192/can negotiate a shared secret/" - "/modp/srp/1024/can negotiate a shared secret/" - "/modp/srp/1536/can negotiate a shared secret/" - "/modp/srp/2048/can negotiate a shared secret/" - "/modp/srp/3072/can negotiate a shared secret/" - "/modp/srp/4096/can negotiate a shared secret/" - "/modp/srp/6144/can negotiate a shared secret/" - "/modp/srp/8192/can negotiate a shared secret/" - "/dsa/jce/1024/can negotiate a shared secret/" - "/dsa/botan/2048/can negotiate a shared secret/" - "/dsa/botan/3072/can negotiate a shared secret/" - ]); - }) super.botan-low; } // import ./configuration-tensorflow.nix { inherit pkgs haskellLib; } self super diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index ebf85f05fc22..0c6c30554097 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -356,20 +356,6 @@ self: super: network = super.network.overrideAttrs (drv: { __darwinAllowLocalNetworking = true; }); - - # 2025-08-04: Some RNG tests fail only on Darwin - botan-low = overrideCabal (drv: { - testFlags = - drv.testFlags or [ ] - ++ (lib.concatMap (x: [ "--skip" ] ++ [ x ]) [ - # botan-low-rng-tests - "/rdrand/rngInit/" - "/rdrand/rngGet/" - "/rdrand/rngReseed/" - "/rdrand/rngReseedFromRNGCtx/" - "/rdrand/rngAddEntropy/" - ]); - }) super.botan-low; } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 { # aarch64-darwin diff --git a/pkgs/development/interpreters/elixir/1.19.nix b/pkgs/development/interpreters/elixir/1.19.nix index b7979d498f9c..9444d4958a01 100644 --- a/pkgs/development/interpreters/elixir/1.19.nix +++ b/pkgs/development/interpreters/elixir/1.19.nix @@ -1,6 +1,6 @@ import ./generic-builder.nix { - version = "1.19.4"; - hash = "sha256-lJC/xXkVIsX6AgL3ynU6C9AncBDwHPsUGxyYlTRdaMY="; + version = "1.19.5"; + hash = "sha256-ph7zu0F5q+/QZcsVIwpdU1icN84Rn3nIVpnRelpRIMQ="; # https://hexdocs.pm/elixir/1.19.0-rc.1/compatibility-and-deprecations.html#between-elixir-and-erlang-otp minimumOTPVersion = "26"; maximumOTPVersion = "28"; diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index aaebff39effa..c928da236af1 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "13.23.0"; + version = "13.23.1"; pyproject = true; src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-qjFxEKA6tSMYmGMV3Hx1GWEZ2BlRVi9SWSyp9djwTXU="; + hash = "sha256-vAYhOBfwDKWO0K4pHVf3qqpXTztb5Qzn8TEzk6ecbw0="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/aiosql/default.nix b/pkgs/development/python-modules/aiosql/default.nix index 9e38db84b485..dae16cb778b2 100644 --- a/pkgs/development/python-modules/aiosql/default.nix +++ b/pkgs/development/python-modules/aiosql/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiosql"; - version = "14.1"; + version = "15.0"; pyproject = true; outputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "nackjicholson"; repo = "aiosql"; tag = version; - hash = "sha256-BNsjVVyYRfp3sNdzQwHy9nQveP2AHfXGK10DLybat9I="; + hash = "sha256-zKKp37tM0pBnWJuLmQhoQpWnUinLG/Nmnpv1rdM8wYM="; }; sphinxRoot = "docs/source"; diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 3f185c962a25..44bc845ce39a 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -22,12 +22,15 @@ nest-asyncio, celery, + kombu, redis, diskcache, multiprocess, psutil, flask-compress, + flaky, + numpy, pytestCheckHook, pytest-mock, mock, @@ -36,14 +39,14 @@ buildPythonPackage rec { pname = "dash"; - version = "3.0.4"; + version = "3.3.0"; pyproject = true; src = fetchFromGitHub { owner = "plotly"; repo = "dash"; tag = "v${version}"; - hash = "sha256-KCGVdD1L+U2KbktU2GU19BQ6wRcmEeYtC/v8UrFTyto="; + hash = "sha256-8Vt109x4T+DhBXfQf7MKoexmWFc23uuU0Nn3Ia/Xm5I="; }; nativeBuildInputs = [ @@ -96,8 +99,10 @@ buildPythonPackage rec { optional-dependencies = { celery = [ celery + kombu redis - ]; + ] + ++ celery.optional-dependencies.redis; diskcache = [ diskcache multiprocess @@ -107,16 +112,23 @@ buildPythonPackage rec { }; nativeCheckInputs = [ + flaky + numpy + psutil pytestCheckHook pytest-mock mock pyyaml + redis + ]; + + enabledTestPaths = [ + "tests/unit" ]; disabledTestPaths = [ "tests/unit/test_browser.py" "tests/unit/test_app_runners.py" # Uses selenium - "tests/integration" ]; pythonImportsCheck = [ "dash" ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 2e5112558b6d..d521681f4b8f 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, + fetchpatch, setuptools, python-dateutil, pytz, @@ -35,6 +36,14 @@ buildPythonPackage rec { hash = "sha256-cUbY6c0JFzs1oZJOTnMXz3uCah2f50g8/3uWQXtwiGY="; }; + patches = [ + (fetchpatch { + # https://github.com/scrapinghub/dateparser/pull/1294 + url = "https://github.com/scrapinghub/dateparser/commit/6b23348b9367d43bebc9a40b00dda3363eb2acd5.patch"; + hash = "sha256-LriRbGdYxF51Nwrm7Dp4kivyMikzmhytNQo0txMGsVI="; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index 8db031ecf268..9ffa3ba51089 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "django-sesame"; - version = "3.2.3"; + version = "3.2.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "aaugustin"; repo = "django-sesame"; tag = version; - hash = "sha256-JpbmcV5hAZkW15cizsAJhmTda4xtML0EY/PJdVSInUs="; + hash = "sha256-q9LvsPyFEbaE/TEOlQ5WodVvzAiv4x7C4vaiz1RJLu4="; }; nativeBuildInputs = [ poetry-core ]; diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 3ed99ab97c4f..dc6fbd48cc90 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.36"; + version = "0.2.38"; pyproject = true; src = fetchFromGitHub { owner = "cyberjunky"; repo = "python-garminconnect"; tag = version; - hash = "sha256-jbCp4R3Pg9idtIw5blEprf1wdewceA8YB62yht58jLI="; + hash = "sha256-d2R/ir/dxFnC4ZjLBHP+mm9JMtfPZ9VMxSRv35rE+CU="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/hijridate/default.nix b/pkgs/development/python-modules/hijridate/default.nix index f440f6c427ce..afa2ca565f0d 100644 --- a/pkgs/development/python-modules/hijridate/default.nix +++ b/pkgs/development/python-modules/hijridate/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "hijridate"; - version = "2.5.0"; + version = "2.6.0"; pyproject = true; src = fetchFromGitHub { owner = "dralshehri"; repo = "hijridate"; tag = "v${version}"; - hash = "sha256-IT5OnFDuNQ9tMfuZ5pFqnAPd7nspIfAmeN6Pqtn0OwA="; + hash = "sha256-xnFF81l1ZqtH91NzYvjzXpXpN/zeHdARJYx6L5VNBSo="; }; build-system = [ diff --git a/pkgs/development/python-modules/http-sf/default.nix b/pkgs/development/python-modules/http-sf/default.nix index 3ac2f394c719..48b9e3278959 100644 --- a/pkgs/development/python-modules/http-sf/default.nix +++ b/pkgs/development/python-modules/http-sf/default.nix @@ -6,16 +6,16 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "http-sf"; - version = "1.0.7"; + version = "1.1.1"; pyproject = true; src = fetchFromGitHub { owner = "mnot"; repo = "http-sf"; - tag = "v${version}"; - hash = "sha256-V/ZwThTNMqnqvgOs7c4JVjvGCTU15ryzTIMX2T4hUQE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-yR1/X3brPgZhjmssShAaKDmmC3HW7AUByjYue9AcU4k="; }; build-system = [ setuptools ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Module to parse and serialise HTTP structured field values"; homepage = "https://github.com/mnot/http-sf"; - changelog = "https://github.com/mnot/http-sf/releases/tag/${src.tag}"; + changelog = "https://github.com/mnot/http-sf/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix index fcb133119e2f..57a2ded366c0 100644 --- a/pkgs/development/python-modules/huey/default.nix +++ b/pkgs/development/python-modules/huey/default.nix @@ -3,38 +3,35 @@ buildPythonPackage, fetchFromGitHub, setuptools, - wheel, redis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "huey"; - version = "2.5.5"; - - format = "pyproject"; + version = "2.6.0"; + pyproject = true; src = fetchFromGitHub { owner = "coleifer"; repo = "huey"; - tag = version; - hash = "sha256-fpnaf0hk26Sm+d3pggW/GfT0oSbYpSm5xotejbOWeJY="; + tag = finalAttrs.version; + hash = "sha256-vXp8xISf8g1VjIus/Xr4wKFFaVg5x4CXgP8IUUKYl+o="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ redis ]; + dependencies = [ redis ]; # connects to redis doCheck = false; + pythonImportsCheck = [ "huey" ]; + meta = { - changelog = "https://github.com/coleifer/huey/blob/${src.tag}/CHANGELOG.md"; - description = "Little task queue for python"; + description = "Module to queue tasks"; homepage = "https://github.com/coleifer/huey"; + changelog = "https://github.com/coleifer/huey/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/monitorcontrol/default.nix b/pkgs/development/python-modules/monitorcontrol/default.nix index cd40bac4b4e7..86b0dd90e3ba 100644 --- a/pkgs/development/python-modules/monitorcontrol/default.nix +++ b/pkgs/development/python-modules/monitorcontrol/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "monitorcontrol"; - version = "4.1.1"; + version = "4.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "monitorcontrol"; tag = version; - hash = "sha256-4A7Cj2PWANZOmMSB9rH++TAf6SgyQd0OFULKa4JRu0s="; + hash = "sha256-KyVLNZLpzmxABQQiHGniCcND7DwZwpT4gJC+sJihoag="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix index 366580a3211e..ebafdd8a8a9d 100644 --- a/pkgs/development/python-modules/msgraph-sdk/default.nix +++ b/pkgs/development/python-modules/msgraph-sdk/default.nix @@ -14,16 +14,16 @@ msgraph-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "msgraph-sdk"; - version = "1.51.0"; + version = "1.52.0"; pyproject = true; src = fetchFromGitHub { owner = "microsoftgraph"; repo = "msgraph-sdk-python"; - tag = "v${version}"; - hash = "sha256-ZpzbDQ+HF49WJdXeyKcUs6wgmy0/YLNFH21wQ9bE0/o="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7HLPkyWlslMuYdoQ4K6Zm7YZ+qp93P/fZdxZrb4X6aI="; }; build-system = [ flit-core ]; @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Microsoft Graph SDK for Python"; homepage = "https://github.com/microsoftgraph/msgraph-sdk-python"; - changelog = "https://github.com/microsoftgraph/msgraph-sdk-python/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/microsoftgraph/msgraph-sdk-python/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix index 3950a03a62f8..218f00110ff0 100644 --- a/pkgs/development/python-modules/pypugjs/default.nix +++ b/pkgs/development/python-modules/pypugjs/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestCheckFlags = [ "pypugjs/testsuite" ]; + pytestFlags = [ "pypugjs/testsuite" ]; pythonImportsCheck = [ "pypugjs" diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 45265af0fc3b..71e9f563b301 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -12,16 +12,16 @@ uv-build, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pysma"; - version = "1.0.3"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "kellerza"; repo = "pysma"; - tag = "v${version}"; - hash = "sha256-T9QBIuKgbKmMUN2G+sZRW4DtgIk3H9rYMTxLtkXfEBI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-fRYpWr3eny9Ore2uQhPgVDSb+M1KYy1cy9bE2+Em3xU="; }; postPatch = '' @@ -47,10 +47,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "pysma" ]; meta = { - changelog = "https://github.com/kellerza/pysma/blob/${src.tag}/CHANGELOG.md"; description = "Python library for interacting with SMA Solar's WebConnect"; homepage = "https://github.com/kellerza/pysma"; + changelog = "https://github.com/kellerza/pysma/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-neutronclient/default.nix b/pkgs/development/python-modules/python-neutronclient/default.nix index 217d4cdb0aab..65d10de5a8ca 100644 --- a/pkgs/development/python-modules/python-neutronclient/default.nix +++ b/pkgs/development/python-modules/python-neutronclient/default.nix @@ -14,7 +14,6 @@ oslo-log, oslo-serialization, oslo-utils, - os-client-config, keystoneauth1, python-keystoneclient, requests, @@ -33,14 +32,14 @@ buildPythonPackage rec { pname = "python-neutronclient"; - version = "11.6.0"; + version = "11.7.0"; pyproject = true; src = fetchFromGitHub { owner = "openstack"; repo = "python-neutronclient"; tag = version; - hash = "sha256-nz7KiFe8IWJypGCjFgrEgGTEsC0xlW3YG/QRNJUzcpc="; + hash = "sha256-nkKADTdqYaPMmQU8Fulc8rE5lmMwPjFonyvMNOBvulA="; }; env.PBR_VERSION = version; @@ -60,7 +59,6 @@ buildPythonPackage rec { oslo-log oslo-serialization oslo-utils - os-client-config keystoneauth1 python-keystoneclient requests diff --git a/pkgs/development/python-modules/sbom4files/default.nix b/pkgs/development/python-modules/sbom4files/default.nix index c5655d03a27f..8c882d48642d 100644 --- a/pkgs/development/python-modules/sbom4files/default.nix +++ b/pkgs/development/python-modules/sbom4files/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { description = "SBOM generator for files within a directory"; homepage = "https://github.com/anthonyharrison/sbom4files"; license = lib.licenses.asl20; + mainProgram = "sbom4files"; maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 30f7c9b90e78..6c43296561df 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -17,20 +17,18 @@ buildPythonPackage rec { pname = "solo-python"; version = "0.1.1"; - format = "pyproject"; - - disabled = pythonOlder "3.6"; + pyproject = true; src = fetchFromGitHub { owner = "solokeys"; repo = "solo-python"; - rev = version; + tag = version; hash = "sha256-XVPYr7JwxeZfZ68+vQ7a7MNiAfJ2bvMbM3R1ryVJ+OU="; }; - nativeBuildInputs = [ flit ]; + build-system = [ flit ]; - propagatedBuildInputs = [ + dependencies = [ click cryptography ecdsa diff --git a/pkgs/development/python-modules/uuid-utils/default.nix b/pkgs/development/python-modules/uuid-utils/default.nix index 122b3ee47087..b1f0a3d9d202 100644 --- a/pkgs/development/python-modules/uuid-utils/default.nix +++ b/pkgs/development/python-modules/uuid-utils/default.nix @@ -9,19 +9,19 @@ buildPythonPackage rec { pname = "uuid-utils"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; src = fetchFromGitHub { owner = "aminalaee"; repo = "uuid-utils"; tag = version; - hash = "sha256-oH+TA4UWet3ES247cQbl77hImcO5onfdn7uOIh2To4g="; + hash = "sha256-wq68t8j+q57WLLOex0HxPU3H6mb+YRn8X53wSpUxPxE="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname src version; - hash = "sha256-go032hrp47RlCIMkpUu8trIIRJX6g5yMHELH5l/KG7E="; + hash = "sha256-20O0l7/UCjF2mtKOzfZ9Pm0/hhiGZdHLMZhohJGaup0="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix index e9127a574358..5272edf01d74 100644 --- a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix +++ b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix @@ -19,13 +19,13 @@ buildHomeAssistantComponent rec { owner = "danielcherubini"; domain = "elegoo_printer"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "danielcherubini"; repo = "elegoo-homeassistant"; tag = "v${version}"; - hash = "sha256-zxFiT6vlaC+cxLKZz4rtdA6Cg41K+07KY5rsOyNxnWI="; + hash = "sha256-qug2UsLPhBL9LobUr+Tns1cmg+Z0rVaLS4J8jGCF79M="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix index 018d54e9efa4..ff32f454dd45 100644 --- a/pkgs/servers/home-assistant/custom-components/powercalc/package.nix +++ b/pkgs/servers/home-assistant/custom-components/powercalc/package.nix @@ -17,13 +17,13 @@ buildHomeAssistantComponent rec { owner = "bramstroker"; domain = "powercalc"; - version = "1.20.1"; + version = "1.20.2"; src = fetchFromGitHub { inherit owner; repo = "homeassistant-powercalc"; tag = "v${version}"; - hash = "sha256-LzXLsKFBDC/Lcdv62kAiQeyc/fu/eH6ukV76jwSb/Es="; + hash = "sha256-NzWivgvDUv41fSA/6g4mYIuoUCobVUdf3bbfmKl0kWg="; }; dependencies = [ numpy ]; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 16fa5388c3f7..730eaaefa257 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.24.739"; + version = "0.24.766"; src = fetchFromGitHub { owner = "jackett"; repo = "jackett"; tag = "v${version}"; - hash = "sha256-MRh1OHkH97kZs2e/S1+snYa1peKnYxp4bvCDWcYYGiE="; + hash = "sha256-l/SjjKrFGZr514VYTEBjq2k7P9hY4lB7IB2BpLWkOgM="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f64fe70796bc..19b97af60743 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8421,8 +8421,6 @@ with pkgs; xcb-util-cursor = xorg.xcbutilcursor; xcb-util-cursor-HEAD = callPackage ../development/libraries/xcb-util-cursor/HEAD.nix { }; - xcbutilxrm = callPackage ../servers/x11/xorg/xcb-util-xrm.nix { }; - xgboostWithCuda = xgboost.override { cudaSupport = true; }; zlib = callPackage ../development/libraries/zlib { @@ -9428,10 +9426,6 @@ with pkgs; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; - quartz-wm = callPackage ../servers/x11/quartz-wm { - stdenv = clangStdenv; - }; - xorg = let # Use `lib.callPackageWith __splicedPackages` rather than plain `callPackage` diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 1b90e4bfdb66..3318b17ba926 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -44,11 +44,7 @@ pkgs.releaseTools.sourceTarball { checkPhase = '' echo "generating packages.json" - ( - echo -n '{"version":2,"packages":' - NIX_STATE_DIR=$TMPDIR NIX_PATH= nix-env -f $src -qa --meta --json --show-trace --arg config 'import ${./packages-config.nix}' - echo -n '}' - ) | sed "s|$src/||g" | jq -c > packages.json + NIX_STATE_DIR=$TMPDIR NIX_PATH= nix-instantiate --eval --raw --expr "import $src/pkgs/top-level/packages-info.nix {}" | sed "s|$src/||g" | jq -c > packages.json # Arbitrary number. The index has ~115k packages as of April 2024. if [ $(jq -r '.packages | length' < packages.json) -lt 100000 ]; then diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index cb09d08eed98..afa74ac4eec1 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -2,6 +2,7 @@ { # Ensures no aliases are in the results. allowAliases = false; + allowVariants = false; # Enable recursion into attribute sets that nix-env normally doesn't look into # so that we can get a more complete picture of the available packages for the diff --git a/pkgs/top-level/packages-info.nix b/pkgs/top-level/packages-info.nix new file mode 100644 index 000000000000..cfa10484822d --- /dev/null +++ b/pkgs/top-level/packages-info.nix @@ -0,0 +1,52 @@ +{ + trace ? false, +}: + +let + pkgs = import ../.. { config = import ./packages-config.nix; }; + inherit (pkgs) lib; + generateInfo = + path: value: + let + result = + if path == [ "AAAAAASomeThingsFailToEvaluate" ] || !(lib.isAttrs value) then + [ ] + else if lib.isDerivation value then + [ + { + name = lib.showAttrPath path; + value = { + ${if value ? "meta" then "meta" else null} = value.meta; + ${if value ? "name" then "name" else null} = value.name; + ${if value ? "outputName" then "outputName" else null} = value.outputName; + ${if value ? "outputs" then "outputs" else null} = lib.listToAttrs ( + lib.map (x: { + name = x; + value = null; + }) value.outputs + ); + ${if value ? "pname" then "pname" else null} = value.pname; + ${if value ? "system" then "system" else null} = value.system; + ${if value ? "version" then "version" else null} = value.version; + }; + } + ] + else if value.recurseForDerivations or false then + lib.pipe value [ + (lib.mapAttrsToList ( + name: value: + lib.addErrorContext "while evaluating package set attribute path '${ + lib.showAttrPath (path ++ [ name ]) + }'" (generateInfo (path ++ [ name ]) value) + )) + lib.concatLists + ] + else + [ ]; + in + lib.traceIf trace "** ${lib.showAttrPath path}" (lib.deepSeq result result); +in +lib.strings.toJSON { + version = "2"; + packages = lib.listToAttrs (generateInfo [ ] (lib.recurseIntoAttrs pkgs)); +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b60dcaf2b9a..7bf7e72fe977 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17614,9 +17614,7 @@ self: super: with self; { solidpython2 = callPackage ../development/python-modules/solidpython2 { }; - solo-python = disabledIf (!pythonAtLeast "3.6") ( - callPackage ../development/python-modules/solo-python { } - ); + solo-python = callPackage ../development/python-modules/solo-python { }; somajo = callPackage ../development/python-modules/somajo { };