diff --git a/.editorconfig b/.editorconfig index 6844b559c7b5..3a2159d33734 100644 --- a/.editorconfig +++ b/.editorconfig @@ -64,6 +64,9 @@ insert_final_newline = unset end_of_line = unset trim_trailing_whitespace = unset +[*.json] +insert_final_newline = unset + [*.lock] indent_size = unset diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index f758d89d3269..0eab34d044e4 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -10,6 +10,25 @@ The Coq derivation is overridable through the `coq.override overrides`, where ov The associated package set can be obtained using `mkCoqPackages coq`, where `coq` is the derivation to use. +## Creating custom Coq environments with `coq.withPackages` {#coq-withPackages} + +The `coq.withPackages` function provides a convenient way to create a Coq environment that includes additional Coq packages. This is similar to how `python.withPackages` works for Python environments. + +The function takes a function that receives the Coq package set and returns a list of packages. It returns a wrapped Coq environment where all Coq binaries (`coqtop`, `coqc`, `coqdep`, `coqchk`, `coqide`, etc.) are configured with the appropriate environment variables to find the packages. + +### Usage {#coq-withPackages-usage} + +Here is an example of creating a Coq environment with specific packages. + +```nix +coq.withPackages ( + ps: with ps; [ + mathcomp + bignums + ] +) +``` + ## Coq packages attribute sets: `coqPackages` {#coq-packages-attribute-sets-coqpackages} The recommended way of defining a derivation for a Coq library, is to use the `coqPackages.mkCoqDerivation` function, which is essentially a specialization of `mkDerivation` taking into account most of the specifics of Coq libraries. The following attributes are supported: diff --git a/doc/redirects.json b/doc/redirects.json index 8e072af31e4e..cbff4ea2f226 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -20,6 +20,12 @@ "cmake-ctest-variables": [ "index.html#cmake-ctest-variables" ], + "coq-withPackages": [ + "index.html#coq-withPackages" + ], + "coq-withPackages-usage": [ + "index.html#coq-withPackages-usage" + ], "cuda": [ "index.html#cuda" ], diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 30edd8d322e0..46a4447d65e1 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -68,6 +68,8 @@ - `elegant-sddm` has been updated to be Qt6 compatible. Themes for SDDM are slightly different so read the [wiki](https://wiki.nixos.org/wiki/SDDM_Themes) for more. +- `forgejo` has been updated to major version 14. For more information, see the [release blog post](https://forgejo.org/2026-01-release-v14-0/) and [full release notes](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/14.0.0.md) + - `n8n` has been updated to version 2. You can find the breaking changes here: https://docs.n8n.io/2-0-breaking-changes/. - `gurk-rs` has been updated from `0.6.4` to `0.8.0`. Version `0.8.0` includes breaking changes. For more information read the [release notes for 0.8.0](https://github.com/boxdot/gurk-rs/releases/tag/v0.8.0). diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1b554157a545..ef50ebc387ae 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5263,12 +5263,6 @@ githubId = 244239; name = "Mauricio Collares"; }; - coloquinte = { - email = "gabriel.gouvine_nix@m4x.org"; - github = "Coloquinte"; - githubId = 4102525; - name = "Gabriel Gouvine"; - }; commandodev = { email = "ben@perurbis.com"; github = "commandodev"; @@ -10801,6 +10795,12 @@ githubId = 51334444; name = "Akshat Agarwal"; }; + humemm = { + email = "nixpkgs.scabbed988@passinbox.com"; + github = "humemm"; + githubId = 75555696; + name = "humemm"; + }; hummeltech = { email = "hummeltech@sherpaguru.com"; github = "hummeltech"; @@ -16952,6 +16952,11 @@ github = "mevatron"; githubId = 714585; }; + mfairley = { + name = "Michael Fairley"; + github = "mfairley"; + githubId = 4374785; + }; mfossen = { email = "msfossen@gmail.com"; github = "mfossen"; @@ -18203,6 +18208,12 @@ matrix = "@neoney:matrix.org"; keys = [ { fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; } ]; }; + n3tshift = { + email = "n3tshift@tilde.pink"; + github = "n3tshift"; + githubId = 254145391; + name = "n3tshift"; + }; n8henrie = { name = "Nathan Henrie"; email = "nate@n8henrie.com"; @@ -22263,6 +22274,13 @@ githubId = 44014925; name = "Rexx Larsson"; }; + reylak = { + name = "Joaquin Lopez"; + email = "elreylak@proton.me"; + github = "Reylak-dev"; + githubId = 178049808; + matrix = "@reylak:unredacted.org"; + }; rgnns = { email = "jglievano@gmail.com"; github = "rgnns"; diff --git a/maintainers/scripts/update-octave-packages b/maintainers/scripts/update-octave-packages index 00a1646184d5..49ff2ef71e6b 100755 --- a/maintainers/scripts/update-octave-packages +++ b/maintainers/scripts/update-octave-packages @@ -351,20 +351,20 @@ def _update_package(path, target): text = _replace_value('hash', sri_hash, text) if fetcher == 'fetchFromGitHub': - # in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";` + # in the case of fetchFromGitHub, it's common to see `tag = version;` or `tag = "v${version}";` # in which no string value is meant to be substituted. However, we can just overwrite the previous value. - regex = '(rev\s+=\s+[^;]*;)' + regex = '(tag\s+=\s+[^;]*;)' regex = re.compile(regex) matches = regex.findall(text) n = len(matches) if n == 0: - raise ValueError("Unable to find rev value for {}.".format(pname)) + raise ValueError("Unable to find tag value for {}.".format(pname)) else: - # forcefully rewrite rev, incase tagging conventions changed for a release + # forcefully rewrite tag, incase tagging conventions changed for a release match = matches[0] - text = text.replace(match, f'rev = "refs/tags/{prefix}${{version}}";') - # incase there's no prefix, just rewrite without interpolation + text = text.replace(match, f'tag = "{prefix}${{version}}";') + # in case there's no prefix, just rewrite without interpolation text = text.replace('"${version}";', 'version;') with open(path, 'w') as f: diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ed6aa31bd6f1..fe37f175fff7 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -181,17 +181,6 @@ with lib.maintainers; github = "cuda-maintainers"; }; - cyberus = { - # Verify additions by approval of an already existing member of the team. - members = [ - xanderio - snu - e1mo - ]; - scope = "Team for Cyberus Technology employees who collectively maintain packages."; - shortName = "Cyberus Technology employees"; - }; - danklinux = { members = [ luckshiba diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index e12231381518..534bc7a9a09a 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -20,6 +20,8 @@ - [reaction](https://reaction.ppom.me/), a daemon that scans program outputs for repeated patterns, and takes action. A common usage is to scan ssh and webserver logs, and to ban hosts that cause multiple authentication errors. A modern alternative to fail2ban. Available as [services.reaction](#opt-services.reaction.enable). +- [qui](https://github.com/autobrr/qui), a modern alternative webUI for qBittorrent, with multi-instance support. Written in Go/React. Available as [services.qui](#opt-services.qui.enable). + - [LibreChat](https://www.librechat.ai/), open-source self-hostable ChatGPT clone with Agents and RAG APIs. Available as [services.librechat](#opt-services.librechat.enable). - [nohang](https://github.com/hakavlad/nohang), a daemon for Linux that prevents out of memory (OOM) situations from affecting system responsiveness. Available as [services.nohang](#opt-services.nohang.enable) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f9adc3f3230f..dc8c2560c94a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1551,6 +1551,7 @@ ./services/torrent/opentracker.nix ./services/torrent/peerflix.nix ./services/torrent/qbittorrent.nix + ./services/torrent/qui.nix ./services/torrent/rtorrent.nix ./services/torrent/torrentstream.nix ./services/torrent/transmission.nix diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index e16d38afe93d..1b262e285e19 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -51,6 +51,12 @@ let '' + script; + # We need to collect all the ACME webroots to grant them write + # access in the systemd service. + webroots = lib.remove null ( + lib.unique (map (certAttrs: certAttrs.webroot) (lib.attrValues config.security.acme.certs)) + ); + # There are many services required to make cert renewals work. # They all follow a common structure: # - They inherit this commonServiceConfig @@ -69,7 +75,9 @@ let ReadWritePaths = [ "/var/lib/acme" lockdir - ]; + ] + # Prevent runtime breakage by only adding non-overlapping paths. + ++ (lib.filter (x: !(lib.strings.hasPrefix "/var/lib/acme/" x)) webroots); PrivateTmp = true; WorkingDirectory = "/tmp"; @@ -299,12 +307,6 @@ let ++ data.extraLegoRenewFlags ); - # We need to collect all the ACME webroots to grant them write - # access in the systemd service. - webroots = lib.remove null ( - lib.unique (map (certAttrs: certAttrs.webroot) (lib.attrValues config.security.acme.certs)) - ); - certificateKey = if data.csrKey != null then "${data.csrKey}" else "certificates/${keyName}.key"; in { @@ -469,8 +471,6 @@ let "acme/.lego/accounts/${accountHash}" ]; - ReadWritePaths = commonServiceConfig.ReadWritePaths ++ webroots; - # Needs to be space separated, but can't use a multiline string because that'll include newlines BindPaths = [ "${accountDir}:/tmp/accounts" diff --git a/nixos/modules/services/networking/tayga.nix b/nixos/modules/services/networking/tayga.nix index f7221bdaf8c7..b6ed216d1992 100644 --- a/nixos/modules/services/networking/tayga.nix +++ b/nixos/modules/services/networking/tayga.nix @@ -167,7 +167,7 @@ in networking.interfaces."${cfg.tunDevice}" = { virtual = true; virtualType = "tun"; - virtualOwner = mkIf config.networking.useNetworkd ""; + virtualOwner = null; ipv4 = { addresses = [ { @@ -205,9 +205,7 @@ in ExecReload = "${pkgs.coreutils}/bin/kill -SIGHUP $MAINPID"; Restart = "always"; - # Hardening Score: - # - nixos-scripts: 2.1 - # - systemd-networkd: 1.6 + # Hardening Score: 1.5 ProtectHome = true; SystemCallFilter = [ "@network-io" @@ -216,9 +214,6 @@ in "~@resources" ]; ProtectKernelLogs = true; - AmbientCapabilities = [ - "CAP_NET_ADMIN" - ]; CapabilityBoundingSet = ""; RestrictAddressFamilies = [ "AF_INET" @@ -226,7 +221,7 @@ in "AF_NETLINK" ]; StateDirectory = "tayga"; - DynamicUser = mkIf config.networking.useNetworkd true; + DynamicUser = true; MemoryDenyWriteExecute = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/nixos/modules/services/torrent/qui.nix b/nixos/modules/services/torrent/qui.nix new file mode 100644 index 000000000000..faeb50650308 --- /dev/null +++ b/nixos/modules/services/torrent/qui.nix @@ -0,0 +1,191 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + getExe + maintainers + mkEnableOption + mkIf + mkOption + mkPackageOption + ; + inherit (lib.types) + bool + path + port + str + submodule + ; + cfg = config.services.qui; + + stateDir = "/var/lib/qui"; + configFormat = pkgs.formats.toml { }; + configFile = configFormat.generate "qui.toml" cfg.settings; +in +{ + options = { + services.qui = { + enable = mkEnableOption "qui"; + + package = mkPackageOption pkgs "qui" { }; + + user = mkOption { + type = str; + default = "qui"; + description = "User to run qui as."; + }; + + group = mkOption { + type = str; + default = "qui"; + example = "torrents"; + description = "Group to run qui as."; + }; + + openFirewall = mkOption { + type = bool; + default = false; + description = "Whether or not to open ports in the firewall for qui."; + }; + + secretFile = mkOption { + type = path; + example = "/run/secrets/qui-session.txt"; + description = '' + Path to a file that contains the session secret. The session secret + can be generated with `openssl rand -hex 32`. + ''; + }; + + settings = mkOption { + default = { }; + example = { + port = 7777; + logLevel = "DEBUG"; + metricsEnabled = true; + }; + type = submodule { + freeformType = configFormat.type; + options = { + host = mkOption { + type = str; + default = "127.0.0.1"; + description = "The host address qui listens on."; + }; + + port = mkOption { + type = port; + default = 7476; + description = "The port qui listens on."; + }; + }; + }; + description = '' + qui configuration options. + + Refer to the [template config](https://github.com/autobrr/qui/blob/main/internal/config/config.go) + in the source code for the available options. + The documentation contains the available [environment variables](https://getqui.com/docs/configuration/environment/), + this can be used to get an overview. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = !(cfg.settings ? sessionSecret); + message = '' + Session secrets should not be passed via settings, as + these are stored in the world-readable nix store. + + Use the secretFile option instead.''; + } + ]; + + systemd.services.qui = { + description = "qui: alternative qBittorrent webUI"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + + LoadCredential = "sessionSecret:${cfg.secretFile}"; + Environment = [ "QUI__SESSION_SECRET_FILE=%d/sessionSecret" ]; + StateDirectory = "qui"; + + ExecStartPre = '' + ${pkgs.coreutils}/bin/install -m 600 '${configFile}' '%S/qui/config.toml' + ''; + ExecStart = "${getExe cfg.package} serve --config-dir %S/qui"; + Restart = "on-failure"; + + # Based on qbittorrent and nemorosa hardening settings + # Similar to what systemd hardening helper suggests + CapabilityBoundingSet = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateNetwork = false; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = "yes"; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + # This should allow for hardlinking to torrent client files + ProtectSystem = "full"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_NETLINK" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; + }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.settings.port ]; + }; + + users = { + users = mkIf (cfg.user == "qui") { + qui = { + group = cfg.group; + description = "qui user"; + isSystemUser = true; + home = stateDir; + }; + }; + + groups = mkIf (cfg.group == "qui") { + qui = { }; + }; + }; + }; + + meta.maintainers = with maintainers; [ undefined-landmark ]; +} diff --git a/nixos/modules/services/web-apps/dependency-track.nix b/nixos/modules/services/web-apps/dependency-track.nix index b19e3064c363..3da1e866e5df 100644 --- a/nixos/modules/services/web-apps/dependency-track.nix +++ b/nixos/modules/services/web-apps/dependency-track.nix @@ -629,6 +629,9 @@ in }; meta = { - maintainers = lib.teams.cyberus.members; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; }; } diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 8e9f6aace6ab..23510534a24d 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -330,6 +330,9 @@ in ]; }; - meta.maintainers = teams.cyberus.members; + meta.maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; meta.doc = ./plausible.md; } diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 9e6529e487b4..e4408b6771d2 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -322,7 +322,9 @@ let RemainAfterExit = true; }; script = '' - ip tuntap add dev "${i.name}" mode "${i.virtualType}" user "${i.virtualOwner}" + ip tuntap add dev "${i.name}" mode "${i.virtualType}" ${ + lib.optionalString (i.virtualOwner != null) ''user "${i.virtualOwner}"'' + } ''; postStop = '' ip link del dev ${i.name} || true diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 2a6d00296303..92c151142215 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -348,9 +348,10 @@ let virtualOwner = mkOption { default = "root"; - type = types.str; + type = types.nullOr types.str; description = '' In case of a virtual device, the user who owns it. + `null` will not set owner, allowing access to any user. ''; }; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 52b10f309d1c..3f93c0827657 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1174,7 +1174,7 @@ in opentelemetry-collector = runTest ./opentelemetry-collector.nix; openvscode-server = runTest ./openvscode-server.nix; openvswitch = runTest ./openvswitch.nix; - optee = handleTestOn [ "aarch64-linux" ] ./optee.nix { }; + optee = runTestOn [ "aarch64-linux" ] ./optee.nix; orangefs = runTest ./orangefs.nix; orthanc = runTest ./orthanc.nix; os-prober = handleTestOn [ "x86_64-linux" ] ./os-prober.nix { }; @@ -1332,6 +1332,7 @@ in qtile = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./qtile/default.nix; qtile-extras = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./qtile-extras/default.nix; quake3 = runTest ./quake3.nix; + qui = runTest ./qui.nix; quicktun = runTest ./quicktun.nix; quickwit = runTest ./quickwit.nix; rabbitmq = runTest ./rabbitmq.nix; @@ -1418,7 +1419,7 @@ in sharkey = runTest ./web-apps/sharkey.nix; shattered-pixel-dungeon = runTest ./shattered-pixel-dungeon.nix; shiori = runTest ./shiori.nix; - shoko = runTest ./shoko.nix; + shoko = import ./shoko.nix { inherit runTest; }; signal-desktop = runTest ./signal-desktop.nix; silverbullet = runTest ./silverbullet.nix; simple = runTest ./simple.nix; diff --git a/nixos/tests/dependency-track.nix b/nixos/tests/dependency-track.nix index c0d56707ac3c..053b9d244a72 100644 --- a/nixos/tests/dependency-track.nix +++ b/nixos/tests/dependency-track.nix @@ -5,7 +5,10 @@ in { name = "dependency-track"; meta = { - maintainers = pkgs.lib.teams.cyberus.members; + maintainers = with pkgs.lib.maintainers; [ + e1mo + xanderio + ]; }; nodes = { diff --git a/nixos/tests/fcitx5/default.nix b/nixos/tests/fcitx5/default.nix index b66638efa741..3632b862f155 100644 --- a/nixos/tests/fcitx5/default.nix +++ b/nixos/tests/fcitx5/default.nix @@ -30,7 +30,7 @@ enable = true; type = "fcitx5"; fcitx5.addons = [ - pkgs.fcitx5-chinese-addons + pkgs.qt6Packages.fcitx5-chinese-addons pkgs.fcitx5-hangul pkgs.fcitx5-m17n pkgs.fcitx5-mozc @@ -81,7 +81,7 @@ user = nodes.machine.users.users.alice; xauth = "${user.home}/.Xauthority"; in - '' + /* python */ '' start_all() machine.wait_for_x() diff --git a/nixos/tests/networking/networkd-and-scripted.nix b/nixos/tests/networking/networkd-and-scripted.nix index 257fd07d1eb3..8acf4e41bf5d 100644 --- a/nixos/tests/networking/networkd-and-scripted.nix +++ b/nixos/tests/networking/networkd-and-scripted.nix @@ -1053,6 +1053,7 @@ let } ]; virtual = true; + virtualOwner = null; mtu = 1342; macAddress = "02:de:ad:be:ef:01"; }; @@ -1070,13 +1071,14 @@ let } ]; virtual = true; + virtualOwner = "root"; mtu = 1343; }; }; testScript = '' targetList = """ - tap0: tap persist user 0 + tap0: tap persist tun0: tun persist user 0 """.strip() @@ -1101,6 +1103,10 @@ let machine.wait_until_succeeds("ip link show dev tap0 | grep 'mtu 1342'") machine.wait_until_succeeds("ip link show dev tun0 | grep 'mtu 1343'") assert "02:de:ad:be:ef:01" in machine.succeed("ip link show dev tap0") + with subtest("Test virtualOwner are configured"): + for interface, expected_owner in [("tap0", "-1"), ("tun0", "0")]: + actual_owner = machine.succeed(f"cat /sys/class/net/{interface}/owner").strip() + assert expected_owner == actual_owner, f"{interface} owner: expect {expected_owner}, got {actual_owner}" '' # network-addresses-* only exist in scripted networking + lib.optionalString (!networkd) '' with subtest("Test interfaces' addresses clean up"): diff --git a/nixos/tests/optee.nix b/nixos/tests/optee.nix index f35f075e882a..f9e0bdd2f0f2 100644 --- a/nixos/tests/optee.nix +++ b/nixos/tests/optee.nix @@ -1,70 +1,68 @@ -import ./make-test-python.nix ( - { pkgs, lib, ... }: - { - name = "optee"; +{ pkgs, lib, ... }: +{ + name = "optee"; - meta = with pkgs.lib.maintainers; { - maintainers = [ jmbaur ]; - }; + meta = with pkgs.lib.maintainers; { + maintainers = [ jmbaur ]; + }; - nodes.machine = - { config, pkgs, ... }: - let - inherit (pkgs) armTrustedFirmwareQemu opteeQemuAarch64 ubootQemuAarch64; + nodes.machine = + { config, pkgs, ... }: + let + inherit (pkgs) armTrustedFirmwareQemu opteeQemuAarch64 ubootQemuAarch64; - # Default environment for qemu-arm64 uboot does not work well with - # large nixos kernel/initrds. - uboot = ubootQemuAarch64.overrideAttrs (old: { - postPatch = (old.postPatch or "") + '' - substituteInPlace board/emulation/qemu-arm/qemu-arm.env \ - --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x46000000" - ''; - }); + # Default environment for qemu-arm64 uboot does not work well with + # large nixos kernel/initrds. + uboot = ubootQemuAarch64.overrideAttrs (old: { + postPatch = (old.postPatch or "") + '' + substituteInPlace board/emulation/qemu-arm/qemu-arm.env \ + --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x46000000" + ''; + }); - bios = armTrustedFirmwareQemu.override { - extraMakeFlags = [ - "SPD=opteed" - "BL32=${opteeQemuAarch64}/tee-header_v2.bin" - "BL32_EXTRA1=${opteeQemuAarch64}/tee-pager_v2.bin" - "BL32_EXTRA2=${opteeQemuAarch64}/tee-pageable_v2.bin" - "BL33=${uboot}/u-boot.bin" - "all" - "fip" - ]; - filesToInstall = [ - "build/qemu/release/bl1.bin" - "build/qemu/release/fip.bin" - ]; - postInstall = '' - dd if=$out/bl1.bin of=$out/bios.bin bs=4096 conv=notrunc - dd if=$out/fip.bin of=$out/bios.bin seek=64 bs=4096 conv=notrunc - ''; - }; - in - { - virtualisation = { - inherit bios; - cores = 2; - qemu.options = [ - "-machine virt,secure=on,accel=tcg,gic-version=2" - "-cpu cortex-a57" - ]; - }; - - # VM boots up via qfw - boot.loader.grub.enable = false; - - services.tee-supplicant = { - enable = true; - # pkcs11 trusted application - trustedApplications = [ "${opteeQemuAarch64.devkit}/ta/fd02c9da-306c-48c7-a49c-bbd827ae86ee.ta" ]; - }; + bios = armTrustedFirmwareQemu.override { + extraMakeFlags = [ + "SPD=opteed" + "BL32=${opteeQemuAarch64}/tee-header_v2.bin" + "BL32_EXTRA1=${opteeQemuAarch64}/tee-pager_v2.bin" + "BL32_EXTRA2=${opteeQemuAarch64}/tee-pageable_v2.bin" + "BL33=${uboot}/u-boot.bin" + "all" + "fip" + ]; + filesToInstall = [ + "build/qemu/release/bl1.bin" + "build/qemu/release/fip.bin" + ]; + postInstall = '' + dd if=$out/bl1.bin of=$out/bios.bin bs=4096 conv=notrunc + dd if=$out/fip.bin of=$out/bios.bin seek=64 bs=4096 conv=notrunc + ''; }; - testScript = '' - machine.wait_for_unit("tee-supplicant.service") - out = machine.succeed("${pkgs.opensc}/bin/pkcs11-tool --module ${lib.getLib pkgs.optee-client}/lib/libckteec.so --list-token-slots") - if out.find("OP-TEE PKCS11 TA") < 0: - raise Exception("optee pkcs11 token not found") - ''; - } -) + in + { + virtualisation = { + inherit bios; + cores = 2; + qemu.options = [ + "-machine virt,secure=on,accel=tcg,gic-version=2" + "-cpu cortex-a57" + ]; + }; + + # VM boots up via qfw + boot.loader.grub.enable = false; + + services.tee-supplicant = { + enable = true; + # pkcs11 trusted application + trustedApplications = [ "${opteeQemuAarch64.devkit}/ta/fd02c9da-306c-48c7-a49c-bbd827ae86ee.ta" ]; + }; + }; + testScript = '' + machine.wait_for_unit("tee-supplicant.service") + out = machine.succeed("${pkgs.opensc}/bin/pkcs11-tool --module ${lib.getLib pkgs.optee-client}/lib/libckteec.so --list-token-slots") + if out.find("OP-TEE PKCS11 TA") < 0: + raise Exception("optee pkcs11 token not found") + ''; +} diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix index 1085db6bf5b7..15abc22270d4 100644 --- a/nixos/tests/outline.nix +++ b/nixos/tests/outline.nix @@ -2,7 +2,10 @@ { name = "outline"; - meta.maintainers = lib.teams.cyberus.members; + meta.maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; node.pkgsReadOnly = false; diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix index 5253b521c99e..b7da2eb4bbb9 100644 --- a/nixos/tests/plausible.nix +++ b/nixos/tests/plausible.nix @@ -2,7 +2,10 @@ { name = "plausible"; meta = { - maintainers = lib.teams.cyberus.members; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; }; nodes.machine = diff --git a/nixos/tests/qui.nix b/nixos/tests/qui.nix new file mode 100644 index 000000000000..cd3cc27f65ce --- /dev/null +++ b/nixos/tests/qui.nix @@ -0,0 +1,47 @@ +{ lib, ... }: + +{ + name = "qui"; + meta.maintainers = with lib.maintainers; [ undefined-landmark ]; + + nodes.machine = + { pkgs, ... }: + let + # We create this secret in the Nix store (making it readable by everyone). + # DO NOT DO THIS OUTSIDE OF TESTS!! + testSecretFile = pkgs.writeText "session_secret" "not-secret"; + in + { + services.qui = { + enable = true; + secretFile = testSecretFile; + }; + + # Use port other than default to test if settings options work. + specialisation.settingsPort.configuration = { + services.qui = { + enable = true; + secretFile = testSecretFile; + settings.port = 7777; + }; + }; + }; + + testScript = + { nodes, ... }: + let + settingsPort = "${nodes.machine.system.build.toplevel}/specialisation/settingsPort"; + in + # python + '' + def test_webui(port): + machine.wait_for_unit("qui.service") + machine.wait_for_open_port(port) + machine.wait_until_succeeds(f"curl --fail http://localhost:{port}") + + test_webui(7476) + + machine.succeed("${settingsPort}/bin/switch-to-configuration test") + test_webui(7777) + ''; +} diff --git a/nixos/tests/shoko.nix b/nixos/tests/shoko.nix index 2d464d45d8ab..dfddc19b83c5 100644 --- a/nixos/tests/shoko.nix +++ b/nixos/tests/shoko.nix @@ -1,19 +1,49 @@ -{ lib, ... }: +{ runTest }: + { - name = "Shoko"; + default = runTest ( + { lib, ... }: - nodes.machine = { - services.shoko.enable = true; - }; + { + name = "Shoko"; - testScript = '' - machine.wait_for_unit("shoko.service") - machine.wait_for_open_port(8111) - machine.succeed("curl --fail http://localhost:8111") - ''; + nodes.machine = { + services.shoko.enable = true; + }; - meta.maintainers = with lib.maintainers; [ - diniamo - nanoyaki - ]; + testScript = '' + machine.wait_for_unit("shoko.service") + machine.wait_for_open_port(8111) + machine.succeed("curl --fail http://localhost:8111") + ''; + + meta.maintainers = with lib.maintainers; [ + diniamo + nanoyaki + ]; + } + ); + + withPlugins = runTest ( + { pkgs, lib, ... }: + + { + name = "Shoko with plugins"; + + nodes.machine = { + services.shoko = { + enable = true; + plugins = [ pkgs.luarenamer ]; + }; + }; + + testScript = '' + machine.wait_for_unit("shoko.service") + machine.wait_for_open_port(8111) + machine.succeed("curl --fail http://localhost:8111") + ''; + + meta.maintainers = with lib.maintainers; [ nanoyaki ]; + } + ); } diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index c830950dbac9..7540de1da671 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy-spotify"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-pM+kqeWYiPXv9DZDBTgwiEwC6Sbqv6uz5vJ5odcixOw="; }; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 24abf4d5e269..ed777a442cd1 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -11,7 +11,7 @@ curl, gtk3, lame, - libxml2, + libxml2_13, ffmpeg, vlc, xdg-utils, @@ -110,13 +110,13 @@ stdenv.mkDerivation rec { # Setting the rpath of the plugin shared object files does not # seem to have an effect for some plugins. # We opt for wrapping the executable with LD_LIBRARY_PATH prefix. - # Note that libcurl and libxml2 are needed for ReaPack to run. + # Note that libcurl and libxml2_13 are needed for ReaPack to run. wrapProgram $out/opt/REAPER/reaper \ --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ curl lame - libxml2 + libxml2_13 ffmpeg vlc xdotool diff --git a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix index e7b674d85192..63d4e4ffd7d8 100644 --- a/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/mruby-zest/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = pname; repo = "${pname}-build"; - rev = "refs/tags/${version}"; + tag = version; fetchSubmodules = true; sha256 = "sha256-rIb6tQimwrUj+623IU5zDyKNWsNYYBElLQClOsP+5Dc="; }; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index c2604cdeabdf..41081b11c66a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -20,12 +20,12 @@ let sha256Hash = "sha256-xs9ABQ9f8/gtxcoiZkf/xEtmTOj6rb4Ty+w70/+C4Ss="; }; betaVersion = { - version = "2025.2.3.7"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 2" - sha256Hash = "sha256-d5BcAUkYV7O25wyoifiZxfUsANPxLa/QkuT9u1qqfP8="; + version = "2025.2.3.8"; # "Android Studio Otter 3 Feature Drop | 2025.2.3 RC 3" + sha256Hash = "sha256-KHvWVIxNzwdgl9kdqXD5Cpvz58r8pWs2VRyPV3VrJH0="; }; latestVersion = { - version = "2025.3.1.2"; # "Android Studio Panda 1 | 2025.3.1 Canary 2" - sha256Hash = "sha256-kgYPwMF/CypkCq4w/y+HnraNdPNHf53198x35S0i7OA="; + version = "2025.3.1.4"; # "Android Studio Panda 1 | 2025.3.1 Canary 4" + sha256Hash = "sha256-5ymB/HKSmi32AWV39+HYmfY11frkNxf2dq8Ld4f9qfA="; }; in { diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 41fa77ea7d5d..468ea813ee42 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -45,7 +45,7 @@ let homepage = { "mainline" = "https://www.gnu.org/software/emacs/"; - "macport" = "https://bitbucket.org/mituharu/emacs-mac/"; + "macport" = "https://github.com/jdtsmith/emacs-mac"; } .${variant}; description = diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix index 137e29086a37..6961354854fe 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-code"; publisher = "anthropic"; - version = "2.1.7"; - hash = "sha256-Bj9VNhwgM0nO3b/Iptb70hkO2TjKxbEpxdYGyzFt3iA="; + version = "2.1.9"; + hash = "sha256-1zrXLaTilKY11FVBGnP4ezRT5LAefGH1UKwqz+E/sFY="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix index 73df5a4b6d29..6e57235a3a13 100644 --- a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix +++ b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-augment"; publisher = "augment"; - version = "0.731.1"; - hash = "sha256-Kv47LVomNt/u0fJKos/R7Q0hhBesOGXGPu5QHaaOKEQ="; + version = "0.747.1"; + hash = "sha256-QQty7jtBHSUHR/BIPCjKMlIuCnn5dbVCqSsXv4LVfdE="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 9e5a1688148f..143e3df6020a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1711,8 +1711,8 @@ let mktplcRef = { name = "vscode-jest-runner"; publisher = "firsttris"; - version = "0.4.84"; - hash = "sha256-x4CaSa/CRZgs7vGthFcn8UXYrbQhQXkULPBbGnj3zpw="; + version = "0.4.86"; + hash = "sha256-QLa8+WAghGJlToGCx7/R68D0GRgCbA0jkEtlA5EnEGA="; }; meta = { description = "Simple way to run or debug a single (or multiple) tests from context-menu"; @@ -2982,8 +2982,8 @@ let mktplcRef = { name = "rainbow-csv"; publisher = "mechatroner"; - version = "3.23.0"; - hash = "sha256-HEbx7vjuVFjAG0koFI/JRehivRiLBF0cgx24LhdwCBc="; + version = "3.24.0"; + hash = "sha256-g9xY6JDx8RZyl4KFgIAVvQKydbwcEHLaUJPinUR89zM="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mechatroner.rainbow-csv/changelog"; @@ -3840,8 +3840,8 @@ let mktplcRef = { name = "ansible"; publisher = "redhat"; - version = "25.12.3"; - hash = "sha256-6G/CpzSSrRzwtay4+t46gz8aBF7qgu79NUhBypTJMrc="; + version = "26.1.0"; + hash = "sha256-xehZZ11C2Bjee1glpnPZaJ25DpbXSCsZONWWy4YNlRo="; }; meta = { description = "Ansible language support"; diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index 8803648654c7..24012d54e91d 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.37.0"; - hash = "sha256-tp72kIpG1NcvHLIDKcKo7OmQ/sQdxz/yb7QhGSWsFzc="; + version = "1.37.1"; + hash = "sha256-xucPJrYqKM+uCxHktfx0o4c0btpluIBMyNigr7d1FJU="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index 2ce6162142b3..00a8af822126 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.14.2"; - hash = "sha256-dgerxoVeLv9J2oIrfPJcb+ncqIrq5aaf4Rog0EQszvA="; + version = "1.14.6"; + hash = "sha256-MACP/IvSk4JwD9DUWRD6pGYbgVQVzuCz8FvXdfHcphs="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix index f8a1ab4f96ca..4e482efcc9cd 100644 --- a/pkgs/applications/emulators/libretro/cores/nestopia.nix +++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "nestopia"; - version = "0-unstable-2025-11-08"; + version = "0-unstable-2026-01-10"; src = fetchFromGitHub { owner = "libretro"; repo = "nestopia"; - rev = "5deada54077fae87e2873f5ad9ef77e3ab7af5e1"; - hash = "sha256-3/e0wrJOaEdQ4Uz17r9KyLdCsyY7dqOpIyC0MPhqhdA="; + rev = "473d3072be67fa2542ca833c274ef6682cf0f0bc"; + hash = "sha256-He60RyFhTL7A+juTPbr032tsXoOEOzK4JzCmF03l7gU="; }; makefile = "Makefile"; diff --git a/pkgs/applications/misc/electrum/grs.nix b/pkgs/applications/misc/electrum/grs.nix index ee1ad77bd46a..7a0ca956d6f5 100644 --- a/pkgs/applications/misc/electrum/grs.nix +++ b/pkgs/applications/misc/electrum/grs.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication { src = fetchFromGitHub { owner = "Groestlcoin"; repo = "electrum-grs"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "1k078jg3bw4n3kcxy917m30x1skxm679w8hcw8mlxb94ikrjc66h"; }; diff --git a/pkgs/applications/misc/mkgmap/default.nix b/pkgs/applications/misc/mkgmap/default.nix index 06735f316a05..09b42f21039c 100644 --- a/pkgs/applications/misc/mkgmap/default.nix +++ b/pkgs/applications/misc/mkgmap/default.nix @@ -17,12 +17,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4923"; + version = "4924"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-tB/0VFLn/ch7XWPz1sJ3kqy/1U5Hk1yV9+wq7ohTRWw="; + sha256 = "sha256-4DGGAWgyIvK5pcopwlO4YDGDc73lOsL0Ljy/kFUY2As="; }; patches = [ diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index 3443179133b0..f5507ba47824 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + postPatch = '' + substituteInPlace Makefile --replace-fail \ + ' -Werror ' ' ' + ''; + buildInputs = [ curses ]; installPhase = '' diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json index 7b9178ab9343..dfacf296ab60 100644 --- a/pkgs/applications/networking/browsers/librewolf/src.json +++ b/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "146.0.1-1", + "packageVersion": "147.0-1", "source": { - "rev": "146.0.1-1", - "hash": "sha256-MYp0PEAbUSJwrvaXYaie7eXj3XRw/EyGrQvsFdVT/Y0=" + "rev": "147.0-1", + "hash": "sha256-LZE4d1z4djtGSrnFsh1i9GXvFbK55RQMcqyID9ui0Ng=" }, "firefox": { - "version": "146.0.1", - "hash": "sha512-rpW4bkg/6/jf7INHdI3ZBI7X1/hFJQ4HqoBI4rNR2mH288X4O7DQxy4adexhtg5Zu+aWOfDzNTKRD/i/XKBzlA==" + "version": "147.0", + "hash": "sha512-rJAXsaLaey8Tk5LDlMNjQf00duPU6ho8fl578QDcMNGFEy75JWvn5rD52/xpI0rFceofxtudhFQ7FXcvTshRYQ==" } } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix index 8dbfeec28a8e..68ee881aa07b 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "vmware-labs"; repo = "distribution-tooling-for-helm"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/fU56Dw7tvUnby4S78tyH/dasg4n3rb0hMlIkzvrv4M="; }; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index d38a8858c733..ad019170b4d2 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "aslafy-z"; repo = "helm-git"; rev = "v${version}"; - sha256 = "sha256-jgHFmANmxDS75k0JQIiT8DDw9nSppw1EZeEWM3jirsg="; + sha256 = "sha256-JSy6bI6XHW4JkXwffbfSFJj46BUqJvRG83sfOi8AcHM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index adf82e9f3b00..c67d67a252e6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,11 +45,11 @@ "vendorHash": "sha256-weHY7ZV3HaFBYlDNhwAYN9vDItkI+wtk9UNlM0uuwfY=" }, "aliyun_alicloud": { - "hash": "sha256-WDFoyj4DxHiS1xIu8bPKUzHaVsGn88rIBzx3KoE8lA0=", + "hash": "sha256-4Y6qItQx3gk4LsZb9OB2J2IQ4g6H5uDwy+FkWPCegrg=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.267.0", + "rev": "v1.268.0", "spdx": "MPL-2.0", "vendorHash": "sha256-ogQLStDbsM0aRf4QIbITB8Z+L9DUtZwoAPK6T4xylXI=" }, @@ -418,11 +418,11 @@ "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs=" }, "fortinetdev_fortios": { - "hash": "sha256-dQMDGaYG3TDK5FBH8ODAsDcdScoDWWrk1vsWmL7sIPc=", + "hash": "sha256-xXCOhF+FPJDSPl7ISaRTn3FpDRSNmy0+3xdGmjbddKU=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "repo": "terraform-provider-fortios", - "rev": "1.23.0", + "rev": "1.24.0", "spdx": "MPL-2.0", "vendorHash": "sha256-V+D/D+i1xbPp9IAfrAds2rNv5t/aXQxPwH9vY09DsMo=" }, @@ -436,13 +436,13 @@ "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA=" }, "gitlabhq_gitlab": { - "hash": "sha256-9NYlkXiUbUtTbaa4K2Ft+khPx6NlSQs9ZnzUf3Ms0K8=", + "hash": "sha256-iBgACKVMJmfDLlIU6TZZiED+eEG7c4CMSkfEjU1Dmiw=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v18.7.0", + "rev": "v18.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-TPyvNpTwTMcysG4kGeRuu+H5hR3/By69vyNuWodnKVg=" + "vendorHash": "sha256-a2y8bnbQr8RNN3hJZFupUHvrIrV8HkAvZQn+7MIod0U=" }, "go-gandi_gandi": { "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", @@ -643,13 +643,13 @@ "vendorHash": "sha256-ssmAveYUVI8z/1UWNeaMX0qdUewowCHNufJIFMirdVg=" }, "hashicorp_random": { - "hash": "sha256-tdTVqSJmQ6Ht3kdoYMxhoRN+XJqvu8BPVB0VQghcDVs=", + "hash": "sha256-pt36xl5drR1YtXZ6IRqvvO14iINwb/m7MEAAw7RwQTA=", "homepage": "https://registry.terraform.io/providers/hashicorp/random", "owner": "hashicorp", "repo": "terraform-provider-random", - "rev": "v3.7.2", + "rev": "v3.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jyfzk3vbgZwHlyiFFw1mhD+us/7WNatUQTGN4WsrfgE=" + "vendorHash": "sha256-GlkqFg9Bgs+Hi59PYAxqq3YW9ji1qeuX4vz59wQ4pRw=" }, "hashicorp_tfe": { "hash": "sha256-U58uWRmLMI9XfYT89wfNuwhok+PaWCanz23RjQYyL98=", @@ -778,13 +778,13 @@ "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg=" }, "jianyuan_sentry": { - "hash": "sha256-/OzoGlUaL7o4O5DejTdEeAJctB85udOCy4BntSTYJLo=", + "hash": "sha256-AH7Ef3G1C0jQX4Wprc8J9rP34u+xifzhclqtmVCQmAI=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.14.7", + "rev": "v0.14.8", "spdx": "MIT", - "vendorHash": "sha256-wbU9RTNvUVJbLkoTGMeGxh9ilZQMKc9tpBkldMdfReA=" + "vendorHash": "sha256-owQrunW0X87DVdA/A/Pl5MWsVfx8kPL1L/xJYWS5ptI=" }, "joneshf_openwrt": { "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=", @@ -896,13 +896,13 @@ "vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0=" }, "metio_migadu": { - "hash": "sha256-vkQANcTx4SNaQJj0QwC+jzFTa7XFo2mXoFDBaoIvaV0=", + "hash": "sha256-rAf+q/zNANhW8cFSJR3TtA0yYqiG5mjCStyBFG0U3tg=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2025.12.11", + "rev": "2026.1.15", "spdx": "0BSD", - "vendorHash": "sha256-4zPD20KNAsXf6tKwzN97rH9Dt+lKm+GGET/6YMf5hfY=" + "vendorHash": "sha256-j9QQjoPh9bvrRCvNbItlN65kWaP5my5aed/YNFItAFI=" }, "mongey_kafka": { "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=", @@ -968,13 +968,13 @@ "vendorHash": "sha256-xTlalKIWvU2MDBvwNjl3cWFVH26EyDthwrnXVmbK+rc=" }, "ns1-terraform_ns1": { - "hash": "sha256-vSq6502jHjEQEgKmgMpUrid88jhsENOVF+3MA6Zm8lg=", + "hash": "sha256-pKdybFzTuuD6D76Uhuz+fLN+EmpDxUwjIWXYK6DRKOY=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.7.3", + "rev": "v2.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-VGGV5UYkb17X//cSy6+cbhTRCVljrrpXhM81orLomdQ=" + "vendorHash": "sha256-QEzQogxM44Yc2iH6r+AtTYhv0p/T7jDwO5axNQE2sMY=" }, "numtide_linuxbox": { "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=", @@ -1004,13 +1004,13 @@ "vendorHash": "sha256-ucXmHK7jrahc78nE2cf5p5PPCSNV5DAQ53KM2SfJnjo=" }, "okta_okta": { - "hash": "sha256-844cF3pAIegwOBhCwLmEaKZCGjgPnJry1DduXNfL8mg=", + "hash": "sha256-tihXPwZUyR8vfYRxbmzwrpbcyDxBoW+Zq//rr6CzqRc=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v6.5.3", + "rev": "v6.5.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-XW0D9lsSkLyVPZQW+LmXrDoAeeYw337fAmU6GEZcMt0=" + "vendorHash": "sha256-V5eM87qIVpHofeM7uKEJREDPGSw7HIWja/JZOp5CnbA=" }, "oktadeveloper_oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -1076,11 +1076,11 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "pagerduty_pagerduty": { - "hash": "sha256-K3Gr3ivLPMFqR10HSino/ZlsYWNpDzyJalx6orTVa4k=", + "hash": "sha256-dQaXwuT7BsgaC5PeFMqqQ1607E2/BYTA18RL8YycvNw=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.30.8", + "rev": "v3.30.9", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1130,13 +1130,13 @@ "vendorHash": "sha256-33NOGIvqLpgndG68GxAeoiISjWV7ApR4jmvqyZHjPKo=" }, "rootlyhq_rootly": { - "hash": "sha256-v/CdJiEmMmmtQ0EhDxg6IT3FGWs3jeuZ/BKhmcHi9XM=", + "hash": "sha256-fXL/MwbXz1SVtro4hf5oy/1yvCkwH81Q58A9dxk7y0A=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v5.2.2", + "rev": "v5.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-H0ohTNvSeFYEhHFIJoY37asNWwe+s2RKsDzYbx1CkJw=" + "vendorHash": "sha256-UyfCHBSdGKCulExhUdYfvEab8cVjaHGDfgslRS0d1Co=" }, "rundeck_rundeck": { "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=", @@ -1229,11 +1229,11 @@ "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8=" }, "spacelift-io_spacelift": { - "hash": "sha256-GSGKjV5tuwTyPvdwd/Z8t9g7LFkkg4gHKhI3FYt00gQ=", + "hash": "sha256-qQ8/y1KWHIc6WHEVXfiP6LKC44N8uK47x2Lv7TAMedE=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.42.0", + "rev": "v1.43.0", "spdx": "MIT", "vendorHash": "sha256-XNPXjqrrTIC3WrpvDBP7veAYgmYws9FdF4W3j6ewRPk=" }, @@ -1499,12 +1499,12 @@ "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc=" }, "yandex-cloud_yandex": { - "hash": "sha256-9mI2bGSiSuTzGBXHzpGjU6I3Vh04aEkCMkfNk6rQbTc=", + "hash": "sha256-nJzWN2OrRiXKLzM1awn68eTW4WFvLavA06+/2BmRPGA=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.177.0", + "rev": "v0.178.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-wwZiY8WXGdpOCT+4EcnSQeemDMzKZcMFZQK8SSAUkkA=" + "vendorHash": "sha256-bHsSBrfyUgUzuFOgFHXmPV12e4whsU5LTIzIXHeHlH0=" } } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 51ac55fb5323..0ecbd3d277fe 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { inherit hash; owner = "GNS3"; repo = "gns3-gui"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 7d8e993551e7..9448adc00c00 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication { inherit hash; owner = "GNS3"; repo = "gns3-server"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; }; # GNS3 2.3.26 requires a static BusyBox for the Docker integration diff --git a/pkgs/applications/office/libreoffice/src-collabora/help.nix b/pkgs/applications/office/libreoffice/src-collabora/help.nix index 0fa16c0e036b..25d53a527288 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/help.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/help.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/help"; - rev = "refs/tags/cp-25.04.1-1"; + tag = "cp-25.04.1-1"; hash = "sha256-jKcrkvdxpebCTeILrjA7bKfcsWw8VFjS7eimJI1dgFQ="; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/main.nix b/pkgs/applications/office/libreoffice/src-collabora/main.nix index aa8d54321099..1d085b100488 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/main.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/main.nix @@ -1,7 +1,7 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/core"; - rev = "refs/tags/cp-25.04.1-1"; + tag = "cp-25.04.1-1"; hash = "sha256-WhNNKL1RC0hWi21wH5EJRZ8V8U7jk6z8h3E3mVR56zk="; fetchSubmodules = false; } diff --git a/pkgs/applications/office/libreoffice/src-collabora/translations.nix b/pkgs/applications/office/libreoffice/src-collabora/translations.nix index 1248c511813a..8a96bf99e801 100644 --- a/pkgs/applications/office/libreoffice/src-collabora/translations.nix +++ b/pkgs/applications/office/libreoffice/src-collabora/translations.nix @@ -1,6 +1,6 @@ { fetchgit, ... }: fetchgit { url = "https://gerrit.libreoffice.org/translations"; - rev = "refs/tags/cp-25.04.1-1"; + tag = "cp-25.04.1-1"; hash = "sha256-kZ5LwhEMWYv9peYPjTL14wjYv4LHUMtaM7XGYSVw68U="; } diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 590c2d6a2d12..1884ef85fe57 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -320,7 +320,7 @@ let Zimmi48 ]; platforms = lib.platforms.unix; - mainProgram = "coqide"; + mainProgram = if buildIde then "coqide" else "coqtop"; }; }; in diff --git a/pkgs/applications/science/logic/coq/with-packages.nix b/pkgs/applications/science/logic/coq/with-packages.nix new file mode 100644 index 000000000000..62a95c927f84 --- /dev/null +++ b/pkgs/applications/science/logic/coq/with-packages.nix @@ -0,0 +1,63 @@ +{ + buildEnv, + coq, + lib, + makeBinaryWrapper, + runCommand, +}: + +packages: + +let + # At version 9.0, Coq underwent a name change to Rocq. + # A couple paths and environment variables need to change at this point. + isRocq = lib.versionAtLeast coq.coq-version "9.0"; + + collectPropagated = + pkg: + [ pkg ] + ++ (pkg.propagatedBuildInputs or [ ]) + ++ (lib.concatMap collectPropagated (pkg.propagatedBuildInputs or [ ])); + + allPackages = lib.unique (lib.concatMap collectPropagated packages); + + coqPath = lib.makeSearchPath "/lib/coq/${coq.coq-version}/user-contrib" allPackages; + + ocamlPath = lib.makeSearchPath "/lib/ocaml/${coq.ocaml.version}/site-lib" ( + [ coq.ocamlPackages.findlib ] ++ allPackages + ); + + pathEnvVar = if isRocq then "ROCQPATH" else "COQPATH"; +in + +buildEnv { + name = "${coq.pname}-with-packages-${coq.version}"; + + paths = [ coq ] ++ allPackages; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postBuild = '' + mkdir -p $out/bin + + # If coq is the only path that has a bin dir, buildEnv may decide to + # symlink $out/bin directly to that. So we do this step to make sure we get a + # writable bin dir + mv $out/bin $out/bin-orig + + for binary in $out/bin-orig/*; do + if [ -f "$binary" ] && [ -x "$binary" ]; then + makeWrapper "$binary" "$out/bin/$(basename "$binary")" \ + --prefix ${pathEnvVar} : "${coqPath}" \ + --prefix OCAMLPATH : "${ocamlPath}" + fi + done + ''; + + passthru = coq.passthru // { + unwrapped = coq; + packages = allPackages; + }; + + meta = coq.meta; +} diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix deleted file mode 100644 index 2b9f3587afc4..000000000000 --- a/pkgs/applications/version-management/blackbox/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - expect, - which, - gnupg, - coreutils, - git, - pinentry, - gnutar, - procps, -}: - -stdenv.mkDerivation rec { - pname = "blackbox"; - version = "1.20220610"; - - src = fetchFromGitHub { - owner = "stackexchange"; - repo = "blackbox"; - rev = "v${version}"; - hash = "sha256-g0oNV7Nj7ZMmsVQFVTDwbKtF4a/Fb3WDB+NRx9IGSWA="; - }; - - buildInputs = [ gnupg ]; - - # https://github.com/NixOS/nixpkgs/issues/134445 - doCheck = !stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; - - nativeCheckInputs = [ - expect - which - coreutils - pinentry - git - gnutar - procps - ]; - - postPatch = '' - patchShebangs bin tools - substituteInPlace Makefile \ - --replace "PREFIX?=/usr/local" "PREFIX=$out" - - substituteInPlace tools/confidence_test.sh \ - --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:/usr/local/MacGPG2/bin:/opt/homebrew/bin:''${blackbox_home}"' \ - "PATH=/build/source/bin/:$PATH" - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin - make copy-install - runHook postInstall - ''; - - meta = { - description = "Safely store secrets in a VCS repo"; - homepage = "https://github.com/StackExchange/blackbox"; - maintainers = [ ]; - license = lib.licenses.mit; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix index 6cf7703a4872..fee86e9c401b 100644 --- a/pkgs/applications/video/kodi/addons/jellycon/default.nix +++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix @@ -17,13 +17,13 @@ in buildKodiAddon rec { pname = "jellycon"; namespace = "plugin.video.jellycon"; - version = "0.8.3"; + version = "0.9.1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellycon"; rev = "v${version}"; - sha256 = "sha256-dCPbPuUtiMhcECd3Aebs3ZGIM6jn6mmCd0rXS+1TQLs="; + sha256 = "sha256-bSAzd0nKD0S3hNEM0azmCNPw9wHQK5XH6lbfcz3sW9o="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix b/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix index 764ebfb70f2a..d0f0947c22ca 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-advanced-masks.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "FiniteSingularity"; repo = "obs-advanced-masks"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-NtmOWKk3eZeRa3TvclZpg4sj8lbOoY8hUhxs1z6kEW4="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix b/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix index d5027568fbe0..6fda0dc19557 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-dvd-screensaver.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "wimpysworld"; repo = "obs-dvd-screensaver"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-eUfy3m0r/sLrGLbp3en1ofcVVWZ+t2rZ4knjwfrorhw="; }; strictDeps = true; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix b/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix index d493328c1310..9fdb529db1df 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-media-controls.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "exeldro"; repo = "obs-media-controls"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-r9fqpg0G9rzGSqq5FUS8ul58rj0796aGZIND8PCJ9jk="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix index 2158ce22db16..3fd0e9a43226 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-recursion-effect.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "exeldro"; repo = "obs-recursion-effect"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-PeWJy423QbX4NULuS15LJ/IR/W+tXCJD9TjZdJOGk6A="; }; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix b/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix index 4b364e96e80a..cc5a8b6ac332 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "norihiro"; repo = "obs-vnc"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-bveTfyhHH7RAM24Lp0mWlt52ao9Rn6vCuKjfQH+B8Rw="; }; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index c889f509119a..369e08c71efa 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -91,7 +91,7 @@ let "debian/PkKek-1-*.pem" "debian/patches/OvmfPkg-X64-add-opt-org.tianocore-UninstallMemAttrPr.patch" ]; - rev = "refs/tags/debian/2025.02-8"; + tag = "debian/2025.02-8"; hash = "sha256-n/6T5UBwW8U49mYhITRZRgy2tNdipeU4ZgGGDu9OTkg="; }; diff --git a/pkgs/by-name/a2/a2jmidid/package.nix b/pkgs/by-name/a2/a2jmidid/package.nix index 33fd63528c9e..a615756043fb 100644 --- a/pkgs/by-name/a2/a2jmidid/package.nix +++ b/pkgs/by-name/a2/a2jmidid/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { domain = "gitea.ladish.org"; owner = "LADI"; repo = "a2jmidid"; - rev = "refs/tags/${version}"; + tag = version; fetchSubmodules = true; hash = "sha256-PZKGhHmPMf0AucPruOLB9DniM5A3BKdghFCrd5pTzeM="; }; diff --git a/pkgs/by-name/ab/abiword/package.nix b/pkgs/by-name/ab/abiword/package.nix index 4dba895b52bf..9bd0c0a5f7ce 100644 --- a/pkgs/by-name/ab/abiword/package.nix +++ b/pkgs/by-name/ab/abiword/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "AbiWord"; - rev = "refs/tags/release-${version}"; + tag = "release-${version}"; hash = "sha256-dYbJ726Zuxs7+VTTCWHYQLsVZ/86hRUBQRac6toO4UI="; }; diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix index 8b31364ec709..37f61ef13c60 100644 --- a/pkgs/by-name/ai/airwindows/package.nix +++ b/pkgs/by-name/ai/airwindows/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation { pname = "airwindows"; - version = "0-unstable-2025-12-07"; + version = "0-unstable-2026-01-11"; src = fetchFromGitHub { owner = "airwindows"; repo = "airwindows"; - rev = "bfff4df7e63a3f6fde744e890849b21895c94e78"; - hash = "sha256-Ss91Ld2bNYD4HiO7Mgth5fwg3OVBYvZBaDQstBvvVKU="; + rev = "53a648baed26d12df3351b3301ea9cc741a35648"; + hash = "sha256-GN6AuqrHfFItFe8s1xU3LpltnTKEhasrvyI+3H9z7rU="; }; # we patch helpers because honestly im spooked out by where those variables diff --git a/pkgs/by-name/al/alertmanager-ntfy/package.nix b/pkgs/by-name/al/alertmanager-ntfy/package.nix index f1a761eebc2b..6b71784c2d8f 100644 --- a/pkgs/by-name/al/alertmanager-ntfy/package.nix +++ b/pkgs/by-name/al/alertmanager-ntfy/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "alertmanager-ntfy"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "alexbakker"; repo = "alertmanager-ntfy"; tag = "v${finalAttrs.version}"; - hash = "sha256-aVK8HCRXRprNoBhILLN7F/Fb3RePPzBW4vBMnQr9zRU="; + hash = "sha256-ELck6TDdRO32BWir0RKW2QLjqXmnKLGVxagUN5ujtV4="; }; - vendorHash = "sha256-CpVGLM6ZtfYODhP6gzWGcnpEuDvKRiMWzoPNm2qtML4="; + vendorHash = "sha256-1M0H/d6aBA8sKhVp8U9VL7mb09+q1sMdoCI2eg9/F9U="; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index 1b70f222850d..5db39455f8fd 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "algia"; - version = "0.0.98"; + version = "0.0.99"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; tag = "v${version}"; - hash = "sha256-Xd0WhXvEPt1VLIdsswk91hTb2UK6ikqhKMR3l/D0/jk="; + hash = "sha256-HT1JFCbC9FWJmbKs5H//OrgYaQEiJxhpuJwEu55WFoU="; }; vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU="; diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix index 7724e840b9c5..a772bc7ed6f7 100644 --- a/pkgs/by-name/al/all-the-package-names/package.nix +++ b/pkgs/by-name/al/all-the-package-names/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "all-the-package-names"; - version = "2.0.2321"; + version = "2.0.2328"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-wkgVhmzfI15GFZ1YDI0MYGdfFIzyfd3ob949kyWA8N4="; + hash = "sha256-6+rb7eNPkifuIMsFs2YO0v27CY6RNWnHrzHYoVhtYCw="; }; - npmDepsHash = "sha256-mikgLEfjusRvmOMjdeENRtC+Vi+yV9zwBIqu3IbLY8A="; + npmDepsHash = "sha256-Q0vdon6Qbt5FOjKZJqB5ufiLcG18DPgL4EN9PSkoXDE="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index 61012fa0f2ed..ddff771e2744 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "ansible-doctor"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; tag = "v${version}"; - hash = "sha256-izgSdHK+vVS0UcK32gYDwBn3b1yDCzp2ImjDXZbMrzs="; + hash = "sha256-eKUeQp4hvLqBkHDfclyR5dTt7jjcVMHneqXBPt1N8No="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/an/antibody/package.nix b/pkgs/by-name/an/antibody/package.nix deleted file mode 100644 index ebb0047a3844..000000000000 --- a/pkgs/by-name/an/antibody/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - stdenv, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "antibody"; - version = "6.1.1"; - - src = fetchFromGitHub { - owner = "getantibody"; - repo = "antibody"; - tag = "v${version}"; - hash = "sha256-If7XAwtg1WqkDkrJ6qYED+DjwHWloPu3P7X9rUd5ikU="; - }; - - vendorHash = "sha256-0m+yDo+AMX5tZfOsjsZgulyjB9mVEjy2RfA2sYeqDn0="; - - doCheck = false; - - ldflags = [ - "-s" - "-w" - "-X main.version=${version}" - ]; - - meta = { - description = "Fastest shell plugin manager"; - mainProgram = "antibody"; - homepage = "https://github.com/getantibody/antibody"; - license = lib.licenses.mit; - - # golang.org/x/sys needs to be updated due to: - # - # https://github.com/golang/go/issues/49219 - # - # but this package is no longer maintained. - # - broken = stdenv.hostPlatform.isDarwin; - }; -} diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index bf4281e0baad..154886e64e0f 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -71,7 +71,7 @@ let airflow-src = fetchFromGitHub { owner = "apache"; repo = "airflow"; - rev = "refs/tags/${version}"; + tag = version; # Download using the git protocol rather than using tarballs, because the # GitHub archive tarballs don't appear to include tests forceFetchGit = true; diff --git a/pkgs/by-name/ap/apbs/package.nix b/pkgs/by-name/ap/apbs/package.nix index 81ed839f0951..19137459d854 100644 --- a/pkgs/by-name/ap/apbs/package.nix +++ b/pkgs/by-name/ap/apbs/package.nix @@ -19,7 +19,7 @@ let src = fetchFromGitHub { owner = "Electrostatics"; repo = "fetk"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-uFA1JRR05cNcUGaJj9IyGNONB2hU9IOBPzOj/HucNH4="; }; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Electrostatics"; repo = "apbs"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-2DnHU9hMDl4OJBaTtcRiB+6R7gAeFcuOUy7aI63A3gQ="; }; diff --git a/pkgs/by-name/ap/apksigner/package.nix b/pkgs/by-name/ap/apksigner/package.nix index b8ff6932a0d4..dfb4fa9b81a9 100644 --- a/pkgs/by-name/ap/apksigner/package.nix +++ b/pkgs/by-name/ap/apksigner/package.nix @@ -3,6 +3,7 @@ stdenv, fetchgit, jdk_headless, + jre_minimal, gradle_8, makeWrapper, bashNonInteractive, @@ -10,6 +11,17 @@ let # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0." gradle = gradle_8; + jre = jre_minimal.override { + modules = [ + "java.base" + "java.compiler" + "java.logging" + "java.naming" + "java.security.jgss" + "java.sql" + "jdk.unsupported" + ]; + }; in stdenv.mkDerivation rec { pname = "apksigner"; @@ -22,7 +34,7 @@ stdenv.mkDerivation rec { # use pname here because the final jar uses this as the filename name = pname; url = "https://android.googlesource.com/platform/tools/apksig"; - rev = "refs/tags/android-15.0.0_r30"; + tag = "android-15.0.0_r30"; hash = "sha256-f/PggxvBv8nYUyL9Ukd4YVpunpRWbLL5UYsYhsiDWRE="; }; @@ -53,7 +65,7 @@ stdenv.mkDerivation rec { mv apksigner $out/opt mkdir -p $out/bin makeWrapper $out/opt/apksigner/bin/apksigner $out/bin/apksigner \ - --set JAVA_HOME ${jdk_headless.home} + --set JAVA_HOME ${jre.home} runHook postInstall ''; diff --git a/pkgs/by-name/ap/apktool/package.nix b/pkgs/by-name/ap/apktool/package.nix index f3064b23077a..115369aa4b5f 100644 --- a/pkgs/by-name/ap/apktool/package.nix +++ b/pkgs/by-name/ap/apktool/package.nix @@ -3,10 +3,20 @@ stdenv, fetchurl, makeWrapper, - jdk_headless, + jre_minimal, aapt, }: +let + jre = jre_minimal.override { + modules = [ + "java.base" + "java.desktop" + "java.logging" + "java.xml" + ]; + }; +in stdenv.mkDerivation rec { pname = "apktool"; version = "2.12.1"; @@ -28,7 +38,7 @@ stdenv.mkDerivation rec { installPhase = '' install -D ${src} "$out/libexec/apktool/apktool.jar" mkdir -p "$out/bin" - makeWrapper "${jdk_headless}/bin/java" "$out/bin/apktool" \ + makeWrapper "${jre}/bin/java" "$out/bin/apktool" \ --add-flags "-jar $out/libexec/apktool/apktool.jar" \ --prefix PATH : ${lib.getBin aapt} ''; diff --git a/pkgs/by-name/ap/apostrophe/package.nix b/pkgs/by-name/ap/apostrophe/package.nix index d2daa5a58443..c554d5ceaf4a 100644 --- a/pkgs/by-name/ap/apostrophe/package.nix +++ b/pkgs/by-name/ap/apostrophe/package.nix @@ -26,7 +26,7 @@ let owner = "World"; repo = "apostrophe"; domain = "gitlab.gnome.org"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Sj5Y4QPMYavdXbU+iVv76qOFNhgBjAeX9+/TvQHZzeI="; }; @@ -36,7 +36,7 @@ let # keep in sync with upstream shipped version # in build-aux/flatpak/org.gnome.gitlab.somas.Apostrophe.json - rev = "refs/tags/5.1.0"; + tag = "5.1.0"; hash = "sha256-L6KVBw20K67lHT07Ws+ZC2DwdURahqyuyjAaK0kTgN0="; }; in diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix index 468a0f4f04af..956b5428b7da 100644 --- a/pkgs/by-name/ar/arkade/package.nix +++ b/pkgs/by-name/ar/arkade/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.62"; + version = "0.11.63"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; tag = version; - hash = "sha256-Ost93sMmlbZI3l5duy0VDaWByREUIzWFtuVRGilZYFo="; + hash = "sha256-J4GC9b4r3ukBQsLIraFueznruVaaHWXcBvox+K+149g="; }; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/as/ascii/package.nix b/pkgs/by-name/as/ascii/package.nix index 06180ba28fb7..12cdc6f6f89f 100644 --- a/pkgs/by-name/as/ascii/package.nix +++ b/pkgs/by-name/as/ascii/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "esr"; repo = "ascii"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-TE9YR5Va9tXaf2ZyNxz7d8lZRTgnD4Lz7FyqRDl1HNY="; }; diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index be7053870fca..a55c5cad8a49 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "atuin"; - version = "18.10.0"; + version = "18.11.0"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; tag = "v${finalAttrs.version}"; - hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M="; + hash = "sha256-yjsCNN15E06te6cueSZksg7mcMyx2FiXKrbGAEcQWmg="; }; - cargoHash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M="; + cargoHash = "sha256-xaALIVJpMek4nbSozxtOEWivRDlMmKdu6KqKiNMp0jk="; # atuin's default features include 'check-updates', which do not make sense # for distribution builds. List all other default features. diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 7873573a0436..a3a2046b2b8e 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "auth0-cli"; - version = "1.25.1"; + version = "1.26.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${version}"; - hash = "sha256-Qtxn3VnqJOAIKI4jURFXnH5fHCWtZU419XtnjdqFlkY="; + hash = "sha256-ng+eIM8C557HY9kfAaidhwb/oT875qcPC7zTpXFn0c8="; }; - vendorHash = "sha256-WN71xEU9GBNj0M5tnVthBdxh13UH78zUOaCEtczFDck="; + vendorHash = "sha256-fEoDvnHNQWwk++3n/4R1Q3YKwraxP8OBFLU0hZLcouc="; ldflags = [ "-s" diff --git a/pkgs/by-name/aw/aws-shell/package.nix b/pkgs/by-name/aw/aws-shell/package.nix index 748fcd502e49..a42ced9aec35 100644 --- a/pkgs/by-name/aw/aws-shell/package.nix +++ b/pkgs/by-name/aw/aws-shell/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "awslabs"; repo = "aws-shell"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-m96XaaFDFQaD2YPjw8D1sGJ5lex4Is4LQ5RhGzVPvH4="; }; diff --git a/pkgs/by-name/az/azahar/fix-zstd-seekable-include.patch b/pkgs/by-name/az/azahar/fix-zstd-seekable-include.patch deleted file mode 100644 index 9b0e352ebccf..000000000000 --- a/pkgs/by-name/az/azahar/fix-zstd-seekable-include.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt -index 66cbbd52ed..a8b9d41e4e 100644 ---- a/externals/CMakeLists.txt -+++ b/externals/CMakeLists.txt -@@ -230,13 +230,8 @@ - ) - target_link_libraries(zstd_seekable PUBLIC libzstd_static) - -- target_link_libraries(libzstd_static INTERFACE zstd_seekable) -- -- add_library(zstd ALIAS libzstd_static) -- -- install(TARGETS zstd_seekable -- EXPORT zstdExports -- ) -+ add_library(zstd INTERFACE) -+ target_link_libraries(zstd INTERFACE libzstd_static zstd_seekable) - endif() - - # ENet -diff --git a/src/common/zstd_compression.cpp b/src/common/zstd_compression.cpp -index 1e38877a1c..ac85ea1978 100644 ---- a/src/common/zstd_compression.cpp -+++ b/src/common/zstd_compression.cpp -@@ -13,7 +13,7 @@ - #include - #include - #include --#include -+#include - - #include - #include diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index f5cdb9ce6803..99d0e32b7935 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -44,7 +44,6 @@ gamemode, enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode, nix-update-script, - fetchpatch2, }: let inherit (lib) @@ -56,24 +55,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2123.4.1"; + version = "2124"; src = fetchzip { url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz"; - hash = "sha256-86i6GMnonQ8SeeDiOH1XSl3rHamnMTgPnkaeJOlAIuI="; + hash = "sha256-k/Rz7hiYtX0tVW2lrrEwiB8LanvAuhXHxPC79Dy4aUI="; }; - patches = [ - # https://github.com/azahar-emu/azahar/pull/1305 - ./fix-zstd-seekable-include.patch - - # TODO: Remove in next release - (fetchpatch2 { - url = "https://github.com/azahar-emu/azahar/commit/1f483e1d335374482845d0325ac8b13af3162c53.patch?full_index=1"; - hash = "sha256-9rmRbv7VFMhHly5qTGaeBLpvtWMu6HkCGUUM+t78Meg="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ cmake @@ -111,8 +99,9 @@ stdenv.mkDerivation (finalAttrs: { vulkan-headers xbyak - # https://github.com/azahar-emu/azahar/pull/1281 + # https://github.com/azahar-emu/azahar/issues/1283 # spirv-tools + # spirv-headers # Azahar uses zstd_seekable which is not currently packaged in nixpkgs # zstd diff --git a/pkgs/by-name/ba/barlow/package.nix b/pkgs/by-name/ba/barlow/package.nix index 67fdf32c04af..dc0b0439c40f 100644 --- a/pkgs/by-name/ba/barlow/package.nix +++ b/pkgs/by-name/ba/barlow/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "jpt"; repo = "barlow"; - tag = "${version}"; + tag = version; hash = "sha256-FG68o6qN/296RhSNDHFXYXbkhlXSZJgGhVjzlJqsksY="; }; diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix index c1499d723861..1d0832003936 100644 --- a/pkgs/by-name/ba/bazelisk/package.nix +++ b/pkgs/by-name/ba/bazelisk/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.27.0"; + version = "1.28.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazelisk"; rev = "v${version}"; - sha256 = "sha256-RPatTc97xYs5lhVCOjInNrNrL1UBsocdHn0C5yUHIxY="; + sha256 = "sha256-wpbJc4qF7UF8HG4tkk7jnsurO2snFIpcfKyRY1Ohby4="; }; - vendorHash = "sha256-gv5x0BbckeGkYa5rzCmyUkvmRsmI5YPy04HVN9Z1Rgc="; + vendorHash = "sha256-PWqKq/2DFopeiecUL0iWnut8Kd/52U32sNSVGj3Ae5g="; ldflags = [ "-s" diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 18bb15b3d447..7bfa38964b59 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -28,18 +28,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-u9RMI1EP+2yhoHtu0Lf1/4RZPrwSFsVc/DgdFJ9xZsA="; + hash = "sha256-mKyoV92+VJESHDRENXLFU+Ug2fFr+xJrleckvxfZ6sY="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-v17x6/ojK4fGqgBBCKKARYOs/8ECT2FXp7ZgGGAUSss="; + hash = "sha256-5z86H/LGI5aSg3vBoXlvm0f2DmumsKu3EN7Bn5UHbr4="; }; postPatch = '' diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index ef2b407dbfbc..9b5f1d48cb2d 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.455"; + version = "4.2.482"; src = fetchurl { url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-3FHaPIJb40ta/+sguolz2QQBKkGgd1P3CgyEHHxX5xA="; + hash = "sha256-mxBE0U2ABiOdSNj8c3Lqgmy5iFtOulCCkQ+oC2xyENA="; }; appimageContents = appimageTools.extract { inherit pname version src; diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix index 6403a68c4775..5d87c316e8fd 100644 --- a/pkgs/by-name/be/beszel/package.nix +++ b/pkgs/by-name/be/beszel/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "beszel"; - version = "0.17.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "henrygd"; repo = "beszel"; tag = "v${version}"; - hash = "sha256-MY/rsWdIiYsqcw6gqDkfA8A/Ied3OSHfJI3KUBxoRKc="; + hash = "sha256-7jXhlstGuQc3EP4fm5k9FD22nge0ecXVZAk8mXdyKc0="; }; webui = buildNpmPackage { @@ -48,10 +48,10 @@ buildGoModule rec { sourceRoot = "${src.name}/internal/site"; - npmDepsHash = "sha256-1au4kSxyjdwFExIoUBSPf/At0jQsfbzlEXuigygBTRM="; + npmDepsHash = "sha256-Ks78fCJeHoLCImkyEHo1fSRJqIOEEvL6Zyydpy5LlTw="; }; - vendorHash = "sha256-gfQU3jGwTGmMJIy9KTjk/Ncwpk886vMo4CJvm5Y5xpA="; + vendorHash = "sha256-OnCX/0DGtkcACuWxGfIreS6SSx9dKq+feWKSymtkABs="; preBuild = '' mkdir -p internal/site/dist diff --git a/pkgs/by-name/be/better-commits/package.nix b/pkgs/by-name/be/better-commits/package.nix index 8c12954d937b..b9556df7552a 100644 --- a/pkgs/by-name/be/better-commits/package.nix +++ b/pkgs/by-name/be/better-commits/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "better-commits"; - version = "1.18.1"; + version = "1.18.3"; src = fetchFromGitHub { owner = "Everduin94"; repo = "better-commits"; tag = "v${version}"; - hash = "sha256-tkGLlvOldKKpoFswo1UzUhNJHstKISRpCDGFrL/W7ZI="; + hash = "sha256-2g9sYTy34estLBLAaHNbjNzv6+rzyocgqMBlVlJUyT4="; }; - npmDepsHash = "sha256-lPJ50DYnANJZ3IowE3kOCyAx9peq7Donh72jk1eQnBs="; + npmDepsHash = "sha256-vtUtdgOJEQk9PzxOz7AlwOxWS6PTjAtrjAugXRXo89c="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix index 25e6aea924e0..3f68296992a7 100644 --- a/pkgs/by-name/bi/binsider/package.nix +++ b/pkgs/by-name/bi/binsider/package.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "binsider"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "orhun"; repo = "binsider"; rev = "v${version}"; - hash = "sha256-k40mnDRbvwWJmcT02aVWdwwEiDCuL4hQnvnPitrW8qA="; + hash = "sha256-ZfLFZXLnH5nBg/5ufOfwMG8c8n+BDex3j7da+Hvh1fw="; }; - cargoHash = "sha256-hysp7AeYJ153AC0ERcrRzf4ujmM+V9pgAxOvOlG/2aE="; + cargoHash = "sha256-HnJBeqZhzDT0XfZ5UDg+lWMaX8tP7Q4iXrAz84XM3QE="; buildNoDefaultFeatures = !stdenv.hostPlatform.isLinux; diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix index d3d5a94e85a6..560fae162335 100644 --- a/pkgs/by-name/bl/bloop/package.nix +++ b/pkgs/by-name/bl/bloop/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "2.0.17"; + version = "2.0.18"; platform = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then - "sha256-pvqIotxcKVtrCQlMdbMGNkPvrMcNyw8CmtnUkQjAF8Y=" + "sha256-18cI2w2HXq1BechxLi1GzljWRYAp2IDO5SAaZHnJy6c=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then - "sha256-W54MoUGEQ48ju+h1PVUxlJZ0RxV2NLjYhlq6QacBEto=" + "sha256-pVGxaEAatqRTIwTHpTEt7XwzLqgFf67ztgjTtIEnBa8=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then - "sha256-7FtS1dlDK5v/zlwFA5rPSkyLaEVbKhAaKdOhZkZcFPg=" + "sha256-AjI1YKarVSGJHuRJ/86BaeD4XkGcbI7XzjAg5swgNM0=" else throw "unsupported platform"; }; diff --git a/pkgs/by-name/br/brlcad/package.nix b/pkgs/by-name/br/brlcad/package.nix index f96fc1064def..180578191552 100644 --- a/pkgs/by-name/br/brlcad/package.nix +++ b/pkgs/by-name/br/brlcad/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "BRL-CAD"; repo = "brlcad"; - rev = "refs/tags/rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; + tag = "rel-${lib.replaceStrings [ "." ] [ "-" ] version}"; hash = "sha256-23UTeH4gY2x/QGYZ64glAkf6LmsXBAppIOHgoUdxgpo="; }; diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix index 55b677cc84bf..ead0880b2857 100644 --- a/pkgs/by-name/bu/buildpack/package.nix +++ b/pkgs/by-name/bu/buildpack/package.nix @@ -16,7 +16,7 @@ buildGoModule { src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0="; }; diff --git a/pkgs/by-name/bu/bulletty/package.nix b/pkgs/by-name/bu/bulletty/package.nix index 0967e63903f6..9cd7979a2313 100644 --- a/pkgs/by-name/bu/bulletty/package.nix +++ b/pkgs/by-name/bu/bulletty/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bulletty"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "CrociDB"; repo = "bulletty"; tag = "v${finalAttrs.version}"; - hash = "sha256-HX5J00Y7nkBwLIOEoc9jRtv9xObeWrWpHhYBQUOUVKA="; + hash = "sha256-J4ljTQuEWwGvxDbwBaP7z0TPqpLKQCmd4YSaIpcVYvg="; }; patches = [ @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ./remove-rustfmt-exec.patch ]; - cargoHash = "sha256-WIEbZIWdIGWiwi6918MVFu++aZ2oWJTF4AUSTpKRZvQ="; + cargoHash = "sha256-yL7qYE60TBtEoj+0/ykhbEv6XBfk9JA0y8JLvRzaAHI="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cached-nix-shell/package.nix b/pkgs/by-name/ca/cached-nix-shell/package.nix index af6394ac5543..f85523197cfc 100644 --- a/pkgs/by-name/ca/cached-nix-shell/package.nix +++ b/pkgs/by-name/ca/cached-nix-shell/package.nix @@ -10,7 +10,7 @@ let blake3-src = fetchFromGitHub { owner = "BLAKE3-team"; repo = "BLAKE3"; - rev = "refs/tags/1.5.1"; + tag = "1.5.1"; hash = "sha256-STWAnJjKrtb2Xyj6i1ACwxX/gTkQo5jUHilcqcgJYxc="; }; in @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "xzfc"; repo = "cached-nix-shell"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-LI/hecqeRg3eCzU2bASJA8VoG4nvrSeHSeaGYn7M/UI="; }; diff --git a/pkgs/by-name/ca/caddyfile-language-server/package.nix b/pkgs/by-name/ca/caddyfile-language-server/package.nix new file mode 100644 index 000000000000..de354fbb2d1e --- /dev/null +++ b/pkgs/by-name/ca/caddyfile-language-server/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchPnpmDeps, + pnpm_8, + nodejs, + pnpmConfigHook, + makeBinaryWrapper, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "caddyfile-language-server"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "caddyserver"; + repo = "vscode-caddyfile"; + tag = "v${finalAttrs.version}"; + hash = "sha256-IusP9Z3e8mQ0mEhI1o1zIqPDB/i0pqlMfnt6M8bzb2w="; + }; + + pnpmWorkspaces = [ "@caddyserver/caddyfile-language-server" ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + pnpm = pnpm_8; + fetcherVersion = 3; + hash = "sha256-D9kYFkmFlvg4r6vR9PHHAwF0qglHsTuRae0Z7CzDq1M="; + }; + + nativeBuildInputs = [ + pnpm_8 + pnpmConfigHook + nodejs + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + + pnpm --filter=@caddyserver/caddyfile-language-server run build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + rm -rf node_modules packages/server/node_modules + pnpm install --production --offline --force --filter=@caddyserver/caddyfile-language-server + mkdir -p $out/lib/node_modules/caddyfile-language-server/ + mv packages/server/dist/* $out/lib/node_modules/caddyfile-language-server/ + + makeWrapper ${lib.getExe nodejs} $out/bin/caddyfile-language-server \ + --add-flags "$out/lib/node_modules/caddyfile-language-server/index.js" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/caddyserver/vscode-caddyfile/releases/tag/v${finalAttrs.version}"; + description = "Basic language server for caddyfile"; + homepage = "https://github.com/caddyserver/vscode-caddyfile"; + mainProgram = "caddyfile-language-server"; + maintainers = with lib.maintainers; [ pyrox0 ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix index 8cca4752544c..f3269d749265 100644 --- a/pkgs/by-name/ca/cadical/package.nix +++ b/pkgs/by-name/ca/cadical/package.nix @@ -96,7 +96,10 @@ stdenv.mkDerivation rec { meta = { description = "Simplified Satisfiability Solver"; - maintainers = with lib.maintainers; [ shnarazk ]; + maintainers = with lib.maintainers; [ + shnarazk + chrjabs + ]; platforms = lib.platforms.unix; license = lib.licenses.mit; homepage = "https://fmv.jku.at/cadical/"; diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix index 878abc12c1f0..0baf1daa08b9 100644 --- a/pkgs/by-name/ca/camunda-modeler/package.nix +++ b/pkgs/by-name/ca/camunda-modeler/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.43.0"; + version = "5.43.1"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-NR1UXnIU0Wf2WeiagqijEXz9qUShFbM1umenFFETOJI="; + hash = "sha256-ruYpMFL/7UK4AF7Zp4OhopClfUqEuWPIMA+cM3PJ9FI="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/by-name/ca/canaille/package.nix b/pkgs/by-name/ca/canaille/package.nix index 87fc242bed68..6d4100e7c8ca 100644 --- a/pkgs/by-name/ca/canaille/package.nix +++ b/pkgs/by-name/ca/canaille/package.nix @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitLab { owner = "yaal"; repo = "canaille"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-FL02ADM7rUU43XR71UWr4FLr/NeUau7zRwTMOSFm1T4="; }; diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index dbfd245e1717..42e6dc5a34f9 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -46,6 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ matthiasbeyer jk + chrjabs ]; }; }) diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index 4de52a2360c3..bed69775d64d 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -91,6 +91,7 @@ rustPlatform.buildRustPackage (finalAttrs: { wucke13 matthiasbeyer CobaltCause + chrjabs ]; broken = stdenv.targetPlatform.isRedox; diff --git a/pkgs/by-name/ca/cargo-machete/package.nix b/pkgs/by-name/ca/cargo-machete/package.nix index 28fb82e53a4b..988c6847c4c0 100644 --- a/pkgs/by-name/ca/cargo-machete/package.nix +++ b/pkgs/by-name/ca/cargo-machete/package.nix @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer + chrjabs ]; }; } diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix index ca87438bf061..d7d8b6830443 100644 --- a/pkgs/by-name/ca/cargo-mobile2/package.nix +++ b/pkgs/by-name/ca/cargo-mobile2/package.nix @@ -10,7 +10,7 @@ let pname = "cargo-mobile2"; - version = "0.22.1"; + version = "0.22.2"; in rustPlatform.buildRustPackage { inherit pname version; @@ -18,14 +18,14 @@ rustPlatform.buildRustPackage { owner = "tauri-apps"; repo = "cargo-mobile2"; rev = "cargo-mobile2-v${version}"; - hash = "sha256-+U/uTbTGa3NPK5WpyvR5C5L1ozl+fa15pNNWYZJXgnk="; + hash = "sha256-pSp7w823Jjjg0PEnCc7jVLBbOgvR7JAjtD8OK5voC0A="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 # sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-fMtFvPrWMLHE4N9WJv6J4pqHbHPnNKhQWz5qEvB8jKQ="; + cargoHash = "sha256-aci1QF/O2J6Yix4UkxPCVW+c+xoqm7AvdhlkF7y1GqA="; preBuild = '' mkdir -p $out/share/ diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index aee461f46a1c..17fe3011d6bc 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with lib.maintainers; [ matthiasbeyer + chrjabs ]; }; } diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index e823b3455f98..56bd4a781552 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -21,6 +21,9 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/orium/cargo-rdme"; changelog = "https://github.com/orium/cargo-rdme/blob/v${version}/release-notes.md"; license = with lib.licenses; [ mpl20 ]; - maintainers = with lib.maintainers; [ GoldsteinE ]; + maintainers = with lib.maintainers; [ + GoldsteinE + chrjabs + ]; }; } diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix index 9c5470d90d9f..0dc65b843a93 100644 --- a/pkgs/by-name/ca/cargo-semver-checks/package.nix +++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix @@ -34,10 +34,8 @@ rustPlatform.buildRustPackage rec { # requires internet access "--skip=detects_target_dependencies" "--skip=query::tests_lints::feature_missing" - # platform specific snapshots - "--skip=query::tests_lints::trait_method_target_feature_removed" - "--skip=query::tests_lints::unsafe_trait_method_requires_more_target_features" - "--skip=query::tests_lints::unsafe_trait_method_target_feature_added" + # platform specific tests + "--skip=target_feature" ]; preCheck = '' @@ -69,6 +67,7 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with lib.maintainers; [ matthiasbeyer + chrjabs ]; }; } diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix index 8bbf2e701578..28d29bffcba2 100644 --- a/pkgs/by-name/ca/cargo-show-asm/package.nix +++ b/pkgs/by-name/ca/cargo-show-asm/package.nix @@ -48,6 +48,7 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ oxalica matthiasbeyer + chrjabs ]; mainProgram = "cargo-asm"; }; diff --git a/pkgs/by-name/ca/cargo-spellcheck/package.nix b/pkgs/by-name/ca/cargo-spellcheck/package.nix index 09a8fc9ae031..cf879d345e88 100644 --- a/pkgs/by-name/ca/cargo-spellcheck/package.nix +++ b/pkgs/by-name/ca/cargo-spellcheck/package.nix @@ -42,6 +42,7 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ newam matthiasbeyer + chrjabs ]; }; } diff --git a/pkgs/by-name/ca/cargo-udeps/package.nix b/pkgs/by-name/ca/cargo-udeps/package.nix index bcfb58c99d53..0dbf4665f667 100644 --- a/pkgs/by-name/ca/cargo-udeps/package.nix +++ b/pkgs/by-name/ca/cargo-udeps/package.nix @@ -41,6 +41,7 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ b4dm4n matthiasbeyer + chrjabs ]; mainProgram = "cargo-udeps"; }; diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix index 995bbe5fcffa..7d99d1afc462 100644 --- a/pkgs/by-name/ca/cargo-valgrind/package.nix +++ b/pkgs/by-name/ca/cargo-valgrind/package.nix @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ otavio matthiasbeyer + chrjabs ]; }; } diff --git a/pkgs/by-name/ca/catppuccinifier-gui/package.nix b/pkgs/by-name/ca/catppuccinifier-gui/package.nix index 0e2317ab0265..201a60a54ac4 100644 --- a/pkgs/by-name/ca/catppuccinifier-gui/package.nix +++ b/pkgs/by-name/ca/catppuccinifier-gui/package.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "lighttigerXIV"; repo = "catppuccinifier"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-e8sLYp+0YhC/vAn4vag9UUaw3VYDRERGnLD1RuW1TXE="; }; diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix index 5a7494eecda6..52bb3d857699 100644 --- a/pkgs/by-name/ce/ceph/package.nix +++ b/pkgs/by-name/ce/ceph/package.nix @@ -153,7 +153,7 @@ let src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; - rev = "refs/tags/v7.9.2"; + tag = "v7.9.2"; hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM="; }; }; diff --git a/pkgs/by-name/ch/chance/package.nix b/pkgs/by-name/ch/chance/package.nix index 748bce5deb08..310994e29800 100644 --- a/pkgs/by-name/ch/chance/package.nix +++ b/pkgs/by-name/ch/chance/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "zelikos"; repo = "rollit"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-25+/TvTba/QF7+QE8+O7u4yc9BNi0pcZeNj11dGkEfg="; }; diff --git a/pkgs/by-name/ch/chiptrack/package.nix b/pkgs/by-name/ch/chiptrack/package.nix index 4a97ba3c894f..16ad7447de1d 100644 --- a/pkgs/by-name/ch/chiptrack/package.nix +++ b/pkgs/by-name/ch/chiptrack/package.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { src = fetchFromGitHub { owner = "jturcotte"; repo = "chiptrack"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yQP5hFM5qBWdaF192PBvM4il6qpmlgUCeuwDCiw/LaQ="; }; @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "refs/tags/m129-0.77.1"; + tag = "m129-0.77.1"; hash = "sha256-WRVuQpfRnYrE7KGFRFx66fXtMFmtJbC3xUcRPK1JoOM="; }; # The externals for skia are taken from skia/DEPS diff --git a/pkgs/tools/misc/ckb-next/install-dirs.patch b/pkgs/by-name/ck/ckb-next/install-dirs.patch similarity index 100% rename from pkgs/tools/misc/ckb-next/install-dirs.patch rename to pkgs/by-name/ck/ckb-next/install-dirs.patch diff --git a/pkgs/tools/misc/ckb-next/modprobe.patch b/pkgs/by-name/ck/ckb-next/modprobe.patch similarity index 100% rename from pkgs/tools/misc/ckb-next/modprobe.patch rename to pkgs/by-name/ck/ckb-next/modprobe.patch diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/by-name/ck/ckb-next/package.nix similarity index 78% rename from pkgs/tools/misc/ckb-next/default.nix rename to pkgs/by-name/ck/ckb-next/package.nix index 61682c9b017c..70f4db66cb5d 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/by-name/ck/ckb-next/package.nix @@ -1,51 +1,48 @@ { lib, - wrapQtAppsHook, fetchFromGitHub, replaceVars, udev, stdenv, pkg-config, - qtbase, + qt6, + qt6Packages, cmake, zlib, kmod, libXdmcp, - qttools, - qtx11extras, - libdbusmenu, gnused, withPulseaudio ? stdenv.hostPlatform.isLinux, libpulseaudio, - quazip, udevCheckHook, + wayland-protocols, }: -stdenv.mkDerivation rec { - version = "0.6.2"; +stdenv.mkDerivation { + version = "0.6.2-unstable-2025-09-25"; pname = "ckb-next"; src = fetchFromGitHub { owner = "ckb-next"; repo = "ckb-next"; - rev = "v${version}"; - hash = "sha256-lA1FpUee2SpUQwJotbYhG0QX7LT5l2PP9lJ9F3uNtdU="; + rev = "4bf942dba5e73c2778ef797b6b8dd6b0239aca9a"; + hash = "sha256-sKgA1LZXZ64OixhbBWYUyCN4y29DRG0O0b/bAMd1I8M="; }; buildInputs = [ udev - qtbase + qt6.qtbase zlib libXdmcp - qttools - qtx11extras - libdbusmenu - quazip + qt6.qttools + qt6Packages.quazip + qt6.qtwayland + wayland-protocols ] ++ lib.optional withPulseaudio libpulseaudio; nativeBuildInputs = [ - wrapQtAppsHook + qt6.wrapQtAppsHook pkg-config cmake udevCheckHook diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json index e681227b1d7e..5317603933df 100644 --- a/pkgs/by-name/cl/claude-code/package-lock.json +++ b/pkgs/by-name/cl/claude-code/package-lock.json @@ -1,12 +1,12 @@ { "name": "@anthropic-ai/claude-code", - "version": "2.1.7", + "version": "2.1.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@anthropic-ai/claude-code", - "version": "2.1.7", + "version": "2.1.9", "license": "SEE LICENSE IN README.md", "bin": { "claude": "cli.js" diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 074e7b75e78a..6f8272aab60f 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -15,14 +15,14 @@ }: buildNpmPackage (finalAttrs: { pname = "claude-code"; - version = "2.1.7"; + version = "2.1.9"; src = fetchzip { url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz"; - hash = "sha256-s/XPemwJYPUNFBgWo00VQ6W6eFIy44y9lFoRN0Duk9I="; + hash = "sha256-TU+54QVtcFaUErv8YB0NxmgP+0eUqa2JEjAVRHKPICs="; }; - npmDepsHash = "sha256-BW3mW3fRXrv+TgW3q+Rc43o0q3t1ra/XUqlUSiA0hTU="; + npmDepsHash = "sha256-yZ5hFIqdKh6VYPGtdIaUq7CW9mnCyeFflr02laU8K0A="; strictDeps = true; diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix index 59097f80307d..ac86d39e181c 100644 --- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix +++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "cloudflare-dynamic-dns"; - version = "4.3.17"; + version = "4.4.1"; src = fetchFromGitHub { owner = "zebradil"; repo = "cloudflare-dynamic-dns"; tag = version; - hash = "sha256-3almGQI4mS2JYJG3WrnCSm7ZgTwcSCOL9njau6peido="; + hash = "sha256-G3msehvCZPm5WZTVCN0NnVEApZBQtqxJKCt0SFWb6xk="; }; - vendorHash = "sha256-dag6xFkf6F7lkgadsXmbMyZJ6KI0qvx9M1hF3cfyhZo="; + vendorHash = "sha256-Zdr6XTcblCi+YGhAgo0VqyN25jTGC5yA6YpQJXBCPGc="; subPackages = "."; diff --git a/pkgs/by-name/cn/cns11643-kai/package.nix b/pkgs/by-name/cn/cns11643-kai/package.nix index 04befdc176fd..bc63e2314301 100644 --- a/pkgs/by-name/cn/cns11643-kai/package.nix +++ b/pkgs/by-name/cn/cns11643-kai/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "rypervenche"; repo = "cns11643-fonts"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-A/4iwNvyzOYEpBzxKeq1xM/6aU6EOCATAr0lQlyckKQ="; }; diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 676ebd24e259..bb4756167fe9 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "12.17.0"; + version = "12.18.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${version}"; - hash = "sha256-tuFdhaFp2gpMm8RzOs502TVy89btlpqklSW2OweREOA="; + hash = "sha256-U3nCL87fdlLkZLnRmJizGyQVGc7xCja2+hRLFGWkSUk="; }; proxyVendor = true; - vendorHash = "sha256-Q09fQoBrTMbnT0Edvue7/8hwAZQQdAJBjQ+9V/HFvY4="; + vendorHash = "sha256-HwlJq48wC/c8VeUQFSH/bBVZiSq2fH9E/JXfaHjSYIM="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix index 80cb8625bab2..687f839e3d81 100644 --- a/pkgs/by-name/co/coconutbattery/package.nix +++ b/pkgs/by-name/co/coconutbattery/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "coconutbattery"; - version = "4.0.4,166"; + version = "4.2.0,192"; src = fetchzip { url = "https://coconut-flavour.com/downloads/coconutBattery_${ lib.replaceStrings [ "." "," ] [ "" "_" ] finalAttrs.version }.zip"; - hash = "sha256-ZbxO6pR752pjaBocA/wqyjPCZaUxV051MaHz1gqQjSg="; + hash = "sha256-pzfg+RAlCbEaBHiU/ZQcBf0Tg0BCfs0UHh62dFQVbz0="; }; installPhase = '' diff --git a/pkgs/by-name/co/codd/package.nix b/pkgs/by-name/co/codd/package.nix index e76ec150994e..a46f90429f8d 100644 --- a/pkgs/by-name/co/codd/package.nix +++ b/pkgs/by-name/co/codd/package.nix @@ -24,7 +24,7 @@ let src = fetchFromGitHub { owner = "mzabani"; repo = "codd"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-KdZCL09TERy/PolQyYYykEbPtG5yhxrLZSSo9n6p2WE="; }; diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 0f71c6b921ce..7f11746e2d98 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "2.3.29", + "version": "2.3.35", "vscodeVersion": "1.105.1", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/linux/x64/Cursor-2.3.29-x86_64.AppImage", - "hash": "sha256-uWgUCXo0MHNyiigiymr0LoMoATePp0dksI7JyR/5bRY=" + "url": "https://downloads.cursor.com/production/cf8353edc265f5e46b798bfb276861d0bf3bf129/linux/x64/Cursor-2.3.35-x86_64.AppImage", + "hash": "sha256-o/NIEtSOlUl67g18mWDG4M0thPA4VIfiWudv0Xiov08=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/linux/arm64/Cursor-2.3.29-aarch64.AppImage", - "hash": "sha256-/oUz5wNRtPKYkEIKpHhcjWZNAAhTMvNdJLm+sXE9pDg=" + "url": "https://downloads.cursor.com/production/cf8353edc265f5e46b798bfb276861d0bf3bf129/linux/arm64/Cursor-2.3.35-aarch64.AppImage", + "hash": "sha256-2l9ppSze2nkvAfszblkhMSl+QhGENNe62AlgCcXBhfM=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-A93Glr2bOL6zSu0XTgNj0Pmt6G2ufRgf4lPJ0xcGhow=" + "url": "https://downloads.cursor.com/production/cf8353edc265f5e46b798bfb276861d0bf3bf129/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-Jl6t4oHC6nqOGDKUvvfViPgKJzpG2vpvht4JMBLHzVk=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/4ca9b38c6c97d4243bf0c61e51426667cb964bdc/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-cp/aTNapbwRXxdUU0fWs3HliV7rCmT/2CbNXqZPMpEs=" + "url": "https://downloads.cursor.com/production/cf8353edc265f5e46b798bfb276861d0bf3bf129/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-ZHxvA+iDluib9PLl5ilthdd0Z+xT+w9OSD25vySc9wI=" } } } diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 667cc718bf84..23cee1899d55 100644 --- a/pkgs/by-name/co/codebuff/package-lock.json +++ b/pkgs/by-name/co/codebuff/package-lock.json @@ -5,7 +5,7 @@ "packages": { "": { "dependencies": { - "codebuff": "^1.0.565" + "codebuff": "^1.0.581" } }, "node_modules/chownr": { @@ -18,9 +18,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.565", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.565.tgz", - "integrity": "sha512-tYuW8FZ+vxsZOo4ZE1p87p6z0dDGqshCV0H3nE2WU8uv1DESb4HdhVQOioiFLOhyCM4iRx06gQwphUHxKyLZ6Q==", + "version": "1.0.581", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.581.tgz", + "integrity": "sha512-3lMaeo/TqALXwPWwPvwaIGaVlJcz7cXisEvEGqG4qjOUIFPd+mpiZBw1nF64U67fSxkjvll1/JNKk/mZTEAVng==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index 6061482feed9..d6411c2e88ed 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,14 +6,14 @@ buildNpmPackage rec { pname = "codebuff"; - version = "1.0.565"; + version = "1.0.581"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz"; - hash = "sha256-d27TTkr5pgo0m4CeLtOlcO5FimlJwp0D9TXQHXW7vYc="; + hash = "sha256-A5sEqkw9nm9ijyq7FT0vVNegbDl1LXQHI62dfdP/0WI="; }; - npmDepsHash = "sha256-TJd+0gXQIrXuqFaYO4OAHtZc2Cm6cOt9DtO/QAH3ZYc="; + npmDepsHash = "sha256-CEoacNXow99r4i9cF2BUA5dNcgU1dCBc4dq0n0p7CBU="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 814c15dbbe35..c972582b243c 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,18 +14,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.84.0"; + version = "0.86.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-vaIloTD994jbGSEiU1NbVpIiWZCV/Rj0NjOvbD7smgU="; + hash = "sha256-sypqDp67nMnxSmdUs2W8TCmfe2Ye9jO3vXLOpNeqjlI="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-wCLngmqsIPT1ZEipP+cwBysCGaoZNpfIA0gfxcHNmBo="; + cargoHash = "sha256-Ryr5mFc+StT1d+jBtRsrOzMtyEJf7W1HbMbnC84ps4s="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/co/coloquinte/package.nix b/pkgs/by-name/co/coloquinte/package.nix index f711e84a80bb..a4fa5e081480 100644 --- a/pkgs/by-name/co/coloquinte/package.nix +++ b/pkgs/by-name/co/coloquinte/package.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Coloquinte/PlaceRoute"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.coloquinte ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/co/commitlint-rs/package.nix b/pkgs/by-name/co/commitlint-rs/package.nix index 91620d2baa2d..1908dc3f0a58 100644 --- a/pkgs/by-name/co/commitlint-rs/package.nix +++ b/pkgs/by-name/co/commitlint-rs/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "KeisukeYamashita"; repo = "commitlint-rs"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-rNCMvIVJ/aOTNMyAmwX3Ir6IjHf6wxZ1XlGIWp7omkQ="; }; diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix index b88d3413931d..8ba5d924072b 100644 --- a/pkgs/by-name/co/complgen/package.nix +++ b/pkgs/by-name/co/complgen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "complgen"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; tag = "v${finalAttrs.version}"; - hash = "sha256-fmnnRG3Vj7oFNJTsnK6KeFnimR9bJ0QDvrJI1Dg6V00="; + hash = "sha256-GUI18RFVIBUu3DA6oVs1BWcsxGzctA68z8PamqJ5aus="; }; - cargoHash = "sha256-zueRWnIiANtlZvOwdh22zXumq4Bmq0/FN6vTU5w/XDk="; + cargoHash = "sha256-XbrWp1+z7VTD4ggh9+tG3fqXWOD1nYSeNzViHqmOmWg="; meta = { changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/co/conduktor-ctl/package.nix b/pkgs/by-name/co/conduktor-ctl/package.nix index f3ffa28fac7a..251b1cf456e3 100644 --- a/pkgs/by-name/co/conduktor-ctl/package.nix +++ b/pkgs/by-name/co/conduktor-ctl/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "conduktor"; repo = "ctl"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-zaguB4LLkzXlMQCEVOWkUUsEovU53F0B51w3BnVjre8="; }; diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index 37d6a1241ae7..351399c2e889 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.408.0"; + version = "1.410.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-sO6ea8SV3/7V0wgotEp7eLs5BUjQlFxBgOdWF1aoHuY="; + hash = "sha256-pReUH/0PZ8q2z+rQScl/fcL1HIFnjH244hr6PjhX6JY="; stripRoot = false; }; diff --git a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix index eb84f453f638..2aafef8ee74a 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-caffeine"; - version = "0-unstable-2025-11-04"; + version = "0-unstable-2026-01-11"; src = fetchFromGitHub { owner = "tropicbliss"; repo = "cosmic-ext-applet-caffeine"; - rev = "1a4ab86d1db1ef294b2cfb24a07f068da0f715ae"; - hash = "sha256-8bu9a7CNAtxXV7VKw232ZwgMGOLwvPKVXWoVtX7RKKc="; + rev = "f101f568c5e6bd5c1acbd1f32a09026898cd5a4c"; + hash = "sha256-tnuNOuTUdwGnS3mIHs5K4ByA6C9uymDTqYDwevJVNFw="; }; cargoHash = "sha256-9EUrO8JNU0FPrqT6WDE+jfVgQSgODK8rbNZLgUb26EQ="; diff --git a/pkgs/by-name/cr/create-dmg/package.nix b/pkgs/by-name/cr/create-dmg/package.nix index c1a242369c70..fa99835492da 100644 --- a/pkgs/by-name/cr/create-dmg/package.nix +++ b/pkgs/by-name/cr/create-dmg/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "create-dmg"; repo = "create-dmg"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-oWrQT9nuFcJRwwXd5q4IqhG7M77aaazBG0+JSHAzPvw="; }; diff --git a/pkgs/by-name/cs/cspell/package.nix b/pkgs/by-name/cs/cspell/package.nix index ebb03da16512..9c3d48952cc3 100644 --- a/pkgs/by-name/cs/cspell/package.nix +++ b/pkgs/by-name/cs/cspell/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cspell"; - version = "9.5.0"; + version = "9.6.0"; src = fetchFromGitHub { owner = "streetsidesoftware"; repo = "cspell"; tag = "v${finalAttrs.version}"; - hash = "sha256-O8CwJZfFSKmPP8tE5KcpW1bC3kUKjjjHS7QAKBc79qc="; + hash = "sha256-S5E51eNiF78TLQeL9aztC/YyhGZ0RvPZVVHtUWL9z/Y="; }; pnpmWorkspaces = [ "cspell..." ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-DBCwysotJBsM8GYro2NTwMe+t29zooX8yAr1FyPR3Ek="; + hash = "sha256-6Mf0aCUIBYrMZVF0Jp8GCDnj5PhGSde+QS67lKzCV1c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/da/davix/package.nix b/pkgs/by-name/da/davix/package.nix index 2e1b357a6c58..913ea4ae55e8 100644 --- a/pkgs/by-name/da/davix/package.nix +++ b/pkgs/by-name/da/davix/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "cern-fts"; repo = "davix"; - rev = "refs/tags/R_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}"; hash = "sha256-n4NeHBgQwGwgHAFQzPc3oEP9k3F/sqrTmkI/zHW+Miw="; }; diff --git a/pkgs/by-name/da/davs2/package.nix b/pkgs/by-name/da/davs2/package.nix index 80cba69d12f0..40bf44c78238 100644 --- a/pkgs/by-name/da/davs2/package.nix +++ b/pkgs/by-name/da/davs2/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "pkuvcl"; repo = "davs2"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-SUY3arrVsFecMcbpmQP0+4rtcSRfQc6pzxZDcEuMWPU="; }; diff --git a/pkgs/by-name/de/debootstrap/package.nix b/pkgs/by-name/de/debootstrap/package.nix index c88618290d3c..c825db3b1f70 100644 --- a/pkgs/by-name/de/debootstrap/package.nix +++ b/pkgs/by-name/de/debootstrap/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "installer-team"; repo = "debootstrap"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-4vINaMRo6IrZ6e2/DAJ06ODy2BWm4COR1JDSY52upUc="; }; diff --git a/pkgs/by-name/de/defuddle-cli/package.nix b/pkgs/by-name/de/defuddle-cli/package.nix index 871042e46e55..85bbbb4b2c24 100644 --- a/pkgs/by-name/de/defuddle-cli/package.nix +++ b/pkgs/by-name/de/defuddle-cli/package.nix @@ -12,7 +12,7 @@ buildNpmPackage rec { src = fetchFromGitHub { owner = "kepano"; repo = "defuddle-cli"; - tag = "${version}"; + tag = version; hash = "sha256-28XmpFKzBKNhRkPOGaacJVw8hjQUZq2nwuR0vNo8aW0="; }; diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index d9613f18ee6b..300b45e0cfb0 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -120,7 +120,10 @@ maven.buildMavenPackage rec { description = "Intelligent Component Analysis platform that allows organizations to identify and reduce risk in the software supply chain"; homepage = "https://github.com/DependencyTrack/dependency-track"; license = lib.licenses.asl20; - teams = [ lib.teams.cyberus ]; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; mainProgram = "dependency-track"; inherit (jre_headless.meta) platforms; }; diff --git a/pkgs/by-name/de/deterministic-zip/package.nix b/pkgs/by-name/de/deterministic-zip/package.nix index 601d99c494b0..3b530637a936 100644 --- a/pkgs/by-name/de/deterministic-zip/package.nix +++ b/pkgs/by-name/de/deterministic-zip/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "timo-reymann"; repo = "deterministic-zip"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-rvheo/DkQTfpVy8fVRRwRA4G9mdMNArptxNT0sxdqnc="; }; diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix index 9e86043a6282..9ba1f3c84f90 100644 --- a/pkgs/by-name/de/devcontainer/package.nix +++ b/pkgs/by-name/de/devcontainer/package.nix @@ -19,18 +19,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "devcontainer"; - version = "0.80.1"; + version = "0.81.1"; src = fetchFromGitHub { owner = "devcontainers"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-riDe8j/DCSuXpuFi27tmT5KjruuJiCrUeP022V4sYjU="; + hash = "sha256-sMhCYDhQfyuzIuGR3eaf713gkUGfrj6b3Ldt4W3KdUw="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-joctNMzQXC/A9A69sJkKbED9pqMcbK1ZYiHPdJBJKCE="; + hash = "sha256-E+IbJjj7/iVUkGVKJMpoYMYiRXlwOLsxXAGNmdG5tBM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/diffnav/package.nix b/pkgs/by-name/di/diffnav/package.nix index 36ba8ee60758..c2f7989ec58a 100644 --- a/pkgs/by-name/di/diffnav/package.nix +++ b/pkgs/by-name/di/diffnav/package.nix @@ -13,7 +13,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "dlvhdr"; repo = "diffnav"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QDPH7vBoA4YCmC+CLmeBdspwOhFEV3iSiyBYX6lwOLA="; }; diff --git a/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix b/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix index ab5a20d74ee8..b5644f536fab 100644 --- a/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix +++ b/pkgs/by-name/do/dovecot-fts-flatcurve/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "slusarz"; repo = "dovecot-fts-flatcurve"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-96sR/pl0G0sSjh/YrXdgVgASJPhrL32xHCbBGrDxzoU="; }; diff --git a/pkgs/by-name/ec/ecwolf/package.nix b/pkgs/by-name/ec/ecwolf/package.nix index 25c6cb40a177..f0f4021405ba 100644 --- a/pkgs/by-name/ec/ecwolf/package.nix +++ b/pkgs/by-name/ec/ecwolf/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromBitbucket { owner = "ecwolf"; repo = "ecwolf"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-T5K6B2fWMKMLB/662p/YLEv0Od9n0vUakznyoOnr0kI="; }; diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix index e4b777e34ead..5c2cee48db3b 100644 --- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix +++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix @@ -2,6 +2,6 @@ "version" = "1.12.7"; "hashes" = { "desktopSrcHash" = "sha256-VnZyNrylYbKhd9YyuoUSJWbTEphOsTivbbYIUeEZv2U="; - "desktopYarnHash" = "sha256-SAIoJRX06oE4j2Gjb/0MSiUa0UGYkQmuyuV90VRbFtk="; + "desktopYarnHash" = "sha256-Gnd/ouRI/OxFwsvR5arfi/FcGld3XjtW9tzuwyX8IRg="; }; } diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 28b3c267ba46..cd992a4489b1 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -4,24 +4,27 @@ fetchFromGitHub, makeWrapper, makeDesktopItem, - yarn, nodejs, - jq, - electron_38, + electron_39, element-web, sqlcipher, callPackage, - desktopToDarwinBundle, typescript, # command line arguments which are always set commandLineArgs ? "", + yarnConfigHook, + yarnBuildHook, + fetchYarnDeps, + asar, + copyDesktopItems, + darwin, }: let pinData = import ./element-desktop-pin.nix; inherit (pinData.hashes) desktopSrcHash desktopYarnHash; executableName = "element-desktop"; - electron = electron_38; + electron = electron_39; seshat = callPackage ./seshat { }; in stdenv.mkDerivation ( @@ -37,24 +40,25 @@ stdenv.mkDerivation ( hash = desktopSrcHash; }; - # TODO: fetchYarnDeps currently does not deal properly with a dependency - # declared as a pin to a commit in a specific git repository. - # While it does download everything correctly, `yarn install --offline` - # always wants to `git ls-remote` to the repository, ignoring the local - # cached tarball. - offlineCache = callPackage ./yarn.nix { - inherit (finalAttrs) version src; + offlineCache = fetchYarnDeps { + yarnLock = finalAttrs.src + "/yarn.lock"; hash = desktopYarnHash; }; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + nativeBuildInputs = [ + asar + copyDesktopItems nodejs makeWrapper - jq - yarn typescript + yarnConfigHook + yarnBuildHook ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.autoSignDarwinBinariesHook + ]; inherit seshat; @@ -63,90 +67,101 @@ stdenv.mkDerivation ( # this shouldn't be in the closure just for unused scripts. dontPatchShebangs = true; - configurePhase = '' - runHook preConfigure + postPatch = '' + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist - mkdir -p node_modules/ - cp -r $offlineCache/node_modules/* node_modules/ - substituteInPlace package.json --replace-fail "tsx " "node node_modules/tsx/dist/cli.mjs " + substituteInPlace package.json \ + --replace-fail \ + ' electron-builder",' \ + ' electron-builder --dir -c.electronDist=electron-dist -c.electronVersion=${electron.version} -c.mac.identity=null",' - runHook postConfigure + # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead + substituteInPlace ./electron-builder.ts \ + --replace-fail "resetAdHocDarwinSignature:" "// resetAdHocDarwinSignature:" + + # Need to disable asar integrity check to copy in native seshat files, see postBuild phase + substituteInPlace ./electron-builder.ts \ + --replace-fail "enableEmbeddedAsarIntegrityValidation: true" "enableEmbeddedAsarIntegrityValidation: false" ''; - # Workaround for darwin sandbox build failure: "Error: listen EPERM: operation not permitted ..tsx..." - preBuild = lib.optionalString stdenv.hostPlatform.isDarwin '' - export TMPDIR="$(mktemp -d)" + preBuild = '' + # Apply upstream patch + # Can be removed if upstream removes patches/@types+auto-launch+5.0.5.patch introduced in + # https://github.com/element-hq/element-desktop/commit/5e882f8e08d58bf9663c8e3ab33885bf7b3709de + node ./node_modules/patch-package/index.js ''; - buildPhase = '' - runHook preBuild + postBuild = '' + # relative path to app.asar differs on Linux and MacOS + packed=$(find ./dist -name app.asar) + asar extract "$packed" tmp-app - yarn --offline run build:ts - node node_modules/matrix-web-i18n/scripts/gen-i18n.js - yarn --offline run i18n:sort - yarn --offline run build:res + # linking here leads to Error: tmp-app/node_modules/matrix-seshat: file ... links out of the package + cp -r $seshat tmp-app/node_modules/matrix-seshat - ln -s $seshat node_modules/matrix-seshat - - runHook postBuild + asar pack tmp-app "$packed" ''; installPhase = '' runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" "$out/bin" + mv dist/mac*/Element.app "$out/Applications" + + ln -s '${element-web}' "$out/Applications/Element.app/Contents/Resources/webapp" + + wrapProgram "$out/Applications/Element.app/Contents/MacOS/Element" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + + makeWrapper "$out/Applications/Element.app/Contents/MacOS/Element" "$out/bin/${executableName}" + '' + + lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + mkdir -p "$out/bin" "$out/share" + + cp -a dist/*-unpacked/resources $out/share/element - # resources - mkdir -p "$out/share/element" ln -s '${element-web}' "$out/share/element/webapp" - cp -r '.' "$out/share/element/electron" - chmod -R "a+w" "$out/share/element/electron/node_modules" - rm -rf "$out/share/element/electron/node_modules" - cp -r './node_modules' "$out/share/element/electron" - cp $out/share/element/electron/lib/i18n/strings/en_EN.json $out/share/element/electron/lib/i18n/strings/en-us.json - ln -s $out/share/element/electron/lib/i18n/strings/en{-us,}.json - # icon + # icon, used in makeDesktopItem mkdir -p "$out/share/icons/hicolor/512x512/apps" - ln -s "$out/share/element/electron/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png" - - # desktop item - mkdir -p "$out/share" - ln -s "${finalAttrs.desktopItem}/share/applications" "$out/share/applications" + ln -s "$out/share/element/build/icon.png" "$out/share/icons/hicolor/512x512/apps/element.png" # executable wrapper # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 - makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ + makeWrapper '${lib.getExe electron}' "$out/bin/${executableName}" \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ - --add-flags "$out/share/element/electron" \ + --add-flags "$out/share/element/app.asar" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} - + '' + + '' runHook postInstall ''; # The desktop item properties should be kept in sync with data from upstream: # https://github.com/element-hq/element-desktop/blob/develop/package.json - desktopItem = makeDesktopItem { - name = "element-desktop"; - exec = "${executableName} %u"; - icon = "element"; - desktopName = "Element"; - genericName = "Matrix Client"; - comment = finalAttrs.meta.description; - categories = [ - "Network" - "InstantMessaging" - "Chat" - ]; - startupWMClass = "Element"; - mimeTypes = [ - "x-scheme-handler/element" - "x-scheme-handler/io.element.desktop" - ]; - }; - - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - cp build/icon.icns $out/Applications/Element.app/Contents/Resources/element.icns - ''; + desktopItems = [ + (makeDesktopItem { + name = "element-desktop"; + exec = "${executableName} %u"; + icon = "element"; + desktopName = "Element"; + genericName = "Matrix Client"; + comment = finalAttrs.meta.description; + categories = [ + "Network" + "InstantMessaging" + "Chat" + ]; + startupWMClass = "Element"; + mimeTypes = [ + "x-scheme-handler/element" + "x-scheme-handler/io.element.desktop" + ]; + }) + ]; passthru = { # run with: nix-shell ./maintainers/scripts/update.nix --argstr package element-desktop @@ -157,7 +172,7 @@ stdenv.mkDerivation ( description = "Feature-rich client for Matrix.org"; homepage = "https://element.io/"; changelog = "https://github.com/element-hq/element-desktop/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = lib.licenses.asl20; + license = lib.licenses.agpl3Plus; teams = [ lib.teams.matrix ]; platforms = electron.meta.platforms ++ lib.platforms.darwin; mainProgram = "element-desktop"; diff --git a/pkgs/by-name/el/element-desktop/yarn.nix b/pkgs/by-name/el/element-desktop/yarn.nix deleted file mode 100644 index df839ddbc981..000000000000 --- a/pkgs/by-name/el/element-desktop/yarn.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - stdenvNoCC, - nodejs, - yarn, - cacert, - git, - version, - src, - hash, -}: -stdenvNoCC.mkDerivation { - pname = "element-desktop-yarn-deps"; - inherit version src; - - nativeBuildInputs = [ - cacert - nodejs - yarn - git - ]; - - dontInstall = true; - - NODE_EXTRA_CA_CERTS = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - - buildPhase = '' - export HOME=$(mktemp -d) - export YARN_ENABLE_TELEMETRY=0 - - yarn install --frozen-lockfile --ignore-platform --skip-integrity-check --ignore-scripts --no-progress --non-interactive - # Apply upstream patch - # Can be removed if upstream removes patches/@types+auto-launch+5.0.5.patch introduced in - # https://github.com/element-hq/element-desktop/commit/5e882f8e08d58bf9663c8e3ab33885bf7b3709de - node ./node_modules/patch-package/index.js - - mkdir -p $out/node_modules - cp -r node_modules/* $out/node_modules/ - ''; - - dontPatchShebangs = true; - - outputHash = hash; - outputHashMode = "recursive"; - outputHashAlgo = "sha256"; -} diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index 850a5217a91e..0da4b2771eae 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation ( homepage = "https://element.io/"; changelog = "https://github.com/element-hq/element-web/blob/v${finalAttrs.version}/CHANGELOG.md"; teams = [ lib.teams.matrix ]; - license = lib.licenses.asl20; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/en/enpass-cli/package.nix b/pkgs/by-name/en/enpass-cli/package.nix index 4b973979fff9..275044e85ca4 100644 --- a/pkgs/by-name/en/enpass-cli/package.nix +++ b/pkgs/by-name/en/enpass-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "enpass-cli"; - version = "1.6.5"; + version = "1.7.0"; src = fetchFromGitHub { owner = "HazCod"; repo = "enpass-cli"; tag = "v${version}"; - hash = "sha256-13AhK0qDDANEgicggy1Sdlmo5b0Vlf2sEDzJerhUvG8="; + hash = "sha256-SloFiV+tmdjiHjeS/SsDMLZ9gjNB/EOmgexMXpu253I="; }; - vendorHash = "sha256-7K7gdMjJ4cfv6xmuI73U+oW9JlmdN6wGg8vMcD/YThQ="; + vendorHash = "sha256-S02hHPA7WSAMLELhfD+2cmsbhxsCiXdPbikU/GGubPc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/en/entangle/package.nix b/pkgs/by-name/en/entangle/package.nix index 9ab3e2973b29..418ced9fd5ce 100644 --- a/pkgs/by-name/en/entangle/package.nix +++ b/pkgs/by-name/en/entangle/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "entangle"; repo = "entangle"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; sha256 = "hz2WSDOjriQSavFlDT+35x1X5MeInq80ZrSP1WR/td0="; }; diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix index a7addc3a02e5..ec8b144b022b 100644 --- a/pkgs/by-name/eq/equicord/package.nix +++ b/pkgs/by-name/eq/equicord/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Equicord"; repo = "Equicord"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ce5n7E+eJLPnj/dUnaaDi4R8kKO4+iOcQgdtOin4NcM="; }; diff --git a/pkgs/by-name/er/ersatztv/nuget-deps.json b/pkgs/by-name/er/ersatztv/nuget-deps.json index 84491619138b..e4c862ee5b5f 100644 --- a/pkgs/by-name/er/ersatztv/nuget-deps.json +++ b/pkgs/by-name/er/ersatztv/nuget-deps.json @@ -309,11 +309,6 @@ "version": "5.0.0", "hash": "sha256-THQ8Z7DAoMDEqAS7feAmAt82NvU7H90Y+jYwC7NwL+0=" }, - { - "pname": "Microsoft.AspNetCore.App.Internal.Assets", - "version": "10.0.2", - "hash": "sha256-nh+JRXHTI01RUDFeEw4yep4iMxci5R7zKyRX2Tkd/mc=" - }, { "pname": "Microsoft.AspNetCore.Authentication.JwtBearer", "version": "10.0.1", diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 4ab7fdb6c3da..4ca493db7b3a 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "esphome"; repo = "dashboard"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-PZf9YLtHqeR+5BRVv1yOMVt6NVlbJTj98ukGnO0RV0Q="; }; diff --git a/pkgs/by-name/et/ethercat/package.nix b/pkgs/by-name/et/ethercat/package.nix index 6fd844ff4e22..197180f5639c 100644 --- a/pkgs/by-name/et/ethercat/package.nix +++ b/pkgs/by-name/et/ethercat/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "etherlab.org"; repo = "ethercat"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-yIlaAjPNcA7yIiCe+2kwk5IHIkwUv8bTxK0H3hu91MI="; }; diff --git a/pkgs/by-name/ez/eztrace/package.nix b/pkgs/by-name/ez/eztrace/package.nix index 6c5a82dde4a1..68017979200c 100644 --- a/pkgs/by-name/ez/eztrace/package.nix +++ b/pkgs/by-name/ez/eztrace/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "eztrace"; repo = "eztrace"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ccW4YjEf++tkdIJLze2x8B/SWbBBXnYt8UV9OH8+KGU="; }; diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index 1b3ad6ae64de..0959b2fc0ec5 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "filebeat"; - version = "8.19.9"; + version = "8.19.10"; src = fetchFromGitHub { owner = "elastic"; repo = "beats"; tag = "v${version}"; - hash = "sha256-ysxy4kMUvIYDoWjDF9gwXByAwdCh0Taw3JFCxh9j/Gk="; + hash = "sha256-Ky1oWqQXIjno14ZBfxR1FoXEkSn1kScdQQTyGDRvMTo="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-WvJwFmnT7m4757yMKhuj3RS/NuzkoH9zlda94OpoYNg="; + vendorHash = "sha256-b4W10tGAoxW1oAfmQqM8x0JOi0BD1WBYB2sUVl/hLHY="; subPackages = [ "filebeat" ]; diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index ff83bd43eea0..5e77bd64c0a6 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.15.178"; + version = "2.15.191"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-03dADzK1LgD3IqYdDqUtZO1yOIya85cefA1cd0/70qQ="; + hash = "sha256-jObw+/lHjk7pm/RNsgeXBfQkK2lBrjCc1LlpM3re82M="; }; - vendorHash = "sha256-5ONoYzrULR2Z3x/EPwkBgxOm78XBdlCosWSKhZYlKco="; + vendorHash = "sha256-BRiLBXHeSFvzCi7i9kmXfuHjtorG72IIcUz3z3thg+8="; ldflags = [ "-s" diff --git a/pkgs/by-name/fl/fladder/package.nix b/pkgs/by-name/fl/fladder/package.nix new file mode 100644 index 000000000000..9a9f0b224a06 --- /dev/null +++ b/pkgs/by-name/fl/fladder/package.nix @@ -0,0 +1,77 @@ +{ + lib, + fetchFromGitHub, + flutter335, + + alsa-lib, + libdisplay-info, + libXpresent, + libXScrnSaver, + libepoxy, + mpv-unwrapped, + + targetFlutterPlatform ? "web", + baseUrl ? null, +}: + +let + flutter = flutter335; + + media_kit_hash = "sha256-oJQ9sRQI4HpAIzoS995yfnzvx5ZzIubVANzbmxTt6LE="; +in + +flutter.buildFlutterApplication rec { + pname = "fladder"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "DonutWare"; + repo = "Fladder"; + tag = "v${version}"; + hash = "sha256-IX3qbIgfi9d8rP24yIGlBzi5l28YQWnvLD+dD+7uIZc="; + }; + + inherit targetFlutterPlatform; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = { + media_kit = media_kit_hash; + media_kit_video = media_kit_hash; + media_kit_libs_linux = media_kit_hash; + media_kit_libs_video = media_kit_hash; + media_kit_libs_android_video = media_kit_hash; + media_kit_libs_ios_video = media_kit_hash; + media_kit_libs_macos_video = media_kit_hash; + media_kit_libs_windows_video = media_kit_hash; + }; + + buildInputs = [ + alsa-lib + libdisplay-info + mpv-unwrapped + libXpresent + libXScrnSaver + ] + ++ lib.optionals (targetFlutterPlatform == "linux") [ + libepoxy + ]; + + postInstall = lib.optionalString (targetFlutterPlatform == "web") ( + '' + sed -i 's;base href="/";base href="$out";' $out/index.html + '' + + lib.optionalString (baseUrl != null) '' + echo '{"baseUrl": "${baseUrl}"}' > $out/assets/config/config.json + '' + ); + + meta = { + description = "Simple Jellyfin Frontend built on top of Flutter"; + homepage = "https://github.com/DonutWare/Fladder"; + downloadPage = "https://github.com/DonutWare/Fladder/releases"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ratcornu ]; + mainProgram = "Fladder"; + }; +} diff --git a/pkgs/by-name/fl/fladder/pubspec.lock.json b/pkgs/by-name/fl/fladder/pubspec.lock.json new file mode 100644 index 000000000000..1dc80e0cea52 --- /dev/null +++ b/pkgs/by-name/fl/fladder/pubspec.lock.json @@ -0,0 +1,3016 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "85.0.0" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.6.0" + }, + "analyzer_plugin": { + "dependency": "transitive", + "description": { + "name": "analyzer_plugin", + "sha256": "a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.4" + }, + "animations": { + "dependency": "direct main", + "description": { + "name": "animations", + "sha256": "18938cefd7dcc04e1ecac0db78973761a01e4bc2d6bfae0cfa596bfeac9e96ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "ansicolor": { + "dependency": "transitive", + "description": { + "name": "ansicolor", + "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "archive": { + "dependency": "direct main", + "description": { + "name": "archive", + "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.7" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "direct main", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "audio_service": { + "dependency": "direct main", + "description": { + "name": "audio_service", + "sha256": "cb122c7c2639d2a992421ef96b67948ad88c5221da3365ccef1031393a76e044", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.18.18" + }, + "audio_service_platform_interface": { + "dependency": "transitive", + "description": { + "name": "audio_service_platform_interface", + "sha256": "6283782851f6c8b501b60904a32fc7199dc631172da0629d7301e66f672ab777", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "audio_service_web": { + "dependency": "transitive", + "description": { + "name": "audio_service_web", + "sha256": "b8ea9243201ee53383157fbccf13d5d2a866b5dda922ec19d866d1d5d70424df", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.4" + }, + "audio_session": { + "dependency": "transitive", + "description": { + "name": "audio_session", + "sha256": "8f96a7fecbb718cb093070f868b4cdcb8a9b1053dce342ff8ab2fde10eb9afb7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "auto_route": { + "dependency": "direct main", + "description": { + "name": "auto_route", + "sha256": "4916e0fe1cb782e315d0e1ebdd34170f1836a8f6e24cb528083671302b486ace", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.2.2" + }, + "auto_route_generator": { + "dependency": "direct dev", + "description": { + "name": "auto_route_generator", + "sha256": "2a5b5bf9c55d4a2098931037dac90921a4663808aed494bb4f134d82d46cb8ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.2.3" + }, + "automatic_animated_list": { + "dependency": "direct main", + "description": { + "name": "automatic_animated_list", + "sha256": "b119bcde6af33d5c8bd839f9b6d0b6778be90f0ce4b412817bdfcf9f55780645", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "background_downloader": { + "dependency": "direct main", + "description": { + "name": "background_downloader", + "sha256": "a913b37cc47a656a225e9562b69576000d516f705482f392e2663500e6ff6032", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.3.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_cli_annotations": { + "dependency": "transitive", + "description": { + "name": "build_cli_annotations", + "sha256": "e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.0" + }, + "cached_network_image": { + "dependency": "direct main", + "description": { + "name": "cached_network_image", + "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, + "cached_network_image_platform_interface": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_platform_interface", + "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "cached_network_image_web": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_web", + "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "charcode": { + "dependency": "transitive", + "description": { + "name": "charcode", + "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "chewie": { + "dependency": "transitive", + "description": { + "name": "chewie", + "sha256": "44bcfc5f0dfd1de290c87c9d86a61308b3282a70b63435d5557cfd60f54a69ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.13.0" + }, + "chopper": { + "dependency": "direct main", + "description": { + "name": "chopper", + "sha256": "fb6106cd29553e34c811874efd8e8ee051ad7b9546e0d8c79394d2b6c9621b45", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.4.0" + }, + "chopper_generator": { + "dependency": "direct dev", + "description": { + "name": "chopper_generator", + "sha256": "4477b8b79aa0b6e2dd3d581e526782e6997f35c7fa3999b80d36003b1213acf2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.2.0" + }, + "ci": { + "dependency": "transitive", + "description": { + "name": "ci", + "sha256": "145d095ce05cddac4d797a158bc4cf3b6016d1fe63d8c3d2fbd7212590adca13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.0" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "942a4791cd385a68ccb3b32c71c427aba508a1bb949b86dff2adbe4049f16239", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.5" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "custom_lint": { + "dependency": "direct dev", + "description": { + "name": "custom_lint", + "sha256": "9656925637516c5cf0f5da018b33df94025af2088fe09c8ae2ca54c53f2d9a84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "custom_lint_core": { + "dependency": "transitive", + "description": { + "name": "custom_lint_core", + "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.5" + }, + "custom_lint_visitor": { + "dependency": "transitive", + "description": { + "name": "custom_lint_visitor", + "sha256": "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0+7.7.0" + }, + "dart_mappable": { + "dependency": "direct main", + "description": { + "name": "dart_mappable", + "sha256": "0e219930c9f7b9e0f14ae7c1de931c401875110fd5c67975b6b9492a6d3a531b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.6.1" + }, + "dart_mappable_builder": { + "dependency": "direct dev", + "description": { + "name": "dart_mappable_builder", + "sha256": "adea8c55aac73c8254aa14a8272b788eb0f72799dd8e4810a9b664ec9b4e353c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.0" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "db_viewer": { + "dependency": "transitive", + "description": { + "name": "db_viewer", + "sha256": "5f7e3cfcde9663321797d8f6f0c876f7c13f0825a2e77ec1ef065656797144d9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.11" + }, + "decimal": { + "dependency": "transitive", + "description": { + "name": "decimal", + "sha256": "fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.4" + }, + "desktop_drop": { + "dependency": "direct main", + "description": { + "name": "desktop_drop", + "sha256": "927511f590ce01ee90d0d80f79bc71b9c919d8522d01e495e89a00c6f4a4fb5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.1" + }, + "desktop_multi_window": { + "dependency": "direct main", + "description": { + "name": "desktop_multi_window", + "sha256": "60ba38725b8887b60e44d15afdcf0c3813568b5da2ccaf1e7f6fd09a380a6e24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.0" + }, + "diffutil_dart": { + "dependency": "transitive", + "description": { + "name": "diffutil_dart", + "sha256": "e0297e4600b9797edff228ed60f4169a778ea357691ec98408fa3b72994c7d06", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "drift": { + "dependency": "direct main", + "description": { + "name": "drift", + "sha256": "540cf382a3bfa99b76e51514db5b0ebcd81ce3679b7c1c9cb9478ff3735e47a1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.28.2" + }, + "drift_db_viewer": { + "dependency": "direct main", + "description": { + "name": "drift_db_viewer", + "sha256": "5ea77858c52b55460a1e8f34ab5f88324621d486717d876fd745765fbc227f3f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "drift_dev": { + "dependency": "direct dev", + "description": { + "name": "drift_dev", + "sha256": "68c138e884527d2bd61df2ade276c3a144df84d1adeb0ab8f3196b5afe021bd4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.28.0" + }, + "drift_flutter": { + "dependency": "direct main", + "description": { + "name": "drift_flutter", + "sha256": "b7534bf320aac5213259aac120670ba67b63a1fd010505babc436ff86083818f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.7" + }, + "drift_sync": { + "dependency": "direct main", + "description": { + "name": "drift_sync", + "sha256": "f358c39bdfa474c020ddd6022ef91540d30b21ef0faab6be331f1e0349e585e5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.14.0" + }, + "dynamic_color": { + "dependency": "direct main", + "description": { + "name": "dynamic_color", + "sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.8.1" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.7" + }, + "extended_image": { + "dependency": "direct main", + "description": { + "name": "extended_image", + "sha256": "f6cbb1d798f51262ed1a3d93b4f1f2aa0d76128df39af18ecb77fa740f88b2e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.1" + }, + "extended_image_library": { + "dependency": "transitive", + "description": { + "name": "extended_image_library", + "sha256": "1f9a24d3a00c2633891c6a7b5cab2807999eb2d5b597e5133b63f49d113811fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.1" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.3" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "f8f4ea435f791ab1f817b4e338ed958cb3d04ba43d6736ffc39958d950754967", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.3.6" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flexible_scrollbar": { + "dependency": "direct main", + "description": { + "name": "flexible_scrollbar", + "sha256": "f5b808009624c49929b9a9c19c41c36fefeac7d8f36cb84558fd26614158d6e9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_blurhash": { + "dependency": "direct main", + "description": { + "name": "flutter_blurhash", + "sha256": "e97b9aff13b9930bbaa74d0d899fec76e3f320aba3190322dcc5d32104e3d25d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.1" + }, + "flutter_cache_manager": { + "dependency": "direct main", + "description": { + "name": "flutter_cache_manager", + "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, + "flutter_custom_tabs": { + "dependency": "direct main", + "description": { + "name": "flutter_custom_tabs", + "sha256": "ac3543d7b4e0ac6ecdf3744360039ebb573656c0ce759149d228e1934d4f7535", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "flutter_custom_tabs_android": { + "dependency": "transitive", + "description": { + "name": "flutter_custom_tabs_android", + "sha256": "925fc5e7d27372ee523962dcfcd4b77c0443549482c284dd7897b77815547621", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "flutter_custom_tabs_ios": { + "dependency": "transitive", + "description": { + "name": "flutter_custom_tabs_ios", + "sha256": "c61a58d30b29ccb09ea4da0daa335bbf8714bcf8798d0d9f4f58a0b83c6c421b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "flutter_custom_tabs_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_custom_tabs_platform_interface", + "sha256": "54a6ff5cc7571cb266a47ade9f6f89d1980b9ed2dba18162a6d5300afc408449", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "flutter_custom_tabs_web": { + "dependency": "transitive", + "description": { + "name": "flutter_custom_tabs_web", + "sha256": "236e035c73b6d3ef0a2f85cd8b6b815954e7559c9f9d50a15ed2e53a297b58b0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "flutter_highlight": { + "dependency": "transitive", + "description": { + "name": "flutter_highlight", + "sha256": "7b96333867aa07e122e245c033b8ad622e4e3a42a1a2372cbb098a2541d8782c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_keyboard_visibility": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility", + "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_keyboard_visibility_linux": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_linux", + "sha256": "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "flutter_keyboard_visibility_macos": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_macos", + "sha256": "c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "flutter_keyboard_visibility_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_platform_interface", + "sha256": "e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "flutter_keyboard_visibility_web": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_web", + "sha256": "d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "flutter_keyboard_visibility_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_keyboard_visibility_windows", + "sha256": "fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_native_splash": { + "dependency": "direct main", + "description": { + "name": "flutter_native_splash", + "sha256": "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.7" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "306f0596590e077338312f38837f595c04f28d6cdeeac392d3d74df2f0003687", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.32" + }, + "flutter_riverpod": { + "dependency": "direct main", + "description": { + "name": "flutter_riverpod", + "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "flutter_rust_bridge": { + "dependency": "transitive", + "description": { + "name": "flutter_rust_bridge", + "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.1" + }, + "flutter_staggered_grid_view": { + "dependency": "direct main", + "description": { + "name": "flutter_staggered_grid_view", + "sha256": "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_sticky_header": { + "dependency": "direct main", + "description": { + "name": "flutter_sticky_header", + "sha256": "fb4fda6164ef3e5fc7ab73aba34aad253c17b7c6ecf738fa26f1a905b7d2d1e2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.0" + }, + "flutter_svg": { + "dependency": "direct main", + "description": { + "name": "flutter_svg", + "sha256": "055de8921be7b8e8b98a233c7a5ef84b3a6fcc32f46f1ebf5b9bb3576d108355", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.2" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_typeahead": { + "dependency": "direct main", + "description": { + "name": "flutter_typeahead", + "sha256": "d64712c65db240b1057559b952398ebb6e498077baeebf9b0731dade62438a6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.2.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_widget_from_html": { + "dependency": "direct main", + "description": { + "name": "flutter_widget_from_html", + "sha256": "7f1daefcd3009c43c7e7fb37501e6bb752d79aa7bfad0085fb0444da14e89bd0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.1" + }, + "flutter_widget_from_html_core": { + "dependency": "transitive", + "description": { + "name": "flutter_widget_from_html_core", + "sha256": "1120ee6ed3509ceff2d55aa6c6cbc7b6b1291434422de2411b5a59364dd6ff03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.0" + }, + "font_awesome_flutter": { + "dependency": "direct main", + "description": { + "name": "font_awesome_flutter", + "sha256": "b9011df3a1fa02993630b8fb83526368cf2206a711259830325bab2f1d2a4eb0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.12.0" + }, + "freezed": { + "dependency": "direct dev", + "description": { + "name": "freezed", + "sha256": "2d399f823b8849663744d2a9ddcce01c49268fb4170d0442a655bf6a2f47be22", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "freezed_annotation": { + "dependency": "direct main", + "description": { + "name": "freezed_annotation", + "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "fvp": { + "dependency": "direct main", + "description": { + "name": "fvp", + "sha256": "33e34a78d3e4bd3ab87af7279d7bc88ff6025291574edc7e8592abea91e04cb4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.35.0" + }, + "fwfh_cached_network_image": { + "dependency": "transitive", + "description": { + "name": "fwfh_cached_network_image", + "sha256": "484cb5f8047f02cfac0654fca5832bfa91bb715fd7fc651c04eb7454187c4af8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.16.1" + }, + "fwfh_chewie": { + "dependency": "transitive", + "description": { + "name": "fwfh_chewie", + "sha256": "ae74fc26798b0e74f3983f7b851e74c63b9eeb2d3015ecd4b829096b2c3f8818", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.16.1" + }, + "fwfh_just_audio": { + "dependency": "transitive", + "description": { + "name": "fwfh_just_audio", + "sha256": "dfd622a0dfe049ac647423a2a8afa7f057d9b2b93d92710b624e3d370b1ac69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.0" + }, + "fwfh_svg": { + "dependency": "transitive", + "description": { + "name": "fwfh_svg", + "sha256": "2e6bb241179eeeb1a7941e05c8c923b05d332d36a9085233e7bf110ea7deb915", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.16.1" + }, + "fwfh_url_launcher": { + "dependency": "transitive", + "description": { + "name": "fwfh_url_launcher", + "sha256": "c38aa8fb373fda3a89b951fa260b539f623f6edb45eee7874cb8b492471af881", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.16.1" + }, + "fwfh_webview": { + "dependency": "transitive", + "description": { + "name": "fwfh_webview", + "sha256": "f71b0aa16e15d82f3c017f33560201ff5ae04e91e970cab5d12d3bcf970b870c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.6" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "google_identity_services_web": { + "dependency": "transitive", + "description": { + "name": "google_identity_services_web", + "sha256": "5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.3+1" + }, + "googleapis_auth": { + "dependency": "transitive", + "description": { + "name": "googleapis_auth", + "sha256": "b81fe352cc4a330b3710d2b7ad258d9bcef6f909bb759b306bf42973a7d046db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "grpc": { + "dependency": "transitive", + "description": { + "name": "grpc", + "sha256": "807a4da90fc1ba94dccc3a44653d3ff7bcf26818f030259d6a8f9fab405cb880", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.1" + }, + "highlight": { + "dependency": "transitive", + "description": { + "name": "highlight", + "sha256": "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "hotreloader": { + "dependency": "transitive", + "description": { + "name": "hotreloader", + "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "html": { + "dependency": "transitive", + "description": { + "name": "html", + "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.6" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http2": { + "dependency": "transitive", + "description": { + "name": "http2", + "sha256": "382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "http_client_helper": { + "dependency": "transitive", + "description": { + "name": "http_client_helper", + "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "icons_launcher": { + "dependency": "direct dev", + "description": { + "name": "icons_launcher", + "sha256": "6317d56a73ee528f1dd570d7cd7be120ce58014e0fe635d141ada3d88782f58d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "iconsax_plus": { + "dependency": "direct main", + "description": { + "name": "iconsax_plus", + "sha256": "e9e51b0652a1d3ceea5fedbfc2c1bb4ad432c2ceb7be7de2e30caf085678933c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "image": { + "dependency": "direct main", + "description": { + "name": "image", + "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.4" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.2" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "json_annotation": { + "dependency": "direct main", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "direct dev", + "description": { + "name": "json_serializable", + "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.9.5" + }, + "just_audio": { + "dependency": "transitive", + "description": { + "name": "just_audio", + "sha256": "9694e4734f515f2a052493d1d7e0d6de219ee0427c7c29492e246ff32a219908", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.5" + }, + "just_audio_platform_interface": { + "dependency": "transitive", + "description": { + "name": "just_audio_platform_interface", + "sha256": "2532c8d6702528824445921c5ff10548b518b13f808c2e34c2fd54793b999a6a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.6.0" + }, + "just_audio_web": { + "dependency": "transitive", + "description": { + "name": "just_audio_web", + "sha256": "6ba8a2a7e87d57d32f0f7b42856ade3d6a9fbe0f1a11fabae0a4f00bb73f0663", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.16" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.0.2" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.10" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "lean_builder": { + "dependency": "transitive", + "description": { + "name": "lean_builder", + "sha256": "ef5cd5f907157eb7aa87d1704504b5a6386d2cbff88a3c2b3344477bab323ee9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.0" + }, + "local_auth": { + "dependency": "direct main", + "description": { + "name": "local_auth", + "sha256": "434d854cf478f17f12ab29a76a02b3067f86a63a6d6c4eb8fbfdcfe4879c1b7b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "local_auth_android": { + "dependency": "transitive", + "description": { + "name": "local_auth_android", + "sha256": "a0bdfcc0607050a26ef5b31d6b4b254581c3d3ce3c1816ab4d4f4a9173e84467", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.56" + }, + "local_auth_darwin": { + "dependency": "transitive", + "description": { + "name": "local_auth_darwin", + "sha256": "699873970067a40ef2f2c09b4c72eb1cfef64224ef041b3df9fdc5c4c1f91f49", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.1" + }, + "local_auth_platform_interface": { + "dependency": "transitive", + "description": { + "name": "local_auth_platform_interface", + "sha256": "f98b8e388588583d3f781f6806e4f4c9f9e189d898d27f0c249b93a1973dd122", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "local_auth_windows": { + "dependency": "transitive", + "description": { + "name": "local_auth_windows", + "sha256": "bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.11" + }, + "logging": { + "dependency": "direct main", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "macos_window_utils": { + "dependency": "direct main", + "description": { + "name": "macos_window_utils", + "sha256": "d4df3501fd32ac0d2d7590cb6a8e4758337d061c8fa0db816fdd636be63a8438", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "markdown": { + "dependency": "transitive", + "description": { + "name": "markdown", + "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.0" + }, + "markdown_widget": { + "dependency": "direct main", + "description": { + "name": "markdown_widget", + "sha256": "b52c13d3ee4d0e60c812e15b0593f142a3b8a2003cde1babb271d001a1dbdc1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2+8" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.17" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "media_kit": { + "dependency": "direct main", + "description": { + "path": "media_kit", + "ref": "main", + "resolved-ref": "e3c72e76a7005d97c6f2b20ad3e38c5d52ed85b5", + "url": "https://github.com/DonutWare/media-kit.git" + }, + "source": "git", + "version": "1.2.2" + }, + "media_kit_libs_android_video": { + "dependency": "direct overridden", + "description": { + "path": "libs/android/media_kit_libs_android_video", + "ref": "HEAD", + "resolved-ref": "e3c72e76a7005d97c6f2b20ad3e38c5d52ed85b5", + "url": "https://github.com/DonutWare/media-kit.git" + }, + "source": "git", + "version": "1.3.8" + }, + "media_kit_libs_ios_video": { + "dependency": "direct overridden", + "description": { + "path": "libs/ios/media_kit_libs_ios_video", + "ref": "HEAD", + "resolved-ref": "e3c72e76a7005d97c6f2b20ad3e38c5d52ed85b5", + "url": "https://github.com/DonutWare/media-kit.git" + }, + "source": "git", + "version": "1.1.4" + }, + "media_kit_libs_linux": { + "dependency": "direct overridden", + "description": { + "path": "libs/linux/media_kit_libs_linux", + "ref": "HEAD", + "resolved-ref": "e3c72e76a7005d97c6f2b20ad3e38c5d52ed85b5", + "url": "https://github.com/DonutWare/media-kit.git" + }, + "source": "git", + "version": "1.2.1" + }, + "media_kit_libs_macos_video": { + "dependency": "direct overridden", + "description": { + "path": "libs/macos/media_kit_libs_macos_video", + "ref": "HEAD", + "resolved-ref": "e3c72e76a7005d97c6f2b20ad3e38c5d52ed85b5", + "url": "https://github.com/DonutWare/media-kit.git" + }, + "source": "git", + "version": "1.1.4" + }, + "media_kit_libs_video": { + "dependency": "direct main", + "description": { + "path": "libs/universal/media_kit_libs_video", + "ref": "main", + "resolved-ref": "e3c72e76a7005d97c6f2b20ad3e38c5d52ed85b5", + "url": "https://github.com/DonutWare/media-kit.git" + }, + "source": "git", + "version": "1.0.7" + }, + "media_kit_libs_windows_video": { + "dependency": "direct overridden", + "description": { + "path": "libs/windows/media_kit_libs_windows_video", + "ref": "HEAD", + "resolved-ref": "e3c72e76a7005d97c6f2b20ad3e38c5d52ed85b5", + "url": "https://github.com/DonutWare/media-kit.git" + }, + "source": "git", + "version": "1.0.11" + }, + "media_kit_video": { + "dependency": "direct main", + "description": { + "path": "media_kit_video", + "ref": "main", + "resolved-ref": "e3c72e76a7005d97c6f2b20ad3e38c5d52ed85b5", + "url": "https://github.com/DonutWare/media-kit.git" + }, + "source": "git", + "version": "2.0.0" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.16.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "octo_image": { + "dependency": "transitive", + "description": { + "name": "octo_image", + "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "overflow_view": { + "dependency": "direct main", + "description": { + "name": "overflow_view", + "sha256": "aa39c40f8229e6dcd243e544d707457ff630bb99063d2fd0be8b31f8da902e27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "page_transition": { + "dependency": "direct main", + "description": { + "name": "page_transition", + "sha256": "9d2a780d7d68b53ae82fbcc43e06a16195e6775e9aae40e55dc0cbb593460f9d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "palette_generator_master": { + "dependency": "direct main", + "description": { + "name": "palette_generator_master", + "sha256": "2b27a3d9f773c5bc407ed828589488777f73fa23cd24abe6a9b90249a41a7df0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "95c68a74d3cab950fd0ed8073d9fab15c1c06eb1f3eec68676e87aabc9ecee5a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.21" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "97390a0719146c7c3e71b6866c34f1cde92685933165c1c671984390d2aca776", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.4" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "pigeon": { + "dependency": "direct dev", + "description": { + "name": "pigeon", + "sha256": "fe36bc5ad43ab7f4d8a9d974850aef1148f6d88a53bd14b3d87475ec403a3cdb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "26.1.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pointer_interceptor": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor", + "sha256": "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1+2" + }, + "pointer_interceptor_ios": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_ios", + "sha256": "03c5fa5896080963ab4917eeffda8d28c90f22863a496fb5ba13bc10943e40e4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1+1" + }, + "pointer_interceptor_platform_interface": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_platform_interface", + "sha256": "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.0+1" + }, + "pointer_interceptor_web": { + "dependency": "transitive", + "description": { + "name": "pointer_interceptor_web", + "sha256": "460b600e71de6fcea2b3d5f662c92293c049c4319e27f0829310e5a953b3ee2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.3" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "posix": { + "dependency": "transitive", + "description": { + "name": "posix", + "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.3" + }, + "protobuf": { + "dependency": "transitive", + "description": { + "name": "protobuf", + "sha256": "2fcc8a202ca7ec17dab7c97d6b6d91cf03aa07fe6f65f8afbb6dfa52cc5bd902", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.0" + }, + "provider": { + "dependency": "transitive", + "description": { + "name": "provider", + "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.5+1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "punycoder": { + "dependency": "direct main", + "description": { + "name": "punycoder", + "sha256": "aed79c05986a18782caa9bad649a4a786e840e1baaf6a2e1aa3a25d143d28e6e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "qs_dart": { + "dependency": "transitive", + "description": { + "name": "qs_dart", + "sha256": "27da57e8b394163f96b74bccb6eb6115bfd2585de4b9ad6241bdf1a9797ab54f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "rational": { + "dependency": "transitive", + "description": { + "name": "rational", + "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "recase": { + "dependency": "transitive", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "reorderable_grid": { + "dependency": "direct main", + "description": { + "name": "reorderable_grid", + "sha256": "c7d2e1f2e032a8fffe121f9da828546ee58db35c9c7d19d7a2d189dea2f9939d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.12" + }, + "riverpod": { + "dependency": "transitive", + "description": { + "name": "riverpod", + "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "riverpod_analyzer_utils": { + "dependency": "transitive", + "description": { + "name": "riverpod_analyzer_utils", + "sha256": "03a17170088c63aab6c54c44456f5ab78876a1ddb6032ffde1662ddab4959611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.10" + }, + "riverpod_annotation": { + "dependency": "direct main", + "description": { + "name": "riverpod_annotation", + "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.1" + }, + "riverpod_generator": { + "dependency": "direct dev", + "description": { + "name": "riverpod_generator", + "sha256": "44a0992d54473eb199ede00e2260bd3c262a86560e3c6f6374503d86d0580e36", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.5" + }, + "rxdart": { + "dependency": "transitive", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.28.0" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "screen_brightness": { + "dependency": "direct main", + "description": { + "name": "screen_brightness", + "sha256": "5f70754028f169f059fdc61112a19dcbee152f8b293c42c848317854d650cba3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.7" + }, + "screen_brightness_android": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_android", + "sha256": "d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "screen_brightness_ios": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_ios", + "sha256": "2493953340ecfe8f4f13f61db50ce72533a55b0bbd58ba1402893feecf3727f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "screen_brightness_macos": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_macos", + "sha256": "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "screen_brightness_ohos": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_ohos", + "sha256": "a93a263dcd39b5c56e589eb495bcd001ce65cdd96ff12ab1350683559d5c5bb7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "screen_brightness_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_platform_interface", + "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "screen_brightness_windows": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_windows", + "sha256": "d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "screen_retriever": { + "dependency": "direct main", + "description": { + "name": "screen_retriever", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "scroll_to_index": { + "dependency": "transitive", + "description": { + "name": "scroll_to_index", + "sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "share_plus": { + "dependency": "direct main", + "description": { + "name": "share_plus", + "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.0.1" + }, + "share_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "share_plus_platform_interface", + "sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.3" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "07d552dbe8e71ed720e5205e760438ff4ecfb76ec3b32ea664350e2ca4b0c43b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.16" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.6" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "sliver_tools": { + "dependency": "direct main", + "description": { + "name": "sliver_tools", + "sha256": "eae28220badfb9d0559207badcbbc9ad5331aac829a88cb0964d330d2a4636a6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.12" + }, + "smtc_windows": { + "dependency": "direct main", + "description": { + "name": "smtc_windows", + "sha256": "dee279b0ddf663c4c729a88bca4e57fb4861aa1b3d01e230bdbf1277b8bfe664", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.7" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.1" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "sqflite_android": { + "dependency": "transitive", + "description": { + "name": "sqflite_android", + "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2+2" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.6" + }, + "sqflite_darwin": { + "dependency": "transitive", + "description": { + "name": "sqflite_darwin", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "sqflite_platform_interface": { + "dependency": "transitive", + "description": { + "name": "sqflite_platform_interface", + "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "sqlite3": { + "dependency": "transitive", + "description": { + "name": "sqlite3", + "sha256": "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.4" + }, + "sqlite3_flutter_libs": { + "dependency": "transitive", + "description": { + "name": "sqlite3_flutter_libs", + "sha256": "69c80d812ef2500202ebd22002cbfc1b6565e9ff56b2f971e757fac5d42294df", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.40" + }, + "sqlparser": { + "dependency": "transitive", + "description": { + "name": "sqlparser", + "sha256": "57090342af1ce32bb499aa641f4ecdd2d6231b9403cea537ac059e803cc20d67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.41.2" + }, + "square_progress_indicator": { + "dependency": "direct main", + "description": { + "name": "square_progress_indicator", + "sha256": "a2bc87ad159ba19e097f45f701a782ad97f0a1c8a6db16138b311e5ab41529ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.8" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "sticky_headers": { + "dependency": "direct main", + "description": { + "name": "sticky_headers", + "sha256": "9b3dd2cb0fd6a7038170af3261f855660cbb241cb56c501452cb8deed7023ede", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.0+2" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "swagger_dart_code_generator": { + "dependency": "direct dev", + "description": { + "name": "swagger_dart_code_generator", + "sha256": "64f10f8e2f38c2139b394d00381d69eae55d3bb42b6f524eb21f27145e60c671", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.6" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "transparent_image": { + "dependency": "direct main", + "description": { + "name": "transparent_image", + "sha256": "e8991d955a2094e197ca24c645efec2faf4285772a4746126ca12875e54ca02f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "type_plus": { + "dependency": "transitive", + "description": { + "name": "type_plus", + "sha256": "d5d1019471f0d38b91603adb9b5fd4ce7ab903c879d2fbf1a3f80a630a03fcc9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "universal_html": { + "dependency": "direct main", + "description": { + "name": "universal_html", + "sha256": "c0bcae5c733c60f26c7dfc88b10b0fd27cbcc45cb7492311cdaa6067e21c9cd4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "universal_io": { + "dependency": "transitive", + "description": { + "name": "universal_io", + "sha256": "f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "universal_platform": { + "dependency": "transitive", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "dff5e50339bf30b06d7950b50fda58164d3d8c40042b104ed041ddc520fbff28", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.25" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.6" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.5" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.2" + }, + "value_layout_builder": { + "dependency": "transitive", + "description": { + "name": "value_layout_builder", + "sha256": "ab4b7d98bac8cefeb9713154d43ee0477490183f5aa23bb4ffa5103d9bbf6275", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.19" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.13" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.19" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "video_player": { + "dependency": "direct main", + "description": { + "name": "video_player", + "sha256": "096bc28ce10d131be80dfb00c223024eb0fba301315a406728ab43dd99c45bdf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.10.1" + }, + "video_player_android": { + "dependency": "transitive", + "description": { + "name": "video_player_android", + "sha256": "36913f94430b474c4a9033d59b7552b800e736a8521e7166e84895ddcedd0b03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.8.19" + }, + "video_player_avfoundation": { + "dependency": "transitive", + "description": { + "name": "video_player_avfoundation", + "sha256": "6bced1739cf1f96f03058118adb8ac0dd6f96aa1a1a6e526424ab92fd2a6a77d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.8.7" + }, + "video_player_platform_interface": { + "dependency": "transitive", + "description": { + "name": "video_player_platform_interface", + "sha256": "57c5d73173f76d801129d0531c2774052c5a7c11ccb962f1830630decd9f24ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.6.0" + }, + "video_player_web": { + "dependency": "transitive", + "description": { + "name": "video_player_web", + "sha256": "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "visibility_detector": { + "dependency": "transitive", + "description": { + "name": "visibility_detector", + "sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0+2" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.2" + }, + "wakelock_plus": { + "dependency": "direct main", + "description": { + "name": "wakelock_plus", + "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "weak_map": { + "dependency": "transitive", + "description": { + "name": "weak_map", + "sha256": "5f8e5d5ce57dc624db5fae814dd689ccae1f17f92b426e52f0a7cbe7f6f4ab97", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webview_flutter": { + "dependency": "transitive", + "description": { + "name": "webview_flutter", + "sha256": "c3e4fe614b1c814950ad07186007eff2f2e5dd2935eba7b9a9a1af8e5885f1ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.13.0" + }, + "webview_flutter_android": { + "dependency": "transitive", + "description": { + "name": "webview_flutter_android", + "sha256": "f754fec262c5bf826615e8c7f035da1c536ba6ad9b1181936fad900d297cb687", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.6" + }, + "webview_flutter_platform_interface": { + "dependency": "transitive", + "description": { + "name": "webview_flutter_platform_interface", + "sha256": "63d26ee3aca7256a83ccb576a50272edd7cfc80573a4305caa98985feb493ee0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.14.0" + }, + "webview_flutter_wkwebview": { + "dependency": "transitive", + "description": { + "name": "webview_flutter_wkwebview", + "sha256": "8f4fa32670375f4ce9bfe0f1c773e0857dd191f4e6b3518a1dcdeb7a880bae2e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.23.3" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.15.0" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xid": { + "dependency": "direct main", + "description": { + "name": "xid", + "sha256": "58b61c7c1234810afa500cde7556d7c407ce72154e0d5a8a5618690f03848dbd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.6.1" + }, + "xxh3": { + "dependency": "transitive", + "description": { + "name": "xxh3", + "sha256": "399a0438f5d426785723c99da6b16e136f4953fb1e9db0bf270bd41dd4619916", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + } + }, + "sdks": { + "dart": ">=3.9.0 <4.0.0", + "flutter": ">=3.35.0" + } +} diff --git a/pkgs/by-name/fl/flamerobin/package.nix b/pkgs/by-name/fl/flamerobin/package.nix index 22eab7204620..139dbd765ab3 100644 --- a/pkgs/by-name/fl/flamerobin/package.nix +++ b/pkgs/by-name/fl/flamerobin/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "mariuz"; repo = "flamerobin"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-IwJEFF3vP0BC9PoMoY+XPLT+ygXnFXP/TWaqjdQWs8s="; }; diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix index d3497603a161..15196ea3391c 100644 --- a/pkgs/by-name/fl/flare-signal/package.nix +++ b/pkgs/by-name/fl/flare-signal/package.nix @@ -1,9 +1,7 @@ { lib, stdenv, - fetchFromGitHub, fetchFromGitLab, - runCommand, cargo, meson, ninja, @@ -25,19 +23,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare"; - version = "0.17.5"; + version = "0.18.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = "flare"; tag = finalAttrs.version; - hash = "sha256-mmw1g1MG1oNGYmQOsnLZgdMFuZSiWehZ7ltPrQxQLys="; + hash = "sha256-YXUXUaFAsqeFtnvAxkSeBGAq8Oll/dMJlb3A0yKus94="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-m1IlDGCelklgXNCm0nsDczuUUMM+A6TyWkQiOo/JVVU="; + hash = "sha256-3n1UyrlfGlJxe6TE5rex0XXA/P7ItycuZWIrKH14t3A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/flexoptix-app/package.nix b/pkgs/by-name/fl/flexoptix-app/package.nix index 9c400dde9797..d59ee205e14a 100644 --- a/pkgs/by-name/fl/flexoptix-app/package.nix +++ b/pkgs/by-name/fl/flexoptix-app/package.nix @@ -7,12 +7,12 @@ }: let pname = "flexoptix-app"; - version = "5.54.0-latest"; + version = "5.57.0-latest"; src = fetchurl { name = "${pname}-${version}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - hash = "sha256-RTzVtAd134cKIlHWgP9Yyhu3FgdDSe1fKDGMsctO3x8="; + hash = "sha256-wTrvteIXiCMk4y2JnXodn5o89XJrLGHxOpHmma4SQXY="; }; udevRules = fetchurl { diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix index 929d8019f937..602508d0b265 100644 --- a/pkgs/by-name/fl/flightgear/package.nix +++ b/pkgs/by-name/fl/flightgear/package.nix @@ -41,7 +41,7 @@ let src = fetchFromGitLab { owner = "flightgear"; repo = "fgdata"; - tag = "${version}"; + tag = version; hash = "sha256-LNHO/W8p4b8fYcehdfVecldKQ9uJp1zlg60xdgDC45c="; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "flightgear"; repo = "flightgear"; - tag = "${version}"; + tag = version; hash = "sha256-m4bbWwMXwKJrMkb6svGrIZhcsPghrTMgFs8JCx3Wn/A="; }; diff --git a/pkgs/by-name/fn/fnlfmt/package.nix b/pkgs/by-name/fn/fnlfmt/package.nix index f5455d32e54d..9d00ae87dccb 100644 --- a/pkgs/by-name/fn/fnlfmt/package.nix +++ b/pkgs/by-name/fn/fnlfmt/package.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { src = fetchFromSourcehut { owner = "~technomancy"; repo = "fnlfmt"; - rev = "refs/tags/${version}"; - hash = "sha256-LYHhKC8iA4N8DdCH8GfSOkN/e+W3YjkFhVSDQraKoFk="; + tag = version; + hash = "sha256-wbeWAv4xhxh7M6tRd9qpgBRtg1/fqg0AUPvh2M5f60Q="; }; nativeBuildInputs = [ luaPackages.fennel ]; @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "FENNEL=${luaPackages.fennel}/bin/fennel" ]; - sourceRoot = [ "${src.name}/tags/${version}" ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/by-name/fo/focus-stack/package.nix b/pkgs/by-name/fo/focus-stack/package.nix index 2194318790c0..57c9d30c2a4b 100644 --- a/pkgs/by-name/fo/focus-stack/package.nix +++ b/pkgs/by-name/fo/focus-stack/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "focus-stack"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "PetteriAimonen"; repo = "focus-stack"; rev = version; - hash = "sha256-SoECgBMjWI+n7H6p3hf8J5E9UCLHGiiz5WAsEEioJsU="; + hash = "sha256-hIaK8hjeuu6w/8nh9DHOffqZufQdqB1/VQRezCPQIPk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/footage/package.nix b/pkgs/by-name/fo/footage/package.nix index 2de02227d7bd..1790d42f1054 100644 --- a/pkgs/by-name/fo/footage/package.nix +++ b/pkgs/by-name/fo/footage/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "adhami3310"; repo = "Footage"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-VEL96JrJ5eJEoX2miiB4dqGUXizNlYWCUZkkYkh09B8="; }; diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index 0a57dd155d85..d4227a77c1f4 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.4"; - hash = "sha256-AZQ4ppJES4CsvlkzBX82KfEp3PlFa2Ypd1KmTj/SXJk="; - npmDepsHash = "sha256-v+vl0fxcnqH8Jp4BILDYe5ioFQTQkB2XnFVEtkgadPc="; - vendorHash = "sha256-tq/72teHKowp6jwOKIJxS0OkcFI7UV19uTAv/OB/rm8"; + version = "14.0.0"; + hash = "sha256-kQaaRwVUYIYTTjWcHKb09CzygDR6lhEbnY3FOsnyYpg="; + npmDepsHash = "sha256-rdlVXdoov3zppDgoLODl22AKCdm+AXiV1O63dmo6trg="; + vendorHash = "sha256-7xgm57IqsFOh3CPwGybPHLLlckGLplJpU7M5upYKBl8="; lts = false; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/fp/fprintd/package.nix b/pkgs/by-name/fp/fprintd/package.nix index 7682e45f07b2..5e8595860e2c 100644 --- a/pkgs/by-name/fp/fprintd/package.nix +++ b/pkgs/by-name/fp/fprintd/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "libfprint"; repo = "fprintd"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aGIz50S0zfE3rV6QJp8iQz3uUVn8WAL68KU70j8GyOU="; }; diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix index 28aa1afb11bc..da232f379af8 100644 --- a/pkgs/by-name/fr/framework-tool-tui/package.nix +++ b/pkgs/by-name/fr/framework-tool-tui/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool-tui"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "grouzen"; repo = "framework-tool-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-N+X6o76Fn0KAqG2MNyR29cDyuh3lLdV20JX8jxHNHjY="; + hash = "sha256-+m92Q5rfINS/TDAXpHDpwJPyV8kGrdS4y72DWw9NLe0="; }; - cargoHash = "sha256-vENf1wzXJdtsN+KfuNgtmJLkdfYf+2ULR+VW61dRG+I="; + cargoHash = "sha256-feA+Jn3ldq6pJe/xFqBAaemNcT0Kjfl61IWIXKHHp9o="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 8d084497a755..49cdbdf5ffd6 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -20,14 +20,14 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "freetube"; - version = "0.23.12-unstable-2025-12-13"; + version = "0.23.12-unstable-2026-01-15"; src = fetchFromGitHub { owner = "FreeTubeApp"; repo = "FreeTube"; # tag = "v${finalAttrs.version}-beta"; - rev = "6717114de5653b08caec20b7bf3f3217723866a4"; - hash = "sha256-PfK4Ny8MyBJ9Xw6ozJUzu+4rX+/rLWNac3lE8dBNPE0="; + rev = "e110a4b603e0f5f275d210aea005698a0d4b26ad"; + hash = "sha256-kq6twf7ce2987iHtwikPzolzzbxr1xcoirqUGpPG4V8="; }; # Darwin requires writable Electron dist @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-at/Kq7M8qSjlDmB6R4z51VRZRvkKAGyjU6sgHho8tBQ="; + hash = "sha256-E6D2Uo06MAcnOKy00e5JoLdKQOeGVr7y7Lu6rZ1F82M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/frigate/ai-edge-litert.patch b/pkgs/by-name/fr/frigate/ai-edge-litert.patch new file mode 100644 index 000000000000..95a63781ccef --- /dev/null +++ b/pkgs/by-name/fr/frigate/ai-edge-litert.patch @@ -0,0 +1,64 @@ +diff --git a/frigate/data_processing/real_time/bird.py b/frigate/data_processing/real_time/bird.py +index d547f2dd..402876b7 100644 +--- a/frigate/data_processing/real_time/bird.py ++++ b/frigate/data_processing/real_time/bird.py +@@ -21,7 +21,7 @@ from .api import RealTimeProcessorApi + try: + from tflite_runtime.interpreter import Interpreter + except ModuleNotFoundError: +- from tensorflow.lite.python.interpreter import Interpreter ++ from ai_edge_litert.interpreter import Interpreter + + logger = logging.getLogger(__name__) + +diff --git a/frigate/detectors/plugins/cpu_tfl.py b/frigate/detectors/plugins/cpu_tfl.py +index 8a54363e..68ae558b 100644 +--- a/frigate/detectors/plugins/cpu_tfl.py ++++ b/frigate/detectors/plugins/cpu_tfl.py +@@ -10,7 +10,7 @@ from frigate.detectors.detector_config import BaseDetectorConfig + try: + from tflite_runtime.interpreter import Interpreter + except ModuleNotFoundError: +- from tensorflow.lite.python.interpreter import Interpreter ++ from ai_edge_litert.interpreter import Interpreter + + + logger = logging.getLogger(__name__) +diff --git a/frigate/detectors/plugins/edgetpu_tfl.py b/frigate/detectors/plugins/edgetpu_tfl.py +index 246d2dd4..e855bf87 100644 +--- a/frigate/detectors/plugins/edgetpu_tfl.py ++++ b/frigate/detectors/plugins/edgetpu_tfl.py +@@ -11,7 +11,7 @@ from frigate.detectors.detector_config import BaseDetectorConfig + try: + from tflite_runtime.interpreter import Interpreter, load_delegate + except ModuleNotFoundError: +- from tensorflow.lite.python.interpreter import Interpreter, load_delegate ++ from ai_edge_litert.interpreter import Interpreter, load_delegate + + + logger = logging.getLogger(__name__) +diff --git a/frigate/embeddings/onnx/face_embedding.py b/frigate/embeddings/onnx/face_embedding.py +index eb04b43b..0c6c26fc 100644 +--- a/frigate/embeddings/onnx/face_embedding.py ++++ b/frigate/embeddings/onnx/face_embedding.py +@@ -14,7 +14,7 @@ from .runner import ONNXModelRunner + try: + from tflite_runtime.interpreter import Interpreter + except ModuleNotFoundError: +- from tensorflow.lite.python.interpreter import Interpreter ++ from ai_edge_litert.interpreter import Interpreter + + logger = logging.getLogger(__name__) + +diff --git a/frigate/events/audio.py b/frigate/events/audio.py +index f2a217fd..82206b5a 100644 +--- a/frigate/events/audio.py ++++ b/frigate/events/audio.py +@@ -36,7 +36,7 @@ from frigate.video import start_or_restart_ffmpeg, stop_ffmpeg + try: + from tflite_runtime.interpreter import Interpreter + except ModuleNotFoundError: +- from tensorflow.lite.python.interpreter import Interpreter ++ from ai_edge_litert.interpreter import Interpreter + + diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 2ecb7c5b655d..84b51095aa9e 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -38,11 +38,6 @@ let hash = "sha256-95xtUzzIxxvDtpHX/5uCHnTQTB8Fc08DZGUOR/SdKLs="; }; }); - onnxruntime = super.onnxruntime.override (old: { - onnxruntime = old.onnxruntime.override (old: { - withFullProtobuf = true; - }); - }); }; }; python3Packages = python.pkgs; @@ -89,6 +84,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-1+n0n0yCtjfAHkXzsZdIF0iCVdPGmsG7l8/VTqBVEjU="; }) ./ffmpeg.patch + ./ai-edge-litert.patch ]; postPatch = '' @@ -132,6 +128,7 @@ python3Packages.buildPythonApplication rec { # docker/main/requirements.txt scikit-build # docker/main/requirements-wheel.txt + ai-edge-litert aiofiles aiohttp appdirs @@ -180,7 +177,6 @@ python3Packages.buildPythonApplication rec { slowapi starlette starlette-context - tensorflow-bin titlecase transformers tzlocal diff --git a/pkgs/by-name/fv/fvm/package.nix b/pkgs/by-name/fv/fvm/package.nix index 3fed21626ade..f94cd3862d08 100644 --- a/pkgs/by-name/fv/fvm/package.nix +++ b/pkgs/by-name/fv/fvm/package.nix @@ -9,13 +9,13 @@ }: let - version = "4.0.0"; + version = "4.0.5"; src = fetchFromGitHub { owner = "leoafarias"; repo = "fvm"; tag = version; - hash = "sha256-gJZHQRFCIlHvyMVr/+FCnZcCO8ZTA1gGyBEaRywbvNQ="; + hash = "sha256-NLFEGUo4Zy/OYOlbPKirN+JhbGfvzX2Eg0qB10SiGxs="; }; in buildDartApplication { diff --git a/pkgs/by-name/fv/fvm/pubspec.lock.json b/pkgs/by-name/fv/fvm/pubspec.lock.json index efd2f97250e9..c13695bea4b7 100644 --- a/pkgs/by-name/fv/fvm/pubspec.lock.json +++ b/pkgs/by-name/fv/fvm/pubspec.lock.json @@ -50,16 +50,6 @@ "source": "hosted", "version": "2.0.3" }, - "archive": { - "dependency": "transitive", - "description": { - "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.6.1" - }, "args": { "dependency": "direct main", "description": { @@ -200,16 +190,6 @@ "source": "hosted", "version": "1.4.0" }, - "charcode": { - "dependency": "transitive", - "description": { - "name": "charcode", - "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.0" - }, "checked_yaml": { "dependency": "transitive", "description": { @@ -230,16 +210,6 @@ "source": "hosted", "version": "0.5.0" }, - "cli_pkg": { - "dependency": "direct dev", - "description": { - "name": "cli_pkg", - "sha256": "f812467b5d6a5f26ad0fba5dcfc95133df02edbae47dfa4ade3df5d2b5afdcf2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.10.0" - }, "cli_util": { "dependency": "transitive", "description": { @@ -640,26 +610,6 @@ "source": "hosted", "version": "1.0.4" }, - "native_stack_traces": { - "dependency": "transitive", - "description": { - "name": "native_stack_traces", - "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.7" - }, - "node_interop": { - "dependency": "transitive", - "description": { - "name": "node_interop", - "sha256": "4848ac408c0cdd0f70136b755df816a8e4c96c244e5377a3fb3b8f8950666150", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, "node_preamble": { "dependency": "transitive", "description": { @@ -690,16 +640,6 @@ "source": "hosted", "version": "1.9.1" }, - "petitparser": { - "dependency": "transitive", - "description": { - "name": "petitparser", - "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.0" - }, "platform": { "dependency": "transitive", "description": { @@ -760,16 +700,6 @@ "source": "hosted", "version": "1.5.0" }, - "retry": { - "dependency": "transitive", - "description": { - "name": "retry", - "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, "scope": { "dependency": "direct main", "description": { @@ -940,16 +870,6 @@ "source": "hosted", "version": "0.6.8" }, - "test_process": { - "dependency": "transitive", - "description": { - "name": "test_process", - "sha256": "ea79c090deffc87d8276a5d28bb498d080a9873be6b1074d9dcfb82eb87e138e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, "timing": { "dependency": "transitive", "description": { @@ -1070,16 +990,6 @@ "source": "hosted", "version": "5.10.1" }, - "xml": { - "dependency": "transitive", - "description": { - "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.5.0" - }, "yaml": { "dependency": "direct main", "description": { diff --git a/pkgs/by-name/ga/galene-stream/package.nix b/pkgs/by-name/ga/galene-stream/package.nix index 5f117560e909..4e140debf9f7 100644 --- a/pkgs/by-name/ga/galene-stream/package.nix +++ b/pkgs/by-name/ga/galene-stream/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "erdnaxe"; repo = "galene-stream"; - tag = "${version}"; + tag = version; hash = "sha256-3TdU3vBVuFle+jon2oJLa/rTLIiwYkvzscTDbMEXD1Q="; }; diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix index 69a1b061e415..abf75565b3cd 100644 --- a/pkgs/by-name/ge/gelly/package.nix +++ b/pkgs/by-name/ge/gelly/package.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gelly"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "Fingel"; repo = "gelly"; tag = "v${finalAttrs.version}"; - hash = "sha256-tjJIIKv4+ElmhLIaZAC/MIqhsZI6RzZBAkXZoN4nLeM="; + hash = "sha256-BLW0ACn3e8tm040UbolXyLtwHlienddQ+9HXj4deNd8="; }; - cargoHash = "sha256-sQJrhkyRYTfk2qQ7FXG6IQ4js9Jq4BSWAh9z0V0jdm8="; + cargoHash = "sha256-htBnnqyHpJFsSERlNsXXKnIRu9CcanqIVd+OwTAmrFw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ge/geoclue2/package.nix b/pkgs/by-name/ge/geoclue2/package.nix index 989b40c5ce9f..95fb94098f4c 100644 --- a/pkgs/by-name/ge/geoclue2/package.nix +++ b/pkgs/by-name/ge/geoclue2/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "geoclue"; repo = "geoclue"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-LwL1WtCdHb/NwPr3/OLISwaAwplhJwiZT9vUdX29Bbs="; }; diff --git a/pkgs/by-name/gh/ghost-cli/package.nix b/pkgs/by-name/gh/ghost-cli/package.nix index 8bb91e624f9a..836e150aa256 100644 --- a/pkgs/by-name/gh/ghost-cli/package.nix +++ b/pkgs/by-name/gh/ghost-cli/package.nix @@ -11,18 +11,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "ghost-cli"; - version = "1.28.3"; + version = "1.28.4"; src = fetchFromGitHub { owner = "TryGhost"; repo = "Ghost-CLI"; tag = "v${finalAttrs.version}"; - hash = "sha256-hmLEkYivIH3uNOz6umEYU+A843a7d1M31OE5RCQ9WRQ="; + hash = "sha256-T8NiGrJNUHrJouIjlOfjshlWggW63JCGw4GFcoMkjR0="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-ncZ5ULF1nE0vl+WISfEGZKtABT+pkJtWjHMkT1BjPCE="; + hash = "sha256-osiFLpsEGyXtGDnqJCqu9dP4+Rmay20Ep1PUvRWkIWo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix index 69f20085ad29..cbae5d1dba14 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.4"; + version = "2.27.5"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-bPGWqWNXvl+kHi5/LLdZ8zw/OXxg06mr6ZWjIQH4QJg="; + sha256 = "sha256-e4iEMRzWTnMoY/tjN/w2T0Rq3zGd0sOxoe9vgUouxf8="; }; vendorHash = "sha256-Vmcva/iMaOszQi87avO7utD0ahlB2gFBmVEI86hvnyQ="; diff --git a/pkgs/by-name/gi/git-credential-oauth/package.nix b/pkgs/by-name/gi/git-credential-oauth/package.nix index 919ece7b4b19..1b58d232c8a6 100644 --- a/pkgs/by-name/gi/git-credential-oauth/package.nix +++ b/pkgs/by-name/gi/git-credential-oauth/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { owner = "hickford"; repo = "git-credential-oauth"; rev = "v${version}"; - hash = "sha256-QvR09UiLWzonmFPZopXJozMSd58nGW4yVxn/JkAmV3A="; + hash = "sha256-M4SsqF5RE2OZv7Ehf5o79lyeNmNlkiYDPyz2G6HYC88="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix index 6190c2d57b4c..c8d800125c50 100644 --- a/pkgs/by-name/gi/github-backup/package.nix +++ b/pkgs/by-name/gi/github-backup/package.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "github-backup"; - version = "0.60.0"; + version = "0.61.1"; pyproject = true; src = fetchFromGitHub { owner = "josegonzalez"; repo = "python-github-backup"; tag = version; - hash = "sha256-dK6qkso5GOV/eZRGcwOCKn8faMuTr7czTvISLioKgVs="; + hash = "sha256-1gUhwZLZ+D1ML5yOifEGVWXpgcLgsligB1+yCkAvX5I="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index 191e02385fda..9f20e9bd65df 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -37,10 +37,8 @@ buildGo124Module rec { meta = { description = "GitLab Docker toolset to pack, ship, store, and deliver content"; license = lib.licenses.asl20; - teams = with lib.teams; [ - gitlab - cyberus - ]; + maintainers = with lib.maintainers; [ e1mo ]; + teams = with lib.teams; [ gitlab ]; platforms = lib.platforms.unix; mainProgram = "registry"; }; diff --git a/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch b/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch new file mode 100644 index 000000000000..6839a3c6214f --- /dev/null +++ b/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch @@ -0,0 +1,5066 @@ +diff --git a/package-lock.json b/package-lock.json +index 775acd4..3fbc2c9 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -147,6 +147,7 @@ + "eslint-formatter-gitlab": "^6.0.1", + "eslint-plugin-import": "^2.32.0", + "execa": "^9.3.1", ++ "extra-deps": "workspace:*", + "fs-extra": "^11.3.2", + "http-server": "^14.1.1", + "ink": "^6.5.1", +@@ -220,7 +221,9 @@ + "license": "MIT", + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", ++ "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==" + }, + "node_modules/@adobe/css-tools": { + "version": "4.4.4", +@@ -525,18 +528,24 @@ + "license": "ISC", + "dependencies": { + "yallist": "^3.0.2" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", ++ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==" + }, + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.1", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", ++ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" + }, + "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { + "version": "3.1.1", +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", ++ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" + }, + "node_modules/@babel/helper-create-class-features-plugin": { + "version": "7.27.1", +@@ -564,7 +573,9 @@ + "license": "ISC", + "bin": { + "semver": "bin/semver.js" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", ++ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" + }, + "node_modules/@babel/helper-create-regexp-features-plugin": { + "version": "7.27.1", +@@ -588,7 +599,9 @@ + "license": "ISC", + "bin": { + "semver": "bin/semver.js" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", ++ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" + }, + "node_modules/@babel/helper-define-polyfill-provider": { + "version": "0.6.3", +@@ -900,7 +913,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", ++ "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==" + }, + "node_modules/@babel/plugin-syntax-async-generators": { + "version": "7.8.4", +@@ -911,7 +926,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", ++ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==" + }, + "node_modules/@babel/plugin-syntax-bigint": { + "version": "7.8.3", +@@ -922,7 +939,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", ++ "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==" + }, + "node_modules/@babel/plugin-syntax-class-properties": { + "version": "7.12.13", +@@ -933,7 +952,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", ++ "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==" + }, + "node_modules/@babel/plugin-syntax-decorators": { + "version": "7.27.1", +@@ -990,7 +1011,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", ++ "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==" + }, + "node_modules/@babel/plugin-syntax-json-strings": { + "version": "7.8.3", +@@ -1001,7 +1024,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", ++ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==" + }, + "node_modules/@babel/plugin-syntax-jsx": { + "version": "7.27.1", +@@ -1028,7 +1053,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", ++ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==" + }, + "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", +@@ -1039,7 +1066,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", ++ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==" + }, + "node_modules/@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", +@@ -1050,7 +1079,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", ++ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==" + }, + "node_modules/@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", +@@ -1061,7 +1092,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", ++ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==" + }, + "node_modules/@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", +@@ -1072,7 +1105,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", ++ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==" + }, + "node_modules/@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", +@@ -1083,7 +1118,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", ++ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==" + }, + "node_modules/@babel/plugin-syntax-top-level-await": { + "version": "7.14.5", +@@ -1097,7 +1134,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", ++ "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==" + }, + "node_modules/@babel/plugin-syntax-typescript": { + "version": "7.27.1", +@@ -1127,7 +1166,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", ++ "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==" + }, + "node_modules/@babel/plugin-transform-arrow-functions": { + "version": "7.27.1", +@@ -1265,7 +1306,9 @@ + "license": "MIT", + "engines": { + "node": ">=4" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", ++ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + }, + "node_modules/@babel/plugin-transform-computed-properties": { + "version": "7.27.1", +@@ -4155,7 +4198,9 @@ + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", ++ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==" + }, + "node_modules/@humanwhocodes/object-schema": { + "version": "2.0.3", +@@ -4446,7 +4491,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", ++ "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==" + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { + "version": "1.0.10", +@@ -4454,7 +4501,9 @@ + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", ++ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==" + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": { + "version": "5.3.1", +@@ -4462,7 +4511,9 @@ + "license": "MIT", + "engines": { + "node": ">=6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", ++ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { + "version": "4.1.0", +@@ -4474,7 +4525,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", ++ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==" + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { + "version": "3.14.1", +@@ -4486,7 +4539,9 @@ + }, + "bin": { + "js-yaml": "bin/js-yaml.js" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", ++ "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==" + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { + "version": "5.0.0", +@@ -4497,7 +4552,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", ++ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==" + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { + "version": "2.3.0", +@@ -4511,7 +4568,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", ++ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==" + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { + "version": "4.1.0", +@@ -4522,7 +4581,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", ++ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==" + }, + "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { + "version": "5.0.0", +@@ -4530,7 +4591,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", ++ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", +@@ -4538,7 +4601,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", ++ "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==" + }, + "node_modules/@jest/console": { + "version": "29.7.0", +@@ -4945,7 +5010,9 @@ + "license": "MIT", + "engines": { + "node": ">=6.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", ++ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.5.5", +@@ -5255,14 +5322,18 @@ + }, + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", ++ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==" + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "license": "MIT", + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", ++ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==" + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", +@@ -5273,7 +5344,9 @@ + }, + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", ++ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==" + }, + "node_modules/@octokit/auth-token": { + "version": "5.1.1", +@@ -8121,7 +8194,9 @@ + }, + "node_modules/@tootallnate/quickjs-emscripten": { + "version": "0.23.0", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", ++ "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==" + }, + "node_modules/@ts-stack/markdown": { + "version": "1.5.0", +@@ -8340,7 +8415,9 @@ + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.4", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", ++ "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==" + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.0", +@@ -8348,7 +8425,9 @@ + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-coverage": "*" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", ++ "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==" + }, + "node_modules/@types/istanbul-reports": { + "version": "3.0.1", +@@ -8356,7 +8435,9 @@ + "license": "MIT", + "dependencies": { + "@types/istanbul-lib-report": "*" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", ++ "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==" + }, + "node_modules/@types/jest": { + "version": "29.5.14", +@@ -8552,7 +8633,9 @@ + "node_modules/@types/stack-utils": { + "version": "2.0.1", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", ++ "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==" + }, + "node_modules/@types/statuses": { + "version": "2.0.6", +@@ -8638,7 +8721,9 @@ + "node_modules/@types/yargs-parser": { + "version": "21.0.0", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", ++ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" + }, + "node_modules/@types/yauzl": { + "version": "2.10.3", +@@ -9886,7 +9971,9 @@ + "node_modules/add-stream": { + "version": "1.0.0", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", ++ "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==" + }, + "node_modules/agent-base": { + "version": "6.0.2", +@@ -9896,7 +9983,9 @@ + }, + "engines": { + "node": ">= 6.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", ++ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==" + }, + "node_modules/aggregate-error": { + "version": "3.1.0", +@@ -9936,7 +10025,9 @@ + "ajv": { + "optional": true + } +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz", ++ "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==" + }, + "node_modules/ajv-formats": { + "version": "3.0.1", +@@ -10031,7 +10122,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", ++ "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==" + }, + "node_modules/ansi-escapes/node_modules/type-fest": { + "version": "0.21.3", +@@ -10042,14 +10135,18 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", ++ "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==" + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", ++ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, + "node_modules/ansi-styles": { + "version": "4.3.0", +@@ -10062,7 +10159,9 @@ + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", ++ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==" + }, + "node_modules/ansis": { + "version": "4.1.0", +@@ -10088,7 +10187,9 @@ + }, + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", ++ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==" + }, + "node_modules/anymatch/node_modules/picomatch": { + "version": "2.3.1", +@@ -10845,7 +10946,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", ++ "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==" + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "29.6.3", +@@ -10936,7 +11039,9 @@ + }, + "peerDependencies": { + "@babel/core": "^7.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", ++ "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==" + }, + "node_modules/babel-preset-jest": { + "version": "29.6.3", +@@ -11129,7 +11234,9 @@ + }, + "node_modules/balanced-match": { + "version": "1.0.2", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", ++ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/bare-events": { + "version": "2.6.1", +@@ -11275,7 +11382,9 @@ + "license": "MIT", + "engines": { + "node": ">=10.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz", ++ "integrity": "sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==" + }, + "node_modules/before-after-hook": { + "version": "3.0.2", +@@ -11850,7 +11959,9 @@ + "license": "MIT", + "engines": { + "node": ">=6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", ++ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" + }, + "node_modules/camelcase": { + "version": "6.3.0", +@@ -12080,7 +12191,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", ++ "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==" + }, + "node_modules/cjs-module-lexer": { + "version": "1.2.3", +@@ -12342,7 +12455,9 @@ + }, + "engines": { + "node": ">=12" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", ++ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==" + }, + "node_modules/clone": { + "version": "2.1.2", +@@ -12431,7 +12546,9 @@ + }, + "engines": { + "node": ">=7.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", ++ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==" + }, + "node_modules/color-interpolate": { + "version": "2.0.0", +@@ -12445,7 +12562,9 @@ + }, + "node_modules/color-name": { + "version": "1.1.4", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", ++ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/color-parse": { + "version": "2.0.2", +@@ -12609,7 +12728,9 @@ + "dependencies": { + "ini": "^1.3.4", + "proto-list": "~1.2.1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", ++ "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==" + }, + "node_modules/config-chain/node_modules/ini": { + "version": "1.3.8", +@@ -12973,7 +13094,9 @@ + }, + "node_modules/convert-source-map": { + "version": "2.0.0", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", ++ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" + }, + "node_modules/convert-to-spaces": { + "version": "2.0.1", +@@ -13041,7 +13164,9 @@ + "node_modules/core-util-is": { + "version": "1.0.3", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", ++ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + }, + "node_modules/cors": { + "version": "2.8.5", +@@ -13421,7 +13546,9 @@ + "license": "MIT", + "engines": { + "node": ">= 14" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz", ++ "integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==" + }, + "node_modules/data-urls": { + "version": "3.0.2", +@@ -13633,7 +13760,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", ++ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==" + }, + "node_modules/dedent": { + "version": "1.6.0", +@@ -13666,12 +13795,16 @@ + "license": "MIT", + "engines": { + "node": ">=4.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", ++ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" + }, + "node_modules/deep-is": { + "version": "0.1.4", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", ++ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" + }, + "node_modules/deepmerge": { + "version": "4.3.1", +@@ -13996,7 +14129,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", ++ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==" + }, + "node_modules/dlv": { + "version": "1.1.3", +@@ -14342,7 +14477,9 @@ + }, + "node_modules/emoji-regex": { + "version": "8.0.0", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", ++ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/emojilib": { + "version": "2.4.0", +@@ -14627,7 +14764,9 @@ + "license": "MIT", + "dependencies": { + "is-arrayish": "^0.2.1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", ++ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==" + }, + "node_modules/error-stack-parser-es": { + "version": "1.0.5", +@@ -14851,6 +14990,246 @@ + "@esbuild/win32-x64": "0.25.9" + } + }, ++ "node_modules/esbuild-android-64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz", ++ "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "android" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-android-arm64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz", ++ "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "android" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-darwin-64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz", ++ "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "darwin" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-darwin-arm64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz", ++ "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "darwin" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-freebsd-64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz", ++ "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "freebsd" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-freebsd-arm64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz", ++ "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "freebsd" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-linux-32": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz", ++ "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==", ++ "cpu": [ ++ "ia32" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-linux-64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz", ++ "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-linux-arm": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz", ++ "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==", ++ "cpu": [ ++ "arm" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-linux-arm64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz", ++ "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-linux-mips64le": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz", ++ "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==", ++ "cpu": [ ++ "mips64el" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-linux-ppc64le": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz", ++ "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==", ++ "cpu": [ ++ "ppc64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-linux-riscv64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz", ++ "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==", ++ "cpu": [ ++ "riscv64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-linux-s390x": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz", ++ "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==", ++ "cpu": [ ++ "s390x" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-netbsd-64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz", ++ "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "netbsd" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, + "node_modules/esbuild-node-externals": { + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/esbuild-node-externals/-/esbuild-node-externals-1.18.0.tgz", +@@ -14867,6 +15246,86 @@ + "esbuild": "0.12 - 0.25" + } + }, ++ "node_modules/esbuild-openbsd-64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz", ++ "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "openbsd" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-sunos-64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz", ++ "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "sunos" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-windows-32": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz", ++ "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==", ++ "cpu": [ ++ "ia32" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "win32" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-windows-64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz", ++ "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==", ++ "cpu": [ ++ "x64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "win32" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "node_modules/esbuild-windows-arm64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz", ++ "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==", ++ "cpu": [ ++ "arm64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "win32" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", +@@ -14890,7 +15349,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", ++ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" + }, + "node_modules/escodegen": { + "version": "2.1.0", +@@ -14909,7 +15370,9 @@ + }, + "optionalDependencies": { + "source-map": "~0.6.1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", ++ "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==" + }, + "node_modules/eslint": { + "version": "9.32.0", +@@ -15501,7 +15964,9 @@ + }, + "engines": { + "node": ">=4" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", ++ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + }, + "node_modules/esquery": { + "version": "1.5.0", +@@ -15512,7 +15977,9 @@ + }, + "engines": { + "node": ">=0.10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", ++ "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==" + }, + "node_modules/esrecurse": { + "version": "4.3.0", +@@ -15545,7 +16012,9 @@ + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", ++ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + }, + "node_modules/etag": { + "version": "1.8.1", +@@ -15566,7 +16035,9 @@ + "license": "MIT", + "engines": { + "node": ">=0.8.x" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", ++ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" + }, + "node_modules/eventsource": { + "version": "3.0.7", +@@ -15633,7 +16104,9 @@ + "dev": true, + "engines": { + "node": ">= 0.8.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", ++ "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==" + }, + "node_modules/expect": { + "version": "29.7.0", +@@ -15816,6 +16289,10 @@ + "node": ">=0.10.0" + } + }, ++ "node_modules/extra-deps": { ++ "resolved": "packages/extra-deps", ++ "link": true ++ }, + "node_modules/extract-from-css": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/extract-from-css/-/extract-from-css-0.4.4.tgz", +@@ -15874,7 +16351,9 @@ + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", ++ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/fast-diff": { + "version": "1.3.0", +@@ -15913,11 +16392,15 @@ + }, + "engines": { + "node": ">= 6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", ++ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", ++ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "node_modules/fast-json-stringify": { + "version": "6.0.1", +@@ -15946,7 +16429,9 @@ + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", ++ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" + }, + "node_modules/fast-querystring": { + "version": "1.1.2", +@@ -16265,7 +16750,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", ++ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==" + }, + "node_modules/find-up-simple": { + "version": "1.0.0", +@@ -16461,7 +16948,9 @@ + "dependencies": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", ++ "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==" + }, + "node_modules/fs-extra": { + "version": "11.3.2", +@@ -16480,7 +16969,9 @@ + }, + "node_modules/fs.realpath": { + "version": "1.0.0", +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", ++ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + }, + "node_modules/fsevents": { + "version": "2.3.3", +@@ -16491,7 +16982,9 @@ + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", ++ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==" + }, + "node_modules/function-bind": { + "version": "1.1.2", +@@ -16554,14 +17047,18 @@ + "license": "MIT", + "engines": { + "node": ">=6.9.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", ++ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", ++ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, + "node_modules/get-east-asian-width": { + "version": "1.3.1", +@@ -16605,7 +17102,9 @@ + "license": "MIT", + "engines": { + "node": ">=8.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", ++ "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==" + }, + "node_modules/get-proto": { + "version": "1.0.1", +@@ -16625,7 +17124,9 @@ + "license": "MIT", + "dependencies": { + "npm-conf": "~1.1.3" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/get-proxy-settings/-/get-proxy-settings-0.1.13.tgz", ++ "integrity": "sha512-67HvLHFnPpg6JIHq0z4TwW0iXOuX+H51FtEe9xSkEiRwrY0jYNAawtbGrUVFIEDcp4I0sRkm8pIRik8dss8OZw==" + }, + "node_modules/get-stream": { + "version": "9.0.1", +@@ -16684,7 +17185,9 @@ + }, + "engines": { + "node": ">= 14" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz", ++ "integrity": "sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==" + }, + "node_modules/get-uri/node_modules/fs-extra": { + "version": "8.1.0", +@@ -16696,21 +17199,27 @@ + }, + "engines": { + "node": ">=6 <7 || >=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", ++ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==" + }, + "node_modules/get-uri/node_modules/jsonfile": { + "version": "4.0.0", + "license": "MIT", + "optionalDependencies": { + "graceful-fs": "^4.1.6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", ++ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==" + }, + "node_modules/get-uri/node_modules/universalify": { + "version": "0.1.2", + "license": "MIT", + "engines": { + "node": ">= 4.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", ++ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" + }, + "node_modules/git-log-parser": { + "version": "1.2.1", +@@ -16784,7 +17293,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", ++ "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==" + }, + "node_modules/glob-parent": { + "version": "6.0.2", +@@ -16794,7 +17305,9 @@ + }, + "engines": { + "node": ">=10.13.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", ++ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==" + }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "1.1.11", +@@ -17013,12 +17526,16 @@ + }, + "node_modules/graceful-fs": { + "version": "4.2.11", +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", ++ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" + }, + "node_modules/graphemer": { + "version": "1.4.0", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", ++ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" + }, + "node_modules/graphql": { + "version": "16.11.0", +@@ -17125,7 +17642,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", ++ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", +@@ -17353,7 +17872,9 @@ + }, + "engines": { + "node": ">= 14" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", ++ "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==" + }, + "node_modules/http-proxy/node_modules/eventemitter3": { + "version": "4.0.7", +@@ -17442,7 +17963,9 @@ + }, + "engines": { + "node": ">= 6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", ++ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==" + }, + "node_modules/human-signals": { + "version": "8.0.0", +@@ -17580,7 +18103,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", ++ "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==" + }, + "node_modules/import-meta-resolve": { + "version": "4.1.0", +@@ -17598,7 +18123,9 @@ + "license": "MIT", + "engines": { + "node": ">=0.8.19" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", ++ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" + }, + "node_modules/indent-string": { + "version": "4.0.0", +@@ -17628,11 +18155,15 @@ + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", ++ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==" + }, + "node_modules/inherits": { + "version": "2.0.4", +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", ++ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/ini": { + "version": "4.1.3", +@@ -17897,7 +18428,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", ++ "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", +@@ -17954,7 +18487,9 @@ + "node_modules/is-arrayish": { + "version": "0.2.1", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", ++ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" + }, + "node_modules/is-async-function": { + "version": "2.1.1", +@@ -18203,7 +18738,9 @@ + "license": "MIT", + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", ++ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" + }, + "node_modules/is-finalizationregistry": { + "version": "1.1.1", +@@ -18239,7 +18776,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", ++ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "node_modules/is-generator-fn": { + "version": "2.1.0", +@@ -18277,7 +18816,9 @@ + }, + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", ++ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==" + }, + "node_modules/is-hexadecimal": { + "version": "1.0.4", +@@ -18623,7 +19164,9 @@ + "node_modules/is-url": { + "version": "1.2.4", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", ++ "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" + }, + "node_modules/is-weakmap": { + "version": "2.0.2", +@@ -18720,16 +19263,22 @@ + }, + "engines": { + "node": ">=v0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz", ++ "integrity": "sha512-rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==" + }, + "node_modules/isarray": { + "version": "1.0.0", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", ++ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + }, + "node_modules/isexe": { + "version": "2.0.0", +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", ++ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/isomorphic-git": { + "version": "1.32.3", +@@ -18836,7 +19385,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", ++ "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==" + }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "6.3.1", +@@ -18844,7 +19395,9 @@ + "license": "ISC", + "bin": { + "semver": "bin/semver.js" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", ++ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", +@@ -19417,7 +19970,9 @@ + }, + "engines": { + "node": ">=10.12.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-16.0.0.tgz", ++ "integrity": "sha512-A94mmw6NfJab4Fg/BlvVOUXzXgF0XIH6EmTgJ5NDPp4xoKq0Kr7sErb+4Xs9nZvu58pJojz5RFGpqnZYJTrRfQ==" + }, + "node_modules/jest-junit/node_modules/uuid": { + "version": "8.3.2", +@@ -19425,7 +19980,9 @@ + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", ++ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + }, + "node_modules/jest-leak-detector": { + "version": "29.7.0", +@@ -20186,7 +20743,9 @@ + }, + "node_modules/json-schema-traverse": { + "version": "1.0.0", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", ++ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" + }, + "node_modules/json-stable-stringify": { + "version": "1.3.0", +@@ -20210,7 +20769,9 @@ + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", ++ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" + }, + "node_modules/json-stable-stringify/node_modules/isarray": { + "version": "2.0.5", +@@ -20233,7 +20794,9 @@ + }, + "engines": { + "node": ">=6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", ++ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" + }, + "node_modules/jsonfile": { + "version": "6.1.0", +@@ -20243,7 +20806,9 @@ + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", ++ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==" + }, + "node_modules/jsonify": { + "version": "0.0.1", +@@ -20514,7 +21079,9 @@ + }, + "engines": { + "node": ">= 0.8.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", ++ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==" + }, + "node_modules/light-my-request": { + "version": "6.6.0", +@@ -20872,7 +21439,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", ++ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==" + }, + "node_modules/lodash": { + "version": "4.17.21", +@@ -20931,7 +21500,9 @@ + "node_modules/lodash.merge": { + "version": "4.6.2", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", ++ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + }, + "node_modules/lodash.uniqby": { + "version": "4.7.0", +@@ -21408,14 +21979,18 @@ + "node_modules/merge-stream": { + "version": "2.0.0", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", ++ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, + "node_modules/merge2": { + "version": "1.4.1", + "license": "MIT", + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", ++ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" + }, + "node_modules/micromark": { + "version": "2.11.4", +@@ -21595,7 +22170,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", ++ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" + }, + "node_modules/min-indent": { + "version": "1.0.1", +@@ -21626,7 +22203,9 @@ + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", ++ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" + }, + "node_modules/minimisted": { + "version": "2.0.1", +@@ -21718,7 +22297,9 @@ + }, + "engines": { + "node": ">=10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", ++ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, + "node_modules/mocha": { + "version": "11.7.2", +@@ -21910,7 +22491,9 @@ + }, + "node_modules/ms": { + "version": "2.1.2", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", ++ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/msw": { + "version": "2.11.2", +@@ -22041,7 +22624,9 @@ + "node_modules/natural-compare": { + "version": "1.4.0", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", ++ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" + }, + "node_modules/negotiator": { + "version": "0.6.3", +@@ -22159,7 +22744,9 @@ + "encoding": { + "optional": true + } +- } ++ }, ++ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", ++ "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==" + }, + "node_modules/node-html-parser": { + "version": "6.1.13", +@@ -22217,7 +22804,9 @@ + "license": "MIT", + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", ++ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" + }, + "node_modules/normalize-url": { + "version": "8.0.1", +@@ -22401,7 +22990,9 @@ + }, + "engines": { + "node": ">=4" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", ++ "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==" + }, + "node_modules/npm-run-path": { + "version": "5.3.0", +@@ -22445,7 +23036,9 @@ + }, + "engines": { + "node": ">=12" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", ++ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==" + }, + "node_modules/npm/node_modules/@isaacs/cliui/node_modules/ansi-regex": { + "version": "6.1.0", +@@ -22457,13 +23050,17 @@ + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", ++ "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==" + }, + "node_modules/npm/node_modules/@isaacs/cliui/node_modules/emoji-regex": { + "version": "9.2.2", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", ++ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "node_modules/npm/node_modules/@isaacs/cliui/node_modules/string-width": { + "version": "5.1.2", +@@ -22480,7 +23077,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", ++ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==" + }, + "node_modules/npm/node_modules/@isaacs/cliui/node_modules/strip-ansi": { + "version": "7.1.0", +@@ -22495,7 +23094,9 @@ + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", ++ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==" + }, + "node_modules/npm/node_modules/@isaacs/fs-minipass": { + "version": "4.0.1", +@@ -22507,13 +23108,17 @@ + }, + "engines": { + "node": ">=18.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", ++ "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==" + }, + "node_modules/npm/node_modules/@isaacs/string-locale-compare": { + "version": "1.1.0", + "dev": true, + "inBundle": true, +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz", ++ "integrity": "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==" + }, + "node_modules/npm/node_modules/@npmcli/agent": { + "version": "3.0.0", +@@ -22529,7 +23134,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz", ++ "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==" + }, + "node_modules/npm/node_modules/@npmcli/arborist": { + "version": "8.0.1", +@@ -22578,7 +23185,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-8.0.1.tgz", ++ "integrity": "sha512-ZyJWuvP+SdT7JmHkmtGyElm/MkQZP/i4boJXut6HDgx1tmJc/JZ9OwahRuKD+IyowJcLyB/bbaXtYh+RoTCUuw==" + }, + "node_modules/npm/node_modules/@npmcli/config": { + "version": "9.0.0", +@@ -22597,7 +23206,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/config/-/config-9.0.0.tgz", ++ "integrity": "sha512-P5Vi16Y+c8E0prGIzX112ug7XxqfaPFUVW/oXAV+2VsxplKZEnJozqZ0xnK8V8w/SEsBf+TXhUihrEIAU4CA5Q==" + }, + "node_modules/npm/node_modules/@npmcli/fs": { + "version": "4.0.0", +@@ -22609,7 +23220,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz", ++ "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==" + }, + "node_modules/npm/node_modules/@npmcli/git": { + "version": "6.0.3", +@@ -22628,7 +23241,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-6.0.3.tgz", ++ "integrity": "sha512-GUYESQlxZRAdhs3UhbB6pVRNUELQOHXwK9ruDkwmCv2aZ5y0SApQzUJCg02p3A7Ue2J5hxvlk1YI53c00NmRyQ==" + }, + "node_modules/npm/node_modules/@npmcli/installed-package-contents": { + "version": "3.0.0", +@@ -22644,7 +23259,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz", ++ "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==" + }, + "node_modules/npm/node_modules/@npmcli/map-workspaces": { + "version": "4.0.2", +@@ -22659,7 +23276,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-4.0.2.tgz", ++ "integrity": "sha512-mnuMuibEbkaBTYj9HQ3dMe6L0ylYW+s/gfz7tBDMFY/la0w9Kf44P9aLn4/+/t3aTR3YUHKoT6XQL9rlicIe3Q==" + }, + "node_modules/npm/node_modules/@npmcli/metavuln-calculator": { + "version": "8.0.1", +@@ -22675,7 +23294,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-8.0.1.tgz", ++ "integrity": "sha512-WXlJx9cz3CfHSt9W9Opi1PTFc4WZLFomm5O8wekxQZmkyljrBRwATwDxfC9iOXJwYVmfiW1C1dUe0W2aN0UrSg==" + }, + "node_modules/npm/node_modules/@npmcli/metavuln-calculator/node_modules/pacote": { + "version": "20.0.0", +@@ -22706,7 +23327,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.0.tgz", ++ "integrity": "sha512-pRjC5UFwZCgx9kUFDVM9YEahv4guZ1nSLqwmWiLUnDbGsjs+U5w7z6Uc8HNR1a6x8qnu5y9xtGE6D1uAuYz+0A==" + }, + "node_modules/npm/node_modules/@npmcli/name-from-folder": { + "version": "3.0.0", +@@ -22715,7 +23338,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-3.0.0.tgz", ++ "integrity": "sha512-61cDL8LUc9y80fXn+lir+iVt8IS0xHqEKwPu/5jCjxQTVoSCmkXvw4vbMrzAMtmghz3/AkiBjhHkDKUH+kf7kA==" + }, + "node_modules/npm/node_modules/@npmcli/node-gyp": { + "version": "4.0.0", +@@ -22724,7 +23349,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz", ++ "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==" + }, + "node_modules/npm/node_modules/@npmcli/package-json": { + "version": "6.2.0", +@@ -22742,7 +23369,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.2.0.tgz", ++ "integrity": "sha512-rCNLSB/JzNvot0SEyXqWZ7tX2B5dD2a1br2Dp0vSYVo5jh8Z0EZ7lS9TsZ1UtziddB1UfNUaMCc538/HztnJGA==" + }, + "node_modules/npm/node_modules/@npmcli/promise-spawn": { + "version": "8.0.2", +@@ -22754,7 +23383,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.2.tgz", ++ "integrity": "sha512-/bNJhjc+o6qL+Dwz/bqfTQClkEO5nTQ1ZEcdCkAQjhkZMHIh22LPG7fNh1enJP1NKWDqYiiABnjFCY7E0zHYtQ==" + }, + "node_modules/npm/node_modules/@npmcli/query": { + "version": "4.0.1", +@@ -22766,7 +23397,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-4.0.1.tgz", ++ "integrity": "sha512-4OIPFb4weUUwkDXJf4Hh1inAn8neBGq3xsH4ZsAaN6FK3ldrFkH7jSpCc7N9xesi0Sp+EBXJ9eGMDrEww2Ztqw==" + }, + "node_modules/npm/node_modules/@npmcli/redact": { + "version": "3.2.2", +@@ -22775,7 +23408,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-3.2.2.tgz", ++ "integrity": "sha512-7VmYAmk4csGv08QzrDKScdzn11jHPFGyqJW39FyPgPuAp3zIaUmuCo1yxw9aGs+NEJuTGQ9Gwqpt93vtJubucg==" + }, + "node_modules/npm/node_modules/@npmcli/run-script": { + "version": "9.1.0", +@@ -22792,7 +23427,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-9.1.0.tgz", ++ "integrity": "sha512-aoNSbxtkePXUlbZB+anS1LqsJdctG5n3UVhfU47+CDdwMi6uNTBMF9gPcQRnqghQd2FGzcwwIFBruFMxjhBewg==" + }, + "node_modules/npm/node_modules/@pkgjs/parseargs": { + "version": "0.11.0", +@@ -22802,7 +23439,9 @@ + "optional": true, + "engines": { + "node": ">=14" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", ++ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==" + }, + "node_modules/npm/node_modules/@sigstore/protobuf-specs": { + "version": "0.4.3", +@@ -22811,7 +23450,9 @@ + "license": "Apache-2.0", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.3.tgz", ++ "integrity": "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA==" + }, + "node_modules/npm/node_modules/@sigstore/tuf": { + "version": "3.1.1", +@@ -22824,7 +23465,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz", ++ "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg==" + }, + "node_modules/npm/node_modules/@tufjs/canonical-json": { + "version": "2.0.0", +@@ -22833,7 +23476,9 @@ + "license": "MIT", + "engines": { + "node": "^16.14.0 || >=18.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", ++ "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==" + }, + "node_modules/npm/node_modules/abbrev": { + "version": "3.0.1", +@@ -22842,7 +23487,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz", ++ "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==" + }, + "node_modules/npm/node_modules/agent-base": { + "version": "7.1.3", +@@ -22851,7 +23498,9 @@ + "license": "MIT", + "engines": { + "node": ">= 14" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", ++ "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==" + }, + "node_modules/npm/node_modules/ansi-regex": { + "version": "5.0.1", +@@ -22860,7 +23509,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", ++ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, + "node_modules/npm/node_modules/ansi-styles": { + "version": "6.2.1", +@@ -22872,25 +23523,33 @@ + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", ++ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==" + }, + "node_modules/npm/node_modules/aproba": { + "version": "2.0.0", + "dev": true, + "inBundle": true, +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", ++ "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==" + }, + "node_modules/npm/node_modules/archy": { + "version": "1.0.0", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", ++ "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==" + }, + "node_modules/npm/node_modules/balanced-match": { + "version": "1.0.2", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", ++ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/npm/node_modules/bin-links": { + "version": "5.0.0", +@@ -22906,7 +23565,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-5.0.0.tgz", ++ "integrity": "sha512-sdleLVfCjBtgO5cNjA2HVRvWBJAHs4zwenaCPMNJAJU0yNxpzj80IpjOIimkpkr+mhlA+how5poQtt53PygbHA==" + }, + "node_modules/npm/node_modules/binary-extensions": { + "version": "2.3.0", +@@ -22918,7 +23579,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", ++ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==" + }, + "node_modules/npm/node_modules/brace-expansion": { + "version": "2.0.2", +@@ -22927,7 +23590,9 @@ + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", ++ "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==" + }, + "node_modules/npm/node_modules/cacache": { + "version": "19.0.1", +@@ -22950,7 +23615,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz", ++ "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==" + }, + "node_modules/npm/node_modules/cacache/node_modules/chownr": { + "version": "3.0.0", +@@ -22959,7 +23626,9 @@ + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", ++ "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==" + }, + "node_modules/npm/node_modules/cacache/node_modules/mkdirp": { + "version": "3.0.1", +@@ -22974,7 +23643,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", ++ "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==" + }, + "node_modules/npm/node_modules/cacache/node_modules/tar": { + "version": "7.4.3", +@@ -22991,7 +23662,9 @@ + }, + "engines": { + "node": ">=18" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", ++ "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==" + }, + "node_modules/npm/node_modules/cacache/node_modules/yallist": { + "version": "5.0.0", +@@ -23000,7 +23673,9 @@ + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", ++ "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==" + }, + "node_modules/npm/node_modules/chalk": { + "version": "5.4.1", +@@ -23012,7 +23687,9 @@ + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz", ++ "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==" + }, + "node_modules/npm/node_modules/chownr": { + "version": "2.0.0", +@@ -23021,7 +23698,9 @@ + "license": "ISC", + "engines": { + "node": ">=10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", ++ "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==" + }, + "node_modules/npm/node_modules/ci-info": { + "version": "4.2.0", +@@ -23036,7 +23715,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.2.0.tgz", ++ "integrity": "sha512-cYY9mypksY8NRqgDB1XD1RiJL338v/551niynFTGkZOO2LHuB2OmOYxDIe/ttN9AHwrqdum1360G3ald0W9kCg==" + }, + "node_modules/npm/node_modules/cidr-regex": { + "version": "4.1.3", +@@ -23048,7 +23729,9 @@ + }, + "engines": { + "node": ">=14" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/cidr-regex/-/cidr-regex-4.1.3.tgz", ++ "integrity": "sha512-86M1y3ZeQvpZkZejQCcS+IaSWjlDUC+ORP0peScQ4uEUFCZ8bEQVz7NlJHqysoUb6w3zCjx4Mq/8/2RHhMwHYw==" + }, + "node_modules/npm/node_modules/cli-columns": { + "version": "4.0.0", +@@ -23061,7 +23744,9 @@ + }, + "engines": { + "node": ">= 10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/cli-columns/-/cli-columns-4.0.0.tgz", ++ "integrity": "sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==" + }, + "node_modules/npm/node_modules/cmd-shim": { + "version": "7.0.0", +@@ -23070,7 +23755,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-7.0.0.tgz", ++ "integrity": "sha512-rtpaCbr164TPPh+zFdkWpCyZuKkjpAzODfaZCf/SVJZzJN+4bHQb/LP3Jzq5/+84um3XXY8r548XiWKSborwVw==" + }, + "node_modules/npm/node_modules/color-convert": { + "version": "2.0.1", +@@ -23082,19 +23769,25 @@ + }, + "engines": { + "node": ">=7.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", ++ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==" + }, + "node_modules/npm/node_modules/color-name": { + "version": "1.1.4", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", ++ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/npm/node_modules/common-ancestor-path": { + "version": "1.0.1", + "dev": true, + "inBundle": true, +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz", ++ "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==" + }, + "node_modules/npm/node_modules/cross-spawn": { + "version": "7.0.6", +@@ -23108,7 +23801,9 @@ + }, + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", ++ "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==" + }, + "node_modules/npm/node_modules/cross-spawn/node_modules/which": { + "version": "2.0.2", +@@ -23123,7 +23818,9 @@ + }, + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", ++ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==" + }, + "node_modules/npm/node_modules/cssesc": { + "version": "3.0.0", +@@ -23135,7 +23832,9 @@ + }, + "engines": { + "node": ">=4" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", ++ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" + }, + "node_modules/npm/node_modules/debug": { + "version": "4.4.1", +@@ -23152,7 +23851,9 @@ + "supports-color": { + "optional": true + } +- } ++ }, ++ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", ++ "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==" + }, + "node_modules/npm/node_modules/diff": { + "version": "5.2.0", +@@ -23161,19 +23862,25 @@ + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", ++ "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==" + }, + "node_modules/npm/node_modules/eastasianwidth": { + "version": "0.2.0", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", ++ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" + }, + "node_modules/npm/node_modules/emoji-regex": { + "version": "8.0.0", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", ++ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, + "node_modules/npm/node_modules/encoding": { + "version": "0.1.13", +@@ -23183,7 +23890,9 @@ + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", ++ "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==" + }, + "node_modules/npm/node_modules/env-paths": { + "version": "2.2.1", +@@ -23192,19 +23901,25 @@ + "license": "MIT", + "engines": { + "node": ">=6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", ++ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==" + }, + "node_modules/npm/node_modules/err-code": { + "version": "2.0.3", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", ++ "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" + }, + "node_modules/npm/node_modules/exponential-backoff": { + "version": "3.1.2", + "dev": true, + "inBundle": true, +- "license": "Apache-2.0" ++ "license": "Apache-2.0", ++ "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz", ++ "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==" + }, + "node_modules/npm/node_modules/fastest-levenshtein": { + "version": "1.0.16", +@@ -23213,7 +23928,9 @@ + "license": "MIT", + "engines": { + "node": ">= 4.9.1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", ++ "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==" + }, + "node_modules/npm/node_modules/foreground-child": { + "version": "3.3.1", +@@ -23229,7 +23946,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", ++ "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==" + }, + "node_modules/npm/node_modules/fs-minipass": { + "version": "3.0.3", +@@ -23241,7 +23960,9 @@ + }, + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", ++ "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==" + }, + "node_modules/npm/node_modules/glob": { + "version": "10.4.5", +@@ -23261,13 +23982,17 @@ + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", ++ "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==" + }, + "node_modules/npm/node_modules/graceful-fs": { + "version": "4.2.11", + "dev": true, + "inBundle": true, +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", ++ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" + }, + "node_modules/npm/node_modules/hosted-git-info": { + "version": "8.1.0", +@@ -23279,13 +24004,17 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.1.0.tgz", ++ "integrity": "sha512-Rw/B2DNQaPBICNXEm8balFz9a6WpZrkCGpcWFpy7nCj+NyhSdqXipmfvtmWt9xGfp0wZnBxB+iVpLmQMYt47Tw==" + }, + "node_modules/npm/node_modules/http-cache-semantics": { + "version": "4.2.0", + "dev": true, + "inBundle": true, +- "license": "BSD-2-Clause" ++ "license": "BSD-2-Clause", ++ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", ++ "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==" + }, + "node_modules/npm/node_modules/http-proxy-agent": { + "version": "7.0.2", +@@ -23298,7 +24027,9 @@ + }, + "engines": { + "node": ">= 14" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", ++ "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==" + }, + "node_modules/npm/node_modules/https-proxy-agent": { + "version": "7.0.6", +@@ -23311,7 +24042,9 @@ + }, + "engines": { + "node": ">= 14" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", ++ "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==" + }, + "node_modules/npm/node_modules/iconv-lite": { + "version": "0.6.3", +@@ -23324,7 +24057,9 @@ + }, + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", ++ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==" + }, + "node_modules/npm/node_modules/ignore-walk": { + "version": "7.0.0", +@@ -23336,7 +24071,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-7.0.0.tgz", ++ "integrity": "sha512-T4gbf83A4NH95zvhVYZc+qWocBBGlpzUXLPGurJggw/WIOwicfXJChLDP/iBZnN5WqROSu5Bm3hhle4z8a8YGQ==" + }, + "node_modules/npm/node_modules/imurmurhash": { + "version": "0.1.4", +@@ -23345,7 +24082,9 @@ + "license": "MIT", + "engines": { + "node": ">=0.8.19" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", ++ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" + }, + "node_modules/npm/node_modules/ini": { + "version": "5.0.0", +@@ -23354,7 +24093,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ini/-/ini-5.0.0.tgz", ++ "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==" + }, + "node_modules/npm/node_modules/init-package-json": { + "version": "7.0.2", +@@ -23372,7 +24113,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-7.0.2.tgz", ++ "integrity": "sha512-Qg6nAQulaOQZjvaSzVLtYRqZmuqOi7gTknqqgdhZy7LV5oO+ppvHWq15tZYzGyxJLTH5BxRTqTa+cPDx2pSD9Q==" + }, + "node_modules/npm/node_modules/ip-address": { + "version": "9.0.5", +@@ -23385,7 +24128,9 @@ + }, + "engines": { + "node": ">= 12" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz", ++ "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==" + }, + "node_modules/npm/node_modules/ip-regex": { + "version": "5.0.0", +@@ -23397,7 +24142,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-5.0.0.tgz", ++ "integrity": "sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==" + }, + "node_modules/npm/node_modules/is-cidr": { + "version": "5.1.1", +@@ -23409,7 +24156,9 @@ + }, + "engines": { + "node": ">=14" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/is-cidr/-/is-cidr-5.1.1.tgz", ++ "integrity": "sha512-AwzRMjtJNTPOgm7xuYZ71715z99t+4yRnSnSzgK5err5+heYi4zMuvmpUadaJ28+KCXCQo8CjUrKQZRWSPmqTQ==" + }, + "node_modules/npm/node_modules/is-fullwidth-code-point": { + "version": "3.0.0", +@@ -23418,13 +24167,17 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", ++ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "node_modules/npm/node_modules/isexe": { + "version": "2.0.0", + "dev": true, + "inBundle": true, +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", ++ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + }, + "node_modules/npm/node_modules/jackspeak": { + "version": "3.4.3", +@@ -23439,13 +24192,17 @@ + }, + "optionalDependencies": { + "@pkgjs/parseargs": "^0.11.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", ++ "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==" + }, + "node_modules/npm/node_modules/jsbn": { + "version": "1.1.0", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz", ++ "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==" + }, + "node_modules/npm/node_modules/json-parse-even-better-errors": { + "version": "4.0.0", +@@ -23454,7 +24211,9 @@ + "license": "MIT", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz", ++ "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==" + }, + "node_modules/npm/node_modules/json-stringify-nice": { + "version": "1.1.4", +@@ -23463,7 +24222,9 @@ + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz", ++ "integrity": "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==" + }, + "node_modules/npm/node_modules/jsonparse": { + "version": "1.3.1", +@@ -23472,19 +24233,25 @@ + "node >= 0.2.0" + ], + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", ++ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==" + }, + "node_modules/npm/node_modules/just-diff": { + "version": "6.0.2", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz", ++ "integrity": "sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==" + }, + "node_modules/npm/node_modules/just-diff-apply": { + "version": "5.5.0", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz", ++ "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==" + }, + "node_modules/npm/node_modules/libnpmaccess": { + "version": "9.0.0", +@@ -23497,7 +24264,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-9.0.0.tgz", ++ "integrity": "sha512-mTCFoxyevNgXRrvgdOhghKJnCWByBc9yp7zX4u9RBsmZjwOYdUDEBfL5DdgD1/8gahsYnauqIWFbq0iK6tO6CQ==" + }, + "node_modules/npm/node_modules/libnpmdiff": { + "version": "7.0.1", +@@ -23516,7 +24285,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmdiff/-/libnpmdiff-7.0.1.tgz", ++ "integrity": "sha512-CPcLUr23hLwiil/nAlnMQ/eWSTXPPaX+Qe31di8JvcV2ELbbBueucZHBaXlXruUch6zIlSY6c7JCGNAqKN7yaQ==" + }, + "node_modules/npm/node_modules/libnpmexec": { + "version": "9.0.1", +@@ -23537,7 +24308,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmexec/-/libnpmexec-9.0.1.tgz", ++ "integrity": "sha512-+SI/x9p0KUkgJdW9L0nDNqtjsFRY3yA5kQKdtGYNMXX4iP/MXQjuXF8MaUAweuV6Awm8plxqn8xCPs2TelZEUg==" + }, + "node_modules/npm/node_modules/libnpmfund": { + "version": "6.0.1", +@@ -23549,7 +24322,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmfund/-/libnpmfund-6.0.1.tgz", ++ "integrity": "sha512-UBbHY9yhhZVffbBpFJq+TsR2KhhEqpQ2mpsIJa6pt0PPQaZ2zgOjvGUYEjURYIGwg2wL1vfQFPeAtmN5w6i3Gg==" + }, + "node_modules/npm/node_modules/libnpmhook": { + "version": "11.0.0", +@@ -23562,7 +24337,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmhook/-/libnpmhook-11.0.0.tgz", ++ "integrity": "sha512-Xc18rD9NFbRwZbYCQ+UCF5imPsiHSyuQA8RaCA2KmOUo8q4kmBX4JjGWzmZnxZCT8s6vwzmY1BvHNqBGdg9oBQ==" + }, + "node_modules/npm/node_modules/libnpmorg": { + "version": "7.0.0", +@@ -23575,7 +24352,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmorg/-/libnpmorg-7.0.0.tgz", ++ "integrity": "sha512-DcTodX31gDEiFrlIHurBQiBlBO6Var2KCqMVCk+HqZhfQXqUfhKGmFOp0UHr6HR1lkTVM0MzXOOYtUObk0r6Dg==" + }, + "node_modules/npm/node_modules/libnpmpack": { + "version": "8.0.1", +@@ -23590,7 +24369,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmpack/-/libnpmpack-8.0.1.tgz", ++ "integrity": "sha512-E53w3QcldAXg5cG9NpXZcsgNiLw5AEtu7ufGJk6+dxudD0/U5Y6vHIws+CJiI76I9rAidXasKmmS2mwiYDncBw==" + }, + "node_modules/npm/node_modules/libnpmpublish": { + "version": "10.0.1", +@@ -23609,7 +24390,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-10.0.1.tgz", ++ "integrity": "sha512-xNa1DQs9a8dZetNRV0ky686MNzv1MTqB3szgOlRR3Fr24x1gWRu7aB9OpLZsml0YekmtppgHBkyZ+8QZlzmEyw==" + }, + "node_modules/npm/node_modules/libnpmsearch": { + "version": "8.0.0", +@@ -23621,7 +24404,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmsearch/-/libnpmsearch-8.0.0.tgz", ++ "integrity": "sha512-W8FWB78RS3Nkl1gPSHOlF024qQvcoU/e3m9BGDuBfVZGfL4MJ91GXXb04w3zJCGOW9dRQUyWVEqupFjCrgltDg==" + }, + "node_modules/npm/node_modules/libnpmteam": { + "version": "7.0.0", +@@ -23634,7 +24419,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmteam/-/libnpmteam-7.0.0.tgz", ++ "integrity": "sha512-PKLOoVukN34qyJjgEm5DEOnDwZkeVMUHRx8NhcKDiCNJGPl7G/pF1cfBw8yicMwRlHaHkld1FdujOzKzy4AlwA==" + }, + "node_modules/npm/node_modules/libnpmversion": { + "version": "7.0.0", +@@ -23650,13 +24437,17 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/libnpmversion/-/libnpmversion-7.0.0.tgz", ++ "integrity": "sha512-0xle91R6F8r/Q/4tHOnyKko+ZSquEXNdxwRdKCPv4kC1cOVBMFXRsKKrVtRKtXcFn362U8ZlJefk4Apu00424g==" + }, + "node_modules/npm/node_modules/lru-cache": { + "version": "10.4.3", + "dev": true, + "inBundle": true, +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", ++ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + }, + "node_modules/npm/node_modules/make-fetch-happen": { + "version": "14.0.3", +@@ -23678,7 +24469,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz", ++ "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==" + }, + "node_modules/npm/node_modules/make-fetch-happen/node_modules/negotiator": { + "version": "1.0.0", +@@ -23687,7 +24480,9 @@ + "license": "MIT", + "engines": { + "node": ">= 0.6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", ++ "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==" + }, + "node_modules/npm/node_modules/minimatch": { + "version": "9.0.5", +@@ -23702,7 +24497,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", ++ "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==" + }, + "node_modules/npm/node_modules/minipass": { + "version": "7.1.2", +@@ -23711,7 +24508,9 @@ + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", ++ "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==" + }, + "node_modules/npm/node_modules/minipass-collect": { + "version": "2.0.1", +@@ -23723,7 +24522,9 @@ + }, + "engines": { + "node": ">=16 || 14 >=14.17" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", ++ "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==" + }, + "node_modules/npm/node_modules/minipass-fetch": { + "version": "4.0.1", +@@ -23740,7 +24541,9 @@ + }, + "optionalDependencies": { + "encoding": "^0.1.13" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz", ++ "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==" + }, + "node_modules/npm/node_modules/minipass-flush": { + "version": "1.0.5", +@@ -23752,7 +24555,9 @@ + }, + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", ++ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==" + }, + "node_modules/npm/node_modules/minipass-flush/node_modules/minipass": { + "version": "3.3.6", +@@ -23764,7 +24569,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", ++ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" + }, + "node_modules/npm/node_modules/minipass-pipeline": { + "version": "1.2.4", +@@ -23776,7 +24583,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", ++ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==" + }, + "node_modules/npm/node_modules/minipass-pipeline/node_modules/minipass": { + "version": "3.3.6", +@@ -23788,7 +24597,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", ++ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" + }, + "node_modules/npm/node_modules/minipass-sized": { + "version": "1.0.3", +@@ -23800,7 +24611,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", ++ "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==" + }, + "node_modules/npm/node_modules/minipass-sized/node_modules/minipass": { + "version": "3.3.6", +@@ -23812,7 +24625,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", ++ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" + }, + "node_modules/npm/node_modules/minizlib": { + "version": "3.0.2", +@@ -23824,7 +24639,9 @@ + }, + "engines": { + "node": ">= 18" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz", ++ "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==" + }, + "node_modules/npm/node_modules/mkdirp": { + "version": "1.0.4", +@@ -23836,13 +24653,17 @@ + }, + "engines": { + "node": ">=10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", ++ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" + }, + "node_modules/npm/node_modules/ms": { + "version": "2.1.3", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", ++ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/npm/node_modules/mute-stream": { + "version": "2.0.0", +@@ -23851,7 +24672,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz", ++ "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==" + }, + "node_modules/npm/node_modules/node-gyp": { + "version": "11.2.0", +@@ -23875,7 +24698,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.2.0.tgz", ++ "integrity": "sha512-T0S1zqskVUSxcsSTkAsLc7xCycrRYmtDHadDinzocrThjyQCn5kMlEBSj6H4qDbgsIOSLmmlRIeb0lZXj+UArA==" + }, + "node_modules/npm/node_modules/node-gyp/node_modules/chownr": { + "version": "3.0.0", +@@ -23884,7 +24709,9 @@ + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", ++ "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==" + }, + "node_modules/npm/node_modules/node-gyp/node_modules/mkdirp": { + "version": "3.0.1", +@@ -23899,7 +24726,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz", ++ "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==" + }, + "node_modules/npm/node_modules/node-gyp/node_modules/tar": { + "version": "7.4.3", +@@ -23916,7 +24745,9 @@ + }, + "engines": { + "node": ">=18" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz", ++ "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==" + }, + "node_modules/npm/node_modules/node-gyp/node_modules/yallist": { + "version": "5.0.0", +@@ -23925,7 +24756,9 @@ + "license": "BlueOak-1.0.0", + "engines": { + "node": ">=18" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", ++ "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==" + }, + "node_modules/npm/node_modules/nopt": { + "version": "8.1.0", +@@ -23940,7 +24773,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz", ++ "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==" + }, + "node_modules/npm/node_modules/normalize-package-data": { + "version": "7.0.0", +@@ -23954,7 +24789,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-7.0.0.tgz", ++ "integrity": "sha512-k6U0gKRIuNCTkwHGZqblCfLfBRh+w1vI6tBo+IeJwq2M8FUiOqhX7GH+GArQGScA7azd1WfyRCvxoXDO3hQDIA==" + }, + "node_modules/npm/node_modules/npm-audit-report": { + "version": "6.0.0", +@@ -23963,7 +24800,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-audit-report/-/npm-audit-report-6.0.0.tgz", ++ "integrity": "sha512-Ag6Y1irw/+CdSLqEEAn69T8JBgBThj5mw0vuFIKeP7hATYuQuS5jkMjK6xmVB8pr7U4g5Audbun0lHhBDMIBRA==" + }, + "node_modules/npm/node_modules/npm-bundled": { + "version": "4.0.0", +@@ -23975,7 +24814,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-4.0.0.tgz", ++ "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==" + }, + "node_modules/npm/node_modules/npm-install-checks": { + "version": "7.1.1", +@@ -23987,7 +24828,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.1.tgz", ++ "integrity": "sha512-u6DCwbow5ynAX5BdiHQ9qvexme4U3qHW3MWe5NqH+NeBm0LbiH6zvGjNNew1fY+AZZUtVHbOPF3j7mJxbUzpXg==" + }, + "node_modules/npm/node_modules/npm-normalize-package-bin": { + "version": "4.0.0", +@@ -23996,7 +24839,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz", ++ "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==" + }, + "node_modules/npm/node_modules/npm-package-arg": { + "version": "12.0.2", +@@ -24011,7 +24856,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-12.0.2.tgz", ++ "integrity": "sha512-f1NpFjNI9O4VbKMOlA5QoBq/vSQPORHcTZ2feJpFkTHJ9eQkdlmZEKSjcAhxTGInC7RlEyScT9ui67NaOsjFWA==" + }, + "node_modules/npm/node_modules/npm-packlist": { + "version": "9.0.0", +@@ -24023,7 +24870,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-9.0.0.tgz", ++ "integrity": "sha512-8qSayfmHJQTx3nJWYbbUmflpyarbLMBc6LCAjYsiGtXxDB68HaZpb8re6zeaLGxZzDuMdhsg70jryJe+RrItVQ==" + }, + "node_modules/npm/node_modules/npm-pick-manifest": { + "version": "10.0.0", +@@ -24038,7 +24887,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-10.0.0.tgz", ++ "integrity": "sha512-r4fFa4FqYY8xaM7fHecQ9Z2nE9hgNfJR+EmoKv0+chvzWkBcORX3r0FpTByP+CbOVJDladMXnPQGVN8PBLGuTQ==" + }, + "node_modules/npm/node_modules/npm-profile": { + "version": "11.0.1", +@@ -24051,7 +24902,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-profile/-/npm-profile-11.0.1.tgz", ++ "integrity": "sha512-HP5Cw9WHwFS9vb4fxVlkNAQBUhVL5BmW6rAR+/JWkpwqcFJid7TihKUdYDWqHl0NDfLd0mpucheGySqo8ysyfw==" + }, + "node_modules/npm/node_modules/npm-registry-fetch": { + "version": "18.0.2", +@@ -24070,7 +24923,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-18.0.2.tgz", ++ "integrity": "sha512-LeVMZBBVy+oQb5R6FDV9OlJCcWDU+al10oKpe+nsvcHnG24Z3uM3SvJYKfGJlfGjVU8v9liejCrUR/M5HO5NEQ==" + }, + "node_modules/npm/node_modules/npm-user-validate": { + "version": "3.0.0", +@@ -24079,7 +24934,9 @@ + "license": "BSD-2-Clause", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-3.0.0.tgz", ++ "integrity": "sha512-9xi0RdSmJ4mPYTC393VJPz1Sp8LyCx9cUnm/L9Qcb3cFO8gjT4mN20P9FAsea8qDHdQ7LtcN8VLh2UT47SdKCw==" + }, + "node_modules/npm/node_modules/p-map": { + "version": "7.0.3", +@@ -24091,13 +24948,17 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.3.tgz", ++ "integrity": "sha512-VkndIv2fIB99swvQoA65bm+fsmt6UNdGeIB0oxBs+WhAhdh08QA04JXpI7rbB9r08/nkbysKoya9rtDERYOYMA==" + }, + "node_modules/npm/node_modules/package-json-from-dist": { + "version": "1.0.1", + "dev": true, + "inBundle": true, +- "license": "BlueOak-1.0.0" ++ "license": "BlueOak-1.0.0", ++ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", ++ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==" + }, + "node_modules/npm/node_modules/pacote": { + "version": "19.0.1", +@@ -24128,7 +24989,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/pacote/-/pacote-19.0.1.tgz", ++ "integrity": "sha512-zIpxWAsr/BvhrkSruspG8aqCQUUrWtpwx0GjiRZQhEM/pZXrigA32ElN3vTcCPUDOFmHr6SFxwYrvVUs5NTEUg==" + }, + "node_modules/npm/node_modules/parse-conflict-json": { + "version": "4.0.0", +@@ -24142,7 +25005,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-4.0.0.tgz", ++ "integrity": "sha512-37CN2VtcuvKgHUs8+0b1uJeEsbGn61GRHz469C94P5xiOoqpDYJYwjg4RY9Vmz39WyZAVkR5++nbJwLMIgOCnQ==" + }, + "node_modules/npm/node_modules/path-key": { + "version": "3.1.1", +@@ -24151,7 +25016,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", ++ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "node_modules/npm/node_modules/path-scurry": { + "version": "1.11.1", +@@ -24167,7 +25034,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", ++ "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==" + }, + "node_modules/npm/node_modules/postcss-selector-parser": { + "version": "7.1.0", +@@ -24180,7 +25049,9 @@ + }, + "engines": { + "node": ">=4" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz", ++ "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==" + }, + "node_modules/npm/node_modules/proc-log": { + "version": "5.0.0", +@@ -24189,7 +25060,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz", ++ "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==" + }, + "node_modules/npm/node_modules/proggy": { + "version": "3.0.0", +@@ -24198,7 +25071,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/proggy/-/proggy-3.0.0.tgz", ++ "integrity": "sha512-QE8RApCM3IaRRxVzxrjbgNMpQEX6Wu0p0KBeoSiSEw5/bsGwZHsshF4LCxH2jp/r6BU+bqA3LrMDEYNfJnpD8Q==" + }, + "node_modules/npm/node_modules/promise-all-reject-late": { + "version": "1.0.1", +@@ -24207,7 +25082,9 @@ + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz", ++ "integrity": "sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==" + }, + "node_modules/npm/node_modules/promise-call-limit": { + "version": "3.0.2", +@@ -24216,7 +25093,9 @@ + "license": "ISC", + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.2.tgz", ++ "integrity": "sha512-mRPQO2T1QQVw11E7+UdCJu7S61eJVWknzml9sC1heAdj1jxl0fWMBypIt9ZOcLFf8FkG995ZD7RnVk7HH72fZw==" + }, + "node_modules/npm/node_modules/promise-retry": { + "version": "2.0.1", +@@ -24229,7 +25108,9 @@ + }, + "engines": { + "node": ">=10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", ++ "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==" + }, + "node_modules/npm/node_modules/promzard": { + "version": "2.0.0", +@@ -24241,7 +25122,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/promzard/-/promzard-2.0.0.tgz", ++ "integrity": "sha512-Ncd0vyS2eXGOjchIRg6PVCYKetJYrW1BSbbIo+bKdig61TB6nH2RQNF2uP+qMpsI73L/jURLWojcw8JNIKZ3gg==" + }, + "node_modules/npm/node_modules/qrcode-terminal": { + "version": "0.12.0", +@@ -24249,7 +25132,9 @@ + "inBundle": true, + "bin": { + "qrcode-terminal": "bin/qrcode-terminal.js" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz", ++ "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==" + }, + "node_modules/npm/node_modules/read": { + "version": "4.1.0", +@@ -24261,7 +25146,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/read/-/read-4.1.0.tgz", ++ "integrity": "sha512-uRfX6K+f+R8OOrYScaM3ixPY4erg69f8DN6pgTvMcA9iRc8iDhwrA4m3Yu8YYKsXJgVvum+m8PkRboZwwuLzYA==" + }, + "node_modules/npm/node_modules/read-cmd-shim": { + "version": "5.0.0", +@@ -24270,7 +25157,9 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-5.0.0.tgz", ++ "integrity": "sha512-SEbJV7tohp3DAAILbEMPXavBjAnMN0tVnh4+9G8ihV4Pq3HYF9h8QNez9zkJ1ILkv9G2BjdzwctznGZXgu/HGw==" + }, + "node_modules/npm/node_modules/read-package-json-fast": { + "version": "4.0.0", +@@ -24283,7 +25172,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz", ++ "integrity": "sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==" + }, + "node_modules/npm/node_modules/retry": { + "version": "0.12.0", +@@ -24292,14 +25183,18 @@ + "license": "MIT", + "engines": { + "node": ">= 4" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", ++ "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==" + }, + "node_modules/npm/node_modules/safer-buffer": { + "version": "2.1.2", + "dev": true, + "inBundle": true, + "license": "MIT", +- "optional": true ++ "optional": true, ++ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", ++ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/npm/node_modules/semver": { + "version": "7.7.2", +@@ -24311,7 +25206,9 @@ + }, + "engines": { + "node": ">=10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", ++ "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==" + }, + "node_modules/npm/node_modules/shebang-command": { + "version": "2.0.0", +@@ -24323,7 +25220,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", ++ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==" + }, + "node_modules/npm/node_modules/shebang-regex": { + "version": "3.0.0", +@@ -24332,7 +25231,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", ++ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "node_modules/npm/node_modules/signal-exit": { + "version": "4.1.0", +@@ -24344,7 +25245,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", ++ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" + }, + "node_modules/npm/node_modules/sigstore": { + "version": "3.1.0", +@@ -24361,7 +25264,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-3.1.0.tgz", ++ "integrity": "sha512-ZpzWAFHIFqyFE56dXqgX/DkDRZdz+rRcjoIk/RQU4IX0wiCv1l8S7ZrXDHcCc+uaf+6o7w3h2l3g6GYG5TKN9Q==" + }, + "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/bundle": { + "version": "3.1.0", +@@ -24373,7 +25278,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz", ++ "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag==" + }, + "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/core": { + "version": "2.0.0", +@@ -24382,7 +25289,9 @@ + "license": "Apache-2.0", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz", ++ "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==" + }, + "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/sign": { + "version": "3.1.0", +@@ -24399,7 +25308,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz", ++ "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw==" + }, + "node_modules/npm/node_modules/sigstore/node_modules/@sigstore/verify": { + "version": "2.1.1", +@@ -24413,7 +25324,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz", ++ "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w==" + }, + "node_modules/npm/node_modules/smart-buffer": { + "version": "4.2.0", +@@ -24423,7 +25336,9 @@ + "engines": { + "node": ">= 6.0.0", + "npm": ">= 3.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", ++ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" + }, + "node_modules/npm/node_modules/socks": { + "version": "2.8.5", +@@ -24437,7 +25352,9 @@ + "engines": { + "node": ">= 10.0.0", + "npm": ">= 3.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.5.tgz", ++ "integrity": "sha512-iF+tNDQla22geJdTyJB1wM/qrX9DMRwWrciEPwWLPRWAUEM8sQiyxgckLxWT1f7+9VabJS0jTGGr4QgBuvi6Ww==" + }, + "node_modules/npm/node_modules/socks-proxy-agent": { + "version": "8.0.5", +@@ -24451,7 +25368,9 @@ + }, + "engines": { + "node": ">= 14" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", ++ "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==" + }, + "node_modules/npm/node_modules/spdx-correct": { + "version": "3.2.0", +@@ -24461,7 +25380,9 @@ + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", ++ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==" + }, + "node_modules/npm/node_modules/spdx-correct/node_modules/spdx-expression-parse": { + "version": "3.0.1", +@@ -24471,13 +25392,17 @@ + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", ++ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==" + }, + "node_modules/npm/node_modules/spdx-exceptions": { + "version": "2.5.0", + "dev": true, + "inBundle": true, +- "license": "CC-BY-3.0" ++ "license": "CC-BY-3.0", ++ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", ++ "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==" + }, + "node_modules/npm/node_modules/spdx-expression-parse": { + "version": "4.0.0", +@@ -24487,19 +25412,25 @@ + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", ++ "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==" + }, + "node_modules/npm/node_modules/spdx-license-ids": { + "version": "3.0.21", + "dev": true, + "inBundle": true, +- "license": "CC0-1.0" ++ "license": "CC0-1.0", ++ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz", ++ "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==" + }, + "node_modules/npm/node_modules/sprintf-js": { + "version": "1.1.3", + "dev": true, + "inBundle": true, +- "license": "BSD-3-Clause" ++ "license": "BSD-3-Clause", ++ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz", ++ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" + }, + "node_modules/npm/node_modules/ssri": { + "version": "12.0.0", +@@ -24511,7 +25442,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz", ++ "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==" + }, + "node_modules/npm/node_modules/string-width": { + "version": "4.2.3", +@@ -24525,7 +25458,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", ++ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" + }, + "node_modules/npm/node_modules/string-width-cjs": { + "name": "string-width", +@@ -24540,7 +25475,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", ++ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" + }, + "node_modules/npm/node_modules/strip-ansi": { + "version": "6.0.1", +@@ -24552,7 +25489,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", ++ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" + }, + "node_modules/npm/node_modules/strip-ansi-cjs": { + "name": "strip-ansi", +@@ -24565,7 +25504,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", ++ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" + }, + "node_modules/npm/node_modules/supports-color": { + "version": "9.4.0", +@@ -24577,7 +25518,9 @@ + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz", ++ "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==" + }, + "node_modules/npm/node_modules/tar": { + "version": "6.2.1", +@@ -24594,7 +25537,9 @@ + }, + "engines": { + "node": ">=10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", ++ "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==" + }, + "node_modules/npm/node_modules/tar/node_modules/fs-minipass": { + "version": "2.1.0", +@@ -24606,7 +25551,9 @@ + }, + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", ++ "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==" + }, + "node_modules/npm/node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { + "version": "3.3.6", +@@ -24618,7 +25565,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", ++ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" + }, + "node_modules/npm/node_modules/tar/node_modules/minipass": { + "version": "5.0.0", +@@ -24627,7 +25576,9 @@ + "license": "ISC", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", ++ "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==" + }, + "node_modules/npm/node_modules/tar/node_modules/minizlib": { + "version": "2.1.2", +@@ -24640,7 +25591,9 @@ + }, + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", ++ "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==" + }, + "node_modules/npm/node_modules/tar/node_modules/minizlib/node_modules/minipass": { + "version": "3.3.6", +@@ -24652,19 +25605,25 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", ++ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" + }, + "node_modules/npm/node_modules/text-table": { + "version": "0.2.0", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", ++ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + }, + "node_modules/npm/node_modules/tiny-relative-date": { + "version": "1.3.0", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz", ++ "integrity": "sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==" + }, + "node_modules/npm/node_modules/tinyglobby": { + "version": "0.2.14", +@@ -24680,7 +25639,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz", ++ "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==" + }, + "node_modules/npm/node_modules/tinyglobby/node_modules/fdir": { + "version": "6.4.6", +@@ -24694,7 +25655,9 @@ + "picomatch": { + "optional": true + } +- } ++ }, ++ "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz", ++ "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==" + }, + "node_modules/npm/node_modules/tinyglobby/node_modules/picomatch": { + "version": "4.0.2", +@@ -24706,7 +25669,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", ++ "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==" + }, + "node_modules/npm/node_modules/treeverse": { + "version": "3.0.0", +@@ -24715,7 +25680,9 @@ + "license": "ISC", + "engines": { + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz", ++ "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==" + }, + "node_modules/npm/node_modules/tuf-js": { + "version": "3.0.1", +@@ -24729,7 +25696,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.0.1.tgz", ++ "integrity": "sha512-+68OP1ZzSF84rTckf3FA95vJ1Zlx/uaXyiiKyPd1pA4rZNkpEvDAKmsu1xUSmbF/chCRYgZ6UZkDwC7PmzmAyA==" + }, + "node_modules/npm/node_modules/tuf-js/node_modules/@tufjs/models": { + "version": "3.0.1", +@@ -24742,7 +25711,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz", ++ "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==" + }, + "node_modules/npm/node_modules/unique-filename": { + "version": "4.0.0", +@@ -24754,7 +25725,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz", ++ "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==" + }, + "node_modules/npm/node_modules/unique-slug": { + "version": "5.0.0", +@@ -24766,13 +25739,17 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz", ++ "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==" + }, + "node_modules/npm/node_modules/util-deprecate": { + "version": "1.0.2", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", ++ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, + "node_modules/npm/node_modules/validate-npm-package-license": { + "version": "3.0.4", +@@ -24782,7 +25759,9 @@ + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", ++ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==" + }, + "node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": { + "version": "3.0.1", +@@ -24792,7 +25771,9 @@ + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", ++ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==" + }, + "node_modules/npm/node_modules/validate-npm-package-name": { + "version": "6.0.1", +@@ -24801,13 +25782,17 @@ + "license": "ISC", + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.1.tgz", ++ "integrity": "sha512-OaI//3H0J7ZkR1OqlhGA8cA+Cbk/2xFOQpJOt5+s27/ta9eZwpeervh4Mxh4w0im/kdgktowaqVNR7QOrUd7Yg==" + }, + "node_modules/npm/node_modules/walk-up-path": { + "version": "3.0.1", + "dev": true, + "inBundle": true, +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz", ++ "integrity": "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==" + }, + "node_modules/npm/node_modules/which": { + "version": "5.0.0", +@@ -24822,7 +25807,9 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", ++ "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==" + }, + "node_modules/npm/node_modules/which/node_modules/isexe": { + "version": "3.1.1", +@@ -24831,7 +25818,9 @@ + "license": "ISC", + "engines": { + "node": ">=16" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", ++ "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==" + }, + "node_modules/npm/node_modules/wrap-ansi": { + "version": "8.1.0", +@@ -24848,7 +25837,9 @@ + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", ++ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==" + }, + "node_modules/npm/node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", +@@ -24866,7 +25857,9 @@ + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", ++ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==" + }, + "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { + "version": "4.3.0", +@@ -24881,7 +25874,9 @@ + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", ++ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==" + }, + "node_modules/npm/node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "6.1.0", +@@ -24893,13 +25888,17 @@ + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", ++ "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==" + }, + "node_modules/npm/node_modules/wrap-ansi/node_modules/emoji-regex": { + "version": "9.2.2", + "dev": true, + "inBundle": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", ++ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" + }, + "node_modules/npm/node_modules/wrap-ansi/node_modules/string-width": { + "version": "5.1.2", +@@ -24916,7 +25915,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", ++ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==" + }, + "node_modules/npm/node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "7.1.0", +@@ -24931,7 +25932,9 @@ + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", ++ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==" + }, + "node_modules/npm/node_modules/write-file-atomic": { + "version": "6.0.0", +@@ -24944,13 +25947,17 @@ + }, + "engines": { + "node": "^18.17.0 || >=20.5.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-6.0.0.tgz", ++ "integrity": "sha512-GmqrO8WJ1NuzJ2DrziEI2o57jKAVIQNf8a18W3nCYU3H7PNWqCCVTeH6/NQE93CIllIgQS98rrmVkYgTX9fFJQ==" + }, + "node_modules/npm/node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "inBundle": true, +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", ++ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" + }, + "node_modules/nth-check": { + "version": "2.1.1", +@@ -25122,7 +26129,9 @@ + "license": "ISC", + "dependencies": { + "wrappy": "1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", ++ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==" + }, + "node_modules/onetime": { + "version": "5.1.2", +@@ -25138,6 +26147,19 @@ + "url": "https://github.com/sponsors/sindresorhus" + } + }, ++ "node_modules/only-allow": { ++ "version": "1.2.2", ++ "resolved": "https://registry.npmjs.org/only-allow/-/only-allow-1.2.2.tgz", ++ "integrity": "sha512-uxyNYDsCh5YIJ780G7hC5OHjVUr9reHsbZNMM80L9tZlTpb3hUzb36KXgW4ZUGtJKQnGA3xegmWg1BxhWV0jJA==", ++ "dev": true, ++ "license": "MIT", ++ "dependencies": { ++ "which-pm-runs": "1.1.0" ++ }, ++ "bin": { ++ "only-allow": "bin.js" ++ } ++ }, + "node_modules/open": { + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz", +@@ -25194,7 +26216,9 @@ + }, + "engines": { + "node": ">= 0.8.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", ++ "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==" + }, + "node_modules/os-homedir": { + "version": "1.0.2", +@@ -25322,7 +26346,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", ++ "integrity": "sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==" + }, + "node_modules/p-limit": { + "version": "3.1.0", +@@ -25335,7 +26361,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", ++ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==" + }, + "node_modules/p-locate": { + "version": "5.0.0", +@@ -25348,7 +26376,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", ++ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==" + }, + "node_modules/p-map": { + "version": "7.0.3", +@@ -25404,7 +26434,9 @@ + "license": "MIT", + "engines": { + "node": ">=6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", ++ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, + "node_modules/pac-proxy-agent": { + "version": "7.1.0", +@@ -25812,7 +26844,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", ++ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", +@@ -25820,7 +26854,9 @@ + "license": "MIT", + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", ++ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" + }, + "node_modules/path-is-inside": { + "version": "1.0.2", +@@ -25834,11 +26870,15 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", ++ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "node_modules/path-parse": { + "version": "1.0.7", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", ++ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + }, + "node_modules/path-scurry": { + "version": "1.11.1", +@@ -25870,7 +26910,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", ++ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" + }, + "node_modules/pathe": { + "version": "2.0.3", +@@ -25955,7 +26997,9 @@ + "license": "MIT", + "engines": { + "node": ">=4" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", ++ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==" + }, + "node_modules/pikaday": { + "version": "1.8.2", +@@ -26029,7 +27073,9 @@ + "license": "MIT", + "engines": { + "node": ">= 6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", ++ "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==" + }, + "node_modules/pixelmatch": { + "version": "7.1.0", +@@ -26142,7 +27188,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", ++ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==" + }, + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", +@@ -26154,7 +27202,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", ++ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==" + }, + "node_modules/pkg-dir/node_modules/locate-path": { + "version": "5.0.0", +@@ -26165,7 +27215,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", ++ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==" + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", +@@ -26179,7 +27231,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", ++ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==" + }, + "node_modules/pkg-dir/node_modules/p-locate": { + "version": "4.1.0", +@@ -26190,7 +27244,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", ++ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==" + }, + "node_modules/playwright": { + "version": "1.56.1", +@@ -26489,7 +27545,9 @@ + "license": "MIT", + "engines": { + "node": ">= 0.8.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", ++ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" + }, + "node_modules/prepend-http": { + "version": "1.0.4", +@@ -26567,7 +27625,9 @@ + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", ++ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==" + }, + "node_modules/pretty-ms": { + "version": "9.0.0", +@@ -26597,7 +27657,9 @@ + "node_modules/process-nextick-args": { + "version": "2.0.1", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", ++ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + }, + "node_modules/process-warning": { + "version": "5.0.0", +@@ -26670,7 +27732,9 @@ + }, + "node_modules/proto-list": { + "version": "1.2.4", +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", ++ "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==" + }, + "node_modules/protobufjs": { + "version": "7.5.0", +@@ -26770,7 +27834,9 @@ + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", ++ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, + "node_modules/pseudomap": { + "version": "1.0.2", +@@ -26938,7 +28004,9 @@ + "license": "MIT", + "engines": { + "node": ">=6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", ++ "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==" + }, + "node_modules/puppeteer": { + "version": "24.20.0", +@@ -27060,7 +28128,9 @@ + "url": "https://feross.org/support" + } + ], +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", ++ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" + }, + "node_modules/quick-format-unescaped": { + "version": "4.0.4", +@@ -27125,7 +28195,9 @@ + }, + "bin": { + "rc": "cli.js" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", ++ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==" + }, + "node_modules/rc/node_modules/ini": { + "version": "1.3.8", +@@ -27139,7 +28211,9 @@ + "license": "MIT", + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", ++ "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==" + }, + "node_modules/react": { + "version": "19.2.0", +@@ -27277,7 +28351,9 @@ + "node_modules/react-is": { + "version": "18.2.0", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", ++ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + }, + "node_modules/react-reconciler": { + "version": "0.33.0", +@@ -27504,12 +28580,16 @@ + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", ++ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==" + }, + "node_modules/readable-stream/node_modules/safe-buffer": { + "version": "5.1.2", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", ++ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "node_modules/readdirp": { + "version": "3.6.0", +@@ -27801,14 +28881,18 @@ + "license": "MIT", + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", ++ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "license": "MIT", + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", ++ "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" + }, + "node_modules/require-in-the-middle": { + "version": "7.5.1", +@@ -27861,7 +28945,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", ++ "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==" + }, + "node_modules/resolve-cwd/node_modules/resolve-from": { + "version": "5.0.0", +@@ -27869,7 +28955,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", ++ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + }, + "node_modules/resolve-from": { + "version": "4.0.0", +@@ -27886,7 +28974,9 @@ + "license": "MIT", + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", ++ "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==" + }, + "node_modules/resolve-url": { + "version": "0.2.1", +@@ -27966,7 +29056,9 @@ + "engines": { + "iojs": ">=1.0.0", + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", ++ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" + }, + "node_modules/rfdc": { + "version": "1.4.1", +@@ -28260,7 +29352,9 @@ + "license": "MIT", + "dependencies": { + "queue-microtask": "^1.2.2" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", ++ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==" + }, + "node_modules/rxjs": { + "version": "7.8.1", +@@ -28314,7 +29408,9 @@ + "url": "https://feross.org/support" + } + ], +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", ++ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" + }, + "node_modules/safe-push-apply": { + "version": "1.0.0", +@@ -28909,14 +30005,18 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", ++ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==" + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", ++ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "node_modules/shell-quote": { + "version": "1.8.1", +@@ -29013,7 +30113,9 @@ + }, + "node_modules/signal-exit": { + "version": "3.0.7", +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", ++ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + }, + "node_modules/signale": { + "version": "1.4.0", +@@ -29128,7 +30230,9 @@ + "url": "https://feross.org/support" + } + ], +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", ++ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" + }, + "node_modules/simple-get": { + "version": "4.0.1", +@@ -29151,7 +30255,9 @@ + "decompress-response": "^6.0.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", ++ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==" + }, + "node_modules/simple-git": { + "version": "3.28.0", +@@ -29245,7 +30351,9 @@ + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", ++ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" + }, + "node_modules/slice-ansi": { + "version": "7.1.0", +@@ -29426,7 +30534,9 @@ + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", ++ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + }, + "node_modules/source-map-js": { + "version": "1.2.1", +@@ -29525,12 +30635,16 @@ + "license": "ISC", + "engines": { + "node": ">= 10.x" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", ++ "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==" + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "dev": true, +- "license": "BSD-3-Clause" ++ "license": "BSD-3-Clause", ++ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", ++ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" + }, + "node_modules/ssh-config": { + "version": "5.0.4", +@@ -29546,14 +30660,18 @@ + }, + "engines": { + "node": ">=10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", ++ "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==" + }, + "node_modules/stack-utils/node_modules/escape-string-regexp": { + "version": "2.0.0", + "license": "MIT", + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", ++ "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" + }, + "node_modules/stackback": { + "version": "0.0.2", +@@ -29786,11 +30904,15 @@ + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", ++ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==" + }, + "node_modules/string_decoder/node_modules/safe-buffer": { + "version": "5.1.2", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", ++ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + }, + "node_modules/string-argv": { + "version": "0.3.2", +@@ -29824,7 +30946,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", ++ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" + }, + "node_modules/string-width-cjs": { + "name": "string-width", +@@ -29907,7 +31031,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", ++ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" + }, + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", +@@ -29973,7 +31099,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", ++ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" + }, + "node_modules/strip-literal": { + "version": "3.0.0", +@@ -30123,7 +31251,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", ++ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==" + }, + "node_modules/supports-hyperlinks": { + "version": "3.1.0", +@@ -30148,7 +31278,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", ++ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" + }, + "node_modules/symbol-tree": { + "version": "3.2.4", +@@ -30304,7 +31436,9 @@ + "dependencies": { + "debug": "4.3.1", + "is2": "^2.0.6" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz", ++ "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==" + }, + "node_modules/tcp-port-used/node_modules/debug": { + "version": "4.3.1", +@@ -30320,7 +31454,9 @@ + "supports-color": { + "optional": true + } +- } ++ }, ++ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", ++ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==" + }, + "node_modules/temp-dir": { + "version": "3.0.0", +@@ -30328,7 +31464,9 @@ + "license": "MIT", + "engines": { + "node": ">=14.16" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-3.0.0.tgz", ++ "integrity": "sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==" + }, + "node_modules/tempfile": { + "version": "5.0.0", +@@ -30342,7 +31480,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-5.0.0.tgz", ++ "integrity": "sha512-bX655WZI/F7EoTDw9JvQURqAXiPHi8o8+yFxPF2lWYyz1aHnmMRuXWqL6YB6GmeO0o4DIYWHLgGNi/X64T+X4Q==" + }, + "node_modules/tempy": { + "version": "3.1.0", +@@ -30531,7 +31671,9 @@ + }, + "engines": { + "node": ">=8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", ++ "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==" + }, + "node_modules/test-exclude/node_modules/brace-expansion": { + "version": "1.1.11", +@@ -30812,7 +31954,9 @@ + }, + "node_modules/tr46": { + "version": "0.0.3", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", ++ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + }, + "node_modules/traverse": { + "version": "0.6.8", +@@ -31143,7 +32287,9 @@ + }, + "engines": { + "node": ">= 0.8.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", ++ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==" + }, + "node_modules/type-detect": { + "version": "4.0.8", +@@ -31596,7 +32742,9 @@ + "license": "MIT", + "engines": { + "node": ">= 10.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", ++ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" + }, + "node_modules/unpipe": { + "version": "1.0.0", +@@ -31814,7 +32962,9 @@ + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", ++ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==" + }, + "node_modules/urix": { + "version": "0.1.0", +@@ -31855,7 +33005,9 @@ + }, + "node_modules/util-deprecate": { + "version": "1.0.2", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", ++ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + }, + "node_modules/uuid": { + "version": "10.0.0", +@@ -32533,7 +33685,9 @@ + }, + "bin": { + "installServerIntoExtension": "bin/installServerIntoExtension" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", ++ "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==" + }, + "node_modules/vscode-languageserver-protocol": { + "version": "3.17.5", +@@ -32541,7 +33695,9 @@ + "dependencies": { + "vscode-jsonrpc": "8.2.0", + "vscode-languageserver-types": "3.17.5" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", ++ "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==" + }, + "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": { + "version": "8.2.0", +@@ -32559,7 +33715,9 @@ + }, + "node_modules/vscode-languageserver-types": { + "version": "3.17.5", +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", ++ "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" + }, + "node_modules/vscode-uri": { + "version": "3.1.0", +@@ -33072,7 +34230,9 @@ + }, + "node_modules/webidl-conversions": { + "version": "3.0.1", +- "license": "BSD-2-Clause" ++ "license": "BSD-2-Clause", ++ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", ++ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + }, + "node_modules/webpack-sources": { + "version": "3.3.3", +@@ -33118,7 +34278,9 @@ + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", ++ "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==" + }, + "node_modules/which": { + "version": "2.0.2", +@@ -33131,7 +34293,9 @@ + }, + "engines": { + "node": ">= 8" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", ++ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==" + }, + "node_modules/which-boxed-primitive": { + "version": "1.1.1", +@@ -33207,6 +34371,16 @@ + "url": "https://github.com/sponsors/ljharb" + } + }, ++ "node_modules/which-pm-runs": { ++ "version": "1.1.0", ++ "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz", ++ "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": ">=4" ++ } ++ }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", +@@ -33353,7 +34527,9 @@ + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", ++ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==" + }, + "node_modules/wrap-ansi-cjs": { + "name": "wrap-ansi", +@@ -33374,7 +34550,9 @@ + }, + "node_modules/wrappy": { + "version": "1.0.2", +- "license": "ISC" ++ "license": "ISC", ++ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", ++ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + }, + "node_modules/write-file-atomic": { + "version": "4.0.2", +@@ -33386,7 +34564,9 @@ + }, + "engines": { + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", ++ "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==" + }, + "node_modules/ws": { + "version": "8.18.3", +@@ -33438,7 +34618,9 @@ + "node_modules/xml": { + "version": "1.0.1", + "dev": true, +- "license": "MIT" ++ "license": "MIT", ++ "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", ++ "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==" + }, + "node_modules/xml-name-validator": { + "version": "4.0.0", +@@ -33478,7 +34660,9 @@ + "license": "ISC", + "engines": { + "node": ">=10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", ++ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + }, + "node_modules/yallist": { + "version": "2.1.2", +@@ -33512,14 +34696,18 @@ + }, + "engines": { + "node": ">=12" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", ++ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==" + }, + "node_modules/yargs-parser": { + "version": "20.2.9", + "license": "ISC", + "engines": { + "node": ">=10" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", ++ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" + }, + "node_modules/yargs-unparser": { + "version": "2.0.0", +@@ -33552,7 +34740,9 @@ + "license": "ISC", + "engines": { + "node": ">=12" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", ++ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" + }, + "node_modules/yauzl": { + "version": "2.10.0", +@@ -33582,7 +34772,9 @@ + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", ++ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" + }, + "node_modules/yoctocolors": { + "version": "2.0.0", +@@ -33714,14 +34906,14 @@ + } + }, + "packages/cli/node_modules/commander": { +- "version": "14.0.1", +- "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.1.tgz", +- "integrity": "sha512-2JkV3gUZUVrbNA+1sjBOYLsMZ5cEEl8GTFP2a4AVz5hvasAMCQ1D2l2le/cX+pV4N6ZU17zjUahLpIXRrnWL8A==", ++ "version": "14.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" +- } ++ }, ++ "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz", ++ "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==" + }, + "packages/cli/node_modules/p-queue": { + "version": "9.0.0", +@@ -33821,6 +35013,84 @@ + "version": "0.0.0", + "devDependencies": {} + }, ++ "packages/extra-deps": { ++ "devDependencies": { ++ "only-allow": "*" ++ }, ++ "optionalDependencies": { ++ "esbuild": "0.15.18" ++ } ++ }, ++ "packages/extra-deps/node_modules/@esbuild/android-arm": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz", ++ "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==", ++ "cpu": [ ++ "arm" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "android" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "packages/extra-deps/node_modules/@esbuild/linux-loong64": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz", ++ "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==", ++ "cpu": [ ++ "loong64" ++ ], ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ], ++ "engines": { ++ "node": ">=12" ++ } ++ }, ++ "packages/extra-deps/node_modules/esbuild": { ++ "version": "0.15.18", ++ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz", ++ "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==", ++ "hasInstallScript": true, ++ "license": "MIT", ++ "optional": true, ++ "bin": { ++ "esbuild": "bin/esbuild" ++ }, ++ "engines": { ++ "node": ">=12" ++ }, ++ "optionalDependencies": { ++ "@esbuild/android-arm": "0.15.18", ++ "@esbuild/linux-loong64": "0.15.18", ++ "esbuild-android-64": "0.15.18", ++ "esbuild-android-arm64": "0.15.18", ++ "esbuild-darwin-64": "0.15.18", ++ "esbuild-darwin-arm64": "0.15.18", ++ "esbuild-freebsd-64": "0.15.18", ++ "esbuild-freebsd-arm64": "0.15.18", ++ "esbuild-linux-32": "0.15.18", ++ "esbuild-linux-64": "0.15.18", ++ "esbuild-linux-arm": "0.15.18", ++ "esbuild-linux-arm64": "0.15.18", ++ "esbuild-linux-mips64le": "0.15.18", ++ "esbuild-linux-ppc64le": "0.15.18", ++ "esbuild-linux-riscv64": "0.15.18", ++ "esbuild-linux-s390x": "0.15.18", ++ "esbuild-netbsd-64": "0.15.18", ++ "esbuild-openbsd-64": "0.15.18", ++ "esbuild-sunos-64": "0.15.18", ++ "esbuild-windows-32": "0.15.18", ++ "esbuild-windows-64": "0.15.18", ++ "esbuild-windows-arm64": "0.15.18" ++ } ++ }, + "packages/lib_ai_configuration": { + "name": "@gitlab-org/ai-configuration", + "version": "0.0.0", +@@ -39663,4 +40933,4 @@ + } + } + } +-} ++} +\ No newline at end of file +diff --git a/package.json b/package.json +index 23fcb1c..320272d 100644 +--- a/package.json ++++ b/package.json +@@ -180,7 +180,8 @@ + "ts-node": "^10.9.2", + "tsx": "^4.20.4", + "type-fest": "^4.41.0", +- "ws": "^8.18.1" ++ "ws": "^8.18.1", ++ "extra-deps": "workspace:*" + }, + "scripts": { + "prepare": "node scripts/git_blame_ignore.mjs && lefthook install", +diff --git a/packages/extra-deps/package.json b/packages/extra-deps/package.json +new file mode 100644 +index 0000000..6099867 +--- /dev/null ++++ b/packages/extra-deps/package.json +@@ -0,0 +1,8 @@ ++{ ++ "devDependencies": { ++ "only-allow": "*" ++ }, ++ "optionalDependencies": { ++ "esbuild": "0.15.18" ++ } ++} diff --git a/pkgs/by-name/gi/gitlab-duo/package.nix b/pkgs/by-name/gi/gitlab-duo/package.nix new file mode 100644 index 000000000000..b684fc7cca56 --- /dev/null +++ b/pkgs/by-name/gi/gitlab-duo/package.nix @@ -0,0 +1,84 @@ +{ + buildNpmPackage, + bun, + concurrently, + fetchFromGitLab, + lib, + nodejs_22, + patch-package, + stdenv, + versionCheckHook, +}: +buildNpmPackage (finalAttrs: { + pname = "gitlab-duo"; + version = "8.57.1"; + + # DOCS https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp#node-version + nodejs = nodejs_22; + + src = fetchFromGitLab { + group = "gitlab-org"; + owner = "editor-extensions"; + repo = "gitlab-lsp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-IofCSh9ja3C8WEiksp0pFJ6LZOu86o4VHnwiIUHHgLI="; + }; + + patches = [ + # HACK https://github.com/NixOS/nixpkgs/issues/408720 + # Fix packages locked but without hash, or even missing + ./missing-hashes.patch + ]; + + # PATCH: Only build for the current platform, not all targets + postPatch = '' + substituteInPlace packages/cli/scripts/compile_executables.sh \ + --replace-fail \ + 'SUPPORTED_TARGETS="bun-linux-x64 bun-linux-arm64 bun-windows-x64 bun-darwin-arm64 bun-darwin-x64"' \ + "SUPPORTED_TARGETS=bun-$TARGET" + ''; + + npmFlags = [ "--install-links" ]; + npmDepsHash = "sha256-dj4TrKMdXgUZr7/0NLT7h8jT3VjobB9KFO8tl/+47rk="; + npmBuildScript = "build:binary"; + npmWorkspace = "@gitlab/duo-cli"; + nativeBuildInputs = [ + bun + concurrently + patch-package + ]; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "true"; + env.PUPPETEER_SKIP_DOWNLOAD = "true"; + env.TARGET = "${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}"; + + postConfigure = '' + patchShebangs --build ./packages/cli/scripts + npmBuildScript=build:bundle runHook npmBuildHook + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 packages/cli/bin/duo-$TARGET $out/bin/duo + + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = ./update.sh; + + meta = { + broken = stdenv.hostPlatform.isDarwin; + changelog = "https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp/-/blob/main/CHANGELOG.md"; + description = "CLI for GitLab AI assistant"; + downloadPage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp"; + homepage = "https://about.gitlab.com/gitlab-duo/"; + license = lib.licenses.mit; + mainProgram = "duo"; + maintainers = with lib.maintainers; [ yajo ]; + }; +}) diff --git a/pkgs/by-name/gi/gitlab-duo/update.sh b/pkgs/by-name/gi/gitlab-duo/update.sh new file mode 100755 index 000000000000..33aff62cfadc --- /dev/null +++ b/pkgs/by-name/gi/gitlab-duo/update.sh @@ -0,0 +1,55 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p git jaq prefetch-npm-deps nix-update npm-lockfile-fix +set -euo pipefail + +# Get new Gitlab Duo release +nix-update --src-only "$UPDATE_NIX_ATTR_PATH" + +# Clone new sources +dir="$(mktemp -d --suffix="$UPDATE_NIX_PNAME")" +git clone --depth 1 \ + --branch "$(nix-instantiate --eval --raw -E "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.tag")" \ + "$(nix-instantiate --eval --raw -E "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.gitRepoUrl")" \ + "$dir" +pushd "$dir" + +# HACK https://github.com/npm/cli/issues/4460 +# Different dependencies require different versions of esbuild. Vite's lacks +# some integrity hashes. We add a dummy "extra-deps" package to the workspace +# to force recording those hashes. +esbuild_version=$(jaq -r '.packages["node_modules/vite/node_modules/esbuild"].version' ./package-lock.json) +mkdir packages/extra-deps +cat > packages/extra-deps/package.json < missing-hashes.patch +sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i package.nix +popd diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix index da15d43018aa..b8027fbdd3ee 100644 --- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix +++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix @@ -54,7 +54,10 @@ buildGoModule rec { description = "Indexes Git repositories into Elasticsearch for GitLab"; mainProgram = "gitlab-elasticsearch-indexer"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ yayayayaka ]; - teams = [ lib.teams.cyberus ]; + maintainers = with lib.maintainers; [ + e1mo + xanderio + yayayayaka + ]; }; } diff --git a/pkgs/by-name/gi/gitxray/package.nix b/pkgs/by-name/gi/gitxray/package.nix index c7d0ed73ae29..05587d6ff6ba 100644 --- a/pkgs/by-name/gi/gitxray/package.nix +++ b/pkgs/by-name/gi/gitxray/package.nix @@ -4,16 +4,16 @@ fetchFromGitHub, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "gitxray"; - version = "1.0.19"; + version = "1.0.20"; pyproject = true; src = fetchFromGitHub { owner = "kulkansecurity"; repo = "gitxray"; - tag = version; - hash = "sha256-jdN91oiKMr8ozjsQG2+lI55nPbjBa+ipWG9GYeFXCDw="; + tag = finalAttrs.version; + hash = "sha256-pnP9vqyobB9MY8axBokzZvM4L8Th3/wDA4adpNyF0G8="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -25,9 +25,9 @@ python3.pkgs.buildPythonApplication rec { meta = { description = "Tool which leverages Public GitHub REST APIs for various tasks"; homepage = "https://github.com/kulkansecurity/gitxray"; - changelog = "https://github.com/kulkansecurity/gitxray/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/kulkansecurity/gitxray/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "gitxray"; }; -} +}) diff --git a/pkgs/by-name/gl/gle/package.nix b/pkgs/by-name/gl/gle/package.nix index b2aa72fb03ac..f769cf015daa 100644 --- a/pkgs/by-name/gl/gle/package.nix +++ b/pkgs/by-name/gl/gle/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "linas"; repo = "glextrusion"; - rev = "refs/tags/${pname}-${version}"; + tag = "${pname}-${version}"; sha256 = "sha256-yvCu0EOwxOMN6upeHX+C2sIz1YVjjB/320g+Mf24S6g="; }; diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 2df155b5e3cd..8d4df32b84d1 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.20.8"; + version = "1.20.9"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-OZrVKzcFnA+mbGG0CET0bfVc77JHPCMMXIq9yzT8cWw="; + hash = "sha256-BbYsnLwBgZTwh3GWOd7F6hRD1ATVYspnN/iuqYhrt4o="; }; vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o="; diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index 08053805653d..3fecad6404c6 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,16 +10,16 @@ }: buildGo125Module rec { pname = "goreleaser"; - version = "2.13.2"; + version = "2.13.3"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${version}"; - hash = "sha256-yfstmysYhJCA8IyYZqnlLbNRNUyo5yEFAXD/jq5e4wE="; + hash = "sha256-VlpBz2FguUfN+ssv+PLSB9RDgLKGP2V/0pAxaLNGu7w="; }; - vendorHash = "sha256-nnUEWY9+u1p4S490yuvupdeFQZB00MD/BNpbbgjdjHc="; + vendorHash = "sha256-UiQ8JH6ISOmo5rQzxE1Zf4jU8VXtI29GsZFTINokLo8="; ldflags = [ "-s" diff --git a/pkgs/by-name/gp/gpd-pocket-4-pipewire/package.nix b/pkgs/by-name/gp/gpd-pocket-4-pipewire/package.nix new file mode 100644 index 000000000000..8a160b24ab34 --- /dev/null +++ b/pkgs/by-name/gp/gpd-pocket-4-pipewire/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitHub, + bankstown-lv2, + lsp-plugins, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gpd-pocket-4-pipewire"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "Manawyrm"; + repo = "gpd-pocket-4-pipewire"; + tag = finalAttrs.version; + hash = "sha256-FNnEfY1a3CeFCH+dRwb7NyOeDPeHDnwacw/8jLawDK0="; + }; + + postPatch = '' + substituteInPlace pipewire.conf.d/sink-gpd-pocket-4.conf \ + --replace-fail /usr/share/pipewire/pipewire.conf.d $out/share/pipewire/pipewire.conf.d + ''; + + installPhase = '' + install -dDm0755 "$out/share/pipewire/pipewire.conf.d/" + install -v -D -m0644 "pipewire.conf.d/gpd-pocket-4-mp-48k-l.wav" "$out/share/pipewire/pipewire.conf.d/gpd-pocket-4-mp-48k-l.wav" + install -v -D -m0644 "pipewire.conf.d/gpd-pocket-4-mp-48k-r.wav" "$out/share/pipewire/pipewire.conf.d/gpd-pocket-4-mp-48k-r.wav" + install -v -D -m0644 "pipewire.conf.d/sink-gpd-pocket-4.conf" "$out/share/pipewire/pipewire.conf.d/sink-gpd-pocket-4.conf" + ''; + + passthru.requiredLv2Packages = [ + bankstown-lv2 + lsp-plugins + ]; + + meta = { + description = "Pipewire audio DSP for internal speakers of GPD Pocket 4"; + license = lib.licenses.mit; + homepage = "https://github.com/Manawyrm/gpd-pocket-4-pipewire/"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ marcel ]; + }; +}) diff --git a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix index 04853be5b4db..38eaaf08cfc7 100644 --- a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix +++ b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "grafana-dash-n-grab"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-pgfIutJkpH4oELEQu1/3vJ1RPVLF+r4EAV3KpOLZixY="; + sha256 = "sha256-fKLyUaKcZfrBarKumjLmK+g9C0VZOYixxNXP7rU83co="; }; vendorHash = "sha256-MXWJ/riQTzAgUNJWvAzSvdHTAzRymlHheeNyJoKGAF4="; diff --git a/pkgs/by-name/gr/graphql-client/package.nix b/pkgs/by-name/gr/graphql-client/package.nix index a67e97b3fb78..b0b64eb4967a 100644 --- a/pkgs/by-name/gr/graphql-client/package.nix +++ b/pkgs/by-name/gr/graphql-client/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage rec { pname = "graphql-client"; - version = "0.15.0"; + version = "0.16.0"; src = fetchCrate { inherit version; crateName = "graphql_client_cli"; - hash = "sha256-kYznUgLe2hg8dOPJQVrl+zZQFAbiSkeHAgxiSiVsHoE="; + hash = "sha256-zWNarJDBSnZeFPQnF8nHOkFG8x0UDChi8l79OBNFA6A="; }; - cargoHash = "sha256-Knet/xIBZwbKWQHSVWCGxS+2W1qBRvQqEHhak6wWr94="; + cargoHash = "sha256-LYRdK+wOoaJ/qkJoNC+enaqlMfeACDvNA1iyNEgTXCg="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index 98d4f51d48da..0a0dca826a3a 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "grpc-health-probe"; - version = "0.4.43"; + version = "0.4.44"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-health-probe"; rev = "v${finalAttrs.version}"; - hash = "sha256-xmNqo+Wa/58944v52MAtFCy9G0LJVIn/XGG7JYqcCvM="; + hash = "sha256-3WzT4lUZUocBr+3BbVoOFlYHtJ+2wmRmytf2V3PlYv0="; }; tags = [ diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 349b3281ff64..4ceb101757d9 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "grype"; - version = "0.104.4"; + version = "0.105.0"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; tag = "v${finalAttrs.version}"; - hash = "sha256-XuB3eUBtyi23Wd3l8iuaN4rVw9/0/XNDBee8/m6swZo="; + hash = "sha256-+8fCQ/9S4qwPfq/XM5G7LdNl8VQvBxIl67RMqlB6rUI="; # 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; @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { proxyVendor = true; - vendorHash = "sha256-toxkblzuAO/IYgKuvpmp5yc70KtFx6wiW2mkkO5owMY="; + vendorHash = "sha256-dYtTYkSVIO5k9kkodhIUWrlNXfQNCUjTUwz4+n6IMtY="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gu/gui-for-clash/package.nix b/pkgs/by-name/gu/gui-for-clash/package.nix index 5e441adb5833..dcad0681a444 100644 --- a/pkgs/by-name/gu/gui-for-clash/package.nix +++ b/pkgs/by-name/gu/gui-for-clash/package.nix @@ -18,13 +18,13 @@ let pname = "gui-for-clash"; - version = "1.16.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "GUI-for-Cores"; repo = "GUI.for.Clash"; tag = "v${version}"; - hash = "sha256-eIKgXZ48iVkFSwTJ04j6CXyvgVsUCBRZ9hwdid/DwsE="; + hash = "sha256-M5M3o7RIXszMW2KGv2UDyR002dNOL3FFj0zM4w4D+U0="; }; metaCommon = { @@ -54,7 +54,7 @@ let ; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-oi78tk0ygR37jtWW3hZnDF44qxWjIFvUU4u5rNffvD8="; + hash = "sha256-AHGPAYw/6FRKO2FY1J84NrLcp+bZOclOF6UFY61npFI="; }; buildPhase = '' @@ -84,7 +84,7 @@ buildGoModule { patches = [ ./xdg-path-and-restart-patch.patch ]; - vendorHash = "sha256-ElDJknPzR7Zh46RjUsn39Msm1B8Nsp1eHIS3ifRl80w="; + vendorHash = "sha256-xQ6TeVoBe8906+/5X1q4e5QHVo+KHymB+yoxM+Obk18="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index ae78f644fe55..a68fb36e2072 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -18,13 +18,13 @@ let pname = "gui-for-singbox"; - version = "1.15.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "GUI-for-Cores"; repo = "GUI.for.SingBox"; tag = "v${version}"; - hash = "sha256-OMZrLceu/7QTyLCPPIIx4c+iyfZlVyOiDKLCTeXoEbE="; + hash = "sha256-8X+hLtNKE9iFJMvUtY1ZDXwp39b4bKDotiU79jVto4E="; }; metaCommon = { @@ -54,7 +54,7 @@ let ; pnpm = pnpm_10; fetcherVersion = 2; - hash = "sha256-MA0CNF2MTCGvsxvEpRbTFu5Diap4XkIHKnxeROkgwnU="; + hash = "sha256-AHGPAYw/6FRKO2FY1J84NrLcp+bZOclOF6UFY61npFI="; }; buildPhase = '' @@ -91,7 +91,7 @@ buildGoModule { --subst-var out ''; - vendorHash = "sha256-A39CVQTWMmOGa/XwM+cZQBsqINiN2UoUYC9voQTL7aU="; + vendorHash = "sha256-xQ6TeVoBe8906+/5X1q4e5QHVo+KHymB+yoxM+Obk18="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index 7506de87141d..71a6f5cb9eb5 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gvm-libs"; - version = "22.34.2"; + version = "22.35.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${version}"; - hash = "sha256-naCk99ZxupBx590MRBorvsNxlYCuKC/B8fufGnZDH1A="; + hash = "sha256-3TWJyh9xzS/HLRjAc4hsBuu3P0SquHEZXjunWw1FqWU="; }; postPatch = '' diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 6e123675578b..b161645843de 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2026-01-06"; + version = "2.3.0-rolling-2026-01-16"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "2e62ee29c98ef70e9f1749884557229fd255a8e5"; - hash = "sha256-fzP95nV1uxjdknsf8BIKerybkmPmlmRF1/m498MSqyk="; + rev = "ccea64b17ade832753db933658047ede9f31a380"; + hash = "sha256-47oNCbOGqNNNUkoP6Bj5F8Zv5QAN0+MGOIGo5jXGtf4="; }; outputs = [ diff --git a/pkgs/by-name/ha/har-to-k6/package.nix b/pkgs/by-name/ha/har-to-k6/package.nix index e6bdb12bb62d..563eb31c4a3c 100644 --- a/pkgs/by-name/ha/har-to-k6/package.nix +++ b/pkgs/by-name/ha/har-to-k6/package.nix @@ -8,18 +8,18 @@ buildNpmPackage rec { pname = "har-to-k6"; - version = "0.14.11"; + version = "0.14.12"; src = fetchFromGitHub { owner = "grafana"; repo = "har-to-k6"; tag = "v${version}"; - hash = "sha256-ACt9MNxcEyfg7lkeFBK/KnssbI4jkER0Ua/llQWLpxU="; + hash = "sha256-9LOL67K1hPPioN0eWPEucMb+jy6WcAYsO4Mm34T9NB4="; }; dontNpmBuild = true; - npmDepsHash = "sha256-RuK3CzcMkPt5MFEZpYBDtMMShHTT/115pRk1CmRkiek="; + npmDepsHash = "sha256-dKt3TPZye/HO2j06EcN5G1iShaKazMpHUaWdwvEN5pk="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/hc/hcloud/package.nix b/pkgs/by-name/hc/hcloud/package.nix index 7dc54671fe9c..6a7d31b19d80 100644 --- a/pkgs/by-name/hc/hcloud/package.nix +++ b/pkgs/by-name/hc/hcloud/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.59.0"; + version = "1.60.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; tag = "v${version}"; - hash = "sha256-E4GPWQSrEMsLQwgwb7gCIYsOUH5uRnxgeq3UzQ02ql0="; + hash = "sha256-OOLuQojsWkjhFn18keK/mJFF+s4lflIoFSwSn3Bd8jg="; }; - vendorHash = "sha256-BB3TArAATTVZ1lzJqbY7GQVS2/2ERWHMrTSbWfJSU60="; + vendorHash = "sha256-XekyBHH0HDjvl3vD8sucypjnvKOdxrguvAaiREPanyo="; ldflags = [ "-s" diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix index 28584adff38d..a2d9475ab0ec 100644 --- a/pkgs/by-name/he/heh/package.nix +++ b/pkgs/by-name/he/heh/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "heh"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ndd7xv"; repo = "heh"; rev = "v${version}"; - hash = "sha256-Yjq4w0xaFNCKJBxXT9dXaJQQ9YYN/5DZ32DJgsvuIsU="; + hash = "sha256-Fo8hsa1+H97t/f90hDNyQOXKGbLVPv2/r5erlHXALbc="; }; - cargoHash = "sha256-D0rO/W37eEfstSUwCp42DC0bAyTbyXDGIZVdRbhP4gQ="; + cargoHash = "sha256-xUhz9tKfqclYL6ztOA45lsQE+0MJAO+LNqy8B9c8MGw="; meta = { description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix index 6225a757e8ec..626a5f348cd2 100644 --- a/pkgs/by-name/he/hextazy/package.nix +++ b/pkgs/by-name/he/hextazy/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "hextazy"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "0xfalafel"; repo = "hextazy"; tag = version; - hash = "sha256-sglKEdmfS8+PHsgZ/Z7HJs9+lrkD0pFvfUDrKtEdRNQ="; + hash = "sha256-ejF2AVVp6Q7pM4tk/lWty83sUTIYhiffjRgn0KJwYO0="; }; - cargoHash = "sha256-E0ia/I7e40lDG24qYUCOwWNKSZ9/VmI5/4BsIKmE61I="; + cargoHash = "sha256-ER9+SJ8kfXJtdh7XB51rYd20IkjyEqWuon9OXpwKLAA="; meta = { description = "TUI hexeditor in Rust with colored bytes"; diff --git a/pkgs/by-name/hi/highscore-bsnes/package.nix b/pkgs/by-name/hi/highscore-bsnes/package.nix index 55e817beec8a..4b28c7750b89 100644 --- a/pkgs/by-name/hi/highscore-bsnes/package.nix +++ b/pkgs/by-name/hi/highscore-bsnes/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highscore-bsnes"; - version = "0-unstable-2026-01-06"; + version = "0-unstable-2026-01-12"; src = fetchFromGitHub { owner = "highscore-emu"; repo = "bsnes"; - rev = "7e26b2970c95404ef9a95bed6e509c8923f2815d"; - hash = "sha256-mOJPhhHqVrYIHYUZ7z1fA8AD6yjWcnUxecMorsaPvFg="; + rev = "e5f6eb18035be8a9c57ff0119c44852b89e55248"; + hash = "sha256-J2ZPUhDc5oyh+47LTP9a+R4FpSXcbR3Oe/CH77XC4t0="; }; sourceRoot = "${finalAttrs.src.name}/bsnes"; diff --git a/pkgs/by-name/hi/highscore-mgba/package.nix b/pkgs/by-name/hi/highscore-mgba/package.nix index d573f8aeb19a..054b89c63b97 100644 --- a/pkgs/by-name/hi/highscore-mgba/package.nix +++ b/pkgs/by-name/hi/highscore-mgba/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "highscore-mgba"; - version = "0-unstable-2026-01-02"; + version = "0-unstable-2026-01-16"; src = fetchFromGitHub { owner = "highscore-emu"; repo = "mgba"; - rev = "a6d684ff03b91d219b861b85791f4069df698562"; - hash = "sha256-Ur7BG+AJ6KQ+XX2qKoj13w556VNnHtxULXd1d+gHUig="; + rev = "d8e2d2d329417e6387563a495491e90dfa44426c"; + hash = "sha256-aH167+XOboz6Q7rabYCfOf+qFm5ylzVTy4g38yx4Zj4="; }; outputs = [ diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix index 14eb3dbe889b..2800d340ba6d 100644 --- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix +++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix @@ -12,23 +12,23 @@ buildNpmPackage (finalAttrs: { pname = "homebridge-config-ui-x"; - version = "5.8.0"; + version = "5.14.0"; src = fetchFromGitHub { owner = "homebridge"; repo = "homebridge-config-ui-x"; tag = "v${finalAttrs.version}"; - hash = "sha256-pbE3s1MzZM8r29oJsZjHTCahRNuWExsvGfERue4RQv4="; + hash = "sha256-CAdzkFuVuJtHoUUDBIRRzxRJiOtGUJFzS/lczYXTfRw="; }; # Deps hash for the root package - npmDepsHash = "sha256-L7sC/4iHSGE9H562pbtESkFpty6eGdmkU60dpUWPQaQ="; + npmDepsHash = "sha256-73Xt2R3COL0WPgtqn3ZwGTmOHrNqHONrX3hQCU/v5y0="; # Deps src and hash for ui subdirectory npmDeps_ui = fetchNpmDeps { name = "npm-deps-ui"; src = "${finalAttrs.src}/ui"; - hash = "sha256-Yhk7cplZlmcChKPmwoI192MJujuq+v8+JXT08rwfL3Q="; + hash = "sha256-xtXAeTBryQt4FMvK3oXHJ3DdB/3umrSrmqZ3IIDgq2s="; }; # Need to also run npm ci in the ui subdirectory diff --git a/pkgs/by-name/hy/hygg/package.nix b/pkgs/by-name/hy/hygg/package.nix index 00f166181a7e..ded0143917db 100644 --- a/pkgs/by-name/hy/hygg/package.nix +++ b/pkgs/by-name/hy/hygg/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "kruseio"; repo = "hygg"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-wxgHlRqe/g9LppWWTzft9hTA8heuFvGkKvA7nG2PsxA="; }; diff --git a/pkgs/by-name/i3/i3status-rust/package.nix b/pkgs/by-name/i3/i3status-rust/package.nix index f5d95e0bf94b..a294bc3e519d 100644 --- a/pkgs/by-name/i3/i3status-rust/package.nix +++ b/pkgs/by-name/i3/i3status-rust/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "greshake"; repo = "i3status-rust"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Eam0MDACJN/a8J1Za7Xwy0Jlv/KGNn4M13C2yaCgLnU="; }; diff --git a/pkgs/by-name/il/illuminanced/package.nix b/pkgs/by-name/il/illuminanced/package.nix index 4151fd7b58e4..a909ba87fd84 100644 --- a/pkgs/by-name/il/illuminanced/package.nix +++ b/pkgs/by-name/il/illuminanced/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "mikhail-m1"; repo = "illuminanced"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ZEVma0uj9rsWB+vfUL7w3dHxI/ppBCG23TirGE+RREk="; }; diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix index 71f0c761f092..f0a18fc5299c 100644 --- a/pkgs/by-name/im/impala/package.nix +++ b/pkgs/by-name/im/impala/package.nix @@ -5,16 +5,22 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "impala"; - version = "0.6.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "pythops"; repo = "impala"; rev = "v${finalAttrs.version}"; - hash = "sha256-FU/8g2zTTHm3Sdbxt9761Z+a0zaJMdAMdHrJIwjUrYs="; + hash = "sha256-kDXf+zrCfsYv+5P69BiZDBqaw9SM3JPCXV7KzpIEJn0="; }; - cargoHash = "sha256-dpTLVlDxc9eK7GwbweODoJlrBZeYwVcv1fQ2UtYbg7k="; + cargoHash = "sha256-Zs3x7wWbO0LL1BjEAWb1UbztJJ6K6hXxgMBynHLri8A="; + + # fix for compilation of musl builds on aarch64 + # see https://github.com/NixOS/nixpkgs/issues/145726 + postPatch = '' + rm .cargo/config.toml + ''; meta = { description = "TUI for managing wifi"; diff --git a/pkgs/by-name/in/ingress2gateway/package.nix b/pkgs/by-name/in/ingress2gateway/package.nix index 0a4eba3b2200..c000b9922a2b 100644 --- a/pkgs/by-name/in/ingress2gateway/package.nix +++ b/pkgs/by-name/in/ingress2gateway/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "ingress2gateway"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "ingress2gateway"; rev = "v${version}"; - hash = "sha256-0w2ZM1g2rr46bN8BNgrkmb3tOQw0FZTMLp/koW01c5I="; + hash = "sha256-pX/4WFqYkBPnaEki3q3CahBCePUvKQzVulT+oMtUXQc="; }; - vendorHash = "sha256-7b247/9/9kdNIYuaLvKIv3RK/nzQzruMKZeheTag2sA="; + vendorHash = "sha256-NlQbjKU5EoNY70ziDs98394LSxSIyTGsGgP1S22ynDA="; ldflags = [ "-s" diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix index 4e7f83da01f1..dd95a1bbce15 100644 --- a/pkgs/by-name/in/intel-gpu-tools/package.nix +++ b/pkgs/by-name/in/intel-gpu-tools/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { domain = "gitlab.freedesktop.org"; owner = "drm"; repo = "igt-gpu-tools"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Lt/mqx13nHyD5QiDl8oWGiYIiK006uQvbbzHH44LB/0="; }; diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index 5ac25de4e2a2..970efb5a1724 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -14,7 +14,7 @@ buildGoModule { src = fetchFromGitLab { owner = "gaincoder"; repo = "invidious-router"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-YcMtZq4VMHr6XqHcsAAEmMF6jF1j1wb7Lq4EK42QAEo="; }; diff --git a/pkgs/by-name/ip/ipinfo/package.nix b/pkgs/by-name/ip/ipinfo/package.nix index 88ffd1d860a4..e54ac0d2b3bf 100644 --- a/pkgs/by-name/ip/ipinfo/package.nix +++ b/pkgs/by-name/ip/ipinfo/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = pname; repo = "cli"; - rev = "refs/tags/${pname}-${version}"; + tag = "${pname}-${version}"; hash = "sha256-sdQdCP2NotrdeqYrSd9c6sExFeuX54I4fxJfEyULPuk="; }; diff --git a/pkgs/by-name/it/itm-tools/Cargo.lock b/pkgs/by-name/it/itm-tools/Cargo.lock deleted file mode 100644 index d9d39e519d22..000000000000 --- a/pkgs/by-name/it/itm-tools/Cargo.lock +++ /dev/null @@ -1,315 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "addr2line" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler32" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "backtrace" -version = "0.3.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "byteorder" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "clap" -version = "2.33.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "either" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" - -[[package]] -name = "exitfailure" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ff5bd832af37f366c6c194d813a11cd90ac484f124f079294f28e357ae40515" -dependencies = [ - "failure", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "gimli" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" - -[[package]] -name = "hermit-abi" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" -dependencies = [ - "libc", -] - -[[package]] -name = "itm" -version = "0.4.0" -source = "git+https://github.com/rust-embedded/itm#5dd476d03de0738062a876fd3845900ab04833a4" -dependencies = [ - "byteorder", - "either", - "thiserror", -] - -[[package]] -name = "itm-tools" -version = "0.1.0" -dependencies = [ - "clap", - "exitfailure", - "failure", - "itm", - "rustc-demangle", - "xmas-elf", -] - -[[package]] -name = "libc" -version = "0.2.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" - -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "object" -version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" - -[[package]] -name = "proc-macro2" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "syn" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "synstructure" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "unicode-xid", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "xmas-elf" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22678df5df766e8d1e5d609da69f0c3132d794edf6ab5e75e7abcd2270d4cf58" -dependencies = [ - "zero", -] - -[[package]] -name = "zero" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5" diff --git a/pkgs/by-name/it/itm-tools/package.nix b/pkgs/by-name/it/itm-tools/package.nix deleted file mode 100644 index 645113908cb7..000000000000 --- a/pkgs/by-name/it/itm-tools/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - fetchFromGitHub, - rustPlatform, - pkg-config, -}: - -rustPlatform.buildRustPackage { - pname = "itm-tools"; - version = "0-unstable-2019-11-15"; - - src = fetchFromGitHub { - owner = "japaric"; - repo = "itm-tools"; - rev = "e94155e44019d893ac8e6dab51cc282d344ab700"; - sha256 = "19xkjym0i7y52cfhvis49c59nzvgw4906cd8bkz8ka38mbgfqgiy"; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "itm-0.4.0" = "sha256-T61f1WvxEMhI5bzp8FuMYWiG1YOPJvWuBJfK/gjuNKI="; - }; - }; - - nativeBuildInputs = [ pkg-config ]; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - doCheck = false; - - meta = { - description = "Tools for analyzing ITM traces"; - homepage = "https://github.com/japaric/itm-tools"; - license = with lib.licenses; [ - asl20 - mit - ]; - maintainers = with lib.maintainers; [ - hh - sb0 - ]; - }; -} diff --git a/pkgs/by-name/ja/jarowinkler-cpp/package.nix b/pkgs/by-name/ja/jarowinkler-cpp/package.nix deleted file mode 100644 index 80333b4dd390..000000000000 --- a/pkgs/by-name/ja/jarowinkler-cpp/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - catch2_3, -}: - -stdenv.mkDerivation rec { - pname = "jarowinkler-cpp"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "maxbachmann"; - repo = "jarowinkler-cpp"; - rev = "v${version}"; - hash = "sha256-GuwDSCYTfSwqTnzZSft3ufVSKL7255lVvbJhBxKxjJw="; - }; - - nativeBuildInputs = [ - cmake - ]; - - cmakeFlags = lib.optionals doCheck [ - "-DJARO_WINKLER_BUILD_TESTING=ON" - ]; - - nativeCheckInputs = [ - catch2_3 - ]; - - doCheck = true; - - meta = { - description = "Fast Jaro and Jaro-Winkler distance"; - homepage = "https://github.com/maxbachmann/jarowinkler-cpp"; - changelog = "https://github.com/maxbachmann/jarowinkler-cpp/blob/${src.rev}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dotlambda ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix index c4a12b766ef6..a4383324033d 100644 --- a/pkgs/by-name/ja/jazz2/package.nix +++ b/pkgs/by-name/ja/jazz2/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jazz2"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "deathkiller"; repo = "jazz2-native"; tag = finalAttrs.version; - hash = "sha256-96NiBE0/sBnIdajKui3pZmR8IGlElbeoyqYEYFWtOuM="; + hash = "sha256-rmmVFsRTnWbVNg6X9O6BHr5yTt9m/DSA8Y+HLnG80Zc="; }; patches = [ ./nocontent.patch ]; diff --git a/pkgs/by-name/jo/jogger/package.nix b/pkgs/by-name/jo/jogger/package.nix index 68032948b103..3c67a0fafb9a 100644 --- a/pkgs/by-name/jo/jogger/package.nix +++ b/pkgs/by-name/jo/jogger/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "codeberg.org"; owner = "baarkerlounger"; repo = "jogger"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-bju9XXMT6HRHG9QViO+FQCYQ+llrC+GP/AlIha0mxkM="; }; diff --git a/pkgs/by-name/ju/justbuild/package.nix b/pkgs/by-name/ju/justbuild/package.nix index 6dc26810e979..8a488ce96be6 100644 --- a/pkgs/by-name/ju/justbuild/package.nix +++ b/pkgs/by-name/ju/justbuild/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "just-buildsystem"; repo = "justbuild"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-ZTwe6S0AH1yQt5mABtIeWuMbiVSKeOZWMFI26fthLsM="; }; diff --git a/pkgs/by-name/ka/kapacitor/package.nix b/pkgs/by-name/ka/kapacitor/package.nix index 7203e0388f3e..55bba282a623 100644 --- a/pkgs/by-name/ka/kapacitor/package.nix +++ b/pkgs/by-name/ka/kapacitor/package.nix @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "influxdata"; repo = "flux"; - rev = "refs/tags/v${libflux_version}"; + tag = "v${libflux_version}"; hash = "sha256-v9MUR+PcxAus91FiHYrMN9MbNOTWewh7MT6/t/QWQcM="; }; patches = [ @@ -73,7 +73,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "influxdata"; repo = "kapacitor"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-vxaLfJq0NFAJst0/AEhNJUl9dAaZY3blZAFthseMSX0="; }; diff --git a/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix b/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix index e2aff916f127..95b5a611ead1 100644 --- a/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix +++ b/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule (finalAttrs: { # "chatgpt-cli" is taken by another package with the same upsteam name. # To keep "pname" and "package attribute name" identical, the owners name (kardolus) gets prefixed as identifier. pname = "kardolus-chatgpt-cli"; - version = "1.10.0"; + version = "1.10.2"; src = fetchFromGitHub { owner = "kardolus"; repo = "chatgpt-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-qyKnafCj+THXV8Lbgt6VSLfUbUc5uaeaaakWthnEguU="; + hash = "sha256-Oc4r2cAE2y9WH0Tii8yIsLI7qR+Bhy4iqg1w0xe1EoY="; }; vendorHash = null; # The tests of kardolus/chatgpt-cli require an OpenAI API Key to be present in the environment, - # (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.10.0/test/contract/contract_test.go#L35) + # (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.10.2/test/contract/contract_test.go#L35) # which will not be the case in the pipeline. # Therefore, tests must be skipped. doCheck = false; diff --git a/pkgs/by-name/ka/kazv/package.nix b/pkgs/by-name/ka/kazv/package.nix index 048bc2c837cd..bdb82fadac73 100644 --- a/pkgs/by-name/ka/kazv/package.nix +++ b/pkgs/by-name/ka/kazv/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "lily-is.land"; owner = "kazv"; repo = "kazv"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WBS7TJJw0t57V4+NxsG8V8q4UKQXB8kRpWocvNy1Eto="; }; diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index e811af61db2e..c396c99d62e2 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keycloak"; - version = "26.5.0"; + version = "26.5.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; - hash = "sha256-0FxCukp7G3AR+Q2XTmJ/6Yj/IkWBXGaAsiqZncUY35E="; + hash = "sha256-lp/3m82N6VgKK4D0QAuEq/j8fR21Biar58MFeNuGjXo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ki/kissat/package.nix b/pkgs/by-name/ki/kissat/package.nix index 136b6e1d6bc3..d4f113a724dd 100644 --- a/pkgs/by-name/ki/kissat/package.nix +++ b/pkgs/by-name/ki/kissat/package.nix @@ -17,7 +17,10 @@ let It is a port of CaDiCaL back to C with improved data structures, better scheduling of inprocessing and optimized algorithms and implementation. ''; - maintainers = with lib.maintainers; [ shnarazk ]; + maintainers = with lib.maintainers; [ + shnarazk + chrjabs + ]; platforms = lib.platforms.unix; license = lib.licenses.mit; homepage = "https://fmv.jku.at/kissat"; diff --git a/pkgs/by-name/kl/klassy/package.nix b/pkgs/by-name/kl/klassy/package.nix new file mode 100644 index 000000000000..2cff91c1a4d5 --- /dev/null +++ b/pkgs/by-name/kl/klassy/package.nix @@ -0,0 +1,75 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + kdePackages, + gitUpdater, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "klassy"; + version = "6.4.breeze6.4.0"; + + src = fetchFromGitHub { + owner = "paulmcauley"; + repo = "klassy"; + tag = finalAttrs.version; + hash = "sha256-+bYS2Upr84BS0IdA0HlCK0FF05yIMVbRvB8jlN5EOUM="; + }; + + nativeBuildInputs = [ + cmake + ninja + kdePackages.extra-cmake-modules + kdePackages.wrapQtAppsHook + ]; + + buildInputs = with kdePackages; [ + qtbase + qtdeclarative + qttools + qtsvg + + frameworkintegration + kcmutils + kcolorscheme + kconfig + kcoreaddons + kdecoration + kguiaddons + ki18n + kiconthemes + kirigami + kwidgetsaddons + kwindowsystem + ]; + + # Klassy tries to build for both Qt 5 and 6 at the same time by default + # but that is impossible given how Qt setup hooks are currently designed + # in Nixpkgs. Given that KDE Plasma 5 has already been removed as of the + # time of writing, I figure it's fine to only build the Qt 6 version. + cmakeFlags = [ + (lib.cmakeBool "BUILD_QT6" true) + (lib.cmakeBool "BUILD_QT5" false) + ]; + + passthru.updateScript = gitUpdater { }; + + meta = { + description = "Highly customizable binary Window Decoration, Application Style and Global Theme plugin for recent versions of the KDE Plasma desktop"; + homepage = "https://github.com/paulmcauley/klassy"; + platforms = lib.platforms.linux; + license = with lib.licenses; [ + bsd3 + cc0 + gpl2Only + gpl2Plus + gpl3Only + gpl3Plus # KDE-Accepted-GPL + mit + ]; + maintainers = with lib.maintainers; [ pluiedev ]; + mainProgram = "klassy-settings"; + }; +}) diff --git a/pkgs/by-name/ko/komari-agent/package.nix b/pkgs/by-name/ko/komari-agent/package.nix index bb6c37901481..cd4104b39438 100644 --- a/pkgs/by-name/ko/komari-agent/package.nix +++ b/pkgs/by-name/ko/komari-agent/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "komari-monitor"; repo = "komari-agent"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-aWCsaiYkpj0D9hr7V3pxSk14pMD2E117vwemt9Ckqv0="; }; diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 3dbc15d76bbf..34e4905ba760 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.99.0"; + version = "1.100.0"; pyproject = false; src = fetchFromGitea { @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; tag = "v${version}"; - hash = "sha256-JKPAY6vfoU0FIXW8BDjUimeDkqp6K1/DG81wNWBGLbY="; + hash = "sha256-rHOXRvUm/Wc5oQpp8+rg3szHxuko+R0oap4S/9rmHMk="; }; nativeBuildInputs = [ @@ -61,6 +61,7 @@ python3.pkgs.buildPythonApplication rec { brotli colorthief dateparser + ebooklib emoji keyring lxml diff --git a/pkgs/by-name/ko/kompose/package.nix b/pkgs/by-name/ko/kompose/package.nix index e8cc3639d38b..219033439940 100644 --- a/pkgs/by-name/ko/kompose/package.nix +++ b/pkgs/by-name/ko/kompose/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "kompose"; - version = "1.37.0"; + version = "1.38.0"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kompose"; tag = "v${finalAttrs.version}"; - hash = "sha256-wS9YoYEsCALIJMxoVTS6EH6NiBfF+qkFIv7JALnVPgs="; + hash = "sha256-d2rUkLGU9s2+LTBI3N7WZx1ByDv05DOUq/2OCQViiOM="; }; - vendorHash = "sha256-dBVrkTpeYtTVdA/BEcBGyBdSk3po7TQQwo0ux6qPK2Q="; + vendorHash = "sha256-53G3nkz+uTwpgiZZFfmrv7Wv6d8iVm6xVyRuxjKA5Po="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ko/koodousfinder/package.nix b/pkgs/by-name/ko/koodousfinder/package.nix index f49099f74015..16b23b5dec66 100644 --- a/pkgs/by-name/ko/koodousfinder/package.nix +++ b/pkgs/by-name/ko/koodousfinder/package.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication { owner = "teixeira0xfffff"; repo = "KoodousFinder"; # Not properly tagged, https://github.com/teixeira0xfffff/KoodousFinder/issues/7 - #rev = "refs/tags/v${version}"; + #tag = "v${version}"; rev = "d9dab5572f44e5cd45c04e6fcda38956897855d1"; hash = "sha256-skCbt2lDKgSyZdHY3WImbr6CF0icrDPTIXNV1736gKk="; }; diff --git a/pkgs/by-name/la/last/package.nix b/pkgs/by-name/la/last/package.nix index acefefcdc13e..a582d8fd6c1d 100644 --- a/pkgs/by-name/la/last/package.nix +++ b/pkgs/by-name/la/last/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-U1FGP6jzB36HLwTFKm/VMZWPPjo6mVuV/ePhGIkQgpg="; }; diff --git a/pkgs/by-name/la/lavacli/package.nix b/pkgs/by-name/la/lavacli/package.nix index b505b4ebf8a3..02c46ed95105 100644 --- a/pkgs/by-name/la/lavacli/package.nix +++ b/pkgs/by-name/la/lavacli/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://lava.gitlab.io/lavacli/"; changelog = "https://gitlab.com/lava/lavacli/-/commits/v${version}?ref_type=tags"; license = lib.licenses.agpl3Only; - teams = [ lib.teams.cyberus ]; + maintainers = with lib.maintainers; [ snu ]; mainProgram = "lavacli"; }; } diff --git a/pkgs/by-name/le/learn6502/missing-hashes.json b/pkgs/by-name/le/learn6502/missing-hashes.json index 992abb31eaef..f71763a7cacb 100644 --- a/pkgs/by-name/le/learn6502/missing-hashes.json +++ b/pkgs/by-name/le/learn6502/missing-hashes.json @@ -1,55 +1,43 @@ { - "@esbuild/aix-ppc64@npm:0.25.0": "468ba76b20f43118a11fd589ef162ff12c3c9f988a861045cc421b3100f9ade27103a0743fa9e9882c54dfe2ec647ca9b209cfc17ef61b5c9bc48be95e5856c1", - "@esbuild/aix-ppc64@npm:0.25.10": "e1a113d75c27f15756d18dc2a9257f07068c7b37a00ed3848c0d903f3e66f2df23156993fca7523422cf5be10417747a1e4faa2e93196f011faab606938174e5", - "@esbuild/android-arm64@npm:0.25.0": "599fcb6b815a9bc8f83687663653c15ceb1c0f9ea0587da03976972281cd040c23b551a9f772d459809c22f7e218e04f1b159f8da1298b9c79b822f5636eff59", - "@esbuild/android-arm64@npm:0.25.10": "a2dd6b7ba7d3ab2b669bdc45dc7e306671ecbd89b251d3ad73191fc18fe07080525beadf0a9ead65f96d623d4e37172b2516dc1ce7ddc3c3224299926615b2a1", - "@esbuild/android-arm@npm:0.25.0": "ff6124350b732afe0f59087d5a50afb0c05d0d3951b4fc0f7c52c19ccacef504d7998217d8d7594dcfd4872748350a49ba611e8f2de3fe9e47a3df4393cb67eb", - "@esbuild/android-arm@npm:0.25.10": "0d7b4d970f4793252396ca9b737a2c5b485a5f051827ba1cbcce23a76e9bb7bc6f73be3b5ebed73a15aca915534917d13aeef0ce14d214026a36f0f334eadb14", - "@esbuild/android-x64@npm:0.25.0": "7015f561e36c4fe142a4047184776344def5f25369c0bce8abd1de3d623d84cf7ddc09e5f7bac8294a8aea457ec23414e169648579382e6fd1aa39590ffe6e01", - "@esbuild/android-x64@npm:0.25.10": "a2e49c045ea189ca6020a8c1baced2db4cf105848c1cc922931c8e3a11b26f1143078d3ee5c088bfbccab8e564039a5b6962513e45b41572614607dced92b03f", - "@esbuild/darwin-arm64@npm:0.25.0": "ba18b48c2c652a930a436a872b40cb0999fc0c4788dcda908f467d47555b080043e9ba1f9a7f080eb8d91ea8a3a399216aeea95539829a58885c412131025597", - "@esbuild/darwin-arm64@npm:0.25.10": "a96d0821aa97cd0ce2fa35b525896fc9d878b492832be8a0cd22bdbb081d11209574e48ef8ce29f51a88a9cea33c5f6a8b4409bd0801eddeac5ef4ad4db2d88a", - "@esbuild/darwin-x64@npm:0.25.0": "83470576dc815364e8f2a6f2ed9c62496fa8112ee4905ccc3b142e36d28c9c90310ad179055d87e2e880e1bf9a3be0e9eb2129d6a88fdacf38181bfab6cf75c0", - "@esbuild/darwin-x64@npm:0.25.10": "0f358404778b8f36a2676181f8840139d7e5723a76e54683f0ada3d72572d8c864bc76084e1d23dd5605896329857ad15b598dedd141d160b64669253bfaee82", - "@esbuild/freebsd-arm64@npm:0.25.0": "646f3abba09e87c4555359200af913bbda9fac43629f6ade6adefdbd0d915707a375314e1d25ed0d951e6024d7d19fe0ecdd10caf4ff6177f3f6450e7132a6a9", - "@esbuild/freebsd-arm64@npm:0.25.10": "f82928e4a4beb95da3379b98c5088d017113c02e3f2ab54867e4f6974b21b25c68ed793cbb3e9a99a510fd58ad3c5dbc1f7ca5bd4ce6adc99627a25fc722178b", - "@esbuild/freebsd-x64@npm:0.25.0": "4b769e23981e5ec010f9c4670b1194e26e8bf98cc0bb70962fe8c160da508b40561c0b97911072c5de82954a4164af9d885e45e597e39ae379b5cad2d0a8c69e", - "@esbuild/freebsd-x64@npm:0.25.10": "08c9d830e43a3be5fdb4525d940b0cd069bd7e7e1f4d53a5475411351c07891343b3c009f37d47e10ae3bafcb9ed52b4b5bd5e7dbd0505723add21a09c08dae6", - "@esbuild/linux-arm64@npm:0.25.0": "508ca15315c4d7b7db28fc8e17247ebe5c816c270496d1354f0d97baafdf774ec055c2d9ac51e06fb02fed93ce4f94d109b92fe80a62e42bf51a2c5046fc76c8", - "@esbuild/linux-arm64@npm:0.25.10": "1b6f5a1ef9aef52210832f5dd4d55ddd0a880dfc0f832106374b56c5cd8fbb865d7d711bdd6ff7c94a0cc42a7c3e6cf91118bf5c4187cfbbe1eb4d1807afca37", - "@esbuild/linux-arm@npm:0.25.0": "3756d3974f5b5a6453f2ece2fa012f530b32b6af78cc0b6466bf0582b3da718803dae41bdb5cc4cdc360882bd791b63bb79e5f4a6f8c44ee053fc93b8dd6ea7f", - "@esbuild/linux-arm@npm:0.25.10": "023383ebb145fa2f93de674713c7e4725df2b3c910f43bc1b5488a3b1169005d46fcbcf84234aace04c799ee569ea7671f92205e42dda52bc9954e48b47d7a1d", - "@esbuild/linux-ia32@npm:0.25.0": "d220829704167772688a93568738d0887fc45d88cce7a4f2e4de992f161e9aa679294bfdf2dd3d70fa6549b548a023d98a90f19270cd8ebd5b365efe04b7027c", - "@esbuild/linux-ia32@npm:0.25.10": "130136f141d0388ec249fa314848906fb8b45e554324b8a07c13b5bc2e7da94c6fc7ebd037af6b69655a542ec52515ea8f8bc3bfe6dfc0dab8bdf9954debfb0d", - "@esbuild/linux-loong64@npm:0.25.0": "e7f1a54ea77c9307f54d7172a03b1e77ec18b3f6622077fe3dcb4d53435ea47fc60e82b9da7b8efe375c0e46f4c07169686262af2eaea6557cf033c973f6fbcd", - "@esbuild/linux-loong64@npm:0.25.10": "0e076ba5ea9b2e6ad00c27b8ee530621ef4c356aba6d8c873f9f7c50fa2f54bd75f4bef57d209fc0af011c9748c64e9d5e281f13456fa9c8b71f79467bfc71ad", - "@esbuild/linux-mips64el@npm:0.25.0": "d51dc06bc3da38fb046986019c6b1a8aa1b43a835089f1f8d8ce4242c9417e1d3d25fa593708cd61f66f8665be27829316b37ecf9e08dc48718aacc00608aac1", - "@esbuild/linux-mips64el@npm:0.25.10": "dc3ef7a524ef0d78030f088263735026c97e7be45f56a610c8849fca8c36b10969558bffb6c21b6d8a5819a33450e529e44c1a71a6fccb0ce69f23b01273bbc3", - "@esbuild/linux-ppc64@npm:0.25.0": "a19514e5b21c5f70e6b5b6ccdacb09922e9c397e80e3b1ac8e55ed283f9f3a5325a9e4dcf284d033954f3c51a88411fa95473c83b2b69990e02e351fa971b63f", - "@esbuild/linux-ppc64@npm:0.25.10": "60088ee09f940e169e2073ee77972f22af78c9c1df9a8e7db45e3c3f9176d5ffd8006a4102f34783c7f3629e9c153797d9f493063e9bdedf6f676018cbe6445e", - "@esbuild/linux-riscv64@npm:0.25.0": "4b275bb4d2442a68b62a93926a4da04bde06795fc7f5719555c7a9d2cf0e8a2cd6a50c0e574f1285e55e126f0be29cf6017d829c571c2fb31728fb1961c45f70", - "@esbuild/linux-riscv64@npm:0.25.10": "3f194dfe0f2725d9a41b0ab127238ef271d0689f31a05ecae25d6df3aa8275261d6ba073373236fac3c6c8af2a4556736a8025e80d8a719a049d22b23c99464c", - "@esbuild/linux-s390x@npm:0.25.0": "7bd0fefc75c72d6d657aa9fec2322f1b8744936fc77da7e32027f0f1aff4b5fdaa8ae19a060fa4d465a79f14e13a4e10f3eeaf1ca64dc4c3cf08494b3e26100b", - "@esbuild/linux-s390x@npm:0.25.10": "926a04be26ebf794dae6a6185e04f39d246b04f1b5cb40b41f5228228a87e3a785cfb6493f405a0dc7d9b6a96d9417453fdc291b7fb4bc4aaf785eaa44cf1806", - "@esbuild/linux-x64@npm:0.25.0": "f9562d7e1d25b9a69faa40aaa7dd607b820836f88733b26b27a48b14b8a526cc5ec033c1869386419bd609c96442974c339ccbb03b4a23ea205927b2243d3b6c", - "@esbuild/linux-x64@npm:0.25.10": "ebe641e7b96af7dcefe629b4f34a4da9cd0b282e42e8efd0311c2ed631a40a143bb96eda5592b209c4eab295f45b2e3395c69412edb40d5689ffaa01aa276409", - "@esbuild/netbsd-arm64@npm:0.25.0": "4f2502bbcf5967cf2a07c712f9fd87a0ec1e60356ea115dc8b69ea7364e88edae5758bb7cba4049065bb8e78d69d0f6bce09f42f146a50b2dcc6069e14ba66d5", - "@esbuild/netbsd-arm64@npm:0.25.10": "11f85ed4ade5c38fe8f2f3e78ee5c302a4f90d48a6bf93cf8917b13d52b03671c7742294785165cc70611eb0b085a4e9aa5a0f487f8e15f80200ff450549e19e", - "@esbuild/netbsd-x64@npm:0.25.0": "82e3e256ac495620890867e85b63f4327e3f5cd5876c868dd4690094c7e4c233bc2359835e512443b8a44f44fc15d98ef3e63914efae8128d3a348d0ebaa66ec", - "@esbuild/netbsd-x64@npm:0.25.10": "322482debb21160769f7ee293c3e84e44293bb7c734082fac2857277038ab1087763a553697b8f20dc3a03b7a397936396cde8150c1cc6a0ad62941e7ee86845", - "@esbuild/openbsd-arm64@npm:0.25.0": "6c8de60d94a53fa4c37f7cbfca04baf06a14bb4b4360ab711b2235ec33b624e268cd39aad84382648eabae4db5727495806221211d663c36f1710579f504f967", - "@esbuild/openbsd-arm64@npm:0.25.10": "4c68206360952d04fbafe32d3f4cf420f15c0a150f914d398746f1cf8241073fe9422cc0cc0de8b0b98b8158879dc5fd322eb8454d936457eab3dc9ba131584d", - "@esbuild/openbsd-x64@npm:0.25.0": "ed2beae58658aa2146a9cae2152a38f52f34e2dd929e79a298f8ce4b3c2c6fcf8e2ac98b458fb0fe5baf87c08df12b162c74b52b4c95f5f54f5a073da1668ebe", - "@esbuild/openbsd-x64@npm:0.25.10": "70328d84e7954932d0fcd282bc2a16fdd31a899ef23f5214221e64bfebd80222b03a7629d9af55fea220df6a41cd51d0c068618f443dc37ad717dc6601a9445b", - "@esbuild/openharmony-arm64@npm:0.25.10": "ca11e8c30cddd7603235cf05185678f6aad7c40eccd8ef57a207325b8553e5481503cda7ae35d777eb5020b9426f2d13332aba147732a9abe0f5b3964a6c0d17", - "@esbuild/sunos-x64@npm:0.25.0": "9a0d0569ea65171983b0daadbf8ec6dd31341db7bee50fc4c2b85521eb09ff7597279d9dda4b4f25c3bfd6f4f77d558b6a6f36dcfb6794e7fc2177df9770a17e", - "@esbuild/sunos-x64@npm:0.25.10": "46c205aa7a15d7b5d13553300f3d36593e7119a320672ac3c092f5a67db6cb91f9c59a235dfbe2947bd99f7653bb3be325a33c3474a00b90d39856ef9b05af48", - "@esbuild/win32-arm64@npm:0.25.0": "5484d8ad74479f8cc8c7b5d14d5f8ced3e50d6ef7fc12a45406ae6c6e5199784267bfccbe0173b598c1b512ea20ecd5de20579cf04d3e07848df3db7ccffd8e6", - "@esbuild/win32-arm64@npm:0.25.10": "ca2d057a874607013788fd3a161e8e25fcfb777a7aa6edd68662cff3869d1566541d61caab9b11e16515e2192673bf70c00f5efc38f67d1305f76b55bbe8febd", - "@esbuild/win32-ia32@npm:0.25.0": "206eb14fd607c5a5116a49eaf4ed3ca7c34c0372729d7d34aa07bbc2a5792afabfd62873212213b17607165bd4ecbe4366066de0ddedd50a46a27a3c5cb830e5", - "@esbuild/win32-ia32@npm:0.25.10": "fa5efade9e9a1a01e65223f22304dd71a3d005a2b394309a652bb231bdbc14fe937ec7bf0ce1e117fed182731430e055828616d1c10abee2dfc80aee50fee13e", - "@esbuild/win32-x64@npm:0.25.0": "a129e6ad07bbcc791fda365e71634aa45cf3989ded1f05ed1ecb99efa625b09081ef410d236fdd279037d001f2e5e5049c98bfbe6a2242c818463222df85cc54", - "@esbuild/win32-x64@npm:0.25.10": "0f2cb29b001bf4a71035b37d42bcaeb48baef5a6b07be2c024593a18dcec87cd5829a0cc17acc7128cd251bd6232bdbd04d967d9c2bd7db9c1978effffe31671", + "@esbuild/aix-ppc64@npm:0.27.2": "78d13201fd4d048d19955fc510db508b14b5fc1a38f4ea506469eac65db770c65fc3727df15b087778178fc8e3304df88559a7441d227451efd8a0b1a688a729", + "@esbuild/android-arm64@npm:0.27.2": "e8aded79b2f1f8841c082396f7476bee51c056ed468e438fe2ee00b6b73e96acd640d0b8d0cc13e63c972898f6cdd275483c36c562d4186f0efc01881672b08a", + "@esbuild/android-arm@npm:0.27.2": "ac673502cf6672dabb4b82a26bb3cc120402acba1b87a92481c0a37c8fa06847fd16503714bb227f6351d836f6f60c644ab50fda95c896d8eeb3e5ec3af96226", + "@esbuild/android-x64@npm:0.27.2": "dcf5c84443645af089e3b82421097c0288a4bdebabf231449ddd66e1b48952e5af975bd26954a50be0441605b91cfe779ca2192bc4b02b7b19192a2a86f912f1", + "@esbuild/darwin-arm64@npm:0.27.2": "cf08b03672941acbea8b509db79a7cb9cf8c81b563c75414c87b8c8442cb1178063eaa14b7cd1ae6cae95dba7e1de9343b721a6d19523a5f21c3d1367e3688b7", + "@esbuild/darwin-x64@npm:0.27.2": "5d3207cf85674b01a817c43064525e39b215802a9ecf352d15e92e926c3e549d95b30e127c2d3f8196ac9472ecca87a861d9f270221ee55884c7a6d0aa636fe1", + "@esbuild/freebsd-arm64@npm:0.27.2": "45f475fc6ab2f4760155ca2b50c4cf0ea8aef2bfad3ba4548f4547898d3cc785dcfc2ea58a190be3c20c715c771d1d694a9eb6ef5fb6b72d93b6abc94f366b98", + "@esbuild/freebsd-x64@npm:0.27.2": "7fb62475cb9cdf54d22f2fa984ef57f891d05f366143227efd1d28d507a3b1f2c723239b3e22b3ac418467e6284a08eaf6dcf0bfd2a0f1bea06d0ac73c2aa8de", + "@esbuild/linux-arm64@npm:0.27.2": "89b8e94e2f4e7cf564623bb6b1d2e9ab218c6d4cafed93778fb797b552d3495f08c99e49d9a2573823bc62660353ce4b4cf17a2828359a3437a9caf8da99673b", + "@esbuild/linux-arm@npm:0.27.2": "fd7c845a5ee2073ef6c5bc9d914844b48b82006ebf00f5acb98a43f600ee83fda578034ed8eb6f7f462ed4e3ecd8b7c6570a78bb708ee7eb10b93751ab879ad6", + "@esbuild/linux-ia32@npm:0.27.2": "23f67cfbab67aa860d7afa842e29fa75eb16af8577a811c54263fc3a276c05e468d532bcdb118d174624ed76a9e133d2520567937d4ed646caf9dd19aadbae15", + "@esbuild/linux-loong64@npm:0.27.2": "b37e531c91346c7b5d31ce6664a334c391a27c3c9fb282136abf232111575387e9d066abf27f29436afc913270a8e2c2b09c1210fbf87e70f1028685d94ec4de", + "@esbuild/linux-mips64el@npm:0.27.2": "8b48a6c7dc8f16147c1087b56710685f3b89279498caab6b63cad3db9402308adf633111d773cfe31756d41fe46e895f2c1ece0fc1ed484ab02e92c28357f0c6", + "@esbuild/linux-ppc64@npm:0.27.2": "4f207f87bfc1253974e00d3cf27316d3e93b7e51fde46ed618367e62f2875dffd66812acb85e8d2949dffc73eed7b3939a42bb93f40ec8fca4a6988173709dab", + "@esbuild/linux-riscv64@npm:0.27.2": "837a0aa03e82a1b853632d153515d68035e57b39ccf730a778311c04e3429aa80f001d990392519a641945501f6ab3af331481eb4551e99718e7cd2ba5862089", + "@esbuild/linux-s390x@npm:0.27.2": "426a4b9d9d4c58d61031a412c64c8cfb0db0e38da3cf4dade253c45a46dc539dccee24700e965e66c7c397a65fef765fc43bdc6b3f46d6bc6f289f79c4b6d7d5", + "@esbuild/linux-x64@npm:0.27.2": "febde9f6908220698cf72947534eca590c2b5ce8b0c9bc6170649c5f64f7f93808bb9be2caabd7c63068dc68e218741f27a17ffb8826d87fb487a0639888b90f", + "@esbuild/netbsd-arm64@npm:0.27.2": "1f69c833bfc5d1d7c58f52fca35637df1686a5bff5c15af900c165b2561a809d805201dc8de712fa73c69205e96a078096cd00b00e9ca8fb5cd8741e4ec943b8", + "@esbuild/netbsd-x64@npm:0.27.2": "29c9cbd018788521145d719013020dfbf744185eaeaff845f0fc925c67630c66743b03486a2531493f79482d2315e910a27a31f89a791e0a9589e04d86d295d7", + "@esbuild/openbsd-arm64@npm:0.27.2": "dccfe8ca6c0d648a26a626b5a4caf3325fed90d7ae343db2a86be9af2479391518c02d54470c2690aec23af1359debe7fbf125d979b5ea891a63fe4b206c2d6f", + "@esbuild/openbsd-x64@npm:0.27.2": "0bc581af266608ba01c530ec1fe2b475630dbd56538562f8b1748f7044727bd08d0784afa9aee8aa0a2afe843bb0b47572b4c6babb2a9953808d37263d730be1", + "@esbuild/openharmony-arm64@npm:0.27.2": "1f04a6d690bd2ef231801b0c46b40359b4d4451409cf46a865613f3942835e7633286c328c31f3a10065491f314e6c7c47d7a8f79c1a1ec25f59ff46f5765c6f", + "@esbuild/sunos-x64@npm:0.27.2": "9543db0acc86a762f9fd708a3226ebc45a1625885532d153928b9d2b0de90b6d78db0f9b77261d345b95c1ba7282ff3ab0fa37932c2dcd9b1c2b7da7cf39cd76", + "@esbuild/win32-arm64@npm:0.27.2": "2bfe0fef3ace4a5b0f7647168ae21eda9344a8bef4924d60d1ca781b59eb1f7fef0858aef6e2fb8c185638117bfb7dc18c55a700db57799955c8f655eaaf1f44", + "@esbuild/win32-ia32@npm:0.27.2": "c510d04bc11f11b7bd6bbf0ea28e2ba484e6232b7655b5cc8ccf8276ef7da760d54a79eaef87a1a40a81632a5ec4a9f7bb08f63920e5d145c8a893ae76d93094", + "@esbuild/win32-x64@npm:0.27.2": "d11933a70f9c908e3cd7202071dc23a9dea8afa58a4c2e22a3beab3516d0898345a5ebb2af47ffb2cc7f5d2a6d788ed4681fa7f37e121f1605149f124d632c67", + "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a", + "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79", + "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b", + "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750", + "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144", + "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1", + "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e", + "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0", + "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690", + "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d", + "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628", + "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c", + "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963", "@rollup/rollup-android-arm-eabi@npm:4.46.2": "d7d021a87cd3504c8d71b00a94199e13c4e07c14fe20ed7300cf1e6436a5f3fe8496c9e5f206e023b15f9b6f8991b2d95a48b47fa41d5c00b44f37fe5f4d5eb8", "@rollup/rollup-android-arm64@npm:4.46.2": "ca901edbf95bbdd2505c979f777e2a01e2e885a597b6daeed5362dac523ea2a1eb9c0c0d22b9b436f3613c22abdd442bd2764491948890930333a9e40ade35be", "@rollup/rollup-darwin-arm64@npm:4.46.2": "ed2b07c4803915d46ff642abd659e179fae524dcd3cb88c810a5b71290d16b498e0371dcb91fe98f6301b8c6600d579a099be1e9450278326281002df4a80019", @@ -70,15 +58,49 @@ "@rollup/rollup-win32-arm64-msvc@npm:4.46.2": "b59089cddf652e3da278744f6b8b2105360d1219833e54791380322913d40073ed4197ccd06d6091e83e1e12a5290d7a2e4aeae7947ff20c45943d07d1f0af0c", "@rollup/rollup-win32-ia32-msvc@npm:4.46.2": "d0aae1f80a64d9148426a7ff25b9df7f3abf7aca912c358a952f4b3bc541e030b5959f52e0b67abe01b9c8c8fb6567d1bbd30e31daabb7e2c4dc0488faf875f7", "@rollup/rollup-win32-x64-msvc@npm:4.46.2": "740ca3c1d07f5af76fc9c2db917edbf6d0c1cf3eeee8330a0c571db4990ec44f0b272696a215ab118e8a32d7529f84bd47225e85dfab458a989b4b18d0bbea49", + "@tailwindcss/oxide-android-arm64@npm:4.1.14": "607d2f0300740e7edffdb9771b501601957664d8be09f922040f8ffd74fe19863db9e9f2d04f3f31e03938acb01d4b723cfb476f7c1c1fe684ed8a4f582a15ca", + "@tailwindcss/oxide-android-arm64@npm:4.1.18": "228e24ef4857fc2de11638b5b73b0949636b2e95691a6cb8fc33e56f4ca93ba3e1b5b92d9493441198fc8830687ca4cafaffb7a0231b7926add3e910859b4dd2", + "@tailwindcss/oxide-darwin-arm64@npm:4.1.14": "edff4d0cfa49cacf5bdead7133c53e4cf3711536d38b503107c2245b6859e79a708599163626854787eb518bc6d79b20b440769c618d91c9299b69abd116612a", + "@tailwindcss/oxide-darwin-arm64@npm:4.1.18": "013ae3386e4b2778debae81c330d26caa1710666522244ba08e79613d9f7d04807fefe8c6071e9e28902bdda85d8f3eb24d2cdae5e65bae260f8d2de9fbac84a", + "@tailwindcss/oxide-darwin-x64@npm:4.1.14": "7316449dfca8bb2745b9f88c315f805ad60f0ca347a7a18e2ae1eef134d635019a393929a4b40e925e33cb19e7dea5cf6550b34067a0a142378dbbf3dc027859", + "@tailwindcss/oxide-darwin-x64@npm:4.1.18": "a208b3c9831c4c9980f592fcf78ec85c1bc7d5583c3d55bb66139e7ba3c9a34f68178e049df2d37d70f632518df91747549bced2207c93510022d392993a2b4a", + "@tailwindcss/oxide-freebsd-x64@npm:4.1.14": "1efe911a9411d0ff817854cc999b48ec7452b50b3a15423efc9ec07fbd4243873fa09896aacbe9c0e68137709675d3171b992a2c6acd4e2e870fb36e234fd4c3", + "@tailwindcss/oxide-freebsd-x64@npm:4.1.18": "e009d8af67f083ad10f88d775a2b01633a020e4228d8288281ac3fe236fb090e16160809c0d54aa208141ec0170876bf07c5a97634ecdf5f604f5cfa6f192802", + "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.14": "6168933cfb293acd1381967324566171d47f06d2a42553254bc43bdbb17b4319bcd98d9fd9d41e473360e20294241bd8600404632c90c6f4e8c4800046a2a846", + "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.18": "3129ae67643cc14cac0197b7b4aaf9aeca68f821f3bc00131c41602743515faabbbcd0a95badaa0ff76dcfbec71196068a32bd6a0f9eeadef523b7e8590b6722", + "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.14": "d2cfaa030ab8a6838d2bcda2f5974750ed72362bf1e682423fe5ac324af182ab6cfabeecef8443bbba5d7ada0d2d236374710bb9df3d90cc63f0c0cdf058e486", + "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.18": "568d962bc3240518623061ff2a30daf9eb23460b3142f1f0d5b1e12e2d72a855bf2c3d1593007303540530f1ddb730f4df66145f94fe8b3b7410358b06a7ab73", + "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.14": "275412b1e96c63156f6f323be1328f8ac11bf020ba71d9703ac27da056a3974ed1dfcc0ada9cc8470dc61abb80a91ff4656702f6632c63c2d612025da82bcdd3", + "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.18": "87b719ffab236a8ff8c1ec7e70f41b7fb4cd1fb8322e12d15534df2a56922b17dc483c8374abb54a09a098a75c5ca05a0551c362d526efc19d1000891201ad7f", + "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.14": "ce4e3fa272b04c4a666e60c74287906c33ba903439d5ac7ab4d41c8fed5eb5feb35d59e77e9fc3d6ad3a56126233a3d63c69b89a73412f0867197bf6f2d3a7f3", + "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.18": "799f1d20017125faaac62f1dff2e8aba872ba3ab1c8f972f296cb98bbda111b044f69493f3aac1113405042c5e545cc66f2f1bd31bb2e6f048cf4a621bc9cf0c", + "@tailwindcss/oxide-linux-x64-musl@npm:4.1.14": "b0e549351ae75e194351da1196977443643bd2601c6c2b6123b6c21d7c0c4c9c543fb596826fd9879d210c8f5af3f12cfed2e184a3a22a060e79194345f5fbab", + "@tailwindcss/oxide-linux-x64-musl@npm:4.1.18": "e6408c0d9cee93dd40a9f7a97c97fbc4ca6cda2cfbb67b8021727dda40e87cf96734f11aa49c77d8aad92bbf1a24a4ca5d2736e355c754cf5dad09bd329c7328", + "@tailwindcss/oxide-wasm32-wasi@npm:4.1.14": "73d67e788052c796ea06864ebc53f4c9b4e72a73796031f49d6ea94cf8d19bcb62224994e89bb2d941173358298c0090be84eb7125e44c80d0e629cc99ac43ae", + "@tailwindcss/oxide-wasm32-wasi@npm:4.1.18": "4aa9244e61c275451c6e9d67be3b832f59dda299239dc0cb1a56a8e332b237b7669ddb2a35b5cee55b30ad8a87446ff9b9bf10fed5bd7e25531231ea87e02bf7", + "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.14": "d67e99b0efd62a57b10dad97358e09ad362e944e81a703cb9b1932492735152e94a483039c756869e3ee317efeacc8c7cc7ec11682e9814cbb09d86027a1dd19", + "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.18": "1dd1988e6b81b4ca26ec75ee49a888db1a669e78d75e89ee8d4bc7e3dcb206eee2562592493c8a12acb2faa33f4a6d3d813f1b191dea89f56494d05a5e50332b", + "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.14": "c0a9fc170c6d137d1b81a84ae44d70aec370f432275e7d2a399094cccaad3f88d7e690a78fd9706acc6efd5bd6006e0201937eb445a91a59bddaabd19208526b", + "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.18": "12b58065f76ac2f46d070102704fc3e3727ecbfee09d11c43ac7a6e8bdb25943469adf362589529df128c922b1ca65be9ae869ae079caf11233fde194fbca9f7", "lightningcss-android-arm64@npm:1.30.2": "7b8a62c7aa787251381e9e082fc19991e8bca696f17be4dad0a5c3a31483d1452e6f8b04713b9c9221ef8d9b011510ee10d69c34005294be92ba2e57ad075a90", + "lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a", "lightningcss-darwin-arm64@npm:1.30.2": "fe4f6eb4af66f95a0f83a9b4970f863417ae9ac394b5c963a20cda24ae08ae0ce6ebdc6f8e664d8b53717afb936242b9a73394584b55ecf2978babab50364e93", + "lightningcss-darwin-x64@npm:1.30.1": "6b88c182be0de82858983ec374093c2cb13cd58139456e25be215fc55a7a8cbfcd6f7487bee1507fc024988a1f324d7cb26b3f195893d5a69ccaf252dc9094eb", "lightningcss-darwin-x64@npm:1.30.2": "b2d82add63e88d77dbd08508a32c1c28a12de826d4dd70f6ec17ffae9d3c5bf1be7a7c35f154bf98bca4164b7390ba515202884e4cabaa83ed7f1727baaa08fa", + "lightningcss-freebsd-x64@npm:1.30.1": "731a96282db6afff3f57e8cbb73f51d06455231868b3b311a772ee11ead9c57538fc217d0956df4f177dbb805fa4fc761734440f6d2bb8965963b21f06bf63c1", "lightningcss-freebsd-x64@npm:1.30.2": "cea6113555ed6fd69e10c67a8616d3b4c743eacd817e93d290b7d85d1c2eb29386466e55f61890f4aee87cafe062ef037b92824160418dd1c299bb7d15796cec", + "lightningcss-linux-arm-gnueabihf@npm:1.30.1": "fcf07f54c4d7d056f9b57d39e6df1c6f60c02ef4ebd51eda76056d35d89b1307af8737e44076d2b1f85348d2b1b9c61bf2220c5347389a6d40ad8bb12f34b5cf", "lightningcss-linux-arm-gnueabihf@npm:1.30.2": "93119a9476759aff2a1a3fe35dfdfd39b0eab320b76725b36bddfc11f258f80140831169ed10f5528349863f7c6497358ec73d3c13054e6dc72ef5b26a22bd26", + "lightningcss-linux-arm64-gnu@npm:1.30.1": "bc82ce2e96ffab4b0ba1f9adacf63f461c3f6221bcbc955104c05e6e8c2c6ed8863421663e0e4148a682b143868d07190c38e9f990915a80ce9692f963132320", "lightningcss-linux-arm64-gnu@npm:1.30.2": "c52236dd9777f150b849e0ed4ec1a4d17dc2bbe1ffa802286483d9c71e868eef16b54e348e410d44921262beb4474d2b4c90c268aa2c1109e55899d7cf8294c8", + "lightningcss-linux-arm64-musl@npm:1.30.1": "2ae25a764b8ed9fcc1977dc1786011e68db23bf3343168fa2d4a9a4bcbb73c7aae258cdcb879d68a3a28e22343705ee435517d3f045e49b15fbb65816d74a91d", "lightningcss-linux-arm64-musl@npm:1.30.2": "85b54252172367c9b15be312c55f982d0541063b0626faa370c26d5eb8bedc36e036b6081374aba35f68d9e82c729239fb7af52f997004df715b09a6f7c5d453", + "lightningcss-linux-x64-gnu@npm:1.30.1": "190ac9ba1b9a4bf658a9e5b3c5702546ec779a7a5ccf5a4e06e5d46012ce6cad1842a9b1e717498bc759e103ba7390f42c9b8ba3e67157adec8e7162225633b4", "lightningcss-linux-x64-gnu@npm:1.30.2": "658f54482728885541331184a5fefc3df76e1f4d691ad28d70b559dc391d552837bc95676449e48cbdcda8d63165f0f56c921a09ec2c6fc591b427c566e0b9ed", + "lightningcss-linux-x64-musl@npm:1.30.1": "fab6ed75d747024fcf46212b9edc7d1daccfbe4e7a06dcd0f9e841c6a023e61e716751747f9e8aecba18495adc9ef6bc20b24616d5c15c87f5dc1ff9ce1fd859", "lightningcss-linux-x64-musl@npm:1.30.2": "6b046d57dab2237729953f1350a922844fafd16bdbae3a9ee17b04abdc2e2d2392ccd61932e7210276bf18938165d900517d2079ec57d866fd288b8bba28dbd4", + "lightningcss-win32-arm64-msvc@npm:1.30.1": "2cc285e89f66323ecae5ec41a6b1a57500d74a549fb392829c99708d5a5254d709c0ccd2d8fef4f6c1fc9a55c5bd51eca633fa1f2228563f884545668adc1b17", "lightningcss-win32-arm64-msvc@npm:1.30.2": "f8383d06fe81494ba34b9bd7eb713ad91dbd84d4f321526b5190d7908e95591e462159acf71f6d3a0c33ea1251d5e80c012d255d94e9aa4187a476a810a249bc", + "lightningcss-win32-x64-msvc@npm:1.30.1": "60bd930e71fab0fbf0250406d4791bf27f0b9c8daf095c8d5fce9f3e120d24753e309eb6fed956043fc6a6cbb6d1da30fb0862acb54fa046b5f9a2e69908b6f9", "lightningcss-win32-x64-msvc@npm:1.30.2": "ab86748b46ca851d29c387cb349cd35ca9da6fc73082b759ef84d358ec08ece6491e0eb137ea8b30b85419c20075c59f44620ab026d9a0aa0e86d3e0a610a960" } diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix index f254908cdd61..da3a2e1b58bd 100644 --- a/pkgs/by-name/le/learn6502/package.nix +++ b/pkgs/by-name/le/learn6502/package.nix @@ -24,20 +24,20 @@ in stdenv.mkDerivation (finalAttrs: { pname = "learn6502"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "JumpLink"; repo = "Learn6502"; tag = "v${finalAttrs.version}"; - hash = "sha256-YWbq0r6OEZpg4l633Y/1+r1Ik42ldoBH1ZjszRKNjRY="; + hash = "sha256-MR4QslG1DnnYLLn7esXGit0HG1cW37ECUE2hgOegudw="; }; missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-5wwpB4iDw/J7nUnb/qdSP+M0LLmHVU4/Zr+Ohl6Q4vk="; + hash = "sha256-y1Xyb2ipUx9gcfnub6gjABBSjBXQmSp6Kim0ZtUso38="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lib2geom/package.nix b/pkgs/by-name/li/lib2geom/package.nix index 17fc5ec2630b..6bd3333901fe 100644 --- a/pkgs/by-name/li/lib2geom/package.nix +++ b/pkgs/by-name/li/lib2geom/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "inkscape"; repo = "lib2geom"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-kbcnefzNhUj/ZKZaB9r19bpI68vxUKOLVAwUXSr/zz0="; }; diff --git a/pkgs/by-name/li/libkazv/package.nix b/pkgs/by-name/li/libkazv/package.nix index e4206da49575..1740c15f8cef 100644 --- a/pkgs/by-name/li/libkazv/package.nix +++ b/pkgs/by-name/li/libkazv/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "lily-is.land"; owner = "kazv"; repo = "libkazv"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-bKujiuAR5otF7nc/BdVWVaEW9fSxdh2bcAgsQ5UO1Aw="; }; diff --git a/pkgs/by-name/li/libloot/package.nix b/pkgs/by-name/li/libloot/package.nix index 65940b449752..a4631e0a5d70 100644 --- a/pkgs/by-name/li/libloot/package.nix +++ b/pkgs/by-name/li/libloot/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "loot"; repo = "libloot"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-l8AdqJ0lZH4rBcf4WV3ju+sIHYam6USXCXTqyRPzgeo="; }; diff --git a/pkgs/by-name/li/libmesode/package.nix b/pkgs/by-name/li/libmesode/package.nix deleted file mode 100644 index b016c47fb849..000000000000 --- a/pkgs/by-name/li/libmesode/package.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - libtool, - openssl, - expat, - pkg-config, - check, -}: - -stdenv.mkDerivation rec { - pname = "libmesode"; - version = "0.10.1"; - - src = fetchFromGitHub { - owner = "profanity-im"; - repo = "libmesode"; - rev = version; - sha256 = "1bxnkhrypgv41qyy1n545kcggmlw1hvxnhwihijhhcf2pxd2s654"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = [ - openssl - expat - libtool - check - ]; - - dontDisableStatic = true; - - doCheck = true; - - meta = { - description = "Fork of libstrophe (https://github.com/strophe/libstrophe) for use with Profanity XMPP Client"; - longDescription = '' - Reasons for forking: - - - Remove Windows support - - Support only one XML Parser implementation (expat) - - Support only one SSL implementation (OpenSSL) - - This simplifies maintenance of the library when used in Profanity. - Whilst Profanity will run against libstrophe, libmesode provides extra - TLS functionality such as manual SSL certificate verification. - ''; - homepage = "https://github.com/profanity-im/libmesode/"; - license = with lib.licenses; [ - gpl3Only - mit - ]; - platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; - maintainers = with lib.maintainers; [ devhell ]; - }; -} diff --git a/pkgs/by-name/li/libsfdo/package.nix b/pkgs/by-name/li/libsfdo/package.nix index 650bf2778629..449aad351861 100644 --- a/pkgs/by-name/li/libsfdo/package.nix +++ b/pkgs/by-name/li/libsfdo/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "vyivel"; repo = "libsfdo"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-xT1pKKElwKSd43XTKuBY+9rogquV1IAAYgWV5lEpAHk="; }; diff --git a/pkgs/by-name/li/likwid/package.nix b/pkgs/by-name/li/likwid/package.nix index 8c894f42d192..5c877ab22386 100644 --- a/pkgs/by-name/li/likwid/package.nix +++ b/pkgs/by-name/li/likwid/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "likwid"; - version = "5.5.0"; + version = "5.5.1"; src = fetchurl { url = "https://ftp.fau.de/pub/likwid/likwid-${version}.tar.gz"; - hash = "sha256-aIkk/gE0BwfCwxi3+GfuYPt1G5X0lUvILTofdqOhUFY="; + hash = "sha256-JceDDmOyA5b8/DsWrnnDm0IgqG03bOt81pSbX/mR23g="; }; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix index 0f1331ef934a..d18cc930f148 100644 --- a/pkgs/by-name/lk/lk-jwt-service/package.nix +++ b/pkgs/by-name/lk/lk-jwt-service/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "lk-jwt-service"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "element-hq"; repo = "lk-jwt-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-Qb+6DzaObeNjV+XVXLR6GkgtodIVTqTxC4G4Ef2xFrE="; + hash = "sha256-x3QYq+PT0MFcRR50CG4NpCxv5KkoCLWzUEkPSdQnZX0="; }; vendorHash = "sha256-GJKSvdv41rRSCGVAgUDxHdXoxRj/h+eDktjRJ3O5QFE="; diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix index 49fe455bdfef..a8f6609b17b7 100644 --- a/pkgs/by-name/ll/llama-swap/package.nix +++ b/pkgs/by-name/ll/llama-swap/package.nix @@ -17,7 +17,7 @@ let in buildGoModule (finalAttrs: { pname = "llama-swap"; - version = "182"; + version = "183"; outputs = [ "out" @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { owner = "mostlygeek"; repo = "llama-swap"; tag = "v${finalAttrs.version}"; - hash = "sha256-w/VQS8uCpgniwLiJsH/8IG/AGasRxjCv7fADTfpvWLw="; + hash = "sha256-5TIcDK6M/9jDkJDWafRGw+/TaW7Pbvn1yl9ijnzP/Mc="; # 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/by-name/ll/llama-swap/ui.nix b/pkgs/by-name/ll/llama-swap/ui.nix index 8afe7088df0e..3262818e4a39 100644 --- a/pkgs/by-name/ll/llama-swap/ui.nix +++ b/pkgs/by-name/ll/llama-swap/ui.nix @@ -7,7 +7,7 @@ buildNpmPackage (finalAttrs: { pname = "${llama-swap.pname}-ui"; inherit (llama-swap) version src; - npmDepsHash = "sha256-RKPcMwJ0qVOgbTxoGryrLn7AW0Bfmv9WasoY+gw4B30="; + npmDepsHash = "sha256-fIDn3vfrqTZfzK8dc+Vpckw9M2iyJi5ggHFEV8PeXtU="; postPatch = '' substituteInPlace vite.config.ts \ diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index 847b9f720016..435c0cc4b349 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,10 +7,10 @@ let pname = "lmstudio"; - version_aarch64-darwin = "0.3.37-1"; - hash_aarch64-darwin = "sha256-RvktWUS12XF5dEn1Uq94vKcZSe89D+xXy6/0tfRVYVU="; - version_x86_64-linux = "0.3.37-1"; - hash_x86_64-linux = "sha256-wNyTEHnxjlXtmLs9yc8p7KRAJX4i5aKSkgjGJuimSJQ="; + version_aarch64-darwin = "0.3.39-1"; + hash_aarch64-darwin = "sha256-A3TfbFr4H7NNXo9e7Ro3MkdJ/svF6PyeQT34VnMAs2I="; + version_x86_64-linux = "0.3.39-1"; + hash_x86_64-linux = "sha256-XIwJ0Dgc34yKMsx2/eBAbdDz9MyKOCx7YpFtYBFWu0U="; meta = { description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; diff --git a/pkgs/by-name/lu/luarenamer/deps.json b/pkgs/by-name/lu/luarenamer/deps.json new file mode 100644 index 000000000000..e2152a081e39 --- /dev/null +++ b/pkgs/by-name/lu/luarenamer/deps.json @@ -0,0 +1,32 @@ +[ + { + "pname": "KeraLua", + "version": "1.4.5", + "hash": "sha256-O3ozcLw1IVc6ssc3SZfPIvp5s0+xLyLuTZw6qrjyEyE=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection", + "version": "8.0.0", + "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ=" + }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.0", + "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.0", + "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4=" + }, + { + "pname": "NLua", + "version": "1.7.5", + "hash": "sha256-1s8cc1RqKnfwafhxpBhOdkr8ZteNjt5fBN2sfLy4e5k=" + }, + { + "pname": "Shoko.Plugin.Abstractions", + "version": "5.2.0", + "hash": "sha256-tNLOeum4rc30OEWRiH1zTzLk5+1MfSEOfvkON1MU/SY=" + } +] diff --git a/pkgs/by-name/lu/luarenamer/nozip.patch b/pkgs/by-name/lu/luarenamer/nozip.patch new file mode 100644 index 000000000000..4275043d6611 --- /dev/null +++ b/pkgs/by-name/lu/luarenamer/nozip.patch @@ -0,0 +1,35 @@ +diff --git a/LuaRenamer/LuaRenamer.csproj b/LuaRenamer/LuaRenamer.csproj +index c4f0508..b9e001c 100644 +--- a/LuaRenamer/LuaRenamer.csproj ++++ b/LuaRenamer/LuaRenamer.csproj +@@ -33,30 +33,4 @@ + + + +- +- +- +- +- +- +- $([System.Text.RegularExpressions.Regex]::Match('$(GitInfo)', '\d+\.\d+\.\d+')) +- $(GitInfo) +- +- +- +- +- +- $(PublishDir)ZipDir/ +- $(PublishDir)../$(ProjectName)_$([MSBuild]::ValueOrDefault("$(RuntimeIdentifier)","Portable"))_$(GitInfo).zip +- +- +- +- +- +- +- +- +- +- +- + diff --git a/pkgs/by-name/lu/luarenamer/package.nix b/pkgs/by-name/lu/luarenamer/package.nix new file mode 100644 index 000000000000..a07b0d64f1fb --- /dev/null +++ b/pkgs/by-name/lu/luarenamer/package.nix @@ -0,0 +1,49 @@ +# SPDX-FileCopyrightText: 2025-2026 Hana Kretzer +# +# SPDX-License-Identifier: MIT +{ + lib, + buildDotnetModule, + fetchFromGitHub, + dotnet-sdk_8, + dotnet-aspnetcore_8, + nix-update-script, +}: + +buildDotnetModule (finalAttrs: { + pname = "luarenamer"; + version = "5.10.1"; + + src = fetchFromGitHub { + owner = "Mik1ll"; + repo = "LuaRenamer"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZN7o9q3APgc7vL+IRpk6Phd0Btpzyqdp53aoGp6sA8o="; + }; + + patches = [ + ./nozip.patch + ]; + + dotnet-sdk = dotnet-sdk_8; + dotnet-runtime = dotnet-aspnetcore_8; + + nugetDeps = ./deps.json; + projectFile = "LuaRenamer/LuaRenamer.csproj"; + + executables = [ ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/Mik1ll/LuaRenamer"; + changelog = "https://github.com/Mik1ll/LuaRenamer/releases/tag/${finalAttrs.src.tag}"; + description = "Plugin for Shoko that allows users to rename their collection using Lua"; + license = [ + lib.licenses.gpl3 + lib.licenses.lgpl3 + ]; + maintainers = with lib.maintainers; [ nanoyaki ]; + inherit (dotnet-sdk_8.meta) platforms; + }; +}) diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index da183b106722..6e29b7ae09ed 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.5.16"; + version = "3.5.17"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage"; - hash = "sha512-V0aeQTFRAoheUsI/gFZMaTTgWaCxQXEirkKr2mFnUhBXdesYGwnKmIJk0v1JOtK2RQT0V536yEMsRJVZgfscNw=="; + hash = "sha512-B/0qzOf5xs4lEDludDhRQbBhEEs5r6WkmHkuY8pz3G4o4q6QcCPtm5I8ZcO0mpPcsoljrTonV4UGZplqTTNh6g=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix index 1aa95871a0b4..80e647ad4191 100644 --- a/pkgs/by-name/ma/magic-vlsi/package.nix +++ b/pkgs/by-name/ma/magic-vlsi/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "RTimothyEdwards"; repo = "magic"; - tag = "${version}"; + tag = version; sha256 = "sha256-P5qfMsn3DGHjeF7zsZWeG9j38C6j5UEwUqGyjaEVO1E="; leaveDotGit = true; }; diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix index 3783dda751c9..d4bd29df0586 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/plugins/s3-storage-provider.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse-s3-storage-provider"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-aeacw6Fpv4zFhZI4LdsJiV2pcOAMv3aV5CicnwYRxw8="; }; diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 5382a883c3c1..4f26bb650e71 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -20,8 +20,8 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(10\\.11\\.[0-9]+)$"; - version = "10.11.9"; - srcHash = "sha256-e7itz3VcjSwXGTA+Dn0g5CmQzpnquQ6GmWNdvwrhaQo="; + version = "10.11.10"; + srcHash = "sha256-do7g5B/rs9JPT2JS718xi3CmaFEXAmmcM/yJi+R/q2Y="; vendorHash = "sha256-Lsw/cvl98JdVmzWr85lAv/JMcTmZZZ4ALLunFLNcrro="; npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A="; lockfileOverlay = '' diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix index 0df9c4fd1f1b..bebf21bcc8f0 100644 --- a/pkgs/by-name/mc/mcp-grafana/package.nix +++ b/pkgs/by-name/mc/mcp-grafana/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "mcp-grafana"; - version = "0.7.10"; + version = "0.8.2"; src = fetchFromGitHub { owner = "grafana"; repo = "mcp-grafana"; tag = "v${finalAttrs.version}"; - hash = "sha256-DDkIWCJneL7l59CThzPkHzcB/lcUZrcVDZO/nWsZ2ss="; + hash = "sha256-oMCRZaAkvotP0oD4MjdNASDRk0FUYnH2vR22IojilN8="; }; - vendorHash = "sha256-4dOsXrwUk+muYLIec9hBdMl/W3lk/pMvliEWeYrU5zQ="; + vendorHash = "sha256-SjzOmWU+mrEdLsgeT1Y2+A3skOzWHxJXxWke7aHrt+A="; ldflags = [ "-s" diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index fabbae2157a0..bc4a683c9c65 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -6,18 +6,18 @@ nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "md-tui"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "henriklovhaug"; repo = "md-tui"; - tag = "v${version}"; - hash = "sha256-pOo+gifWomZh3hTfqaIRMPEPR5TPinzl8NgYcCit7t4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-LBt15MCv+QbjutwRfYI9zX5UAiYF2Y70EQ3DATRLaY8="; }; - cargoHash = "sha256-07U69UdiAqdIv5JVfvbLNfQD/SfPfaiYZsMr6y/r8UY="; + cargoHash = "sha256-2Qr+6y/DOQJYP5EMMI/OdqIMrHBX4tNH29fK+QCsrnQ="; nativeBuildInputs = [ pkg-config ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Markdown renderer in the terminal"; homepage = "https://github.com/henriklovhaug/md-tui"; - changelog = "https://github.com/henriklovhaug/md-tui/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/henriklovhaug/md-tui/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ GaetanLepage @@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec { platforms = lib.platforms.all; mainProgram = "mdt"; }; -} +}) diff --git a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix index c057a7a914bd..38bcb287af16 100644 --- a/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix +++ b/pkgs/by-name/md/mdbook-kroki-preprocessor/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-kroki-preprocessor"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "joelcourtney"; repo = "mdbook-kroki-preprocessor"; rev = "v${version}"; - hash = "sha256-rTXieHa/EIg69vUQE2FOD1Xb4cUVe5CvBiv9CnhHB3I="; + hash = "sha256-NTsI/ANqm192sNE9yd2d7ldDLglWoq4L20t84PaAO3M="; }; - cargoHash = "sha256-aTtjrCl13oOKqwPGiVlOfjGqAdBS94XGjcvn3bBWpa0="; + cargoHash = "sha256-BStTLg44XRdEaQKDNfR+jgjECjZantXTYNk/HX5h7eU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 21f9dae474db..3a1b810147eb 100644 --- a/pkgs/by-name/me/meilisearch/package.nix +++ b/pkgs/by-name/me/meilisearch/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "meilisearch"; - version = "1.32.1"; + version = "1.32.2"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-ljp+Cpk8aW1fC9wM7/9dAg9d68scwhYBJmbnJmgoMG8="; + hash = "sha256-72AflpW0z1vpPEYsP07U9NJ84CEPhAbLo+tXxI8Qha4="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-0OK34rZqUL2w0z3NIoEfa+DMpbIZWZ6X3ZeeDf4GCcA="; + cargoHash = "sha256-UCQk76TB7gWFd0077RQ39IXGrGjc6hxhXJW0pBheADU="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/me/meritous/package.nix b/pkgs/by-name/me/meritous/package.nix index 8a79612d2ad9..5bf5b2830816 100644 --- a/pkgs/by-name/me/meritous/package.nix +++ b/pkgs/by-name/me/meritous/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "meritous"; repo = "meritous"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-6KK2anjX+fPsYf4HSOHQ0EQBINqZiVbxo1RmBR6pslg="; }; diff --git a/pkgs/by-name/mf/mfaktc/package.nix b/pkgs/by-name/mf/mfaktc/package.nix index e8c9fd4dafc4..eae83959ecb7 100644 --- a/pkgs/by-name/mf/mfaktc/package.nix +++ b/pkgs/by-name/mf/mfaktc/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "primesearch"; repo = "mfaktc"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-7lJ3+v9exe+n+Txkn1vsvSPYLEP4l/0UgHpc6lAGv1Y="; }; diff --git a/pkgs/by-name/ml/mlmmj/package.nix b/pkgs/by-name/ml/mlmmj/package.nix index 6828fe929cdd..aeedb8f1c644 100644 --- a/pkgs/by-name/ml/mlmmj/package.nix +++ b/pkgs/by-name/ml/mlmmj/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { domain = "codeberg.org"; owner = "mlmmj"; repo = "mlmmj"; - rev = "refs/tags/RELEASE_" + lib.replaceStrings [ "." ] [ "_" ] version; + tag = "RELEASE_" + lib.replaceStrings [ "." ] [ "_" ] version; hash = "sha256-kAo04onxVve3kCaM4h1APsjs3C4iePabkBFJeqvnPxo="; }; diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix index 6fa29dbe4161..846fa2474456 100644 --- a/pkgs/by-name/ml/mlx42/package.nix +++ b/pkgs/by-name/ml/mlx42/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, glfw, enableShared ? !stdenv.hostPlatform.isStatic, @@ -11,31 +10,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "mlx42"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "codam-coding-college"; repo = "MLX42"; tag = "v${finalAttrs.version}"; - hash = "sha256-/HCP6F7N+J97n4orlLxg/4agEoq4+rJdpeW/3q+DI1I="; + hash = "sha256-IMwDdWtbu882N43oTr/c6Fq34TduCuUt34Vh2Hx/TJY="; }; - patches = [ - # clang no longer allows using -Ofast - # see: https://github.com/codam-coding-college/MLX42/issues/147 - (fetchpatch { - name = "replace-ofast-with-o3.patch"; - url = "https://github.com/codam-coding-college/MLX42/commit/ce254c3a19af8176787601a2ac3490100a5c4c61.patch"; - hash = "sha256-urL/WVOXinf7hWR5kH+bAVTcAzldkkWfY0+diSf7jHE="; - }) - ]; - postPatch = '' patchShebangs --build ./tools - '' - + lib.optionalString enableShared '' - substituteInPlace CMakeLists.txt \ - --replace-fail "mlx42 STATIC" "mlx42 SHARED" ''; strictDeps = true; @@ -44,7 +29,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glfw ]; - cmakeFlags = [ (lib.cmakeBool "DEBUG" enableDebug) ]; + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) + (lib.cmakeBool "DEBUG" enableDebug) + ]; postInstall = '' mkdir -p $out/lib/pkgconfig diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 90a203a609f4..ca8716e4fb57 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -40,7 +40,7 @@ let pname = "mongodb-compass"; - version = "1.48.2"; + version = "1.49.0"; selectSystem = attrs: @@ -55,9 +55,9 @@ let } }"; hash = selectSystem { - x86_64-linux = "sha256-6plLkjeFyXnYVTRY9hnnlKRRk0/pqIE7uQ/ftht6MB4="; - x86_64-darwin = "sha256-kVIYeo4YmEGUA+9jUMQ+tm3C504yCdFSTprUMZmXCxI="; - aarch64-darwin = "sha256-dJD7efN/sfLwxJz1myYneAKdnVdEcNzSth5CzcVoGsM="; + x86_64-linux = "sha256-XbVgFYkamZWCVcik3Hh0MiuwCHCi2NDKusT/CRO+q0E="; + x86_64-darwin = "sha256-mqnVYJ1wsC1qekEM9CYkZ05DTKHTDUHnoVytm/5QMw4="; + aarch64-darwin = "sha256-fVnW4mygJOgpqIHlO2qjMt9zdQaVBqFLKX4CL31KvXg="; }; }; diff --git a/pkgs/by-name/mo/mongosh/package.nix b/pkgs/by-name/mo/mongosh/package.nix index 4c925831bd69..28d85142b5e1 100644 --- a/pkgs/by-name/mo/mongosh/package.nix +++ b/pkgs/by-name/mo/mongosh/package.nix @@ -7,16 +7,16 @@ buildNpmPackage.override { nodejs = nodejs_22; } (finalAttrs: { pname = "mongosh"; - version = "2.5.10"; + version = "2.6.0"; src = fetchFromGitHub { owner = "mongodb-js"; repo = "mongosh"; tag = "v${finalAttrs.version}"; - hash = "sha256-N1uAIgEX44RSFJTivOpASKiab+Jr0N0Mo+olt000uK4="; + hash = "sha256-JoHTHqBx7CKcpEzn82qK4Mp8zGzw4o/iYMhZAw6gpV0="; }; - npmDepsHash = "sha256-/8qw9dVPHAuyQZWdDq+jhP7NMBwTbvMqv/PtwXJEQuo="; + npmDepsHash = "sha256-PgH5r2E94fKj5dhEDP6h68UoRq3KPvJuYdM1oAGuWXo="; patches = [ ./disable-telemetry.patch diff --git a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix index d2741dc11f01..1c28e1ff628d 100644 --- a/pkgs/by-name/mo/mov-cli/mov-cli-test.nix +++ b/pkgs/by-name/mo/mov-cli/mov-cli-test.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mov-cli"; repo = "mov-cli-test"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-INdPAJxPxfo5bKg4Xn1r7bildxznXrTJxmDI21wylnI="; }; diff --git a/pkgs/by-name/mp/mpc-qt/package.nix b/pkgs/by-name/mp/mpc-qt/package.nix index d1e13997f5b8..b650f73842c4 100644 --- a/pkgs/by-name/mp/mpc-qt/package.nix +++ b/pkgs/by-name/mp/mpc-qt/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mpc-qt"; - version = "25.07"; + version = "26.01"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; tag = "v${finalAttrs.version}"; - hash = "sha256-apZR3PgU+Fq1whnWQHhmHPZKAZBKdrVCWaGfu+H7A4s="; + hash = "sha256-tgCdPzolUlp3Cy1ZbDlMQvl/4WcTl86QTZ8F18f0JME="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mp/mpv/scripts/modernz.nix b/pkgs/by-name/mp/mpv/scripts/modernz.nix index 357736724488..e9bc5ff1122b 100644 --- a/pkgs/by-name/mp/mpv/scripts/modernz.nix +++ b/pkgs/by-name/mp/mpv/scripts/modernz.nix @@ -7,14 +7,14 @@ }: buildLua (finalAttrs: { pname = "modernz"; - version = "0.2.8"; + version = "0.2.9"; scriptPath = "modernz.lua"; src = fetchFromGitHub { owner = "Samillion"; repo = "ModernZ"; rev = "v${finalAttrs.version}"; - hash = "sha256-pQttcfCaw9K8BD/T2CZdRAb9QEFobyeUj/KmNStgzEg="; + hash = "sha256-ocsThwgCeWUSCs1ZD2pwNIvKQZtGQXrvceaMRvgmFPA="; }; postInstall = '' diff --git a/pkgs/by-name/mp/mpv/scripts/webtorrent-mpv-hook.nix b/pkgs/by-name/mp/mpv/scripts/webtorrent-mpv-hook.nix index 704e90fc0275..55493e172c3d 100644 --- a/pkgs/by-name/mp/mpv/scripts/webtorrent-mpv-hook.nix +++ b/pkgs/by-name/mp/mpv/scripts/webtorrent-mpv-hook.nix @@ -20,7 +20,7 @@ let src = fetchFromGitHub { owner = "murat-dogan"; repo = "node-datachannel"; - rev = "refs/tags/v${nodeDatachannel.version}"; + tag = "v${nodeDatachannel.version}"; hash = "sha256-r5tBg645ikIWm+RU7Muw/JYyd7AMpkImD0Xygtm1MUk="; }; diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix index ae52507b8464..e3c252848759 100644 --- a/pkgs/by-name/mu/multipath-tools/package.nix +++ b/pkgs/by-name/mu/multipath-tools/package.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; makeFlags = [ + "WARN_ONLY=1" "LIB=lib" "prefix=$(out)" "systemd_prefix=$(out)" diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 335ee9a1cd3c..72c64f5b9ab5 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "myks"; - version = "5.5.1"; + version = "5.6.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${version}"; - hash = "sha256-6K/mlx1l8Ijmligefb2Wcwq9aSGh5PbvgoyJpx0U4w4="; + hash = "sha256-0bK5ZnzGhQc0s0nQiNTGe5Z45BpwqXiv8kt0ne8EkpE="; }; - vendorHash = "sha256-Tl8ubucPn72TGD5ER3zeDHJUoSklNeeByitj/WfICoU="; + vendorHash = "sha256-jNPo6TotuBhG2GW9vHu1zC6BYCIRfyqRZB6vbtCNCpI="; subPackages = "."; diff --git a/pkgs/by-name/nb/nbfc-linux/package.nix b/pkgs/by-name/nb/nbfc-linux/package.nix index 8bfae97efb92..eaca2a5ef4c0 100644 --- a/pkgs/by-name/nb/nbfc-linux/package.nix +++ b/pkgs/by-name/nb/nbfc-linux/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "nbfc-linux"; repo = "nbfc-linux"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ARUhm1K3A0bzVRen6VO3KvomkPl1S7vx2+tmg2ZtL8s="; }; diff --git a/pkgs/by-name/ne/nest-cli/package.nix b/pkgs/by-name/ne/nest-cli/package.nix index cfa7f1fd7926..69ca8dd9c586 100644 --- a/pkgs/by-name/ne/nest-cli/package.nix +++ b/pkgs/by-name/ne/nest-cli/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "nest-cli"; - version = "11.0.14"; + version = "11.0.15"; src = fetchFromGitHub { owner = "nestjs"; repo = "nest-cli"; tag = version; - hash = "sha256-FvZRqQ/wDjEBhug99MZa/ZKcQXCF3I8fXom8hi2AQm4="; + hash = "sha256-yUDlF5UyRE9UdGhw9HDLDpg1voUMQsIenUZZ4UPhBT4="; }; - npmDepsHash = "sha256-KnvcJqTSiW9pCt1MhwsTJmmmvwgtVK5hoLAs/B709MI="; + npmDepsHash = "sha256-qsY1pGKg+qt7meKwH9wKuPF57KtZC7Y8hYgkm5ObOwE="; npmFlags = [ "--legacy-peer-deps" ]; env = { diff --git a/pkgs/by-name/ne/newelle/package.nix b/pkgs/by-name/ne/newelle/package.nix index 145729cc7301..bce92233d3df 100644 --- a/pkgs/by-name/ne/newelle/package.nix +++ b/pkgs/by-name/ne/newelle/package.nix @@ -20,7 +20,7 @@ }: let - version = "1.0.1"; + version = "1.1.0"; in python3Packages.buildPythonApplication { pname = "newelle"; @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication { owner = "qwersyk"; repo = "Newelle"; tag = version; - hash = "sha256-l/eNf1KLZeuDWf1A/5Y8fggOovKmjW6UFNMvNxuJXkc="; + hash = "sha256-gI4HNzbIM/1ZTPWondi8tCMZOlNt/SzrTIeppY7uLDM="; }; postPatch = '' diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 58688dc64611..67f424342b6a 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -230,5 +230,8 @@ buildDotnetModule (finalAttrs: { '' } ''; + knownVulnerabilities = [ + "NexusMods.App has been discontinued upstream: https://www.nexusmods.com/news/15424" + ]; }; }) diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix index 5944893ed5c2..434ab192db67 100644 --- a/pkgs/by-name/ni/nix-fast-build/package.nix +++ b/pkgs/by-name/ni/nix-fast-build/package.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "Mic92"; repo = "nix-fast-build"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-6X4BW+3C2nfkorMfe+tuoeYrdddxPtLqOJ1rZxuxPrc="; }; diff --git a/pkgs/by-name/no/nodeinfo/package.nix b/pkgs/by-name/no/nodeinfo/package.nix index cd76391847a5..8f975cc5b37b 100644 --- a/pkgs/by-name/no/nodeinfo/package.nix +++ b/pkgs/by-name/no/nodeinfo/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { domain = "codeberg.org"; owner = "thefederationinfo"; repo = "nodeinfo-go"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-XwK3QeVDQMZD5G79XPJTAJyilVgYFVgZORHYTBI0gIQ="; }; diff --git a/pkgs/by-name/no/nofi/package.nix b/pkgs/by-name/no/nofi/package.nix deleted file mode 100644 index 14521470e79d..000000000000 --- a/pkgs/by-name/no/nofi/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - dbus, - pkg-config, -}: - -rustPlatform.buildRustPackage rec { - pname = "nofi"; - version = "0.2.4"; - - src = fetchFromGitHub { - owner = "ellsclytn"; - repo = "nofi"; - rev = "v${version}"; - hash = "sha256-hQYIcyNCxb8qVpseNsmjyPxlwbMxDpXeZ+H1vpv62rQ="; - }; - - cargoHash = "sha256-dWqMwS0TgspZqlpi8hhwtA7sbqGunw0FIqjJXOTiFKA="; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ dbus ]; - - meta = { - description = "Interruption-free notification system for Linux"; - homepage = "https://github.com/ellsclytn/nofi/"; - changelog = "https://github.com/ellsclytn/nofi/raw/v${version}/CHANGELOG.md"; - license = [ - lib.licenses.asl20 # or - lib.licenses.mit - ]; - mainProgram = "nofi"; - maintainers = [ lib.maintainers.magnetophon ]; - }; -} diff --git a/pkgs/by-name/np/npm-check-updates/package.nix b/pkgs/by-name/np/npm-check-updates/package.nix index 87b340d5f8d1..298a96cf6c9e 100644 --- a/pkgs/by-name/np/npm-check-updates/package.nix +++ b/pkgs/by-name/np/npm-check-updates/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "npm-check-updates"; - version = "19.1.0"; + version = "19.3.1"; src = fetchFromGitHub { owner = "raineorshine"; repo = "npm-check-updates"; - rev = "refs/tags/v${version}"; - hash = "sha256-I9X98vqQgLgWt7q9Tr+0b+IlpTsPZDBQd+PVZlgpzyE="; + tag = "v${version}"; + hash = "sha256-VcZB4NIFvGgTL55AbIpaWwrYNEtVJPgKobPbtL/B28s="; }; - npmDepsHash = "sha256-cb8EgKRBKK3h+aP7MChwNoM5zMd5Ok/bjlx5bONDhdE="; + npmDepsHash = "sha256-u1B+tD6ciObPwgsdhDHR200/vMeDLi7qLCwTd5Auksg="; postPatch = '' sed -i '/"prepare"/d' package.json diff --git a/pkgs/by-name/nu/nunicode/package.nix b/pkgs/by-name/nu/nunicode/package.nix index e8afc6c0b768..117a4b4327cd 100644 --- a/pkgs/by-name/nu/nunicode/package.nix +++ b/pkgs/by-name/nu/nunicode/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromBitbucket { owner = "alekseyt"; repo = "nunicode"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-6255YdX7eYSAj0EAE4RgX1m4XDNIF/Nc4ZCvXzTxpag="; }; diff --git a/pkgs/by-name/oc/ocis/web.nix b/pkgs/by-name/oc/ocis/web.nix index 3d07c279b267..9568c5c30b02 100644 --- a/pkgs/by-name/oc/ocis/web.nix +++ b/pkgs/by-name/oc/ocis/web.nix @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitHub { owner = "owncloud"; repo = "web"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-hupdtK/V74+X7/eXoDmUjFvSKuhnoOtNQz7o6TLJXG4="; }; diff --git a/pkgs/by-name/oc/octoprint/plugins.nix b/pkgs/by-name/oc/octoprint/plugins.nix index a6e5632eed7b..ea99883f164d 100644 --- a/pkgs/by-name/oc/octoprint/plugins.nix +++ b/pkgs/by-name/oc/octoprint/plugins.nix @@ -513,7 +513,7 @@ in src = fetchFromGitHub { owner = "jneilliii"; repo = "OctoPrint-STLViewer"; - rev = "refs/tags/${version}"; + tag = version; sha256 = "sha256-S7zjEbyo59OJpa7INCv1o4ybQ+Sy6a3EJ5AJ6wiBe1Y="; }; diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix index 838f94cc7c3d..0a8682d7a4e2 100644 --- a/pkgs/by-name/oh/oh-my-zsh/package.nix +++ b/pkgs/by-name/oh/oh-my-zsh/package.nix @@ -19,14 +19,14 @@ }: stdenv.mkDerivation rec { - version = "2025-11-23"; + version = "2026-01-14"; pname = "oh-my-zsh"; src = fetchFromGitHub { owner = "ohmyzsh"; repo = "ohmyzsh"; - rev = "beadd56dd75e8a40fe0a7d4a5d63ed5bf9efcd48"; - sha256 = "sha256-e3zTM3rj4z6RwDai9i7KKrz6imTGmZiSAqcS9Mw2LZU="; + rev = "ec14da72fbf8b5016bb1533d4af3ff3bb2ac7a19"; + sha256 = "sha256-ML9s5t26DTbrSxQLP1CEC7GWUdRYAy8IhMraMHqOc50="; }; strictDeps = true; diff --git a/pkgs/by-name/ok/oklch-color-picker/package.nix b/pkgs/by-name/ok/oklch-color-picker/package.nix index 201ea4ed7d66..4a17e541f9eb 100644 --- a/pkgs/by-name/ok/oklch-color-picker/package.nix +++ b/pkgs/by-name/ok/oklch-color-picker/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "eero-lehtinen"; repo = "oklch-color-picker"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-dbsE1mYt/GhpkWIBS6MejiKKKz1B+h/3wqGKHCp0p2Q="; }; diff --git a/pkgs/by-name/ol/olaris-server/package.nix b/pkgs/by-name/ol/olaris-server/package.nix deleted file mode 100644 index 35965871e44c..000000000000 --- a/pkgs/by-name/ol/olaris-server/package.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - buildGoModule, - fetchFromGitLab, - fetchzip, - ffmpeg, - installShellFiles, - lib, - makeWrapper, -}: - -buildGoModule rec { - pname = "olaris-server"; - version = "unstable-2022-06-11"; - - src = fetchFromGitLab { - owner = "olaris"; - repo = "olaris-server"; - rev = "bdb2aeb1595c941210249164a97c12404c1ae0d8"; - hash = "sha256-Uhnh6GC85ORKnfHeYNtbSA40osuscxXDF5/kXJrF2Cs="; - }; - - preBuild = - let - olaris-react = fetchzip { - url = "https://gitlab.com/api/v4/projects/olaris%2Folaris-react/jobs/artifacts/v${version}/download?job=build"; - extension = "zip"; - hash = "sha256-MkxBf/mGvtiOu0e79bMpd9Z/D0eOxhzPE+bKic//viM="; - }; - in - '' - # cannot build olaris-react https://github.com/NixOS/nixpkgs/issues/203708 - cp -r ${olaris-react} react/build - make generate - ''; - - ldflags = [ - "-s" - "-w" - "-X gitlab.com/olaris/olaris-server/helpers.Version=${version}" - ]; - - vendorHash = "sha256-bw8zvDGFBci9bELsxAD0otpNocBnO8aAcgyohLZ3Mv0="; - - nativeBuildInputs = [ - installShellFiles - makeWrapper - ]; - - # integration tests require network access - doCheck = false; - - postInstall = '' - installShellCompletion --cmd olaris-server \ - --bash <($out/bin/olaris-server completion bash) \ - --fish <($out/bin/olaris-server completion fish) \ - --zsh <($out/bin/olaris-server completion zsh) - wrapProgram $out/bin/olaris-server --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} - ''; - - meta = { - # Marked broken 2025-11-28 because it has failed on Hydra for at least one year. - broken = true; - description = "Media manager and transcoding server"; - homepage = "https://gitlab.com/olaris/olaris-server"; - changelog = "https://gitlab.com/olaris/olaris-server/-/releases/v${version}"; - license = lib.licenses.gpl3Only; - maintainers = [ ]; - }; -} diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 721ac2a49234..862438477fd9 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -138,13 +138,13 @@ in goBuild (finalAttrs: { pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-hJeEWkIWQHITxzo6VGqkWJHOktBJyVNIEKtUdSPyD24="; + hash = "sha256-r9Qwa1bAzLlr50mB+RLkRfuCFe6FUXtR9irqvU7PAvA="; }; vendorHash = "sha256-WdHAjCD20eLj0d9v1K6VYP8vJ+IZ8BEZ3CciYLLMtxc="; diff --git a/pkgs/by-name/on/oneanime/git-hashes.json b/pkgs/by-name/on/oneanime/git-hashes.json index eec2874f8e55..7dd1da1a3983 100644 --- a/pkgs/by-name/on/oneanime/git-hashes.json +++ b/pkgs/by-name/on/oneanime/git-hashes.json @@ -1,10 +1,10 @@ { - "media_kit": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=", - "media_kit_libs_android_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=", - "media_kit_libs_ios_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=", - "media_kit_libs_linux": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=", - "media_kit_libs_macos_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=", - "media_kit_libs_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=", - "media_kit_libs_windows_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=", - "media_kit_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=" + "media_kit": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", + "media_kit_libs_android_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", + "media_kit_libs_ios_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", + "media_kit_libs_linux": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", + "media_kit_libs_macos_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", + "media_kit_libs_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", + "media_kit_libs_windows_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=", + "media_kit_video": "sha256-Uw0bAY+M7GwprZ/K8MYBqChONmAbuuETZo+x1mNcM3s=" } diff --git a/pkgs/by-name/on/oneanime/package.nix b/pkgs/by-name/on/oneanime/package.nix index a4a910653370..e037c991c751 100644 --- a/pkgs/by-name/on/oneanime/package.nix +++ b/pkgs/by-name/on/oneanime/package.nix @@ -56,13 +56,13 @@ let }; }); - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "Predidit"; repo = "oneAnime"; tag = version; - hash = "sha256-dDXDBem2G/CSGOiHTAtMZ9PrTj8b1zIiqabh/dNiSkQ="; + hash = "sha256-4EieR+Wys7vK+0/pWF5MkA71EeChThVGJ8J5x/8k8nA="; }; in flutter335.buildFlutterApplication { diff --git a/pkgs/by-name/on/oneanime/pubspec.lock.json b/pkgs/by-name/on/oneanime/pubspec.lock.json index 1b22195ce3f3..0a0a3fdeb1e6 100644 --- a/pkgs/by-name/on/oneanime/pubspec.lock.json +++ b/pkgs/by-name/on/oneanime/pubspec.lock.json @@ -10,16 +10,6 @@ "source": "hosted", "version": "67.0.0" }, - "adaptive_theme": { - "dependency": "direct main", - "description": { - "name": "adaptive_theme", - "sha256": "caa49b4c73b681bf12a641dff77aa1383262a00cf38b9d1a25b180e275ba5ab9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.7.0" - }, "analyzer": { "dependency": "transitive", "description": { @@ -174,11 +164,11 @@ "dependency": "direct main", "description": { "name": "canvas_danmaku", - "sha256": "98fd90f257ffe93bd6a0bd857d92f40172767fc77ffb48b2379ac692e62150eb", + "sha256": "59018315feefe497dd6b5a5c8059a1c40a4849b985f273704acc2faf20cd0d98", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.7" + "version": "0.3.1" }, "characters": { "dependency": "transitive", @@ -788,8 +778,8 @@ "dependency": "direct main", "description": { "path": "media_kit", - "ref": "8c4b795d373243d1d64fea932ba497696fd89925", - "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925", + "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -799,8 +789,8 @@ "dependency": "direct overridden", "description": { "path": "libs/android/media_kit_libs_android_video", - "ref": "8c4b795d373243d1d64fea932ba497696fd89925", - "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925", + "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -810,8 +800,8 @@ "dependency": "direct overridden", "description": { "path": "libs/ios/media_kit_libs_ios_video", - "ref": "8c4b795d373243d1d64fea932ba497696fd89925", - "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925", + "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -821,8 +811,8 @@ "dependency": "direct overridden", "description": { "path": "libs/linux/media_kit_libs_linux", - "ref": "8c4b795d373243d1d64fea932ba497696fd89925", - "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925", + "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -832,8 +822,8 @@ "dependency": "direct overridden", "description": { "path": "libs/macos/media_kit_libs_macos_video", - "ref": "8c4b795d373243d1d64fea932ba497696fd89925", - "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925", + "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -843,8 +833,8 @@ "dependency": "direct main", "description": { "path": "libs/universal/media_kit_libs_video", - "ref": "8c4b795d373243d1d64fea932ba497696fd89925", - "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925", + "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -854,8 +844,8 @@ "dependency": "direct overridden", "description": { "path": "libs/windows/media_kit_libs_windows_video", - "ref": "8c4b795d373243d1d64fea932ba497696fd89925", - "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925", + "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -865,8 +855,8 @@ "dependency": "direct main", "description": { "path": "media_kit_video", - "ref": "8c4b795d373243d1d64fea932ba497696fd89925", - "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925", + "ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", + "resolved-ref": "cfbac4f170d25cd4d48bbe352c07ad147ee710f6", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -876,11 +866,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.16.0" + "version": "1.17.0" }, "mime": { "dependency": "transitive", @@ -1222,16 +1212,6 @@ "source": "hosted", "version": "2.1.0" }, - "screen_pixel": { - "dependency": "direct main", - "description": { - "name": "screen_pixel", - "sha256": "b7310d81d98289ba1d6fb381ec95094b30b43ee1e901fefb65a3cf4de7d77e6b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.3" - }, "screen_retriever": { "dependency": "transitive", "description": { @@ -1282,76 +1262,6 @@ "source": "hosted", "version": "0.2.0" }, - "shared_preferences": { - "dependency": "transitive", - "description": { - "name": "shared_preferences", - "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.3" - }, - "shared_preferences_android": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_android", - "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.10" - }, - "shared_preferences_foundation": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_foundation", - "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.4" - }, - "shared_preferences_linux": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_linux", - "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "shared_preferences_platform_interface": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_platform_interface", - "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "shared_preferences_web": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_web", - "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.3" - }, - "shared_preferences_windows": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_windows", - "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, "shelf": { "dependency": "transitive", "description": { @@ -1512,11 +1422,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.6" + "version": "0.7.7" }, "timing": { "dependency": "transitive", @@ -1678,16 +1588,6 @@ "source": "hosted", "version": "15.0.0" }, - "volume_controller": { - "dependency": "transitive", - "description": { - "name": "volume_controller", - "sha256": "d75039e69c0d90e7810bfd47e3eedf29ff8543ea7a10392792e81f9bded7edf5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.4.0" - }, "wakelock_plus": { "dependency": "transitive", "description": { @@ -1821,6 +1721,6 @@ }, "sdks": { "dart": ">=3.8.0-0 <4.0.0", - "flutter": ">=3.35.7" + "flutter": ">=3.38.3" } } diff --git a/pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch b/pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch deleted file mode 100644 index e071b24afec3..000000000000 --- a/pkgs/by-name/on/onnxruntime/cpuinfo-logging.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/onnxruntime/core/common/cpuid_info.cc b/onnxruntime/core/common/cpuid_info.cc ---- a/onnxruntime/core/common/cpuid_info.cc -+++ b/onnxruntime/core/common/cpuid_info.cc -@@ -3,6 +3,7 @@ - #include "core/common/cpuid_info.h" - #include "core/common/logging/logging.h" - #include "core/common/logging/severity.h" -+#include - - #ifdef __linux__ - -@@ -364,8 +365,14 @@ - #if defined(CPUINFO_SUPPORTED) - pytorch_cpuinfo_init_ = cpuinfo_initialize(); - if (!pytorch_cpuinfo_init_) { -- LOGS_DEFAULT(WARNING) << "Failed to initialize PyTorch cpuinfo library. May cause CPU EP performance degradation " -- "due to undetected CPU features."; -+ constexpr const char* message = -+ "Failed to initialize PyTorch cpuinfo library. May cause CPU EP performance degradation due to undetected CPU " -+ "features."; -+ if (logging::LoggingManager::HasDefaultLogger()) { -+ LOGS_DEFAULT(WARNING) << message; -+ } else { -+ std::cerr << "onnxruntime cpuid_info warning: " << message << std::endl; -+ } - } - #endif // defined(CPUINFO_SUPPORTED) - #if defined(__linux__) -diff --git a/onnxruntime/core/platform/posix/env.cc b/onnxruntime/core/platform/posix/env.cc ---- a/onnxruntime/core/platform/posix/env.cc -+++ b/onnxruntime/core/platform/posix/env.cc -@@ -605,7 +605,12 @@ - PosixEnv() { - cpuinfo_available_ = cpuinfo_initialize(); - if (!cpuinfo_available_) { -- LOGS_DEFAULT(INFO) << "cpuinfo_initialize failed"; -+ constexpr const char* message = "cpuinfo_initialize failed"; -+ if (logging::LoggingManager::HasDefaultLogger()) { -+ LOGS_DEFAULT(INFO) << message; -+ } else { -+ std::cerr << "onnxruntime cpuid_info warning: " << message << std::endl; -+ } - } - } - bool cpuinfo_available_{false}; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 3e7b182813af..f531ea458784 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -1,8 +1,9 @@ { + lib, config, stdenv, - lib, fetchFromGitHub, + applyPatches, fetchpatch, abseil-cpp_202407, cmake, @@ -14,7 +15,6 @@ howard-hinnant-date, libpng, nlohmann_json, - perl, pkg-config, python3Packages, removeReferencesTo, @@ -33,51 +33,91 @@ }@inputs: let - version = "1.22.2"; - - src = fetchFromGitHub { - owner = "microsoft"; - repo = "onnxruntime"; - tag = "v${version}"; - fetchSubmodules = true; - hash = "sha256-X8Pdtc0eR0iU+Xi2A1HrNo1xqCnoaxNjj4QFm/E3kSE="; - }; - stdenv = throw "Use effectiveStdenv instead"; effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv; inherit (cudaPackages) cuda_nvcc; cudaArchitecturesString = cudaPackages.flags.cmakeCudaArchitecturesString; - mp11 = fetchFromGitHub { + # While onnxruntime suggests using (3 year-old) protobuf 21.12 + # https://github.com/microsoft/onnxruntime/blob/v1.23.2/cmake/deps.txt#L40, using a newer + # protobuf version is possible. + # We still need to patch the nixpkgs protobuf (32.1) to address the following test failure that + # occurs when cudaSupport is enabled: + # [libprotobuf ERROR /build/source/src/google/protobuf/descriptor_database.cc:642] File already exists in database: onnx/onnx-ml.proto + # [libprotobuf FATAL /build/source/src/google/protobuf/descriptor.cc:1986] CHECK failed: GeneratedDatabase()->Add(encoded_file_descriptor, size): + # terminate called after throwing an instance of 'google::protobuf::FatalException' + # what(): CHECK failed: GeneratedDatabase()->Add(encoded_file_descriptor, size): + # + # + # Caused by: https://github.com/protocolbuffers/protobuf/commit/8f7aab29b21afb89ea0d6e2efeafd17ca71486a9 + # Reported upstream: https://github.com/protocolbuffers/protobuf/issues/21542 + protobuf' = protobuf.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ + (fetchpatch { + name = "Workaround nvcc bug in message_lite.h"; + url = "https://raw.githubusercontent.com/conda-forge/protobuf-feedstock/737a13ea0680484c08e8e0ab0144dab82c10c1b3/recipe/patches/0010-Workaround-nvcc-bug-in-message_lite.h.patch"; + hash = "sha256-joK50Il4mrwIc6zuNW9gDIfOx9LuA4FlusJuzUf9kqI="; + }) + ]; + }); + + # TODO: update the following dependencies according to: + # https://github.com/microsoft/onnxruntime/blob/v/cmake/deps.txt + + mp11-src = fetchFromGitHub { + name = "mp11-src"; owner = "boostorg"; repo = "mp11"; tag = "boost-1.82.0"; hash = "sha256-cLPvjkf2Au+B19PJNrUkTW/VPxybi1MpPxnIl4oo4/o="; }; - safeint = fetchFromGitHub { + safeint-src = fetchFromGitHub { + name = "safeint-src"; owner = "dcleblanc"; repo = "safeint"; tag = "3.0.28"; hash = "sha256-pjwjrqq6dfiVsXIhbBtbolhiysiFlFTnx5XcX77f+C0="; }; - onnx = fetchFromGitHub { - owner = "onnx"; - repo = "onnx"; - tag = "v1.17.0"; - hash = "sha256-9oORW0YlQ6SphqfbjcYb0dTlHc+1gzy9quH/Lj6By8Q="; + onnx-src = applyPatches { + name = "onnx-src"; + src = fetchFromGitHub { + owner = "onnx"; + repo = "onnx"; + tag = "v1.18.0"; + hash = "sha256-UhtF+CWuyv5/Pq/5agLL4Y95YNP63W2BraprhRqJOag="; + }; + + patches = [ + # Fix "error: conversion from 'onnx::OpSchema' to non-scalar type 'onnx::OpSchemaRegistry::OpSchemaRegisterOnce'" + # https://github.com/microsoft/onnxruntime/issues/26229 + # Fix from https://github.com/onnx/onnx/pull/7390 + (fetchpatch { + url = "https://github.com/onnx/onnx/commit/595a069aaac07586f111681245bc808ee63551f8.patch"; + includes = [ "onnx/defs/schema.h" ]; + hash = "sha256-FFAJuJse4nmNT3ixvEdlqzbr3edY46SqEFv7z/oo6m0="; + }) + + # Fix "undefined reference to `onnx::RNNShapeInference(onnx::InferenceContext&)'" + (fetchpatch { + url = "https://github.com/onnx/onnx/commit/6769c41ad64ebca0358da8c7211d2c6d0e627b2b.patch"; + hash = "sha256-VlTHs0om20kTNvSVQaasSsa5JROliQy4k9BECTsBtbU="; + }) + ]; }; - cutlass = fetchFromGitHub { + cutlass-src = fetchFromGitHub { + name = "cutlass-src"; owner = "NVIDIA"; repo = "cutlass"; - tag = "v3.5.1"; - hash = "sha256-sTGYN+bjtEqQ7Ootr/wvx3P9f8MCDSSj3qyCWjfdLEA="; + tag = "v3.9.2"; + hash = "sha256-teziPNA9csYvhkG5t2ht8W8x5+1YGGbHm8VKx4JoxgI="; }; - dlpack = fetchFromGitHub { + dlpack-src = fetchFromGitHub { + name = "dlpack-src"; owner = "dmlc"; repo = "dlpack"; rev = "5c210da409e7f1e51ddf445134a4376fdbd70d7d"; @@ -86,30 +126,38 @@ let isCudaJetson = cudaSupport && cudaPackages.flags.isJetsonBuild; in -effectiveStdenv.mkDerivation rec { +effectiveStdenv.mkDerivation (finalAttrs: { pname = "onnxruntime"; - inherit src version; + version = "1.23.2"; + + src = fetchFromGitHub { + owner = "microsoft"; + repo = "onnxruntime"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-hZ2L5+0Enkw4rGDKVpRECnKXP87w6Kbiyp6Fdxwt6hk="; + }; patches = [ - # https://github.com/microsoft/onnxruntime/pull/24583 + # Missing cstdint include (GCC 15 compatibility) (fetchpatch { - name = "fix-compilation-with-gcc-15.patch"; - url = "https://github.com/microsoft/onnxruntime/commit/f7619dc93f592ddfc10f12f7145f9781299163a0.patch"; - hash = "sha256-jxfMB+/Zokcu5DSfZP7QV1E8mTrsLe/sMr+ZCX/Y3m0="; + url = "https://github.com/microsoft/onnxruntime/commit/d6e712c5b7b6260a61e54d1fe40107cf5366ee77.patch"; + hash = "sha256-FSuPybX8f2VoxvLhcYx4rdChaiK8bSUDR32sN3Efwfc="; + }) + + # Correct maybe-uninitialized and range-loop-construct warnings + # https://github.com/microsoft/onnxruntime/pull/26201 + (fetchpatch { + url = "https://github.com/microsoft/onnxruntime/commit/8ebd0bf1cf02414584d15d7244b07fa97d65ba02.patch"; + hash = "sha256-vX+kaFiNdmqWI91JELcLpoaVIHBb5EPbI7rCAMYAx04="; }) - # Handle missing default logger when cpuinfo initialization fails in the build sandbox - # TODO: Remove on next release - # https://github.com/microsoft/onnxruntime/issues/10038 - # https://github.com/microsoft/onnxruntime/pull/15661 - # https://github.com/microsoft/onnxruntime/pull/20509 - ./cpuinfo-logging.patch ]; nativeBuildInputs = [ cmake pkg-config python3Packages.python - protobuf + protobuf' ] ++ lib.optionals pythonSupport ( with python3Packages; @@ -127,9 +175,6 @@ effectiveStdenv.mkDerivation rec { ] ++ lib.optionals isCudaJetson [ cudaPackages.autoAddCudaCompatRunpath - ] - ++ lib.optionals rocmSupport [ - perl # for tools/ci_build/hipify-perl ]; buildInputs = [ @@ -169,6 +214,7 @@ effectiveStdenv.mkDerivation rec { ++ lib.optionals rocmSupport [ rocmPackages.clr rocmPackages.hipblas + rocmPackages.hipblaslt rocmPackages.hipcub rocmPackages.hipfft rocmPackages.hiprand @@ -178,6 +224,7 @@ effectiveStdenv.mkDerivation rec { rocmPackages.rocrand rocmPackages.rocthrust rocmPackages.miopen + rocmPackages.migraphx rocmPackages.rccl rocmPackages.rocm-smi rocmPackages.roctracer @@ -192,9 +239,9 @@ effectiveStdenv.mkDerivation rec { ++ lib.optionals pythonSupport ( with python3Packages; [ + onnx pytest sympy - onnx ] ); @@ -215,34 +262,30 @@ effectiveStdenv.mkDerivation rec { (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true) (lib.cmakeBool "FETCHCONTENT_QUIET" false) (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ABSEIL_CPP" "${abseil-cpp_202407.src}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DLPACK" "${dlpack}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DLPACK" "${dlpack-src}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_FLATBUFFERS" "${flatbuffers_23.src}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MP11" "${mp11}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ONNX" "${onnx}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MP11" "${mp11-src}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_ONNX" "${onnx-src}") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_RE2" "${re2.src}") - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SAFEINT" "${safeint}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_SAFEINT" "${safeint-src}") (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") # fails to find protoc on darwin, so specify it - (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe protobuf)) + (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe protobuf')) (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true) - (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck) + (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck) (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf) (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport)) - (lib.cmakeBool "onnxruntime_USE_ROCM" rocmSupport) + (lib.cmakeBool "onnxruntime_USE_MIGRAPHX" rocmSupport) (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8")) ] - ++ lib.optionals (effectiveStdenv.cc.isClang || rocmSupport) [ - # Disable -Werror from COMPILE_WARNING_AS_ERROR target property - "--compile-no-warning-as-error" - ] ++ lib.optionals pythonSupport [ (lib.cmakeBool "onnxruntime_ENABLE_PYTHON" true) ] ++ lib.optionals cudaSupport [ # Werror and cudnn_frontend deprecations make for a bad time. "--compile-no-warning-as-error" - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass-src}") (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}") (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1") @@ -296,8 +339,9 @@ effectiveStdenv.mkDerivation rec { substituteInPlace cmake/libonnxruntime.pc.cmake.in \ --replace-fail '$'{prefix}/@CMAKE_INSTALL_ @CMAKE_INSTALL_ echo "find_package(cudnn_frontend REQUIRED)" > cmake/external/cudnn_frontend.cmake - - # https://github.com/microsoft/onnxruntime/blob/c4f3742bb456a33ee9c826ce4e6939f8b84ce5b0/onnxruntime/core/platform/env.h#L249 + '' + # https://github.com/microsoft/onnxruntime/blob/c4f3742bb456a33ee9c826ce4e6939f8b84ce5b0/onnxruntime/core/platform/env.h#L249 + + '' substituteInPlace onnxruntime/core/platform/env.h --replace-fail \ "GetRuntimePath() const { return PathString(); }" \ "GetRuntimePath() const { return PathString(\"$out/lib/\"); }" @@ -305,8 +349,8 @@ effectiveStdenv.mkDerivation rec { + lib.optionalString rocmSupport '' patchShebangs tools/ci_build/hipify-perl '' + # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691 + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") '' - # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691 rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc ''; @@ -314,8 +358,8 @@ effectiveStdenv.mkDerivation rec { ${python3Packages.python.interpreter} ../setup.py bdist_wheel ''; + # perform parts of `tools/ci_build/github/linux/copy_strip_binary.sh` postInstall = '' - # perform parts of `tools/ci_build/github/linux/copy_strip_binary.sh` install -m644 -Dt $out/include \ ../include/onnxruntime/core/framework/provider_options.h \ ../include/onnxruntime/core/providers/cpu/cpu_provider_factory.h \ @@ -330,7 +374,7 @@ effectiveStdenv.mkDerivation rec { passthru = { inherit cudaSupport cudaPackages ncclSupport; # for the python module - inherit protobuf; + protobuf = protobuf'; tests = lib.optionalAttrs pythonSupport { python = python3Packages.onnxruntime; }; @@ -348,7 +392,7 @@ effectiveStdenv.mkDerivation rec { compatibility. ''; homepage = "https://github.com/microsoft/onnxruntime"; - changelog = "https://github.com/microsoft/onnxruntime/releases/tag/v${version}"; + changelog = "https://github.com/microsoft/onnxruntime/releases/tag/${finalAttrs.src.tag}"; # https://github.com/microsoft/onnxruntime/blob/master/BUILD.md#architectures platforms = lib.platforms.unix; license = lib.licenses.mit; @@ -356,5 +400,9 @@ effectiveStdenv.mkDerivation rec { puffnfresh ck3d ]; + # [libprotobuf ERROR /build/source/src/google/protobuf/descriptor_database.cc:642] File already + # exists in database: onnx/onnx-ml.proto + # https://github.com/onnx/onnx/issues/6094 + broken = withFullProtobuf; }; -} +}) diff --git a/pkgs/by-name/op/open-policy-agent/package.nix b/pkgs/by-name/op/open-policy-agent/package.nix index 167f2e8b0842..7cbeeee10eda 100644 --- a/pkgs/by-name/op/open-policy-agent/package.nix +++ b/pkgs/by-name/op/open-policy-agent/package.nix @@ -14,13 +14,13 @@ assert buildGoModule (finalAttrs: { pname = "open-policy-agent"; - version = "1.12.2"; + version = "1.12.3"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZysAtmGhoSAsU/w81UvA/tpamFrYRv5E09DnvPSbuRE="; + hash = "sha256-PfOEjWy97COEdGpCcSHCdXVWZzJUwDAGoCi4kr2FWQs="; }; vendorHash = "sha256-vlF4TBjfinaY48UNefXFWbrWenD7eYYYMkByI2M32X8="; diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix index 2b79afc7517e..0ead4f13d7c4 100644 --- a/pkgs/by-name/op/opencode/package.nix +++ b/pkgs/by-name/op/opencode/package.nix @@ -12,19 +12,19 @@ versionCheckHook, writableTmpDirAsHomeHook, }: -let +stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencode"; - version = "1.1.21"; + version = "1.1.23"; src = fetchFromGitHub { owner = "anomalyco"; repo = "opencode"; - tag = "v${version}"; - hash = "sha256-8ykONBWMiq9EACHOsdx1AFPoj53Tsxi3EbUDVciH5Ok="; + tag = "v${finalAttrs.version}"; + hash = "sha256-cvz4HO5vNwA3zWx7zdVfs59Z7vD/00+MMCDbLU5WKpM="; }; node_modules = stdenvNoCC.mkDerivation { - pname = "${pname}-node_modules"; - inherit version src; + pname = "${finalAttrs.pname}-node_modules"; + inherit (finalAttrs) version src; impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "GIT_PROXY_COMMAND" @@ -66,18 +66,10 @@ let # NOTE: Required else we get errors that our fixed-output derivation references store paths dontFixup = true; - outputHash = "sha256-gl/5eA4nPLQ2clOcAf0D8/ocjRO4xBm5AQtqrcSdkTw="; + outputHash = "sha256-ojbTZBWM353NLMMHckMjFf+k6TpeOoF/yeQR9dq0nNo="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; -in -stdenvNoCC.mkDerivation (finalAttrs: { - inherit - pname - version - src - node_modules - ; nativeBuildInputs = [ bun @@ -97,7 +89,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { configurePhase = '' runHook preConfigure - cp -R ${node_modules}/. . + cp -R ${finalAttrs.node_modules}/. . runHook postConfigure ''; diff --git a/pkgs/by-name/op/openllm/package.nix b/pkgs/by-name/op/openllm/package.nix index c5b129189acb..77b48158457d 100644 --- a/pkgs/by-name/op/openllm/package.nix +++ b/pkgs/by-name/op/openllm/package.nix @@ -11,7 +11,7 @@ let version = "23.1.2"; build-system = [ super.poetry-core ]; src = oldAttrs.src.override { - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-YO4Clbo5fmXbysxwwM2qCHJwO5KwDC05VctRVFruJcw="; }; }); @@ -27,7 +27,7 @@ python.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "bentoml"; repo = "openllm"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-4KIpe6KjbBDDUj0IjzSccxjgZyBoaUVIQJYk1+W01Vo="; }; diff --git a/pkgs/by-name/op/openssh-askpass/package.nix b/pkgs/by-name/op/openssh-askpass/package.nix new file mode 100644 index 000000000000..777c5b42b897 --- /dev/null +++ b/pkgs/by-name/op/openssh-askpass/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + openssh, + gtk3, + pkg-config, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "openssh-askpass"; + inherit (openssh) src version; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk3 ]; + + sourceRoot = "${openssh.pname}-${finalAttrs.version}/contrib"; + makeFlags = "gnome-ssh-askpass3"; + dontConfigure = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/libexec + cp -a gnome-ssh-askpass3 $out/libexec/gtk-ssh-askpass + runHook postInstall + ''; + + meta = { + description = "A passphrase dialog for OpenSSH and GTK"; + homepage = "https://www.openssh.org"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ n3tshift ]; + }; +}) diff --git a/pkgs/by-name/op/optee-client/package.nix b/pkgs/by-name/op/optee-client/package.nix index 49743c558c04..a693484b37e3 100644 --- a/pkgs/by-name/op/optee-client/package.nix +++ b/pkgs/by-name/op/optee-client/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "optee-client"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "OP-TEE"; repo = "optee_client"; rev = finalAttrs.version; - hash = "sha256-hHEIn0WU4XfqwZbOdg9kwSDxDcvK7Tvxtelamfc3IRM="; + hash = "sha256-MZPT3GbAInFGL0OZH1aCDTdmd95LsI8RmpbtPE0fp4s="; }; outputs = [ diff --git a/pkgs/by-name/or/or-tools/gscip-scip10.patch b/pkgs/by-name/or/or-tools/gscip-scip10.patch new file mode 100644 index 000000000000..529cb39632bb --- /dev/null +++ b/pkgs/by-name/or/or-tools/gscip-scip10.patch @@ -0,0 +1,15 @@ +--- a/ortools/gscip/gscip.cc ++++ b/ortools/gscip/gscip.cc +@@ -48,7 +48,13 @@ + #include "scip/cons_indicator.h" + #include "scip/cons_linear.h" + #include "scip/cons_or.h" ++#if SCIP_VERSION_MAJOR >= 10 ++#include "scip/cons_nonlinear.h" ++#define SCIPcreateConsBasicQuadratic SCIPcreateConsBasicQuadraticNonlinear ++#define SCIPcreateConsQuadratic SCIPcreateConsQuadraticNonlinear ++#else + #include "scip/cons_quadratic.h" ++#endif // SCIP_VERSION_MAJOR >= 10 + #include "scip/cons_sos1.h" + #include "scip/cons_sos2.h" diff --git a/pkgs/by-name/or/or-tools/package.nix b/pkgs/by-name/or/or-tools/package.nix index f5260e0ac88e..254ea0faadc4 100644 --- a/pkgs/by-name/or/or-tools/package.nix +++ b/pkgs/by-name/or/or-tools/package.nix @@ -64,12 +64,13 @@ let scipopt-scip' = scipopt-scip.overrideAttrs (old: { patches = old.patches or [ ] ++ [ # from https://github.com/google/or-tools/commit/77a28070b9c4c83995ac6bbfa9544722ff3342ce#diff-c95174a817e73db366d414af1e329c1856f70e5158ed3994d43da88765ccc98f + # and updated with https://github.com/google/or-tools/pull/4932/files#diff-e6b0a69b2e4b97ec922abc459d909483d440a1e0d2868bed263927b106b6efe6 ./scip.patch ]; # Their patch forgets to find_package() soplex, bring it back. postPatch = (old.postPatch or "") + '' substituteInPlace CMakeLists.txt \ - --replace-fail 'message(STATUS "Finding Soplex...")' 'find_package(SOPLEX CONFIG HINTS ''${SOPLEX_DIR})' + --replace-fail 'message(STATUS "Finding Soplex")' 'find_package(SOPLEX CONFIG HINTS ''${SOPLEX_DIR})' ''; }); @@ -112,6 +113,16 @@ stdenv.mkDerivation (finalAttrs: { includes = [ "ortools/math_opt/solvers/highs_solver_test.cc" ]; hash = "sha256-/dFk/F/3/BwH5IwIwNU4Ua+4sROPXYCjO8R6jpoZpgo="; }) + # Fix compatibility with SCIP 10.0 + # https://github.com/google/or-tools/issues/4912 + (fetchpatch { + url = "https://github.com/google/or-tools/pull/4932.patch"; + includes = [ "ortools/linear_solver/proto_solver/scip_proto_solver.cc" ]; + hash = "sha256-1jw/r3yAjIpq9o8mqAbNorQgmT1E5nt809N+Gb+D9ZI="; + }) + # Compatibility with SCIP 10.0 also needs the following patch adjusted for or-tools 9.14 + # https://github.com/google/or-tools/pull/4932/files#diff-9559febee3c6051bab4def3c102cb78cbf8a57fc2be4058ace32f89436c784a9 + ./gscip-scip10.patch ]; # or-tools normally attempts to build Protobuf for the build platform when diff --git a/pkgs/by-name/or/or-tools/scip.patch b/pkgs/by-name/or/or-tools/scip.patch index 7a92254118b6..dbb153101564 100644 --- a/pkgs/by-name/or/or-tools/scip.patch +++ b/pkgs/by-name/or/or-tools/scip.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8492dc75..4c12a9bf 100644 +index b3c57799..eeeca4c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -38,9 +38,11 @@ set(CPACK_PACKAGE_VENDOR "Zuse Institute Berlin") +@@ -52,9 +52,11 @@ set(CPACK_PACKAGE_VENDOR "Zuse Institute Berlin") set(CPACK_PACKAGE_CONTACT "http://scipopt.org") include(CPack) @@ -17,25 +17,12 @@ index 8492dc75..4c12a9bf 100644 if(SCIPOptSuite_BINARY_DIR) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCIPOptSuite_BINARY_DIR}/bin) -@@ -412,22 +414,11 @@ endif() - #search the selected LP solver library +@@ -517,10 +519,10 @@ endif() message(STATUS "Finding Solver \"${LPS}\"") if(LPS STREQUAL "spx") -- message(STATUS "Finding Soplex") -- find_package(SOPLEX CONFIG HINTS ${SOPLEX_DIR}) + message(STATUS "Finding Soplex") +- find_package(SOPLEX REQUIRED CONFIG HINTS ${SOPLEX_DIR}) - if(NOT SOPLEX_FOUND) -- # Utilities to automatically download missing dependencies -- include(cmake/Dependencies.cmake) -- find_or_download_package( -- NAME SOPLEX -- VERSION 7.0.1 -- URL https://github.com/scipopt/soplex/archive/refs/tags/release-701.tar.gz -- URL_HASH SHA256=80cce994dcbe45fd52b60e31a3aeb5d2c60a7ddbaae495e0ce6bf58481675696 -- COMPONENTS soplex) -- find_package(SOPLEX REQUIRED CONFIG HINTS _deps/local) -- endif() -- if(NOT SOPLEX_FOUND) -+ message(STATUS "Finding Soplex...") + if(NOT TARGET libsoplex-pic OR NOT TARGET libsoplex) message(FATAL_ERROR "Requested LP solver SoPlex not found.") endif() @@ -43,64 +30,41 @@ index 8492dc75..4c12a9bf 100644 if (DEFINED SOPLEX_WITH_PAPILO) message(STATUS "SOPLEX links PAPILO") if((NOT SCIP_WITH_PAPILO)) # TODO not sure how to handle AUTOBUILD -@@ -502,9 +493,9 @@ if(SOPLEX_FOUND) +@@ -593,11 +595,11 @@ if(SOPLEX_FOUND) message(STATUS "Finding SOPLEX - found") # SoPlex headers can be directly included include_directories(${SOPLEX_INCLUDE_DIRS}) - set(LPS_LIBRARIES ${SOPLEX_LIBRARIES}) +- set(LPS_PIC_LIBRARIES ${SOPLEX_PIC_LIBRARIES}) + set(LPS_LIBRARIES libsoplex) - if(SHARED) -- set(LPS_PIC_LIBRARIES ${SOPLEX_PIC_LIBRARIES}) -+ set(LPS_PIC_LIBRARIES libsoplex-pic) - else() - set(LPS_PIC_LIBRARIES ${LPS_LIBRARIES}) - endif() -@@ -514,7 +505,7 @@ if(SOPLEX_FOUND) - set(lpi lpi/lpi_spx2.cpp) - endif() ++ set(LPS_PIC_LIBRARIES libsoplex-pic) + set(lpi lpi/lpi_spx.cpp) else() - message(STATUS "Support SOPLEX: OFF") + message(FATAL_ERROR "SOPLEX not found !") endif() if(CLP_FOUND) -diff --git a/scip-config.cmake.in b/scip-config.cmake.in -index 559552f9..682ac40a 100644 ---- a/scip-config.cmake.in -+++ b/scip-config.cmake.in -@@ -1,17 +1,16 @@ - if(NOT TARGET libscip) -- include("${CMAKE_CURRENT_LIST_DIR}/scip-targets.cmake") --endif() -+ include(CMakeFindDependencyMacro) -+ if(@ZIMPL_NEEDED@) -+ find_dependency(ZIMPL REQUIRED NO_MODULE) -+ endif() -+ if(@SOPLEX_NEEDED@) -+ find_dependency(SOPLEX REQUIRED NO_MODULE) -+ endif() - --if(@ZIMPL_NEEDED@) -- set(ZIMPL_DIR "@CONF_ZIMPL_DIR@") -- find_package(ZIMPL QUIET CONFIG) --endif() -- --if(@SOPLEX_NEEDED@) -- set(SOPLEX_DIR "@CONF_SOPLEX_DIR@") -- find_package(SOPLEX QUIET CONFIG) -+ include("${CMAKE_CURRENT_LIST_DIR}/scip-targets.cmake") - endif() - -+# Legacy - set(SCIP_LIBRARIES libscip) - set(SCIP_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") - set(SCIP_FOUND TRUE) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e6fda2d5..2d04b845 100644 +index c6ce7283..6b6b1fc8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -1149,17 +1149,8 @@ install(TARGETS scip libscip EXPORT scip-targets - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +@@ -1213,6 +1213,13 @@ target_link_libraries(scip + add_dependencies(libscip scip_update_githash) + add_dependencies(scip scip_update_githash) + ++if(APPLE) ++ set_target_properties(libscip PROPERTIES ++ INSTALL_RPATH "@loader_path") ++elseif(UNIX) ++ set_target_properties(libscip PROPERTIES ++ INSTALL_RPATH "$ORIGIN") ++endif() + set_target_properties(libscip PROPERTIES + VERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR}.${SCIP_VERSION_PATCH} + SOVERSION ${SCIP_VERSION_MAJOR}.${SCIP_VERSION_MINOR} +@@ -1265,17 +1272,8 @@ install(FILES ${PROJECT_SOURCE_DIR}/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR} + install(FILES ${PROJECT_SOURCE_DIR}/src/tclique/LICENSE DESTINATION ${CMAKE_INSTALL_DATADIR}/licenses/scip/tclique) # Add all targets to the build-tree export set -export(TARGETS scip libscip @@ -117,11 +81,11 @@ index e6fda2d5..2d04b845 100644 +#export(TARGETS scip libscip +# FILE "${PROJECT_BINARY_DIR}/scip-targets.cmake") - # configure the config file for the build tree - set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}") -@@ -1175,18 +1166,16 @@ ${PROJECT_BINARY_DIR}/scip-config-version.cmake - - #configure the config file for the install + # Configure scip-config.cmake for the build-tree: + # We add the CMake module path from the sources. +@@ -1295,18 +1293,16 @@ ${PROJECT_BINARY_DIR}/scip-config-version.cmake + # We add the current directory of the installed scip-config.cmake as a CMake module path. + set(EXTRA_CMAKE_MODULE_PATH "\${CMAKE_CURRENT_LIST_DIR}") set(CONF_INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../include") -if(SOPLEX_NEEDED) - set(CONF_SOPLEX_DIR "\${CMAKE_CURRENT_LIST_DIR}/../soplex") diff --git a/pkgs/by-name/or/orocos-kdl/package.nix b/pkgs/by-name/or/orocos-kdl/package.nix index 348a8ffd49a7..fae94aeb5288 100644 --- a/pkgs/by-name/or/orocos-kdl/package.nix +++ b/pkgs/by-name/or/orocos-kdl/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "orocos"; repo = "orocos_kinematics_dynamics"; - tag = "${version}"; + tag = version; hash = "sha256-4pPU+6uMMYLGq2V46wmg6lHFVhwFXrEg7PfnWGAI2is="; fetchSubmodules = true; # Needed to build Python bindings }; diff --git a/pkgs/by-name/os/os-agent/package.nix b/pkgs/by-name/os/os-agent/package.nix index 0e5bb9ee5193..df1ef45f7204 100644 --- a/pkgs/by-name/os/os-agent/package.nix +++ b/pkgs/by-name/os/os-agent/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "home-assistant"; repo = "os-agent"; - tag = "${version}"; + tag = version; hash = "sha256-x0bVY476Gm5D1drRmyszdshrO0Vi/baDsG3ulysu0Kg="; }; diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix index ca104d0f6be0..38d3097b71d5 100644 --- a/pkgs/by-name/os/osv-scanner/package.nix +++ b/pkgs/by-name/os/osv-scanner/package.nix @@ -6,18 +6,18 @@ osv-scanner, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "osv-scanner"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "google"; repo = "osv-scanner"; - tag = "v${version}"; - hash = "sha256-qpfpFjMMRWzzP1Q/28Bzp+hQ5TDi3ffwJ20PwXKgJjs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-IulgR8bXD/NBya5hK49uUbjKoVR9Xg4ZyvhI4eswoRE="; }; - vendorHash = "sha256-0htgQgpZwtHHnGWi7pnvmA9eKsu15Kd6u7VH2s/PhSs="; + vendorHash = "sha256-jMLZ0EARnUX0c40exl9d/lrbr3ClM9JmlUDiirFlBzU="; subPackages = [ "cmd/osv-scanner" @@ -26,7 +26,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/google/osv-scanner/internal/version.OSVVersion=${version}" + "-X=github.com/google/osv-scanner/internal/version.OSVVersion=${finalAttrs.version}" "-X=main.commit=n/a" "-X=main.date=1970-01-01T00:00:00Z" ]; @@ -42,10 +42,10 @@ buildGoModule rec { description = "Vulnerability scanner written in Go which uses the data provided by https://osv.dev"; mainProgram = "osv-scanner"; homepage = "https://github.com/google/osv-scanner"; - changelog = "https://github.com/google/osv-scanner/releases/tag/v${version}"; + changelog = "https://github.com/google/osv-scanner/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ stehessel ]; }; -} +}) diff --git a/pkgs/by-name/ou/outfly/package.nix b/pkgs/by-name/ou/outfly/package.nix index b64956b1c3ce..a57e4438b9a8 100644 --- a/pkgs/by-name/ou/outfly/package.nix +++ b/pkgs/by-name/ou/outfly/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { domain = "codeberg.org"; owner = "outfly"; repo = "outfly"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-FRvu3FgbT3i5888ll573nhb7naYx04Oi8nrcfgEHxUo="; }; diff --git a/pkgs/by-name/pa/package-version-server/package.nix b/pkgs/by-name/pa/package-version-server/package.nix index a0c1d2095715..e03e31ae41f6 100644 --- a/pkgs/by-name/pa/package-version-server/package.nix +++ b/pkgs/by-name/pa/package-version-server/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "zed-industries"; repo = "package-version-server"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/YyJ8+tKrNKVrN+F/oHgtExBBRatIIOvWr9mAyTHA3E="; }; diff --git a/pkgs/by-name/pa/pagmo2/package.nix b/pkgs/by-name/pa/pagmo2/package.nix index bd390f7445af..04dd5b35123c 100644 --- a/pkgs/by-name/pa/pagmo2/package.nix +++ b/pkgs/by-name/pa/pagmo2/package.nix @@ -1,54 +1,67 @@ { - fetchFromGitHub, lib, stdenv, + fetchFromGitHub, cmake, eigen, nlopt, ipopt, boost, onetbb, - # tests pass but take 30+ minutes - runTests ? false, + testers, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pagmo2"; version = "2.19.1"; src = fetchFromGitHub { owner = "esa"; repo = "pagmo2"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ido3e0hQLDEPT0AmsfAVTPlGbWe5QBkxgRO6Fg1wp/c="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ - eigen - nlopt - boost - onetbb - ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) ipopt; - - cmakeFlags = [ - "-DPAGMO_BUILD_TESTS=${if runTests then "ON" else "OFF"}" - "-DPAGMO_WITH_EIGEN3=yes" - "-DPAGMO_WITH_NLOPT=yes" - "-DNLOPT_LIBRARY=${nlopt}/lib/libnlopt${stdenv.hostPlatform.extensions.sharedLibrary}" - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - "-DPAGMO_WITH_IPOPT=yes" - "-DCMAKE_CXX_FLAGS='-fuse-ld=gold'" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # FIXME: fails ipopt test with Invalid_Option on darwin, so disable. - "-DPAGMO_WITH_IPOPT=no" - "-DLLVM_USE_LINKER=gold" + outputs = [ + "out" + "dev" ]; - doCheck = runTests; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + onetbb + ]; + + propagatedBuildInputs = [ + eigen + nlopt + ipopt + boost + ]; + + cmakeFlags = [ + (lib.cmakeBool "PAGMO_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "PAGMO_WITH_EIGEN3" true) + (lib.cmakeBool "PAGMO_WITH_NLOPT" true) + (lib.cmakeBool "PAGMO_WITH_IPOPT" true) + ]; + + env = { + # Workaround clang17+ / lto bug + # See https://github.com/esa/pagmo2/pull/585 + # Should be removed in new release + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-fno-assume-unique-vtables"; + }; + + doCheck = true; + + passthru = { + tests.cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "pagmo" ]; + package = finalAttrs.finalPackage; + }; + }; meta = { homepage = "https://esa.github.io/pagmo2/"; @@ -57,4 +70,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = [ lib.maintainers.costrouc ]; }; -} +}) diff --git a/pkgs/by-name/pa/pandoc-mustache/package.nix b/pkgs/by-name/pa/pandoc-mustache/package.nix index 35d274b74963..96d41b7b757a 100644 --- a/pkgs/by-name/pa/pandoc-mustache/package.nix +++ b/pkgs/by-name/pa/pandoc-mustache/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "michaelstepner"; repo = "pandoc-mustache"; - tag = "${version}"; + tag = version; hash = "sha256-lgbQV4X2N4VuIEtjeSA542yqGdIs5QQ7+bdCoy/aloE="; }; diff --git a/pkgs/by-name/pc/pcmanfm/package.nix b/pkgs/by-name/pc/pcmanfm/package.nix index 236c76334299..34fdbfe53b48 100644 --- a/pkgs/by-name/pc/pcmanfm/package.nix +++ b/pkgs/by-name/pc/pcmanfm/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "lxde"; repo = "pcmanfm"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-4kJDCnld//Vbe2KbrLoYZJ/dutagY/GImoOnbpQIdDY="; }; diff --git a/pkgs/by-name/pc/pcsclite/package.nix b/pkgs/by-name/pc/pcsclite/package.nix index 552df8b13486..b222c64655a3 100644 --- a/pkgs/by-name/pc/pcsclite/package.nix +++ b/pkgs/by-name/pc/pcsclite/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "salsa.debian.org"; owner = "rousseau"; repo = "PCSC"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-37qeWGEuutF0cOOidoLchKJLQCvJFdVRZXepWzD4pZs="; }; diff --git a/pkgs/by-name/pg/pgformatter/package.nix b/pkgs/by-name/pg/pgformatter/package.nix index 0721b37acb20..e4267107536f 100644 --- a/pkgs/by-name/pg/pgformatter/package.nix +++ b/pkgs/by-name/pg/pgformatter/package.nix @@ -6,13 +6,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.6"; + version = "5.9"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - hash = "sha256-EJLAP1uBmWxWEsdLJYTuViMv4o0iEi2fqy79ixyRijU="; + hash = "sha256-G4Bbg8tNlwV8VCVKCamhlQ/pGf8hWCkABm6f8i5doos="; }; outputs = [ "out" ]; @@ -37,7 +37,10 @@ perlPackages.buildPerlPackage rec { description = "PostgreSQL SQL syntax beautifier that can work as a console program or as a CGI"; homepage = "https://github.com/darold/pgFormatter"; changelog = "https://github.com/darold/pgFormatter/releases/tag/v${version}"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + thunze + mfairley + ]; license = [ lib.licenses.postgresql lib.licenses.artistic2 diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index 6f0534320bd0..bc46cd4eccce 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.53.0"; + version = "2.53.1"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-G7hIJUGzgMB202Unzrycv9KTkJ88bmRbgVT0v5jA99M="; + sha256 = "sha256-5Iral/ju6tJGRS8JUIXBVEQeme34F+v1i8F7pXprZas="; }; vendorHash = "sha256-LyPS2E5v3n7RVV3YEsEUZJZWB5x32TTfeOHAZProuCs="; diff --git a/pkgs/by-name/ph/phylophlan/package.nix b/pkgs/by-name/ph/phylophlan/package.nix index 3cb804a29227..e5670ec6ef85 100644 --- a/pkgs/by-name/ph/phylophlan/package.nix +++ b/pkgs/by-name/ph/phylophlan/package.nix @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "biobakery"; repo = "phylophlan"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-KlWKt2tH2lQBh/eQ2Hbcu2gXHEFfmFEc6LrybluxINc="; }; diff --git a/pkgs/by-name/pl/plausible/package.nix b/pkgs/by-name/pl/plausible/package.nix index b1acaae50a50..75fdf91ad317 100644 --- a/pkgs/by-name/pl/plausible/package.nix +++ b/pkgs/by-name/pl/plausible/package.nix @@ -182,7 +182,10 @@ beamPackages.mixRelease rec { changelog = "https://github.com/plausible/analytics/blob/${src.rev}/CHANGELOG.md"; description = "Simple, open-source, lightweight (< 1 KB) and privacy-friendly web analytics alternative to Google Analytics"; mainProgram = "plausible"; - teams = with lib.teams; [ cyberus ]; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/pl/playwright-mcp/package.nix b/pkgs/by-name/pl/playwright-mcp/package.nix index 3963cbc3068d..4c4d1727d401 100644 --- a/pkgs/by-name/pl/playwright-mcp/package.nix +++ b/pkgs/by-name/pl/playwright-mcp/package.nix @@ -7,16 +7,16 @@ }: buildNpmPackage rec { pname = "playwright-mcp"; - version = "0.0.55"; + version = "0.0.56"; src = fetchFromGitHub { owner = "Microsoft"; repo = "playwright-mcp"; tag = "v${version}"; - hash = "sha256-85mpLvbnNcaz6alka6cLu2TdGVDk9JUzwuA0g1Ng/uk="; + hash = "sha256-kfn9vIxmx+dSYKzR5ayGX8RIWd5d8quTAyx4/dC6hIY="; }; - npmDepsHash = "sha256-9i6Tx5OmJgTr8VCRFCQTIOjhgk05UDnr3mQjD1QVu1c="; + npmDepsHash = "sha256-Qsln4llNpfXYXhSEfHnvdsFIF7adHKEyC1eGHtVY2Qk="; postInstall = '' rm -r $out/lib/node_modules/@playwright/mcp/node_modules/playwright diff --git a/pkgs/by-name/pl/plus42/package.nix b/pkgs/by-name/pl/plus42/package.nix index b17df6a77af1..ea1d53e3c31d 100644 --- a/pkgs/by-name/pl/plus42/package.nix +++ b/pkgs/by-name/pl/plus42/package.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation rec { pname = "plus42"; - version = "1.3.12"; + version = "1.3.13"; src = fetchurl { url = "https://thomasokken.com/plus42/upstream/plus42-upstream-${version}.tgz"; - hash = "sha256-IBXQu1hI0bJZISL9wInAzf2z8zbynXXP15oG/od+MC8="; + hash = "sha256-I5SAR6vEufzT2Cgs4RQk8AWDZWm+QOLtHRqaED2DQtA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 92c4a2847f47..bf16d091e9fb 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -12,13 +12,13 @@ }: buildGo125Module (finalAttrs: { pname = "pocket-id"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-tBjo5evQVRG0oembk1VfAfM3M/FJ4zPWV/9vgAWH9Kc="; + hash = "sha256-n1jNU7+eNO7MFUWB7+EnssACMvNoMcJqPk0AvyIr9h8="; }; sourceRoot = "${finalAttrs.src.name}/backend"; diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index 6ce032ed60c2..6ecc61558cb3 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-rvEchQfJr4frFOmuKPRcV2dwl97u36tgayJvbm3X7ks="; + hash = "sha256-sl3OsGV6J1kxCW8ter71ACk7BkPZjImIKdcGJOtoEmg="; }; - vendorHash = "sha256-dNkpHGMtnR0sL9+Fl+NOfyQLJ9AXxgsnV5X9ieAVcao="; + vendorHash = "sha256-2nLjbIqjxFNd/epJfi+3C9HHlKYipv9HbqNKgtgH6H8="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix b/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix index bcbc8df5825a..22e7dbd85c68 100644 --- a/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix +++ b/pkgs/by-name/po/poetry/plugins/poetry-plugin-poeblix.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "spoorn"; repo = "poeblix"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-TKadEOk9kM3ZYsQmE2ftzjHNGNKI17p0biMr+Nskigs="; }; diff --git a/pkgs/by-name/po/pokemmo-installer/package.nix b/pkgs/by-name/po/pokemmo-installer/package.nix index 81beed1f60a3..3a57de350668 100644 --- a/pkgs/by-name/po/pokemmo-installer/package.nix +++ b/pkgs/by-name/po/pokemmo-installer/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "coringao"; repo = "pokemmo-installer"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-uSbnXBpkeGM9X6DU7AikT7hG/emu67PXuGdm6xfB8To="; }; diff --git a/pkgs/by-name/po/popura/package.nix b/pkgs/by-name/po/popura/package.nix deleted file mode 100644 index 8a16a6244949..000000000000 --- a/pkgs/by-name/po/popura/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule rec { - pname = "popura"; - version = "0.4.6"; - - src = fetchFromGitHub { - owner = "popura-network"; - repo = "popura"; - rev = "v${version}"; - hash = "sha256-iCu6/vD4vgn7aGdwK+OB8ib/QwUwoFuxDUs7vqbTZQc="; - }; - - vendorHash = "sha256-9lQC35yt1S2uch3qgwNfa/1FHy+Qi1D5Jo7DWNMgU9w="; - - ldflags = - let - pkgSrc = "github.com/yggdrasil-network/yggdrasil-go/src/version"; - in - [ - "-s" - "-w" - "-X=${pkgSrc}.buildName=yggdrasil" - "-X=${pkgSrc}.buildVersion=${version}" - ]; - - meta = { - description = "Alternative Yggdrasil network client"; - homepage = "https://github.com/popura-network/popura"; - license = lib.licenses.lgpl3Only; - maintainers = [ ]; - mainProgram = "yggdrasil"; - }; -} diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix index bf33f009ded7..d4ea3d73bd1b 100644 --- a/pkgs/by-name/po/poutine/package.nix +++ b/pkgs/by-name/po/poutine/package.nix @@ -6,15 +6,15 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "poutine"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "boostsecurityio"; repo = "poutine"; - tag = "v${version}"; - hash = "sha256-lAnErnkJY2qU+felYqsbeEBOlCj54unX2iycTWqVAhs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-mtlwxqJnNANiONPi5AkgQoeG4Xed56by4JykNme8LqA="; }; vendorHash = "sha256-qp3Ko+01kk9AH0oCT2Si/si+74gT5KFtPFslwih/IBE="; @@ -30,18 +30,18 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd ${meta.mainProgram} \ - --bash <($out/bin/${meta.mainProgram} completion bash) \ - --fish <($out/bin/${meta.mainProgram} completion fish) \ - --zsh <($out/bin/${meta.mainProgram} completion zsh) + installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \ + --bash <($out/bin/${finalAttrs.meta.mainProgram} completion bash) \ + --fish <($out/bin/${finalAttrs.meta.mainProgram} completion fish) \ + --zsh <($out/bin/${finalAttrs.meta.mainProgram} completion zsh) ''; meta = { description = "Security scanner that detects misconfigurations and vulnerabilities in build pipelines of repositories"; homepage = "https://github.com/boostsecurityio/poutine"; - changelog = "https://github.com/boostsecurityio/poutine/releases/tag/v${version}"; + changelog = "https://github.com/boostsecurityio/poutine/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "poutine"; }; -} +}) diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix index 4d4cea292f5d..2ca7f4de3476 100644 --- a/pkgs/by-name/pr/precice/package.nix +++ b/pkgs/by-name/pr/precice/package.nix @@ -18,13 +18,13 @@ assert petsc.mpiSupport; stdenv.mkDerivation (finalAttrs: { pname = "precice"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "precice"; repo = "precice"; tag = "v${finalAttrs.version}"; - hash = "sha256-1FbTNo2F+jH1EVV6gXc9o0T31UHY/wBK3vQeCV7wW5E="; + hash = "sha256-3Cg9e1n/O1kG806X3PT7IBd6QuBM38qj9BTlzYZqfSs="; }; cmakeFlags = [ diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index 70a8c9a86f9f..7c81b57c8346 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -21,7 +21,7 @@ let version = "2.3.0"; src = fetchFromGitHub { inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-oGg5MD9p4PSUVkt5pGLwjAF4SHHf4Aqr+/3FsuFaybY="; }; }); @@ -47,7 +47,7 @@ let src = fetchFromGitHub { owner = "pretix"; repo = "pretix"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-O9HAslZ8xbmLgJi3y91M6mc1oIvJZ8nRJyFRuNorRHs="; }; diff --git a/pkgs/by-name/pr/prisma-language-server/package.nix b/pkgs/by-name/pr/prisma-language-server/package.nix index ede6cb1637ca..dc466d1ff25d 100644 --- a/pkgs/by-name/pr/prisma-language-server/package.nix +++ b/pkgs/by-name/pr/prisma-language-server/package.nix @@ -11,7 +11,7 @@ buildNpmPackage (finalAttrs: { src = fetchFromGitHub { owner = "prisma"; repo = "language-tools"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-hcLjvIi7EZQSr99OLHGWesziBc5HhkvD+dmGOTgOY/c="; }; diff --git a/pkgs/by-name/pr/professor/package.nix b/pkgs/by-name/pr/professor/package.nix index aaafc6e02a3f..3c9765514cb0 100644 --- a/pkgs/by-name/pr/professor/package.nix +++ b/pkgs/by-name/pr/professor/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchFromGitLab { owner = "hepcedar"; repo = "professor"; - rev = "refs/tags/professor-2.4.2"; + tag = "professor-2.4.2"; hash = "sha256-z2Ub7SUTz4Hj3ajnzOV/QXZ+cH2v6zJv9UZM2M2y1Hg="; # workaround unpacking to case-sensitive filesystems postFetch = '' diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix index 4e432c58da92..810710ef26f2 100644 --- a/pkgs/by-name/ps/pscale/package.nix +++ b/pkgs/by-name/ps/pscale/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.269.0"; + version = "0.270.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-fs4MXuC4CLxoApgimmHNOoxyhck2ZV/IE4rGoAKr7Lk="; + sha256 = "sha256-oqfefPcGav1TwCq5F+r1eg/hx0CZoyc21rULg9cYquA="; }; - vendorHash = "sha256-HxvjFM1o14L2EVToDaqdvnnm/UeOy5BQ73ge1xx815k="; + vendorHash = "sha256-1rBQdT2bSQxOL3vWWWSwaMH8K9op6x7t5asj+qJM/sA="; ldflags = [ "-s" diff --git a/pkgs/by-name/qu/qui/package.nix b/pkgs/by-name/qu/qui/package.nix index 89a73f6946a6..607318695256 100644 --- a/pkgs/by-name/qu/qui/package.nix +++ b/pkgs/by-name/qu/qui/package.nix @@ -3,6 +3,7 @@ buildGoModule, fetchFromGitHub, stdenvNoCC, + nixosTests, nix-update-script, nodejs, pnpm_9, @@ -72,11 +73,14 @@ buildGoModule (finalAttrs: { versionCheckProgramArg = "version"; doInstallCheck = true; - passthru.updateScript = nix-update-script { - extraArgs = [ - "--subpackage" - "qui-web" - ]; + passthru = { + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "qui-web" + ]; + }; + tests.testService = nixosTests.qui; }; meta = { diff --git a/pkgs/by-name/qu/quickder/package.nix b/pkgs/by-name/qu/quickder/package.nix index 40c4b61a8832..9f4fbec335c0 100644 --- a/pkgs/by-name/qu/quickder/package.nix +++ b/pkgs/by-name/qu/quickder/package.nix @@ -22,7 +22,7 @@ let src = fetchFromGitHub { owner = "pyparsing"; repo = "pyparsing"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-0B8DjO4kLgvt4sYsk8CZI+5icdKy73XE2tWeqVLqO5A="; }; }); diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix index 3189ba9961bb..ba755fa1e2ac 100644 --- a/pkgs/by-name/ra/ratman/package.nix +++ b/pkgs/by-name/ra/ratman/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { domain = "codeberg.org"; owner = "irdest"; repo = "irdest"; - tag = "${version}"; + tag = version; hash = "sha256-rdKfKbikyqs0Y/y9A8XRVSKenjHD5rS3blxwy98Tvmg="; }; diff --git a/pkgs/by-name/re/realmd/package.nix b/pkgs/by-name/re/realmd/package.nix index e08e1de89cee..9d49b0197ce8 100644 --- a/pkgs/by-name/re/realmd/package.nix +++ b/pkgs/by-name/re/realmd/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "realmd"; repo = "realmd"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-lmNlrXOOUSDk/8H/ge0IRA64bnau9nYUIkW6OyVxbBg="; }; diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix index 6c0bd88ce615..2f8dae7e3867 100644 --- a/pkgs/by-name/re/redpanda-client/package.nix +++ b/pkgs/by-name/re/redpanda-client/package.nix @@ -7,12 +7,12 @@ stdenv, }: let - version = "25.3.4"; + version = "25.3.5"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-I5WtwY6CODf64x5ZjFBFQagQ3HkIBvuJil92sajSqRM="; + sha256 = "sha256-Qtdgl2EV1Nbvwo30ZMod83gvw/Kw36Qnjx7ywtsnvTI="; }; in buildGoModule rec { @@ -20,7 +20,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorHash = "sha256-AZQmI4foYhxyaWUfr9QzbyMX/q+737h1uc//9rXBMcY="; + vendorHash = "sha256-ozhu/4DGhpRj8vK4rzyhyV9/ZXg3LtoFYcubHVwjMbQ="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix index 7a0411894943..162b1a203ebf 100644 --- a/pkgs/by-name/re/reindeer/package.nix +++ b/pkgs/by-name/re/reindeer/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2026.01.05.00"; + version = "2026.01.12.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; tag = "v${version}"; - hash = "sha256-QbpNbiRWKbJlA3qM7RBjmjQb3Jrlwcpakb+bSdl4jA4="; + hash = "sha256-c5O1oJ4DEhOHU9b/nHj+TqTFkFRtPuh79wqzGSBP95w="; }; - cargoHash = "sha256-GeRXwE6QqWaPxRTMIIvcIGE1NdWVSSjfxy6wq3pKieM="; + cargoHash = "sha256-oCB8hV9+ZGiJ7SllVzZhq0Bg6eMua5njYJV+Mb6UpP0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix index 89103e7df3c1..fa52da1b670e 100644 --- a/pkgs/by-name/re/release-plz/package.nix +++ b/pkgs/by-name/re/release-plz/package.nix @@ -50,7 +50,10 @@ rustPlatform.buildRustPackage rec { asl20 mit ]; - maintainers = with lib.maintainers; [ dannixon ]; + maintainers = with lib.maintainers; [ + dannixon + chrjabs + ]; mainProgram = "release-plz"; broken = stdenv.hostPlatform.isDarwin; }; diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix index 7539e2b0e9b0..9b6bd1f9107a 100644 --- a/pkgs/by-name/re/repomix/package.nix +++ b/pkgs/by-name/re/repomix/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "repomix"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "yamadashy"; repo = "repomix"; tag = "v${version}"; - hash = "sha256-qesW90kU+qeRoHvxgcf4M8gpLH3qGNDw9UkX7V0z5wQ="; + hash = "sha256-LmQtgVrWZQFGTxU6Sz6RjPQqVERDWc4A7r6PS0Y7xYc="; }; - npmDepsHash = "sha256-urYj5rPgz7DIwoCc9J41dPXUWInj4Hm7YnWCp1TZPFo="; + npmDepsHash = "sha256-C/b/RFMuI5HeVHH24GFupJU1x7Kinoq6tocVHgsWw1w="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/rg/rgrc/package.nix b/pkgs/by-name/rg/rgrc/package.nix index 66fe5fd6dbbe..dbe720a55a82 100644 --- a/pkgs/by-name/rg/rgrc/package.nix +++ b/pkgs/by-name/rg/rgrc/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rgrc"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "lazywalker"; repo = "rgrc"; tag = "v${finalAttrs.version}"; - hash = "sha256-OuNVX1whhJOMj2rX2yANyHie8dn9i5JAI29btOgNH38="; + hash = "sha256-01wZYHxE01GpvFo45Fx7VootmNf/PQsS5jRMBKM7SHY="; }; - cargoHash = "sha256-wQht/DJgTvnOIQ3u2Nz5jyUNhotDgA2/iXhb9ZElGI4="; + cargoHash = "sha256-EoFTZGHviwlvB1eVQS4F0/e0g7Lp9ZipsgEYbZfNwHA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/rh/rhsrvany/package.nix b/pkgs/by-name/rh/rhsrvany/package.nix index a5f548481102..a5fc86f65da4 100644 --- a/pkgs/by-name/rh/rhsrvany/package.nix +++ b/pkgs/by-name/rh/rhsrvany/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "rwmjones"; repo = "rhsrvany"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eeEiAdm7NO5fFYKtHQbeBq4RhP8Xwgw2p2Wkm+n0EWM="; }; diff --git a/pkgs/by-name/ro/roboto/package.nix b/pkgs/by-name/ro/roboto/package.nix index 05c1c10fd67e..01445c448ea2 100644 --- a/pkgs/by-name/ro/roboto/package.nix +++ b/pkgs/by-name/ro/roboto/package.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "roboto"; - version = "3.014"; + version = "3.015"; src = fetchzip { url = "https://github.com/googlefonts/roboto-3-classic/releases/download/v${finalAttrs.version}/Roboto_v${finalAttrs.version}.zip"; stripRoot = false; - hash = "sha256-JP30nhh0CcQMqWgvA9Tmu6hCD1F8bx4XMbX0F6T6jUk="; + hash = "sha256-vfn4KmOHHSVYT9XK+mDz5f4s8LnkCAY/IyTa3Rmir2k="; }; installPhase = '' diff --git a/pkgs/by-name/ro/root/clang-root.nix b/pkgs/by-name/ro/root/clang-root.nix index 7edef83fcf50..7e3ba20c8788 100644 --- a/pkgs/by-name/ro/root/clang-root.nix +++ b/pkgs/by-name/ro/root/clang-root.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = "https://github.com/root-project/llvm-project"; - rev = "refs/tags/ROOT-llvm${version}"; + tag = "ROOT-llvm${version}"; hash = "sha256-qEoQVv/Aw9gqKSNa8ZJGqPzwXvH1yXiSOkvrUWeXI+g="; }; diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index 554884b99602..1871c71f61be 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "clad"; # Make sure that this is the same tag as in the ROOT build files! # https://github.com/root-project/root/blob/master/interpreter/cling/tools/plugins/clad/CMakeLists.txt#L76 - rev = "refs/tags/v2.0"; + tag = "v2.0"; hash = "sha256-Oj7gGSvnGuYdggonPWjrwPn/06cD+ig3eefRh7xaiPs="; }; diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index 490f232b3f78..0516e01b776c 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -6,7 +6,7 @@ pkg-config, openssl, buildNpmPackage, - nodejs_20, + nodejs, nix-update-script, }: let @@ -24,9 +24,7 @@ let rqbit-webui = buildNpmPackage { pname = "rqbit-webui"; - nodejs = nodejs_20; - - inherit version src; + inherit version src nodejs; sourceRoot = "${src.name}/crates/librqbit/webui"; diff --git a/pkgs/by-name/ru/rush-parallel/package.nix b/pkgs/by-name/ru/rush-parallel/package.nix index aed32b53470a..900cf4140e77 100644 --- a/pkgs/by-name/ru/rush-parallel/package.nix +++ b/pkgs/by-name/ru/rush-parallel/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rush-parallel"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "shenwei356"; repo = "rush"; rev = "v${version}"; - hash = "sha256-5xuRA3Jf9SiNc6E/XBP9PCSA7vmioww0G5QkUAzHmEI="; + hash = "sha256-G4EG/hj8vosmCwzFN/R/2VC3ZQJfI04aKDQbQdiSFyI="; }; - vendorHash = "sha256-zCloMhjHNkPZHYX1e1nx072IYbWHFWam4Af0l0s8a6M="; + vendorHash = "sha256-1q5qD496PfK/4LnVI6FWuHorg8EseqodAM7NCB03Lt8="; ldflags = [ "-s" diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index 3db648e3b66e..ec4c165b3e32 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2026-01-05"; + version = "2026-01-12"; - cargoHash = "sha256-J1WMQHpY3DBkM86FbXVj9YvDCJtNfX/1hKQkWQyc8YE="; + cargoHash = "sha256-2lutUe9+VZqMXPfFP6zjg2wQR7Amdc0U6Ih3OXvwCEk="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - hash = "sha256-lcA/e3++3aZQSj6xCsBi2VpYyC3Q+oO/oukgfHiL+Ts="; + hash = "sha256-xSOqy4OwQtkuPtptNQDkKs36K4xdrebEHnchoMhIpug="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/sa/safe-rm/package.nix b/pkgs/by-name/sa/safe-rm/package.nix index 0919260d494b..40e7b4c900a2 100644 --- a/pkgs/by-name/sa/safe-rm/package.nix +++ b/pkgs/by-name/sa/safe-rm/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchgit { url = "https://git.launchpad.net/safe-rm"; - rev = "refs/tags/${pname}-${version}"; + tag = "${pname}-${version}"; sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw="; }; diff --git a/pkgs/by-name/sa/sandhole/package.nix b/pkgs/by-name/sa/sandhole/package.nix index fa10203be944..7fbd99bc9ea3 100644 --- a/pkgs/by-name/sa/sandhole/package.nix +++ b/pkgs/by-name/sa/sandhole/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sandhole"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "EpicEric"; repo = "sandhole"; tag = "v${finalAttrs.version}"; - hash = "sha256-30ltOQLobRy/M1v+0jFpBmH5ZkTmkZ+mQP7BX5RKo2s="; + hash = "sha256-C6LJj8bQAe23uLEdQ3b90wanTfZvEM6o8svoOg99K2g="; }; - cargoHash = "sha256-BE7y4VlvINWdJM4/36CDn4YxPWUQnT22YJtcvjup0Ec="; + cargoHash = "sha256-HzSytIh/oMEXsd+sqR9jxi03FvbRs3WBmmscZydHL/k="; # All integration tests require networking. postPatch = '' diff --git a/pkgs/by-name/sa/satyrographos/package.nix b/pkgs/by-name/sa/satyrographos/package.nix index 6d0bcff93cdd..035477bf2682 100644 --- a/pkgs/by-name/sa/satyrographos/package.nix +++ b/pkgs/by-name/sa/satyrographos/package.nix @@ -10,7 +10,7 @@ let src = fetchFromGitHub { owner = "na4zagin3"; repo = "satyrographos"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-f9iJTr4nV7dFCMkI8+zv9qvYWRSw8H/xbbZm2LR9cB4="; }; in diff --git a/pkgs/by-name/sc/schemat/package.nix b/pkgs/by-name/sc/schemat/package.nix index 70abeeceb25a..4aa51a9d577d 100644 --- a/pkgs/by-name/sc/schemat/package.nix +++ b/pkgs/by-name/sc/schemat/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "schemat"; - version = "0.4.12"; + version = "0.5.1"; src = fetchFromGitHub { owner = "raviqqe"; repo = "schemat"; tag = "v${finalAttrs.version}"; - hash = "sha256-NUpY4VXrp6A+ACjID9uqD9G31acGtmByyVCjIDT05vI="; + hash = "sha256-mHInvr1fhVyt0Rr3uGvrl5yh4K0sMhf5oJ/RO0Cswls="; }; - cargoHash = "sha256-wPHD+ZOf9BdqpG1s/o8awxe7apbTF2Nr0i/00Vpvnes="; + cargoHash = "sha256-iKdXIWxFjIky7bQmohnuuxHv7dmf68UuwBy1wtl8ow0="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/sc/scipopt-gcg/package.nix b/pkgs/by-name/sc/scipopt-gcg/package.nix index 2357476ded2c..f6187a5a5497 100644 --- a/pkgs/by-name/sc/scipopt-gcg/package.nix +++ b/pkgs/by-name/sc/scipopt-gcg/package.nix @@ -13,16 +13,13 @@ stdenv.mkDerivation rec { pname = "scipopt-gcg"; - version = "372-unstable-2025-10-11"; - - # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.4"; + version = "4.0.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "gcg"; - rev = "83a2d210a03f920dd941d547da94867deb504882"; - hash = "sha256-wbzknCmwDhJ38gItA3DppJxSJfNK7NeIkxZVRd2kmp0="; + tag = "v${version}"; + hash = "sha256-HMhb35Zkjt3yzYk6X1OfigZjJrLuelrkQyCBs/UpFjc="; }; nativeBuildInputs = [ @@ -54,14 +51,9 @@ stdenv.mkDerivation rec { ''; doCheck = true; - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)" - ''; - meta = { maintainers = with lib.maintainers; [ fettgoenner ]; - changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; + changelog = "https://gcg.or.rwth-aachen.de/doc-3.5.0/RN${lib.versions.major version}${lib.versions.minor version}.html"; description = "Branch-and-Price & Column Generation for Everyone"; license = lib.licenses.lgpl3Plus; homepage = "https://gcg.zib.de"; diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix index e6e692a1f743..e5a9dbc3edd2 100644 --- a/pkgs/by-name/sc/scipopt-papilo/package.nix +++ b/pkgs/by-name/sc/scipopt-papilo/package.nix @@ -12,16 +12,13 @@ stdenv.mkDerivation rec { pname = "scipopt-papilo"; - version = "2.4.4"; - - # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "papilo"; tag = "v${version}"; - hash = "sha256-VHOwr3uIhurab1zI9FeecBXZIp1ee2pk8fhVak6H0+A="; + hash = "sha256-oxuXv/xWQiApxrrVdH3aEUOp40Em6kCz/DJXXpCxdzs="; }; nativeBuildInputs = [ cmake ]; @@ -46,7 +43,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = { maintainers = with lib.maintainers; [ fettgoenner ]; - changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; description = "Parallel Presolve for Integer and Linear Optimization"; license = lib.licenses.lgpl3Plus; homepage = "https://github.com/scipopt/papilo"; diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix index 6b07a7fe84b3..94380ed902da 100644 --- a/pkgs/by-name/sc/scipopt-scip/package.nix +++ b/pkgs/by-name/sc/scipopt-scip/package.nix @@ -15,17 +15,18 @@ gfortran, criterion, mpfr, + enableZimpl ? (!stdenv.hostPlatform.isDarwin), }: stdenv.mkDerivation rec { pname = "scipopt-scip"; - version = "9.2.4"; + version = "10.0.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "scip"; - tag = "v${lib.replaceStrings [ "." ] [ "" ] version}"; - hash = "sha256-nwFRtP63/HPfk9JhcyLKApicgqE9IF+7s5MGGrVJrpM="; + tag = "v${version}"; + hash = "sha256-KW7N2ORspzkaR/gdU//p38BV4GyuhoSIVb6q9RTrCYQ="; }; nativeBuildInputs = [ cmake ]; @@ -33,7 +34,6 @@ stdenv.mkDerivation rec { buildInputs = [ scipopt-soplex scipopt-papilo - scipopt-zimpl ipopt gmp readline @@ -42,8 +42,12 @@ stdenv.mkDerivation rec { boost gfortran criterion - mpfr # if not included, throws fatal error: mpfr.h not found - ]; + ] + ++ lib.optional enableZimpl scipopt-zimpl; + + cmakeFlags = lib.optional (!enableZimpl) "-DZIMPL=OFF"; + + propagatedBuildInputs = [ mpfr ]; doCheck = true; diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix index 3e36f07c2f69..43c949d740bb 100644 --- a/pkgs/by-name/sc/scipopt-soplex/package.nix +++ b/pkgs/by-name/sc/scipopt-soplex/package.nix @@ -11,16 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "scipopt-soplex"; - version = "7.1.5"; - - # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.4"; + version = "8.0.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "soplex"; - rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}"; - hash = "sha256-gtz2h5EszE77zYZ8m2UtkYnoquO8GJhAAzsvQW5b+3I="; + tag = "v${finalAttrs.version}"; + hash = "sha256-AppJUule+0x23gF/PwjDMsZ194aqK91UTevQgjPZIgc="; }; nativeBuildInputs = [ cmake ]; @@ -41,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { description = "Sequential object-oriented simPlex"; license = with lib.licenses; [ asl20 ]; mainProgram = "soplex"; - maintainers = with lib.maintainers; [ david-r-cox ]; - changelog = "https://scipopt.org/doc-${finalAttrs.scipVersion}/html/RN${lib.versions.major finalAttrs.scipVersion}.php"; + maintainers = with lib.maintainers; [ fettgoenner ]; + changelog = "https://soplex.zib.de/doc-${finalAttrs.version}/html/CHANGELOG.php"; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/sc/scipopt-ug/package.nix b/pkgs/by-name/sc/scipopt-ug/package.nix index 96b9ae0d34de..61fa4a225bfb 100644 --- a/pkgs/by-name/sc/scipopt-ug/package.nix +++ b/pkgs/by-name/sc/scipopt-ug/package.nix @@ -6,21 +6,20 @@ scipopt-scip, zlib, mpi, + gmp, }: stdenv.mkDerivation rec { pname = "scipopt-ug"; - version = "1.0.0-beta6"; + version = "1.0.0"; # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.4"; + scipVersion = "10.0.0"; # Take the SCIPOptSuite source since no other source exists publicly. src = fetchzip { - url = "https://github.com/scipopt/scip/releases/download/v${ - lib.replaceStrings [ "." ] [ "" ] scipVersion - }/scipoptsuite-${scipVersion}.tgz"; - hash = "sha256-ZFgHaC4JL0eFt/do0ucGkarmfL1WdGEecrE1iPBpFh0="; + url = "https://github.com/scipopt/scip/releases/download/v${scipVersion}/scipoptsuite-${scipVersion}.tgz"; + hash = "sha256-Nskb8quLsox7igz1UZCfd+VjR9Q8/oa8dZBYjAdc1EU="; }; sourceRoot = "${src.name}/ug"; @@ -33,6 +32,7 @@ stdenv.mkDerivation rec { scipopt-scip mpi zlib + gmp ]; meta = { diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix index 971dc1b5cf19..0158254fded4 100644 --- a/pkgs/by-name/sc/scipopt-zimpl/package.nix +++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix @@ -11,16 +11,13 @@ stdenv.mkDerivation rec { pname = "scipopt-zimpl"; - version = "362"; - - # To correlate scipVersion and version, check: https://scipopt.org/#news - scipVersion = "9.2.4"; + version = "3.7.0"; src = fetchFromGitHub { owner = "scipopt"; repo = "zimpl"; tag = "v${version}"; - hash = "sha256-juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o="; + hash = "sha256-ataepqBfdA7CgqPhbw+Xy7PC3VZTLcSrF2/xnFyx+YI="; }; postPatch = '' @@ -48,7 +45,9 @@ stdenv.mkDerivation rec { ''; meta = { maintainers = with lib.maintainers; [ fettgoenner ]; - changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php"; + platforms = lib.platforms.linux; + broken = stdenv.isDarwin; + changelog = "https://zimpl.zib.de/download/CHANGELOG.txt"; description = "Zuse Institut Mathematical Programming Language"; longDescription = '' ZIMPL is a little language to translate the mathematical model of a diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix index 05b56efa62cb..6d5ca4b14aa2 100644 --- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix +++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sdl_gamecontrollerdb"; - version = "0-unstable-2025-12-30"; + version = "0-unstable-2026-01-11"; src = fetchFromGitHub { owner = "mdqinc"; repo = "SDL_GameControllerDB"; - rev = "01de5cf46ff3679b5378ec7dae365791e632b76a"; - hash = "sha256-O04ruUxYYUCtuP7JAdB4IFFV9Uh4Hhy+fE8Iuai01pY="; + rev = "65490d3c39825a84f9c2cb4fa9bc359284f37ca2"; + hash = "sha256-v6V5TTmI7PKHU5F82yhyyPdofPegvbbGeqqque+C1hU="; }; dontBuild = true; diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix index 3b0f2b279223..3c4ed11d30b0 100644 --- a/pkgs/by-name/se/secretspec/package.nix +++ b/pkgs/by-name/se/secretspec/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "secretspec"; - version = "0.5.1"; + version = "0.6.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-hrjR+4XrvmgnO1EsHNFq9FoBkK2rgJLpAbz4rOnRLHw="; + hash = "sha256-OBIIKoF0WDkLQDVmEQJ8+EyVhFCq1dESgIbAVfNuyBU="; }; - cargoHash = "sha256-fbxMKz2fIFnqJ0BM5pyYoVrC06ymmBrvTatItfM82po="; + cargoHash = "sha256-y6ayj6FcqZI9VR6bXIKdDKrJTFDxF49ZFXXPnWLG6tQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; diff --git a/pkgs/by-name/sh/shoko-webui/package.nix b/pkgs/by-name/sh/shoko-webui/package.nix index e429a3d59682..b537f3d6e6d3 100644 --- a/pkgs/by-name/sh/shoko-webui/package.nix +++ b/pkgs/by-name/sh/shoko-webui/package.nix @@ -11,13 +11,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "shoko-webui"; - version = "2.2.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "ShokoAnime"; repo = "Shoko-WebUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-plXTAN3V0tcAe+uMs4XwYHO1UC9DCAxcMPVNKdFobcY="; + hash = "sha256-/frP6qI5xAmogb5a5AA83IJxgOhVUi6X0E4h3Qg5u6w="; }; # Avoid requiring git as a build time dependency. It's used for version @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-4/Qbg+jUagPUiQPoc57drorbEkn1ShsPZynvct+HX7A="; + hash = "sha256-rTlem83dFptgvKUKUaHK8vi5B0FBehPFtkCUhOnUKd0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shoko/deps.json b/pkgs/by-name/sh/shoko/deps.json index 95bc329bc12d..b6a073b86b27 100644 --- a/pkgs/by-name/sh/shoko/deps.json +++ b/pkgs/by-name/sh/shoko/deps.json @@ -46,13 +46,13 @@ }, { "pname": "Magick.NET-Q8-AnyCPU", - "version": "13.6.0", - "hash": "sha256-LzHv4Acau5YKP3mnqHY3S9b4TL/xZAr+LqlJkzictPA=" + "version": "14.9.1", + "hash": "sha256-4svX77hA0bfAo9Lbbks6RfAwB4DbUI8mwduMbmyaEfQ=" }, { "pname": "Magick.NET.Core", - "version": "13.6.0", - "hash": "sha256-9y7fLtgmWc830XbH6Vfj61H9W/DGqBqv+tIrg1L9U2c=" + "version": "14.9.1", + "hash": "sha256-FkFcEeK08Jrp9y1znQzy4uyW6sMU1bVi3s5e5em2of4=" }, { "pname": "MessagePack", @@ -299,6 +299,11 @@ "version": "1.1.1", "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig=" }, + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" + }, { "pname": "Microsoft.CodeAnalysis.Analyzers", "version": "3.3.4", @@ -1219,11 +1224,6 @@ "version": "1.4.2", "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY=" }, - { - "pname": "Shoko.Plugin.Abstractions", - "version": "4.0.0-beta5", - "hash": "sha256-Tc3cOHkEFjaqWTdHvAscMUfOawH5fc93/u2ztXWGtSc=" - }, { "pname": "SQLitePCLRaw.bundle_e_sqlite3", "version": "2.1.6", @@ -1294,11 +1294,6 @@ "version": "4.5.0", "hash": "sha256-THw2znu+KibfJRfD7cE3nRYHsm7Fyn5pjOOZVonFjvs=" }, - { - "pname": "System.Buffers", - "version": "4.5.1", - "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" - }, { "pname": "System.ClientModel", "version": "1.0.0", @@ -1624,11 +1619,6 @@ "version": "4.5.1", "hash": "sha256-5g6C2vb0RCUiSBw/tlCUbmrIbCvT9zQ+w/45o3l6Ctg=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.4.0", - "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U=" - }, { "pname": "System.Numerics.Vectors", "version": "4.5.0", diff --git a/pkgs/by-name/sh/shoko/package.nix b/pkgs/by-name/sh/shoko/package.nix index 8de64de5b0cb..ac4db1f494bb 100644 --- a/pkgs/by-name/sh/shoko/package.nix +++ b/pkgs/by-name/sh/shoko/package.nix @@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: { pname = "shoko"; - version = "5.1.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "ShokoAnime"; repo = "ShokoServer"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZO5S0zMwzr4giaO1bmQ4dLBIPrv6eZY7k9Os4GiO4C4="; + hash = "sha256-V8DwYLjxklKYmOnYNLp51GRJXgOXKnbgDD4DL4T4lVc="; fetchSubmodules = true; }; @@ -46,7 +46,7 @@ buildDotnetModule (finalAttrs: { ]; }; - tests.shoko = nixosTests.shoko; + tests = { inherit (nixosTests) shoko; }; }; meta = { diff --git a/pkgs/by-name/si/simgear/package.nix b/pkgs/by-name/si/simgear/package.nix index 46bf323252e3..a4f76566cc64 100644 --- a/pkgs/by-name/si/simgear/package.nix +++ b/pkgs/by-name/si/simgear/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = fetchFromGitLab { owner = "flightgear"; repo = "simgear"; - tag = "${version}"; + tag = version; hash = "sha256-1zbw/lIjTbVwhxHPvXRlxPmYJeWmKvPE/RDrTL0PXb4="; }; diff --git a/pkgs/by-name/si/sing-geoip/package.nix b/pkgs/by-name/si/sing-geoip/package.nix index d2153b81c280..10e259820cd2 100644 --- a/pkgs/by-name/si/sing-geoip/package.nix +++ b/pkgs/by-name/si/sing-geoip/package.nix @@ -14,7 +14,7 @@ let src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-geoip"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-nIrbiECK25GyuPEFqMvPdZUShC2JC1NI60Y10SsoWyY="; }; diff --git a/pkgs/by-name/sk/skyscraper/package.nix b/pkgs/by-name/sk/skyscraper/package.nix index ba5b02d99499..55ce287b7c3a 100644 --- a/pkgs/by-name/sk/skyscraper/package.nix +++ b/pkgs/by-name/sk/skyscraper/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Gemba"; repo = "skyscraper"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-z6Y5JUKvwxYgE7sdXvRNOsbUTON5i/DX1q9y4wRXixE="; }; diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix index 6c7a972093aa..c8f05d8db137 100644 --- a/pkgs/by-name/sl/slade-unstable/package.nix +++ b/pkgs/by-name/sl/slade-unstable/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation { pname = "slade"; - version = "3.2.10-unstable-2026-01-06"; + version = "3.2.10-unstable-2026-01-13"; src = fetchFromGitHub { owner = "sirjuddington"; repo = "SLADE"; - rev = "41967633f73a507181b44a1b52694547dcd534d5"; - hash = "sha256-6HnhsO9EuZia2ox7edVIade1RZ4ES6zWZkLNwA0PqZ0="; + rev = "da2bf4fd868062ea69111077c6631b26860ad5e3"; + hash = "sha256-PmTRseccN9ZyyFKWAJyDitDhWIKyTEJi77H5/CdNzbY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sl/slskd/deps.json b/pkgs/by-name/sl/slskd/deps.json index 02930e2be902..874e030b8546 100644 --- a/pkgs/by-name/sl/slskd/deps.json +++ b/pkgs/by-name/sl/slskd/deps.json @@ -39,6 +39,11 @@ "version": "6.0.0", "hash": "sha256-VPYsOGhVFSMtGyKEGOmP/m5c7KsK+2QeODkvD5p5D6M=" }, + { + "pname": "Dapper", + "version": "2.1.66", + "hash": "sha256-e5n/wnAFGPDSe30oQQ0fanXrvFZYYa+qCDSTHtfQmPw=" + }, { "pname": "Fare", "version": "2.1.1", diff --git a/pkgs/by-name/sl/slskd/package.nix b/pkgs/by-name/sl/slskd/package.nix index b8e15299c267..f5a555bc175b 100644 --- a/pkgs/by-name/sl/slskd/package.nix +++ b/pkgs/by-name/sl/slskd/package.nix @@ -19,13 +19,13 @@ let in buildDotnetModule rec { pname = "slskd"; - version = "0.24.1"; + version = "0.24.3"; src = fetchFromGitHub { owner = "slskd"; repo = "slskd"; tag = version; - hash = "sha256-rgD+akew2hs2nfz+X0pfVQbxeOdznFoWaUX3vX0G9uE="; + hash = "sha256-471Rhpkl89l6T1ScXltCYwRckS0iOAWmDYuj7NH0TAQ="; }; nativeBuildInputs = [ @@ -40,7 +40,7 @@ buildDotnetModule rec { name = "${pname}-${version}-npm-deps"; inherit src; sourceRoot = "${src.name}/${npmRoot}"; - hash = "sha256-VFWePzmE/mVd3wJuRSF+SeFR+0cgDfEScRbpZzDOKIw="; + hash = "sha256-cNYnYp+QrbwvpYs/qKKivDlMpdQP6EbDUBS32S3TrO4="; }; projectFile = "slskd.sln"; diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix index 236118c73f33..334adb2dca00 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.6"; + version = "9.14.7"; pyproject = true; src = fetchFromGitHub { owner = "snakemake"; repo = "snakemake"; tag = "v${version}"; - hash = "sha256-eGHhyMkPnC0QTxwWIWjNqX9fhzhQ3QPRAdboQVWwrRA="; + hash = "sha256-kKULORORg187jwEp5rjtWBVYdS0IA+aYCnPhJj7mVNE="; }; postPatch = '' diff --git a/pkgs/by-name/so/socalabs-papu/package.nix b/pkgs/by-name/so/socalabs-papu/package.nix index 8b4b06b2f221..31632fc4ee2c 100644 --- a/pkgs/by-name/so/socalabs-papu/package.nix +++ b/pkgs/by-name/so/socalabs-papu/package.nix @@ -30,13 +30,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "socalabs-papu"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "FigBug"; repo = "PAPU"; tag = "v${finalAttrs.version}"; - hash = "sha256-psSwQJwfCvsSgF72/K0WZQRqt0CoasVITLH69V4XcUg="; + hash = "sha256-8GM28Qt+wCc+r/6wWCh/msbIQJJqFii8ijkhuOLWfdc="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix index e7fe6017165a..39211b0f3b4a 100644 --- a/pkgs/by-name/so/solanum/package.nix +++ b/pkgs/by-name/so/solanum/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation { pname = "solanum"; - version = "0-unstable-2025-12-10"; + version = "0-unstable-2026-01-11"; src = fetchFromGitHub { owner = "solanum-ircd"; repo = "solanum"; - rev = "b58ba9b980389b064c67fa42052a66508db73b40"; - hash = "sha256-FAT1k9ETN4TozWhXSLWQ7SpvqQ0j/G/uEL0ErYFs8B8="; + rev = "e2a499f7192fa5e966dab03b7980e3240111d7b3"; + hash = "sha256-F+CtxubdNz+B/a9sAoZW4tIvj72Mms/0bUKmvm14wHg="; }; patches = [ diff --git a/pkgs/by-name/sp/speed-dreams/package.nix b/pkgs/by-name/sp/speed-dreams/package.nix new file mode 100644 index 000000000000..b314ef9aeadc --- /dev/null +++ b/pkgs/by-name/sp/speed-dreams/package.nix @@ -0,0 +1,159 @@ +{ + lib, + stdenv, + libGLU, + libGL, + libglut, + libX11, + plib, + openal, + freealut, + libXrandr, + xorgproto, + libXext, + libSM, + libICE, + libXi, + libXt, + libXrender, + libXxf86vm, + openscenegraph, + expat, + libpng12, + zlib, + bash, + SDL2, + SDL2_mixer, + enet, + libjpeg, + cmake, + pkg-config, + libvorbis, + runtimeShell, + curl, + fetchgit, + cjson, + minizip, + rhash, + copyDesktopItems, +}: + +stdenv.mkDerivation rec { + version = "2.4.2"; + pname = "speed-dreams"; + + src = fetchgit { + url = "https://forge.a-lec.org/speed-dreams/speed-dreams-code.git"; + rev = "v${version}"; + sha256 = "sha256-ZY/0tf0wFbepEUNqpaBA4qgkWDij/joqPtbiF/48oN4="; + fetchSubmodules = true; + }; + NIX_CFLAGS_COMPILE = "-I${src}/src/libs/tgf -I${src}/src/libs/tgfdata -I${src}/src/interfaces -I${src}/src/libs/math -I${src}/src/libs/portability"; + + postInstall = '' + mkdir -p "$out/bin" + # Wrapper for main executable + cat > "$out/bin/speed-dreams" <= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK diff --git a/pkgs/by-name/tc/tcld/package.nix b/pkgs/by-name/tc/tcld/package.nix index 00f2f57b38c1..d8ddc11d38ea 100644 --- a/pkgs/by-name/tc/tcld/package.nix +++ b/pkgs/by-name/tc/tcld/package.nix @@ -14,7 +14,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "temporalio"; repo = "tcld"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Jnm6l9Jj1mi9esDS6teKTEMhq7V1QD/dTl3qFhKsW4o="; # Populate values from the git repository; by doing this in 'postFetch' we # can delete '.git' afterwards and the 'src' should stay reproducible. diff --git a/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch b/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch index c167dd39df5a..af2d2e57e829 100644 --- a/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch +++ b/pkgs/by-name/te/terracotta/0001-nix-read-timestamp-from-SOURCE_DATE_EPOCH.patch @@ -1,4 +1,4 @@ -From f89d1d20a773cff73dd5856af4c84bccaea549ac Mon Sep 17 00:00:00 2001 +From 6cb38146684743fda3e86f7c64c38f3455dacf0b Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 8 Nov 2025 15:18:44 +0800 Subject: [PATCH 1/2] nix: read timestamp from SOURCE_DATE_EPOCH @@ -31,5 +31,5 @@ index 142abf3..3935272 100644 \ No newline at end of file +} -- -2.51.0 +2.51.2 diff --git a/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch b/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch index 29cb9c7c6d68..7156525c9a44 100644 --- a/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch +++ b/pkgs/by-name/te/terracotta/0002-nix-use-easytier-from-nix-input.patch @@ -1,21 +1,22 @@ -From cbf623903a0efdbd9b105f24aae6ac9ce0a4d21e Mon Sep 17 00:00:00 2001 +From d16cf03e5cbaa35e74285098cfd95197415f8cfd Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Sat, 8 Nov 2025 15:22:08 +0800 Subject: [PATCH 2/2] nix: use easytier from nix input --- build.rs | 3 ++- - src/easytier/executable_impl.rs | 31 +++---------------------------- - 2 files changed, 5 insertions(+), 29 deletions(-) + src/easytier/executable_impl.rs | 32 +++----------------------------- + src/main.rs | 1 - + 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/build.rs b/build.rs -index dc6e117..df454d9 100644 +index dfbcc4b..d716f28 100644 --- a/build.rs +++ b/build.rs -@@ -12,7 +12,8 @@ fn main() { +@@ -11,7 +11,8 @@ use std::{ + fn main() { println!("cargo::rerun-if-changed=Cargo.toml"); - println!("cargo::rerun-if-changed=.easytier"); - download_easytier(); + // Use easytier from nix + // download_easytier(); @@ -23,12 +24,19 @@ index dc6e117..df454d9 100644 sevenz_rust2::compress_to_path( "web", diff --git a/src/easytier/executable_impl.rs b/src/easytier/executable_impl.rs -index 4444060..c534360 100644 +index 81ba374..b9894cb 100644 --- a/src/easytier/executable_impl.rs +++ b/src/easytier/executable_impl.rs -@@ -16,12 +16,6 @@ use std::{ - time::Duration, +@@ -1,6 +1,5 @@ + use crate::easytier::argument::{Argument, PortForward}; + use crate::ports::PortRequest; +-use crate::EASYTIER_DIR; + use parking_lot::Mutex; + use std::ffi::OsString; + use std::fmt::Write; +@@ -17,12 +16,6 @@ use std::{ }; + use crate::easytier::{EasyTierMember, NatType}; -static EASYTIER_ARCHIVE: (&str, &str, &[u8]) = ( - include_str!(env!("TERRACOTTA_ET_ENTRY_CONF")), @@ -37,12 +45,12 @@ index 4444060..c534360 100644 -); - lazy_static::lazy_static! { - pub static ref FACTORY: EasytierFactory = create(); + static ref FACTORY: EasytierFactory = create_factory(); } -@@ -38,32 +32,13 @@ pub struct Easytier { +@@ -42,32 +35,13 @@ pub struct EasyTier { } - fn create() -> EasytierFactory { + fn create_factory() -> EasytierFactory { - let _ = fs::create_dir_all(&*EASYTIER_DIR); - logging!( @@ -75,6 +83,18 @@ index 4444060..c534360 100644 EasytierFactory { exe, cli } } +diff --git a/src/main.rs b/src/main.rs +index c40b991..a3aecaf 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -132,7 +132,6 @@ lazy_static! { + )) + }; + static ref LOGGING_FILE: std::path::PathBuf = WORKING_DIR.join("application.log"); +- static ref EASYTIER_DIR: std::path::PathBuf = WORKING_DIR.join("embedded-easytier"); + } + + #[derive(Debug, PartialEq)] -- -2.51.0 +2.51.2 diff --git a/pkgs/by-name/te/terracotta/Cargo.lock b/pkgs/by-name/te/terracotta/Cargo.lock index 3fd3cb651b49..b2ed1c66d8d5 100644 --- a/pkgs/by-name/te/terracotta/Cargo.lock +++ b/pkgs/by-name/te/terracotta/Cargo.lock @@ -54,9 +54,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" [[package]] name = "async-compression" -version = "0.4.33" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c1f86859c1af3d514fa19e8323147ff10ea98684e6c7b307912509f50e67b2" +checksum = "98ec5f6c2f8bc326c994cb9e241cc257ddaba9afa8555a43cffbb5dd86efaa37" dependencies = [ "compression-codecs", "compression-core", @@ -84,7 +84,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -95,7 +95,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -163,9 +163,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.19.0" +version = "3.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" [[package]] name = "bytemuck" @@ -196,9 +196,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.46" +version = "1.2.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97463e1064cb1b1c1384ad0a0b9c8abd0988e2a91f52606c80ef14aadb63e36" +checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" dependencies = [ "find-msvc-tools", "jobserver", @@ -206,6 +206,12 @@ dependencies = [ "shlex", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cfg-if" version = "1.0.4" @@ -229,6 +235,15 @@ dependencies = [ "windows-link", ] +[[package]] +name = "cidr" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579504560394e388085d0c080ea587dfa5c15f7e251b4d5247d1e1a61d1d6928" +dependencies = [ + "serde", +] + [[package]] name = "cipher" version = "0.4.4" @@ -240,10 +255,20 @@ dependencies = [ ] [[package]] -name = "compression-codecs" -version = "0.4.32" +name = "combine" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "680dc087785c5230f8e8843e2e57ac7c1c90488b6a91b88caa265410568f441b" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "compression-codecs" +version = "0.4.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0f7ac3e5b97fdce45e8922fb05cae2c37f7bbd63d30dd94821dacfd8f3f2bf2" dependencies = [ "compression-core", "flate2", @@ -253,9 +278,9 @@ dependencies = [ [[package]] name = "compression-core" -version = "0.4.30" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9b614a5787ef0c8802a55766480563cb3a93b435898c422ed2a359cf811582" +checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" [[package]] name = "constant_time_eq" @@ -318,6 +343,41 @@ dependencies = [ "typenum", ] +[[package]] +name = "darling" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +dependencies = [ + "darling_core", + "quote", + "syn", +] + [[package]] name = "deflate64" version = "0.1.10" @@ -341,7 +401,38 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", +] + +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn", ] [[package]] @@ -374,7 +465,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -429,7 +520,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -491,9 +582,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" +checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff" [[package]] name = "flate2" @@ -642,6 +733,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "getset" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cf0fc11e47561d47397154977bc219f4cf809b2974facc3ccb3b89e2436f912" +dependencies = [ + "proc-macro-error2", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "glob" version = "0.3.3" @@ -659,7 +762,7 @@ dependencies = [ "fnv", "futures-core", "futures-sink", - "http 1.3.1", + "http 1.4.0", "indexmap", "slab", "tokio", @@ -669,9 +772,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "hermit-abi" @@ -707,12 +810,11 @@ dependencies = [ [[package]] name = "http" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -734,7 +836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ "bytes", - "http 1.3.1", + "http 1.4.0", ] [[package]] @@ -745,7 +847,7 @@ checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", "futures-core", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "pin-project-lite", ] @@ -796,7 +898,7 @@ dependencies = [ "futures-channel", "futures-core", "h2", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "httparse", "itoa", @@ -813,7 +915,7 @@ version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "http 1.3.1", + "http 1.4.0", "hyper 1.8.1", "hyper-util", "rustls", @@ -826,16 +928,16 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" dependencies = [ "base64", "bytes", "futures-channel", "futures-core", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "hyper 1.8.1", "ipnet", @@ -922,9 +1024,9 @@ checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" [[package]] name = "icu_properties" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +checksum = "020bfc02fe870ec3a66d93e677ccca0562506e5872c650f893269e08615d74ec" dependencies = [ "icu_collections", "icu_locale_core", @@ -936,9 +1038,9 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.1.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" +checksum = "616c294cf8d725c6afcd8f55abc17c56464ef6211f9ed59cccffe534129c77af" [[package]] name = "icu_provider" @@ -955,6 +1057,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + [[package]] name = "idna" version = "1.1.0" @@ -978,9 +1086,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.12.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "equivalent", "hashbrown", @@ -1011,9 +1119,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" [[package]] name = "iri-string" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" +checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" dependencies = [ "memchr", "serde", @@ -1060,9 +1168,42 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.15" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" + +[[package]] +name = "java-locator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c46c1fe465c59b1474e665e85e1256c3893dd00927b8d55f63b09044c1e64f" +dependencies = [ + "glob", +] + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "java-locator", + "jni-sys", + "libloading", + "log", + "thiserror 1.0.69", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" @@ -1076,9 +1217,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ "once_cell", "wasm-bindgen", @@ -1098,9 +1239,19 @@ checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" [[package]] name = "libc" -version = "0.2.177" +version = "0.2.179" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" +checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] [[package]] name = "liblzma" @@ -1124,9 +1275,9 @@ dependencies = [ [[package]] name = "libredox" -version = "0.1.10" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +checksum = "3d0b95e02c851351f877147b7deea7b1afb1df71b63aa5f8270716e0c5720616" dependencies = [ "bitflags", "libc", @@ -1134,9 +1285,9 @@ dependencies = [ [[package]] name = "libz-rs-sys" -version = "0.5.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd" +checksum = "c10501e7805cee23da17c7790e59df2870c0d4043ec6d03f67d31e2b53e77415" dependencies = [ "zlib-rs", ] @@ -1155,14 +1306,14 @@ checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" [[package]] name = "local-ip-address" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "656b3b27f8893f7bbf9485148ff9a65f019e3f33bd5cdc87c83cab16b3fd9ec8" +checksum = "0a60bf300a990b2d1ebdde4228e873e8e4da40d834adbf5265f3da1457ede652" dependencies = [ "libc", "neli", - "thiserror", - "windows-sys 0.59.0", + "thiserror 2.0.17", + "windows-sys 0.61.2", ] [[package]] @@ -1176,9 +1327,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" +checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "loom" @@ -1240,9 +1391,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ "libc", "wasi", @@ -1258,7 +1409,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http 1.3.1", + "http 1.4.0", "httparse", "memchr", "mime", @@ -1270,9 +1421,9 @@ dependencies = [ [[package]] name = "native-dialog" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454a816a8fed70bb5ba4ae90901073173dd5142f5df5ee503acde1ebcfaa4c4b" +checksum = "89853bb05334e192e6646290ea94ca31bcb80443f25ad40ebf478b6dafb08d6c" dependencies = [ "ascii", "block2", @@ -1285,7 +1436,7 @@ dependencies = [ "objc2-core-graphics", "objc2-foundation", "raw-window-handle", - "thiserror", + "thiserror 2.0.17", "versions", "wfd", "which", @@ -1294,27 +1445,31 @@ dependencies = [ [[package]] name = "neli" -version = "0.6.5" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93062a0dce6da2517ea35f301dfc88184ce18d3601ec786a727a87bf535deca9" +checksum = "e23bebbf3e157c402c4d5ee113233e5e0610cc27453b2f07eefce649c7365dcc" dependencies = [ + "bitflags", "byteorder", + "derive_builder", + "getset", "libc", "log", "neli-proc-macros", + "parking_lot", ] [[package]] name = "neli-proc-macros" -version = "0.1.4" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8034b7fbb6f9455b2a96c19e6edf8dc9fc34c70449938d8ee3b4df363f61fe" +checksum = "05d8d08c6e98f20a62417478ebf7be8e1425ec9acecc6f63e22da633f6b71609" dependencies = [ "either", "proc-macro2", "quote", "serde", - "syn 1.0.109", + "syn", ] [[package]] @@ -1576,9 +1731,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "open" -version = "5.3.2" +version = "5.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2483562e62ea94312f3576a7aca397306df7990b8d89033e18766744377ef95" +checksum = "43bb73a7fa3799b198970490a51174027ba0d4ec504b03cd08caf513d40024bc" dependencies = [ "is-wsl", "libc", @@ -1650,7 +1805,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -1708,10 +1863,32 @@ dependencies = [ ] [[package]] -name = "proc-macro2" -version = "1.0.103" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.104" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9695f8df41bb4f3d222c95a67532365f569318332d03d5f3f67f37b20e6ebdf0" dependencies = [ "unicode-ident", ] @@ -1724,7 +1901,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", "version_check", "yansi", ] @@ -1743,7 +1920,7 @@ dependencies = [ "rustc-hash", "rustls", "socket2 0.6.1", - "thiserror", + "thiserror 2.0.17", "tokio", "tracing", "web-time", @@ -1764,7 +1941,7 @@ dependencies = [ "rustls", "rustls-pki-types", "slab", - "thiserror", + "thiserror 2.0.17", "tinyvec", "tracing", "web-time", @@ -1881,7 +2058,7 @@ checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" dependencies = [ "getrandom 0.2.16", "libredox", - "thiserror", + "thiserror 2.0.17", ] [[package]] @@ -1901,7 +2078,7 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -1923,11 +2100,10 @@ checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.24" +version = "0.12.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" dependencies = [ - "async-compression", "base64", "bytes", "encoding_rs", @@ -1935,7 +2111,7 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", "http-body-util", "hyper 1.8.1", @@ -1955,7 +2131,6 @@ dependencies = [ "sync_wrapper", "tokio", "tokio-rustls", - "tokio-util", "tower", "tower-http", "tower-service", @@ -2030,7 +2205,7 @@ dependencies = [ "proc-macro2", "quote", "rocket_http", - "syn 2.0.110", + "syn", "unicode-xid", "version_check", ] @@ -2070,9 +2245,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustix" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" dependencies = [ "bitflags", "errno", @@ -2097,9 +2272,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.13.0" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a" +checksum = "21e6f2ab2928ca4291b86736a8bd920a277a399bba1589409d72154ff87c1282" dependencies = [ "web-time", "zeroize", @@ -2124,9 +2299,18 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "ryu" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" +checksum = "a50f4cf475b65d88e057964e0e9bb1f0aa9bbb2036dc65c64596b42932536984" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] [[package]] name = "scoped-tls" @@ -2167,20 +2351,20 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] name = "serde_json" -version = "1.0.145" +version = "1.0.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" +checksum = "3084b546a1dd6289475996f182a22aba973866ea8e8b02c51d9f46b1336a22da" dependencies = [ "itoa", "memchr", - "ryu", "serde", "serde_core", + "zmij", ] [[package]] @@ -2194,9 +2378,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392" +checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" dependencies = [ "serde_core", ] @@ -2254,18 +2438,19 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signal-hook-registry" -version = "1.4.6" +version = "1.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" dependencies = [ + "errno", "libc", ] [[package]] name = "simd-adler32" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" [[package]] name = "slab" @@ -2329,6 +2514,12 @@ dependencies = [ "loom", ] +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "subtle" version = "2.6.1" @@ -2337,20 +2528,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "1.0.109" +version = "2.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.110" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea" +checksum = "678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4" dependencies = [ "proc-macro2", "quote", @@ -2374,7 +2554,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -2400,9 +2580,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.23.0" +version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" +checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" dependencies = [ "fastrand", "getrandom 0.3.4", @@ -2417,7 +2597,9 @@ version = "0.0.0-snapshot" dependencies = [ "cfg-if", "chrono", + "cidr", "hex", + "jni", "lazy_static", "libc", "local-ip-address", @@ -2438,19 +2620,41 @@ dependencies = [ "sevenz-rust2", "socket2 0.6.1", "timestamp", - "toml 0.9.8", + "tokio", + "toml 0.9.10+spec-1.1.0", + "uuid", "winapi", "winresource", "zip", ] +[[package]] +name = "thiserror" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" +dependencies = [ + "thiserror-impl 1.0.69", +] + [[package]] name = "thiserror" version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ - "thiserror-impl", + "thiserror-impl 2.0.17", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2461,7 +2665,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -2538,9 +2742,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.48.0" +version = "1.49.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" dependencies = [ "bytes", "libc", @@ -2560,7 +2764,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -2611,14 +2815,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.8" +version = "0.9.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8" +checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48" dependencies = [ "indexmap", "serde_core", - "serde_spanned 1.0.3", - "toml_datetime 0.7.3", + "serde_spanned 1.0.4", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", "winnow", @@ -2635,9 +2839,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.7.3" +version = "0.7.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533" +checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" dependencies = [ "serde_core", ] @@ -2658,9 +2862,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.4" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e" +checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44" dependencies = [ "winnow", ] @@ -2673,9 +2877,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "toml_writer" -version = "1.0.4" +version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2" +checksum = "ab16f14aed21ee8bfd8ec22513f7287cd4a91aa92e44edfe2c17ddd004e92607" [[package]] name = "tower" @@ -2694,17 +2898,22 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" dependencies = [ + "async-compression", "bitflags", "bytes", + "futures-core", "futures-util", - "http 1.3.1", + "http 1.4.0", "http-body 1.0.1", + "http-body-util", "iri-string", "pin-project-lite", + "tokio", + "tokio-util", "tower", "tower-layer", "tower-service", @@ -2724,9 +2933,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.41" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -2735,20 +2944,20 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] name = "tracing-core" -version = "0.1.34" +version = "0.1.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", "valuable", @@ -2767,9 +2976,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" +checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" dependencies = [ "matchers", "nu-ansi-term", @@ -2850,6 +3059,16 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +[[package]] +name = "uuid" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "valuable" version = "0.1.1" @@ -2872,6 +3091,16 @@ dependencies = [ "nom", ] +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -2898,9 +3127,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ "cfg-if", "once_cell", @@ -2911,9 +3140,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.55" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ "cfg-if", "js-sys", @@ -2924,9 +3153,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2934,31 +3163,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.110", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" dependencies = [ "unicode-ident", ] [[package]] name = "web-sys" -version = "0.3.82" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" dependencies = [ "js-sys", "wasm-bindgen", @@ -2976,9 +3205,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" +checksum = "12bed680863276c63889429bfd6cab3b99943659923822de1c8a39c49e4d722c" dependencies = [ "rustls-pki-types", ] @@ -3021,6 +3250,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" @@ -3057,7 +3295,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -3068,7 +3306,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -3108,18 +3346,18 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.52.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.42.2", ] [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ "windows-targets 0.52.6", ] @@ -3142,6 +3380,21 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -3190,6 +3443,12 @@ dependencies = [ "windows_x86_64_msvc 0.53.1", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -3208,6 +3467,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -3226,6 +3491,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -3256,6 +3527,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -3274,6 +3551,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -3292,6 +3575,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -3310,6 +3599,12 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -3330,20 +3625,20 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf" +checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" dependencies = [ "memchr", ] [[package]] name = "winresource" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ef04dd590e94ff7431a8eda99d5ca659e688d60e930bd0a330062acea4608f" +checksum = "6b021990998587d4438bb672b5c5f034cbc927f51b45e3807ab7323645ef4899" dependencies = [ - "toml 0.9.8", + "toml 0.9.10+spec-1.1.0", "version_check", ] @@ -3393,28 +3688,28 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.27" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.27" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -3434,7 +3729,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", "synstructure", ] @@ -3449,13 +3744,13 @@ dependencies = [ [[package]] name = "zeroize_derive" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -3488,7 +3783,7 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.110", + "syn", ] [[package]] @@ -3520,9 +3815,15 @@ dependencies = [ [[package]] name = "zlib-rs" -version = "0.5.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" +checksum = "40990edd51aae2c2b6907af74ffb635029d5788228222c4bb811e9351c0caad3" + +[[package]] +name = "zmij" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30e0d8dffbae3d840f64bda38e28391faef673a7b5a6017840f2a106c8145868" [[package]] name = "zopfli" diff --git a/pkgs/by-name/te/terracotta/package.nix b/pkgs/by-name/te/terracotta/package.nix index ff574808e251..23e928697ee7 100644 --- a/pkgs/by-name/te/terracotta/package.nix +++ b/pkgs/by-name/te/terracotta/package.nix @@ -3,21 +3,21 @@ stdenv, rustPlatform, fetchFromGitHub, + callPackage, easytier, replaceVars, imagemagick, - nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "terracotta"; - version = "0.3.14"; + version = "0.4.1"; src = fetchFromGitHub { owner = "burningtnt"; repo = "Terracotta"; tag = "v${finalAttrs.version}"; - hash = "sha256-zp3Ax0A7Vc6LnZiWu2pWzQTWvYH9NRmqSfmxK756qA8="; + hash = "sha256-AlbztRTHnrEqJCcNeRNssu2M0QHicdRlGCVHOvYglTw="; # 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; @@ -40,6 +40,9 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; postPatch = '' + # remove android-specific git dependency + sed -i '/EasyTier.git/d' Cargo.toml + ln -s ${./Cargo.lock} Cargo.lock '' + lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -50,6 +53,15 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ imagemagick ]; + cargoBuildFlags = [ + "--bin" + "terracotta" + ]; + cargoTestFlags = [ + "--bin" + "terracotta" + ]; + cargoLock.lockFile = ./Cargo.lock; env = { @@ -90,7 +102,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '@TERRACOTTA_BIN@' "$out/bin/terracotta" ''; - passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; + passthru.updateScript = lib.getExe (callPackage ./update.nix { }); meta = { description = "Terracotta provides out-of-the-box multiplayer support for Minecraft"; diff --git a/pkgs/by-name/te/terracotta/update.nix b/pkgs/by-name/te/terracotta/update.nix new file mode 100644 index 000000000000..f690af68e528 --- /dev/null +++ b/pkgs/by-name/te/terracotta/update.nix @@ -0,0 +1,47 @@ +{ + writeShellApplication, + curl, + jq, + common-updater-scripts, + cargo, +}: + +writeShellApplication { + name = "update-terracotta"; + runtimeInputs = [ + curl + jq + common-updater-scripts + cargo + ]; + + text = '' + get_latest_release() { + curl --fail ''${GITHUB_TOKEN:+ -H "Authorization: bearer $GITHUB_TOKEN"} \ + -s "https://api.github.com/repos/burningtnt/Terracotta/releases/latest" | jq -r ".tag_name" + } + + version=$(get_latest_release) + version="''${version#v}" + + if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 + fi + + tmp=$(mktemp -d) + trap 'rm -rf "$tmp"' EXIT + + update-source-version terracotta "$version" + + cp -r "$(nix-build --no-link -A terracotta.src)" "$tmp/src" + chmod -R +w "$tmp/src" + + pushd "$tmp/src" + sed -i '/EasyTier.git/d' Cargo.toml + cargo generate-lockfile + popd + + cp "$tmp/src/Cargo.lock" "pkgs/by-name/te/terracotta/Cargo.lock" + ''; +} diff --git a/pkgs/by-name/te/terraform-backend/package.nix b/pkgs/by-name/te/terraform-backend/package.nix index b04dbacb048f..9acf353f24a1 100644 --- a/pkgs/by-name/te/terraform-backend/package.nix +++ b/pkgs/by-name/te/terraform-backend/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "terraform-backend"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "nimbolus"; repo = "terraform-backend"; tag = "v${finalAttrs.version}"; - hash = "sha256-S3ih7dLSQs3xJMHyQyWy43OG1maizBPVT8IsrWcSRUM="; + hash = "sha256-/LIdvUsNeZ49GVo+TW4Uw0f7GWkexuaEvcFhg04BP44="; }; - vendorHash = "sha256-5L8MNhjEPI3OOmtHdkB9ZQp02d7nzPp5h0/gVHTiCws="; + vendorHash = "sha256-2krZ1JVioWiVuAGflMzw0W0wITpHTMu8j1Kio+uCkvM="; ldflags = [ "-s" diff --git a/pkgs/by-name/te/textidote/package.nix b/pkgs/by-name/te/textidote/package.nix index 3a1e6ca9e4c9..6ad359dd4e5f 100644 --- a/pkgs/by-name/te/textidote/package.nix +++ b/pkgs/by-name/te/textidote/package.nix @@ -25,7 +25,7 @@ let src = fetchFromGitHub { owner = "sylvainhalle"; repo = "textidote"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QMSoxk5jDn6qsdxffXJ/S4eTIzLjJdAEbdaK8MZIavI="; }; diff --git a/pkgs/by-name/te/textlint-rule-common-misspellings/package.nix b/pkgs/by-name/te/textlint-rule-common-misspellings/package.nix index ad17e2a91092..c190acb8527c 100644 --- a/pkgs/by-name/te/textlint-rule-common-misspellings/package.nix +++ b/pkgs/by-name/te/textlint-rule-common-misspellings/package.nix @@ -42,7 +42,7 @@ let src = fetchFromGitHub { owner = "textlint"; repo = "textlint-rule-helper"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-SVeL/3KC/yazSGsmn5We8fJAuVqfcspzN7i2a4+EOlI="; }; diff --git a/pkgs/by-name/te/textpieces/package.nix b/pkgs/by-name/te/textpieces/package.nix index 29b3d744d26e..fe2d28ecb2ba 100644 --- a/pkgs/by-name/te/textpieces/package.nix +++ b/pkgs/by-name/te/textpieces/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "liferooter"; repo = "textpieces"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-BUhcPnvi6cuhaYYNZV9pvOLH/cIV3t7ncpG55fBjqwo="; }; diff --git a/pkgs/by-name/th/threema-desktop/package.nix b/pkgs/by-name/th/threema-desktop/package.nix index 9f328cd0beef..6b6420e5b44b 100644 --- a/pkgs/by-name/th/threema-desktop/package.nix +++ b/pkgs/by-name/th/threema-desktop/package.nix @@ -14,7 +14,7 @@ let electronSrc = fetchFromGitHub { owner = "threema-ch"; repo = "threema-web-electron"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-u1rzKFDrLxU/o7Oc2o/WBwbAncNWKJ9GAUBaNDPViZI="; }; @@ -25,7 +25,7 @@ let src = fetchFromGitHub { owner = "threema-ch"; repo = "threema-web"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-GmyWKJdDgiRS7XxNjCyvt92Bn48kpP3+ZsfRouyUCM0="; }; diff --git a/pkgs/by-name/to/topicctl/package.nix b/pkgs/by-name/to/topicctl/package.nix index a11fa855328e..6c6268d6db5b 100644 --- a/pkgs/by-name/to/topicctl/package.nix +++ b/pkgs/by-name/to/topicctl/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "topicctl"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-48s15CF6prLoaZjJ77bXNM0Y8ZkFlDTEJUb+DtnbwZY="; + sha256 = "sha256-i7Gu7bk7J8+kG6gWpB+8hyIQs7B3TNQmYvLyQQ0ZGtc="; }; - vendorHash = "sha256-ltvWWB0Y5arPV8o3bSYHcDf1ZSRRCrPriXklShj/fjo="; + vendorHash = "sha256-aoFMYgyZnXmPg3fjwydGm85WKcT+Jez07a4JX1o3Mmo="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix index 74e83f4442c7..576ff3189050 100644 --- a/pkgs/by-name/tr/trufflehog/package.nix +++ b/pkgs/by-name/tr/trufflehog/package.nix @@ -6,15 +6,15 @@ makeWrapper, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "trufflehog"; - version = "3.92.4"; + version = "3.92.5"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; - tag = "v${version}"; - hash = "sha256-fV1PO8e4ezU4Nzhfqc1vCLH9ex0eEaQyQkrwGpRK4vc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-9nzcFw+7dpkSNAYy6Rh+qhhneO44tYCHEPPM2KDzs/4="; }; vendorHash = "sha256-98yTB5Wu2W2xesg9NMPv+Yij/stutRSP98MeTf807Jo="; @@ -28,7 +28,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X=github.com/trufflesecurity/trufflehog/v3/pkg/version.BuildVersion=${version}" + "-X=github.com/trufflesecurity/trufflehog/v3/pkg/version.BuildVersion=${finalAttrs.version}" ]; # Test cases run git clone and require network access @@ -45,7 +45,7 @@ buildGoModule rec { meta = { description = "Find credentials all over the place"; homepage = "https://github.com/trufflesecurity/trufflehog"; - changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/v${version}"; + changelog = "https://github.com/trufflesecurity/trufflehog/releases/tag/${finalAttrs.src.tag}"; license = with lib.licenses; [ agpl3Only ]; maintainers = with lib.maintainers; [ fab @@ -53,4 +53,4 @@ buildGoModule rec { ]; mainProgram = "trufflehog"; }; -} +}) diff --git a/pkgs/by-name/tu/turborepo-remote-cache/package.nix b/pkgs/by-name/tu/turborepo-remote-cache/package.nix new file mode 100644 index 000000000000..6a71337649e7 --- /dev/null +++ b/pkgs/by-name/tu/turborepo-remote-cache/package.nix @@ -0,0 +1,85 @@ +{ + lib, + stdenvNoCC, + nodejs-slim_24, + pnpm_10, + pnpmConfigHook, + jq, + fetchFromGitHub, + fetchPnpmDeps, + makeWrapper, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "turborepo-remote-cache"; + version = "2.7.0"; + + src = fetchFromGitHub { + owner = "ducktors"; + repo = "turborepo-remote-cache"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ySMZZ9rhVNkoJzz9g1ZxfnL67xGjN2WbirINJMKQqN4="; + }; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + pnpm = pnpm_10; + fetcherVersion = 3; + hash = "sha256-i8kXC9bRit9S1TPV9uixCkkn3KahRu/hhBeDyHm6MBc="; + }; + + nativeBuildInputs = [ + nodejs-slim_24 + pnpmConfigHook + pnpm_10 + jq + makeWrapper + ]; + + postPatch = '' + # Replace build script to skip linting + jq '.scripts.build = "tsc -p ./tsconfig.json"' package.json > package.json.tmp + mv package.json.tmp package.json + + # Remove prepare script since we don't need git hooks + jq 'del(.scripts.prepare)' package.json > package.json.tmp + mv package.json.tmp package.json + ''; + + buildPhase = '' + runHook preBuild + pnpm build + pnpm prune --prod + # Clean up broken symlinks left behind by `pnpm prune` + # https://github.com/pnpm/pnpm/issues/3645 + find node_modules -xtype l -delete + # Remove non-deterministic files + rm node_modules/.modules.yaml + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + appdir="$out/lib/turborepo-remote-cache" + mkdir -p "$appdir" "$out/bin" + + cp -r dist node_modules "$appdir"/ + + makeWrapper ${nodejs-slim_24}/bin/node "$out/bin/turborepo-remote-cache" \ + --add-flags "$appdir/dist/index.js" \ + --set NODE_PATH "$appdir/node_modules" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/ducktors/turborepo-remote-cache"; + description = "This project is an open-source implementation of the Turborepo custom remote cache server."; + license = lib.licenses.mit; + mainProgram = "turborepo-remote-cache"; + maintainers = with lib.maintainers; [ humemm ]; + }; +}) diff --git a/pkgs/by-name/tu/turtle/package.nix b/pkgs/by-name/tu/turtle/package.nix index c2a9188894d9..1c7866aa8661 100644 --- a/pkgs/by-name/tu/turtle/package.nix +++ b/pkgs/by-name/tu/turtle/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { pname = "turtle"; - version = "0.13.3"; + version = "0.14"; pyproject = true; src = fetchFromGitLab { @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "philippun1"; repo = "turtle"; tag = version; - hash = "sha256-bfoo2xWBr4jR5EX5H8hiXl6C6HSpNJ93icDg1gwWXqE="; + hash = "sha256-+XDDscw5xBUp39tbZLqZWK+wsRDi401mRDjx+VR6Cu0="; }; postPatch = '' @@ -58,7 +58,10 @@ python3Packages.buildPythonApplication rec { dontWrapPythonPrograms = true; postFixup = '' - makeWrapperArgs+=(''${gappsWrapperArgs[@]}) + makeWrapperArgs+=( + ''${gappsWrapperArgs[@]} + --prefix PATH : ${lib.makeBinPath [ meld ]} + ) wrapPythonPrograms '' # Dialogs are not imported, but executed. The same does diff --git a/pkgs/by-name/ty/typesetter/package.nix b/pkgs/by-name/ty/typesetter/package.nix index 3a8f601f8543..d2ac1c6f34d1 100644 --- a/pkgs/by-name/ty/typesetter/package.nix +++ b/pkgs/by-name/ty/typesetter/package.nix @@ -30,19 +30,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "typesetter"; - version = "0.8.4"; + version = "0.9.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "haydn"; repo = "typesetter"; tag = "v${finalAttrs.version}"; - hash = "sha256-P92n2ly60czewff5d2tC0nkXMtFGAzNkRY+Jh8Pi4iQ="; + hash = "sha256-Ryte4znAa+4K0r0WfvQP7RPZFykbvoPmpYTRiAWOF/c="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-jG6FLt74nDAYfaAhaw+foVZBeLQIvtCHcxB8s/HSvIQ="; + hash = "sha256-FCZFKn0RhyvFPpmRMNojSU6djg6pOJCIgjzRD6Wbn4M="; }; strictDeps = true; diff --git a/pkgs/by-name/ty/typioca/package.nix b/pkgs/by-name/ty/typioca/package.nix index 538929d68616..fc428d9876ef 100644 --- a/pkgs/by-name/ty/typioca/package.nix +++ b/pkgs/by-name/ty/typioca/package.nix @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-fViYwewzhJUJjMupCYk1UsnnPAhByYZqYkuKD6MJNnE="; }; diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix index 83e5aa2c99d0..1cca082243f9 100644 --- a/pkgs/by-name/ty/typos/package.nix +++ b/pkgs/by-name/ty/typos/package.nix @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { ]; maintainers = with lib.maintainers; [ mgttlinger + chrjabs ]; }; } diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix index 519f01d1efc1..ec2111a516b8 100644 --- a/pkgs/by-name/ud/udiskie/package.nix +++ b/pkgs/by-name/ud/udiskie/package.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { pname = "udiskie"; - version = "2.6.0"; + version = "2.6.1"; pyproject = true; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { owner = "coldfix"; repo = "udiskie"; tag = "v${version}"; - hash = "sha256-ZagfjzSikXuVGeJdQm0YpW+IqbUfJ2b9Pnj/RLUmsik="; + hash = "sha256-1/qQS2bAxoHbWWmMkDoV5QNSUVYCQfer6lWM9ptG+Vk="; }; patches = [ diff --git a/pkgs/by-name/un/unfs3/package.nix b/pkgs/by-name/un/unfs3/package.nix index 8e250d84f935..383acc1623c2 100644 --- a/pkgs/by-name/un/unfs3/package.nix +++ b/pkgs/by-name/un/unfs3/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "unfs3"; repo = "unfs3"; - rev = "refs/tags/unfs3-${version}"; + tag = "unfs3-${version}"; hash = "sha256-5iAriIutBhwyZVS7AG2fnkrHOI7pNAKfYv062Cy0WXw="; }; diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix index 82b43ddbb34d..a60f6fb64036 100644 --- a/pkgs/by-name/up/upcloud-cli/package.nix +++ b/pkgs/by-name/up/upcloud-cli/package.nix @@ -9,16 +9,16 @@ buildGo125Module (finalAttrs: { pname = "upcloud-cli"; - version = "3.27.0"; + version = "3.28.0"; src = fetchFromGitHub { owner = "UpCloudLtd"; repo = "upcloud-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-OAsSB12Q8kdi2tjOUzqtaI6Qt/wFYaAuuy7XHJ2IyrI="; + hash = "sha256-mQmQt2rZKUj+J7ZZEIjuOa6WEeP4VObcpZUREoIK0Bw="; }; - vendorHash = "sha256-dhqsioXUdEafeRsz3GwpsvKCyV6M45V0rDJutdHDo38="; + vendorHash = "sha256-3FD8mZKjR6pTAWeMCAlgHmBCJEStZCx8FsfHzrEbnI8="; ldflags = [ "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${finalAttrs.version}" diff --git a/pkgs/by-name/ur/urlfinder/package.nix b/pkgs/by-name/ur/urlfinder/package.nix index 567ba1f7b992..522e354a765e 100644 --- a/pkgs/by-name/ur/urlfinder/package.nix +++ b/pkgs/by-name/ur/urlfinder/package.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "projectdiscovery"; repo = "urlfinder"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-dtCXCRnI05822+a5Os+I+ZAmL/hC884PRCIPlEY3jok="; }; diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 81a0f478480f..0eaffccd05e7 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "usql"; - version = "0.20.5"; + version = "0.20.8"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; tag = "v${version}"; - hash = "sha256-rMjUT4YBSI16L7bxLIs8hs0A+yQwEX3ZWm1Yym5w2jE="; + hash = "sha256-oaimplnmNpr3nMGNmiXmE9L03SfifjfncI9ZPiJg6JI="; }; buildInputs = [ diff --git a/pkgs/by-name/uu/uutils-util-linux/package.nix b/pkgs/by-name/uu/uutils-util-linux/package.nix index 6a1c40e60413..126281d616d3 100644 --- a/pkgs/by-name/uu/uutils-util-linux/package.nix +++ b/pkgs/by-name/uu/uutils-util-linux/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "uutils-util-linux"; - version = "0.0.1-unstable-2026-01-08"; + version = "0.0.1-unstable-2026-01-15"; src = fetchFromGitHub { owner = "uutils"; repo = "util-linux"; - rev = "8f87ce4641e8040eba624ffa99b73f73f73ab373"; - hash = "sha256-9U1vJyBEvOeesZrttSZg7vMqXSUj4eq/xtB2gRovXiA="; + rev = "60c8f8b572109d8bef0210b17486de2a2d565a19"; + hash = "sha256-hebVBj/u8UQcOXFniY+FKVbT8kZgbmLWGClAX858GzI="; }; postPatch = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"cut"' '"${lib.getExe' coreutils "cut"}"' ''; - cargoHash = "sha256-k1wIiL1DUkk9+UJX+6mgNEW+0zGNHuUTPUk8zuQFo1s="; + cargoHash = "sha256-bgOnkNfVZuPB9Ku12wwjhryR/fjRkWK2cMhoRZMBMZ0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix index dbc64c8cdc8c..bca2dde18605 100644 --- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix +++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix @@ -9,12 +9,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20260112053243"; + version = "20260115051358"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-21Xk+0o4xUOHcLtXrioLy8cwZziKoXp7LCHS+Q60ZTI="; + hash = "sha256-KtYU16cpYkZ739+Y9ZqZkNa4Uv8WGvoY2flbf/cCZyA="; }; vendorHash = "sha256-9tXv+rDBowxDN9gH4zHCr4TRbic4kijco3Y6bojJKRk="; meta = { diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix index ea56b5cdaddc..b15c3271e71d 100644 --- a/pkgs/by-name/ve/velero/package.nix +++ b/pkgs/by-name/ve/velero/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "velero"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZVnYHBcnYOCBFJ9wyvMDrRIf3NyDV1Zqqf7e6JbA+go="; + hash = "sha256-cDOsLwSp7VtHeylgDGhotBn1VN2HzBEq1kZsx7wN2r8="; }; ldflags = [ @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-AuvJmHRAmxKduP6q7k81GapGbGLS4x7cwccSnZWvPwI="; + vendorHash = "sha256-1ikbyWXK3jL4I+FxiqOsvPvqk+/DIndc4myTajDxFko="; excludedPackages = [ "issue-template-gen" diff --git a/pkgs/by-name/ve/venera/git-hashes.json b/pkgs/by-name/ve/venera/git-hashes.json index 9123f1968eb0..87616e3a449d 100644 --- a/pkgs/by-name/ve/venera/git-hashes.json +++ b/pkgs/by-name/ve/venera/git-hashes.json @@ -10,6 +10,7 @@ "flutter_inappwebview_windows": "sha256-9ocNFgXXqP28VmuJVXc81MUSPjIkzngOyEInMSxgwCU=", "flutter_qjs": "sha256-Mp9swQ4JEIyIEBQGlR7i+37Jp2sFGwL0uGrSTwE/n88=", "flutter_saf": "sha256-zmRZ82aJPYX/N/lOUcOoT8UAHEDoUk0FTFSqB4gKR+U=", + "flutter_to_debian": "sha256-YapWHABZSRh33Do2jKaeOshFHe83Tq4dsGGdOiB7REg=", "lodepng_flutter": "sha256-fOOhjoo3dzNNZI04Ie7GHLTfVlD5X+5IONpg8+RlmsE=", "photo_view": "sha256-zRc/WCbVybWkF52KDZZXgvKA8bbXASI7Yj2RFzLhXUk=", "rhttp": "sha256-6AH7A+CJg60Vk0ph3cJwj29GkmJEezI/VuZvRqqmOYs=", diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix index 4c95134f34f3..159116d5b888 100644 --- a/pkgs/by-name/ve/venera/package.nix +++ b/pkgs/by-name/ve/venera/package.nix @@ -13,13 +13,13 @@ }: let - version = "1.5.3"; + version = "1.6.2"; src = fetchFromGitHub { owner = "venera-app"; repo = "venera"; tag = "v${version}"; - hash = "sha256-yjO7nQ3F+DLudjqXUp0N13lhBZSAKwAeKXRAKxPxDVQ="; + hash = "sha256-hqpWkYXWM/kZU2kVAP2ak2TDZt3m4j4809rGhX68dek="; }; in flutter335.buildFlutterApplication { diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json index d170ac3807a2..01201f23a85a 100644 --- a/pkgs/by-name/ve/venera/pubspec.lock.json +++ b/pkgs/by-name/ve/venera/pubspec.lock.json @@ -573,6 +573,16 @@ "source": "git", "version": "0.0.1" }, + "flutter_staggered_grid_view": { + "dependency": "direct main", + "description": { + "name": "flutter_staggered_grid_view", + "sha256": "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, "flutter_test": { "dependency": "direct dev", "description": "flutter", @@ -592,11 +602,12 @@ "flutter_to_debian": { "dependency": "direct dev", "description": { - "name": "flutter_to_debian", - "sha256": "d23534407334b331ce20fbaa8395b9ecc255d0c047136b8998715f36933ee696", - "url": "https://pub.dev" + "path": ".", + "ref": "HEAD", + "resolved-ref": "3777c91b6b1cc0b7c03357c67ca216d4313c3db5", + "url": "https://github.com/venera-app/flutter_to_debian.git" }, - "source": "hosted", + "source": "git", "version": "2.0.2" }, "flutter_web_plugins": { @@ -820,11 +831,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.16.0" + "version": "1.17.0" }, "mime": { "dependency": "direct main", @@ -1189,11 +1200,11 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00", + "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.6" + "version": "0.7.7" }, "typed_data": { "dependency": "transitive", @@ -1400,15 +1411,15 @@ "dependency": "direct main", "description": { "name": "zip_flutter", - "sha256": "c4d5a34c5803def866bc550926bb16fe89717c9b7304695d5b2ede30964eb8a8", + "sha256": "baecf8deb6bf53a50e5ab513707ab56cc0c25f5b43333aa56ef562e8e7057357", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.0.12" + "version": "0.0.13" } }, "sdks": { "dart": ">=3.8.0 <4.0.0", - "flutter": ">=3.35.5" + "flutter": ">=3.38.5" } } diff --git a/pkgs/by-name/ve/versitygw/package.nix b/pkgs/by-name/ve/versitygw/package.nix index e4fc52ea9841..948aeea2c79e 100644 --- a/pkgs/by-name/ve/versitygw/package.nix +++ b/pkgs/by-name/ve/versitygw/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "versitygw"; - version = "1.0.20"; + version = "1.1.0"; src = fetchFromGitHub { owner = "versity"; repo = "versitygw"; tag = "v${version}"; - hash = "sha256-uRYGcV1vXZS7tCuj4riBU4ROQQkYbTFSYYNJa0Dy1mA="; + hash = "sha256-mjtW5Jyx5hDGAony3ZPK8u4QgDdXbP+RCCTglUc7AR0="; }; - vendorHash = "sha256-tZUSxfy9wAFausFrEGRrgXZj8PHp6XeF10jPdD4zyDk="; + vendorHash = "sha256-3M2LOWEszQlfSvnIBN/mQ966qizOtUwa68ugTSvvw8U="; doCheck = false; # Require access to online S3 services diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix index 71b2e34346ab..13490914bf66 100644 --- a/pkgs/by-name/vf/vfox/package.nix +++ b/pkgs/by-name/vf/vfox/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "vfox"; - version = "0.10.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "version-fox"; repo = "vfox"; tag = "v${finalAttrs.version}"; - hash = "sha256-dA/boWkJrFgVV6NeSiCwDxRuBxtjn9qf8shpFwED6TA="; + hash = "sha256-iCHvrq1GoW1J6BnslhhFb7M9IE4DGtoXLRrZe2PzlAU="; }; - vendorHash = "sha256-+5hJMip3wAR1k6n21I3QFYe++nw4J4Ip+43EujQl2ec="; + vendorHash = "sha256-+swC2G8g0rrANsUM8jXad+38QX0yWIf+2boyAv7+hG8="; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/vi/viking/package.nix b/pkgs/by-name/vi/viking/package.nix index be02ff45ee77..e21d229c30f0 100644 --- a/pkgs/by-name/vi/viking/package.nix +++ b/pkgs/by-name/vi/viking/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, desktopToDarwinBundle, docbook_xml_dtd_45, docbook_xsl, @@ -11,11 +10,13 @@ libxslt, pkg-config, wrapGAppsHook3, + xxd, yelp-tools, curl, gdk-pixbuf, gtk3, json-glib, + libnova, libxml2, gpsbabel, withGeoClue ? true, @@ -34,25 +35,18 @@ liboauth, withRealtimeGPSTracking ? (!stdenv.hostPlatform.isDarwin), gpsd, + xz, }: stdenv.mkDerivation rec { pname = "viking"; - version = "1.10"; + version = "1.11"; src = fetchurl { url = "mirror://sourceforge/viking/viking-${version}.tar.bz2"; - sha256 = "sha256-lFXIlfmLwT3iS9ayNM0PHV7NwbBotMvG62ZE9hJuRaw="; + hash = "sha256-/iHVwRHvIId9HNlbGkvDT6rp3ToXuskj9BjhJxo8/JE="; }; - patches = [ - # Fix check_md5_hash.sh on macOS - (fetchpatch { - url = "https://github.com/viking-gps/viking/pull/184/commits/b0e110a3cfefea0f1874669525eb3a220dd29f9f.patch"; - hash = "sha256-HdkcZMV570SXOQMIZZAti2HT0gIdF/EwQCVXBaOwpqs="; - }) - ]; - nativeBuildInputs = [ docbook_xml_dtd_45 docbook_xsl @@ -61,6 +55,7 @@ stdenv.mkDerivation rec { libxslt pkg-config wrapGAppsHook3 + xxd yelp-tools ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; @@ -70,7 +65,9 @@ stdenv.mkDerivation rec { gdk-pixbuf gtk3 json-glib + libnova libxml2 + xz # liblzma ] ++ lib.optional withGeoClue geoclue2 ++ lib.optional withGeoTag gexiv2 @@ -92,8 +89,6 @@ stdenv.mkDerivation rec { (lib.enableFeature withRealtimeGPSTracking "realtime-gps-tracking") ]; - hardeningDisable = [ "format" ]; - doCheck = true; preFixup = '' diff --git a/pkgs/by-name/vm/vmmlib/package.nix b/pkgs/by-name/vm/vmmlib/package.nix index 26d6cc59b1ce..325e9d47e4f0 100644 --- a/pkgs/by-name/vm/vmmlib/package.nix +++ b/pkgs/by-name/vm/vmmlib/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Eyescale"; repo = "vmmlib"; - tag = "${version}"; + tag = version; hash = "sha256-QEfeQcE66XbsFTN/Fojgldem5C+RhbOBmRyBX3sfUrg="; fetchSubmodules = true; diff --git a/pkgs/by-name/wa/wayback-x11/package.nix b/pkgs/by-name/wa/wayback-x11/package.nix index 9c1fde197636..9ef293d241d1 100644 --- a/pkgs/by-name/wa/wayback-x11/package.nix +++ b/pkgs/by-name/wa/wayback-x11/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "wayback"; repo = "wayback"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-/H0+zOAdrejHMNRcc94Wjgc4/s/M1rUegPcX+pBQcrY="; }; diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix index 7f08b0e5b105..e44878f3465b 100644 --- a/pkgs/by-name/we/websurfx/package.nix +++ b/pkgs/by-name/we/websurfx/package.nix @@ -6,7 +6,7 @@ pkg-config, }: let - version = "1.24.27"; + version = "1.24.29"; in rustPlatform.buildRustPackage { pname = "websurfx"; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage { owner = "neon-mmd"; repo = "websurfx"; tag = "v${version}"; - hash = "sha256-+nd4CchLAC0QbXDCCCdeLUsTyQDXprLHkWDFSljzFLY="; + hash = "sha256-LBMPx/IRxqkdD3dwLwoFHqjnuMUApffaq3ccu4WA2v4="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { openssl ]; - cargoHash = "sha256-mkkBJBd17Ct0xpXGK1k+TZf5GqDIUW8EgFtokTDe8Vw="; + cargoHash = "sha256-oLeVLNJ69tX8cuUVbe6WfAnR2In08iSJLqIhz4/fG20="; postPatch = '' substituteInPlace src/handler.rs \ diff --git a/pkgs/by-name/wh/wheelwizard/package.nix b/pkgs/by-name/wh/wheelwizard/package.nix index 181f70603ec4..8b7a0b441a16 100644 --- a/pkgs/by-name/wh/wheelwizard/package.nix +++ b/pkgs/by-name/wh/wheelwizard/package.nix @@ -19,7 +19,7 @@ buildDotnetModule rec { src = fetchFromGitHub { owner = "TeamWheelWizard"; repo = "WheelWizard"; - tag = "${version}"; + tag = version; hash = "sha256-DuEI6bmvNP6wRuZX9Do0FGDsu80ldy0SCefBk6gqT9s="; }; postPatch = '' diff --git a/pkgs/by-name/wh/whitesur-icon-theme/package.nix b/pkgs/by-name/wh/whitesur-icon-theme/package.nix index f6c711b8cdc9..e3d56ce1e413 100644 --- a/pkgs/by-name/wh/whitesur-icon-theme/package.nix +++ b/pkgs/by-name/wh/whitesur-icon-theme/package.nix @@ -36,7 +36,7 @@ lib.checkListOfEnum "${pname}: theme variants" src = fetchFromGitHub { owner = "vinceliuice"; repo = "WhiteSur-icon-theme"; - tag = "${version}"; + tag = version; hash = "sha256-oBKDvCVHEjN6JT0r0G+VndzijEWU9L8AvDhHQTmw2E4="; }; diff --git a/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix index ce4242c7a1b9..3915bed5ebc9 100644 --- a/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix +++ b/pkgs/by-name/wi/wine-discord-ipc-bridge/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "0e4ef622"; repo = "wine-discord-ipc-bridge"; - rev = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-jzsbOKMakNQ6RNMlioX088fGzFBDxOP45Atlsfm2RKg="; }; diff --git a/pkgs/by-name/wi/witr/package.nix b/pkgs/by-name/wi/witr/package.nix index d6acbbcf4b66..d60643b00c32 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.2.0"; + version = "0.2.5"; src = fetchFromGitHub { owner = "pranshuparmar"; repo = "witr"; tag = "v${finalAttrs.version}"; - hash = "sha256-gxfoqa7Q1kb9sIN3zwxmjAHQeWdoGNg0yxc5j8unp5g="; + hash = "sha256-2Du3Z6p/IqrP7uqB1fz0d0prCX02+Iw59wikviV7z84="; # 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/by-name/wl/wlc/package.nix b/pkgs/by-name/wl/wlc/package.nix index d83c1863dbb8..06866b932ae9 100644 --- a/pkgs/by-name/wl/wlc/package.nix +++ b/pkgs/by-name/wl/wlc/package.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonPackage rec { pname = "wlc"; - version = "1.16.1"; + version = "1.17.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gTVt5cxz8tk63mnTZAtzcYdy4m0NVR0y6xjmVICw7pg="; + hash = "sha256-FtxJ1clfvJCggg4h9Lzwq4S4KyejJxppjrB3i7Jiy/Y="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/wo/wox/package.nix b/pkgs/by-name/wo/wox/package.nix index 9ce3e2e12037..f925c1685956 100644 --- a/pkgs/by-name/wo/wox/package.nix +++ b/pkgs/by-name/wo/wox/package.nix @@ -24,13 +24,13 @@ }: let - version = "2.0.0-beta.7"; + version = "2.0.0-beta.8"; src = fetchFromGitHub { owner = "Wox-launcher"; repo = "Wox"; tag = "v${version}"; - hash = "sha256-uKnuzuR+Qd5yP45kPJELBz8v+LrZEMIHl9I07nNPZpE="; + hash = "sha256-eucyQKNuzJCLwAnyQVE/64gth+uVrCgyHLAJNfrUxvk="; }; metaCommon = { @@ -79,7 +79,7 @@ let ; pnpm = pnpm_9; fetcherVersion = 2; - hash = "sha256-BO3QsybMxbyBhwM6XVmS6s5jGJljyxE1PRUSAreE17Y="; + hash = "sha256-8EovIVJ+uAo9XJIIgRrpkQrcmNkKC2Ruja2md7NFZ4A="; }; buildPhase = '' diff --git a/pkgs/by-name/wo/wox/pubspec.lock.json b/pkgs/by-name/wo/wox/pubspec.lock.json index ea0a04be8f10..8ceb11cbce9c 100644 --- a/pkgs/by-name/wo/wox/pubspec.lock.json +++ b/pkgs/by-name/wo/wox/pubspec.lock.json @@ -114,21 +114,21 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.4+2" + "version": "0.3.5+1" }, "crypto": { "dependency": "transitive", "description": { "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.6" + "version": "3.0.7" }, "dbus": { "dependency": "transitive", @@ -264,11 +264,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "7872545770c277236fd32b022767576c562ba28366204ff1a5628853cf8f2200", + "sha256": "d974b6ba2606371ac71dd94254beefb6fa81185bde0b59bdc1df09885da85fde", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.3.7" + "version": "10.3.8" }, "fixnum": { "dependency": "transitive", @@ -300,11 +300,11 @@ "dependency": "direct main", "description": { "name": "flutter_code_editor", - "sha256": "52da5d30f14b58ebd49a7ffa9f281430899b8bd02c12bf63a68756206470d99e", + "sha256": "9af48ba8e3558b6ea4bb98b84c5eb1649702acf53e61a84d88383eeb79b239b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.4" + "version": "0.3.5" }, "flutter_highlight": { "dependency": "direct main", @@ -336,25 +336,35 @@ "source": "hosted", "version": "6.0.0" }, + "flutter_math_fork": { + "dependency": "transitive", + "description": { + "name": "flutter_math_fork", + "sha256": "6d5f2f1aa57ae539ffb0a04bb39d2da67af74601d685a161aff7ce5bda5fa407", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.4" + }, "flutter_plugin_android_lifecycle": { "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31", + "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.30" + "version": "2.0.33" }, "flutter_svg": { "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678", + "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.3" }, "flutter_test": { "dependency": "direct dev", @@ -382,11 +392,21 @@ "dependency": "direct main", "description": { "name": "get", - "sha256": "c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425", + "sha256": "5ed34a7925b85336e15d472cc4cfe7d9ebf4ab8e8b9f688585bf6b50f4c3d79a", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.7.2" + "version": "4.7.3" + }, + "gpt_markdown": { + "dependency": "direct main", + "description": { + "name": "gpt_markdown", + "sha256": "9b88dfaffea644070b648c204ca4a55745a49f4ad0b58ed0ab70913ad593c7a1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.5" }, "highlight": { "dependency": "direct main", @@ -462,11 +482,11 @@ "dependency": "transitive", "description": { "name": "http", - "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.5.0" + "version": "1.6.0" }, "http_parser": { "dependency": "transitive", @@ -552,21 +572,21 @@ "dependency": "direct main", "description": { "name": "logger", - "sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c", + "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.6.1" + "version": "2.6.2" }, "lottie": { "dependency": "direct main", "description": { "name": "lottie", - "sha256": "c5fa04a80a620066c15cf19cc44773e19e9b38e989ff23ea32e5903ef1015950", + "sha256": "8ae0be46dbd9e19641791dc12ee480d34e1fd3f84c749adc05f3ad9342b71b95", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.3.1" + "version": "3.3.2" }, "lpinyin": { "dependency": "direct main", @@ -588,26 +608,6 @@ "source": "hosted", "version": "1.9.0" }, - "markdown": { - "dependency": "transitive", - "description": { - "name": "markdown", - "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.3.0" - }, - "markdown_widget": { - "dependency": "direct main", - "description": { - "name": "markdown_widget", - "sha256": "b52c13d3ee4d0e60c812e15b0593f142a3b8a2003cde1babb271d001a1dbdc1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2+8" - }, "matcher": { "dependency": "transitive", "description": { @@ -629,14 +629,14 @@ "version": "0.11.1" }, "math_expressions": { - "dependency": "direct overridden", + "dependency": "direct main", "description": { "name": "math_expressions", - "sha256": "218dc65bed4726562bb31c53d8daa3cc824664b26fb72d77bc592757edf74ba0", + "sha256": "2e1ceb974c2b1893c809a68c7005f1b63f7324db0add800a0e792b1ac8ff9f03", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.7.0" + "version": "3.1.0" }, "meta": { "dependency": "transitive", @@ -668,6 +668,16 @@ "source": "hosted", "version": "1.0.4" }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, "path": { "dependency": "direct main", "description": { @@ -702,21 +712,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db", + "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.18" + "version": "2.2.22" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd", + "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.5.1" }, "path_provider_linux": { "dependency": "transitive", @@ -752,11 +762,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.1.0" + "version": "7.0.1" }, "platform": { "dependency": "transitive", @@ -848,15 +858,15 @@ "source": "hosted", "version": "0.2.0" }, - "scroll_to_index": { + "provider": { "dependency": "transitive", "description": { - "name": "scroll_to_index", - "sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176", + "name": "provider", + "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.1" + "version": "6.1.5+1" }, "scrollable_positioned_list": { "dependency": "transitive", @@ -884,16 +894,6 @@ "source": "hosted", "version": "1.10.1" }, - "sprintf": { - "dependency": "transitive", - "description": { - "name": "sprintf", - "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, "stack_trace": { "dependency": "transitive", "description": { @@ -1088,41 +1088,41 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e", + "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.20" + "version": "6.3.28" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7", + "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.4" + "version": "6.3.6" }, "url_launcher_linux": { "dependency": "transitive", "description": { "name": "url_launcher_linux", - "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.2.2" }, "url_launcher_macos": { "dependency": "transitive", "description": { "name": "url_launcher_macos", - "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.3" + "version": "3.2.5" }, "url_launcher_platform_interface": { "dependency": "transitive", @@ -1148,21 +1148,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_windows", - "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.4" + "version": "3.1.5" }, "uuid": { "dependency": "direct main", "description": { "name": "uuid", - "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.1" + "version": "4.5.2" }, "vector_graphics": { "dependency": "transitive", @@ -1204,25 +1204,15 @@ "source": "hosted", "version": "2.2.0" }, - "visibility_detector": { - "dependency": "transitive", - "description": { - "name": "visibility_detector", - "sha256": "dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.0+2" - }, "vm_service": { "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.0" + "version": "15.0.2" }, "web": { "dependency": "transitive", @@ -1258,11 +1248,11 @@ "dependency": "transitive", "description": { "name": "win32", - "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.14.0" + "version": "5.15.0" }, "win32_registry": { "dependency": "transitive", @@ -1288,15 +1278,15 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.5.0" + "version": "6.6.1" } }, "sdks": { - "dart": ">=3.8.0 <4.0.0", + "dart": ">=3.9.0 <4.0.0", "flutter": ">=3.35.1" } } diff --git a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix index a21832dc6e66..698b32ed0576 100644 --- a/pkgs/by-name/wy/wyoming-faster-whisper/package.nix +++ b/pkgs/by-name/wy/wyoming-faster-whisper/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-faster-whisper"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-MKB6gZdGdAYoNK8SRiDHG8xtMZ5mXdaSn+bH4T6o/K4="; }; diff --git a/pkgs/by-name/wy/wyoming-openwakeword/package.nix b/pkgs/by-name/wy/wyoming-openwakeword/package.nix index 5fd3feaf9e40..05e13f63740f 100644 --- a/pkgs/by-name/wy/wyoming-openwakeword/package.nix +++ b/pkgs/by-name/wy/wyoming-openwakeword/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "rhasspy"; repo = "wyoming-openwakeword"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-yYDZ1wOhCTdYGeRmtbOgx5/zkF0Baxmha7eO/i0p49g="; }; diff --git a/pkgs/by-name/xa/xavs2/package.nix b/pkgs/by-name/xa/xavs2/package.nix index 561b1b0bd237..222a44e73301 100644 --- a/pkgs/by-name/xa/xavs2/package.nix +++ b/pkgs/by-name/xa/xavs2/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "pkuvcl"; repo = "xavs2"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-4w/WTXvRQbohKL+YALQCCYglHQKVvehlUYfitX/lLPw="; }; diff --git a/pkgs/by-name/xf/xfitter/package.nix b/pkgs/by-name/xf/xfitter/package.nix index 8b062b28e657..c867258bbaee 100644 --- a/pkgs/by-name/xf/xfitter/package.nix +++ b/pkgs/by-name/xf/xfitter/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { src = fetchFromGitLab { owner = "fitters"; repo = "xfitter"; - rev = "refs/tags/2.2.0_Future_Freeze"; + tag = "2.2.0_Future_Freeze"; domain = "gitlab.cern.ch"; hash = "sha256-wanxgldvBEuAEOeVok3XgRVStcn9APd+Nj7vpRZUtGs="; }; diff --git a/pkgs/by-name/xl/xlogo/package.nix b/pkgs/by-name/xl/xlogo/package.nix index 4ecc87e9b3a0..ea6d02a00263 100644 --- a/pkgs/by-name/xl/xlogo/package.nix +++ b/pkgs/by-name/xl/xlogo/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { group = "xorg"; owner = "app"; repo = "xlogo"; - rev = "refs/tags/xlogo-${version}"; + tag = "xlogo-${version}"; hash = "sha256-KjJhuiFVn34vEZbC7ds4MrcXCHq9PcIpAuaCGBX/EXc="; }; diff --git a/pkgs/by-name/xr/xr-hardware/package.nix b/pkgs/by-name/xr/xr-hardware/package.nix index e6ea0a99027c..2f85fc3bc39a 100644 --- a/pkgs/by-name/xr/xr-hardware/package.nix +++ b/pkgs/by-name/xr/xr-hardware/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { domain = "gitlab.freedesktop.org"; owner = "monado/utilities"; repo = "xr-hardware"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-w35/LoozCJz0ytHEHWsEdCaYYwyGU6sE13iMckVdOzY="; }; diff --git a/pkgs/by-name/ya/yaookctl/package.nix b/pkgs/by-name/ya/yaookctl/package.nix index 880f72a1dbfa..36e59b6fbd88 100644 --- a/pkgs/by-name/ya/yaookctl/package.nix +++ b/pkgs/by-name/ya/yaookctl/package.nix @@ -6,13 +6,13 @@ }: python3.pkgs.buildPythonApplication { pname = "yaookctl"; - version = "0-unstable-2025-12-12"; + version = "0-unstable-2026-01-13"; src = fetchFromGitLab { owner = "yaook"; repo = "yaookctl"; - rev = "94215db203cd8e471616d557cd83d71f0bc9918d"; - hash = "sha256-rAd69fJQSqo6Xe0yL4CmPn0/HmygWkojwBXPEOAY1dE="; + rev = "97ff5ceb948c6e61ef5fe288d84fca8b60e1c984"; + hash = "sha256-+pWfm39WRybN9ldTf9Emm120NwvGQhtX0nU1CVZSot0="; }; pyproject = true; diff --git a/pkgs/by-name/yg/yggdrasil-jumper/package.nix b/pkgs/by-name/yg/yggdrasil-jumper/package.nix index 06e8248be921..2b714b184c92 100644 --- a/pkgs/by-name/yg/yggdrasil-jumper/package.nix +++ b/pkgs/by-name/yg/yggdrasil-jumper/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "one-d-wide"; repo = "yggdrasil-jumper"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-dElC+q76dE3SlVY4+aauNmeqcNdfj0mMjg51WRuywJI="; }; diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix index b8e890f3115b..742106fc41b0 100644 --- a/pkgs/by-name/ze/zensical/package.nix +++ b/pkgs/by-name/ze/zensical/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "zensical"; - version = "0.0.15"; + version = "0.0.16"; pyproject = true; # We fetch from PyPi, because GitHub repo does not contain all sources. @@ -16,12 +16,12 @@ python3Packages.buildPythonApplication rec { # We could combine sources, but then nix-update won't work. src = fetchPypi { inherit pname version; - hash = "sha256-syAMkbMDcGccULi0qkHCDlX/KBS5AD7iPJtvkjoMGb4="; + hash = "sha256-C3WduiRUGXvb8bEz3E6mToIC5nVwNqbrqtfkXsCgnbg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Sg4gl23aK6yPZ3Hdi+IzTGnx8wEAkSL0SrKGVdMRJ2s="; + hash = "sha256-ksFmYf9Yu+xlQw3tSa1mwdWlOhyK4hqtEZq4dULL4Fs="; }; nativeBuildInputs = with rustPlatform; [ @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec { use, with powerful customization options. ''; homepage = "https://zensical.org"; - changelog = "https://github.com/zensical/zensical/releases/tag/${version}"; + changelog = "https://github.com/zensical/zensical/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ aljazerzen ]; mainProgram = "zensical"; diff --git a/pkgs/by-name/zl/zlcompressor/package.nix b/pkgs/by-name/zl/zlcompressor/package.nix index 27d13226efc9..2ed0c224ed06 100644 --- a/pkgs/by-name/zl/zlcompressor/package.nix +++ b/pkgs/by-name/zl/zlcompressor/package.nix @@ -34,7 +34,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ZL-Audio"; repo = "ZLCompressor"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-G7tgRenRB6aYpi+BSiQzwSsekvCw4JPUuy1iXVj7HN0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/zl/zlequalizer/package.nix b/pkgs/by-name/zl/zlequalizer/package.nix index c5b40446ea20..fd7ef5e529f1 100644 --- a/pkgs/by-name/zl/zlequalizer/package.nix +++ b/pkgs/by-name/zl/zlequalizer/package.nix @@ -34,7 +34,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ZL-Audio"; repo = "ZLEqualizer"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-ix3UcTs9CEJ2TCJLdpvZOaoB0wgNDrvSQhZzer8yMRw="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/zl/zlsplitter/package.nix b/pkgs/by-name/zl/zlsplitter/package.nix index 31d1be13f68a..64fa5d3e0aa0 100644 --- a/pkgs/by-name/zl/zlsplitter/package.nix +++ b/pkgs/by-name/zl/zlsplitter/package.nix @@ -34,7 +34,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ZL-Audio"; repo = "ZLSplitter"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-6ICXL1jX6MMYf5VasTW9osJ2BNb6jqWfeAtmmEp6L/4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/zm/zmqpp/package.nix b/pkgs/by-name/zm/zmqpp/package.nix index 171872f3ed8c..20b18b7922f9 100644 --- a/pkgs/by-name/zm/zmqpp/package.nix +++ b/pkgs/by-name/zm/zmqpp/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "zeromq"; repo = "zmqpp"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-UZyJpBEOf/Ys+i2tiBTjv4PlM5fHjjNLWuGhpgcmYyM="; }; diff --git a/pkgs/by-name/zu/zulip-term/package.nix b/pkgs/by-name/zu/zulip-term/package.nix index 91dd61297ad7..074b6df06f96 100644 --- a/pkgs/by-name/zu/zulip-term/package.nix +++ b/pkgs/by-name/zu/zulip-term/package.nix @@ -17,7 +17,7 @@ let src = fetchFromGitHub { owner = "urwid"; repo = "urwid"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-oPb2h/+gaqkZTXIiESjExMfBNnOzDvoMkXvkZ/+KVwo="; }; doCheck = false; diff --git a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix index 2e02c75ab969..994a1702b95d 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-mediaplayer-app/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-mediaplayer-app"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-A1tAXQXDwVZ3ILFcJKCtbOm1iNxPFOXQIS6p7fPbqwM="; }; diff --git a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix index df754042206c..809cceec9006 100644 --- a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix +++ b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "ubports"; repo = "development/core/qqc2-suru-style"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-kAgHsNWwUWxHg26bTMmlq8m9DR4+ob4pl/oUX7516hM="; }; diff --git a/pkgs/development/compilers/corretto/25.nix b/pkgs/development/compilers/corretto/25.nix new file mode 100644 index 000000000000..1b9b5bdf5761 --- /dev/null +++ b/pkgs/development/compilers/corretto/25.nix @@ -0,0 +1,41 @@ +{ + fetchFromGitHub, + gradle_9, + jdk25, + lib, + stdenv, + rsync, + pandoc, + runCommand, + testers, +}: + +let + corretto = import ./mk-corretto.nix rec { + inherit + lib + stdenv + rsync + runCommand + testers + ; + jdk = jdk25; + gradle = gradle_9; + version = "25.0.1.9.1"; + src = fetchFromGitHub { + owner = "corretto"; + repo = "corretto-25"; + rev = version; + hash = "sha256-eAjepqxp5LVQgP/HcxwwdjbXxy5jUOJC4HYntcHNX0o="; + }; + extraNativeBuildInputs = [ pandoc ]; + }; +in +corretto.overrideAttrs ( + final: prev: { + patches = (prev.patches or [ ]) ++ [ + # See patches in openjdk/generic.nix. + ./remove_removal_of_wformat_during_test_compilation.patch + ]; + } +) diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index 9fdc03d3059e..df9282fb7abc 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -6,6 +6,7 @@ stdenv, gradle, extraConfig ? [ ], + extraNativeBuildInputs ? [ ], rsync, runCommand, testers, @@ -29,11 +30,14 @@ jdk.overrideAttrs ( finalAttrs: oldAttrs: { inherit pname version src; - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ - jdk - gradle - rsync - ]; + nativeBuildInputs = + oldAttrs.nativeBuildInputs + ++ [ + jdk + gradle + rsync + ] + ++ extraNativeBuildInputs; dontConfigure = true; @@ -41,11 +45,25 @@ jdk.overrideAttrs ( let extra_config = builtins.concatStringsSep " " extraConfig; in - '' + (oldAttrs.postPatch or "") + + '' # The rpm/deb task definitions require a Gradle plugin which we don't - # have and so the build fails. We'll simply remove them here because - # they are not needed anyways. - rm -rf installers/linux/universal/{rpm,deb} + # have and so the build fails. We'll simply empty them here because + # they are not needed anyways. The directories are kept because Gradle + # still expects them. + rm -rf installers/linux/universal/{rpm,deb}/{*,.*} + + # These fixes are necessary as long as we use Gradle 9 to build + # Corretto but upstream is not yet using it. I.e. as long as upstream + # hasn't fixed compatibility with Gradle 9 issues. + find /build/source/installers -type d -exec cp /build/source/version.txt {}/version.txt \; + find /build/source/installers -name 'build.gradle' -exec sed -i '/fileMode =/d' {} \; + for d in source pre-build; do + # These subprojects (see settings.gradle) don't exist. Create them + # here so that Gradle doesn't complain. + mkdir /build/source/$d + cp /build/source/version.txt /build/source/$d/version.txt + done # `/usr/bin/rsync` is invoked to copy the source tree. We don't have that. for file in $(find installers -name "build.gradle"); do @@ -74,6 +92,7 @@ jdk.overrideAttrs ( file=$(find ./installers -name 'amazon-corretto-${version}*.tar.gz') tar -xzf $file -C $dir mv $dir/amazon-corretto-* $dir/jdk + chmod +x $dir/jdk/bin/* '' + oldAttrs.postBuild or ""; diff --git a/pkgs/development/compilers/corretto/remove_removal_of_wformat_during_test_compilation.patch b/pkgs/development/compilers/corretto/remove_removal_of_wformat_during_test_compilation.patch new file mode 100644 index 000000000000..077fb2330e96 --- /dev/null +++ b/pkgs/development/compilers/corretto/remove_removal_of_wformat_during_test_compilation.patch @@ -0,0 +1,13 @@ +diff --git a/make/common/TestFilesCompilation.gmk b/make/common/TestFilesCompilation.gmk +index fd1c54eaf..c1e240a19 100644 +--- a/make/common/TestFilesCompilation.gmk ++++ b/make/common/TestFilesCompilation.gmk +@@ -112,7 +112,7 @@ define SetupTestFilesCompilationBody + CXXFLAGS := $$(TEST_CFLAGS) $$($1_CFLAGS) $$($1_CFLAGS_$$(name)), \ + LD_SET_ORIGIN := $$($1_LD_SET_ORIGIN), \ + LDFLAGS := $$($1_LDFLAGS) $$($1_LDFLAGS_$$(name)), \ +- DISABLED_WARNINGS_gcc := format undef unused-but-set-variable \ ++ DISABLED_WARNINGS_gcc := undef unused-but-set-variable \ + unused-const-variable unused-function unused-value \ + unused-variable, \ + DISABLED_WARNINGS_clang := format-nonliteral \ diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index 8a9057ce8aff..9851edf92549 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall + rm LICENSE cp -R . $out '' + lib.optionalString (stdenv.hostPlatform.isLinux) '' diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix index 1e7ba16b09a2..11fda70b6be6 100644 --- a/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -6,6 +6,7 @@ flutter_secure_storage_linux = callPackage ./flutter-secure-storage-linux { }; flutter_vodozemac = callPackage ./flutter_vodozemac { }; flutter_volume_controller = callPackage ./flutter_volume_controller { }; + fvp = callPackage ./fvp { }; handy_window = callPackage ./handy-window { }; hotkey_manager_linux = callPackage ./hotkey_manager_linux { }; matrix = callPackage ./matrix { }; diff --git a/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix b/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix new file mode 100644 index 000000000000..4c5c13d12f11 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/fvp/default.nix @@ -0,0 +1,26 @@ +{ + stdenv, + mdk-sdk, +}: + +{ version, src, ... }: + +stdenv.mkDerivation rec { + pname = "fvp"; + inherit version src; + inherit (src) passthru; + + postPatch = '' + sed -i 's|.*libc++.so.1.*|${mdk-sdk}/lib/libc++.so.1|' ./linux/CMakeLists.txt + substituteInPlace ./linux/CMakeLists.txt \ + --replace-fail "fvp_setup_deps()" "include(${mdk-sdk}/lib/cmake/FindMDK.cmake)" + ''; + + installPhase = '' + runHook preInstall + + cp -r . $out + + runHook postInstall + ''; +} diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 9e1f248e61cd..1519f5562271 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -100,71 +100,77 @@ let # combine an SDK with the runtime/packages from a base SDK combineSdk = - base: overlay: - if (overlay.runtime.version != base.runtime.version) then - throw "combineSdk: unable to combine ${overlay.name} with ${base.name} because runtime versions don't match (${overlay.runtime.version} != ${base.runtime.version})" + base: fallback: + if (fallback.runtime.version != base.runtime.version) then + throw "combineSdk: unable to combine ${fallback.name} with ${base.name} because runtime versions don't match (${fallback.runtime.version} != ${base.runtime.version})" + else if base.meta.broken then + fallback else - pkgs.callPackage ./wrapper.nix { } "sdk" ( - (pkgs.combinePackages [ - base.runtime - base.aspnetcore - (overlay.overrideAttrs (old: { - passthru = old.passthru // { - inherit (base) - packages - targetPackages - ; - }; - })) - ]).unwrapped.overrideAttrs - (old: { - name = overlay.unwrapped.name; - # resolve symlinks so DOTNET_ROOT is self-contained - postBuild = '' - mv "$out"/share/dotnet{,~} - cp -Lr "$out"/share/dotnet{~,} - rm -r "$out"/share/dotnet~ - '' - + old.postBuild; - passthru = - old.passthru - // ( - let - # if only overlay has a working ILCompiler, use it - hostRid = pkgs.systemToDotnetRid base.stdenv.hostPlatform.system; - hasILCompiler = base.hasILCompiler || overlay.hasILCompiler; - packageName = "runtime.${hostRid}.Microsoft.DotNet.ILCompiler"; - packages = - if !base.hasILCompiler && overlay.hasILCompiler then - lib.filter (x: x.pname != packageName) base.packages - ++ lib.filter (x: x.pname == packageName) overlay.packages - else - base.packages; - in - { - inherit hasILCompiler packages; + let + withBaseRuntimes = + if fallback.version == base.version then + base.unwrapped + else + (pkgs.combinePackages [ + base.runtime + base.aspnetcore + fallback + ]).unwrapped.overrideAttrs + (old: { + name = fallback.unwrapped.name; + # resolve symlinks so DOTNET_ROOT is self-contained + postBuild = '' + mv "$out"/share/dotnet{,~} + cp -Lr "$out"/share/dotnet{~,} + rm -r "$out"/share/dotnet~ + '' + + old.postBuild; + passthru = old.passthru // { inherit (base) - targetPackages runtime aspnetcore ; - inherit (overlay.unwrapped) + inherit (fallback.unwrapped) pname version ; - } - ); - }) - ); + }; + }); + + withFallbackPackages = withBaseRuntimes.overrideAttrs (old: { + passthru = + old.passthru + // ( + let + hostRid = pkgs.systemToDotnetRid base.stdenv.hostPlatform.system; + hasILCompiler = base.hasILCompiler || fallback.hasILCompiler; + packageName = "runtime.${hostRid}.Microsoft.DotNet.ILCompiler"; + mergePackages = + a: b: + let + names = lib.genAttrs' a (p: lib.nameValuePair p.pname null); + in + a ++ lib.filter (p: !lib.hasAttr p.pname names) b; + packages = mergePackages base.packages fallback.packages; + targetPackages = lib.mapAttrs ( + name: value: mergePackages value fallback.targetPackages.${name} + ) base.targetPackages; + in + { + inherit hasILCompiler packages targetPackages; + } + ); + }); + in + pkgs.callPackage ./wrapper.nix { } "sdk" withFallbackPackages; in pkgs // rec { # use binary SDK here to avoid downgrading feature band - sdk_8_0_1xx = if !pkgs.dotnet_8.vmr.meta.broken then pkgs.dotnet_8.sdk else pkgs.sdk_8_0_1xx-bin; - sdk_9_0_1xx = if !pkgs.dotnet_9.vmr.meta.broken then pkgs.dotnet_9.sdk else pkgs.sdk_9_0_1xx-bin; - sdk_10_0_1xx = - if !pkgs.dotnet_10.vmr.meta.broken then pkgs.dotnet_10.sdk else pkgs.sdk_10_0_1xx-bin; + sdk_8_0_1xx = combineSdk pkgs.dotnet_8.sdk pkgs.sdk_8_0_1xx-bin; + sdk_9_0_1xx = combineSdk pkgs.dotnet_9.sdk pkgs.sdk_9_0_1xx-bin; + sdk_10_0_1xx = combineSdk pkgs.dotnet_10.sdk pkgs.sdk_10_0_1xx-bin; # source-built SDK only exists for _1xx feature band # https://github.com/dotnet/source-build/issues/3667 sdk_8_0_4xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_4xx-bin; @@ -172,9 +178,10 @@ pkgs sdk_8_0 = sdk_8_0_4xx; sdk_9_0 = sdk_9_0_3xx; sdk_10_0 = sdk_10_0_1xx; - sdk_8_0-source = sdk_8_0_1xx; - sdk_9_0-source = sdk_9_0_1xx; - sdk_10_0-source = sdk_10_0_1xx; + sdk_8_0-source = if !pkgs.dotnet_8.vmr.meta.broken then pkgs.dotnet_8.sdk else pkgs.sdk_8_0_1xx-bin; + sdk_9_0-source = if !pkgs.dotnet_9.vmr.meta.broken then pkgs.dotnet_9.sdk else pkgs.sdk_9_0_1xx-bin; + sdk_10_0-source = + if !pkgs.dotnet_10.vmr.meta.broken then pkgs.dotnet_10.sdk else pkgs.sdk_10_0_1xx-bin; runtime_8_0 = sdk_8_0.runtime; runtime_9_0 = sdk_9_0.runtime; runtime_10_0 = sdk_10_0.runtime; diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index ea526b2212a5..6be556fe204c 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -94,8 +94,10 @@ let (mkPackage "Microsoft.DotNet.ILCompiler" runtime.version) (mkPackage "Microsoft.NET.ILLink.Tasks" runtime.version) (mkPackage "Microsoft.NETCore.App.Crossgen2.${hostRid}" runtime.version) - (mkPackage "runtime.${hostRid}.Microsoft.DotNet.ILCompiler" runtime.version) ] + ++ lib.optional vmr.hasILCompiler ( + mkPackage "runtime.${hostRid}.Microsoft.DotNet.ILCompiler" runtime.version + ) ++ lib.optionals (lib.versionOlder runtime.version "9") [ (mkPackage "Microsoft.NETCore.DotNetHost" runtime.version) (mkPackage "Microsoft.NETCore.DotNetHostPolicy" runtime.version) @@ -114,6 +116,9 @@ let (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHost" runtime.version) (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostPolicy" runtime.version) (mkPackage "runtime.${targetRid}.Microsoft.NETCore.DotNetHostResolver" runtime.version) + ] + ++ lib.optionals (lib.versionAtLeast runtime.version "10") [ + (mkPackage "Microsoft.NETCore.App.Runtime.NativeAOT.${targetRid}" runtime.version) ]; }; diff --git a/pkgs/development/compilers/dotnet/update.sh b/pkgs/development/compilers/dotnet/update.sh index 132ea56874bc..2be0a8843ba9 100755 --- a/pkgs/development/compilers/dotnet/update.sh +++ b/pkgs/development/compilers/dotnet/update.sh @@ -128,6 +128,12 @@ aspnetcore_packages () { Microsoft.AspNetCore.App.Ref ) + if versionAtLeast "$version" 10; then + pkgs+=( + Microsoft.AspNetCore.App.Internal.Assets + ) + fi + generate_package_list "$version" ' ' "${pkgs[@]}" } diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/versions/10.0.nix index b5afc79b4c03..ab60243c61b8 100644 --- a/pkgs/development/compilers/dotnet/versions/10.0.nix +++ b/pkgs/development/compilers/dotnet/versions/10.0.nix @@ -14,6 +14,11 @@ let version = "10.0.2"; hash = "sha512-MeDkxsB9ir694B2z0nIG7ZZ6DISLmbU7aOwCusO6AadYjitxjv+e9TuY1Y0ijwuYNjxukBIj45nF/fCEg6CGHw=="; }) + (fetchNupkg { + pname = "Microsoft.AspNetCore.App.Internal.Assets"; + version = "10.0.2"; + hash = "sha512-v9Au9ZSo3ZOe77StttCPCtOZkY7xSFXSyyWMR9Y0Kx3ZKegVp4zg7TJwz4osTgQp7EKyXlbDpvjUbgly51XbmA=="; + }) (fetchNupkg { pname = "Microsoft.NETCore.DotNetAppHost"; version = "10.0.2"; diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index f1c4259bf1c2..841ef03c311c 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -384,7 +384,9 @@ stdenv.mkDerivation { # https://github.com/NixOS/nixpkgs/issues/38991 # bash: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8) - LOCALE_ARCHIVE = lib.optionalString isLinux "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString ( + isLinux && glibcLocales != null + ) "${glibcLocales}/lib/locale/locale-archive"; # clang: error: argument unused during compilation: '-Wa,--compress-debug-sections' [-Werror,-Wunused-command-line-argument] # caused by separateDebugInfo diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index e4cf6e158f71..1e66c4dbd0de 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -33,6 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { license maintainers platforms + broken ; }; diff --git a/pkgs/development/compilers/flutter/versions/3_38/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json index a398341749e3..1767260d8c3c 100644 --- a/pkgs/development/compilers/flutter/versions/3_38/data.json +++ b/pkgs/development/compilers/flutter/versions/3_38/data.json @@ -1,73 +1,73 @@ { - "version": "3.38.5", - "engineVersion": "1527ae0ec577a4ef50e65f6fefcfc1326707d9bf", + "version": "3.38.7", + "engineVersion": "78fc3012e45889657f72359b005af7beac47ba3d", "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=", "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416", "channel": "stable", "engineHashes": { "aarch64-linux": { - "aarch64-linux": "sha256-7eYbNWoKY9JYMAAJ+5cYPXnn15Mvahm6OeL0QVlhtXs=", - "x86_64-linux": "sha256-7eYbNWoKY9JYMAAJ+5cYPXnn15Mvahm6OeL0QVlhtXs=" + "aarch64-linux": "sha256-bsC6dzVGf9JsfwGjn7FRC4EqjgBl6VDzpHDlgDTTZuI=", + "x86_64-linux": "sha256-bsC6dzVGf9JsfwGjn7FRC4EqjgBl6VDzpHDlgDTTZuI=" }, "x86_64-linux": { - "aarch64-linux": "sha256-qrOzazP0ZrrzBpkt5dDJIFrHDvoLYcXOR6BqKxgr+h8=", - "x86_64-linux": "sha256-qrOzazP0ZrrzBpkt5dDJIFrHDvoLYcXOR6BqKxgr+h8=" + "aarch64-linux": "sha256-Bl3xaFAWNj93Vxz6lM1g7mkU30eK9X+5aiO/Wj5wj5A=", + "x86_64-linux": "sha256-Bl3xaFAWNj93Vxz6lM1g7mkU30eK9X+5aiO/Wj5wj5A=" } }, - "dartVersion": "3.10.4", + "dartVersion": "3.10.7", "dartHash": { - "x86_64-linux": "sha256-ZePB4yLGh5TJVrgXPTv6EY1l5uHhpnD6j8AaErWVP8c=", - "aarch64-linux": "sha256-ALgFAnqBXK9NalTnypszhEz+yoUdW8nWU2IN6gWyOBI=", - "x86_64-darwin": "sha256-d3Q0hxTu5Q0i3XxKc7HMvq1X8gpHm744Q8HCh/E6JS8=", - "aarch64-darwin": "sha256-ha0VitYy4MIZE3U+Vy3bbZiH+0BAetH8CmPMmV8RRUQ=" + "x86_64-linux": "sha256-PZPskpxD0ZsEgKGOov9maZmHbTp+AtnHW46RjLEJ+qs=", + "aarch64-linux": "sha256-IRcX1PBPzOhNcdcp9Ppa5S7lpsvaQwElQb014rRXDkQ=", + "x86_64-darwin": "sha256-L5zxNiNlUmv0jlehqWbKiIU2ckpcUR9lzby36L15VHU=", + "aarch64-darwin": "sha256-HdZWlVSDaohuTUnzN+H8q2kPssj7omxt6sWch/kkL+o=" }, - "flutterHash": "sha256-qIvmxEUHtahABuPFUR+JWfg6yHgNK/i//tnDCZ/aFTE=", + "flutterHash": "sha256-rxAvZ1UdrP17nURjdm3ixkDwqLuCa0uAQKs/X/fcgpg=", "artifactHashes": { "android": { - "aarch64-darwin": "sha256-G3wi3eSoTKsiLw/GanLX62xMwjT5hVhbDZhhAUe9J7Q=", - "aarch64-linux": "sha256-uCtzsKrJtL6USbTS8z3xizoUJmxJuLq1fBDAT/exzOQ=", - "x86_64-darwin": "sha256-G3wi3eSoTKsiLw/GanLX62xMwjT5hVhbDZhhAUe9J7Q=", - "x86_64-linux": "sha256-uCtzsKrJtL6USbTS8z3xizoUJmxJuLq1fBDAT/exzOQ=" + "aarch64-darwin": "sha256-KzBx+xKhW6emToEmxbQjuOlSTK1NMYpcL7Uuuc4gvik=", + "aarch64-linux": "sha256-hmpOFNtR8DiC8Fo77L1GDO+07nxolmLkYARoyC+yLVo=", + "x86_64-darwin": "sha256-KzBx+xKhW6emToEmxbQjuOlSTK1NMYpcL7Uuuc4gvik=", + "x86_64-linux": "sha256-hmpOFNtR8DiC8Fo77L1GDO+07nxolmLkYARoyC+yLVo=" }, "fuchsia": { - "aarch64-darwin": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=", - "aarch64-linux": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=", - "x86_64-darwin": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=", - "x86_64-linux": "sha256-nEcdKKVAWMFjY3HkrHp1/oPDW347DXtdtWy6A/oBZxo=" + "aarch64-darwin": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=", + "aarch64-linux": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=", + "x86_64-darwin": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=", + "x86_64-linux": "sha256-RRs/AyOAGH14/dIi21X33brN4rlL6XdoiwcoACjm2QY=" }, "ios": { - "aarch64-darwin": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=", - "aarch64-linux": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=", - "x86_64-darwin": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=", - "x86_64-linux": "sha256-CCN8JVZ1yIn1H6QtOs4XmkIg6CzzO6wMS8Qe7ziNnoo=" + "aarch64-darwin": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=", + "aarch64-linux": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=", + "x86_64-darwin": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=", + "x86_64-linux": "sha256-CVVwxlJf4RHxTgyuQnRm/LCUeJmOPBgWNyuDomHSctw=" }, "linux": { - "aarch64-darwin": "sha256-AzRBBnfcJ/AipXsvX3DO+D2bSy7dzooWXvAEOsj4Jsw=", - "aarch64-linux": "sha256-AzRBBnfcJ/AipXsvX3DO+D2bSy7dzooWXvAEOsj4Jsw=", - "x86_64-darwin": "sha256-IFHSkU99MKm9WSMCtR+uDfYX/UdgxzF3kYRdyHzAEO8=", - "x86_64-linux": "sha256-IFHSkU99MKm9WSMCtR+uDfYX/UdgxzF3kYRdyHzAEO8=" + "aarch64-darwin": "sha256-O6fIR0wKUpHMFBxTFjzEws6u9vwZ3P5oWBdeM18IFlo=", + "aarch64-linux": "sha256-O6fIR0wKUpHMFBxTFjzEws6u9vwZ3P5oWBdeM18IFlo=", + "x86_64-darwin": "sha256-ZGAR+bjdAXrAxo0GJj5NYGb+uzPk1BV0n+JDwlpMltA=", + "x86_64-linux": "sha256-ZGAR+bjdAXrAxo0GJj5NYGb+uzPk1BV0n+JDwlpMltA=" }, "macos": { - "aarch64-darwin": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=", - "aarch64-linux": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=", - "x86_64-darwin": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=", - "x86_64-linux": "sha256-BZuho0vvpWHCBxlf5bqcpV0CxwgD1JkQlumCgOSir/A=" + "aarch64-darwin": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=", + "aarch64-linux": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=", + "x86_64-darwin": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=", + "x86_64-linux": "sha256-HQeMgmuBcZemxDgG2ykqmENj7I2kjp82pCwGIGW1ES4=" }, "universal": { - "aarch64-darwin": "sha256-/hyLfGgHWAHE5W7IM533RMmqRLceSKBOEsC3t71cSQA=", - "aarch64-linux": "sha256-you7n+Z1uhZ1ZP1abSFGaUPZIcNstdz9Q6omn5F15z4=", - "x86_64-darwin": "sha256-wp5rokG074cPBFV5hzEpCumeatZ7Zsrp49b9imSNTyQ=", - "x86_64-linux": "sha256-8Sf61AZe+lMiXi2+R039tYKG9Y3/s5NxZIO65AehymU=" + "aarch64-darwin": "sha256-+bCK5vVzOwe49nMQ8fnLvjVOl9eoLuK9kGUYIn+M45g=", + "aarch64-linux": "sha256-Bm2ts/9S1LFka5GzmpzcOXc6PtW9wUKuKf/vIb5dOE8=", + "x86_64-darwin": "sha256-/VhgsmG5TxPi/GN01nUWM1gn75pUSnOxF9jgbucDOrQ=", + "x86_64-linux": "sha256-5r3cTuUkTwZNcQ0I/Erf7c22qek9gM/glhAX4H6DK1M=" }, "web": { - "aarch64-darwin": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=", - "aarch64-linux": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=", - "x86_64-darwin": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=", - "x86_64-linux": "sha256-HT5EyBvHhOpR7OS2XQRSRsLH7AQQAo1u4Stn7NELnEU=" + "aarch64-darwin": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=", + "aarch64-linux": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=", + "x86_64-darwin": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=", + "x86_64-linux": "sha256-zig2dDj0duSJjEgMJw4FqKFp9tSoCsp4UfjFxJXOo7I=" }, "windows": { - "x86_64-darwin": "sha256-NkkcN9NTL8fQQqBldg0BDZvmg3f+BBMqyMq+X3SZaq0=", - "x86_64-linux": "sha256-NkkcN9NTL8fQQqBldg0BDZvmg3f+BBMqyMq+X3SZaq0=" + "x86_64-darwin": "sha256-GcIW0ulTqFgnHKqkcQynhbsSQ4HKdDTtjc3SKCuOJL8=", + "x86_64-linux": "sha256-GcIW0ulTqFgnHKqkcQynhbsSQ4HKdDTtjc3SKCuOJL8=" } }, "pubspecLock": { diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix index b1fd87ac1a6e..33e675a90a4d 100644 --- a/pkgs/development/compilers/go/1.24.nix +++ b/pkgs/development/compilers/go/1.24.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.24.11"; + version = "1.24.12"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-/9+XdmpMSxNc1TgJcTl46e4alDssjiitIhpUKd4w4hA="; + hash = "sha256-+6LdZht757NNa9F+2S9BxEpeBZU62BqzS07HgOXn3EE="; }; strictDeps = true; diff --git a/pkgs/development/compilers/go/1.26.nix b/pkgs/development/compilers/go/1.26.nix index ae9f4bb890a8..75f57c7d6973 100644 --- a/pkgs/development/compilers/go/1.26.nix +++ b/pkgs/development/compilers/go/1.26.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.26rc1"; + version = "1.26rc2"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-ZeM0BQb0uhJaV5nsx4etSdTJ9NJX4sLBXT4pXlACtoQ="; + hash = "sha256-4lzIxf/hJBpdhxmSCSQ9cMJIRyYPsep7FjqVtTfeZaw="; }; strictDeps = true; diff --git a/pkgs/development/compilers/jetbrains-jdk/17.nix b/pkgs/development/compilers/jetbrains-jdk/17.nix index 1991c7f5bf31..f95d35e8eb43 100644 --- a/pkgs/development/compilers/jetbrains-jdk/17.nix +++ b/pkgs/development/compilers/jetbrains-jdk/17.nix @@ -60,7 +60,7 @@ openjdk17.overrideAttrs (oldAttrs: rec { hash = "sha256-Ckv2SNugHK75Af+ZzI91+QodOHIa5TMcjVQYsO45mQo="; }; - env = { + env = (oldAttrs.env or { }) // { BOOT_JDK = openjdk17-bootstrap.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update SOURCE_DATE_EPOCH = 1745907200; diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 7d8592aff977..921929b5a54c 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -62,7 +62,7 @@ jdk.overrideAttrs (oldAttrs: rec { hash = "sha256-P2boCbGB66X8LB4sZHGFO8lqHbv6F4kqGVMGBd9yKu0="; }; - env = { + env = (oldAttrs.env or { }) // { BOOT_JDK = jdk.home; # run `git log -1 --pretty=%ct` in jdk repo for new value on update SOURCE_DATE_EPOCH = 1765114563; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 94175437f80d..126db28f0fc9 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -1,4 +1,9 @@ -{ callPackage, fetchpatch2 }: +{ + callPackage, + fetchpatch2, + gcc14Stdenv, + gfortran14, +}: let juliaWithPackages = callPackage ../../julia-modules { }; @@ -27,47 +32,57 @@ in ); julia_111-bin = wrapJulia ( callPackage (import ./generic-bin.nix { - version = "1.11.7"; + version = "1.11.8"; sha256 = { - x86_64-linux = "aa5924114ecb89fd341e59aa898cd1882b3cb622ca4972582c1518eff5f68c05"; - aarch64-linux = "f97f80b35c12bdaf40c26f6c55dbb7617441e49c9e6b842f65e8410a388ca6f4"; - x86_64-darwin = "b2c11315df39da478ab0fa77fb228f3fd818f1eaf42dc5cc1223c703f7122fe5"; - aarch64-darwin = "74df9d4755a7740d141b04524a631e2485da9d65065d934e024232f7ba0790b6"; + x86_64-linux = "26ad9031b0c9857cde8c89aced86990d1842a551940bfb275e8372108e57cc50"; + aarch64-linux = "54c8f866e1317fa249df47bde535fb4dda7c620863e8f877a1c91d6ed241f11a"; + x86_64-darwin = "b54fd6e6d06fc8ae138dbd556d34d6bf89d91025b725349ab88c83bf958f8557"; + aarch64-darwin = "c54daf1eea4c66d831d29ff0c40d629891474bc57391db3b3a2e56d06390bc38"; }; }) { } ); julia_112-bin = wrapJulia ( callPackage (import ./generic-bin.nix { - version = "1.12.3"; + version = "1.12.4"; sha256 = { - x86_64-linux = "04mrysmaq0z6vzzr8az22zdf572x6hqxxxjxijx4xbkjfh7xaywg"; - aarch64-linux = "036cvw7cnbfylpg106mb2d8gn23bljqpcq94w268m5wnp4jn2s9j"; - x86_64-darwin = "1cwy57qvw196m9fm4j18smipikfyz1f8h5966bz71n652w1yqjpq"; - aarch64-darwin = "1miv453pxnkih041nmdwbyjs6zkyi0f5db4gjs2ddgs43f56xb1l"; + x86_64-linux = "0pcq75k0vg1gdl39p3chszwmlcig91nkj98srdm94h71iwbsyyy5"; + aarch64-linux = "1p9xcv4sz69wry29vww0kvyy4hr7czf6fxg4d3yj84lkxvgs40m6"; + x86_64-darwin = "15zl9gqca1c5ss95xmqrk9j0hihm9y926wvafyxg5802ndd4jd1c"; + aarch64-darwin = "03vyvn7d5nkz0p7kgypa6c9l44ir6512sbrqdzl04havxc6v4ipa"; }; }) { } ); julia_110 = wrapJulia ( - callPackage (import ./generic.nix { - version = "1.10.10"; - hash = "sha256-/NTIGLlcNu4sI1rICa+PS/Jn+YnWi37zFBcbfMnv3Ys="; - patches = [ - # Revert https://github.com/JuliaLang/julia/pull/55354 - # [build] Some improvements to the LLVM build system - # Related: https://github.com/JuliaLang/julia/issues/55617 - (fetchpatch2 { - url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch"; - revert = true; - hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y="; - }) - ]; - }) { } + callPackage + (import ./generic.nix { + version = "1.10.10"; + hash = "sha256-/NTIGLlcNu4sI1rICa+PS/Jn+YnWi37zFBcbfMnv3Ys="; + patches = [ + # Revert https://github.com/JuliaLang/julia/pull/55354 + # [build] Some improvements to the LLVM build system + # Related: https://github.com/JuliaLang/julia/issues/55617 + (fetchpatch2 { + url = "https://github.com/JuliaLang/julia/commit/0be37db8c5b5a440bd9a11960ae9c998027b7337.patch"; + revert = true; + hash = "sha256-gXC3LE3AuHMlSdA4dW+rbAhJpSB6ZMaz9X1qrHDPX7Y="; + }) + ]; + }) + { + stdenv = gcc14Stdenv; + gfortran = gfortran14; + } ); julia_111 = wrapJulia ( - callPackage (import ./generic.nix { - version = "1.11.7"; - hash = "sha256-puluy9YAV8kdx6mfwbN1F7Nhot+P0cRv/a0dm86Jln0="; - }) { } + callPackage + (import ./generic.nix { + version = "1.11.8"; + hash = "sha256-ACblvJzyoRlzaWMZL/1ieF4izdNuhCvYgxvPrtCyJBo="; + }) + { + stdenv = gcc14Stdenv; + gfortran = gfortran14; + } ); julia_112 = wrapJulia ( callPackage (import ./generic.nix { diff --git a/pkgs/development/coq-modules/stdlib/default.nix b/pkgs/development/coq-modules/stdlib/default.nix index ebbe95b7fa64..eb1091ea642a 100644 --- a/pkgs/development/coq-modules/stdlib/default.nix +++ b/pkgs/development/coq-modules/stdlib/default.nix @@ -35,7 +35,8 @@ let ''; installPhase = '' echo installing nothing - touch $out + # Make an output directory rather than a file, so this is more friendly to buildEnv + mkdir $out ''; meta = { diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.13.0.json b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.13.0.json new file mode 100644 index 000000000000..c4ff46160339 --- /dev/null +++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.13.0.json @@ -0,0 +1,36 @@ +{ + "release_date": "2025-07-22", + "release_label": "10.13.0", + "release_product": "tensorrt", + "tensorrt": { + "name": "NVIDIA TensorRT", + "license": "TensorRT", + "version": "10.13.0.35", + "cuda_variant": [ + "11", + "12" + ], + "linux-sbsa": { + "cuda12": { + "md5": "30ba514ad9252fbaec21d0a336fe5b0a", + "relative_path": "tensorrt/10.13.0/tars/TensorRT-10.13.0.35.Linux.aarch64-gnu.cuda-12.9.tar.gz", + "sha256": "b2f7c7ae6da3588729b7a64825246cc59b643adbe373684fb9c5713262ed46c2", + "size": "4377387760" + } + }, + "linux-x86_64": { + "cuda11": { + "md5": "6388feec8573aeced9863a70091aad97", + "relative_path": "tensorrt/10.13.0/tars/TensorRT-10.13.0.35.Linux.x86_64-gnu.cuda-11.8.tar.gz", + "sha256": "4128dd4f40433b957c90f9d04d53311d1636ee046b66a241ab60492f4861de74", + "size": "4788315804" + }, + "cuda12": { + "md5": "de94ac8efa527dfd7fa5700f368ebf74", + "relative_path": "tensorrt/10.13.0/tars/TensorRT-10.13.0.35.Linux.x86_64-gnu.cuda-12.9.tar.gz", + "sha256": "899ff39e237f1351fccac7f6891617f68cbab71c13a7d7c703184424bdbbf621", + "size": "6934362378" + } + } + } +} diff --git a/pkgs/development/cuda-modules/packages/cuda-samples.nix b/pkgs/development/cuda-modules/packages/cuda-samples.nix index 37b87a9747d4..2261509e1317 100644 --- a/pkgs/development/cuda-modules/packages/cuda-samples.nix +++ b/pkgs/development/cuda-modules/packages/cuda-samples.nix @@ -17,6 +17,7 @@ flags, lib, libcublas, + libcudla, libcufft, libcurand, libcusolver, @@ -197,6 +198,7 @@ backendStdenv.mkDerivation (finalAttrs: { libnvjitlink libnvjpeg ] + ++ lib.optionals libcudla.meta.available [ libcudla ] ++ lib.optionals (cudaAtLeast "13") [ cuda_culibos ]; cmakeFlags = [ diff --git a/pkgs/development/cuda-modules/packages/libcudla.nix b/pkgs/development/cuda-modules/packages/libcudla.nix index a24a06b80b36..10c81dfbbb40 100644 --- a/pkgs/development/cuda-modules/packages/libcudla.nix +++ b/pkgs/development/cuda-modules/packages/libcudla.nix @@ -1,7 +1,7 @@ { backendStdenv, buildRedist, - cudaMajorMinorVersion, + cudaOlder, lib, }: buildRedist { @@ -19,7 +19,7 @@ buildRedist { autoPatchelfIgnoreMissingDeps = [ "libnvcudla.so" ] - ++ lib.optionals (cudaMajorMinorVersion == "11.8") [ + ++ lib.optionals (cudaOlder "12") [ "libcuda.so.1" "libnvdla_runtime.so" ]; @@ -27,12 +27,7 @@ buildRedist { platformAssertions = [ { message = "Only Xavier (7.2) and Orin (8.7) Jetson devices are supported"; - assertion = - let - inherit (backendStdenv) hasJetsonCudaCapability requestedJetsonCudaCapabilities; - in - hasJetsonCudaCapability - -> (lib.subtractLists [ "7.2" "8.7" ] requestedJetsonCudaCapabilities == [ ]); + assertion = lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]; } ]; } diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix index 6b3481ff6278..a91317465ced 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/passthru.nix @@ -30,40 +30,40 @@ in } ); - # TODO(@connorbaker): A number of the tests fail with 10.2: - # API Usage Error (Unable to load library: libnvinfer_builder_resource_win.so.10.2.0: - # libnvinfer_builder_resource_win.so.10.2.0: cannot open shared object file: No such file or directory) + mkTester = + name: cmdArgs: + writeShellApplication { + name = finalAttrs.name + "-tester-" + name; + runtimeInputs = [ finalAttrs.finalPackage ]; + text = '' + ${lib.toShellVar "cmdArgs" cmdArgs} + echo "running ''${cmdArgs[*]@Q}" + "''${cmdArgs[@]}" + ''; + }; + # TODO(@connorbaker): Add tests for trtexec. testers = let - mkTester = - name: cmdArgs: - writeShellApplication { - name = finalAttrs.name + "-tester-" + name; - runtimeInputs = [ finalAttrs.finalPackage ]; - text = '' - ${lib.toShellVar "cmdArgs" cmdArgs} - echo "running ''${cmdArgs[*]@Q}" - "''${cmdArgs[@]}" - ''; - }; + mkTesters = lib.flip import { + inherit (finalAttrs.passthru) mkTester sample-data; + inherit + atLeast + backendStdenv + finalAttrs + lib + older + ; + }; in - lib.packagesFromDirectoryRecursive { - callPackage = - path: _: - import path { - inherit (finalAttrs.passthru) sample-data; - inherit - atLeast - backendStdenv - finalAttrs - lib - mkTester - older - ; - }; - directory = ./testers; - }; + # Filter out sets of testers which are completely empty (not available on this architecture, this version, etc.). + lib.filterAttrs (_: attrs: attrs != { }) ( + # Construct all the testers from the filesystem. + lib.packagesFromDirectoryRecursive { + callPackage = path: _: mkTesters path; + directory = ./testers; + } + ); # Wrap each of the derivations in testers in a runCommand. tests = lib.mapAttrsRecursiveCond (as: !(lib.isDerivation as)) ( diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix index 047b0e6a5121..87815642a701 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_algorithm_selector.nix @@ -1,4 +1,5 @@ { + atLeast, backendStdenv, lib, mkTester, @@ -26,15 +27,16 @@ lib.optionalAttrs (older "10.8") ( "--datadir=${sample-data.outPath + "/mnist"}" "--fp16" ]; - + } + // lib.optionalAttrs (atLeast "10") { bf16 = mkTester "sample_algorithm_selector-bf16" [ "sample_algorithm_selector" "--datadir=${sample-data.outPath + "/mnist"}" "--bf16" ]; } - # Only Orin has a DLA - // lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + # Only Xavier and Orin have a DLA + // lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_algorithm_selector-dla" [ "sample_algorithm_selector" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix index e68c51ccb3df..6094b16011f8 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_dynamic_reshape.nix @@ -1,4 +1,6 @@ { + atLeast, + lib, mkTester, sample-data, ... @@ -21,7 +23,8 @@ "--datadir=${sample-data.outPath + "/mnist"}" "--fp16" ]; - +} +// lib.optionalAttrs (atLeast "10") { bf16 = mkTester "sample_dynamic_reshape-bf16" [ "sample_dynamic_reshape" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix index 58faf35a48fc..3ca3a46bacc2 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_int8_api.nix @@ -12,8 +12,8 @@ "--data=${sample-data.outPath + "/int8_api"}" ]; } -# Only Orin has a DLA -// lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { +# Only Xavier and Orin have a DLA +// lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_int8_api-dla" [ "sample_int8_api" "--model=${sample-data.outPath + "/resnet50/ResNet50.onnx"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix index 208966cd2640..c8ec26241fdb 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_io_formats.nix @@ -11,8 +11,8 @@ "--datadir=${sample-data.outPath + "/mnist"}" ]; } -# Only Orin has a DLA -// lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { +# Only Xavier and Orin have a DLA +// lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_io_formats-dla" [ "sample_io_formats" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix index 8e97fdf3c99c..5b43347d7c05 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_non_zero_plugin.nix @@ -1,27 +1,28 @@ { atLeast, - finalAttrs, lib, mkTester, sample-data, ... }: -{ - default = mkTester "sample_non_zero_plugin" [ - "sample_non_zero_plugin" - "--datadir=${sample-data.outPath + "/mnist"}" - ]; +lib.optionalAttrs (atLeast "10") ( + { + default = mkTester "sample_non_zero_plugin" [ + "sample_non_zero_plugin" + "--datadir=${sample-data.outPath + "/mnist"}" + ]; - fp16 = mkTester "sample_non_zero_plugin-fp16" [ - "sample_non_zero_plugin" - "--datadir=${sample-data.outPath + "/mnist"}" - "--fp16" - ]; -} -// lib.optionalAttrs (atLeast "10.0.1") { - columnOrder = mkTester "sample_non_zero_plugin-columnOrder" [ - "sample_non_zero_plugin" - "--datadir=${sample-data.outPath + "/mnist"}" - "--columnOrder" - ]; -} + fp16 = mkTester "sample_non_zero_plugin-fp16" [ + "sample_non_zero_plugin" + "--datadir=${sample-data.outPath + "/mnist"}" + "--fp16" + ]; + } + // lib.optionalAttrs (atLeast "10.0.1") { + columnOrder = mkTester "sample_non_zero_plugin-columnOrder" [ + "sample_non_zero_plugin" + "--datadir=${sample-data.outPath + "/mnist"}" + "--columnOrder" + ]; + } +) diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix index 1895b87d47e5..bd2791eb4d8f 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist.nix @@ -1,4 +1,5 @@ { + atLeast, backendStdenv, lib, mkTester, @@ -22,15 +23,16 @@ "--datadir=${sample-data.outPath + "/mnist"}" "--fp16" ]; - +} +// lib.optionalAttrs (atLeast "10") { bf16 = mkTester "sample_onnx_mnist-bf16" [ "sample_onnx_mnist" "--datadir=${sample-data.outPath + "/mnist"}" "--bf16" ]; } -# Only Orin has a DLA -// lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { +# Only Xavier and Orin have a DLA +// lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_onnx_mnist-dla" [ "sample_onnx_mnist" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix index ef4b4bedfbc0..25260050b501 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_onnx_mnist_coord_conv_ac.nix @@ -25,8 +25,8 @@ lib.optionalAttrs false ( "--fp16" ]; } - # Only Orin has a DLA - // lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + # Only Xavier and Orin have a DLA + // lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_onnx_mnist_coord_conv_ac-dla" [ "sample_onnx_mnist_coord_conv_ac" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix index 86254b3039d4..55866b2e5b48 100644 --- a/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix +++ b/pkgs/development/cuda-modules/packages/tensorrt-samples/testers/sample_progress_monitor.nix @@ -25,8 +25,8 @@ lib.optionalAttrs false ( "--fp16" ]; } - # Only Orin has a DLA - // lib.optionalAttrs (lib.elem "8.7" backendStdenv.cudaCapabilities) { + # Only Xavier and Orin have a DLA + // lib.optionalAttrs (lib.subtractLists [ "7.2" "8.7" ] backendStdenv.cudaCapabilities == [ ]) { dla = mkTester "sample_progress_monitor-dla" [ "sample_progress_monitor" "--datadir=${sample-data.outPath + "/mnist"}" diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 251c38f1caf9..72e2a346197e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -614,7 +614,7 @@ with haskellLib; src = pkgs.fetchgit { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; - rev = "refs/tags/" + super.git-annex.version; + tag = super.git-annex.version; sha256 = "sha256-Cnkohi1sl7kS4JECCsNDbxXKIWBus1gDcWoO3xZtXoM="; # delete android and Android directories which cause issues on # darwin (case insensitive directory). Since we don't need them diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 363397c70dca..80ba3ff965b8 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -410,8 +410,8 @@ in }; ruby_4_0 = generic { - version = rubyVersion "4" "0" "0" ""; - hash = "sha256-LoOJyMByy2WMk6E3JzLZ6shAgsiLBldQ2x5SpaxjAnE="; + version = rubyVersion "4" "0" "1" ""; + hash = "sha256-OSS+LQXbMPTjX4Wb8Ci+hfS33QFxQUL9gj5K9d4vr50="; cargoHash = "sha256-z7NwWc4TaR042hNx0xgRkh/BQEpEJtE53cfrN0qNiE0="; }; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index 2af6cf4c6845..6e98ed629910 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitLab { owner = "accounts-sso"; repo = "libaccounts-qt"; - rev = "refs/tags/VERSION_${finalAttrs.version}"; + tag = "VERSION_${finalAttrs.version}"; hash = "sha256-mPZgD4r7vlUP6wklvZVknGqTXZBckSOtNzK7p6e2qSA="; }; diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 4573e7c8ba40..863684149df2 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -10,6 +10,7 @@ generateSplicesForMkScope, lib, stdenv, + gcc14Stdenv, fetchurl, fetchgit, fetchpatch, @@ -246,12 +247,15 @@ let addPackages = self: let - qtModule = callPackage ../qtModule.nix { - inherit patches; - # Use a variant of mkDerivation that does not include wrapQtApplications - # to avoid cyclic dependencies between Qt modules. - mkDerivation = (callPackage ../mkDerivation.nix { wrapQtAppsHook = null; }) stdenv.mkDerivation; - }; + qtModuleWithStdenv = + stdenv: + callPackage ../qtModule.nix { + inherit patches; + # Use a variant of mkDerivation that does not include wrapQtApplications + # to avoid cyclic dependencies between Qt modules. + mkDerivation = (callPackage ../mkDerivation.nix { wrapQtAppsHook = null; }) stdenv.mkDerivation; + }; + qtModule = qtModuleWithStdenv stdenv; callPackage = self.newScope { inherit @@ -326,14 +330,22 @@ let qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix { }; qtwayland = callPackage ../modules/qtwayland.nix { }; qtwebchannel = callPackage ../modules/qtwebchannel.nix { }; - qtwebengine = callPackage ../modules/qtwebengine.nix { - # Won’t build with Clang 20, as `-Wenum-constexpr-conversion` - # was made a hard error. - stdenv = if stdenv.cc.isClang then llvmPackages_19.stdenv else stdenv; - inherit (srcs.qtwebengine) version; - inherit (darwin) bootstrap_cmds; - python = python3; - }; + qtwebengine = + # Actually propagating stdenv change + let + # Won’t build with Clang 20, as `-Wenum-constexpr-conversion` + # was made a hard error. + # qt5webengine no longer maintained, FTBFS with GCC 15 + stdenv' = if stdenv.cc.isClang then llvmPackages_19.stdenv else gcc14Stdenv; + qtModule' = qtModuleWithStdenv stdenv'; + in + callPackage ../modules/qtwebengine.nix { + inherit (srcs.qtwebengine) version; + inherit (darwin) bootstrap_cmds; + stdenv = stdenv'; + qtModule = qtModule'; + python = python3; + }; qtwebglplugin = callPackage ../modules/qtwebglplugin.nix { }; qtwebkit = callPackage ../modules/qtwebkit.nix { }; qtwebsockets = callPackage ../modules/qtwebsockets.nix { }; diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index a725329d917c..0d6a6ac1664d 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -479,7 +479,7 @@ let src = pkgs.fetchFromGitHub { owner = "fukamachi"; repo = "qlot"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-j9iT25Yz9Z6llCKwwiHlVNKLqwuKvY194LrAzXuljsE="; }; diff --git a/pkgs/development/ocaml-modules/synchronizer/default.nix b/pkgs/development/ocaml-modules/synchronizer/default.nix index f61c99238f43..519c55ba9bdf 100644 --- a/pkgs/development/ocaml-modules/synchronizer/default.nix +++ b/pkgs/development/ocaml-modules/synchronizer/default.nix @@ -15,7 +15,7 @@ buildDunePackage (finalAttrs: { src = fetchFromGitHub { owner = "OCamlPro"; repo = "synchronizer"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-0XtPHpDlyH1h8W2ZlRvJbZjCN9WP5mzk2N01WFd8eLQ="; }; diff --git a/pkgs/development/ocaml-modules/tls/miou-unix.nix b/pkgs/development/ocaml-modules/tls/miou-unix.nix new file mode 100644 index 000000000000..ddf031bd57e6 --- /dev/null +++ b/pkgs/development/ocaml-modules/tls/miou-unix.nix @@ -0,0 +1,37 @@ +{ + buildDunePackage, + crowbar, + hxd, + miou, + mirage-crypto-rng-miou-unix, + ohex, + ptime, + rresult, + tls, + x509, +}: + +buildDunePackage { + pname = "tls-miou-unix"; + inherit (tls) src version; + + propagatedBuildInputs = [ + miou + tls + x509 + ]; + + doCheck = true; + checkInputs = [ + crowbar + hxd + mirage-crypto-rng-miou-unix + ohex + ptime + rresult + ]; + + meta = tls.meta // { + description = "Transport Layer Security purely in OCaml, Miou+Unix layer"; + }; +} diff --git a/pkgs/development/octave-modules/bim/default.nix b/pkgs/development/octave-modules/bim/default.nix index f9218e310c2b..4232176fba29 100644 --- a/pkgs/development/octave-modules/bim/default.nix +++ b/pkgs/development/octave-modules/bim/default.nix @@ -13,7 +13,7 @@ buildOctavePackage rec { src = fetchFromGitHub { owner = "carlodefalco"; repo = "bim"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; sha256 = "sha256-nK/VZ+thMuMU5RBiNYpzylOuVxKbcfSyrXZfka5+g4I="; }; diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index f5bce5cf9d37..e6ae003b8f7b 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -21,6 +21,9 @@ tqdm, ufonormalizer, ufoprocessor, + + # passthru + afdko, }: buildPythonPackage (finalAttrs: { @@ -139,7 +142,7 @@ buildPythonPackage (finalAttrs: { ]; passthru.tests = { - fullTestsuite = finalAttrs.finalPackage.override { runAllTests = true; }; + fullTestsuite = afdko.override { runAllTests = true; }; }; meta = { diff --git a/pkgs/development/python-modules/ai-edge-litert/default.nix b/pkgs/development/python-modules/ai-edge-litert/default.nix new file mode 100644 index 000000000000..7a9e3c35bf3f --- /dev/null +++ b/pkgs/development/python-modules/ai-edge-litert/default.nix @@ -0,0 +1,87 @@ +{ + autoPatchelfHook, + buildPythonPackage, + fetchurl, + lib, + python, + pythonAtLeast, + stdenv, + + # dependencies + backports-strenum, + flatbuffers, + numpy, + protobuf, + tqdm, + typing-extensions, + + # optional-dependencies + lark, + ml-dtypes, +}: + +let + release = builtins.fromJSON (builtins.readFile ./release.json); + platforms = release.src; + platform = + platforms.${stdenv.hostPlatform.system} + or (throw "ai-edge-litert: unsupported platform (${stdenv.hostPlatform.system})"); + pythonMajorMinor = lib.versions.majorMinor python.version; + source = + platform.${pythonMajorMinor} + or (throw "ai-edge-litert: unsupported python version (${pythonMajorMinor})"); +in + +buildPythonPackage { + pname = "ai-edge-litert"; + version = release.version; + format = "wheel"; + + src = fetchurl { + inherit (source) + url + hash + ; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + + dependencies = [ + backports-strenum + flatbuffers + numpy + protobuf + tqdm + typing-extensions + ]; + + optional-dependencies = { + model-utils = [ + lark + ml-dtypes + # TODO :xdsl + ]; + # TODO: npu-sdk + }; + + pythonRemoveDeps = lib.optionals (pythonAtLeast "3.12") [ + # https://github.com/google-ai-edge/LiteRT/pull/5298 + "backports.strenum" + ]; + + pythonImportsCheck = [ + "ai_edge_litert" + "ai_edge_litert.interpreter" + ]; + + passthru.updateScript = ./update.py; + + meta = { + description = "LiteRT is for mobile and embedded devices"; + downloadPage = "https://github.com/google-ai-edge/LiteRT"; + homepage = "https://www.tensorflow.org/lite/"; + license = lib.licenses.asl20; + platforms = lib.attrNames platforms; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/ai-edge-litert/release.json b/pkgs/development/python-modules/ai-edge-litert/release.json new file mode 100644 index 000000000000..d21b94acfeb9 --- /dev/null +++ b/pkgs/development/python-modules/ai-edge-litert/release.json @@ -0,0 +1,49 @@ +{ + "version": "2.1.0", + "src": { + "aarch64-linux": { + "3.10": { + "url": "https://files.pythonhosted.org/packages/a5/7a/6ea77fe405d76dcd1a95fceccd1018293603f551bf3645a382ef1fd470eb/ai_edge_litert-2.1.0-cp310-cp310-manylinux_2_27_aarch64.whl", + "hash": "sha256-eAZzWROFxGRqqCs42qLu2IvCY0bhqvvp0Nt/BJPWq1Q=" + }, + "3.11": { + "url": "https://files.pythonhosted.org/packages/82/e7/73fff29c7a95a4f35953a027bdb174dd9ac08adbe8c2c322dee26d8f1d3f/ai_edge_litert-2.1.0-cp311-cp311-manylinux_2_27_aarch64.whl", + "hash": "sha256-krJNJQf8z1aAwm5xLBViZtz2Sokt85Id1C9KfSZSdGI=" + }, + "3.12": { + "url": "https://files.pythonhosted.org/packages/61/f6/1aeccf3034f95ec680a2e25f33582d4adf02c30b3462357511d529a2cad2/ai_edge_litert-2.1.0-cp312-cp312-manylinux_2_27_aarch64.whl", + "hash": "sha256-4Gt9sF08WCT9S1biMY9oWN73GHgM2QMYYmtKqY23WDw=" + }, + "3.13": { + "url": "https://files.pythonhosted.org/packages/9e/b2/dde0f8043eb26f237c5958e44334d62fa90496fa51438f9c5179dec72d4c/ai_edge_litert-2.1.0-cp313-cp313-manylinux_2_27_aarch64.whl", + "hash": "sha256-eoB6MjbIz1ZeIxtuwzG+zjo/WhfDwl+I8+N8/oZo+NA=" + }, + "3.9": { + "url": "https://files.pythonhosted.org/packages/30/8b/531b230a5377b2253eff8235f10e72489bc207f7e5ed6e531670495e4fd4/ai_edge_litert-2.1.0-cp39-cp39-manylinux_2_27_aarch64.whl", + "hash": "sha256-qe3jwpMVGnSt+hK6yLjOh+wB3Fhuw86hIqxxRlDIQb8=" + } + }, + "x86_64-linux": { + "3.10": { + "url": "https://files.pythonhosted.org/packages/20/4a/5f7848c8d21df432f44ebd36097406f66d98762295a4f11239f1d913f347/ai_edge_litert-2.1.0-cp310-cp310-manylinux_2_27_x86_64.whl", + "hash": "sha256-0FSis6ZeLCtFcahO0zul2ojp0Xhy/YdTwXc/+3g1HLE=" + }, + "3.11": { + "url": "https://files.pythonhosted.org/packages/0d/d1/032cd1300a9b40da97e9f93781b3c2c5f104c22157695a3bb5bd5531821f/ai_edge_litert-2.1.0-cp311-cp311-manylinux_2_27_x86_64.whl", + "hash": "sha256-3PfXk3SrRnzsGfLtrdO+skOtF4M/jFrVm/dnEr8USbE=" + }, + "3.12": { + "url": "https://files.pythonhosted.org/packages/bb/16/0aface4ec3554304487d6436938684023c054828b4334f114f7db303b27a/ai_edge_litert-2.1.0-cp312-cp312-manylinux_2_27_x86_64.whl", + "hash": "sha256-SNfm6BuqNYHmtIkgpzq4lzAcxIqluJq9012fBt9jLUo=" + }, + "3.13": { + "url": "https://files.pythonhosted.org/packages/96/c7/53b1f2627dbb0b307c1637e5f2cdbdc5a5f4ffecbebe75c8977d46590b6a/ai_edge_litert-2.1.0-cp313-cp313-manylinux_2_27_x86_64.whl", + "hash": "sha256-QeJJDL8dJmZj1FEllzEXC4Gqpwt9/vbXGIaX5lxxLJU=" + }, + "3.9": { + "url": "https://files.pythonhosted.org/packages/85/b7/efd39c318ae7f73bd3de247a93501f1d748e60979ecd97c794e7a4a1d671/ai_edge_litert-2.1.0-cp39-cp39-manylinux_2_27_x86_64.whl", + "hash": "sha256-QicA/OOs8HK8DVjXhj7BZjHwix2t3vyHwAjebkzaMWc=" + } + } + } +} \ No newline at end of file diff --git a/pkgs/development/python-modules/ai-edge-litert/update.py b/pkgs/development/python-modules/ai-edge-litert/update.py new file mode 100755 index 000000000000..e792c3a06443 --- /dev/null +++ b/pkgs/development/python-modules/ai-edge-litert/update.py @@ -0,0 +1,99 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i python -p "python3.withPackages (ps: [ ps.httpx ] )" + +import json +import httpx +import re +import subprocess +from pathlib import Path +from typing import Dict +from collections import defaultdict + + +def get_metadata(package) -> Dict: + response = httpx.get( + f"https://pypi.org/pypi/{package}/json", + headers={"user-agent": "nixpkgs/pypi-updater/unstable"}, + ) + return response.json() + + +def get_hash(url) -> str: + result = subprocess.run(["nix-prefetch-url", url], stdout=subprocess.PIPE) + base32_hash = result.stdout.decode().strip() + result = subprocess.run( + ["nix", "hash", "to-sri", "--type", "sha256", base32_hash], + stdout=subprocess.PIPE, + ) + sri_hash = result.stdout.decode().strip() + return sri_hash + + +def get_platform(platform: str) -> str: + result = re.match(r"^(?Pmacosx|manylinux)[\d+_]+(?Px86_64|aarch64)", platform) + if not result: + raise RuntimeError(f"Unable to parse platform string: {platform}") + + target = { + "macosx": "darwin", + "manylinux": "linux", + }[result.group("target")] + + arch = result.group("arch") + + return f"{arch}-{target}" + +def get_python_version(python: str) -> str: + result = re.match(r"^cp(?P\d)(?P\d+)$", python) + if not result: + raise RuntimeError(f"Unable to disect python compat tag: {python}") + + return f"{result.group('major')}.{result.group('minor')}" + + +def main(package: str): + metadata = get_metadata(package) + + info = metadata.get("info") + if info is None: + raise RuntimeError("Package metadata has no info attribute") + + version = info.get("version") + assert not info.get("yanked"), ( + f"Latest release was yanked: {info.get('yanked_reason')}" + ) + releases = metadata["releases"][version] + + out = { + "version": version, + "src": defaultdict(dict), + } + for release in releases: + if release.get("packagetype") != "bdist_wheel": + # the package expects the binary wheels + continue + + print(json.dumps(release, indent=2)) + + filename = release.get("filename") + result = re.match( + rf"(?P\w+)-{re.escape(version)}-(?P\w+)-(?P\w+)-(?P\w+)\.whl$", + filename, + ) + if not result: + raise RuntimeError(f"Unable to disect wheel filename: {filename}") + + platform = get_platform(result.group("platform")) + python_version = get_python_version(release["python_version"]) + + out["src"][platform][python_version] = { + "url": release.get("url"), + "hash": get_hash(release.get("url")), + } + + with open(Path(__file__).with_name("release.json"), "w") as fd: + json.dump(out, fd, indent=2) + + +if __name__ == "__main__": + main("ai-edge-litert") diff --git a/pkgs/development/python-modules/airos/default.nix b/pkgs/development/python-modules/airos/default.nix index 748ebadeaef1..821e77483f54 100644 --- a/pkgs/development/python-modules/airos/default.nix +++ b/pkgs/development/python-modules/airos/default.nix @@ -12,9 +12,9 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "airos"; - version = "0.6.1"; + version = "0.6.2"; pyproject = true; disabled = pythonOlder "3.13"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CoMPaTech"; repo = "python-airos"; - tag = "v${version}"; - hash = "sha256-/FDVikSKtGj3q5BmZzXDvSoR5JAHUasQIq8q9S7UH2k="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tzdWcqXi0dcTKNAdhTOGz89spf+29qORjyyBGB/eD8U="; }; build-system = [ setuptools ]; @@ -45,8 +45,8 @@ buildPythonPackage rec { meta = { description = "Ubiquity airOS module(s) for Python 3"; homepage = "https://github.com/CoMPaTech/python-airos"; - changelog = "https://github.com/CoMPaTech/python-airos/releases/tag/v${version}"; + changelog = "https://github.com/CoMPaTech/python-airos/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = [ lib.maintainers.jamiemagee ]; }; -} +}) diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index e01c0d2d2a72..e2e46c77602d 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-doc"; repo = "alabaster"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-aQEhFZUJs0TptfpjQVoIVI9V9a+xKjE2OfStSaJKHGI="; }; diff --git a/pkgs/development/python-modules/alibabacloud-openapi-util/default.nix b/pkgs/development/python-modules/alibabacloud-openapi-util/default.nix index 3724867ec2a7..e612ba35e5f5 100644 --- a/pkgs/development/python-modules/alibabacloud-openapi-util/default.nix +++ b/pkgs/development/python-modules/alibabacloud-openapi-util/default.nix @@ -7,15 +7,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "alibabacloud-openapi-util"; - version = "0.2.2"; + version = "0.2.4"; pyproject = true; src = fetchPypi { pname = "alibabacloud_openapi_util"; - inherit version; - hash = "sha256-67w5BvVUy0v49RPkPooz6Laj1KDvE2F6DhTD3ajvUqg="; + inherit (finalAttrs) version; + hash = "sha256-hwIrnct1k6YB96QMppgiesPMt3a1jLewa43H9RCZXDQ="; }; build-system = [ setuptools ]; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 85169db32fc0..6deb20ca96cc 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "warsaw"; repo = "public"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-cqum+4hREu0jO9iFoUUzfzn597BoMAhG+aanwnh8hb8="; }; diff --git a/pkgs/development/python-modules/backports-strenum/default.nix b/pkgs/development/python-modules/backports-strenum/default.nix index 816f8b412f11..e967ea74b973 100644 --- a/pkgs/development/python-modules/backports-strenum/default.nix +++ b/pkgs/development/python-modules/backports-strenum/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "clbarnes"; repo = "backports.strenum"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-j5tALFrLeZ8k+GwAaq0ocmcQWvdWkRUHbOVq5Du4mu0="; }; diff --git a/pkgs/development/python-modules/bacpypes/default.nix b/pkgs/development/python-modules/bacpypes/default.nix index 8b604069d732..81ad8dc1a345 100644 --- a/pkgs/development/python-modules/bacpypes/default.nix +++ b/pkgs/development/python-modules/bacpypes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "JoelBender"; repo = "bacpypes"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-BHCHI36nTqBj2dkHB/Y5qkC4uJCmzbHGzSFWKNsIdbc="; }; diff --git a/pkgs/development/python-modules/biocframe/default.nix b/pkgs/development/python-modules/biocframe/default.nix index 3eee6572e828..324eea7c5a56 100644 --- a/pkgs/development/python-modules/biocframe/default.nix +++ b/pkgs/development/python-modules/biocframe/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BiocPy"; repo = "BiocFrame"; - tag = "${version}"; + tag = version; hash = "sha256-2O4YINYo9ehiBuZSHZmBmNIwud7GkNzAMWEv2/7oSs8="; }; diff --git a/pkgs/development/python-modules/biocutils/default.nix b/pkgs/development/python-modules/biocutils/default.nix index fd950949c22f..eaa860c8522d 100644 --- a/pkgs/development/python-modules/biocutils/default.nix +++ b/pkgs/development/python-modules/biocutils/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "BiocPy"; repo = "BiocUtils"; - tag = "${version}"; + tag = version; hash = "sha256-ziKVF2cxOIRt8cEMOsbf5HAgBGG2vLp+DSMpL+hH6JM="; }; diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index fb20505d5da0..40a66161fa56 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -358,13 +358,13 @@ buildPythonPackage (finalAttrs: { pname = "boto3-stubs"; - version = "1.42.28"; + version = "1.42.30"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-bug70UV9Y3cTDXCfyw+LK5XKeSiwZX0Yq7HQjRnbbsk="; + hash = "sha256-aKLKdUaGyYDXnRxn8tTV643D2J9Oxi1AgLlfva0+4Bs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 06cf46fa41b0..faa5bbbc67e3 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "botocore-stubs"; - version = "1.42.28"; + version = "1.42.29"; pyproject = true; src = fetchPypi { pname = "botocore_stubs"; inherit (finalAttrs) version; - hash = "sha256-qhMfkvJmwKxHmHPo6RTEYlbDnbOuzqDHPt8IRtME6d8="; + hash = "sha256-8vbtyp1TexhlmSqTkqGBTN95PWAxl4uxZJhgWodYJmo="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/causal-conv1d/default.nix b/pkgs/development/python-modules/causal-conv1d/default.nix index 8902d04fc0e9..e2dd6730c877 100644 --- a/pkgs/development/python-modules/causal-conv1d/default.nix +++ b/pkgs/development/python-modules/causal-conv1d/default.nix @@ -87,6 +87,6 @@ buildPythonPackage rec { # The package requires either CUDA or ROCm. # It doesn't work without either, nor with both. - broken = cudaSupport != rocmSupport; + broken = cudaSupport == rocmSupport; }; } diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 78907e2f1b45..5f4c316f116d 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -23,7 +23,7 @@ let binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-XXJBySIT3ylK1nd3suP2bq4bVSVah/1XhOmkEONbCoY="; }; in @@ -37,7 +37,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = "cle"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-rWbZzm5hWi/C+te8zeQChxqYHO0S795tJ6Znocq9TTs="; }; diff --git a/pkgs/development/python-modules/colcon-cd/default.nix b/pkgs/development/python-modules/colcon-cd/default.nix index c2acd60cb967..d2711e0d04db 100644 --- a/pkgs/development/python-modules/colcon-cd/default.nix +++ b/pkgs/development/python-modules/colcon-cd/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "colcon"; repo = "colcon-cd"; - tag = "${version}"; + tag = version; hash = "sha256-eOo1DqTvYazr+wWraG9PZe0tTCgaAvhWtELG5rlaGSs="; }; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index 5bc41fdd60b6..800bc6a88c15 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "dslackw"; repo = "colored"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-PPaPw7pCZJeBz6h5omZ+kcRXsqi6ncLYGM7FNfZ0r4w="; }; diff --git a/pkgs/development/python-modules/compliance-trestle/default.nix b/pkgs/development/python-modules/compliance-trestle/default.nix index 8f1f1a7d66c5..78c794c90583 100644 --- a/pkgs/development/python-modules/compliance-trestle/default.nix +++ b/pkgs/development/python-modules/compliance-trestle/default.nix @@ -1,54 +1,74 @@ { - attrs, + lib, buildPythonPackage, + fetchFromGitHub, + pythonAtLeast, + + # build-system + hatchling, + + # dependencies + attrs, cmarkgfm, cryptography, defusedxml, - datamodel-code-generator, - email-validator, - fetchFromGitHub, furl, ilcli, importlib-resources, jinja2, - lib, - mypy, openpyxl, orjson, paramiko, - pytestCheckHook, pydantic, python-dotenv, python-frontmatter, requests, ruamel-yaml, - setuptools, - setuptools-scm, + + # tests + datamodel-code-generator, + pytestCheckHook, + mypy, }: -buildPythonPackage rec { +let + # nist-content is a git submodule, but using fetchSubmodules in src fails while recursing into + # nist-content itself. + # Thus we simply inject it after the fact in postPatch. + nist-content = fetchFromGitHub { + name = "nist-content"; + owner = "usnistgov"; + repo = "oscal-content"; + rev = "941c978d14c57379fbf6f7fb388f675067d5bff7"; + hash = "sha256-sDvNMheZZhk09YEfY5ocmZmAC3t3KenqD3PaNsi0mMU="; + }; +in +buildPythonPackage (finalAttrs: { pname = "compliance-trestle"; - version = "3.9.1"; + version = "3.11.0"; pyproject = true; src = fetchFromGitHub { owner = "oscal-compass"; repo = "compliance-trestle"; - tag = "v${version}"; - hash = "sha256-AJ1luN2X6Q4dp4fna14x6HgUw1uX4X87BXkVBPVIn9k="; - fetchSubmodules = true; + tag = "v${finalAttrs.version}"; + # TODO: Try to fall back to fetchSubmodules at the next release + # fetchSubmodules = true; + hash = "sha256-vhRD2NTt9F/7lgbmrjp5AWSUIs/iaqUAAAxs8T4Ap4A="; }; - pythonRelaxDeps = true; - postPatch = '' substituteInPlace tests/trestle/misc/mypy_test.py \ - --replace-fail "trestle'," "${placeholder "out"}/bin/trestle'," \ + --replace-fail "trestle'," "${placeholder "out"}/bin/trestle'," + '' + # Replace the expected nist-content git submodule with the pre-fetched path. + + '' + rmdir ./nist-content + ln -s ${nist-content} ./nist-content ''; build-system = [ - setuptools - setuptools-scm + hatchling ]; dependencies = [ @@ -56,8 +76,6 @@ buildPythonPackage rec { cmarkgfm cryptography defusedxml - datamodel-code-generator - email-validator furl ilcli importlib-resources @@ -70,11 +88,13 @@ buildPythonPackage rec { python-frontmatter requests ruamel-yaml - ]; + ] + ++ pydantic.optional-dependencies.email; nativeCheckInputs = [ - pytestCheckHook + datamodel-code-generator mypy + pytestCheckHook ]; disabledTests = [ @@ -88,11 +108,26 @@ buildPythonPackage rec { "test_ssp_assemble_fedramp_profile" "test_ssp_generate_aggregates_no_cds" "test_ssp_generate_aggregates_no_param_value_orig" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # AssertionError: assert 1 == 0 + # AttributeError: 'AliasTracker' object has no attribute 'aliases' + "test_arguments" + "test_get_list_cli" + "test_load_custom_config" + "test_load_default_config" + "test_split_catalog_star" + "test_split_comp_def" ]; disabledTestPaths = [ # Requires network access "tests/trestle/core/remote" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # pydantic.v1.errors.ConfigError: unable to infer type for attribute "poam" + "tests/trestle/core/models/interfaces_test.py" + "tests/trestle/tasks/ocp4_cis_profile_to_oscal_catalog_test.py" ]; pythonImportsCheck = [ "trestle" ]; @@ -100,9 +135,9 @@ buildPythonPackage rec { meta = { description = "Opinionated tooling platform for managing compliance as code, using continuous integration and NIST's OSCAL standard"; homepage = "https://github.com/oscal-compass/compliance-trestle"; - changelog = "https://github.com/oscal-compass/compliance-trestle/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/oscal-compass/compliance-trestle/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ tochiaha ]; mainProgram = "trestle"; }; -} +}) diff --git a/pkgs/development/python-modules/conjure-python-client/default.nix b/pkgs/development/python-modules/conjure-python-client/default.nix index 3ba67ac0bab0..de2bb79a2b74 100644 --- a/pkgs/development/python-modules/conjure-python-client/default.nix +++ b/pkgs/development/python-modules/conjure-python-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "palantir"; repo = "conjure-python-client"; - tag = "${version}"; + tag = version; hash = "sha256-dfoP0/v0yFAyBo4wADDGGTggVuFBoG53e5WTBvKQaS0="; }; diff --git a/pkgs/development/python-modules/crontab/default.nix b/pkgs/development/python-modules/crontab/default.nix index f801151e1b8d..8887c456072d 100644 --- a/pkgs/development/python-modules/crontab/default.nix +++ b/pkgs/development/python-modules/crontab/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "doctormo"; repo = "python-crontab"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-eJXtvTRwokbewWrTArHJ2FXGDLvlkGA/5ZZR01koMW8="; }; diff --git a/pkgs/development/python-modules/csaf-tool/default.nix b/pkgs/development/python-modules/csaf-tool/default.nix index f18a295ec6a8..40495b680fef 100644 --- a/pkgs/development/python-modules/csaf-tool/default.nix +++ b/pkgs/development/python-modules/csaf-tool/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "anthonyharrison"; repo = "csaf"; - tag = "${version}"; + tag = version; hash = "sha256-LR6r03z0nvvAQgFHaTWfukoJmLZ6SLPXfbp/G8N/HtM="; }; diff --git a/pkgs/development/python-modules/cv2-enumerate-cameras/default.nix b/pkgs/development/python-modules/cv2-enumerate-cameras/default.nix index c7752eae5257..e64310f29f0d 100644 --- a/pkgs/development/python-modules/cv2-enumerate-cameras/default.nix +++ b/pkgs/development/python-modules/cv2-enumerate-cameras/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "cv2_enumerate_cameras"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "lukehugh"; repo = "cv2_enumerate_cameras"; tag = "v${version}"; - hash = "sha256-wBjpZxqzWYXWlgcqJmpohJFK97Eh1IkWtNn6S6DlWPo="; + hash = "sha256-4QB/yWpurH/ai49PBRECdCfRRQ0tAvzGnpXj+DeP1pE="; }; pyproject = true; diff --git a/pkgs/development/python-modules/cython/0.nix b/pkgs/development/python-modules/cython/0.nix index f30b0b4f7452..a54ebfa8b156 100644 --- a/pkgs/development/python-modules/cython/0.nix +++ b/pkgs/development/python-modules/cython/0.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-XsEy2NrG7hq+VXRCRbD4BRaBieU6mVoE0GT52L3mMhs="; }; diff --git a/pkgs/development/python-modules/dedupe-pylbfgs/default.nix b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix index 83b031473cd9..a06645526753 100644 --- a/pkgs/development/python-modules/dedupe-pylbfgs/default.nix +++ b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dedupeio"; repo = "pylbfgs"; - tag = "${version}"; + tag = version; hash = "sha256-H416dgZQxyqsnhmlK5keW8cJWY6gea4mebVuP0IEVOU="; }; diff --git a/pkgs/development/python-modules/defang/default.nix b/pkgs/development/python-modules/defang/default.nix index a2452e6cca50..0bb3d89e63e0 100644 --- a/pkgs/development/python-modules/defang/default.nix +++ b/pkgs/development/python-modules/defang/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromBitbucket { owner = "johannestaas"; repo = "defang"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-OJfayJeVf2H1/jg7/fu2NiHhRHNCaLGI29SY8BnJyxI="; }; diff --git a/pkgs/development/python-modules/discord-webhook/default.nix b/pkgs/development/python-modules/discord-webhook/default.nix index 901f5d12a631..c1bd7a56b14f 100644 --- a/pkgs/development/python-modules/discord-webhook/default.nix +++ b/pkgs/development/python-modules/discord-webhook/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lovvskillz"; repo = "python-discord-webhook"; - tag = "${version}"; + tag = version; hash = "sha256-7nVvtXo1XjQExZSCF9VaYSCeEByJY2jn5KbVGTi33f0="; }; diff --git a/pkgs/development/python-modules/django-crossdomainmedia/default.nix b/pkgs/development/python-modules/django-crossdomainmedia/default.nix index 998b69818a40..652a02851238 100644 --- a/pkgs/development/python-modules/django-crossdomainmedia/default.nix +++ b/pkgs/development/python-modules/django-crossdomainmedia/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { repo = "django-crossdomainmedia"; # Release is not tagged yet # https://github.com/stefanw/django-crossdomainmedia/issues/1 - # rev = "refs/tags/v${version}"; + # tag = "v${version}"; rev = "45af45a82e2630d99381758c7660fe9bdad06d2d"; hash = "sha256-nwFUm+cxokZ38c5D77z15gIO/kg49oRACOl6+eGGEtQ="; }; diff --git a/pkgs/development/python-modules/django-jquery-js/default.nix b/pkgs/development/python-modules/django-jquery-js/default.nix index ef2d1435ab02..f8aeaa570eb9 100644 --- a/pkgs/development/python-modules/django-jquery-js/default.nix +++ b/pkgs/development/python-modules/django-jquery-js/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchFromBitbucket { owner = "tim_heap"; repo = "django-jquery"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-TzMo31jFhcvlrmq2TJgQyds9n8eATaChnyhnQ7bwdzs="; }; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 94758d8e7ede..6a54a6e34180 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django"; repo = "django"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-vdY85Ib2knRFLPmZZ6ojiD5R9diuvpVut1+nOVXSp0Y="; }; diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix index 3fbdc3ae0445..d35469b1af38 100644 --- a/pkgs/development/python-modules/django/5_2.nix +++ b/pkgs/development/python-modules/django/5_2.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "django"; repo = "django"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-9URe8hB15WP92AU1YgGGFfZhVxn59gfBRrORZ04L+F0="; }; diff --git a/pkgs/development/python-modules/dmgbuild/default.nix b/pkgs/development/python-modules/dmgbuild/default.nix index e0a8f3ef1138..319003ed6b90 100644 --- a/pkgs/development/python-modules/dmgbuild/default.nix +++ b/pkgs/development/python-modules/dmgbuild/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dmgbuild"; repo = "dmgbuild"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-PozYxmXumFnptIgb4FM4b/Q5tx0MIS2bVw2kCuGucA8="; }; diff --git a/pkgs/development/python-modules/ewmhlib/default.nix b/pkgs/development/python-modules/ewmhlib/default.nix index 23820d8c1383..f4c1cbc834de 100644 --- a/pkgs/development/python-modules/ewmhlib/default.nix +++ b/pkgs/development/python-modules/ewmhlib/default.nix @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "Kalmat"; repo = "EWMHlib"; - tag = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-NELOgUV8KuN+CqmoSbLYImguHlp8dyhGmJtoxJjOBkA="; }; diff --git a/pkgs/development/python-modules/exif/default.nix b/pkgs/development/python-modules/exif/default.nix index 8253298bb616..90a0f51b0a47 100644 --- a/pkgs/development/python-modules/exif/default.nix +++ b/pkgs/development/python-modules/exif/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "TNThieding"; repo = "exif"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-uiHL3m0C6+YnAHRLwzMCSzffrQsSyVcuem6FBtTLxek="; }; diff --git a/pkgs/development/python-modules/faraday-plugins/default.nix b/pkgs/development/python-modules/faraday-plugins/default.nix index cf2304f728d9..63fcd5b3e397 100644 --- a/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/pkgs/development/python-modules/faraday-plugins/default.nix @@ -19,21 +19,21 @@ tldextract, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "faraday-plugins"; - version = "1.25.0"; + version = "1.27.1"; pyproject = true; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; - tag = version; - hash = "sha256-VkpwTHPpM1cS5HT5zE3gB25zWOTIVaZdPKNgQFJHO/Q="; + tag = finalAttrs.version; + hash = "sha256-/K9mCwYOnz1oas9Qhf2UoYTeoJjGNKQ4JCx6rWy2EdE="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail "version=version," "version='${version}'," + --replace-fail "version=version," "version='${finalAttrs.version}'," ''; build-system = [ setuptools ]; @@ -64,7 +64,8 @@ buildPythonPackage rec { disabledTests = [ # Fail because of missing faraday "test_detect_report" - "test_process_report_summary" + "test_process_report" + "TestNuclei3x" # JSON parsing issue "test_process_report_ignore_info" "test_process_report_tags" @@ -75,9 +76,9 @@ buildPythonPackage rec { meta = { description = "Security tools report parsers for Faraday"; homepage = "https://github.com/infobyte/faraday_plugins"; - changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${src.tag}"; + changelog = "https://github.com/infobyte/faraday_plugins/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "faraday-plugins"; }; -} +}) diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix index 158050a9af77..87d3bc908e1e 100644 --- a/pkgs/development/python-modules/ffcv/default.nix +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "libffcv"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-L2mwGFivq/gtAw+1D6U2jbW6VxYgetHX7OUrjwyybqE="; }; diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 40d8434a88d3..7f7f4e307496 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "usnistgov"; repo = "fipy"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-usuAj+bIzbCSxYuKeUDxEESbjxPCwYwdD/opaBbgl1w="; }; diff --git a/pkgs/development/python-modules/flit-scm/default.nix b/pkgs/development/python-modules/flit-scm/default.nix index e5470bf2939f..60eb80034910 100644 --- a/pkgs/development/python-modules/flit-scm/default.nix +++ b/pkgs/development/python-modules/flit-scm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "WillDaSilva"; repo = "flit_scm"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-2nx9kWq/2TzauOW+c67g9a3JZ2dhBM4QzKyK/sqWOPo="; }; diff --git a/pkgs/development/python-modules/flynt/default.nix b/pkgs/development/python-modules/flynt/default.nix index 8b6a22087eef..2d531bc4500f 100644 --- a/pkgs/development/python-modules/flynt/default.nix +++ b/pkgs/development/python-modules/flynt/default.nix @@ -1,29 +1,28 @@ { - astor, buildPythonPackage, fetchFromGitHub, hatchling, lib, pytestCheckHook, - pythonOlder, - tomli, + hatch-vcs, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "flynt"; - version = "1.0.1"; + version = "1.0.6"; pyproject = true; src = fetchFromGitHub { owner = "ikamensh"; repo = "flynt"; - tag = version; - hash = "sha256-UHY4UDBHcP3ARikktIehSUD3Dx8A0xpOnfKWWrLCsOY="; + tag = finalAttrs.version; + hash = "sha256-SkkCA4fEHplt9HkEn+QOq4k9lW5qJeZzLZEbNEtKBSo="; }; - build-system = [ hatchling ]; - - propagatedBuildInputs = [ astor ] ++ lib.optionals (pythonOlder "3.11") [ tomli ]; + build-system = [ + hatchling + hatch-vcs + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -38,9 +37,9 @@ buildPythonPackage rec { meta = { description = "Tool to automatically convert old string literal formatting to f-strings"; homepage = "https://github.com/ikamensh/flynt"; - changelog = "https://github.com/ikamensh/flynt/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/ikamensh/flynt/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ cpcloud ]; mainProgram = "flynt"; }; -} +}) diff --git a/pkgs/development/python-modules/frictionless/default.nix b/pkgs/development/python-modules/frictionless/default.nix index 269670c7981f..599f8f0e8258 100644 --- a/pkgs/development/python-modules/frictionless/default.nix +++ b/pkgs/development/python-modules/frictionless/default.nix @@ -204,9 +204,15 @@ buildPythonPackage rec { "frictionless/formats/spss" # Console CLI tests fail due to typer/Click CliRunner output capture issues # result.stdout is empty when error messages are expected - # All 1690 functional tests pass (including duckdb adapter tests) "frictionless/console/__spec__/test_console.py" "frictionless/console/commands/__spec__/test_summary.py" + # We're well-ahead of requirements for duckdb and sqlalchemy + # https://github.com/frictionlessdata/frictionless-py/blob/be08dcf491781a565d230f47e08707e703292d85/pyproject.toml#L84 + "frictionless/formats/sql/__spec__/duckdb/test_adapter.py" + "frictionless/formats/sql/__spec__/duckdb/test_parser.py" + "frictionless/indexer/__spec__/test_resource.py::test_resource_index_sqlite[duckdb_url]" + "frictionless/indexer/__spec__/test_resource.py::test_resource_index_sqlite_with_metadata[duckdb_url]" + "frictionless/indexer/__spec__/test_resource.py::test_resource_index_sqlite_on_progress[duckdb_url]" ]; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/fslpy/default.nix b/pkgs/development/python-modules/fslpy/default.nix index d3bbdc549e3d..c2815dc78e89 100644 --- a/pkgs/development/python-modules/fslpy/default.nix +++ b/pkgs/development/python-modules/fslpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { domain = "git.fmrib.ox.ac.uk"; owner = "fsl"; repo = "fslpy"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-lY/7TNOqGK0pRm5Rne1nrqXVQDZPkHwlZV9ITsOwp9Q="; }; diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index 4088d11c34b1..8730534514e1 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -1,5 +1,6 @@ { lib, + fetchpatch, buildPythonPackage, fetchFromGitHub, setuptools, @@ -18,6 +19,14 @@ buildPythonPackage rec { hash = "sha256-0p8FW9alcWCSdi66wanS/F9IgO714WIRQIXvg3f9op8="; }; + patches = [ + (fetchpatch { + name = "allow-install-python314"; + url = "https://github.com/jazzband/geojson/commit/2584c0de5651bd694499449f9da5321b15597270.patch"; + hash = "sha256-64LPEwC1qc83wF48878fH31CVFn2txTmSxxr0cnQbRg="; + }) + ]; + build-system = [ setuptools ]; pythonImportsCheck = [ "geojson" ]; @@ -30,5 +39,6 @@ buildPythonPackage rec { description = "Python bindings and utilities for GeoJSON"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ oxzi ]; + teams = [ lib.teams.geospatial ]; }; } diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix index d68f038ec3b9..1e84679782a0 100644 --- a/pkgs/development/python-modules/gmpy/default.nix +++ b/pkgs/development/python-modules/gmpy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aleaxit"; repo = "gmpy"; - rev = "refs/tags/gmpy_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tag = "gmpy_${lib.replaceStrings [ "." ] [ "_" ] version}"; hash = "sha256-kMidOjhKJlDRu2qaiq9c+XcwD1tNAoPhRTvvGcOJe8I="; }; diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index beb40cd058a7..fc77bddb0c02 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -12,15 +12,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-resource-manager"; - version = "1.15.0"; + version = "1.16.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_resource_manager"; - inherit version; - hash = "sha256-PQt4w9qnE/lW0k5SWzXp6adtWXxDiDcXEwTUMQhM7a8="; + inherit (finalAttrs) version; + hash = "sha256-zJOPh8w2wmcvBiseVBZQYp4NlUxAWk2sNc7t7nDCZ8M="; }; build-system = [ setuptools ]; @@ -52,8 +52,8 @@ buildPythonPackage rec { meta = { description = "Google Cloud Resource Manager API client library"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-resource-manager"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v${version}/packages/google-cloud-resource-manager/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v${finalAttrs.version}/packages/google-cloud-resource-manager/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix index 38c85619a893..ea349bf4f9c0 100644 --- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix +++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix @@ -12,15 +12,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-vpc-access"; - version = "1.14.0"; + version = "1.15.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_vpc_access"; - inherit version; - hash = "sha256-N1CpDs/TgSCjJOnNwOJCaS7MWur95uoztvl+R5DjYC0="; + inherit (finalAttrs) version; + hash = "sha256-kO/iNVmRbMzoNErXVnarpkATXY+PwJiLVSoKpLui4Us="; }; build-system = [ setuptools ]; @@ -47,8 +47,8 @@ buildPythonPackage rec { meta = { description = "Python Client for Virtual Private Cloud"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-vpc-access"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-vpc-access-v${version}/packages/google-cloud-vpc-access/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-vpc-access-v${finalAttrs.version}/packages/google-cloud-vpc-access/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix index 46e764069b38..ebeeb456c1c3 100644 --- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix +++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix @@ -12,15 +12,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-webrisk"; - version = "1.19.0"; + version = "1.20.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_webrisk"; - inherit version; - hash = "sha256-TuWU+3pfwFt8E06zUDAY8+JJb+2j4l/eHP7Y0dgE0gs="; + inherit (finalAttrs) version; + hash = "sha256-XjzgGju4J1oUnYPoX1DiW16Z1/4WCQh/cMqxRKhNpZ8="; }; build-system = [ setuptools ]; @@ -48,8 +48,8 @@ buildPythonPackage rec { meta = { description = "Python Client for Web Risk"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-webrisk"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-webrisk-v${version}/packages/google-cloud-webrisk/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-webrisk-v${finalAttrs.version}/packages/google-cloud-webrisk/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix index 39f05e282af1..7363c128f02b 100644 --- a/pkgs/development/python-modules/google-cloud-workflows/default.nix +++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix @@ -11,15 +11,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-workflows"; - version = "1.19.0"; + version = "1.20.0"; pyproject = true; src = fetchPypi { pname = "google_cloud_workflows"; - inherit version; - hash = "sha256-SODiguyX82EPPvm3wvRp7tAcArNINmc9c1+WkkKPNHE="; + inherit (finalAttrs) version; + hash = "sha256-aicI4O1m3L3gtnZ3eslGSKsFKyVTnWyr0SjNJdWxcfQ="; }; build-system = [ setuptools ]; @@ -46,8 +46,8 @@ buildPythonPackage rec { meta = { description = "Python Client for Cloud Workflows"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-workflows"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-workflows-v${version}/packages/google-cloud-workflows/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-workflows-v${finalAttrs.version}/packages/google-cloud-workflows/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix index e211585c3940..07ca89dc15f9 100644 --- a/pkgs/development/python-modules/hatch-jupyter-builder/default.nix +++ b/pkgs/development/python-modules/hatch-jupyter-builder/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jupyterlab"; repo = "hatch-jupyter-builder"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-QDWHVdjtexUNGRL+dVehdBwahSW2HmNkZKkQyuOghyI="; }; diff --git a/pkgs/development/python-modules/hledger-utils/default.nix b/pkgs/development/python-modules/hledger-utils/default.nix index e23b78d12e85..498a2b00a46f 100644 --- a/pkgs/development/python-modules/hledger-utils/default.nix +++ b/pkgs/development/python-modules/hledger-utils/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "nobodyinperson"; repo = "hledger-utils"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-Qu4nUcAGTACmLhwc7fkLxITOyFnUHv85qMhtViFumVs="; }; diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index a46dd176da42..1f0525638641 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -14,9 +14,9 @@ websockets, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "homematicip"; - version = "2.4.0"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hahn-th"; repo = "homematicip-rest-api"; - tag = version; - hash = "sha256-Ye3UDItGbpF+7iqcBruep0Vb/Oj7KkF0z2HeZ44MeA0="; + tag = finalAttrs.version; + hash = "sha256-UdVOYJyWLtqJaZgiRa3M9JL+gPzZeecZwElBXqrAdFM="; }; build-system = [ @@ -79,8 +79,8 @@ buildPythonPackage rec { meta = { description = "Module for the homematicIP REST API"; homepage = "https://github.com/hahn-th/homematicip-rest-api"; - changelog = "https://github.com/hahn-th/homematicip-rest-api/releases/tag/${src.tag}"; + changelog = "https://github.com/hahn-th/homematicip-rest-api/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index af26c394d781..1be25e708952 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202601151"; + version = "0.1.202601161"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-J8b4pPBip8rRwDVxmOXl1+WI00qchu4eJj50jCmJ9Zo="; + hash = "sha256-9Z98crfuhXI65Wfa6qDMxi0Obek0VozPnpaSHN2I4Ik="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/imap-tools/default.nix b/pkgs/development/python-modules/imap-tools/default.nix index 033cad18c38a..56aaef013e81 100644 --- a/pkgs/development/python-modules/imap-tools/default.nix +++ b/pkgs/development/python-modules/imap-tools/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "imap-tools"; - version = "1.11.0"; + version = "1.11.1"; pyproject = true; src = fetchFromGitHub { owner = "ikvk"; repo = "imap_tools"; tag = "v${version}"; - hash = "sha256-8oPiCFoJ0mV7ZnteM9lufIbxwA/7hV91959weEx/e30="; + hash = "sha256-6DvK8X/P6ZksR9k7sd0RJXbFtrk3Zbyt+CT73j/Ej3M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jaxlib/default.nix b/pkgs/development/python-modules/jaxlib/default.nix index a12fe4f9d29f..449665d68b02 100644 --- a/pkgs/development/python-modules/jaxlib/default.nix +++ b/pkgs/development/python-modules/jaxlib/default.nix @@ -230,7 +230,7 @@ let owner = "google"; repo = "jax"; # google/jax contains tags for jax and jaxlib. Only use jaxlib tags! - rev = "refs/tags/${pname}-v${version}"; + tag = "${pname}-v${version}"; hash = "sha256-qSHPwi3is6Ts7pz5s4KzQHBMbcjGp+vAOsejW3o36Ek="; }; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 1151847d6c7c..629e583d2d78 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -121,7 +121,7 @@ buildPythonPackage rec { version = "0.21.2"; src = fetchFromGitHub { inherit (prev.src) owner repo; - rev = "refs/tags/v${final.version}"; + tag = "v${final.version}"; hash = "sha256-AVVvdo/CDF9IU6l779sLc7wKz5h3kzMttdDNTPLYxtQ="; }; } diff --git a/pkgs/development/python-modules/kestra/default.nix b/pkgs/development/python-modules/kestra/default.nix index d0e007c4b698..9783f1704b71 100644 --- a/pkgs/development/python-modules/kestra/default.nix +++ b/pkgs/development/python-modules/kestra/default.nix @@ -10,23 +10,22 @@ pytest-mock, requests-mock, }: -buildPythonPackage rec { + +buildPythonPackage (finalAttrs: { pname = "kestra"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "kestra-io"; repo = "libs"; - tag = "v${version}"; - hash = "sha256-cDJ5c4HgwmBnRtAFp8gxCqpo8AYJcuI2tthQOXaSOmU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-JpePlqwjIalbkVMIIqZ4z6YfkvjyuYUbhXcD2Z6hp/Y="; }; - sourceRoot = "${src.name}/python"; + sourceRoot = "${finalAttrs.src.name}/python"; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ requests @@ -34,9 +33,7 @@ buildPythonPackage rec { python-dateutil ]; - pythonImportsCheck = [ - "kestra" - ]; + pythonImportsCheck = [ "kestra" ]; nativeCheckInputs = [ pytestCheckHook @@ -47,7 +44,8 @@ buildPythonPackage rec { meta = { description = "Infinitely scalable orchestration and scheduling platform, creating, running, scheduling, and monitoring millions of complex pipelines"; homepage = "https://github.com/kestra-io/libs"; + changelog = "https://github.com/kestra-io/libs/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.apsl20; maintainers = with lib.maintainers; [ DataHearth ]; }; -} +}) diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index f0450aeb1366..c5343acb1878 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "langchain-aws"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langchain-aws"; tag = "langchain-aws==${version}"; - hash = "sha256-xihQ50g0urP7BL91C0msfaPIVTN2Gb9sWQhKU7eWg1w="; + hash = "sha256-FJRlt8+Xo2TqXevgx/Pb9LF/fjej+VXzfxZwZEC67ok="; }; postPatch = '' diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix index 13040be3fbb6..9527031f45cb 100644 --- a/pkgs/development/python-modules/langfuse/default.nix +++ b/pkgs/development/python-modules/langfuse/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, anyio, backoff, httpx, @@ -19,18 +20,21 @@ wrapt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "langfuse"; - version = "3.11.0"; + version = "3.11.2"; pyproject = true; src = fetchFromGitHub { owner = "langfuse"; repo = "langfuse-python"; - tag = "v${version}"; - hash = "sha256-3hL29Gu1lonkWAOyTqH2q03joXwVQimbVF0R2nYZUIs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-CZa1nzgGHQSx/cPkOxbDsfkWpgr/veWRN8zgHeYrJOw="; }; + # https://github.com/langfuse/langfuse/issues/9618 + disabled = pythonAtLeast "3.14"; + build-system = [ poetry-core ]; pythonRelaxDeps = [ "packaging" ]; @@ -63,8 +67,8 @@ buildPythonPackage rec { meta = { description = "Instrument your LLM app with decorators or low-level SDK and get detailed tracing/observability"; homepage = "https://github.com/langfuse/langfuse-python"; - changelog = "https://github.com/langfuse/langfuse-python/releases/tag/${src.tag}"; + changelog = "https://github.com/langfuse/langfuse-python/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; }; -} +}) diff --git a/pkgs/development/python-modules/liberty-parser/default.nix b/pkgs/development/python-modules/liberty-parser/default.nix index fc66f6ebbae0..84e60242771f 100644 --- a/pkgs/development/python-modules/liberty-parser/default.nix +++ b/pkgs/development/python-modules/liberty-parser/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "liberty-parser"; - version = "0.0.28"; + version = "0.0.29"; pyproject = true; src = fetchFromGitea { @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tok"; repo = "liberty-parser"; tag = version; - hash = "sha256-CdsT0R2KVvN0+TfTuauaNpYTKhxx1gAOJJdWNfQb2Dk="; + hash = "sha256-rPEZIRxvmNrDTVD4NG7v2BT3jJXtTisfs4txCG4OfnQ="; }; # Tests try to write to /tmp directly. use $TMPDIR instead. diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 53465893fd40..8a7304f57812 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -7,15 +7,15 @@ hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-llms-openai"; - version = "0.6.12"; + version = "0.6.13"; pyproject = true; src = fetchPypi { pname = "llama_index_llms_openai"; - inherit version; - hash = "sha256-m4sddDWYP5dPe0X3lCg2G/22jGIlQSBTkr+PD+oXm64="; + inherit (finalAttrs) version; + hash = "sha256-47dCK8ciduAKmA2CZHfQsU1b90O6acSk8L3uD1Il1FA="; }; pythonRemoveDeps = [ @@ -41,4 +41,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix index 4fc4c386d5f5..4f6a0b167520 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix @@ -7,15 +7,15 @@ pymilvus, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-vector-stores-milvus"; - version = "0.9.5"; + version = "0.9.6"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_milvus"; - inherit version; - hash = "sha256-c44M+k0OL2cKAlI4OZI5f/sf/kF0Cg8o2CxoBUbZMdg="; + inherit (finalAttrs) version; + hash = "sha256-bTisWTmlcOAkBof1T77k4f9sX6otKNJTd6PzjSygfis="; }; build-system = [ hatchling ]; @@ -36,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/llama-stack-client/default.nix b/pkgs/development/python-modules/llama-stack-client/default.nix index 572a79537e89..adc6db0391a9 100644 --- a/pkgs/development/python-modules/llama-stack-client/default.nix +++ b/pkgs/development/python-modules/llama-stack-client/default.nix @@ -13,6 +13,7 @@ httpx-aiohttp, httpx, nest-asyncio, + openai, pandas, prompt-toolkit, pyaml, @@ -29,15 +30,15 @@ typing-extensions, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-stack-client"; - version = "0.2.23"; + version = "0.4.2"; pyproject = true; src = fetchPypi { pname = "llama_stack_client"; - inherit version; - hash = "sha256-aPNOisjupqc+2dSXfYSZkrLYvYNYBNdwoRhDQxzVv3Q="; + inherit (finalAttrs) version; + hash = "sha256-Ene/VjUx2bxHbjBfLSvq2ZAJhtQmouMsmt9LakZIBMM="; }; postPatch = '' @@ -78,12 +79,13 @@ buildPythonPackage rec { nativeCheckInputs = [ dirty-equals nest-asyncio + openai pytest-asyncio pytest-xdist pytestCheckHook respx ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "llama_stack_client" ]; @@ -91,13 +93,17 @@ buildPythonPackage rec { # Tests require network access "tests/api_resources/" "tests/test_client.py" + "tests/integration/test_agent_turn_step_events.py" + + # AttributeError: 'Agent' object has no attribute '_session_last_response_id' + "tests/lib/agents/test_agent_responses.py::test_agent_tracks_multiple_sessions" ]; meta = { description = "Library for the llama-stack-client API"; homepage = "https://github.com/llamastack/llama-stack-client-python"; - changelog = "https://github.com/llamastack/llama-stack-client-python/releases/tag/v${version}"; + changelog = "https://github.com/llamastack/llama-stack-client-python/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/marqo/default.nix b/pkgs/development/python-modules/marqo/default.nix index a4f68be28e89..a23240eeabf9 100644 --- a/pkgs/development/python-modules/marqo/default.nix +++ b/pkgs/development/python-modules/marqo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "marqo-ai"; repo = "py-marqo"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-phO7aR7kQJHw5qxrpMI5DtOaXlaHMsKfaC3UquyD/Rw="; }; diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index 050a24bc2d25..ab73bccb8a68 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "irmen"; repo = "pyminiaudio"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-H3o2IWGuMqLrJTzQ7w636Ito6f57WBtMXpXXzrZ7UD8="; }; diff --git a/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix b/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix index f634c44c9983..94afb210b6d3 100644 --- a/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix +++ b/pkgs/development/python-modules/mkdocs-include-markdown-plugin/default.nix @@ -42,6 +42,9 @@ buildPythonPackage rec { description = "Mkdocs Markdown includer plugin"; homepage = "https://pypi.org/project/mkdocs-include-markdown-plugin/"; license = lib.licenses.asl20; - teams = [ lib.teams.cyberus ]; + maintainers = with lib.maintainers; [ + e1mo + xanderio + ]; }; } diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index e84ba439dcd3..6fb5fb1850f4 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -207,8 +207,8 @@ in "sha256-Yj+PL5SHeMuiC3kougQa6zahznlD32+1NQWqoD8xdEg="; mypy-boto3-cleanrooms = - buildMypyBoto3Package "cleanrooms" "1.42.20" - "sha256-Psj4WK99bI+zQBUCmUgiL1zl7i/f76Ieu0QxIfGUfvA="; + buildMypyBoto3Package "cleanrooms" "1.42.29" + "sha256-UaGUvnJYw/bCJzIU9exO/eW2cvnUuiDGheFO6Zj3Uoo="; mypy-boto3-cloud9 = buildMypyBoto3Package "cloud9" "1.42.3" @@ -335,8 +335,8 @@ in "sha256-zMNP1LXKSynkfJSLn19sz5UoT8LiswD5qSZCn1y5GsA="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.42.28" - "sha256-Vt3rd5sY2S/RNpgGK6rdQK0EEwe5y8yPTPm4LTk/sIo="; + buildMypyBoto3Package "connect" "1.42.30" + "sha256-P0z7BN74A6ihdUOE5lFN68BUqvdMLq6KuvX/kY9yJgI="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.42.3" @@ -443,8 +443,8 @@ in "sha256-92qhSUqTiLgbtvCdi/Mmgve18mcYR00ABL+bNy7/OnY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.42.15" - "sha256-ZntIoM7u7EpnFzJMsezVzy7XwsX3i6Z+FwhaVAxR0no="; + buildMypyBoto3Package "ec2" "1.42.29" + "sha256-o7pABpOci5Z0fblGTcpep7FnFTW37OQWTnxbIk8CZJo="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.42.3" @@ -459,8 +459,8 @@ in "sha256-syjw4M02YXRXsJpM3e7OikE3sSTl/hIIJ3857PP2BII="; mypy-boto3-ecs = - buildMypyBoto3Package "ecs" "1.42.13" - "sha256-qINV3eKoz/lYLNIunllwb6u7RC19cHVbs1LInPevkjo="; + buildMypyBoto3Package "ecs" "1.42.29" + "sha256-hXpGVFL8ZLXWs7GNz8Ij3xXzKBd6HMi7/deFq4s5RrM="; mypy-boto3-efs = buildMypyBoto3Package "efs" "1.42.3" @@ -563,8 +563,8 @@ in "sha256-4LBhjln6mCxMSooGEV7mo1Fe7U6Jssxq+6JYwqnFhRs="; mypy-boto3-glacier = - buildMypyBoto3Package "glacier" "1.42.10" - "sha256-EFKWChvNMhj07s/la58yb7iZKtAh96qysffZ8LdvZeE="; + buildMypyBoto3Package "glacier" "1.42.30" + "sha256-TtiFsS2IIBgVxTwAWwU5M/0pBfXs1zxnnyjMuMhjWDY="; mypy-boto3-globalaccelerator = buildMypyBoto3Package "globalaccelerator" "1.42.3" @@ -762,8 +762,8 @@ in "sha256-UfEbkTcu9ecQoqoXbM6uWxNAh5B/Z6Wj26WHSaLiEj8="; mypy-boto3-lakeformation = - buildMypyBoto3Package "lakeformation" "1.42.3" - "sha256-6fTkAXpFQ0Io8akKnTdSGENyKmsTu6VtkzVXRsskKZE="; + buildMypyBoto3Package "lakeformation" "1.42.29" + "sha256-Yb24aPwMfxgh4ftE8k6mCvvJCTuUCxD5J+GElQBMD+U="; mypy-boto3-lambda = buildMypyBoto3Package "lambda" "1.42.8" @@ -970,8 +970,8 @@ in "sha256-NVhi7X3TpxHLoalx2LTleKBXUiWElWdr4NGdOlnuoXk="; mypy-boto3-opensearchserverless = - buildMypyBoto3Package "opensearchserverless" "1.42.3" - "sha256-Yz43bH+alilEKIqvD41ueohgC4eu2sUy5Z2qfIX82co="; + buildMypyBoto3Package "opensearchserverless" "1.42.29" + "sha256-fC4SP/yP31qx5O5a2rStUATsq+Cs5zWpwGf1XsBWFQI="; mypy-boto3-opsworks = buildMypyBoto3Package "opsworks" "1.40.0" @@ -1110,8 +1110,8 @@ in "sha256-fijgv07T/uckhzTbyzvQ8IzbtaYyz5QTeHGl3w4+Sko="; mypy-boto3-resource-explorer-2 = - buildMypyBoto3Package "resource-explorer-2" "1.42.3" - "sha256-Jvb5qMnUZhiuDYtByiG2CjaQPsm30iyEEWGG1hKUg48="; + buildMypyBoto3Package "resource-explorer-2" "1.42.30" + "sha256-KP7USy0B599a9Z0R3LwpKeb/XpjPUde3qe2oNH87xR4="; mypy-boto3-resource-groups = buildMypyBoto3Package "resource-groups" "1.42.3" @@ -1170,8 +1170,8 @@ in "sha256-juVfwdjPDNPaT5tvyXpzDtomugqxeu++AERLkVtFIxw="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.42.26" - "sha256-v7Ya1FPmGr/HvommCpAZ9IFlkUEXY1tB3adPIuwjoYo="; + buildMypyBoto3Package "sagemaker" "1.42.30" + "sha256-X4wR1GUZ1rFVDoWx5IODmCYaqGEfuN7oTJRqIE7ypqA="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.42.3" diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index a38ed796db89..ad9be9312a9b 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { domain = "dev.gajim.org"; owner = "gajim"; repo = "python-nbxmpp"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-q910WbBp0TBqXw8WfYniliVGnr4Hi6dDhVDqZszSL0c="; }; diff --git a/pkgs/development/python-modules/nexusrpc/default.nix b/pkgs/development/python-modules/nexusrpc/default.nix index 7399bd358595..de8c5f30dcbb 100644 --- a/pkgs/development/python-modules/nexusrpc/default.nix +++ b/pkgs/development/python-modules/nexusrpc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nexus-rpc"; repo = "sdk-python"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-i2FfJ3aCncbqLY2oBG8zAPTbgxzH30MSmZxhDltN4JA="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix index 258faa3462ed..08f83f95798b 100644 --- a/pkgs/development/python-modules/niworkflows/default.nix +++ b/pkgs/development/python-modules/niworkflows/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "niworkflows"; - version = "1.14.3"; + version = "1.14.4"; pyproject = true; src = fetchFromGitHub { owner = "nipreps"; repo = "niworkflows"; tag = version; - hash = "sha256-wdPHXVgMvd+Od3M2j7S43gBRSh4yiPeu+HM6EyiakwU="; + hash = "sha256-AMUOiIL33kcJtlKT+L5QwcUh8mBBkf80uzOQZFKDauo="; }; pythonRelaxDeps = [ "traits" ]; diff --git a/pkgs/development/python-modules/nvdlfw-inspect/default.nix b/pkgs/development/python-modules/nvdlfw-inspect/default.nix new file mode 100644 index 000000000000..ab7f1db22e2f --- /dev/null +++ b/pkgs/development/python-modules/nvdlfw-inspect/default.nix @@ -0,0 +1,47 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # dependencies + pyyaml, + torch, + + # tests + pytestCheckHook, +}: + +# nixpkgs-update: no auto update +# The bot tries to update the package to the older 0.2 tag + +buildPythonPackage (finalAttrs: { + pname = "nvdlfw-inspect"; + version = "0.2.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "nvidia-dlfw-inspect"; + # No tag, found the commit using `git blame` + rev = "3a7314ac44f8479a3368a69ac4c7938e40e6104c"; + hash = "sha256-qLyPzdwIIXHUDeP226w4yo2B1fqOKZ3yeSXrG3pNQyk="; + }; + + dependencies = [ + pyyaml + torch + ]; + + pythonImportsCheck = [ "nvdlfw_inspect" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Facilitates debugging convergence issues and testing new algorithms/recipes for training LLMs using Nvidia libraries"; + homepage = "https://github.com/NVIDIA/nvidia-dlfw-inspect"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 13dfcec11fb0..523f625c44a8 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchgit { url = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; - rev = "refs/tags/${pname}-${version}"; + tag = "${pname}-${version}"; sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa"; }; diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 85a14ba9ac0f..645dcca9dd8a 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "openai"; - version = "2.11.0"; + version = "2.15.0"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-f4d6gz4W04NPu43u0ovORzvF8ZW7oIYO8DJIqUGIEdE="; + hash = "sha256-FmOmWtkp+Pe3pICi0uvzsb1nsP4M4yc/34U3Bd2q/KE="; }; postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"''; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index f2ae52cfcb51..72f88a169d81 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { domain = "foss.heptapod.net"; owner = "openpyxl"; repo = "openpyxl"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-vp+TIWcHCAWlDaBcmC7w/kV7DZTZpa6463NusaJmqKo="; }; diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix index bd501db36b4a..cb8ff61bab36 100644 --- a/pkgs/development/python-modules/opower/default.nix +++ b/pkgs/development/python-modules/opower/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "opower"; - version = "0.16.2"; + version = "0.16.3"; pyproject = true; src = fetchFromGitHub { owner = "tronikos"; repo = "opower"; tag = "v${finalAttrs.version}"; - hash = "sha256-6VqGM8HhqXVXVTXjWxr8IO5IMshcpeZBUF2VUoOnX0I="; + hash = "sha256-+LkLbIJR6v4icoQFIsipR+PfrF5ZgcEh5d1nAwVTldU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pluginlib/default.nix b/pkgs/development/python-modules/pluginlib/default.nix index 7d34cea82d1f..c3e89726e999 100644 --- a/pkgs/development/python-modules/pluginlib/default.nix +++ b/pkgs/development/python-modules/pluginlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Rockhopper-Technologies"; repo = "pluginlib"; - tag = "${version}"; + tag = version; hash = "sha256-mt3VE8iJPCmbws8bAdYMK9to446z8FQtsMZOlkLVUIU="; }; diff --git a/pkgs/development/python-modules/plum-py/default.nix b/pkgs/development/python-modules/plum-py/default.nix index f4b137c6725a..4d099fd594d3 100644 --- a/pkgs/development/python-modules/plum-py/default.nix +++ b/pkgs/development/python-modules/plum-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "dangass"; repo = "plum"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-gZSRqijKdjqOZe1+4aeycpCPsh6HC5sRbyVjgK+g4wM="; }; diff --git a/pkgs/development/python-modules/port-for/default.nix b/pkgs/development/python-modules/port-for/default.nix index 8f0de56e3ea8..7f983879fb6c 100644 --- a/pkgs/development/python-modules/port-for/default.nix +++ b/pkgs/development/python-modules/port-for/default.nix @@ -8,19 +8,20 @@ buildPythonPackage rec { pname = "port-for"; - version = "0.7.1"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "kmike"; repo = "port-for"; tag = "v${version}"; - hash = "sha256-/45TQ2crmTupRgL9hgZGw5IvFKywezSIHqHFbeAkMoo="; + hash = "sha256-vv2xjXyUh6g7T0zGDAlOs3K+YM18wSE8rEvgSP1ZBL4="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "port_for" ]; meta = { diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index d69b3622ce3c..651805651b43 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.58.0"; + version = "2.58.1"; pyproject = false; src = fetchurl { url = "mirror://gnome/sources/pyatspi/${lib.versions.majorMinor version}/pyatspi-${version}.tar.xz"; - sha256 = "6dKQ1TzH4wZtly/RilDuiF77i+CqJSYvGe9/iE/qDv8="; + sha256 = "Px8HmTX5JlhDMQJcdTGFjetCJFyZO2USH09LAeawRTY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index 3f42f2e7e7b3..af1195baf61b 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -5,9 +5,6 @@ fetchFromGitHub, cmake, boost, - eigen, - ipopt, - nlopt, pagmo2, python, cloudpickle, @@ -43,9 +40,6 @@ toPythonModule ( buildInputs = [ boost - eigen - ipopt - nlopt pagmo2 pybind11 ]; diff --git a/pkgs/development/python-modules/pykakasi/default.nix b/pkgs/development/python-modules/pykakasi/default.nix index 0162f0c33286..3ea76b573612 100644 --- a/pkgs/development/python-modules/pykakasi/default.nix +++ b/pkgs/development/python-modules/pykakasi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { domain = "codeberg.org"; owner = "miurahr"; repo = "pykakasi"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-b2lYYdg1RW1xRD3hym7o1EnxzN/U5txVTWRifwZn3k0="; }; diff --git a/pkgs/development/python-modules/pylsl/default.nix b/pkgs/development/python-modules/pylsl/default.nix index 6f11c43821f6..90fe12d0c1d9 100644 --- a/pkgs/development/python-modules/pylsl/default.nix +++ b/pkgs/development/python-modules/pylsl/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pylsl"; - version = "1.17.6"; + version = "1.18.1"; pyproject = true; src = fetchFromGitHub { owner = "labstreaminglayer"; repo = "pylsl"; tag = "v${version}"; - hash = "sha256-PEeTG+bQNEce9j0obDoaTYXMGp0MRUibbWVXM1IvGGY="; + hash = "sha256-H/ALvRtgv1Ms9VeTJvDRCpg0Q+/4Xjx/NS4whOGmtU8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymonctl/default.nix b/pkgs/development/python-modules/pymonctl/default.nix index 643e56257c1e..7a434581e95e 100644 --- a/pkgs/development/python-modules/pymonctl/default.nix +++ b/pkgs/development/python-modules/pymonctl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "Kalmat"; repo = "PyMonCtl"; - tag = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eFB+HqYBud836VNEA8q8o1KQKA+GHwSC0YfU1KCbDXw="; }; diff --git a/pkgs/development/python-modules/pymongo-search-utils/default.nix b/pkgs/development/python-modules/pymongo-search-utils/default.nix index 5702d09294f0..befb10f13705 100644 --- a/pkgs/development/python-modules/pymongo-search-utils/default.nix +++ b/pkgs/development/python-modules/pymongo-search-utils/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymongo-search-utils"; - version = "0.1.0"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "mongodb-labs"; repo = "pymongo-search-utils"; tag = version; - hash = "sha256-R0GYfVeLc0zfzfEGBil/AHyt20Y0bEo+eQ9wtdNwJL8="; + hash = "sha256-nNXJwRtN5AICpI/OdS+ToYbUIfMSL88XiO6Hrh2R8NA="; }; build-system = [ diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index 2843018a6c6e..99c041bd444d 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "7.5.0"; + version = "7.6.0"; pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; repo = "pynetbox"; tag = "v${version}"; - hash = "sha256-gDcTWXGE0GOEmuDSwFgKytCidg8Py1PFMfJCDhuOMoQ="; + hash = "sha256-XflMJ6mrXOeUt+Tlmaa2Tw59M3zssnjgnZ7RoQRdOTQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/pytest-postgresql/default.nix b/pkgs/development/python-modules/pytest-postgresql/default.nix index 5e3cbe9954eb..ad9fe9193407 100644 --- a/pkgs/development/python-modules/pytest-postgresql/default.nix +++ b/pkgs/development/python-modules/pytest-postgresql/default.nix @@ -7,6 +7,7 @@ pytest-cov-stub, setuptools, mirakuru, + packaging, port-for, psycopg, pytest, @@ -15,29 +16,29 @@ buildPythonPackage rec { pname = "pytest-postgresql"; - version = "6.0.0"; + version = "7.0.2"; pyproject = true; src = fetchFromGitHub { - owner = "ClearcodeHQ"; + owner = "dbfixtures"; repo = "pytest-postgresql"; tag = "v${version}"; - hash = "sha256-6D9QNcfq518ORQDYCH5G+LLJ7tVWPFwB6ylZR3LOZ5g="; + hash = "sha256-/EekUveW3wb8NlcKacMJpjjU7bpFvnNMpAuZ9h0sbpw="; }; postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail "--max-worker-restart=0" "" sed -i 's#/usr/lib/postgresql/.*/bin/pg_ctl#${postgresql}/bin/pg_ctl#' pytest_postgresql/plugin.py ''; + build-system = [ setuptools ]; + buildInputs = [ pytest ]; dependencies = [ mirakuru port-for psycopg - setuptools # requires 'pkg_resources' at runtime + packaging ]; nativeCheckInputs = [ @@ -50,12 +51,14 @@ buildPythonPackage rec { ]; disabledTestPaths = [ "tests/docker/test_noproc_docker.py" ]; # requires Docker disabledTests = [ - # permissions issue running pg as Nixbld user - "test_executor_init_with_password" # "ValueError: Pytest terminal summary report not found" + "test_postgres_drop_test_database" "test_postgres_loader_in_cli" + "test_postgres_loader_in_ini" "test_postgres_options_config_in_cli" "test_postgres_options_config_in_ini" + "test_postgres_port_search_count_in_cli_is_int" + "test_postgres_port_search_count_in_ini_is_int" ]; pythonImportsCheck = [ "pytest_postgresql" @@ -69,7 +72,7 @@ buildPythonPackage rec { meta = { homepage = "https://pypi.python.org/pypi/pytest-postgresql"; description = "Pytest plugin that enables you to test code on a temporary PostgreSQL database"; - changelog = "https://github.com/ClearcodeHQ/pytest-postgresql/blob/v${version}/CHANGES.rst"; + changelog = "https://github.com/dbfixtures/pytest-postgresql/blob/v${version}/CHANGES.rst"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/python-apt/default.nix b/pkgs/development/python-modules/python-apt/default.nix index 99512d60930a..316a3f8eb9e3 100644 --- a/pkgs/development/python-modules/python-apt/default.nix +++ b/pkgs/development/python-modules/python-apt/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { domain = "salsa.debian.org"; owner = "apt-team"; repo = "python-apt"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-3mRMqbhKy5CYwpSttq8MgXY147Ov3lPuZaTjUMtmHik="; }; diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 06527bddc607..e10c433246b5 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.46.4"; + version = "0.46.5"; pyproject = true; src = fetchFromGitHub { owner = "pyvista"; repo = "pyvista"; tag = "v${version}"; - hash = "sha256-FFrnLiGiP6LSwaoEHx4tih6XPdKCZ/9tjvz00NQDU0Q="; + hash = "sha256-yTCHbAOcAxXrXwKbTXKGuSwoA69hy+XBT1kt6MhdoxQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pywinbox/default.nix b/pkgs/development/python-modules/pywinbox/default.nix index a6dfccf327c1..9815316daf3a 100644 --- a/pkgs/development/python-modules/pywinbox/default.nix +++ b/pkgs/development/python-modules/pywinbox/default.nix @@ -20,7 +20,7 @@ buildPythonPackage (finalAttrs: { src = fetchFromGitHub { owner = "Kalmat"; repo = "PyWinBox"; - tag = "refs/tags/v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Z/gedrIFNpQvzRWqGxMEl5MoEIo9znZz/FZLMVl0Eb4="; }; diff --git a/pkgs/development/python-modules/qiskit-finance/default.nix b/pkgs/development/python-modules/qiskit-finance/default.nix index 6ded6bd638f3..aacc7b0d031b 100644 --- a/pkgs/development/python-modules/qiskit-finance/default.nix +++ b/pkgs/development/python-modules/qiskit-finance/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "qiskit"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-zYhYhojCzlENzgYSenwewjeVHUBX2X6eQbbzc9znBsk="; }; diff --git a/pkgs/development/python-modules/qiskit-nature/default.nix b/pkgs/development/python-modules/qiskit-nature/default.nix index 69d66f6f9d5f..7635b0b82646 100644 --- a/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/pkgs/development/python-modules/qiskit-nature/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Qiskit"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-SVzg3McB885RMyAp90Kr6/iVKw3Su9ucTob2jBckBo0="; }; diff --git a/pkgs/development/python-modules/qiskit-optimization/default.nix b/pkgs/development/python-modules/qiskit-optimization/default.nix index 7ec578316d4b..2b63c5c56236 100644 --- a/pkgs/development/python-modules/qiskit-optimization/default.nix +++ b/pkgs/development/python-modules/qiskit-optimization/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "qiskit"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-kzEuICajlV8mgD0YLhwFJaDQVxYZo9jv3sr/r/P0VG0="; }; diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index 120ffc25b80f..80ac838b8312 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vanstinator"; repo = "raincloudy"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-qCkBVirM09iA1sXiOB9FJns8bHjQq7rRk8XbRWrtBDI="; }; diff --git a/pkgs/development/python-modules/reflex/default.nix b/pkgs/development/python-modules/reflex/default.nix index 51df98b9bf26..49f29978690d 100644 --- a/pkgs/development/python-modules/reflex/default.nix +++ b/pkgs/development/python-modules/reflex/default.nix @@ -49,14 +49,14 @@ buildPythonPackage (finalAttrs: { pname = "reflex"; - version = "0.8.24"; + version = "0.8.25"; pyproject = true; src = fetchFromGitHub { owner = "reflex-dev"; repo = "reflex"; tag = "v${finalAttrs.version}"; - hash = "sha256-l78pXsaPl6F7C850HD8/as/eJPaH1vOmnbNmuos7Yio="; + hash = "sha256-pp4onogav+kad0JpBRPnar30elP1aYuhA9AMoSjjRss="; }; # For some reason, pre_commit is supposedly missing when python>=3.14 diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix index f16f609ce960..48a7351a4682 100644 --- a/pkgs/development/python-modules/sagemaker-core/default.nix +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sagemaker-core"; - version = "1.0.72"; + version = "1.0.73"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-core"; tag = "v${version}"; - hash = "sha256-KntbPDsboaDs5jSREQca+N9xUd3lCZzH0pqeCIHmVxw="; + hash = "sha256-0pjz5XKiHe4ReDSeDeKpuT9hmv+XkM6ut3AbiWQDAlE="; }; build-system = [ diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index b54fa72b51be..bf3422f6cdb7 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -1,20 +1,21 @@ { lib, - appdirs, buildPythonPackage, - cryptography, fetchFromGitHub, + + # build-system flit-core, + + # dependencies + appdirs, + cryptography, id, importlib-resources, - nix-update-script, platformdirs, - pretend, pyasn1, pydantic, pyjwt, pyopenssl, - pytestCheckHook, requests, rfc3161-client, rfc8785, @@ -24,10 +25,17 @@ sigstore-protobuf-specs, sigstore-rekor-types, tuf, + + # tests + pretend, + pytestCheckHook, writableTmpDirAsHomeHook, + + # passthru + nix-update-script, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sigstore"; version = "4.1.0"; pyproject = true; @@ -35,32 +43,29 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sigstore"; repo = "sigstore-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-Wt9ZoMHTiMlbAab9p8/WF38/OiyCaqHPS5R7/fTAfxw="; }; + build-system = [ flit-core ]; + pythonRelaxDeps = [ "sigstore-models" - "sigstore-rekor-types" - "rfc3161-client" - "cryptography" ]; - build-system = [ flit-core ]; - dependencies = [ appdirs cryptography id importlib-resources + platformdirs + pyasn1 pydantic pyjwt pyopenssl - pyasn1 - rfc8785 - rfc3161-client - platformdirs requests + rfc3161-client + rfc8785 rich securesystemslib sigstore-models @@ -100,9 +105,9 @@ buildPythonPackage rec { meta = { description = "Codesigning tool for Python packages"; homepage = "https://github.com/sigstore/sigstore-python"; - changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/sigstore/sigstore-python/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bot-wxt1221 ]; mainProgram = "sigstore"; }; -} +}) diff --git a/pkgs/development/python-modules/skybellpy/default.nix b/pkgs/development/python-modules/skybellpy/default.nix index 76e58efe547a..8d610327ca09 100644 --- a/pkgs/development/python-modules/skybellpy/default.nix +++ b/pkgs/development/python-modules/skybellpy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MisterWil"; repo = "skybellpy"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-/+9KYxXYTN0T6PoccAA/pwdwWqOzCSZdNxj6xi6oG74="; }; diff --git a/pkgs/development/python-modules/spacy/lookups-data.nix b/pkgs/development/python-modules/spacy/lookups-data.nix index 0c61a09caded..8be43751fc9b 100644 --- a/pkgs/development/python-modules/spacy/lookups-data.nix +++ b/pkgs/development/python-modules/spacy/lookups-data.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "explosion"; repo = "spacy-lookups-data"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-6sKZ+GgCjLWYnV96nub4xEUFh1qpPQpbnoxyOVrvcD0="; }; diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix index 8ddfa6df9c67..fc45d496991f 100644 --- a/pkgs/development/python-modules/sqlfmt/default.nix +++ b/pkgs/development/python-modules/sqlfmt/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "sqlfmt"; - version = "0.28.2"; + version = "0.29.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "tconbeer"; repo = "sqlfmt"; tag = "v${version}"; - hash = "sha256-9SO3G8SQOkxxSyro9dwSI6oH6BT8Rd66WqM5bvdVQkg="; + hash = "sha256-AeG6ga+WaBVvCCkEJbIkaJQg4rEmBcyQNmgJHEYkhrI="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 755a7bee60c7..92460ee2a3ae 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -50,7 +50,7 @@ let src = fetchFromGitHub { owner = "tensorflow"; repo = "probability"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-LXQfGFgnM7WYUQjJ2Y3jskdeJ/dEKz+Afg+UOQjv5kc="; }; diff --git a/pkgs/development/python-modules/terminaltables3/default.nix b/pkgs/development/python-modules/terminaltables3/default.nix index ea4351ea7007..6f7b82e329d6 100644 --- a/pkgs/development/python-modules/terminaltables3/default.nix +++ b/pkgs/development/python-modules/terminaltables3/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "matthewdeanmartin"; repo = "terminaltables3"; - #rev = "refs/tags/v${version}"; + #tag = "v${version}"; rev = "f1c465b36eb9b91a984d8864b21376e7c37075b8"; hash = "sha256-UcEovh1Eb4QNPwLGDjCphPlJSSkOdhCJ2fK3tuSWOTc="; }; diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix index 0eaa076fc091..56c29e669db5 100644 --- a/pkgs/development/python-modules/tinygrad/default.nix +++ b/pkgs/development/python-modules/tinygrad/default.nix @@ -17,35 +17,43 @@ setuptools, # optional-dependencies - llvmlite, - triton, + # arm unicorn, + # triton + triton, + # testing_minimal + hypothesis, + numpy, + pytest-xdist, + torch, + z3-solver, + # testing_unit + ggml-python, + openai, + safetensors, + tabulate, + tqdm, + # testing + blobfile, + boto3, + bottle, + capstone, + librosa, + networkx, + nibabel, + onnx, + onnxruntime, + opencv4, + pandas, + pillow, + pycocotools, + sentencepiece, + tiktoken, + transformers, # tests pytestCheckHook, writableTmpDirAsHomeHook, - blobfile, - bottle, - capstone, - clang, - hexdump, - hypothesis, - jax, - librosa, - ml-dtypes, - networkx, - numpy, - onnx, - onnxruntime, - pillow, - pytest-xdist, - safetensors, - sentencepiece, - tiktoken, - torch, - tqdm, - transformers, - z3-solver, # passthru tinygrad, @@ -56,118 +64,124 @@ buildPythonPackage (finalAttrs: { pname = "tinygrad"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; src = fetchFromGitHub { owner = "tinygrad"; repo = "tinygrad"; tag = "v${finalAttrs.version}"; - hash = "sha256-VG2rhkiwPFN3JYSBbqrwCdqhdGE8GY6oEatMSCydhw8="; + hash = "sha256-Lied19C1sAbislr2WznnCZEmOn5PA0OzMg2KOdWOYkA="; }; - patches = [ - (replaceVars ./fix-dlopen-cuda.patch { - inherit (addDriverRunpath) driverLink; - libnvrtc = - if cudaSupport then - "${lib.getLib cudaPackages.cuda_nvrtc}/lib/libnvrtc.so" - else - "Please import nixpkgs with `config.cudaSupport = true`"; - }) - ]; + patches = + let + libExtension = stdenv.hostPlatform.extensions.sharedLibrary; + in + [ + (replaceVars ./patch-deps-paths.patch { + libllvm = "${lib.getLib llvmPackages.llvm}/lib/libLLVM${libExtension}"; + libclang = "${lib.getLib llvmPackages.libclang}/lib/libclang${libExtension}"; - postPatch = - # Patch `clang` directly in the source file - # Use the unwrapped variant to enable the "native" features currently unavailable in the sandbox - '' - substituteInPlace tinygrad/runtime/ops_cpu.py \ - --replace-fail "getenv(\"CC\", 'clang')" "'${lib.getExe llvmPackages.clang-unwrapped}'" - '' - + '' - substituteInPlace tinygrad/runtime/support/llvm.py \ - --replace-fail "ctypes.util.find_library('LLVM')" "'${lib.getLib llvmPackages.llvm}/lib/libLLVM.so'" - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace tinygrad/runtime/autogen/libc.py \ - --replace-fail "ctypes.util.find_library('c')" "'${stdenv.cc.libc}/lib/libc.so.6'" + # Use the unwrapped variant to enable the "native" features currently unavailable in the sandbox + clang = lib.getExe llvmPackages.clang-unwrapped; + }) + ] + ++ lib.optionals cudaSupport [ + (replaceVars ./patch-cuda-paths.patch { + inherit (addDriverRunpath) driverLink; + cuda_nvrtc = lib.getLib cudaPackages.cuda_nvrtc; - substituteInPlace tinygrad/runtime/autogen/opencl.py \ - --replace-fail "ctypes.util.find_library('OpenCL')" "'${ocl-icd}/lib/libOpenCL.so'" - '' - # test/test_tensor.py imports the PTX variable from the cuda_compiler.py file. - # This import leads to loading the libnvrtc.so library that is not substituted when cudaSupport = false. - # -> As a fix, we hardcode this variable to False - + lib.optionalString (!cudaSupport) '' - substituteInPlace test/test_tensor.py \ - --replace-fail "from tinygrad.runtime.support.compiler_cuda import PTX" "PTX = False" - '' - # `cuda_fp16.h` and co. are needed at runtime to compile kernels - + lib.optionalString cudaSupport '' - substituteInPlace tinygrad/runtime/support/compiler_cuda.py \ - --replace-fail \ - '"-I/usr/local/cuda/include", "-I/usr/include", "-I/opt/cuda/include"' \ - '"-I${lib.getDev cudaPackages.cuda_cudart}/include/"' - '' - + lib.optionalString rocmSupport '' - substituteInPlace tinygrad/runtime/autogen/hip.py \ - --replace-fail "/opt/rocm/" "${rocmPackages.clr}/" + # `cuda_fp16.h` and co. are needed at runtime to compile kernels + cuda_cudart = lib.getInclude cudaPackages.cuda_cudart; + }) + ] + ++ lib.optionals rocmSupport [ + (replaceVars ./patch-rocm-paths.patch { + comgr = lib.getLib rocmPackages.rocm-comgr; + clr = lib.getLib rocmPackages.clr; + rocm-runtime = lib.getLib rocmPackages.rocm-runtime; + rocm-llvm-objdump = lib.getExe' rocmPackages.llvm.llvm "llvm-objdump"; + llvm-objdump = lib.getExe' llvmPackages.llvm "llvm-objdump"; + hipcc = lib.getExe' rocmPackages.hipcc "hipcc"; + }) + ]; - substituteInPlace tinygrad/runtime/support/compiler_hip.py \ - --replace-fail "/opt/rocm/include" "${rocmPackages.clr}/include" + postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace tinygrad/runtime/autogen/opencl.py \ + --replace-fail \ + "dll = DLL('opencl', 'OpenCL')" \ + "dll = DLL('opencl', '${lib.getLib ocl-icd}/lib/libOpenCL.so')" - substituteInPlace tinygrad/runtime/support/compiler_hip.py \ - --replace-fail "/opt/rocm/llvm" "${rocmPackages.llvm.llvm}" - - substituteInPlace tinygrad/runtime/autogen/comgr.py \ - --replace-fail "/opt/rocm/" "${rocmPackages.rocm-comgr}/" - ''; + substituteInPlace tinygrad/runtime/autogen/libc.py \ + --replace-fail \ + "dll = DLL('libc', 'c', use_errno=True)" \ + "dll = DLL('libc', '${lib.getLib stdenv.cc.libc}/lib/libc.so.6', use_errno=True)" + ''; __propagatedImpureHostDeps = lib.optional stdenv.hostPlatform.isDarwin "/usr/lib/libc.dylib"; build-system = [ setuptools ]; - optional-dependencies = { - llvm = [ llvmlite ]; + optional-dependencies = lib.fix (self: { arm = [ unicorn ]; triton = [ triton ]; - }; + testing_minimal = [ + hypothesis + numpy + pytest-xdist + torch + z3-solver + ]; + testing_unit = self.testing_minimal ++ [ + ggml-python + openai + safetensors + tabulate + tqdm + ]; + testing = self.testing_unit ++ [ + blobfile + boto3 + bottle + capstone + librosa + networkx + nibabel + onnx + onnxruntime + opencv4 + pandas + pillow + pycocotools + sentencepiece + tiktoken + transformers + ]; + }); pythonImportsCheck = [ "tinygrad" + "tinygrad.runtime.autogen.libclang" ] ++ lib.optionals cudaSupport [ + "tinygrad.runtime.ops_cuda" "tinygrad.runtime.ops_nv" + ] + ++ lib.optionals rocmSupport [ + "tinygrad.runtime.ops_amd" + "tinygrad.runtime.ops_hip" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "tinygrad.runtime.ops_metal" ]; nativeCheckInputs = [ + llvmPackages.clang pytestCheckHook writableTmpDirAsHomeHook - - blobfile - bottle - capstone - clang - hexdump - hypothesis - jax - librosa - ml-dtypes - networkx - numpy - onnx - onnxruntime - pillow - pytest-xdist - safetensors - sentencepiece - tiktoken - torch - tqdm - transformers - z3-solver ] - ++ networkx.optional-dependencies.extra; + ++ finalAttrs.passthru.optional-dependencies.testing; disabledTests = [ # RuntimeError: Attempting to relocate against an undefined symbol 'fmaxf' @@ -192,6 +206,7 @@ buildPythonPackage (finalAttrs: { "test_dataset_is_realized" "test_e2e_big" "test_fetch_small" + "test_hevc_parser" "test_huggingface_enet_safetensors" "test_index_mnist" "test_linear_mnist" @@ -206,8 +221,13 @@ buildPythonPackage (finalAttrs: { "test_load_convnext" "test_load_enet" "test_load_enet_alt" + "test_load_gpt2_q4_1" "test_load_llama2bfloat" "test_load_resnet" + "test_load_sample_mxfp4" + "test_load_sample_q6_k" + "test_load_tinyllama_q4_0" + "test_load_tinyllama_q8_0" "test_mnist_val" "test_openpilot_model" "test_resnet" @@ -220,12 +240,19 @@ buildPythonPackage (finalAttrs: { "test_transcribe_long_no_batch" "test_vgg7" ] - ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ # Fail with AssertionError "test_casts_from" "test_casts_to" + "test_float_cast_to_unsigned_underflow" "test_int8" "test_int8_to_uint16_negative" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Flaky (pass when running a smaller set of tests: tests/unit/*, but not within the full test suite) + # AttributeError: module 'tinygrad.runtime.autogen.libclang' has no attribute 'clang_parseTranslationUnit' + "test_gen_from_header" + "test_struct_ordering" ]; disabledTestPaths = [ @@ -236,10 +263,30 @@ buildPythonPackage (finalAttrs: { # Files under this directory are not considered as tests by upstream and should be skipped "extra/" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # urllib.error.URLError: + "test/models/test_whisper.py" ]; - passthru.tests = { - withCuda = tinygrad.override { cudaSupport = true; }; + __darwinAllowLocalNetworking = true; + + passthru = { + tests = { + withCuda = tinygrad.override { cudaSupport = true; }; + withRocm = tinygrad.override { rocmSupport = true; }; + }; + + gpuCheck = tinygrad.overridePythonAttrs (old: { + requiredSystemFeatures = [ "cuda" ]; + + pytestFlags = (old.pytestFlags or [ ]) ++ [ + # When running in parallel, with GPU support, some tests become flaky: + # RuntimeError: Wait timeout: 30000 ms! (the signal is not set to 153, but 151) + "--maxprocesses=1" + ]; + }); }; meta = { @@ -248,10 +295,5 @@ buildPythonPackage (finalAttrs: { changelog = "https://github.com/tinygrad/tinygrad/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; - badPlatforms = [ - # Fatal Python error: Aborted - # onnxruntime/capi/_pybind_state.py", line 32 in - "aarch64-linux" - ]; }; }) diff --git a/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch b/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch deleted file mode 100644 index 285ca6111569..000000000000 --- a/pkgs/development/python-modules/tinygrad/fix-dlopen-cuda.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/tinygrad/runtime/autogen/cuda.py b/tinygrad/runtime/autogen/cuda.py -index a30c8f53..e2078ff6 100644 ---- a/tinygrad/runtime/autogen/cuda.py -+++ b/tinygrad/runtime/autogen/cuda.py -@@ -145,7 +145,19 @@ def char_pointer_cast(string, encoding='utf-8'): - - - _libraries = {} --_libraries['libcuda.so'] = ctypes.CDLL(ctypes.util.find_library('cuda')) -+libcuda = None -+try: -+ libcuda = ctypes.CDLL('libcuda.so') -+except OSError: -+ pass -+try: -+ libcuda = ctypes.CDLL('@driverLink@/lib/libcuda.so') -+except OSError: -+ pass -+if libcuda is None: -+ raise RuntimeError(f"`libcuda.so` not found") -+ -+_libraries['libcuda.so'] = libcuda - - - cuuint32_t = ctypes.c_uint32 -diff --git a/tinygrad/runtime/autogen/nvrtc.py b/tinygrad/runtime/autogen/nvrtc.py -index 6af74187..c5a6c6c4 100644 ---- a/tinygrad/runtime/autogen/nvrtc.py -+++ b/tinygrad/runtime/autogen/nvrtc.py -@@ -10,7 +10,18 @@ import ctypes, ctypes.util - - - _libraries = {} --_libraries['libnvrtc.so'] = ctypes.CDLL(ctypes.util.find_library('nvrtc')) -+libnvrtc = None -+try: -+ libnvrtc = ctypes.CDLL('libnvrtc.so') -+except OSError: -+ pass -+try: -+ libnvrtc = ctypes.CDLL('@libnvrtc@') -+except OSError: -+ pass -+if libnvrtc is None: -+ raise RuntimeError(f"`libnvrtc.so` not found") -+_libraries['libnvrtc.so'] = libnvrtc - def string_cast(char_pointer, encoding='utf-8', errors='strict'): - value = ctypes.cast(char_pointer, ctypes.c_char_p).value - if value is not None and encoding is not None: diff --git a/pkgs/development/python-modules/tinygrad/patch-cuda-paths.patch b/pkgs/development/python-modules/tinygrad/patch-cuda-paths.patch new file mode 100644 index 000000000000..b2a2177ab3e2 --- /dev/null +++ b/pkgs/development/python-modules/tinygrad/patch-cuda-paths.patch @@ -0,0 +1,39 @@ +diff --git a/tinygrad/runtime/autogen/cuda.py b/tinygrad/runtime/autogen/cuda.py +index 061c8d73f..65ec3ffd7 100644 +--- a/tinygrad/runtime/autogen/cuda.py ++++ b/tinygrad/runtime/autogen/cuda.py +@@ -1,7 +1,7 @@ + # mypy: ignore-errors + import ctypes + from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR +-dll = DLL('cuda', 'cuda') ++dll = DLL('cuda', '@driverLink@/lib/libcuda.so') + cuuint32_t = ctypes.c_uint32 + cuuint64_t = ctypes.c_uint64 + CUdeviceptr_v2 = ctypes.c_uint64 +diff --git a/tinygrad/runtime/autogen/nvrtc.py b/tinygrad/runtime/autogen/nvrtc.py +index 88085c45b..90518d403 100644 +--- a/tinygrad/runtime/autogen/nvrtc.py ++++ b/tinygrad/runtime/autogen/nvrtc.py +@@ -2,7 +2,7 @@ + import ctypes + from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR + import sysconfig +-dll = DLL('nvrtc', 'nvrtc', f'/usr/local/cuda/targets/{sysconfig.get_config_vars().get("MULTIARCH", "").rsplit("-", 1)[0]}/lib') ++dll = DLL('nvrtc','@cuda_nvrtc@/lib/libnvrtc.so') + nvrtcResult = CEnum(ctypes.c_uint32) + NVRTC_SUCCESS = nvrtcResult.define('NVRTC_SUCCESS', 0) + NVRTC_ERROR_OUT_OF_MEMORY = nvrtcResult.define('NVRTC_ERROR_OUT_OF_MEMORY', 1) +diff --git a/tinygrad/runtime/support/compiler_cuda.py b/tinygrad/runtime/support/compiler_cuda.py +index 8f71a9255..fdbf01bad 100644 +--- a/tinygrad/runtime/support/compiler_cuda.py ++++ b/tinygrad/runtime/support/compiler_cuda.py +@@ -43,7 +43,7 @@ def cuda_disassemble(lib:bytes, arch:str): + class CUDACompiler(Compiler): + def __init__(self, arch:str, cache_key:str="cuda"): + self.arch, self.compile_options = arch, [f'--gpu-architecture={arch}'] +- self.compile_options += [f"-I{CUDA_PATH}/include"] if CUDA_PATH else ["-I/usr/local/cuda/include", "-I/usr/include", "-I/opt/cuda/include"] ++ self.compile_options += ["-I@cuda_cudart@/include"] + nvrtc_check(nvrtc.nvrtcVersion((nvrtcMajor := ctypes.c_int()), (nvrtcMinor := ctypes.c_int()))) + if (nvrtcMajor.value, nvrtcMinor.value) >= (12, 4): self.compile_options.append("--minimal") + super().__init__(f"compile_{cache_key}_{self.arch}") diff --git a/pkgs/development/python-modules/tinygrad/patch-deps-paths.patch b/pkgs/development/python-modules/tinygrad/patch-deps-paths.patch new file mode 100644 index 000000000000..8e8bbeec2f66 --- /dev/null +++ b/pkgs/development/python-modules/tinygrad/patch-deps-paths.patch @@ -0,0 +1,39 @@ +diff --git a/tinygrad/runtime/autogen/libclang.py b/tinygrad/runtime/autogen/libclang.py +index dbf22b6f5..4a5a097dc 100644 +--- a/tinygrad/runtime/autogen/libclang.py ++++ b/tinygrad/runtime/autogen/libclang.py +@@ -1,7 +1,7 @@ + # mypy: ignore-errors + import ctypes + from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR +-dll = DLL('libclang', ['clang-20', 'clang']) ++dll = DLL('libclang', '@libclang@') + CXIndex = ctypes.c_void_p + class struct_CXTargetInfoImpl(Struct): pass + CXTargetInfo = ctypes.POINTER(struct_CXTargetInfoImpl) +diff --git a/tinygrad/runtime/autogen/llvm.py b/tinygrad/runtime/autogen/llvm.py +index 7d05224e7..54204f563 100644 +--- a/tinygrad/runtime/autogen/llvm.py ++++ b/tinygrad/runtime/autogen/llvm.py +@@ -2,7 +2,7 @@ + import ctypes + from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR + from tinygrad.helpers import WIN, OSX +-dll = DLL('llvm', 'C:\\Program Files\\LLVM\\bin\\LLVM-C.dll' if WIN else '/opt/homebrew/opt/llvm@20/lib/libLLVM.dylib' if OSX else ['LLVM', 'LLVM-21', 'LLVM-20', 'LLVM-19', 'LLVM-18', 'LLVM-17', 'LLVM-16', 'LLVM-15', 'LLVM-14']) ++dll = DLL('llvm', '@libllvm@') + intmax_t = ctypes.c_int64 + try: (imaxabs:=dll.imaxabs).restype, imaxabs.argtypes = intmax_t, [intmax_t] + except AttributeError: pass +diff --git a/tinygrad/runtime/support/compiler_cpu.py b/tinygrad/runtime/support/compiler_cpu.py +index 8b11f3af8..d8190fac3 100644 +--- a/tinygrad/runtime/support/compiler_cpu.py ++++ b/tinygrad/runtime/support/compiler_cpu.py +@@ -15,7 +15,7 @@ class ClangJITCompiler(Compiler): + arch = {'x86_64': '-march=native', 'AMD64': '-march=native', 'riscv64': '-march=rv64g'}.get(platform.machine(), "-mcpu=native") + args = [arch, f'--target={target}-none-unknown-elf', '-O2', '-fPIC', '-ffreestanding', '-fno-math-errno', '-nostdlib', '-fno-ident'] + arch_args = ['-ffixed-x18'] if target == 'arm64' else [] +- obj = subprocess.check_output([getenv("CC", 'clang'), '-c', '-x', 'c', *args, *arch_args, '-', '-o', '-'], input=src.encode('utf-8')) ++ obj = subprocess.check_output(["@clang@", '-c', '-x', 'c', *args, *arch_args, '-', '-o', '-'], input=src.encode('utf-8')) + return jit_loader(obj) + + def disassemble(self, lib:bytes): return capstone_flatdump(lib) diff --git a/pkgs/development/python-modules/tinygrad/patch-rocm-paths.patch b/pkgs/development/python-modules/tinygrad/patch-rocm-paths.patch new file mode 100644 index 000000000000..5b96c6e906f1 --- /dev/null +++ b/pkgs/development/python-modules/tinygrad/patch-rocm-paths.patch @@ -0,0 +1,68 @@ +diff --git a/tinygrad/runtime/autogen/comgr.py b/tinygrad/runtime/autogen/comgr.py +index 9c642cef2..b42c7c9c8 100644 +--- a/tinygrad/runtime/autogen/comgr.py ++++ b/tinygrad/runtime/autogen/comgr.py +@@ -2,7 +2,7 @@ + import ctypes + from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR + import os +-dll = DLL('comgr', [os.getenv('ROCM_PATH', '/opt/rocm')+'/lib/libamd_comgr.so', 'amd_comgr']) ++dll = DLL('comgr', '@comgr@/lib/libamd_comgr.so') + amd_comgr_status_s = CEnum(ctypes.c_uint32) + AMD_COMGR_STATUS_SUCCESS = amd_comgr_status_s.define('AMD_COMGR_STATUS_SUCCESS', 0) + AMD_COMGR_STATUS_ERROR = amd_comgr_status_s.define('AMD_COMGR_STATUS_ERROR', 1) +diff --git a/tinygrad/runtime/autogen/hip.py b/tinygrad/runtime/autogen/hip.py +index 1cccb1e1f..d57a4d90a 100644 +--- a/tinygrad/runtime/autogen/hip.py ++++ b/tinygrad/runtime/autogen/hip.py +@@ -2,7 +2,7 @@ + import ctypes + from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR + import os +-dll = DLL('hip', os.getenv('ROCM_PATH', '/opt/rocm')+'/lib/libamdhip64.so') ++dll = DLL('hip', '@clr@/lib/libamdhip64.so') + hipError_t = CEnum(ctypes.c_uint32) + hipSuccess = hipError_t.define('hipSuccess', 0) + hipErrorInvalidValue = hipError_t.define('hipErrorInvalidValue', 1) +diff --git a/tinygrad/runtime/autogen/hsa.py b/tinygrad/runtime/autogen/hsa.py +index 16e568e21..9788d3705 100644 +--- a/tinygrad/runtime/autogen/hsa.py ++++ b/tinygrad/runtime/autogen/hsa.py +@@ -2,7 +2,7 @@ + import ctypes + from tinygrad.runtime.support.c import DLL, Struct, CEnum, _IO, _IOW, _IOR, _IOWR + import os +-dll = DLL('hsa', [os.getenv('ROCM_PATH', '/opt/rocm')+'/lib/libhsa-runtime64.so', 'hsa-runtime64']) ++dll = DLL('hsa', '@rocm-runtime@/lib/libhsa-runtime64.so') + enum_SQ_RSRC_BUF_TYPE = CEnum(ctypes.c_uint32) + SQ_RSRC_BUF = enum_SQ_RSRC_BUF_TYPE.define('SQ_RSRC_BUF', 0) + SQ_RSRC_BUF_RSVD_1 = enum_SQ_RSRC_BUF_TYPE.define('SQ_RSRC_BUF_RSVD_1', 1) +diff --git a/tinygrad/runtime/support/compiler_amd.py b/tinygrad/runtime/support/compiler_amd.py +index e97aaefcd..ef55838a3 100644 +--- a/tinygrad/runtime/support/compiler_amd.py ++++ b/tinygrad/runtime/support/compiler_amd.py +@@ -13,9 +13,9 @@ from tinygrad.runtime.support.compiler_cpu import LLVMCompiler + from tinygrad.helpers import OSX, to_char_p_p + + def _find_llvm_objdump(): +- if OSX: return '/opt/homebrew/opt/llvm/bin/llvm-objdump' ++ if OSX: return '@llvm-objdump@' + # Try ROCm path first, then versioned, then unversioned +- for p in ['/opt/rocm/llvm/bin/llvm-objdump', 'llvm-objdump-21', 'llvm-objdump-20', 'llvm-objdump']: ++ for p in ['@rocm-llvm-objdump@', '@llvm-objdump@']: + if shutil.which(p): return p + raise FileNotFoundError("llvm-objdump not found") + +@@ -107,9 +107,9 @@ class HIPCCCompiler(Compiler): + srcf.write(src.encode()) + srcf.flush() + +- subprocess.run(["hipcc", "-c", "-emit-llvm", "--cuda-device-only", "-O3", "-mcumode", +- f"--offload-arch={self.arch}", "-I/opt/rocm/include/hip", "-o", bcf.name, srcf.name] + self.extra_options, check=True) +- subprocess.run(["hipcc", "-target", "amdgcn-amd-amdhsa", f"-mcpu={self.arch}", ++ subprocess.run(["@hipcc@", "-c", "-emit-llvm", "--cuda-device-only", "-O3", "-mcumode", ++ f"--offload-arch={self.arch}", "-I@clr@/include/hip", "-o", bcf.name, srcf.name] + self.extra_options, check=True) ++ subprocess.run(["@hipcc@", "-target", "amdgcn-amd-amdhsa", f"-mcpu={self.arch}", + "-O3", "-mllvm", "-amdgpu-internalize-symbols", "-c", "-o", libf.name, bcf.name] + self.extra_options, check=True) + + return pathlib.Path(libf.name).read_bytes() diff --git a/pkgs/development/python-modules/tololib/default.nix b/pkgs/development/python-modules/tololib/default.nix index 3c958577ecea..ebf8aff02dc0 100644 --- a/pkgs/development/python-modules/tololib/default.nix +++ b/pkgs/development/python-modules/tololib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "MatthiasLohr"; repo = "tololib"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-dfyc96VcauERv2E5I6nOIXAHbmTHiRLqS+0XH0GB5HM="; }; diff --git a/pkgs/development/python-modules/torch-tb-profiler/default.nix b/pkgs/development/python-modules/torch-tb-profiler/default.nix index 766baff5d3cc..e922f19dd851 100644 --- a/pkgs/development/python-modules/torch-tb-profiler/default.nix +++ b/pkgs/development/python-modules/torch-tb-profiler/default.nix @@ -14,7 +14,7 @@ let repo = fetchFromGitHub { owner = "pytorch"; repo = "kineto"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-nAtqGCv8q3Tati3NOGWWLb+gXdvO3qmECeC1WG2Mt3M="; }; in diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index c49e0d0d1092..030aad8ae43a 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -57,16 +57,16 @@ hf-xet, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "transformers"; - version = "4.57.3"; + version = "4.57.6"; pyproject = true; src = fetchFromGitHub { owner = "huggingface"; repo = "transformers"; - tag = "v${version}"; - hash = "sha256-QqlNE2UJqn5ylVhSX5qak62ooda5IQbsc1F7SYU8Kjw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-a78ornUAYlOpr30iFdq1oUiWQTm6GeT0iq8ras5i3DQ="; }; build-system = [ setuptools ]; @@ -194,7 +194,7 @@ buildPythonPackage rec { homepage = "https://github.com/huggingface/transformers"; description = "Natural Language Processing for TensorFlow 2.0 and PyTorch"; mainProgram = "transformers-cli"; - changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; + changelog = "https://github.com/huggingface/transformers/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ @@ -202,4 +202,4 @@ buildPythonPackage rec { happysalada ]; }; -} +}) diff --git a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix index c89f11ded901..8f53a89075d6 100644 --- a/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix +++ b/pkgs/development/python-modules/tuya-device-sharing-sdk/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "tuya-device-sharing-sdk"; - version = "0.2.8"; + version = "0.2.9"; pyproject = true; src = fetchFromGitHub { owner = "tuya"; repo = "tuya-device-sharing-sdk"; tag = finalAttrs.version; - hash = "sha256-uD2Lzs08i/01iEksXpYRGB2lU7I15sQrJLfJZ93+oeY="; + hash = "sha256-kNWg+AXISThwK14ByObUr+/4GMntrZgtEEMNpw/HjLw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index ce5913fb93ff..1f044cb1476b 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -17,7 +17,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "twilio"; version = "9.9.1"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-ewG2VgxK8F2G/wogkGnhqZT9M9vrJu9Rdx4uXYNRhrI="; }; @@ -66,8 +66,8 @@ buildPythonPackage rec { meta = { description = "Twilio API client and TwiML generator"; homepage = "https://github.com/twilio/twilio-python/"; - changelog = "https://github.com/twilio/twilio-python/blob/${src.tag}/CHANGES.md"; + changelog = "https://github.com/twilio/twilio-python/blob/${finalAttrs.src.tag}/CHANGES.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix index 96f8263ef6c4..41a760fda6bd 100644 --- a/pkgs/development/python-modules/usort/default.nix +++ b/pkgs/development/python-modules/usort/default.nix @@ -17,14 +17,14 @@ buildPythonPackage (finalAttrs: { pname = "usort"; - version = "1.1.1"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "facebook"; repo = "usort"; tag = "v${finalAttrs.version}"; - hash = "sha256-sSc6TpsErz+93+dlKk+RZnyZFAp7qjpNYMVCEW9lXds="; + hash = "sha256-hoBk8KAml/YOscno9605I3t4z10vQPlh22wH1XHcQqY="; }; build-system = [ diff --git a/pkgs/development/python-modules/vbuild/default.nix b/pkgs/development/python-modules/vbuild/default.nix index f1d2ca66357b..980f0ac52d57 100644 --- a/pkgs/development/python-modules/vbuild/default.nix +++ b/pkgs/development/python-modules/vbuild/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "manatlan"; repo = "vbuild"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-p9v1FiYn0cI+f/25hvjwm7eb1GqxXvNnmXBGwZe9fk0="; }; diff --git a/pkgs/development/python-modules/virt-firmware/default.nix b/pkgs/development/python-modules/virt-firmware/default.nix index 8c9d73cf636c..d190652c4be4 100644 --- a/pkgs/development/python-modules/virt-firmware/default.nix +++ b/pkgs/development/python-modules/virt-firmware/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "kraxel"; repo = "virt-firmware"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-kuFTKMhBVlgCBYLTO23IUz/tRLoMRHxjWPIaauu/PWw="; }; diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 7a5d69e3a6fb..916164c1c49a 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vmprof"; repo = "vmprof-python"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-7k6mtEdPmp1eNzB4l/k/ExSYtRJVmRxcx50ql8zR36k="; }; diff --git a/pkgs/development/python-modules/wassima/default.nix b/pkgs/development/python-modules/wassima/default.nix index a4ca9ab252c2..e5db5328abd6 100644 --- a/pkgs/development/python-modules/wassima/default.nix +++ b/pkgs/development/python-modules/wassima/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "wassima"; - version = "2.0.3"; + version = "2.0.4"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "wassima"; tag = version; - hash = "sha256-tkA6U0SqzivR4tHPu7BKawlqoYfkBFgt5ZcV9kOMKzI="; + hash = "sha256-6tNmJwnOtl+luN1qgu93LXEfBZ0oieEpLa9Q9N6Gsag="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index a1f1630011c6..2bcfba01468d 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -16,16 +16,16 @@ sensor-state-data, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "xiaomi-ble"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchFromGitHub { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; - tag = "v${version}"; - hash = "sha256-hZIhMBeF0YN0+dWQPyKf/6LQPq9MKYAE54lvhAvWZCY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/q0MJlsK2skE/fok8C9AHApYZIzKNv6fogFy0cQ186w="; }; build-system = [ poetry-core ]; @@ -54,8 +54,8 @@ buildPythonPackage rec { meta = { description = "Library for Xiaomi BLE devices"; homepage = "https://github.com/Bluetooth-Devices/xiaomi-ble"; - changelog = "https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/${src.tag}"; + changelog = "https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/yeelight/default.nix b/pkgs/development/python-modules/yeelight/default.nix index 4ea5c17448e4..0f5dd64cf846 100644 --- a/pkgs/development/python-modules/yeelight/default.nix +++ b/pkgs/development/python-modules/yeelight/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitLab { owner = "stavros"; repo = "python-yeelight"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-WLEXTDVcSpGCmfEI31cQXGf9+4EIUCkcaeaj25f4ERU="; }; diff --git a/pkgs/development/python-modules/zipfile2/default.nix b/pkgs/development/python-modules/zipfile2/default.nix index 0d477776bd76..dab7334886fd 100644 --- a/pkgs/development/python-modules/zipfile2/default.nix +++ b/pkgs/development/python-modules/zipfile2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "cournape"; repo = "zipfile2"; - #rev = "refs/tags/v${version}"; + #tag = "v${version}"; rev = "8823f7253772e5c5811343306a591c00c764c6d0"; hash = "sha256-jDOyIj0sQS1dIsar4nyk5V2mme3Zc6VTms49/4n93ho="; }; diff --git a/pkgs/development/python-modules/zope-index/default.nix b/pkgs/development/python-modules/zope-index/default.nix index 93c2cf8d90ff..232e1a014060 100644 --- a/pkgs/development/python-modules/zope-index/default.nix +++ b/pkgs/development/python-modules/zope-index/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.index"; - tag = "${version}"; + tag = version; hash = "sha256-dHapd/+pJh6qzVx9FGSMmPsGbz8NhAoPqufXm3FOuM8="; }; diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index d0ae0e45b48f..f1934a8626b4 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,9 +10,9 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "zwave-js-server-python"; - version = "0.67.1"; + version = "0.68.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; - tag = version; - hash = "sha256-9z0IYeH2Tch2de18UnEwQ+lmVaZwb/3kJmvcl0MWJ60="; + tag = finalAttrs.version; + hash = "sha256-NfK+/nuQjlAgg4ZCifo/KoPrgc5FHhEmdK8utnm1iDI="; }; build-system = [ setuptools ]; @@ -41,9 +41,9 @@ buildPythonPackage rec { meta = { description = "Python wrapper for zwave-js-server"; homepage = "https://github.com/home-assistant-libs/zwave-js-server-python"; - changelog = "https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/${src.tag}"; - license = with lib.licenses; [ asl20 ]; + changelog = "https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "zwave-js-server-python"; }; -} +}) diff --git a/pkgs/development/rocm-modules/6/migraphx/default.nix b/pkgs/development/rocm-modules/6/migraphx/default.nix index 723e987c829b..98ebed7c916c 100644 --- a/pkgs/development/rocm-modules/6/migraphx/default.nix +++ b/pkgs/development/rocm-modules/6/migraphx/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, rocmUpdateScript, pkg-config, cmake, @@ -79,6 +80,12 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./msgpack-6-compat.patch + # Backport "Add quantize_bf16 to C api output" + # Required for onnxruntime 1.23+ + (fetchpatch { + url = "https://github.com/ROCm/AMDMIGraphX/commit/f33afac654dfc4558f4d9867c2d28a2d98cf49b4.patch"; + hash = "sha256-5O4UanmyhQ9Te830SISaquM4TdG/gEY3wfWSaU/cS30="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index f745ce99235f..410482616aea 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -650,6 +650,10 @@ in # Fix incompatible function pointer conversion errors with clang 16 ./hpricot-fix-incompatible-function-pointer-conversion.patch ]; + env.NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=incompatible-pointer-types" + "-Wno-error=int-conversion" + ]; }; iconv = attrs: { @@ -657,6 +661,7 @@ in "--with-iconv-dir=${lib.getLib libiconv}" "--with-iconv-include=${lib.getDev libiconv}/include" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; }; idn-ruby = attrs: { @@ -1005,6 +1010,7 @@ in ruby-lxc = attrs: { buildInputs = [ lxc ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; }; ruby-terminfo = attrs: { diff --git a/pkgs/development/tools/build-managers/buck/default.nix b/pkgs/development/tools/build-managers/buck/default.nix deleted file mode 100644 index a5010236588c..000000000000 --- a/pkgs/development/tools/build-managers/buck/default.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - jdk8, - ant, - python3, - watchman, - bash, - makeWrapper, -}: - -stdenv.mkDerivation rec { - pname = "buck"; - version = "2022.05.05.01"; - - src = fetchFromGitHub { - owner = "facebook"; - repo = pname; - rev = "v${version}"; - sha256 = "15v4sk1l43pgd5jxr5lxnh0ks6vb3xk5253n66s7vvsnph48j14q"; - }; - - patches = [ ./pex-mtime.patch ]; - - postPatch = '' - grep -l -r '/bin/bash' --null | xargs -0 sed -i -e "s!/bin/bash!${bash}/bin/bash!g" - ''; - - nativeBuildInputs = [ - makeWrapper - python3 - jdk8 - ant - watchman - ]; - - buildPhase = '' - # Set correct version, see https://github.com/facebook/buck/issues/2607 - echo v${version} > .buckrelease - - ant - - PYTHONDONTWRITEBYTECODE=true ./bin/buck build -c buck.release_version=${version} buck - ''; - - installPhase = '' - install -D -m755 buck-out/gen/*/programs/buck.pex $out/bin/buck - wrapProgram $out/bin/buck \ - --prefix PATH : "${ - lib.makeBinPath [ - jdk8 - watchman - python3 - ] - }" - ''; - - meta = { - homepage = "https://buck.build/"; - description = "High-performance build tool"; - mainProgram = "buck"; - maintainers = [ lib.maintainers.jgertm ]; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - # https://github.com/facebook/buck/issues/2666 - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; - }; -} diff --git a/pkgs/development/tools/build-managers/buck/pex-mtime.patch b/pkgs/development/tools/build-managers/buck/pex-mtime.patch deleted file mode 100644 index b8726e64a604..000000000000 --- a/pkgs/development/tools/build-managers/buck/pex-mtime.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/third-party/py/pex/pex/common.py b/third-party/py/pex/pex/common.py -index 76459ce23..eff411b20 100644 ---- a/third-party/py/pex/pex/common.py -+++ b/third-party/py/pex/pex/common.py -@@ -328,4 +328,7 @@ class Chroot(object): - def zip(self, filename, mode='wb'): - with contextlib.closing(zipfile.ZipFile(filename, mode)) as zf: - for f in sorted(self.files()): -- zf.write(os.path.join(self.chroot, f), arcname=f, compress_type=zipfile.ZIP_DEFLATED) -+ path = os.path.join(self.chroot, f) -+ instant = 615532801 -+ os.utime(path, (instant, instant)) -+ zf.write(path, arcname=f, compress_type=zipfile.ZIP_DEFLATED) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 99beacece616..254ca4f61924 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub }: let - version = "3.12.0"; - vendorHash = "sha256-TXQ53G+YGIcURZvJtkvGU66dlQx0NxMTeRkrmReCDU8="; - nodeModulesHash = "sha256-Mx5Q9Zdv4sJGRDs3dYio7IfktFvauLJqZxGBhOOjdo4="; + version = "3.13.0"; + vendorHash = "sha256-EkOg1D+zeEbVBPr4fpCPI31CvMnTD7FZ2hhQW7UzN8A="; + nodeModulesHash = "sha256-wORM+24nE771llb1Q7bn6iDtlJpm3kOqO3wTLUQmjyQ="; in { inherit version vendorHash nodeModulesHash; @@ -11,7 +11,7 @@ in owner = "woodpecker-ci"; repo = "woodpecker"; tag = "v${version}"; - hash = "sha256-TaFAQa8QlogqzhznKeveaCiDbpk1Bl+aPSMGxiaE2ko="; + hash = "sha256-EeND2L5l37fo3JBlFORR4m0tXQWlJ2qqIXIdQ1vJdgM="; }; postInstall = '' diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index 2e8e1d96c64d..c48010ef21d6 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "PyCQA"; repo = pname; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-94JGKX91d2kul+KMYohga9KCOj6RN/YKpD8e4nWSOOM="; }; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix deleted file mode 100644 index 520439b2321b..000000000000 --- a/pkgs/games/speed-dreams/default.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ - fetchurl, - lib, - stdenv, - libGLU, - libGL, - libglut, - libX11, - plib, - openal, - freealut, - libXrandr, - xorgproto, - libXext, - libSM, - libICE, - libXi, - libXt, - libXrender, - libXxf86vm, - openscenegraph, - expat, - libpng, - zlib, - bash, - SDL2, - SDL2_mixer, - enet, - libjpeg, - cmake, - pkg-config, - libvorbis, - runtimeShell, - curl, - copyDesktopItems, - makeDesktopItem, -}: - -let - version = "2.3.0-r8786"; - shortVersion = builtins.substring 0 5 version; -in -stdenv.mkDerivation rec { - inherit version; - pname = "speed-dreams"; - - src = fetchurl { - url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-base-${version}.tar.xz"; - sha256 = "sha256-DUyMs9Hr1PYgmNVwBY/e6snVeGl9GX0AnZ7S+TFABKQ="; - }; - - cars-and-tracks = fetchurl { - url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz"; - sha256 = "sha256-WT+W6uuw4BRSbF1Cw123q3v9qSCvBQ7TcQ/Y0RV/7Js="; - }; - - more-cars-and-tracks = fetchurl { - url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz"; - sha256 = "sha256-psApv+Z1HDFvh5bzt125mo/ZvO5rjee/KhOf45iKnKk="; - }; - - wip-cars-and-tracks = fetchurl { - url = "mirror://sourceforge/speed-dreams/${shortVersion}/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz"; - sha256 = "sha256-OEAbqFfO2PzHP7+eAtPNn3Ql6fYNTKzzQW8lHe9KDXM="; - }; - - sourceRoot = "."; - - postUnpack = '' - echo Unpacking data - tar -xf ${cars-and-tracks} - tar -xf ${more-cars-and-tracks} - tar -xf ${wip-cars-and-tracks} - ''; - - preBuild = '' - make -C src/libs/portability - make -C src/libs/portability portability.o - ar -rv "$(echo lib*/games/speed-dreams*/lib)"/libportability_static.a src/libs/portability/CMakeFiles/portability.dir/portability.cpp.o - export NIX_LDFLAGS="$NIX_LDFLAGS -L$(echo $PWD/lib*/games/speed-dreams*/lib) -lexpat" - echo "libportability_static.a built" - ''; - - postInstall = '' - mkdir "$out/bin" - for i in "$out"/games/*; do - echo '#!${runtimeShell}' >> "$out/bin/$(basename "$i")" - echo "$i"' "$@"' >> "$out/bin/$(basename "$i")" - chmod a+x "$out/bin/$(basename "$i")" - done - - mkdir -p $out/share/pixmaps/ - ln -s "$out/share/games/speed-dreams-2/data/icons/icon.png" "$out/share/pixmaps/speed-dreams-2.png" - ''; - - desktopItems = [ - (makeDesktopItem { - name = "Speed Dreams 2"; - exec = "speed-dreams-2"; - icon = "speed-dreams-2.png"; - desktopName = "speed-dreams-2"; - comment = "The Open Racing Car Simulator Fork"; - categories = [ - "Application" - "Game" - ]; - }) - ]; - - # RPATH of binary /nix/store/.../lib64/games/speed-dreams-2/drivers/shadow_sc/shadow_sc.so contains a forbidden reference to /build/ - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; - - nativeBuildInputs = [ - pkg-config - cmake - copyDesktopItems - ]; - - buildInputs = [ - libpng - libGLU - libGL - libglut - libX11 - plib - openal - freealut - libXrandr - xorgproto - libXext - libSM - libICE - libXi - libXt - libXrender - libXxf86vm - zlib - bash - expat - SDL2 - SDL2_mixer - enet - libjpeg - openscenegraph - libvorbis - curl - ]; - - meta = { - description = "Car racing game - TORCS fork with more experimental approach"; - homepage = "https://speed-dreams.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux; - hydraPlatforms = [ ]; - }; -} diff --git a/pkgs/misc/optee-os/default.nix b/pkgs/misc/optee-os/default.nix index e191a254a023..c5670f9fd285 100644 --- a/pkgs/misc/optee-os/default.nix +++ b/pkgs/misc/optee-os/default.nix @@ -2,18 +2,19 @@ dtc, fetchFromGitHub, lib, + nukeReferences, pkgsBuildBuild, stdenv, }: let - defaultVersion = "4.6.0"; + defaultVersion = "4.7.0"; defaultSrc = fetchFromGitHub { owner = "OP-TEE"; repo = "optee_os"; rev = defaultVersion; - hash = "sha256-4z706DNfZE+CAPOa362CNSFhAN1KaNyKcI9C7+MRccs="; + hash = "sha256-kvp3GDBZtKlephyW+oxHmXnqvCe1jL+PN1i/MCw6SX0="; }; buildOptee = lib.makeOverridable ( @@ -61,6 +62,7 @@ let nativeBuildInputs = [ dtc + nukeReferences (pkgsBuildBuild.python3.withPackages ( p: with p; [ pyelftools @@ -89,21 +91,30 @@ let mkdir -p $out cp out/core/{tee.elf,tee-pageable_v2.bin,tee.bin,tee-header_v2.bin,tee-pager_v2.bin,tee-raw.bin} $out + nuke-refs $out/* + cp -r out/export-${taTarget} $devkit runHook postInstall ''; - meta = + # The conventional build system for OPTEE trusted applications accepts + # a TA_DEV_KIT_DIR parameter, which expects all artifacts (headers and + # libraries) to exist in that directory. We populate a "devkit" Nix + # output for this purpose, but we must also tell the multiple-output + # setup hook to not move our artifacts after we populate this + # directory. + outputDev = "devkit"; + outputLib = "devkit"; - { - description = "Trusted Execution Environment for ARM"; - homepage = "https://github.com/OP-TEE/optee_os"; - changelog = "https://github.com/OP-TEE/optee_os/blob/${defaultVersion}/CHANGELOG.md"; - license = lib.licenses.bsd2; - maintainers = [ lib.maintainers.jmbaur ]; - } - // extraMeta; + meta = { + description = "Trusted Execution Environment for ARM"; + homepage = "https://github.com/OP-TEE/optee_os"; + changelog = "https://github.com/OP-TEE/optee_os/blob/${defaultVersion}/CHANGELOG.md"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.jmbaur ]; + } + // extraMeta; } // removeAttrs args [ "extraMeta" ] ) diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index b734d66be00e..abd866dc060e 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -5,7 +5,7 @@ rec { src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-fAs289FFdUnddkikm4ceA9d/w1qqqaWuPXmAiq3cIA8="; }; } diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index e5111151f087..3822cbef1605 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "AppDaemon"; repo = "appdaemon"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-lcGQQz+kPefHSyc2RNQ4gHgraRJPvn/FcgMJGvCtC48="; }; diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix index 194a215226b2..e7254e8cb535 100644 --- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix +++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix @@ -10,13 +10,13 @@ buildHomeAssistantComponent rec { owner = "AN3Orik"; domain = "systemair"; - version = "1.0.18"; + version = "1.0.22"; src = fetchFromGitHub { inherit owner; repo = "systemair"; tag = "v${version}"; - hash = "sha256-fhzL+pez92T77ZJ2aE/0ugGd9Dlg2uGa417pJWwTYw0="; + hash = "sha256-GzIIjaRFeZAo065Dn0fpU4Ou5+8wIVQ7ImLmukjTxOQ="; }; postPatch = '' diff --git a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix index d3358374bf1b..f2897b10053a 100644 --- a/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/versatile_thermostat/package.nix @@ -15,7 +15,7 @@ buildHomeAssistantComponent rec { src = fetchFromGitHub { inherit owner; repo = domain; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-zSpeiSK8FyXlM1U8jjSVl1nLQX/IplvKHfS6XZUNxo4="; }; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 74c993862ac5..1f20086586b9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -50,7 +50,7 @@ let src = fetchFromGitHub { owner = "tkdrob"; repo = "aioskybell"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-aBT1fDFtq1vasTvCnAXKV2vmZ6LBLZqRCiepv1HDJ+Q="; }; }); @@ -60,7 +60,7 @@ let src = fetchFromGitHub { owner = "bachya"; repo = "aiowatttime"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-tWnxGLJT+CRFvkhxFamHxnLXBvoR8tfOvzH1o1i5JJg="; }; postPatch = '' @@ -110,7 +110,7 @@ let src = fetchFromGitHub { owner = "burnash"; repo = "gspread"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-i+QbnF0Y/kUMvt91Wzb8wseO/1rZn9xzeA5BWg1haks="; }; dependencies = with self; [ @@ -136,7 +136,7 @@ let src = fetchFromGitHub { owner = "engrbm87"; repo = "notifications_android_tv"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-adkcUuPl0jdJjkBINCTW4Kmc16C/HzL+jaRZB/Qr09A="; }; @@ -155,7 +155,7 @@ let version = "2.2"; src = fetchFromGitHub { inherit (oldAttrs.src) owner repo; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-GGp7nKFH01m1KW6yMkKlAdd26bDi8JDWva6OQ0CWMIw="; }; }); @@ -211,7 +211,7 @@ let src = fetchFromGitHub { owner = "gagebenne"; repo = "pydexcom"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-ItDGnUUUTwCz4ZJtFVlMYjjoBPn2h8QZgLzgnV2T/Qk="; }; }); @@ -221,7 +221,7 @@ let src = fetchFromGitHub { owner = "ChrisMandich"; repo = "PyFlume"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-kIE3y/qlsO9Y1MjEQcX0pfaBeIzCCHk4f1Xa215BBHo="; }; dependencies = oldAttrs.propagatedBuildInputs or [ ] ++ [ @@ -234,7 +234,7 @@ let src = fetchFromGitHub { owner = "AustinBrunkhorst"; repo = "pysnooz"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-hJwIObiuFEAVhgZXYB9VCeAlewBBnk0oMkP83MUCpyU="; }; patches = [ ]; @@ -246,7 +246,7 @@ let src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "pytradfri"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-xOdTzG0bF5p1QpkXv2btwrVugQRjSwdAj8bXcC0IoQg="; }; patches = [ ]; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 9e12806bd7ce..584f2793cceb 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -680,7 +680,7 @@ let name = "secure-token"; owner = "kaltura"; repo = "nginx-secure-token-module"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-qYTjGS9pykRqMFmNls52YKxEdXYhHw+18YC2zzdjEpU="; }; @@ -978,7 +978,7 @@ let name = "video-thumbextractor"; owner = "wandenberg"; repo = "nginx-video-thumbextractor-module"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-F2cuzCbJdGYX0Zmz9MSXTB7x8+FBR6pPpXtLlDRCcj8="; }; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix index 7828fc37ecae..7ab4080fc491 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "grafana-metricsdrilldown-app"; - version = "1.0.27"; - zipHash = "sha256-w+GxgYBVrNnanznS6xjXsibq08rhCP8fQvtIYoBCTNw="; + version = "1.0.28"; + zipHash = "sha256-ivWufoJ98aXJ9av7WNXU9foBDkPENC3f0zOXPjDlOSg="; meta = { description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries"; license = lib.licenses.agpl3Only; diff --git a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix index 0e13f54bf5bd..76c8d5fbb531 100644 --- a/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix +++ b/pkgs/servers/monitoring/nagios-plugins/labs_consol_de/default.nix @@ -66,7 +66,7 @@ in src = fetchFromGitHub { owner = "lausser"; repo = "check_mssql_health"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-K6sGrms9z59a9rkZNulwKBexGF2Nkqqak/cRg12ynxc="; fetchSubmodules = true; }; @@ -82,7 +82,7 @@ in src = fetchFromGitHub { owner = "lausser"; repo = "check_nwc_health"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-r8Cb9RnEohNp0GxMAIaj7e08dTWZhuV1jz4/b8tuJ6k="; fetchSubmodules = true; }; @@ -98,7 +98,7 @@ in src = fetchFromGitHub { owner = "lausser"; repo = "check_ups_health"; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-ZGSTPVJObP49/tDASOCh4wVdMKajheHD+xVTiFf101k="; fetchSubmodules = true; }; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index 2288214b3d3c..53752e77eace 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "prometheus"; repo = "consul_exporter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-2X1nJIUwp7kqqz/D3x4bq6vHg1N8zC9AWCn02qsAyAQ="; }; diff --git a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix b/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix index b3749325ef1c..eab71766d14c 100644 --- a/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/imap-mailstat-exporter.nix @@ -12,7 +12,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "bt909"; repo = "imap-mailstat-exporter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-aR/94C9SI+FPs3zg3bpexmgGYrhxghyHwpXj25x0yuw="; }; diff --git a/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix b/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix index 3e337dbf9bf0..d8bf75af4856 100644 --- a/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "msroest"; repo = pname; - rev = "refs/tags/${version}"; + tag = version; hash = "sha256-9oL9Zbzzbr0hZjOdkaH86Tho6gaR+/6uAMreLwYzB8o="; }; diff --git a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix index af7143179888..ac0a4e2e934c 100644 --- a/pkgs/servers/monitoring/prometheus/unbound-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/unbound-exporter.nix @@ -15,7 +15,7 @@ buildGoModule { src = fetchFromGitHub { owner = "letsencrypt"; repo = "unbound_exporter"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-xVc6xES3YdKIaP6rwAzI0/RLoer7bcq7VAmfjYii8VI="; }; diff --git a/pkgs/servers/sql/postgresql/ext/ip4r.nix b/pkgs/servers/sql/postgresql/ext/ip4r.nix index 142ea551c03f..a893811a4567 100644 --- a/pkgs/servers/sql/postgresql/ext/ip4r.nix +++ b/pkgs/servers/sql/postgresql/ext/ip4r.nix @@ -13,7 +13,7 @@ postgresqlBuildExtension (finalAttrs: { src = fetchFromGitHub { owner = "RhodiumToad"; repo = "ip4r"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-3chAD4f4A6VlXVSI0kfC/ANcnFy4vBp4FZpT6QRAueQ="; }; diff --git a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix index d378f5318a91..6c68c60a5667 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_relusage.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_relusage.nix @@ -12,7 +12,7 @@ postgresqlBuildExtension (finalAttrs: { src = fetchFromGitHub { owner = "adept"; repo = "pg_relusage"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-8hJNjQ9MaBk3J9a73l+yQMwMW/F2N8vr5PO2o+5GvYs="; }; diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 1c5831aaac3e..a0adcd2f3bd0 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -16,7 +16,7 @@ postgresqlBuildExtension (finalAttrs: { src = fetchFromGitHub { owner = "pgroonga"; repo = "pgroonga"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-PwUnjwqnmoWQ9kKZuKsAVzVBRyKvT+aexrm5eeRiRIQ="; }; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index 6a0603ec6f37..fcf4dde38249 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { meta = { description = "Digest and HMAC vmod"; homepage = "https://github.com/varnish/libvmod-digest"; - inherit (varnish.meta) license platforms teams; + inherit (varnish.meta) license platforms; }; } diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 51563fa4012e..b366fb466efb 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { meta = { description = "Dynamic director similar to the DNS director from Varnish 3"; homepage = "https://github.com/nigoroll/libvmod-dynamic"; - inherit (varnish.meta) license platforms teams; + inherit (varnish.meta) license platforms; }; } diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 6d6f1cb81e56..fbbaea22e679 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -46,7 +46,7 @@ let meta = { description = "Collection of Varnish Cache modules (vmods) by Varnish Software"; homepage = "https://github.com/varnish/varnish-modules"; - inherit (varnish.meta) license platforms teams; + inherit (varnish.meta) license platforms; }; }; in diff --git a/pkgs/servers/web-apps/lemmy/server.nix b/pkgs/servers/web-apps/lemmy/server.nix index 788e03e03fc7..9c573d048104 100644 --- a/pkgs/servers/web-apps/lemmy/server.nix +++ b/pkgs/servers/web-apps/lemmy/server.nix @@ -64,6 +64,12 @@ rustPlatform.buildRustPackage rec { "--skip=scheduled_tasks::tests::test_nodeinfo_lemmy_ml" ]; + # This gets installed automatically by cargoInstallHook, + # but we don't actually need it, and it leaks a reference to rustc. + postInstall = '' + rm $out/lib/libhtml2md.so + ''; + passthru.updateScript = ./update.py; passthru.tests.lemmy-server = nixosTests.lemmy; diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index 1cd32fd1152a..6d68de1b1096 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -95,9 +95,10 @@ stdenv.mkDerivation rec { license = lib.licenses.bsl11; maintainers = with lib.maintainers; [ cab404 + e1mo + xanderio yrd ]; - teams = [ lib.teams.cyberus ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/shells/fish/plugins/plugin-git.nix b/pkgs/shells/fish/plugins/plugin-git.nix index bef76a97e1fa..ea5c8edbffd7 100644 --- a/pkgs/shells/fish/plugins/plugin-git.nix +++ b/pkgs/shells/fish/plugins/plugin-git.nix @@ -11,7 +11,7 @@ buildFishPlugin rec { src = fetchFromGitHub { owner = "jhillyerd"; repo = "plugin-git"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-p7vvwisu3mvVOE1DcALbzuGJqWBcE1h71UjaopGdxE0="; }; diff --git a/pkgs/shells/fish/plugins/spark.nix b/pkgs/shells/fish/plugins/spark.nix index 68b23fb55d01..818536596f3f 100644 --- a/pkgs/shells/fish/plugins/spark.nix +++ b/pkgs/shells/fish/plugins/spark.nix @@ -11,7 +11,7 @@ let src = fetchFromGitHub { owner = "jorgebucaran"; repo = "spark.fish"; - rev = "refs/tags/${self.version}"; + tag = self.version; hash = "sha256-AIFj7lz+QnqXGMBCfLucVwoBR3dcT0sLNPrQxA5qTuU="; }; diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 93d5daf4c8c9..6e8314d80937 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "fennewald"; repo = "nu_plugin_net"; - tag = "${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-HiNydU40FprxVmRRZtnXom2kFYI04mbeuGTq8+BMh7o="; }; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 3bc88f59c4bb..3cbe274a2f0e 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -43,7 +43,8 @@ in # Select the appropriate stages for the platform `system'. if crossSystem != localSystem || crossOverlays != [ ] then stagesCross -else if config ? replaceStdenv then +# The `or null` fallback is needed for contexts that don't use the module system (e.g. tarball builds). +else if (config.replaceStdenv or null) != null then stagesCustom else if localSystem.isLinux then stagesLinux diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index 54ffcc4e3540..054c489ec44e 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "savonet"; repo = "liquidsoap"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-EQFWFtgWvwsV+ZhO36Sd7mpxYOnd4Vv6Z+6xsgi335k="; }; diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index d5356b6e9eb7..bd6c826dcab0 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -18,7 +18,7 @@ let asio = fetchFromGitHub { owner = "chriskohlhoff"; repo = "asio"; - rev = "refs/tags/asio-1-28-2"; + tag = "asio-1-28-2"; hash = "sha256-8Sw0LuAqZFw+dxlsTstlwz5oaz3+ZnKBuvSdLW6/DKQ="; }; @@ -26,7 +26,7 @@ let bitsery = fetchFromGitHub { owner = "fraillt"; repo = "bitsery"; - rev = "refs/tags/v5.2.3"; + tag = "v5.2.3"; hash = "sha256-rmfcIYCrANycFuLtibQ5wOPwpMVhpTMpdGsUfpR3YsM="; }; @@ -34,7 +34,7 @@ let clap = fetchFromGitHub { owner = "free-audio"; repo = "clap"; - rev = "refs/tags/1.1.9"; + tag = "1.1.9"; hash = "sha256-z2P0U2NkDK1/5oDV35jn/pTXCcspuM1y2RgZyYVVO3w="; }; @@ -42,7 +42,7 @@ let function2 = fetchFromGitHub { owner = "Naios"; repo = "function2"; - rev = "refs/tags/4.2.3"; + tag = "4.2.3"; hash = "sha256-+fzntJn1fRifOgJhh5yiv+sWR9pyaeeEi2c1+lqX3X8="; }; @@ -50,7 +50,7 @@ let ghc_filesystem = fetchFromGitHub { owner = "gulrak"; repo = "filesystem"; - rev = "refs/tags/v1.5.14"; + tag = "v1.5.14"; hash = "sha256-XZ0IxyNIAs2tegktOGQevkLPbWHam/AOFT+M6wAWPFg="; }; @@ -58,7 +58,7 @@ let tomlplusplus = fetchFromGitHub { owner = "marzer"; repo = "tomlplusplus"; - rev = "refs/tags/v3.4.0"; + tag = "v3.4.0"; hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M="; }; @@ -66,7 +66,7 @@ let vst3 = fetchFromGitHub { owner = "robbert-vdh"; repo = "vst3sdk"; - rev = "refs/tags/v3.7.7_build_19-patched"; + tag = "v3.7.7_build_19-patched"; fetchSubmodules = true; hash = "sha256-LsPHPoAL21XOKmF1Wl/tvLJGzjaCLjaDAcUtDvXdXSU="; }; @@ -79,7 +79,7 @@ multiStdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "robbert-vdh"; repo = "yabridge"; - rev = "refs/tags/${finalAttrs.version}"; + tag = finalAttrs.version; hash = "sha256-4eA3vQFklIWkhtbd3Nw39bnJT6gPcni79ZyQVqU4+GQ="; }; diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 774771e95100..07be73d31bfc 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, fetchFromGitHub, cmake, extra-cmake-modules, @@ -50,6 +51,15 @@ stdenv.mkDerivation rec { fcitx5-lua ]; + patches = [ + # Without this patch, setting ENABLE_CLOUDPINYIN to off would fail to build + (fetchpatch { + name = "cloudpinyin-disable-build"; + url = "https://github.com/fcitx/fcitx5-chinese-addons/commit/024fff9c8587ca2fb01905e9a25df838e7d99da2.patch"; + hash = "sha256-Mo5l8tsn1JQxTFHxOZfQRmbCeWZHLyxfn2Qwv/gQXGA="; + }) + ]; + prePatch = '' ln -s ${pyStroke} modules/pinyinhelper/$(stripHash ${pyStroke}) ln -s ${pyTable} modules/pinyinhelper/$(stripHash ${pyTable}) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b63f6d4d33d0..f50f99b9dfc7 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -214,6 +214,20 @@ lib.makeExtensible ( nix_2_32 = addTests "nix_2_32" self.nixComponents_2_32.nix-everything; + nixComponents_2_33 = nixDependencies.callPackage ./modular/packages.nix rec { + version = "2.33.1"; + inherit (self.nix_2_32.meta) teams; + otherSplices = generateSplicesForNixComponents "nixComponents_2_33"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + tag = version; + hash = "sha256-TVKn52SoKq8mMyW/x3NPPskGVurFdnGGV0DGvnL0gak="; + }; + }; + + nix_2_33 = addTests "nix_2_33" self.nixComponents_2_33.nix-everything; + nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec { version = "2.34pre20251217_${lib.substring 0 8 src.rev}"; inherit teams; @@ -228,7 +242,7 @@ lib.makeExtensible ( git = addTests "git" self.nixComponents_git.nix-everything; - latest = self.nix_2_32; + latest = self.nix_2_33; # Read ./README.md before bumping a major release stable = addFallbackPathsCheck self.nix_2_31; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dd9ba3ff6253..fce5d3e9669c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -296,6 +296,7 @@ mapAliases { ansible_2_17 = throw "ansible_2_17 has been removed, as it is EOL"; # Added 2025-11-10 ansible_2_18 = throw "ansible_2_18 has been removed; use overridePythonAttrs if you need a specific version"; # Added 2025-11-10 ansible_2_19 = throw "ansible_2_19 has been removed; use overridePythonAttrs if you need a specific version"; # Added 2025-11-10 + antibody = throw "antibody has been removed because it was deprecated and archived upstream. Consider using antidote instead"; # Added 2026-01-16 antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20 ao = throw "'ao' has been renamed to/replaced by 'libfive'"; # Converted to throw 2025-10-27 apacheAnt = throw "'apacheAnt' has been renamed to/replaced by 'ant'"; # Converted to throw 2025-10-27 @@ -367,6 +368,7 @@ mapAliases { bitwarden_rs-postgresql = throw "'bitwarden_rs-postgresql' has been renamed to/replaced by 'vaultwarden-postgresql'"; # Converted to throw 2025-10-27 bitwarden_rs-sqlite = throw "'bitwarden_rs-sqlite' has been renamed to/replaced by 'vaultwarden-sqlite'"; # Converted to throw 2025-10-27 bitwarden_rs-vault = throw "'bitwarden_rs-vault' has been renamed to/replaced by 'vaultwarden-vault'"; # Converted to throw 2025-10-27 + blackbox = throw "'blackbox' has been removed since it has been deprecated and archived upstream. Consider using pass instead"; # Added 2026-01-16 blas-reference = throw "blas-reference has been removed since it has been discontinued as free-standing package. It is now contained within lapack-reference."; # Added 2025-10-21 blender-hip = throw "blender-hip has been removed in favor of setting `config.rocmSupport = true` or using `pkgsRocm.blender`"; # Added 2026-01-04 blender-with-packages = throw "blender-with-packages is deprecated in in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"; # Converted to throw 2025-10-26 @@ -382,6 +384,7 @@ mapAliases { breath-theme = throw "'breath-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 brogue = warnAlias "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04 btanks = throw "'btanks' has been removed as it's been unmaintained since 2010 and fails to build"; # Added 2025-11-29 + buck = throw "'buck' has been removed has it was deprecated and archived upstream. Consider moving to buck2"; # Added 2026-01-16 buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17 buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13 buildPlatform = warnAlias "'buildPlatform' has been renamed to/replaced by 'stdenv.buildPlatform'" stdenv.buildPlatform; # Converted to warning 2025-10-28 @@ -803,11 +806,13 @@ mapAliases { isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18 iso-flags-png-320x420 = throw "'iso-flags-png-320x420' has been renamed to/replaced by 'iso-flags-png-320x240'"; # Converted to throw 2025-10-27 itktcl = throw "'itktcl' has been renamed to/replaced by 'tclPackages.itktcl'"; # Converted to throw 2025-10-27 + itm-tools = throw "'itm-tools' has been removed because it was deprecated and archived upstream."; # Added 2026-01-15 itpp = throw "itpp has been removed, as it was broken"; # Added 2025-08-25 jack_rack = throw "'jack_rack' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 jami-client = throw "'jami-client' has been renamed to/replaced by 'jami'"; # Converted to throw 2025-10-27 jami-client-qt = throw "'jami-client-qt' has been renamed to/replaced by 'jami-client'"; # Converted to throw 2025-10-27 jami-daemon = throw "'jami-daemon' has been renamed to/replaced by 'jami.daemon'"; # Converted to throw 2025-10-27 + jarowinkler-cpp = throw "'jarowinkler-cpp' has been removed because it was deprecated and archived upstream. Consider using 'rapidfuzz-cpp' instead"; # Added 2026-01-15 jdk23 = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04 jdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04 jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04 @@ -895,6 +900,7 @@ mapAliases { libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # Added 2025-08-28 libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28 liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20 + libmesode = throw "'libmesode' has been removed because it was deprecated and archived upstream. Consider using 'libstrophe' instead"; # Added 2026-01-15 libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16 libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16 @@ -1238,6 +1244,7 @@ mapAliases { nixosTest = throw "'nixosTest' has been renamed to/replaced by 'testers.nixosTest'"; # Converted to throw 2025-10-27 nixStable = throw "'nixStable' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2025-10-27 nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30 + nofi = throw "'nofi' has been removed due to being archived upstream."; # Added 2026-01-16 nomacs-qt6 = nomacs; # Added 2025-08-30 norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29 notary = throw "'notary' has been removed due to being archived upstream. Consider using 'notation' instead."; # Added 2025-11-13 @@ -1255,6 +1262,7 @@ mapAliases { obliv-c = throw "obliv-c has been removed from Nixpkgs, as it has been unmaintained upstream for 4 years and does not build with supported GCC versions"; # Added 2025-08-18 oclgrind = throw "oclgrind has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10 oil = throw "'oil' has been renamed to/replaced by 'oils-for-unix'"; # Converted to throw 2025-10-27 + olaris-server = throw "'olaris-server' has been removed as it failed to build since 2024"; # Added 2026-01-15 onevpl-intel-gpu = throw "'onevpl-intel-gpu' has been renamed to/replaced by 'vpl-gpu-rt'"; # Converted to throw 2025-10-27 onlyoffice-bin = throw "'onlyoffice-bin' has been renamed to/replaced by 'onlyoffice-desktopeditors'"; # Converted to throw 2025-10-27 onlyoffice-bin_latest = throw "'onlyoffice-bin_latest' has been renamed to/replaced by 'onlyoffice-bin'"; # Converted to throw 2025-10-27 @@ -1369,6 +1377,7 @@ mapAliases { polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18 polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25 poppler_utils = throw "'poppler_utils' has been renamed to/replaced by 'poppler-utils'"; # Converted to throw 2025-10-27 + popura = throw "'popura' is abandoned upstream and in nixpkgs and has been removed"; # Added 2026-01-15 posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23 postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19 postgres-lsp = warnAlias "'postgres-lsp' has been renamed to 'postgres-language-server'" postgres-language-server; # Added 2025-10-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e638e1db9d9e..6d842df78ae7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2303,8 +2303,6 @@ with pkgs; cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert; - ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { }; - clickhouse-lts = callPackage ../by-name/cl/clickhouse/lts.nix { }; cmdpack = callPackages ../tools/misc/cmdpack { }; @@ -4153,6 +4151,7 @@ with pkgs; corretto11 = javaPackages.compiler.corretto11; corretto17 = javaPackages.compiler.corretto17; corretto21 = javaPackages.compiler.corretto21; + corretto25 = javaPackages.compiler.corretto25; inherit (callPackage ../development/compilers/crystal { }) crystal_1_14 @@ -5944,10 +5943,6 @@ with pkgs; black-macchiato = with python3Packages; toPythonApplication black-macchiato; - buck = callPackage ../development/tools/build-managers/buck { - python3 = python311; - }; - build2 = callPackage ../development/tools/build-managers/build2 { # Break cycle by using self-contained toolchain for bootstrapping build2 = buildPackages.callPackage ../development/tools/build-managers/build2/bootstrap.nix { }; @@ -7911,6 +7906,7 @@ with pkgs; generateSplicesForMkScope lib stdenv + gcc14Stdenv fetchurl fetchpatch fetchgit @@ -10187,10 +10183,6 @@ with pkgs; bitwig-studio = bitwig-studio5; - blackbox = callPackage ../applications/version-management/blackbox { - pinentry = pinentry-curses; - }; - blucontrol = callPackage ../applications/misc/blucontrol/wrapper.nix { inherit (haskellPackages) ghcWithPackages; }; @@ -12620,12 +12612,6 @@ with pkgs; tibia = pkgsi686Linux.callPackage ../games/tibia { }; - speed_dreams = callPackage ../games/speed-dreams { - # Torcs wants to make shared libraries linked with plib libraries (it provides static). - # i686 is the only platform I know than can do that linking without plib built with -fPIC - libpng = libpng12; - }; - ultrastar-creator = libsForQt5.callPackage ../tools/misc/ultrastar-creator { }; ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { }; diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix index c8e8a3f58590..757274fd1dc7 100644 --- a/pkgs/top-level/config.nix +++ b/pkgs/top-level/config.nix @@ -266,6 +266,38 @@ let feature = "build packages with CUDA support by default"; }; + cudaCapabilities = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + A list of CUDA capabilities to build for. + + Packages may use this option to control device code generation to + take advantage of architecture-specific functionality, speed up + compile times by producing less device code, or slim package closures. + + For example, you can build for Ada Lovelace GPUs with + `cudaCapabilities = [ "8.9" ];`. + + If not provided, the default value is calculated per-package set, + derived from a list of GPUs supported by that CUDA version. + + See the [CUDA section](https://nixos.org/manual/nixpkgs/stable/#cuda) in + the Nixpkgs manual for more information. + ''; + }; + + cudaForwardCompat = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable PTX support for future hardware. + + When enabled, packages will include PTX code that can be JIT-compiled + for GPUs newer than those explicitly targeted by `cudaCapabilities`. + ''; + }; + replaceBootstrapFiles = mkMassRebuild { type = types.functionTo (types.attrsOf types.package); default = lib.id; @@ -294,6 +326,22 @@ let ''; }; + replaceStdenv = mkMassRebuild { + type = types.nullOr (types.functionTo types.package); + default = null; + defaultText = literalExpression "null"; + description = '' + A function to replace the standard environment (stdenv). + + The function receives an attribute set with `pkgs` and should return + a stdenv derivation. + + This can be used to globally replace the stdenv with a custom one, + for example to use ccache or distcc. + ''; + example = literalExpression "{ pkgs }: pkgs.ccacheStdenv"; + }; + rocmSupport = mkMassRebuild { feature = "build packages with ROCm support by default"; }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 8a35e3a59feb..6e2e29b41ea8 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -24,12 +24,12 @@ let self: coq: let callPackage = self.callPackage; - in - { - inherit coq lib; coqPackages = self // { recurseForDerivations = false; }; + in + { + inherit coqPackages lib; metaFetch = import ../build-support/coq/meta-fetch/default.nix { inherit @@ -41,6 +41,17 @@ let }; mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq { }); + coq = coq.overrideAttrs (oldAttrs: { + passthru = (oldAttrs.passthru or { }) // { + withPackages = + f: + (callPackage ../applications/science/logic/coq/with-packages.nix { + inherit coq; + }) + (f self); + }; + }); + contribs = lib.recurseIntoAttrs (callPackage ../development/coq-modules/contribs { }); aac-tactics = callPackage ../development/coq-modules/aac-tactics { }; @@ -302,39 +313,39 @@ rec { in self.filterPackages (!coq.dontFilter or false); - coq_8_7 = mkCoq "8.7" { }; - coq_8_8 = mkCoq "8.8" { }; - coq_8_9 = mkCoq "8.9" { }; - coq_8_10 = mkCoq "8.10" { }; - coq_8_11 = mkCoq "8.11" { }; - coq_8_12 = mkCoq "8.12" { }; - coq_8_13 = mkCoq "8.13" { }; - coq_8_14 = mkCoq "8.14" { }; - coq_8_15 = mkCoq "8.15" { }; - coq_8_16 = mkCoq "8.16" { }; - coq_8_17 = mkCoq "8.17" { }; - coq_8_18 = mkCoq "8.18" { }; - coq_8_19 = mkCoq "8.19" { }; - coq_8_20 = mkCoq "8.20" { }; - coq_9_0 = mkCoq "9.0" rocqPackages_9_0; - coq_9_1 = mkCoq "9.1" rocqPackages_9_1; + coqPackages_8_7 = mkCoqPackages (mkCoq "8.7" { }); + coqPackages_8_8 = mkCoqPackages (mkCoq "8.8" { }); + coqPackages_8_9 = mkCoqPackages (mkCoq "8.9" { }); + coqPackages_8_10 = mkCoqPackages (mkCoq "8.10" { }); + coqPackages_8_11 = mkCoqPackages (mkCoq "8.11" { }); + coqPackages_8_12 = mkCoqPackages (mkCoq "8.12" { }); + coqPackages_8_13 = mkCoqPackages (mkCoq "8.13" { }); + coqPackages_8_14 = mkCoqPackages (mkCoq "8.14" { }); + coqPackages_8_15 = mkCoqPackages (mkCoq "8.15" { }); + coqPackages_8_16 = mkCoqPackages (mkCoq "8.16" { }); + coqPackages_8_17 = mkCoqPackages (mkCoq "8.17" { }); + coqPackages_8_18 = mkCoqPackages (mkCoq "8.18" { }); + coqPackages_8_19 = mkCoqPackages (mkCoq "8.19" { }); + coqPackages_8_20 = mkCoqPackages (mkCoq "8.20" { }); + coqPackages_9_0 = mkCoqPackages (mkCoq "9.0" rocqPackages_9_0); + coqPackages_9_1 = mkCoqPackages (mkCoq "9.1" rocqPackages_9_1); - coqPackages_8_7 = mkCoqPackages coq_8_7; - coqPackages_8_8 = mkCoqPackages coq_8_8; - coqPackages_8_9 = mkCoqPackages coq_8_9; - coqPackages_8_10 = mkCoqPackages coq_8_10; - coqPackages_8_11 = mkCoqPackages coq_8_11; - coqPackages_8_12 = mkCoqPackages coq_8_12; - coqPackages_8_13 = mkCoqPackages coq_8_13; - coqPackages_8_14 = mkCoqPackages coq_8_14; - coqPackages_8_15 = mkCoqPackages coq_8_15; - coqPackages_8_16 = mkCoqPackages coq_8_16; - coqPackages_8_17 = mkCoqPackages coq_8_17; - coqPackages_8_18 = mkCoqPackages coq_8_18; - coqPackages_8_19 = mkCoqPackages coq_8_19; - coqPackages_8_20 = mkCoqPackages coq_8_20; - coqPackages_9_0 = mkCoqPackages coq_9_0; - coqPackages_9_1 = mkCoqPackages coq_9_1; + coq_8_7 = coqPackages_8_7.coq; + coq_8_8 = coqPackages_8_8.coq; + coq_8_9 = coqPackages_8_9.coq; + coq_8_10 = coqPackages_8_10.coq; + coq_8_11 = coqPackages_8_11.coq; + coq_8_12 = coqPackages_8_12.coq; + coq_8_13 = coqPackages_8_13.coq; + coq_8_14 = coqPackages_8_14.coq; + coq_8_15 = coqPackages_8_15.coq; + coq_8_16 = coqPackages_8_16.coq; + coq_8_17 = coqPackages_8_17.coq; + coq_8_18 = coqPackages_8_18.coq; + coq_8_19 = coqPackages_8_19.coq; + coq_8_20 = coqPackages_8_20.coq; + coq_9_0 = coqPackages_9_0.coq; + coq_9_1 = coqPackages_9_1.coq; coqPackages = lib.recurseIntoAttrs coqPackages_9_0; coq = coqPackages.coq; diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 65dac9efe79c..190fbc3a82a6 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -11,9 +11,16 @@ let manifests = _cuda.lib.selectManifests manifestVersions; }; + # NOTE: + # The manifests are largely the same except for TensorRT: + # - linux-x86_64 is generally the best supported and can use the latest release + # - linux-sbsa (post-Orin Jetson and ARM) comes in second; NVIDIA dropped support for CUDA 12 with 10.13.2 (there is no + # 10.13.1), so we use 10.13.0 for all CUDA 12 releases. + # - linux-aarch64 (pre-Thor Jetson) is historically least supported; we use the latest release available. + cudaPackages_12_6 = let - inherit (cudaPackages_12_6.backendStdenv) hasJetsonCudaCapability; + inherit (cudaPackages_12_6.backendStdenv) hasJetsonCudaCapability hostPlatform; in mkCudaPackages { cublasmp = "0.6.0"; @@ -29,12 +36,18 @@ let nvjpeg2000 = "0.9.0"; nvpl = "25.5"; nvtiff = "0.5.1"; - tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.14.1"; + tensorrt = + if hasJetsonCudaCapability then + "10.7.0" + else if hostPlatform.isAarch64 then + "10.13.0" + else + "10.14.1"; }; cudaPackages_12_8 = let - inherit (cudaPackages_12_8.backendStdenv) hasJetsonCudaCapability; + inherit (cudaPackages_12_8.backendStdenv) hasJetsonCudaCapability hostPlatform; in mkCudaPackages { cublasmp = "0.6.0"; @@ -50,12 +63,18 @@ let nvjpeg2000 = "0.9.0"; nvpl = "25.5"; nvtiff = "0.5.1"; - tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.14.1"; + tensorrt = + if hasJetsonCudaCapability then + "10.7.0" + else if hostPlatform.isAarch64 then + "10.13.0" + else + "10.14.1"; }; cudaPackages_12_9 = let - inherit (cudaPackages_12_9.backendStdenv) hasJetsonCudaCapability; + inherit (cudaPackages_12_9.backendStdenv) hasJetsonCudaCapability hostPlatform; in mkCudaPackages { cublasmp = "0.6.0"; @@ -71,7 +90,13 @@ let nvjpeg2000 = "0.9.0"; nvpl = "25.5"; nvtiff = "0.5.1"; - tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.14.1"; + tensorrt = + if hasJetsonCudaCapability then + "10.7.0" + else if hostPlatform.isAarch64 then + "10.13.0" + else + "10.14.1"; }; # NOTE: Thor is supported from CUDA 13.0, so our check needs to capture whether pre-Thor devices were selected. diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix index 974c4d59611d..7c222e5f8300 100644 --- a/pkgs/top-level/java-packages.nix +++ b/pkgs/top-level/java-packages.nix @@ -47,6 +47,7 @@ in corretto11 = callPackage ../development/compilers/corretto/11.nix { }; corretto17 = callPackage ../development/compilers/corretto/17.nix { }; corretto21 = callPackage ../development/compilers/corretto/21.nix { }; + corretto25 = callPackage ../development/compilers/corretto/25.nix { }; openjdk8 = mkOpenjdk "8"; openjdk11 = mkOpenjdk "11"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 51dfcd2c9b09..72e6b416bb44 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -2090,6 +2090,8 @@ let tls-lwt = callPackage ../development/ocaml-modules/tls/lwt.nix { }; + tls-miou-unix = callPackage ../development/ocaml-modules/tls/miou-unix.nix { }; + tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { }; toml = callPackage ../development/ocaml-modules/toml { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77401c0a50f6..1ed705affa04 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -156,6 +156,8 @@ self: super: with self; { ahocorasick-rs = callPackage ../development/python-modules/ahocorasick-rs { }; + ai-edge-litert = callPackage ../development/python-modules/ai-edge-litert { }; + aigpy = callPackage ../development/python-modules/aigpy { }; ailment = callPackage ../development/python-modules/ailment { }; @@ -1715,7 +1717,7 @@ self: super: with self; { backoff = callPackage ../development/python-modules/backoff { }; backports-asyncio-runner = - if pythonAtLeast "3.11" then + if pythonAtLeast "3.12" then null else callPackage ../development/python-modules/backports-asyncio-runner { }; @@ -1730,7 +1732,11 @@ self: super: with self; { backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; - backports-strenum = callPackage ../development/python-modules/backports-strenum { }; + backports-strenum = + if pythonAtLeast "3.11" then + null + else + callPackage ../development/python-modules/backports-strenum { }; backports-tarfile = callPackage ../development/python-modules/backports-tarfile { }; @@ -11074,6 +11080,8 @@ self: super: with self; { nvchecker = callPackage ../development/python-modules/nvchecker { }; + nvdlfw-inspect = callPackage ../development/python-modules/nvdlfw-inspect { }; + nvdlib = callPackage ../development/python-modules/nvdlib { }; nvidia-dlprof-pytorch-nvtx =