diff --git a/doc/doc-support/header.html b/doc/doc-support/header.html new file mode 100644 index 000000000000..1c42f4adcf11 --- /dev/null +++ b/doc/doc-support/header.html @@ -0,0 +1,7 @@ +
+ + Nixpkgs Manual +
diff --git a/doc/doc-support/package.nix b/doc/doc-support/package.nix index f2c37df39132..728bbe334501 100644 --- a/doc/doc-support/package.nix +++ b/doc/doc-support/package.nix @@ -119,6 +119,8 @@ stdenvNoCC.mkDerivation ( --script ./anchor-use.js \ --sidebar-depth 3 \ --nav ./nav.json \ + --header ${./header.html}\ + --no-navheader \ manual.md \ out/index.html diff --git a/doc/languages-frameworks/rocq.section.md b/doc/languages-frameworks/rocq.section.md index f2ba50312807..056394056797 100644 --- a/doc/languages-frameworks/rocq.section.md +++ b/doc/languages-frameworks/rocq.section.md @@ -74,6 +74,8 @@ The recommended way of defining a derivation for a Rocq library, is to use the ` * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it. * `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variables `COQLIBINSTALL` and `COQPLUGININSTALL` so as to install in the proper subdirectory. Indeed Rocq libraries should be installed in `$(out)/lib/coq/${rocq-core.rocq-version}/user-contrib/`. Such directories are automatically added to the `$ROCQPATH` environment variable by the hook defined in the Rocq derivation. * `setROCQBIN` (optional, defaults to `true`), by default, the environment variable `$ROCQBIN` is set to the current Rocq's binary, but one can disable this behavior by setting it to `false`, +* `useCoq` (optional, defaults to `false`), adds the Coq compatibility binaries to the build environment, which is necessary for some packages that still depend on them and sets `COQBIN` to the path of the `coqc` binary (if `setROCQBIN` is also set to `true`). A wrapper `mkCoqDerivation` is provided that sets this option to `true`. +* `useCoqifVersion` (optional, defaults to `(x: false)`), adds the Coq compatibility binaries to the build environment if the provided predicate evaluates to true on the version. This can be useful for supporting old package versions that need the Coq compatibility binaries, while newer versions do not. * `useMelquiondRemake` (optional, default to `null`) is an attribute set, which, if given, overloads the `preConfigurePhases`, `configureFlags`, `buildPhase`, and `installPhase` attributes of the derivation for a specific use in libraries using `remake` as set up by Guillaume Melquiond for `flocq`, `gappalib`, `interval`, and `coquelicot` (see the corresponding derivation for concrete examples of use of this option). For backward compatibility, the attribute `useMelquiondRemake.logpath` must be set to the logical root of the library (otherwise, one can pass `useMelquiondRemake = {}` to activate this without backward compatibility). * `dropAttrs`, `keepAttrs`, `dropDerivationAttrs` are all optional and allow to tune which attribute is added or removed from the final call to `mkDerivation`. diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md index ce3330d0b967..3df6dcba2037 100644 --- a/doc/release-notes/rl-2611.section.md +++ b/doc/release-notes/rl-2611.section.md @@ -44,6 +44,8 @@ - `libgdata` has been removed, as it was archived upstream and relied on the insecure libsoup 2.4. +- `mcphost` has been removed, as it was archived upstream and declared unmaintained. + - `services.mysql` now sets `root@localhost` authentication to `auth_socket` when used with `mysql` or `percona-server`. Existing deployments will also be adjusted if possible. See the [security advisory GHSA-6qxx-6rg8-c4p8](https://github.com/NixOS/nixpkgs/security/advisories/GHSA-6qxx-6rg8-c4p8) for more information. @@ -106,6 +108,7 @@ - Starting with v14, `flameshot` will primarily utilise xdg-desktop-portal calls for screenshotting. This will directly affect users on X11 window managers due to the lack of a compatible portal with Screenshot feature. See [upstream changelog](https://github.com/flameshot-org/flameshot/releases/tag/v14.0.0) or [NixOS Flameshot](https://wiki.nixos.org/wiki/Flameshot) wiki page for workarounds. - `nim1` and respective aliases have been removed due to entering EOL; please migrate to `nim` or `nim-unwrapped` (nim 2). - `nim-2_0` & `nim-2_2` and respective aliases have been removed; please migrate to `nim` or `nim-unwrapped` (nim 2.2.10). +- `domoticz` has been updated from `2024.7` to `2026.x`, breaking third party applications and scripts using the old RType calls. Review the [release notes](https://github.com/domoticz/domoticz/blob/2026.2/History.txt#L398) for more information. - `vimacs` has been removed, as it has not been maintained in 10 years and was built for an old version of vim (6.0). @@ -142,10 +145,11 @@ ### Deprecations {#sec-nixpkgs-release-26.11-lib-deprecations} -- Create the first release note entry in this section! +- Setting `config.allowBrokenPredicate` is deprecated in favor of + using `config.problems.handlers.PackageName.broken = "warn"` (or `= + "ignore"`). For more information see [](#sec-allow-broken). ### Additions and Improvements {#sec-nixpkgs-release-26.11-lib-additions-improvements} - Create the first release note entry in this section! - diff --git a/doc/style.css b/doc/style.css index 8b426e72de24..9410d39e54be 100644 --- a/doc/style.css +++ b/doc/style.css @@ -23,14 +23,14 @@ body { @media screen and (min-width: 992px) { .book, .appendix { - max-width: 60rem; + max-width: 55rem; } } @media screen and (min-width: 1200px) { .book, .appendix { - max-width: 73rem; + max-width: 55rem; } } @@ -398,6 +398,7 @@ div.appendix .variablelist .term { :root { --sidebar-width: 20rem; + --header-height: 3rem; --background: #fff; --main-text-color: #000; --link-color: #405d99; @@ -528,7 +529,7 @@ nav.toc-sidebar summary { min-height: 0; display: grid; grid-template-columns: minmax(0, 1fr); - grid-template-rows: auto minmax(0, 1fr); + grid-template-rows: var(--header-height) auto minmax(0, 1fr); } body:has(> nav.toc-sidebar) { @@ -537,7 +538,7 @@ nav.toc-sidebar summary { .navheader { grid-column: 1 / -1; - grid-row: 1; + grid-row: 2; } nav.toc-sidebar { @@ -548,7 +549,7 @@ nav.toc-sidebar summary { /* */ margin: 0; grid-column: 1; - grid-row: 2; + grid-row: 3; max-height: none; overflow-y: auto; border: none; @@ -562,7 +563,7 @@ nav.toc-sidebar summary { main.content { grid-column: 1 / -1; - grid-row: 2; + grid-row: 3; overflow-y: auto; padding: 0 1rem; } @@ -571,3 +572,73 @@ nav.toc-sidebar summary { grid-column: 2; } } + +.manual-header { + background-color: var(--background); + border-bottom: 0.0625rem solid #d8d8d8; + display: flex; + flex-direction: column; +} + +.manual-header--title { + order: -1; + padding: 0.5rem 1rem 0; + font-size: 0.875rem; + font-weight: 500; + color: var(--small-heading-color); + text-align: center; +} + +.manual-header--tabs { + display: flex; + align-items: stretch; + justify-content: space-around; + margin: 0; + padding: 0; +} + +.manual-header--tab { + display: flex; + align-items: center; + padding: 0 1rem; + font-size: 0.875rem; + font-weight: 500; + color: var(--main-text-color); + text-decoration: none; + border-bottom: 0.1875rem solid transparent; + border-top: 0.1875rem solid transparent; + transition: border-bottom-color 0.15s ease; +} + +.manual-header--tab:hover { + border-bottom-color: var(--heading-color); + color: var(--main-text-color); +} + +.manual-header--tab-active { + border-bottom-color: var(--heading-color); + color: var(--heading-color); + font-weight: 700; +} + +@media screen and (min-width: 768px) { + .manual-header { + height: var(--header-height); + flex-direction: row; + align-items: stretch; + grid-column: 1 / -1; + grid-row: 1; + } + + .manual-header--title { + order: 0; + margin-left: auto; + padding: 0 1rem; + align-self: center; + } + + .manual-header--tabs { + justify-content: flex-start; + padding: 0 1rem; + } +} diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 40779e666e48..8c1abf72ed9e 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -151,6 +151,7 @@ "samuela": 226872 }, "members": { + "ethancedwards8": 60861925, "prusnak": 42201 }, "name": "cuda-maintainers" @@ -365,10 +366,10 @@ "freedesktop": { "description": "Maintain Freedesktop.org packages for graphical desktop.", "id": 3806136, - "maintainers": {}, - "members": { + "maintainers": { "jtojnar": 705123 }, + "members": {}, "name": "Freedesktop" }, "geospatial": { diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dfae715bcd38..7667360d7624 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1943,6 +1943,11 @@ githubId = 143312793; name = "Annin"; }; + anntnzrb = { + github = "anntnzrb"; + githubId = 51257127; + name = "anntnzrb"; + }; anoa = { matrix = "@andrewm:amorgan.xyz"; email = "andrew@amorgan.xyz"; @@ -4640,6 +4645,13 @@ githubId = 53847249; name = "Casey Avila"; }; + cassandracomar = { + name = "Cassandra Comar"; + github = "cassandracomar"; + githubId = 320772; + email = "cass@mountclare.net"; + keys = [ { fingerprint = "104E E74E 24A0 372B EAF5 5533 B019 18F7 7E04 AC99"; } ]; + }; castorNova2 = { email = "solemnsquire@gmail.com"; github = "castorNova2"; @@ -8841,6 +8853,13 @@ githubId = 345808; name = "Jakub Okoński"; }; + FatBoyXPC = { + name = "FatBoyXPC"; + email = "fatboyxpc@gmail.com"; + github = "FatBoyXPC"; + githubId = 744962; + keys = [ { fingerprint = "0E08 1B81 CBCA 1CF7 9568 A13F C4ED 3CA2 3211 8969"; } ]; + }; faukah = { github = "faukah"; name = "faukah"; @@ -9021,6 +9040,11 @@ githubId = 5198058; name = "Udo Sauer"; }; + fernvenue = { + github = "fernvenue"; + githubId = 84565547; + name = "fernvenue"; + }; feyorsh = { email = "george@feyor.sh"; github = "Feyorsh"; @@ -10386,6 +10410,12 @@ githubId = 273582; name = "greg"; }; + gregshuflin = { + email = "greg@everdayimshuflin.com"; + github = "neunenak"; + githubId = 311545; + name = "Greg Shuflin"; + }; greizgh = { email = "greizgh@ephax.org"; github = "greizgh"; @@ -11445,6 +11475,11 @@ githubId = 69209; name = "Ian Duncan"; }; + IanHollow = { + github = "IanHollow"; + githubId = 72767437; + name = "Ian Holloway"; + }; ianliu = { email = "ian.liu88@gmail.com"; github = "ianliu"; @@ -12745,6 +12780,12 @@ githubId = 5741620; name = "Jeremy Schlatter"; }; + jeremystucki = { + email = "dev@jeremystucki.ch"; + github = "jeremystucki"; + githubId = 7629727; + name = "Jeremy Stucki"; + }; jerith666 = { email = "github@matt.mchenryfamily.org"; github = "jerith666"; @@ -14096,6 +14137,14 @@ name = "Kenichi Kamiya"; keys = [ { fingerprint = "9121 5D87 20CA B405 C63F 24D2 EF6E 574D 040A E2A5"; } ]; }; + kacper-uminski = { + name = "Kacper Uminski"; + email = "kacper+nixpkgs@lysator.liu.se"; + github = "kacper-uminski"; + githubId = 57466578; + matrix = "@kacper.uminski:matrix.org"; + keys = [ { fingerprint = "3DF9 3DEB CAA9 81FA B3E2 A7F0 87DA 201D E02F 14B1"; } ]; + }; kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; @@ -20309,6 +20358,12 @@ githubId = 4242897; name = "Nikolai Mishin"; }; + nmoya = { + email = "nikolasmoya@gmail.com"; + github = "nmoya"; + githubId = 1767648; + name = "Nikolas Moya"; + }; noaccos = { name = "Francesco Noacco"; email = "francesco.noacco2000@gmail.com"; diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index cf5c28358097..78f44ad9ad74 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -202,6 +202,8 @@ rec { --script ./anchor.min.js \ --script ./anchor-use.js \ --sidebar-depth 2 \ + --header ${./header.html}\ + --no-navheader \ ./manual.md \ $dst/${common.indexPath} diff --git a/nixos/doc/manual/header.html b/nixos/doc/manual/header.html new file mode 100644 index 000000000000..acc029f5c3e4 --- /dev/null +++ b/nixos/doc/manual/header.html @@ -0,0 +1,7 @@ +
+ + Nixos Manual +
diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index fa6f1989ba71..f767735f9e37 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -1891,6 +1891,9 @@ "sec-kubernetes": [ "index.html#sec-kubernetes" ], + "module-services-nordvpn": [ + "index.html#module-services-nordvpn" + ], "ch-running": [ "index.html#ch-running" ], diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index ccf235a16557..5eec5286eb9f 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -56,6 +56,8 @@ - [OO7](https://github.com/linux-credentials/oo7) is a desktop-agnostic Secret Service provider. Available as [services.oo7](#opt-services.oo7.enable) +- [NordVPN](https://github.com/NordSecurity/nordvpn-linux), a NordVPN client for linux. Available as [services.nordvpn](options.html#opt-services.nordvpn.enable). + ## Backward Incompatibilities {#sec-release-26.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6773d0004541..a1c6cedf8a41 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -358,6 +358,7 @@ ./programs/wayland/mangowc.nix ./programs/wayland/miracle-wm.nix ./programs/wayland/niri.nix + ./programs/wayland/pinnacle.nix ./programs/wayland/river.nix ./programs/wayland/sway.nix ./programs/wayland/uwsm.nix @@ -1343,6 +1344,7 @@ ./services/networking/nncp.nix ./services/networking/nntp-proxy.nix ./services/networking/nomad.nix + ./services/networking/nordvpn.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix ./services/networking/ntp/chrony.nix diff --git a/nixos/modules/programs/wayland/pinnacle.nix b/nixos/modules/programs/wayland/pinnacle.nix new file mode 100644 index 000000000000..2b341136c583 --- /dev/null +++ b/nixos/modules/programs/wayland/pinnacle.nix @@ -0,0 +1,70 @@ +{ + pkgs, + config, + lib, + ... +}: +let + cfg = config.programs.pinnacle; + inherit (lib.options) mkEnableOption mkPackageOption; +in +{ + options.programs.pinnacle = { + enable = mkEnableOption "pinnacle"; + package = mkPackageOption pkgs "pinnacle" { + default = "pinnacle"; + example = "pkgs.pinnacle"; + extraDescription = "package containing the pinnacle server binary"; + }; + xdg-portals.enable = mkEnableOption "enable xdg-portals for pinnacle"; + withUWSM = mkEnableOption '' + manage the pinnacle session with [UWSM](https://github.com/Vladimir-csp/uwsm) instead + of independent systemd services and targets. + ''; + }; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + environment.systemPackages = [ + cfg.package + pkgs.protobuf + cfg.package.lua-client-api + ]; + environment.pathsToLink = [ + # For /run/current-system/sw/share/pinnacle protobuf files - for + # pinnacle to be able to launch with a non-default config out of the + # box. + "/share/pinnacle" + ]; + xdg.portal = lib.mkIf cfg.xdg-portals.enable { + enable = true; + wlr.enable = true; + configPackages = [ cfg.package ]; + extraPortals = [ + pkgs.xdg-desktop-portal-wlr + pkgs.xdg-desktop-portal-gtk + pkgs.gnome-keyring + ]; + }; + } + (lib.mkIf (cfg.withUWSM) { + programs.uwsm.enable = true; + # Configure UWSM to launch Pinnacle from a display manager like SDDM + programs.uwsm.waylandCompositors = { + pinnacle = { + prettyName = "Pinnacle"; + comment = "Pinnacle compositor managed by UWSM"; + binPath = "/run/current-system/sw/bin/pinnacle"; + extraArgs = [ "--session" ]; + }; + }; + }) + (lib.mkIf (!cfg.withUWSM) { + services.displayManager.sessionPackages = [ cfg.package ]; + }) + ] + ); + + meta.maintainers = with lib.maintainers; [ cassandracomar ]; +} diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix index 4a55c30c839b..671c3821da4d 100644 --- a/nixos/modules/services/matrix/dendrite.nix +++ b/nixos/modules/services/matrix/dendrite.nix @@ -13,6 +13,7 @@ in { options.services.dendrite = { enable = lib.mkEnableOption "matrix.org dendrite"; + package = lib.mkPackageOption pkgs "dendrite" { }; httpPort = lib.mkOption { type = lib.types.nullOr lib.types.port; default = 8008; @@ -321,7 +322,7 @@ in ]; ExecStart = lib.strings.concatStringsSep " " ( [ - "${pkgs.dendrite}/bin/dendrite" + (lib.getExe cfg.package) "--config /run/dendrite/dendrite.yaml" ] ++ lib.optionals (cfg.httpPort != null) [ diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix index eb874447bb3a..adc948104da3 100644 --- a/nixos/modules/services/networking/networkd-dispatcher.nix +++ b/nixos/modules/services/networking/networkd-dispatcher.nix @@ -93,6 +93,10 @@ in config = mkIf cfg.enable { + warnings = mkIf (!config.networking.useNetworkd) [ + "services.networkd-dispatcher will not execute any scripts unless networking.useNetworkd is enabled." + ]; + systemd = { packages = [ pkgs.networkd-dispatcher ]; services.networkd-dispatcher = { diff --git a/nixos/modules/services/networking/nordvpn.md b/nixos/modules/services/networking/nordvpn.md new file mode 100644 index 000000000000..06016098894a --- /dev/null +++ b/nixos/modules/services/networking/nordvpn.md @@ -0,0 +1,65 @@ +# NordVPN {#module-services-nordvpn} + +*Source:* {file}`modules/services/networking/nordvpn.nix` + +*Upstream documentation:* + +NordVPN offers a paid virtual private network (VPN) service. +The service operates as closed-source, +but the Linux client uses open-source code licensed under GPLv3. +A minimal configuration in NixOS appears as follows: + +```nix +{ + services.nordvpn.enable = true; + networking.firewall.enable = true; + networking.firewall.checkReversePath = "loose"; +} +``` + +When using a firewall, set `networking.firewall.checkReversePath` to `"loose"` or `false`. +NordVPN includes a `kill-switch` feature that blocks all packets not associated with the VPN connection. + +Additionally, add your user to the `nordvpn` group. + +```nix +{ + users.users.yourUser = { + #.. + extraGroups = [ + #.. + "nordvpn" + ]; + }; +} +``` + +If you prefer to use your own user and group, you can do so using + +```nix +{ + services.nordvpn.user = "SOME-USER"; + services.nordvpn.group = "SOME-GROUP"; +} +``` + +NordVPN provides several useful CLI commands, including: + +```bash +nordvpn login # Log in using an OAuth URL +nordvpn login --token # Log in with a token obtained from your NordVPN account +nordvpn c # Connect to the VPN +nordvpn c ie # Connect to a NordVPN server in Ireland +nordvpn d # Disconnect from the VPN +nordvpn set technology openvpn # Switch to OpenVPN technology +nordvpn c # Reconnect after changing technology +``` + +Additionally, if you prefer to use the friendly GUI, + +```bash +nordvpn-gui +``` + +**Disclaimer:** NixOS currently does not support meshnet. +Contributions welcome! diff --git a/nixos/modules/services/networking/nordvpn.nix b/nixos/modules/services/networking/nordvpn.nix new file mode 100644 index 000000000000..b38d75dd519d --- /dev/null +++ b/nixos/modules/services/networking/nordvpn.nix @@ -0,0 +1,171 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.nordvpn; + defaultUser = "nordvpn"; + defaultGroup = "nordvpn"; + + nordvpn = + let + cli = cfg.package.cli.overrideAttrs (old: { + preBuild = + let + extraPreBuild = lib.optionalString (cfg.group != defaultGroup) '' + substituteInPlace internal/permissions.go \ + --replace-fail \ + 'string{"nordvpn"}' \ + 'string{"${cfg.group}"}' + + substituteInPlace internal/constants.go \ + --replace-fail \ + 'NordvpnGroup = "nordvpn"' \ + 'NordvpnGroup = "${cfg.group}"' + ''; + in + extraPreBuild + (old.preBuild or ""); + + # postFixup wraps nordvpnd so that it can find binaries that it calls. + # here, instead, use systemd to update the path to those binaries. + postFixup = ""; + }); + in + pkgs.symlinkJoin { + inherit (cfg.package) pname version meta; + paths = [ + cli + cfg.package.gui + ]; + }; +in +{ + options.services.nordvpn = { + enable = lib.mkEnableOption "Enable NordVPN"; + package = lib.mkPackageOption pkgs "nordvpn" { }; + user = lib.mkOption { + type = lib.types.str; + default = defaultUser; + description = '' + The User that owns the `nordvpnd` systemd process. + If overriding the default, a user with the same name must exist. + ''; + }; + group = lib.mkOption { + type = lib.types.str; + default = defaultGroup; + description = '' + The Group that owns the `nordvpnd` systemd process. + If overriding the default, a group with the same name must exist. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + + # create the default user if that's the one used + users.users = lib.mkIf (cfg.user == defaultUser) { + ${defaultUser} = { + description = "User that runs `nordvpnd`."; + group = cfg.group; + isSystemUser = true; + }; + }; + + # create the default group if that's the one used + users.groups = lib.mkIf (cfg.group == defaultGroup) { + ${defaultGroup} = { }; + }; + + # nordvpnd uses resolved to configure dns + services.resolved.enable = true; + + # policy that allows nordvpnd to configure dns + security.polkit = { + enable = true; + extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.resolve1.set-dns-servers" + && subject.isInGroup("${cfg.group}")) { + return polkit.Result.YES; + } + }); + ''; + }; + + environment.systemPackages = [ + nordvpn + ]; + + systemd.services.nordvpnd = { + after = [ "network-online.target" ]; + description = "NordVPN daemon."; + path = ( + with pkgs; + [ + e2fsprogs + iproute2 + libxslt + nftables + procps + wireguard-tools + ] + ++ [ nordvpn ] + ); + serviceConfig = { + # nordvpnd needs CAP_NET_ADMIN to configure network interfaces + AmbientCapabilities = "CAP_NET_ADMIN"; + CapabilityBoundingSet = "CAP_NET_ADMIN"; + ExecStart = lib.getExe' nordvpn "nordvpnd"; + Group = cfg.group; + KillMode = "process"; + NonBlocking = true; + Requires = "nordvpnd.socket"; + Restart = "on-failure"; + RestartSec = 5; + RuntimeDirectory = "nordvpn"; + RuntimeDirectoryMode = "0750"; + StateDirectory = "nordvpn"; + StateDirectoryMode = "0750"; + User = cfg.user; + }; + wantedBy = [ "default.target" ]; + wants = [ "network-online.target" ]; + }; + + systemd.sockets.nordvpnd = { + description = "NordVPN Daemon Socket"; + listenStreams = [ "/run/nordvpn/nordvpnd.sock" ]; + partOf = [ "nordvpnd.service" ]; + socketConfig = { + DirectoryMode = "0750"; + NoDelay = true; + SocketGroup = cfg.group; + SocketMode = "0770"; + SocketUser = cfg.user; + }; + wantedBy = [ "sockets.target" ]; + }; + + systemd.user.services.norduserd = { + after = [ "network-online.target" ]; + description = "NordUserD Service"; + serviceConfig = { + ExecStart = lib.getExe' nordvpn "norduserd"; + NonBlocking = true; + Restart = "on-failure"; + RestartSec = 5; + }; + wantedBy = [ "graphical-session.target" ]; + wants = [ "network-online.target" ]; + }; + + }; + + meta = { + doc = ./nordvpn.md; + maintainers = with lib.maintainers; [ different-error ]; + }; +} diff --git a/nixos/modules/services/networking/technitium-dns-server.nix b/nixos/modules/services/networking/technitium-dns-server.nix index 143b0c43cfdc..32aa247989aa 100644 --- a/nixos/modules/services/networking/technitium-dns-server.nix +++ b/nixos/modules/services/networking/technitium-dns-server.nix @@ -65,6 +65,7 @@ in DynamicUser = true; StateDirectory = "technitium-dns-server"; + LogsDirectory = "technitium"; Restart = "always"; RestartSec = 10; @@ -102,5 +103,8 @@ in }; }; - meta.maintainers = with lib.maintainers; [ fabianrig ]; + meta.maintainers = with lib.maintainers; [ + fabianrig + awildleon + ]; } diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 9add26b636c6..dacf4a339d0e 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -347,7 +347,7 @@ def config_entry(levels: int, bootspec: BootSpec, label: str, time: str) -> str: os.path.basename(bootspec.toplevel) + "-secrets" ) - if os.system(bootspec.initrdSecrets + " " + initrd_secrets_path_temp) != 0: + if subprocess.run([bootspec.initrdSecrets, initrd_secrets_path_temp]).returncode != 0: print( f'warning: failed to create initrd secrets for "{label}"', file=sys.stderr, diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5e2b349d0813..029a2543ec93 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -63,7 +63,7 @@ let - `config.node.pkgs.` or `config.nodes.foo.nixpkgs.pkgs.` to refer to the Nixpkgs used on the VM guest(s). - `hostPkgs.` when invoking commands on the VM host (e.g. in Python - `os.system("foo")`) + `subprocess.run(["foo"])`) - Since the runTest argument is a module instead of a function, arguments must be passed as option definitions. You may declare explicit `options` for the test parameter(s), or use the @@ -1205,6 +1205,7 @@ in nominatim = runTest ./nominatim.nix; non-default-filesystems = handleTest ./non-default-filesystems.nix { }; non-switchable-system = runTest ./non-switchable-system.nix; + nordvpn = runTest ./nordvpn.nix; noto-fonts = runTest ./noto-fonts.nix; noto-fonts-cjk-qt-default-weight = runTest ./noto-fonts-cjk-qt-default-weight.nix; novacomd = handleTestOn [ "x86_64-linux" ] ./novacomd.nix { }; diff --git a/nixos/tests/blint.nix b/nixos/tests/blint.nix index ea0a14cb4b1f..3438f4926f82 100644 --- a/nixos/tests/blint.nix +++ b/nixos/tests/blint.nix @@ -14,7 +14,7 @@ ] ++ teams.ngi.members; - nodes.machine = { + containers.machine = { environment.systemPackages = with pkgs; [ blint jq diff --git a/nixos/tests/bluesky-pds.nix b/nixos/tests/bluesky-pds.nix index b74c74955f54..aa791a43c27b 100644 --- a/nixos/tests/bluesky-pds.nix +++ b/nixos/tests/bluesky-pds.nix @@ -2,7 +2,7 @@ { name = "PDS"; - nodes.machine = { + containers.machine = { services.bluesky-pds = { enable = true; settings = { diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index a59f94b94edf..ecc6240fc888 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -203,11 +203,26 @@ in makeTest { name = "boot-uboot-extlinux"; nodes = { }; - testScript = '' - import os + testScript = /* py */ '' + import subprocess # Create a mutable linked image backed by the read-only SD image - if os.system("${pkgs.qemu}/bin/qemu-img create -f qcow2 -F raw -b ${sdImage} ${mutableImage}") != 0: + if ( + subprocess.run( + [ + "${pkgs.qemu}/bin/qemu-img", + "create", + "-f", + "qcow2", + "-F", + "raw", + "-b", + "${sdImage}", + "${mutableImage}", + ] + ).returncode + != 0 + ): raise RuntimeError("Could not create mutable linked image") machine = create_machine("${startCommand}") diff --git a/nixos/tests/ec2-image.nix b/nixos/tests/ec2-image.nix index df07d14b8ba7..b711ceadc2d5 100644 --- a/nixos/tests/ec2-image.nix +++ b/nixos/tests/ec2-image.nix @@ -135,7 +135,17 @@ in public_key = os.path.join(key_dir, "id_ed25519.pub") # Generate key pair using host SSH tools - ret = os.system(f"${hostPkgs.openssh}/bin/ssh-keygen -t ed25519 -f {private_key} -N \"\"") + ret = subprocess.run( + [ + "${hostPkgs.openssh}/bin/ssh-keygen", + "-t", + "ed25519", + "-f", + private_key, + "-N", + "" + ] + ).returncode if ret != 0: raise Exception("Failed to generate SSH key pair") diff --git a/nixos/tests/ghostunnel-modular.nix b/nixos/tests/ghostunnel-modular.nix index bb4cef2a9f08..7fa301168a46 100644 --- a/nixos/tests/ghostunnel-modular.nix +++ b/nixos/tests/ghostunnel-modular.nix @@ -54,13 +54,13 @@ }; testScript = '' - import os + import subprocess # prepare certificates def cmd(command): print(f"+{command}") - r = os.system(command) + r = subprocess.run(command, shell=True).returncode if r != 0: raise Exception(f"Command {command} failed with exit code {r}") diff --git a/nixos/tests/ghostunnel.nix b/nixos/tests/ghostunnel.nix index acd9c4331835..58749591ffbc 100644 --- a/nixos/tests/ghostunnel.nix +++ b/nixos/tests/ghostunnel.nix @@ -48,13 +48,13 @@ }; testScript = '' - import os + import subprocess # prepare certificates def cmd(command): print(f"+{command}") - r = os.system(command) + r = subprocess.run(command, shell=True).returncode if r != 0: raise Exception(f"Command {command} failed with exit code {r}") diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix index 107010528737..20bcd700bb58 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -69,12 +69,12 @@ }; }; testScript = '' - import os + import subprocess # Helpers def cmd(command): print(f"+{command}") - r = os.system(command) + r = subprocess.run(command, shell=True).returncode if r != 0: raise Exception(f"Command {command} failed with exit code {r}") diff --git a/nixos/tests/matter-server.nix b/nixos/tests/matter-server.nix index 5aeffaa97b42..ca4d55a161ce 100644 --- a/nixos/tests/matter-server.nix +++ b/nixos/tests/matter-server.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: let - chipVersion = pkgs.python311Packages.home-assistant-chip-core.version; + chipVersion = pkgs.python3Packages.home-assistant-chip-core.version; in { diff --git a/nixos/tests/nordvpn.nix b/nixos/tests/nordvpn.nix new file mode 100644 index 000000000000..59af7c54660f --- /dev/null +++ b/nixos/tests/nordvpn.nix @@ -0,0 +1,129 @@ +{ lib, ... }: +{ + name = "nordvpn"; + meta.maintainers = with lib.maintainers; [ different-error ]; + nodes = + let + commonConfig = user: { + # norduserd reads DBUS_SESSION_BUS_ADDRESS which the + # desktopManager sets on user session creation (i.e. login) + services.xserver.enable = true; + services.desktopManager.plasma6.enable = true; + services.displayManager.gdm.enable = true; + services.displayManager.autoLogin = { + enable = true; + user = user; + }; + }; + in + { + nada = { ... }: { }; + basic = + { ... }: + lib.recursiveUpdate { + users.users.alice = { + extraGroups = [ "nordvpn" ]; + isNormalUser = true; + }; + # default: run nordvpnd as nordvpn:nordvpn + services.nordvpn.enable = true; + } (commonConfig "alice"); + userOnly = + { ... }: + lib.recursiveUpdate { + users.users.kanye = { + extraGroups = [ "nordvpn" ]; + isNormalUser = true; + }; + # run nordvpnd as kanye:nordvpn + services.nordvpn = { + enable = true; + user = "kanye"; + }; + } (commonConfig "kanye"); + groupOnly = + { ... }: + lib.recursiveUpdate { + users.users.alice = { + extraGroups = [ "kanye" ]; + isNormalUser = true; + }; + users.groups.kanye = { }; + # run nordvpnd as nordvpn:kanye + services.nordvpn = { + enable = true; + group = "kanye"; + }; + } (commonConfig "alice"); + userAndGroup = + { ... }: + lib.recursiveUpdate { + users.users.kanye = { + group = "kanye"; + isNormalUser = true; + }; + users.groups.kanye = { }; + # run nordvpnd as kanye:kanye + services.nordvpn = { + enable = true; + group = "kanye"; + user = "kanye"; + }; + } (commonConfig "kanye"); + }; + + testScript = '' + class UserGroupTestCase: + def __init__(self, machine, user, has_nordvpn_usr, has_nordvpn_gp): + self.machine = machine + self.user = user + self.has_nordvpn_usr = has_nordvpn_usr + self.has_nordvpn_gp = has_nordvpn_gp + + def run(self): + self.machine.start() + self.verify_nordvpn_user() + self.verify_nordvpn_group() + self.verify_services() + self.machine.shutdown() + + def verify_nordvpn_user(self): + if self.has_nordvpn_usr: + self.machine.succeed("id nordvpn") + else: + self.machine.fail("id nordvpn") + + def verify_nordvpn_group(self): + group_str = self.machine.succeed(f"sudo -u {self.user} groups") + groups = [x.strip() for x in group_str.split(" ")] + if self.has_nordvpn_gp: + assert "nordvpn" in groups, f"nordvpn is not in {groups} but should be" + else: + assert "nordvpn" not in groups, f"nordvpn is in {groups} but should not be" + + def verify_services(self): + self.machine.wait_for_unit("nordvpnd", timeout=60) + self.machine.wait_for_unit("norduserd", self.user, timeout=90) + # verify can talk to nordvpnd. give nordvpnd at most 5s to initialize. + self.machine.wait_until_succeeds("nordvpn status", timeout=5) + self.machine.succeed("nordvpn status") + + test_cases = [ + UserGroupTestCase(basic, "alice", has_nordvpn_usr=True, has_nordvpn_gp=True), + UserGroupTestCase(userOnly, "kanye", has_nordvpn_usr=False, has_nordvpn_gp=True), + UserGroupTestCase(groupOnly, "alice", has_nordvpn_usr=True, has_nordvpn_gp=False), + UserGroupTestCase(userAndGroup, "kanye", has_nordvpn_usr=False, has_nordvpn_gp=False), + ] + + # NADA + nada.start() + nada.wait_for_unit("multi-user.target", timeout=60) + nada.fail("nordvpnd") + nada.fail("nordvpn") + nada.fail("norduserd") + nada.shutdown() + + for test_case in test_cases: + test_case.run() + ''; +} diff --git a/nixos/tests/slipshow.nix b/nixos/tests/slipshow.nix index abbbc6361e88..c8bd4158af5b 100644 --- a/nixos/tests/slipshow.nix +++ b/nixos/tests/slipshow.nix @@ -8,7 +8,7 @@ meta.maintainers = with lib.maintainers; [ ethancedwards8 ]; - nodes.machine = { + containers.machine = { environment.systemPackages = with pkgs; [ slipshow ]; environment.etc."slipshow".source = pkgs.fetchFromGitHub { diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix index 637302db7639..0e35c48c293b 100644 --- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix @@ -12,20 +12,20 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.3.tar.gz"; - hash = "sha256-lryIoVxoytyDyfgjnobQ3e94wIIohmIKL88fwf2I49w="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4.tar.gz"; + hash = "sha256-BPuMTwZ3Xkk4SBRCdgZ8vCoEYjhTa3d8CFOqrGlcGg0="; }; aarch64-linux = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.3-aarch64.tar.gz"; - hash = "sha256-oZQaxpVV0O4WlDE6Ia+KzHIF0SfWQBubBFIopSRMbvE="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.tar.gz"; + hash = "sha256-f9KenMq1gtldzpBraSBwOb/186WQwh1ps5Ypj5JoOU0="; }; x86_64-darwin = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.3.dmg"; - hash = "sha256-KUcQRWYUD/+4HHWnkGuqoltqL2an0WQkUEfUcttwjCI="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4.dmg"; + hash = "sha256-SGdo6WYMCcCBuZUjvURcMTbJUqhZ4MzFlSLg6Zjr84I="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.3-aarch64.dmg"; - hash = "sha256-1N1RtN1QLvuJ1QL8jbN5TdbOHAHSN84W9XEK2PEPijI="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.dmg"; + hash = "sha256-ZYen6Ew0GYbBAmuGCDACPBsygxZ6sT787o6gqF9DJzw="; }; }; # update-script-end: urls @@ -39,8 +39,8 @@ mkJetBrainsProduct { product = "WebStorm"; # update-script-start: version - version = "2026.1.3"; - buildNumber = "261.25134.101"; + version = "2026.1.4"; + buildNumber = "261.26222.58"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); 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 e6d1da26f2ca..f547aec1465c 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,26 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-OY34TyyPj0Vjc6rLdR7uaVYsgmCXQFTS/1+QLA9pGgk="; + hash = "sha256-QxZa6ugaMC7otLQmDZU54Fv3OGMNYO5iyjqjCLDNdbI="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-A8CrNx6GfFmaFWe1Awck/2B0VuJhNX6HHI5YNSG1qVo="; + hash = "sha256-lgE5dld8lvt/dyGVNjR1ZiV2qtBu9pMZayNe5dBfHo0="; }; "x86_64-darwin" = { arch = "darwin-x64"; - hash = "sha256-egXg308OJWvMyMqLHiANNEIGCSza/yKPFIqWq1X6JdE="; + hash = "sha256-AnqO7aZ3uybYnAHYCi5ppZ/5xOuiTqs+75TflN7bVow="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-BmI7NTlKUVMnTBS8nf2jqYYSA+LT3qP9Yu5gQIv7Mxo="; + hash = "sha256-KKuUXjfIsngnKrSLTMYNzb6XVZkJszUwIihCGHQJ0gU="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.206"; + version = "2.1.207"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 58c011dda03d..de3ec7a5475f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1007,8 +1007,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.15.0"; - hash = "sha256-Nw1aXRIJI6kBJl3yp2hripZLf+wIecb8gmIjT5zVBjk="; + version = "1.15.2"; + hash = "sha256-mBACvGUQF3LoaFJ9MIewN9zu4jDTWfUgyd1MQvZQUvk="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; @@ -1346,8 +1346,8 @@ let mktplcRef = { publisher = "discloud"; name = "discloud"; - version = "2.29.7"; - hash = "sha256-l0CTWC16Aw2u8uob5tKauYIT3KaDsptV/L8WR54eN64="; + version = "2.29.8"; + hash = "sha256-dvyIdixtmg5ZTo/REB/E5QlHJu2xZ+Ui5qwJegoHTfk="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index 19ebc0b3efb4..5ebaa79fb71b 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.39.8"; - hash = "sha256-MiCa1OuLvXYC5HmXNzM7LCL72weG40tDTgLWWl9Kxug="; + version = "1.39.9"; + hash = "sha256-Iycuj7EXzRwVgvpk0KXa3dNw2rL21DnG4ohqIExS6Go="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index c86912e97cb3..f30232317025 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2026-06-26"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "424f2dfd6d08c587020857421b89a5d9acda4beb"; - hash = "sha256-QkHgLWW+gk106wNeF5bKYsA4e6IKPiXakWb92AImRQc="; + rev = "d137f0cacff196fb44a2783ecbc6e8ddb3e57cfc"; + hash = "sha256-4KPYwvtVLrzZcn3LYqSWmP+qWFjtNsCjrVY/L93/ZOE="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index edab66c09021..54cbf0bc890b 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2026-06-19"; + version = "0-unstable-2026-07-03"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "4832d33cc3427ee0a1c1b9065339dd18ff57370d"; - hash = "sha256-qn3zYecSmQjQV1f0Aw6+zVEQttMSHsrNQuMFbsDyKC8="; + rev = "dfc165599f3f1068c40a0b7ad6fe5f161283d483"; + hash = "sha256-a7GXw0B/ekIcNl08s1DpuRQZyxm4tYGWzNVVBTjXeOk="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index f777c18941ff..26b3d48ea660 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2026-06-22"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "1e4f393f3c52581cdec7867ddadc47f6b4d20cec"; - hash = "sha256-a02AsJg7mm/fUBN/5IC2Q6NexLYsBYp74bfqfJosaxc="; + rev = "50aedca2639521bc498ace0b2be1ea012801a86a"; + hash = "sha256-ywqwy8HwxigRG/2GfvfpewNjTIeunXH9NtyAH5iUfa8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ecd3d377729e..c48d47e8b89c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -54,13 +54,13 @@ "vendorHash": "sha256-sESuNlWNyjjGYb7z+tQF7RGBgicnPISuwXRzB+QJ7E4=" }, "aminueza_minio": { - "hash": "sha256-DfpZjIkjo5bEZ2BtHJoBLtjEDAD6ZiqpoCOMbmd1Jvo=", + "hash": "sha256-4b5K2Hyy26euJct1/0dxC39DMM41W6+jdJS68/d4yCw=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.38.1", + "rev": "v3.38.3", "spdx": "AGPL-3.0", - "vendorHash": "sha256-OLabFXYTe+Yhlf0Ja63tCcrc5mvPeXfN7yLoRZCkdvg=" + "vendorHash": "sha256-se32x/vxIRiAewIIUZb/wR9eB6sDpDzN3n7OS5m8t5g=" }, "argoproj-labs_argocd": { "hash": "sha256-c6+WY4oXL8evvPk/RzVrwtgq4XLB/LzAH5tpjErbE60=", @@ -283,13 +283,13 @@ "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI=" }, "datadog_datadog": { - "hash": "sha256-pTtEKgxh17Oi41oqgBrtUCsriRMfRew30kLjbOdM9jo=", + "hash": "sha256-PmzUO8mCYQRYWI0MxFqVua+laKybLAFgeW9+9HZ/7A8=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v4.13.0", + "rev": "v4.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GRxcI8+3uarErfVhzoz+Iku3mCmY9XfriDZZX0wSI5s=" + "vendorHash": "sha256-G3lkLzLo31XGDyTgprHd7LbbOaAGRvq9LTIth2vnH00=" }, "datadrivers_nexus": { "hash": "sha256-gwExaFhOoJFrAhH91oZEp1AFvI7kgWekp655zd4tyd8=", @@ -508,13 +508,13 @@ "vendorHash": "sha256-ikBqIxD5aTOcwNHCMN6EaOwSHCAP5n/SULuqQXPLpOc=" }, "hashicorp_aws": { - "hash": "sha256-710i6mRyieTzltcaC23OXZm8mtqjyOc5Fk9fmcqkXY4=", + "hash": "sha256-876U9ojKfnJCRKaTFhW9NvBQ6fvTpC0NYE+fhwkCwk8=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v6.52.0", + "rev": "v6.54.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-COWHnLR6aRwcGJVo6IFvqQLwAYxFpqUGQbZVvEo/b/I=" + "vendorHash": "sha256-lxxSwaBXrl2xrZJ+OHrCBvHKmsq3D9Om7/Y0zPaYIQg=" }, "hashicorp_awscc": { "hash": "sha256-z1wns0zuanfoeIb7CDRBtt4CoRQ4+b5PNKpmDbfyHd0=", @@ -706,11 +706,11 @@ "vendorHash": "sha256-47xWjlzpQ/EYzjbuuMKQiu5cfYAXdYkXRl+AOEP+sA4=" }, "heroku_heroku": { - "hash": "sha256-hR4DvSneqG/5P4tYljcuFxQ34AnDIjIt+JMn1BhloeU=", + "hash": "sha256-AmHgAlz4J3l9OCjUMVxLMWtKZB1LpNOyX1exUI6fWHA=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.3.2", + "rev": "v5.4.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -760,13 +760,13 @@ "vendorHash": null }, "integrations_github": { - "hash": "sha256-OpuKe7/Ymr46J41zgYdk1Qet+trEGTafl6TM23PV1lA=", + "hash": "sha256-2y25AE4iLckdvvFv+vPRdl2wLCPlUnK2Xc73m0qVyxc=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.12.1", + "rev": "v6.13.0", "spdx": "MIT", - "vendorHash": "sha256-qzyV/rgQ79XvoTBRjjIsPFfqAXLROiIAlY7Y/d8SYcM=" + "vendorHash": "sha256-crDSVC0UvJ8fXoKwSgyFWHivwOA9XRO7dXoEOYLPZTo=" }, "jfrog_artifactory": { "hash": "sha256-BSUOmqHwnDEYojtwTXBWo9oGG2FbgaODUKClZPCaK/I=", @@ -1319,11 +1319,11 @@ "vendorHash": "sha256-7ZoJg1HEVj5Nygr46lmBZeJDfZuU4F90yntrgkBVgGg=" }, "tencentcloudstack_tencentcloud": { - "hash": "sha256-tADmls3GAmR3S5wdasoHrBYOtZTVXDS2alZD6Mzfo4M=", + "hash": "sha256-1UBML3E5ZnOcsdGZlZ5qkaqQsE1+Q9Uw9R8FeWJXFSw=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.83.7", + "rev": "v1.83.10", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1427,13 +1427,13 @@ "vendorHash": null }, "vancluever_acme": { - "hash": "sha256-AlT7Qe4YGdPUhM1N4OiMyjbmupgqXcQ/6SLz/v+W8lI=", + "hash": "sha256-CziwRMh53FPGhXw/TFWJUuI3KtMlwobCVNOgfRyjRLA=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.48.1", + "rev": "v2.48.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-lWBMihP6oX7qPpTuPQQwQS3IDwdyb/rEYqtBsTozb7Q=" + "vendorHash": "sha256-I6u4huFtk7dXmSyPRX4NxvcUJ4Q2iKuw8qzCdNzYjoQ=" }, "venafi_venafi": { "hash": "sha256-tCjeApdanKPNEy7snb6QJoCvwjpNa2fdDryoD+7wn8Y=", diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index 7472cc1155db..e1072e07d6ea 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -34,6 +34,7 @@ libjxl, libicns, apple-sdk_15, + llvmPackages, nix-update-script, }: @@ -67,6 +68,11 @@ stdenv.mkDerivation (finalAttrs: { # to build bundled libdispatch clang gobject-introspection + ] + # Work around ld64's libc++ hardening issue causing Trace/BPT trap: 5 + # TODO: Remove once nixpkgs#536365 reaches this branch. + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + llvmPackages.lld ]; buildInputs = [ @@ -102,6 +108,12 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; + # Work around ld64's libc++ hardening issue causing Trace/BPT trap: 5 + # TODO: Remove once nixpkgs#536365 reaches this branch. + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + cmakeFlags = [ # We're allowed to used the API ID of the Snap package: (lib.cmakeFeature "TDESKTOP_API_ID" "611335") diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index cee47f70a062..aedee50cefef 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -79,7 +79,7 @@ let }; releaseRev = v: "V${v}"; fetched = - import ../../../../build-support/coq/meta-fetch/default.nix + import ../../../../build-support/rocq/meta-fetch/default.nix { inherit lib diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix index 6f1c384d005f..a6501daaaa3f 100644 --- a/pkgs/applications/science/logic/rocq-core/default.nix +++ b/pkgs/applications/science/logic/rocq-core/default.nix @@ -32,7 +32,7 @@ let }; releaseRev = v: "V${v}"; fetched = - import ../../../../build-support/coq/meta-fetch/default.nix + import ../../../../build-support/rocq/meta-fetch/default.nix { inherit lib diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix deleted file mode 100644 index 3c9670f4f65e..000000000000 --- a/pkgs/build-support/coq/default.nix +++ /dev/null @@ -1,246 +0,0 @@ -{ - lib, - stdenv, - coqPackages, - coq, - which, - fetchzip, - fetchurl, - dune, -}@args: - -let - lib = import ./extra-lib.nix { - inherit (args) lib; - }; - - inherit (lib) - concatStringsSep - flip - foldl - isFunction - isString - optional - optionalAttrs - optionals - optionalString - pred - remove - switch - versions - ; - - inherit (lib.attrsets) removeAttrs; - inherit (lib.strings) match; - - isGitHubDomain = d: match "^github.*" d != null; - isGitLabDomain = d: match "^gitlab.*" d != null; -in - -{ - pname, - version ? null, - fetcher ? null, - owner ? "rocq-community", - domain ? "github.com", - repo ? pname, - defaultVersion ? null, - releaseRev ? (v: v), - displayVersion ? { }, - release ? { }, - buildInputs ? [ ], - nativeBuildInputs ? [ ], - extraBuildInputs ? [ ], - extraNativeBuildInputs ? [ ], - overrideBuildInputs ? [ ], - overrideNativeBuildInputs ? [ ], - namePrefix ? [ "coq" ], - enableParallelBuilding ? true, - extraInstallFlags ? [ ], - setCOQBIN ? true, - mlPlugin ? false, - useMelquiondRemake ? null, - dropAttrs ? [ ], - keepAttrs ? [ ], - dropDerivationAttrs ? [ ], - useDuneifVersion ? (x: false), - useDune ? false, - opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])), - ... -}@args: -let - args-to-remove = foldl (flip remove) ( - [ - "version" - "fetcher" - "repo" - "owner" - "domain" - "releaseRev" - "displayVersion" - "defaultVersion" - "useMelquiondRemake" - "release" - "buildInputs" - "nativeBuildInputs" - "extraBuildInputs" - "extraNativeBuildInputs" - "overrideBuildInputs" - "overrideNativeBuildInputs" - "namePrefix" - "meta" - "useDuneifVersion" - "useDune" - "opam-name" - "extraInstallFlags" - "setCOQBIN" - "mlPlugin" - "dropAttrs" - "dropDerivationAttrs" - "keepAttrs" - "env" - ] - ++ dropAttrs - ) keepAttrs; - fetch = - import ../coq/meta-fetch/default.nix - { - inherit - lib - stdenv - fetchzip - fetchurl - ; - } - ( - { - inherit release releaseRev; - location = { inherit domain owner repo; }; - } - // optionalAttrs (args ? fetcher) { inherit fetcher; } - ); - fetched = fetch (if version != null then version else defaultVersion); - display-pkg = - n: sep: v: - let - d = displayVersion.${n} or (if sep == "" then ".." else true); - in - n - + optionalString (v != "" && v != null) ( - switch d [ - { - case = true; - out = sep + v; - } - { - case = "."; - out = sep + versions.major v; - } - { - case = ".."; - out = sep + versions.majorMinor v; - } - { - case = "..."; - out = sep + versions.majorMinorPatch v; - } - { - case = isFunction; - out = optionalString (d v != "") (sep + d v); - } - { - case = isString; - out = optionalString (d != "") (sep + d); - } - ] "" - ) - + optionalString (v == null) "-broken"; - append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; - prefix-name = foldl append-version "" namePrefix; - useDune = args.useDune or (useDuneifVersion fetched.version); - coqlib-flags = [ - "COQLIBINSTALL=$(out)/lib/coq/${coq.coq-version}/user-contrib" - "COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)" - ]; - docdir-flags = [ "COQDOCINSTALL=$(out)/share/coq/${coq.coq-version}/user-contrib" ]; - COQUSERCONTRIB = "$out/lib/coq/${coq.coq-version}/user-contrib"; -in -stdenv.mkDerivation ( - removeAttrs ( - { - - name = prefix-name + (display-pkg pname "-" fetched.version); - - inherit (fetched) version src; - - nativeBuildInputs = - args.overrideNativeBuildInputs or ( - [ which ] - ++ optional useDune dune - ++ optionals (useDune || mlPlugin) [ - coq.ocamlPackages.ocaml - coq.ocamlPackages.findlib - ] - ++ (args.nativeBuildInputs or [ ]) - ++ extraNativeBuildInputs - ); - buildInputs = - args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or [ ]) ++ extraBuildInputs); - inherit enableParallelBuilding; - - env = - optionalAttrs setCOQBIN { - COQBIN = "${coq}/bin/"; - } - // optionalAttrs (args ? useMelquiondRemake) { - inherit COQUSERCONTRIB; - } - // (args.env or { }); - - meta = - ( - { - platforms = coq.meta.platforms; - } - // (switch domain [ - { - case = pred.union isGitHubDomain isGitLabDomain; - out = { - homepage = "https://${domain}/${owner}/${repo}"; - }; - } - ] { }) - // optionalAttrs (fetched.broken or false) { - coqFilter = true; - broken = true; - } - ) - // (args.meta or { }); - - } - // (optionalAttrs (!args ? installPhase && !args ? useMelquiondRemake) { - installFlags = coqlib-flags ++ docdir-flags ++ extraInstallFlags; - }) - // (optionalAttrs useDune { - buildPhase = '' - runHook preBuild - dune build -p ${opam-name} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} - runHook postBuild - ''; - installPhase = '' - runHook preInstall - dune install --prefix=$out --libdir $OCAMLFIND_DESTDIR ${opam-name} - mkdir $out/lib/coq/ - mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version} - runHook postInstall - ''; - }) - // (optionalAttrs (args ? useMelquiondRemake) { - preConfigurePhases = [ "autoconf" ]; - configureFlags = [ "--libdir=${COQUSERCONTRIB}/${useMelquiondRemake.logpath or ""}" ]; - buildPhase = "./remake -j$NIX_BUILD_CORES"; - installPhase = "./remake install"; - }) - // (removeAttrs args args-to-remove) - ) dropDerivationAttrs -) diff --git a/pkgs/build-support/rocq/default.nix b/pkgs/build-support/rocq/default.nix index 7a7c5fba7b25..68181efcfb44 100644 --- a/pkgs/build-support/rocq/default.nix +++ b/pkgs/build-support/rocq/default.nix @@ -3,15 +3,16 @@ stdenv, rocqPackages, rocq-core, + coq, which, fetchzip, fetchurl, dune, -}@args: +}@args0: let lib = import ./extra-lib.nix { - inherit (args) lib; + inherit (args0) lib; }; inherit (lib) @@ -66,6 +67,8 @@ in useDuneifVersion ? (x: false), useDune ? false, opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])), + useCoq ? false, + useCoqifVersion ? (x: false), ... }@args: let @@ -99,11 +102,13 @@ let "dropDerivationAttrs" "keepAttrs" "env" + "useCoq" + "useCoqifVersion" ] ++ dropAttrs ) keepAttrs; fetch = - import ../coq/meta-fetch/default.nix + import ../rocq/meta-fetch/default.nix { inherit lib @@ -158,6 +163,8 @@ let append-version = p: n: p + display-pkg n "" rocqPackages.${n}.version + "-"; prefix-name = foldl append-version "" namePrefix; useDune = args.useDune or (useDuneifVersion fetched.version); + useCoq = args.useCoq or (useCoqifVersion fetched.version); + rocq-core = if useCoq then coq // { rocq-version = coq.coq-version; } else args0.rocq-core; rocqlib-flags = [ "COQLIBINSTALL=$(out)/lib/coq/${rocq-core.rocq-version}/user-contrib" "COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)" @@ -190,9 +197,10 @@ stdenv.mkDerivation ( inherit enableParallelBuilding; env = - optionalAttrs setROCQBIN { + optionalAttrs (setROCQBIN && !useCoq) { ROCQBIN = "${rocq-core}/bin/"; } + // optionalAttrs (setROCQBIN && useCoq) { COQBIN = "${rocq-core}/bin/"; } // optionalAttrs (args ? useMelquiondRemake) { inherit COQUSERCONTRIB; } diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/rocq/meta-fetch/default.nix similarity index 100% rename from pkgs/build-support/coq/meta-fetch/default.nix rename to pkgs/build-support/rocq/meta-fetch/default.nix diff --git a/pkgs/by-name/ac/ace-of-penguins/fix-wayland-segfault.patch b/pkgs/by-name/ac/ace-of-penguins/fix-wayland-segfault.patch new file mode 100644 index 000000000000..0e2d0a63aee8 --- /dev/null +++ b/pkgs/by-name/ac/ace-of-penguins/fix-wayland-segfault.patch @@ -0,0 +1,16 @@ +diff --git a/lib/help.c b/lib/help.c +--- a/lib/help.c ++++ b/lib/help.c +@@ -177,8 +177,12 @@ + for (i=0; i<17; i++) + { + if (!fonts[i]) + fonts[i] = XLoadQueryFont(display, i & STYLE_TT ? "fixed" : "variable"); ++ if (!fonts[i]) ++ fonts[i] = XLoadQueryFont(display, "fixed"); ++ if (!fonts[i]) ++ return; + thin_space[i] = XTextWidth(fonts[i], " ", 1); + } + for (i=0; i +Date: Sun, 12 Jul 2026 14:39:09 +0530 +Subject: [PATCH 1/3] fix: rm deprecated import + github.com/ncruces/go-sqlite3/embed + +Signed-off-by: phanirithvij +--- + internal/kvstore/sqlitekvstore.go | 1 - + internal/logstore/logstore.go | 1 - + internal/oplog/sqlitestore/sqlitestore.go | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/internal/kvstore/sqlitekvstore.go b/internal/kvstore/sqlitekvstore.go +index 9453228..e360a2c 100644 +--- a/internal/kvstore/sqlitekvstore.go ++++ b/internal/kvstore/sqlitekvstore.go +@@ -8,7 +8,6 @@ import ( + "strings" + + _ "github.com/ncruces/go-sqlite3/driver" +- _ "github.com/ncruces/go-sqlite3/embed" + ) + + var ErrNotExist = errors.New("key does not exist") +diff --git a/internal/logstore/logstore.go b/internal/logstore/logstore.go +index 48e0509..dd6ac17 100644 +--- a/internal/logstore/logstore.go ++++ b/internal/logstore/logstore.go +@@ -17,7 +17,6 @@ import ( + + "github.com/hashicorp/go-multierror" + _ "github.com/ncruces/go-sqlite3/driver" +- _ "github.com/ncruces/go-sqlite3/embed" + "go.uber.org/zap" + ) + +diff --git a/internal/oplog/sqlitestore/sqlitestore.go b/internal/oplog/sqlitestore/sqlitestore.go +index 41b12ac..08a53e0 100644 +--- a/internal/oplog/sqlitestore/sqlitestore.go ++++ b/internal/oplog/sqlitestore/sqlitestore.go +@@ -27,7 +27,6 @@ import ( + + "github.com/gofrs/flock" + _ "github.com/ncruces/go-sqlite3/driver" +- _ "github.com/ncruces/go-sqlite3/embed" + "github.com/ncruces/go-sqlite3/vfs" + "github.com/ncruces/go-sqlite3/vfs/memdb" + _ "github.com/ncruces/go-sqlite3/vfs/memdb" +-- +2.54.0 + diff --git a/pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch b/pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch new file mode 100644 index 000000000000..d78462d64dde --- /dev/null +++ b/pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch @@ -0,0 +1,26 @@ +From 2d84683ee874d9f7ca506c61f810aaf4bdc06e63 Mon Sep 17 00:00:00 2001 +From: phanirithvij +Date: Sun, 12 Jul 2026 15:12:39 +0530 +Subject: [PATCH 2/3] fix: exit after printing version + +Signed-off-by: phanirithvij +--- + cmd/backrest/backrest.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmd/backrest/backrest.go b/cmd/backrest/backrest.go +index dd59512..9c0ca7e 100644 +--- a/cmd/backrest/backrest.go ++++ b/cmd/backrest/backrest.go +@@ -58,7 +58,7 @@ func runApp() { + flag.Parse() + if *printVersion { + fmt.Printf("backrest version: %s, commit: %s\n", version, commit) +- return ++ os.Exit(0) + } + installLoggers(version, commit) + +-- +2.54.0 + diff --git a/pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch b/pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch new file mode 100644 index 000000000000..6137bd5136b0 --- /dev/null +++ b/pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch @@ -0,0 +1,28 @@ +From 809a1e95a2d322ac2c00f95a274b639860d3b5bc Mon Sep 17 00:00:00 2001 +From: phanirithvij +Date: Sun, 12 Jul 2026 16:07:29 +0530 +Subject: [PATCH 3/3] fix: quit tray on graceful shutdown + +--- + cmd/backrest/tray.go | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/cmd/backrest/tray.go b/cmd/backrest/tray.go +index 68db4f2..cca1b36 100644 +--- a/cmd/backrest/tray.go ++++ b/cmd/backrest/tray.go +@@ -16,7 +16,10 @@ func startTray() { + status := newTrayStatus() + // Observe oplog status in-process so the icon can reflect backup state. + onOpLogReady = status.attach +- go runApp() ++ go func() { ++ runApp() ++ systray.Quit() ++ }() + systray.Run(func() { onReady(status) }, func() {}) + } + +-- +2.54.0 + diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 0e79b0605e0d..9157c8e337a5 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -22,13 +22,13 @@ let pnpm = pnpm_11; pname = "backrest"; - version = "1.13.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "garethgeorge"; repo = "backrest"; tag = "v${version}"; - hash = "sha256-JcrHQDjoaaK6BONEcn6XKsjhGlth4SaZKqfxa3cD0gY="; + hash = "sha256-RxjPjvnKy8UM1OXRklJF/HSZ6FMiHWYQBsZ6owMJMF0="; leaveDotGit = true; postFetch = '' cd "$out" @@ -62,7 +62,7 @@ let inherit pnpm; sourceRoot = "${finalAttrs.src.name}/webui"; fetcherVersion = 4; - hash = "sha256-xPZg7kYRlqdO/EfZr+m+IVhDcyYegQ6v8ZAF2EjrKjU="; + hash = "sha256-y6NYFPepibiTuvPMwyc5cN3TwAc2W7RtPbCmzWDozNQ="; }; postPatch = '' @@ -99,6 +99,15 @@ buildGoModule (finalAttrs: { __structuredAttrs = true; strictDeps = true; + patches = [ + # https://github.com/garethgeorge/backrest/pull/1293 + ./0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch + # https://github.com/garethgeorge/backrest/pull/1294 + ./0002-fix-exit-after-printing-version.patch + # https://github.com/garethgeorge/backrest/pull/1295 + ./0003-fix-quit-tray-on-graceful-shutdown.patch + ]; + postPatch = '' sed -i -e \ '/func installRestic(targetPath string) error {/a\ @@ -107,7 +116,7 @@ buildGoModule (finalAttrs: { ''; proxyVendor = true; - vendorHash = "sha256-1PecXGXdSu4FzOKVZ15lTLLPy3VlLiGvGeTUDzqe9sc="; + vendorHash = "sha256-yadRulgtcDPthWLeTydcMol/vwriflKvDu7zgoehZCM="; subPackages = [ "cmd/backrest" ]; @@ -116,6 +125,8 @@ buildGoModule (finalAttrs: { makeBinaryWrapper ]; + tags = [ "tray" ]; + ldflags = [ "-s" "-X main.version=${finalAttrs.version}" @@ -164,6 +175,8 @@ buildGoModule (finalAttrs: { postInstall = '' wrapProgram $out/bin/backrest \ --set-default BACKREST_RESTIC_COMMAND "${lib.getExe restic}" + makeBinaryWrapper $out/bin/backrest $out/bin/backrest-tray \ + --add-flags "-tray" ''; doInstallCheck = true; diff --git a/pkgs/by-name/bi/bisq1/package.nix b/pkgs/by-name/bi/bisq1/package.nix index 8895ec305994..e5ca6ad35ec8 100644 --- a/pkgs/by-name/bi/bisq1/package.nix +++ b/pkgs/by-name/bi/bisq1/package.nix @@ -36,7 +36,10 @@ }: let - version = "1.10.2"; + # This is separated into its own file so it's easier for `update.sh`. + sources = import ./sources.nix; + + version = sources.version; # JDK 21 is the toolchain required by docs/build.md. enableJavaFX is not # strictly required (Bisq bundles its own JavaFX jars), but mirrors the @@ -86,17 +89,17 @@ let publicKey = { "E222AA02" = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/E222AA02.asc"; - hash = "sha256-Ue/UmS6F440/ybEEIAR+pdPEIksAt6QSMN6G5TZVWzc="; + hash = sources."key-E222AA02-hash"; }; "4A133008" = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/4A133008.asc"; - hash = "sha256-UijG3DkJNNTakVJd2wl30mDepa27n6R/Xxfl4sjt0sk="; + hash = sources."key-4A133008-hash"; }; "387C8307" = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/387C8307.asc"; - hash = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI="; + hash = sources."key-387C8307-hash"; }; }; @@ -133,7 +136,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - hash = "sha256-e7rPUhA6KF3Tz3zlYqEfM9G0owe9hAUFDifKseRvb6A="; + hash = sources."deb-hash"; # Verify the upstream Debian package's detached PGP signature prior to use. # This ensures that a successful build of this Nix package requires the @@ -158,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { signature = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb.asc"; - hash = "sha256-kBRaOXuP22DvXMkJ1XQatwvTmu/Ds8FvmUgYnRT7Vg0="; + hash = sources."sig-hash"; }; nativeBuildInputs = [ @@ -241,6 +244,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.updateScript = ./update.sh; + meta = { description = "Decentralized bitcoin exchange network (Bisq 1)"; homepage = "https://bisq.network"; diff --git a/pkgs/by-name/bi/bisq1/sources.nix b/pkgs/by-name/bi/bisq1/sources.nix new file mode 100644 index 000000000000..8b9f276e8cf1 --- /dev/null +++ b/pkgs/by-name/bi/bisq1/sources.nix @@ -0,0 +1,9 @@ +# Generated by ./update.sh - do not update manually! +{ + version = "1.10.3"; + deb-hash = "sha256-kzLtadq8gfX6j9XU3PD5kNV43wLDoICPlXdJqULkAWE="; + sig-hash = "sha256-+51j+SBp7buukop1T4Gz0YDUga6540BVxDRoU2YE3pY="; + key-E222AA02-hash = "sha256-Ue/UmS6F440/ybEEIAR+pdPEIksAt6QSMN6G5TZVWzc="; + key-4A133008-hash = "sha256-UijG3DkJNNTakVJd2wl30mDepa27n6R/Xxfl4sjt0sk="; + key-387C8307-hash = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI="; +} diff --git a/pkgs/by-name/bi/bisq1/update.sh b/pkgs/by-name/bi/bisq1/update.sh new file mode 100755 index 000000000000..c162a4e6190b --- /dev/null +++ b/pkgs/by-name/bi/bisq1/update.sh @@ -0,0 +1,79 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert jq + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +# Fetch the latest release version from GitHub +payload=$(curl -sL https://api.github.com/repos/bisq-network/bisq/releases/latest) +version=$(jq -r .tag_name <<< "$payload" | sed 's/^v//') + +echo "Updating bisq1 to version $version" + +# URLs for the new version +deb_url="https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb" +sig_url="https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb.asc" + +# Fetch and compute hashes using nix-prefetch-url and convert to SRI format +echo "Prefetching .deb package..." +deb_hash_raw=$(nix-prefetch-url "$deb_url" 2>/dev/null) +deb_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$deb_hash_raw") +echo " deb hash: $deb_hash" + +echo "Prefetching signature..." +sig_hash_raw=$(nix-prefetch-url "$sig_url" 2>/dev/null) +sig_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sig_hash_raw") +echo " signature hash: $sig_hash" + +# Fetch and compute hashes for public keys (these may not exist in all releases) +get_key_hash() { + local key_name=$1 + local url="https://github.com/bisq-network/bisq/releases/download/v${version}/${key_name}.asc" + local hash_raw + if hash_raw=$(nix-prefetch-url "$url" 2>/dev/null); then + nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$hash_raw" + else + echo "" # Return empty if key doesn't exist + fi +} + +echo "Prefetching public keys..." +key_E222AA02_hash=$(get_key_hash "E222AA02") +if [ -n "$key_E222AA02_hash" ]; then + echo " E222AA02 hash: $key_E222AA02_hash" +else + echo " E222AA02: not found in this release, keeping old hash" + key_E222AA02_hash=$(grep 'key-E222AA02-hash' sources.nix | sed 's/.*= "\(.*\)".*/\1/') +fi + +key_4A133008_hash=$(get_key_hash "4A133008") +if [ -n "$key_4A133008_hash" ]; then + echo " 4A133008 hash: $key_4A133008_hash" +else + echo " 4A133008: not found in this release, keeping old hash" + key_4A133008_hash=$(grep 'key-4A133008-hash' sources.nix | sed 's/.*= "\(.*\)".*/\1/') +fi + +key_387C8307_hash=$(get_key_hash "387C8307") +if [ -n "$key_387C8307_hash" ]; then + echo " 387C8307 hash: $key_387C8307_hash" +else + echo " 387C8307: not found in this release, keeping old hash" + key_387C8307_hash=$(grep 'key-387C8307-hash' sources.nix | sed 's/.*= "\(.*\)".*/\1/') +fi + +# Write sources.nix (only include keys that exist) +cat >sources.nix <= 1.122 but still ships @vscode/ripgrep. + # Capping the build-time vscodeVersion avoids modifying the notarized app bundle on Darwin. + vscodeVersion = + if lib.versionAtLeast sourcesJson.vscodeVersion "1.122.0" then + "1.121.0" + else + sourcesJson.vscodeVersion; pname = "cursor"; diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 29774683e1bb..31ac9cbdd27f 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,22 @@ { - "version": "3.9.16", - "vscodeVersion": "1.105.1", + "version": "3.11.13", + "vscodeVersion": "1.125.0", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/042b3c1a4c53f2c3808067f519fbfc67b72cad8b/linux/x64/Cursor-3.9.16-x86_64.AppImage", - "hash": "sha256-dG61VYGMHPip57ldzNICEi1yPc4s1dON+MlDGiKadKc=" + "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/linux/x64/Cursor-3.11.13-x86_64.AppImage", + "hash": "sha256-MXBXgGe7HXiL3kAMKxBSRTZxWMbh15D5dfXw6iemG9g=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/042b3c1a4c53f2c3808067f519fbfc67b72cad8b/linux/arm64/Cursor-3.9.16-aarch64.AppImage", - "hash": "sha256-7tkupyy8EFeOpzQqoHQsYxWQlFoW6VBpXkuCJsRIhRw=" + "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/linux/arm64/Cursor-3.11.13-aarch64.AppImage", + "hash": "sha256-UCjZFxXjzeovYrZWp6xrZGp+eH4uGo41Tl9Uj9q16W4=" }, "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/042b3c1a4c53f2c3808067f519fbfc67b72cad8b/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-5sAj/FiPAs1facGmNKgXiNzs1Kc1ht9eXYU1aZ1VoUA=" + "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/darwin/x64/Cursor-darwin-x64.dmg", + "hash": "sha256-FbSBuRaWKjTD7vdg0GvFsizmbpNvnNyzB6yAljMAtSs=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/042b3c1a4c53f2c3808067f519fbfc67b72cad8b/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-pnSsOvyFiBKJsPUPkfnSY1l+LEzz3g5kbepIco7dDIM=" + "url": "https://downloads.cursor.com/production/3f21b08f0b436a07be29fbfe00b304fa15553353/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-j1k40mFZDWnNTl/IwCB39JZ+Zc4/JwEthNh8SPCXAZE=" } } } diff --git a/pkgs/by-name/co/codechecker/package.nix b/pkgs/by-name/co/codechecker/package.nix index 305e2aa8b8e4..371c6b048095 100644 --- a/pkgs/by-name/co/codechecker/package.nix +++ b/pkgs/by-name/co/codechecker/package.nix @@ -1,65 +1,30 @@ { lib, - python3, fetchPypi, - fetchFromGitHub, - clang, + makeWrapper, + python3Packages, + libclang, clang-tools, cppcheck, gcc, - makeWrapper, + infer, withClang ? false, withClangTools ? false, withCppcheck ? false, withGcc ? false, + withInfer ? false, }: -let - python = python3.override { - packageOverrides = self: super: rec { - # codechecker is incompatible with SQLAlchemy greater than 1.3 - sqlalchemy = super.sqlalchemy_1_4.overridePythonAttrs (oldAttrs: rec { - version = "1.3.23"; - pname = oldAttrs.pname; - src = fetchFromGitHub { - owner = "sqlalchemy"; - repo = "sqlalchemy"; - rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-hWA0/f7rQpEfYTg10i0rBK3qeJbw3p6HW7S59rLnD0Q="; - }; - doCheck = false; - # That test does not exist in the 1.3 branch so we get an error for disabling it - disabledTestPaths = builtins.filter ( - testPath: testPath != "test/ext/mypy" - ) oldAttrs.disabledTestPaths; - }); - sqlalchemy_1_4 = sqlalchemy; - - # The current alembic version is not compatible with SQLAlchemy 1.3 so we need to downgrade it - alembic = super.alembic.overridePythonAttrs (oldAttrs: rec { - pname = "alembic"; - version = "1.5.5"; - src = fetchPypi { - inherit pname version; - hash = "sha256-3wAowZJ1os/xN+OWF6Oc3NvRFzczuHtr+iV7fAhgITs="; - }; - doCheck = false; - dependencies = oldAttrs.dependencies ++ [ - super.python-dateutil - super.python-editor - ]; - }); - }; - }; - python3Packages = python.pkgs; -in python3Packages.buildPythonApplication rec { pname = "codechecker"; - version = "6.24.0"; + version = "6.28.0"; pyproject = true; + strictDeps = true; + __structuredAttrs = true; + src = fetchPypi { inherit pname version; - hash = "sha256-ftZACUf2lAHokcUXj45LRA7/3goOcIy521cGl6qhR98="; + hash = "sha256-wxV+/hzsk7RrzWTXNz5HyweYdFFI1upNS508QRPCefo="; }; build-system = with python3Packages; [ @@ -67,40 +32,39 @@ python3Packages.buildPythonApplication rec { ]; dependencies = with python3Packages; [ + alembic + argcomplete + authlib distutils # required in python312 to call subcommands (see https://github.com/Ericsson/codechecker/issues/4350) lxml - sqlalchemy - alembic + multiprocess portalocker psutil - multiprocess + semver + sqlalchemy thrift gitpython pyyaml + requests types-pyyaml sarif-tools + types-psutil ]; - pythonRelaxDeps = [ - "thrift" - "portalocker" - "types-pyyaml" - "lxml" - "psutil" - "multiprocess" - "gitpython" - "sarif-tools" - "pyyaml" + pythonRelaxDeps = true; + nativeBuildInputs = with python3Packages; [ + makeWrapper + pythonRelaxDepsHook ]; postInstall = '' wrapProgram "$out/bin/CodeChecker" --prefix PATH : ${ lib.makeBinPath ( - [ ] - ++ lib.optional withClang clang + lib.optional withClang libclang ++ lib.optional withClangTools clang-tools ++ lib.optional withCppcheck cppcheck ++ lib.optional withGcc gcc + ++ lib.optional withInfer infer ) } ''; @@ -116,6 +80,7 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ zebreus felixsinger + kacper-uminski ]; mainProgram = "CodeChecker"; platforms = lib.platforms.darwin ++ lib.platforms.linux; diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index 79a1304b8aeb..efb36ff4bd01 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "comrak"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = "comrak"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-neiDYC1wvCCYKlSX5R1PupZiH5vP3W5bWw17+8wv6uM="; + sha256 = "sha256-nLyGIN5AsWJsi+RPsQqPb2DLeSVF30ZrJAcDTsBV1V8="; }; - cargoHash = "sha256-ErZ0yD9G0i0EEafrFGP2MQoVQR/plIkJjBrfbNTeEy8="; + cargoHash = "sha256-CXdjr6ScUN1JehyFDlk1Fji93X5tCF5/fs4obRTBzOU="; meta = { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/by-name/co/container/package.nix b/pkgs/by-name/co/container/package.nix index 4e9d69648b62..e084654d9ce8 100644 --- a/pkgs/by-name/co/container/package.nix +++ b/pkgs/by-name/co/container/package.nix @@ -5,23 +5,25 @@ libarchive, xar, installShellFiles, + makeWrapper, versionCheckHook, nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "container"; - version = "0.12.3"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-${finalAttrs.version}-installer-signed.pkg"; - hash = "sha256-g/NjEmrB8GRYjeOc1rR0NA1InBkmSSosTlnE1Uqm2OM="; + hash = "sha256-DKHEKiJpwlV++x2CsbOKxVPmo6PaGxF5xDm87h59ZxQ="; }; nativeBuildInputs = [ libarchive xar installShellFiles + makeWrapper ]; dontUnpack = true; @@ -43,6 +45,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { --zsh <($out/bin/${finalAttrs.meta.mainProgram} --generate-completion-script zsh) ''; + postFixup = '' + wrapProgram $out/bin/container \ + --set-default CONTAINER_INSTALL_ROOT "$out" + wrapProgram $out/bin/container-apiserver \ + --set-default CONTAINER_INSTALL_ROOT "$out" + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; @@ -60,6 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "container"; maintainers = with lib.maintainers; [ xiaoxiangmoe + Br1ght0ne ]; platforms = [ "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix index bc565e2e546b..2869d2bac74c 100644 --- a/pkgs/by-name/co/context7-mcp/package.nix +++ b/pkgs/by-name/co/context7-mcp/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "context7-mcp"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "upstash"; repo = "context7"; tag = "${tag-prefix}@${finalAttrs.version}"; - hash = "sha256-v3zKMnZsc0gWVAdgZwFTskWcFVlOU6sG2i+qDwjx+dw="; + hash = "sha256-yyz4UraRm1JR/C7J2ib0nBU6zsNpKCWIWduTu7OlebM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/copacetic/package.nix b/pkgs/by-name/co/copacetic/package.nix index a689b45517b6..f1462d0ad0f8 100644 --- a/pkgs/by-name/co/copacetic/package.nix +++ b/pkgs/by-name/co/copacetic/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "copacetic"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "project-copacetic"; repo = "copacetic"; tag = "v${finalAttrs.version}"; - hash = "sha256-pD6AdJ9GfTPVgI/e4zRW4oJjOzpEk9uY4kdEm5yLDrw="; + hash = "sha256-MH3HSbJ+/5vjUrjFZQVf4Qv2+qAezOShxfkAoCJMnFU="; }; vendorHash = "sha256-RKqaIwGDZj91lfbEJHcnG8RhIrixtR0VtieCfZD/rns="; diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix index 67cca59a1728..a98087d61091 100644 --- a/pkgs/by-name/ct/ctx7/package.nix +++ b/pkgs/by-name/ct/ctx7/package.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ctx7"; - version = "0.5.3"; + version = "0.5.4"; __structuredAttrs = true; strictDeps = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "upstash"; repo = "context7"; tag = "${finalAttrs.pname}@${finalAttrs.version}"; - hash = "sha256-J3FS0HPpkuriuxEyY1dluwdMovdvgWUTFgBxVUlf+GA="; + hash = "sha256-yyz4UraRm1JR/C7J2ib0nBU6zsNpKCWIWduTu7OlebM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index 4bf958f44b12..8d3f8946c574 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -10,26 +10,26 @@ let inherit (stdenv) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.06.19-20-24-33-653a7fb/linux/x64/agent-cli-package.tar.gz"; - hash = "sha256-3xHrn1JaG2Leok/CiWtZezERrYqVcpZggXSD/zuWyy4="; + url = "https://downloads.cursor.com/lab/2026.06.26-7079533/linux/x64/agent-cli-package.tar.gz"; + hash = "sha256-fZNlWkdPQsK12SfmKmG+VrxWA4Df7sAFQJ5DSToq+Eg="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.06.19-20-24-33-653a7fb/linux/arm64/agent-cli-package.tar.gz"; - hash = "sha256-6iiinIexiEKqXDXOHzKut1d0Mtg89A8zel0zeXna4Qc="; + url = "https://downloads.cursor.com/lab/2026.06.26-7079533/linux/arm64/agent-cli-package.tar.gz"; + hash = "sha256-WcMurHV8Pm/2Y1HvNJGZYqjgt3OzHwn5oW5W27egueE="; }; x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.06.19-20-24-33-653a7fb/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-HgxyZ1TPLnyJJJuvi8VrQhm33/rzD9kCwxy4Mp0D9C0="; + url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/x64/agent-cli-package.tar.gz"; + hash = "sha256-5J2SA5AoyOxT9Ng58MnyCFtNllQCYhbO5MQZaONwgsk="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.06.19-20-24-33-653a7fb/darwin/arm64/agent-cli-package.tar.gz"; - hash = "sha256-Qa22+f5+x5+4sHesqp24d9GlKqPp6xBJG7BFxz6LUVU="; + url = "https://downloads.cursor.com/lab/2026.06.26-7079533/darwin/arm64/agent-cli-package.tar.gz"; + hash = "sha256-UO8SRA6depwO9SNhvYl9uOy9Dp625vHVNiyfxtmq3c4="; }; }; in stdenv.mkDerivation { pname = "cursor-cli"; - version = "2026.06.19-20-24-33-653a7fb"; + version = "0-unstable-2026-06-26"; src = sources.${hostPlatform.system}; diff --git a/pkgs/by-name/cy/cyberstrike/package.nix b/pkgs/by-name/cy/cyberstrike/package.nix index 8ce2972eb26e..777d5301dea2 100644 --- a/pkgs/by-name/cy/cyberstrike/package.nix +++ b/pkgs/by-name/cy/cyberstrike/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cyberstrike"; - version = "1.1.14"; + version = "1.1.15"; __structuredAttrs = true; strictDeps = true; @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "CyberStrikeus"; repo = "CyberStrike"; tag = "v${finalAttrs.version}"; - hash = "sha256-MlFEGP/MiuDtLl7Ms6j11u1MdLV6w8T/7TYo7eeE/rc="; + hash = "sha256-U1yYTFZCjF3z+161CL4xyxYwcWJh5zCbGAOm/ctACSs="; }; node_modules = stdenvNoCC.mkDerivation { @@ -75,7 +75,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # Required so fixed-output derivation does not retain store references dontFixup = true; - outputHash = "sha256-IxIdzd9MJJRpc0nB5eEASSW0LIckU+SvcUgkKoL+mog="; + outputHash = "sha256-O5p/2+14dFt/gbONLVSvqPdNmLgQ8L+cUTGp81Rm0js="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix index 0bc132727e15..11170463fc34 100644 --- a/pkgs/by-name/cy/cypress/package.nix +++ b/pkgs/by-name/cy/cypress/package.nix @@ -1,6 +1,7 @@ { alsa-lib, autoPatchelfHook, + darwin, fetchzip, gtk2, gtk3, @@ -55,6 +56,9 @@ stdenv.mkDerivation rec { unzip makeShellWrapper ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.autoSignDarwinBinariesHook + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 diff --git a/pkgs/by-name/da/daisydisk/package.nix b/pkgs/by-name/da/daisydisk/package.nix index e6d6676a0852..784b352b8d82 100644 --- a/pkgs/by-name/da/daisydisk/package.nix +++ b/pkgs/by-name/da/daisydisk/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "daisydisk"; - version = "4.33.3"; + version = "4.34.2"; src = fetchzip { url = "https://daisydiskapp.com/download/DaisyDisk.zip"; - hash = "sha256-2QhaY4oQV+bkvcyC88Zsk7eZJ6dySsb5G2+juH8HNjI="; + hash = "sha256-lSV367twsKDp0e5TsVYfjYO5GPcjtteBCxmUIOrz+0E="; stripRoot = false; }; diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index 13f93aec0b51..34ab2772083f 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -7,7 +7,6 @@ versionCheckHook, nix-update-script, }: - buildGoModule (finalAttrs: { pname = "databricks-cli"; version = "1.7.0"; @@ -31,6 +30,12 @@ buildGoModule (finalAttrs: { ldflags = [ "-X github.com/databricks/cli/internal/build.buildVersion=${finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildTag=v${finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildSummary=v${finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildMajor=${lib.versions.major finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildMinor=${lib.versions.minor finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildPatch=${lib.versions.patch finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildIsSnapshot=false" ]; postBuild = '' diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix index 60c07cfa4630..026e4cde54ee 100644 --- a/pkgs/by-name/da/davmail/package.nix +++ b/pkgs/by-name/da/davmail/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "davmail"; - version = "6.8.0"; + version = "6.8.1"; src = fetchFromGitHub { owner = "mguessan"; repo = "davmail"; tag = finalAttrs.version; - hash = "sha256-I5MQTxCU3SCIAj6Y6idJ9KbBRhvSbzZhZ9nY82BXM7k="; + hash = "sha256-kIDAMVenUzc7tIC49yzc1MzqNa9B7nNlX1bzwpG8Vp0="; }; buildPhase = '' diff --git a/pkgs/by-name/de/deck-app/package.nix b/pkgs/by-name/de/deck-app/package.nix new file mode 100644 index 000000000000..2fd4267197f2 --- /dev/null +++ b/pkgs/by-name/de/deck-app/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "deck-app"; + version = "1.4.5"; + + src = fetchurl { + url = "https://github.com/yuzeguitarist/Deck/releases/download/v${finalAttrs.version}/Deck.dmg"; + hash = "sha256-U5iMoQZGycwiiehxKUB3iohvzAh42gkC1sk3AJ62Ujs="; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + dontBuild = true; + dontFixup = true; + strictDeps = true; + + __structuredAttrs = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Deck is a modern, native, privacy-first clipboard manager for macOS."; + homepage = "https://deckclip.app/"; + changelog = "https://github.com/yuzeguitarist/Deck/releases/tag/v${finalAttrs.version}"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.darwin; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ myzel394 ]; + # Deck provides a CLI tool that can be enabled in the app settings. + mainProgram = "deckclip"; + }; +}) diff --git a/pkgs/by-name/de/dendrite/package.nix b/pkgs/by-name/de/dendrite/package.nix index 227a78356917..6186e6723e06 100644 --- a/pkgs/by-name/de/dendrite/package.nix +++ b/pkgs/by-name/de/dendrite/package.nix @@ -67,6 +67,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://element-hq.github.io/dendrite"; + mainProgram = "dendrite"; description = "Second-generation Matrix homeserver written in Go"; changelog = "https://github.com/element-hq/dendrite/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Plus; diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index e15bbc02d63e..9c30cb651b6b 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, - nodejs_20, + fetchpatch2, jre_headless, protobuf_30, xmlstarlet, @@ -13,20 +13,17 @@ nixosTests, }: let - version = "4.14.1"; + version = "4.14.2"; frontend = buildNpmPackage { pname = "dependency-track-frontend"; inherit version; - # TODO: pinned due to build error on node 22 - nodejs = nodejs_20; - src = fetchFromGitHub { owner = "DependencyTrack"; repo = "frontend"; - rev = version; - hash = "sha256-xjIRkffmXYMAfZ8wJehnPRfTThJjTgNL8ONl9N9ZJ+M="; + tag = version; + hash = "sha256-/MH1YjEJdRjYjenkzOcp7oytudsJcinPbc9OAGFnI/Q="; }; installPhase = '' @@ -34,7 +31,14 @@ let cp -R ./dist $out/ ''; - npmDepsHash = "sha256-CW9LOur8N3obrOeHgYFH2OO/vg8XihUspuXS5Zrix8I="; + patches = [ + (fetchpatch2 { + url = "https://github.com/DependencyTrack/frontend/pull/1575.patch?full_index=1"; + hash = "sha256-Wo+6yXa/8jB/pph0DTNsFz6lK3sedvro+7yvLSKes9c="; + }) + ]; + + npmDepsHash = "sha256-md+PGEC1/Kl2MQhhYldSErcsDSefbPvwVDsw0Yklq1E="; forceGitDeps = true; makeCacheWritable = true; @@ -50,8 +54,8 @@ maven.buildMavenPackage rec { src = fetchFromGitHub { owner = "DependencyTrack"; repo = "dependency-track"; - rev = version; - hash = "sha256-pIZM8FQ0IFqRbTQT5VIlCmS+fCCXULJJ6bdEv6xfjbc="; + tag = version; + hash = "sha256-9EPjIm2VOmt1FEiPoJtwNHoKZcewO0kJgBSc9fnUXeI="; }; postPatch = '' @@ -84,7 +88,7 @@ maven.buildMavenPackage rec { ''; mvnJdk = jre_headless; - mvnHash = "sha256-eZuwBt+emThf4mxVaphFgBWNqP64Cs9WIKW+GPvHll4="; + mvnHash = "sha256-pshUDIPPGGGzxg5WJXC3mjnqGXn8HVowFCb2l5f6zjA="; manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" # added to saticfy protobuf compiler plugin dependency resolving @@ -92,7 +96,7 @@ maven.buildMavenPackage rec { "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.19.1" "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.0" "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.3" - "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.0" + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2" "io.micrometer:micrometer-core:1.16.0" "io.micrometer:micrometer-observation:1.16.0" ]; diff --git a/pkgs/by-name/de/devin-cli/package.nix b/pkgs/by-name/de/devin-cli/package.nix index a0599a264759..02bfc1cbf3f5 100644 --- a/pkgs/by-name/de/devin-cli/package.nix +++ b/pkgs/by-name/de/devin-cli/package.nix @@ -7,29 +7,24 @@ }: let - version = "3000.1.23"; + version = "3000.1.27"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; srcs = { x86_64-linux = fetchurl { url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-unknown-linux.tar.gz"; - hash = "sha256-m7DOI/PY0ldm4kRmAxeEQXTiH/R2oT3R8igmtXYA40g="; + hash = "sha256-y0kHpKT2wZvquR0EOIpFN2EMC84BpOOOKLXWwE0nygo="; }; aarch64-linux = fetchurl { url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz"; - hash = "sha256-oOZjPyr3sgaH54KBWQhODFwxrEnuhkTW/rVPwXUAeUY="; + hash = "sha256-gyWbCpfLNphBjoSGVIhi7hgGToBKceavEKn//yDA1uw="; }; aarch64-darwin = fetchurl { url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz"; - hash = "sha256-x+g7kILZuWG2JX4tc+GdIE7XqpHIzWt6+xPQU/gzyeA="; - }; - - x86_64-darwin = fetchurl { - url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-apple-darwin.tar.gz"; - hash = "sha256-LF1Mk53ds28Avvq+TtyvIu/BPYSHm9tBVjAlUXAyJVU="; + hash = "sha256-OnpANdMh9ws9FHwfwWR63OSaC/P3MB+eAV33JxQNUaQ="; }; }; in diff --git a/pkgs/by-name/de/devin-cli/update.sh b/pkgs/by-name/de/devin-cli/update.sh index 8b1773684578..33955c67802e 100755 --- a/pkgs/by-name/de/devin-cli/update.sh +++ b/pkgs/by-name/de/devin-cli/update.sh @@ -16,7 +16,6 @@ update-source-version devin-cli $latestVersion || true for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix store prefetch-file --json --hash-type sha256 \ $(nix-instantiate --eval --raw -E "with import ./. {}; devin-cli.src.url" --system "$system") | jq -r '.hash') diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index 101220e3344d..96df189c77aa 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -6,17 +6,20 @@ nix-update-script, pkg-config, openssl, + cacert, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "dezoomify-rs"; - version = "2.15.0"; + version = "2.16.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "lovasoa"; repo = "dezoomify-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-gx/h9i+VPU0AtpQEkN/zCLmeyaW5wSUCfdY52hPwm3Q="; + hash = "sha256-45Vlgle605s3uvPh+Lr+KAk72AzIoolnSuhFzRCORC4="; }; nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ @@ -27,9 +30,13 @@ rustPlatform.buildRustPackage (finalAttrs: { openssl ]; + nativeCheckInputs = [ + cacert + ]; + passthru.updateScript = nix-update-script { }; - cargoHash = "sha256-Jh1a5DW25a4wzuZbOAoTn/crp/ioLsmq3jDiqIctCCM="; + cargoHash = "sha256-tfeknHPrY11rSmHyEAUvJgCLDwmIpo9jk8BLgzgQCrc="; # hyper uses SystemConfiguration.framework to read system proxy settings. # Allow access to the Mach service to prevent the tests from failing. @@ -39,9 +46,13 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Zoomable image downloader for Google Arts & Culture, Zoomify, IIIF, and others"; + changelog = "https://github.com/lovasoa/dezoomify-rs/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/lovasoa/dezoomify-rs/"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ fsagbuya ]; + maintainers = with lib.maintainers; [ + fsagbuya + kybe236 + ]; mainProgram = "dezoomify-rs"; }; }) diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index 3cc982696725..b70a321014f0 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.3.10"; + version = "2.3.11"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-ePoFjIzLUQ4GpPIObhIsg0NvvM1VcVf++IDdTI3XjXw="; + hash = "sha256-zxlV3AbG5cBBGUk3hx9U3OR26lB3G2QQlcxTg00WJZQ="; }; - cargoHash = "sha256-lGVUxYrZ81YvJncGGw7VQ8bl74aYOyHsEKDIMCwc7lw="; + cargoHash = "sha256-GytJ0Eq4LkdSq1fosXFoC0nI7bY0VdM8oOV/tvyUSMg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/di/direvent/package.nix b/pkgs/by-name/di/direvent/package.nix index 80c722a028df..f500c4d1e4fb 100644 --- a/pkgs/by-name/di/direvent/package.nix +++ b/pkgs/by-name/di/direvent/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "direvent"; - version = "5.4"; + version = "5.5"; src = fetchurl { url = "mirror://gnu/direvent/direvent-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-HbvGGSqrZ+NFclFIYD1XDGooKDgMlkIVdir5FSTXlbo="; + sha256 = "sha256-DhbAtLPm92c+m08x2BqwEjatIvg1OFEvOy9Y+flv3Lc="; }; meta = { diff --git a/pkgs/by-name/di/diskonaut-ng/package.nix b/pkgs/by-name/di/diskonaut-ng/package.nix new file mode 100644 index 000000000000..3735ed81bc59 --- /dev/null +++ b/pkgs/by-name/di/diskonaut-ng/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + + __structuredAttrs = true; + + pname = "diskonaut-ng"; + version = "0.13.2"; + + src = fetchFromGitHub { + owner = "neunenak"; + repo = "diskonaut"; + tag = finalAttrs.version; + hash = "sha256-4gfJnqACJP1lV62Bkuarp85Idoh/H8zQ5W085yNZR5Q="; + }; + + cargoHash = "sha256-+NwZbR3fRj8Wi95GtsUQFWOyaZ0ekC4chsoJ5rsH3Zg="; + + # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1 + doCheck = !stdenv.hostPlatform.isDarwin; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal disk space navigator"; + homepage = "https://github.com/neunenak/diskonaut"; + changelog = "https://github.com/neunenak/diskonaut/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + gregshuflin + ]; + mainProgram = "diskonaut"; + }; +}) diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index c6cdb6d87806..f620e39268fb 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "dnsproxy"; - version = "0.82.1"; + version = "0.83.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-d/PZrfH8jR4kcBX5Ze/06vDcDTlKWxHZ2gvi7eJF2j8="; + hash = "sha256-ceeNS1Z2xQgZrouRTh48in+Z71dBj/dtnOYTPY/0az8="; }; - vendorHash = "sha256-QsNhCfqhqPv01xM/ojO3K4ktyTrUgdR79cQICtP2y1g="; + vendorHash = "sha256-6skcvkErUm/0u7yk8p70tYnT4d1XLySw6arMgPnOzq8="; ldflags = [ "-s" diff --git a/pkgs/by-name/do/doas-sudo-shim/package.nix b/pkgs/by-name/do/doas-sudo-shim/package.nix index bc7a005210d4..e973b4d526ea 100644 --- a/pkgs/by-name/do/doas-sudo-shim/package.nix +++ b/pkgs/by-name/do/doas-sudo-shim/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "doas-sudo-shim"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "jirutka"; repo = "doas-sudo-shim"; rev = "v${version}"; - sha256 = "sha256-jgakKxglJi4LcxXsSE4mEdY/44kPxVb/jF7CgX7dllA="; + sha256 = "sha256-USSakVUzCbUY1DJLmDCiwdq/xjOwwnm3VtXBBeXeV1A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix index beeeafccb3a0..5bbdf8dc17cd 100644 --- a/pkgs/by-name/do/domoticz/package.nix +++ b/pkgs/by-name/do/domoticz/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, makeWrapper, cmake, python3, @@ -24,23 +23,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "domoticz"; - version = "2024.7"; + version = "2026.2-unstable-2026-07-09"; src = fetchFromGitHub { owner = "domoticz"; repo = "domoticz"; - tag = finalAttrs.version; - hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ="; + rev = "7e12d1e5d7bf3f7d083ef31d5dd611d678f89d48"; # pinned due to removed dependency (see nixpkgs pr #539060) + hash = "sha256-+6EIEsgGTaLEPzBa/R5EYAxnYB3+cj54LGDJwutTQGA="; + fetchSubmodules = true; }; - patches = [ - # Boost 1.87 compatibility, remove once upgraded to 2025.1 - (fetchpatch { - url = "https://github.com/domoticz/domoticz/commit/5d0db89bbd120ed5dc05b4ff8c136f14a42f0cd3.patch"; - hash = "sha256-FPe83yJKJEgnY3kABy9CTRe1CBh42dPG1ZWCUE5PO8E="; - }) - ]; - buildInputs = [ openssl python3 @@ -87,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ - versionCheckHook + # versionCheckHook # readd once we can move to a tagged release again ]; doInstallCheck = true; @@ -98,15 +90,15 @@ stdenv.mkDerivation (finalAttrs: { various devices like: lights, switches, various sensors/meters like temperature, rain, wind, UV, electra, gas, water and much more ''; - maintainers = with lib.maintainers; [ edcragg ]; + maintainers = with lib.maintainers; [ + edcragg + lenny + ]; homepage = "https://www.domoticz.com/"; changelog = "https://github.com/domoticz/domoticz/blob/${finalAttrs.version}/History.txt"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin mainProgram = "domoticz"; - knownVulnerabilities = [ - "CVE-2026-1001" - ]; }; }) diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix index a4eed321c8de..9a1eecaf52e4 100644 --- a/pkgs/by-name/do/dopamine/package.nix +++ b/pkgs/by-name/do/dopamine/package.nix @@ -10,7 +10,7 @@ }: buildNpmPackage (finalAttrs: { pname = "dopamine"; - version = "3.0.6"; + version = "3.0.7"; # needed to upgrade better-sqlite3 in npmConfigHook src = applyPatches { @@ -18,7 +18,7 @@ buildNpmPackage (finalAttrs: { owner = "digimezzo"; repo = "dopamine"; tag = "v${finalAttrs.version}"; - hash = "sha256-HTPWejm5Wi6yGJyS/f1RhjIluTz01ue8lAsnAcQY3IY="; + hash = "sha256-zYuf5BIQaxTqHBXWX1PLghGR5WmwtnSxTYrNosVFebc="; }; patches = [ # register-scheme contains install scripts, but has no lockfile @@ -32,7 +32,7 @@ buildNpmPackage (finalAttrs: { ]; }; - npmDepsHash = "sha256-9dQUqoLfzYXOgmE9j2lkew9b/1m4XOghT7roD82y+qg="; + npmDepsHash = "sha256-m5y8TmOUAUf2IE87b73hFe2vj/uRAqFGgfuy3vkUX/s="; nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ distutils ])) diff --git a/pkgs/by-name/do/dosbox-x/package.nix b/pkgs/by-name/do/dosbox-x/package.nix index c09e3235c70f..b7007d6b9197 100644 --- a/pkgs/by-name/do/dosbox-x/package.nix +++ b/pkgs/by-name/do/dosbox-x/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2026.06.02"; + version = "2026.07.02"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-60ZMaevTqYjHq6WrhKVQ8T8kfrQV7Auy59y3JFMHi5w="; + hash = "sha256-HO5JJQHeEJYXU7TtNCXZALgqkNbIMGI+TjDwbvs5L8w="; }; # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants diff --git a/pkgs/by-name/dr/drawy/package.nix b/pkgs/by-name/dr/drawy/package.nix index c743c0cf6a91..c44ef3ca7ba6 100644 --- a/pkgs/by-name/dr/drawy/package.nix +++ b/pkgs/by-name/dr/drawy/package.nix @@ -12,16 +12,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "drawy"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = "drawy"; rev = "v${finalAttrs.version}"; - hash = "sha256-K070SiIf2bj1r44tixUZbsLYDxT65lEW0g68ENg3ZiE="; + hash = "sha256-Y6CAdHgcCK9lIae+CwqSGml+FAvVzLzyIAKdw85dKmQ="; }; + __structuredAttrs = true; strictDeps = true; nativeBuildInputs = [ @@ -31,32 +32,46 @@ stdenv.mkDerivation (finalAttrs: { shared-mime-info ]; - buildInputs = [ - qt6.qtbase - qt6.qttools - - kdePackages.extra-cmake-modules - kdePackages.kconfig - kdePackages.kconfigwidgets - kdePackages.kcoreaddons - kdePackages.kcrash - kdePackages.kdoctools - kdePackages.ki18n - kdePackages.kiconthemes - kdePackages.kwidgetsaddons - kdePackages.kxmlgui - kdePackages.syntax-highlighting - ]; + buildInputs = + (with qt6; [ + qtbase + qttools + ]) + ++ (with kdePackages; [ + extra-cmake-modules + kconfig + kconfigwidgets + kcoreaddons + kcrash + kdoctools + ki18n + kiconthemes + kwidgetsaddons + kxmlgui + syntax-highlighting + ]); passthru.updateScript = nix-update-script { }; meta = { description = "Handy and infinite brainstorming tool"; homepage = "https://apps.kde.org/drawy/"; - license = lib.licenses.gpl3Only; + changelog = "https://invent.kde.org/graphics/drawy/-/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ + bsd2 + bsd3 + cc-by-sa-40 + cc0 + gpl2Plus + gpl3Plus + lgpl2Plus + mit + ofl + ]; maintainers = with lib.maintainers; [ - yiyu quarterstar + sigmasquadron + yiyu ]; mainProgram = "drawy"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix index 2474bc2e0fb9..6cd5364963f4 100644 --- a/pkgs/by-name/dr/dropbear/package.nix +++ b/pkgs/by-name/dr/dropbear/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, zlib, libxcrypt, enableSCP ? false, @@ -15,18 +15,24 @@ let SFTPSERVER_PATH = sftpPath; DROPBEAR_PATH_SSH_PROGRAM = "${placeholder "out"}/bin/dbclient"; }; - in - stdenv.mkDerivation (finalAttrs: { pname = "dropbear"; - version = "2026.91"; + version = "2026.92"; - src = fetchurl { - url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-3vqSRHWr9rwedKvAAXPka/3IBL1Hyq+hT1pO8Mx22jQ="; + src = fetchFromGitHub { + owner = "mkj"; + repo = "dropbear"; + tag = "DROPBEAR_${finalAttrs.version}"; + hash = "sha256-xXjKWj6tMW/Qlq4DttxKAqOwsER2QEeb1Qw3Gllu2QQ="; }; + patches = [ + # Allow sessions to inherit the PATH from the parent dropbear. + # Otherwise they only get the usual /bin:/usr/bin kind of PATH + ./pass-path.patch + ]; + env.CFLAGS = lib.pipe (lib.attrNames dflags) [ (map (name: "-D${name}=\\\"${dflags.${name}}\\\"")) (lib.concatStringsSep " ") @@ -55,27 +61,38 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - postInstall = lib.optionalString enableSCP '' - ln -rs $out/bin/scp $out/bin/dbscp - ''; - - patches = [ - # Allow sessions to inherit the PATH from the parent dropbear. - # Otherwise they only get the usual /bin:/usr/bin kind of PATH - ./pass-path.patch - ]; - buildInputs = [ zlib libxcrypt ]; + postInstall = lib.optionalString enableSCP '' + ln -rs $out/bin/scp $out/bin/dbscp + ''; + meta = { - description = "Small footprint implementation of the SSH 2 protocol"; + description = "Small memory footprint ssh server/client suitable for memory-constrained environments"; + longDescription = '' + Dropbear is particularly useful for "embedded"-type Linux (or other Unix) systems, such as wireless routers. + + ## Features + + * Implements X11 forwarding, and authentication-agent forwarding for OpenSSH clients + * Can run from inetd or standalone + * Compatible with OpenSSH ~/.ssh/authorized_keys public key authentication + * Multi-hop mode uses SSH TCP forwarding to tunnel through multiple SSH hosts in a single command: + + ```shell + dbclient user1@hop1,user2@hop2,destination + ``` + ''; homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html"; - changelog = "https://github.com/mkj/dropbear/raw/DROPBEAR_${finalAttrs.version}/CHANGES"; + changelog = "https://github.com/mkj/dropbear/releases/tag/DROPBEAR_${finalAttrs.version}"; + downloadPage = "https://matt.ucc.asn.au/dropbear/releases"; license = lib.licenses.mit; - maintainers = [ ]; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + debtquity + ]; }; }) diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix index b56dc86e3d52..04a6d33e7e31 100644 --- a/pkgs/by-name/du/duplicati/package.nix +++ b/pkgs/by-name/du/duplicati/package.nix @@ -14,9 +14,9 @@ let # for update.sh easy to handle - ngclientVersion = "0.0.225"; - ngclientRev = "b740ef00435af2066936f90d4cf284b5662c4bf9"; - ngclientHash = "sha256-X8ZhCmwfroIZWj3DjFq/InN+2zCOtHjEE1TyCXHNaIw="; + ngclientVersion = "0.0.226"; + ngclientRev = "2cc3e2e088ddb4691bb389b0afa89287d399340e"; + ngclientHash = "sha256-uMWOunSaV9HNhgH65P2boangZFe/9NCRb5BBqXv9TI0="; # from Duplicati/Server/webroot/ngclient/package.json ngclient = buildNpmPackage { @@ -30,7 +30,7 @@ let hash = ngclientHash; }; - npmDepsHash = "sha256-DhP1gY965xNOj98s95LqSTCaqJt4YdFfbZ4bGp3o4cA="; + npmDepsHash = "sha256-89l/1v8dncwImDgiQic2VN65K/dxIkEPCrsHCty2VV0="; nativeBuildInputs = [ bun ]; @@ -58,15 +58,15 @@ let in buildDotnetModule rec { pname = "duplicati"; - version = "2.3.0.3"; + version = "2.3.0.4"; channel = "stable"; - buildDate = "2026-06-10"; + buildDate = "2026-07-09"; src = fetchFromGitHub { owner = "duplicati"; repo = "duplicati"; tag = "v${version}_${channel}_${buildDate}"; - hash = "sha256-vRD3pehsGznGesynrftns6F5md9Ej509A99Ug0IOPGk="; + hash = "sha256-pVfcD7bIlZ/ZsMNwjPcg+DY6YFNm191ngEm5SrDukSw="; stripRoot = true; }; diff --git a/pkgs/by-name/eg/eggnog-mapper/package.nix b/pkgs/by-name/eg/eggnog-mapper/package.nix index 2960d5485476..704794daac0c 100644 --- a/pkgs/by-name/eg/eggnog-mapper/package.nix +++ b/pkgs/by-name/eg/eggnog-mapper/package.nix @@ -2,6 +2,7 @@ lib, autoPatchelfHook, fetchFromGitHub, + fetchpatch2, python3Packages, wget, zlib, @@ -9,38 +10,53 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "eggnog-mapper"; - version = "2.1.13"; - format = "setuptools"; + version = "2.1.14"; + pyproject = true; src = fetchFromGitHub { owner = "eggnogdb"; repo = "eggnog-mapper"; - tag = finalAttrs.version; - hash = "sha256-Gu4D8DBvgCPlO+2MjeNZy6+lNqsIlksegWmmYvEZmUU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-rjQojz6JA7T03s4PojjXJuDZhdAx9VhPQrlRTGZaYZg="; }; - postPatch = '' - # Not a great solution... - substituteInPlace setup.cfg \ - --replace "==" ">=" - ''; + patches = [ + # From https://github.com/eggnogdb/eggnog-mapper/pull/599 + (fetchpatch2 { + name = "replace-distutils.patch"; + url = "https://github.com/eggnogdb/eggnog-mapper/commit/998129d3766e060ff450e8f950b5361c6318b0a2.patch?full_index=1"; + hash = "sha256-xYNd9p5BhGpvFXCWXRSEkZf+Lt4hCRGYeV9Oe4mDz3I="; + }) + ]; nativeBuildInputs = [ autoPatchelfHook ]; + build-system = with python3Packages; [ + setuptools + ]; + buildInputs = [ zlib ]; propagatedBuildInputs = [ wget - ] - ++ (with python3Packages; [ + ]; + + dependencies = with python3Packages; [ biopython psutil xlsxwriter - ]); + ]; + + # Upstream already relaxed these dependencies, but that is not yet included in 2.1.14 + pythonRelaxDeps = [ + "biopython" + "psutil" + "xlsxwriter" + ]; # Tests rely on some of the databases being available, which is not bundled # with this package as (1) in total, they represent >100GB of data, and (2) diff --git a/pkgs/by-name/en/envfs/package.nix b/pkgs/by-name/en/envfs/package.nix index f1601aa562bc..823c183868e6 100644 --- a/pkgs/by-name/en/envfs/package.nix +++ b/pkgs/by-name/en/envfs/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "envfs"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "envfs"; rev = finalAttrs.version; - hash = "sha256-bpATdm/lB+zomPYGCxA7omWK/SKPIaqr94J+fjMaXfE="; + hash = "sha256-hj/6zS9ebF0IDqgc1Dne59nWx80nk6jn2gj8BzQUFIQ="; }; - cargoHash = "sha256-nMUdAFRHJZDwvLASBVykzzkwk3HxslDehqqm1U99qYg="; + cargoHash = "sha256-dz3gpE464jnmSDsAsmJHcxUsEKeUURNoUjgGU2214Xg="; postInstall = '' ln -s envfs $out/bin/mount.envfs diff --git a/pkgs/by-name/et/et-book/package.nix b/pkgs/by-name/et/et-book/package.nix index a25b27d5c6a9..673a7704837d 100644 --- a/pkgs/by-name/et/et-book/package.nix +++ b/pkgs/by-name/et/et-book/package.nix @@ -2,12 +2,21 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { pname = "et-book"; version = "0-unstable-2015-10-05"; + strictDeps = true; + __structuredAttrs = true; + + outputs = [ + "out" + "webfont" + ]; + src = fetchFromGitHub { owner = "edwardtufte"; repo = "et-book"; @@ -15,14 +24,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-B6ryC9ibNop08TJC/w9LSHHwqV/81EezXsTUJFq8xpo="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - cp -t $out/share/fonts/truetype source/4-ttf/*.ttf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Typeface used in Edward Tufte’s books"; diff --git a/pkgs/by-name/ev/evdevremapkeys/package.nix b/pkgs/by-name/ev/evdevremapkeys/package.nix index 7986b373996b..e1c04f0c7c29 100644 --- a/pkgs/by-name/ev/evdevremapkeys/package.nix +++ b/pkgs/by-name/ev/evdevremapkeys/package.nix @@ -4,32 +4,35 @@ python3Packages, }: -python3Packages.buildPythonPackage { +python3Packages.buildPythonPackage (finalAttrs: { pname = "evdevremapkeys"; - version = "1.0.0"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "philipl"; repo = "evdevremapkeys"; - rev = "9b6f372a9bdf8b27d39f7e655b74f6b9d1a8467f"; - sha256 = "sha256-FwRbo0RTiiV2AB7z6XOalMnwMbj15jM4Dxs41TsIOQI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Gtml52tHNtg/3Fy+QO9eIh90nim0p0Fs+oEyqJvsZKs="; }; build-system = with python3Packages; [ - setuptools + hatchling + hatch-vcs ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; + dependencies = with python3Packages; [ pyyaml pyxdg - python-daemon evdev pyudev ]; - # hase no tests - doCheck = false; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; pythonImportsCheck = [ "evdevremapkeys" ]; @@ -41,4 +44,4 @@ python3Packages.buildPythonPackage { maintainers = [ lib.maintainers.q3k ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index 87e68113e450..988e1e4e3d9e 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20260511"; + version = "20260712"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-H9SZRkwZJZ9LMDiyfXXZm8zCq3E3CjbSCBePjf1pPd4="; + hash = "sha256-fCzh9pn+HWL60IvpPieaaZ+JjQZ1bbfYIyLEHDITK4U="; }; dontUnpack = true; diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 046ced1cb339..ea2f4eece6da 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -185,7 +185,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { llvmPackages.bintools (python3.withPackages ( pythonPackages: with pythonPackages; [ - setuptools + packaging libclang ] )) diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix index 505c3f073f8a..55cc640cf25d 100644 --- a/pkgs/by-name/fo/formatjson5/package.nix +++ b/pkgs/by-name/fo/formatjson5/package.nix @@ -20,9 +20,20 @@ rustPlatform.buildRustPackage { patches = [ (fetchpatch { + # bugfix: fix missing_docs error + # Needed to build with Rust 1.83+. + name = "0001-bugfix-fix-missing-docs-error"; url = "https://github.com/google/json5format/commit/32914546e7088b3d9173ae9a2f307effa87917bf.patch"; hash = "sha256-kAbRUL/FuhnxkC9Xo4J2bXt9nkMOLeJvgMmOoKnSxKc="; }) + (fetchpatch { + # Skip rewriting unchanged files with --replace + # Unmerged upstream patch, ensures json5format is compatible with treefmt(-nix), + # which is quite popular in the Nix ecosystem. + name = "0002-skip-rewriting-unchanged-files"; + url = "https://github.com/google/json5format/commit/7bb67ff03529f6f0350d72b7a36839f20fe9d190.patch"; + hash = "sha256-ZY7Ck51/vHcRDQ5GEwOuMIF+QiYNGay3wbIvesmEl9k="; + }) ]; cargoHash = "sha256-1CSt9dPVHdOqfQXio7/eXiDLWt+iOe6Qj+VtWblwSDE="; diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 99d631b9ad1e..8df7058846e1 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -8,7 +8,6 @@ libtool, cmake, pkg-config, - python3, macdylibbundler, makeWrapper, darwin, @@ -24,6 +23,7 @@ dbus, apple-sdk_15, nix-update-script, + wget, }: let @@ -49,52 +49,54 @@ let hash = "sha256-P84gjnuiQQBVBExJBY3sUbwo00lXY6HB+AMpx/oovRg="; }; radaeSrc = fetchFromGitHub { - owner = "drowe67"; - repo = "radae"; - rev = "5d640a028ab2b8e4ff23ed7136caee396cdcb844"; - # upstream repository archive fetching is broken - forceFetchGit = true; - hash = "sha256-+Sd+FWycEJabT3RN/zyKXS2Xzr060/ekYdzg6s1gQcM="; + owner = "peterbmarks"; + repo = "radae_nopy"; + rev = "d72ec84e795493249db44d5939eb9b05438f956a"; + hash = "sha256-ziEhYZarzQtQ1akAxF54kcX6o38gJeUJ08jipSWXnxQ="; }; - radeInteg = fetchFromGitHub { - owner = "drowe67"; - repo = "radae"; - rev = "7bd3ae2401fcba58e314755576a2940085835312"; - hash = "sha256-WVYKvttiNh6uEzw0b27winyDfzzGkEEhYq7DIwfZW74="; + rnnoiseSrc = fetchFromGitHub { + owner = "xiph"; + repo = "rnnoise"; + rev = "70f1d256acd4b34a572f999a05c87bf00b67730d"; + nativeBuildInputs = [ wget ]; + postFetch = '' + cd $out + export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + export SSL_CERT_FILE=$NIX_SSL_CERT_FILE + ./download_model.sh + substituteInPlace autogen.sh \ + --replace-fail "./download_model.sh" "" + ''; + hash = "sha256-t/AwOCuHb5Oahy1fDI3Sc9M08Xz3dSAavhYatRC1OIk="; }; in stdenv.mkDerivation (finalAttrs: { pname = "freedv"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; tag = "v${finalAttrs.version}"; - hash = "sha256-7SOGz2+MzAkXd5JDKasSJcKVXcnuYk+C0S9N/NPRfOM="; + hash = "sha256-TjE/iYg+VFvbZH7/1q1V4t0SgcS44pLVet4Pgt6L5HA="; }; - patches = [ - ./no-framework.patch - ]; - postPatch = '' cp -R ${ebur128Src} ebur128 cp -R ${radaeSrc} radae - cp -R ${radeInteg} rade_integ - chmod -R u+w ebur128 radae rade_integ + cp -R ${rnnoiseSrc} rnnoise + chmod -R u+w ebur128 radae rnnoise substituteInPlace cmake/BuildEbur128.cmake \ --replace-fail "GIT_REPOSITORY https://github.com/jiixyj/libebur128.git" "URL $(realpath ebur128)" \ --replace-fail 'GIT_TAG "v''${EBUR128_VERSION}"' "" \ --replace-fail "git apply" "patch -p1 <" substituteInPlace cmake/BuildRADE.cmake \ --replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \ - --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \ + --replace-fail "GIT_REPOSITORY https://github.com/peterbmarks/radae_nopy/" "URL $(realpath radae)" \ + --replace-fail "GIT_TAG main" "" + substituteInPlace cmake/BuildRNNoise.cmake \ + --replace-fail "GIT_REPOSITORY \''${RNNOISE_REPO}" "URL $(realpath rnnoise)" \ --replace-fail "GIT_TAG main" "" - substituteInPlace cmake/BuildRADEForIntegrations.cmake \ - --replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \ - --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath rade_integ)" \ - --replace-fail "GIT_TAG ms-disable-python-gc" "" patchShebangs test/test_*.sh substituteInPlace cmake/CheckGit.cmake \ --replace-fail "git describe --abbrev=4 --always HEAD" "echo v${finalAttrs.version}" @@ -113,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: { libtool cmake pkg-config - python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (macdylibbundler.overrideAttrs { @@ -136,7 +137,6 @@ stdenv.mkDerivation (finalAttrs: { speexdsp hamlib_4 wxwidgets_3_2 - python3.pkgs.numpy ] ++ ( if stdenv.hostPlatform.isLinux then diff --git a/pkgs/by-name/gc/gcx/package.nix b/pkgs/by-name/gc/gcx/package.nix index 67fd9803b791..644851da09d0 100644 --- a/pkgs/by-name/gc/gcx/package.nix +++ b/pkgs/by-name/gc/gcx/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "gcx"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "grafana"; repo = "gcx"; tag = "v${finalAttrs.version}"; - hash = "sha256-nSopsew5QMOs/QyJg7TzALokZagIGCjxMCNsairB5PA="; + hash = "sha256-yPxSRg9PLfHwfv4bCTaxgvRD6UHD4A5qh68c2Dxcpn0="; }; - vendorHash = "sha256-JioNpEqGFxD6Gg84ZZ/9OrETxTGn2V+HMlGGiiZfeIo="; + vendorHash = "sha256-PevzovryzpNap8dzruYWdk07M5g9jlA8QPQcrXnO7xk="; subPackages = [ "cmd/gcx" ]; diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix index 7f9c9f1684d1..5e537209a2a7 100644 --- a/pkgs/by-name/gd/gdal/package.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -309,6 +309,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!usePoppler) [ "test_pdf_jpx_compression" + ] + ++ lib.optionals (!useNetCDF) [ + # writes the Zarr tile-presence cache (.gmac) via the netCDF driver, which + # is absent in the minimal build + "test_zarr_read_simple_sharding" ]; postCheck = '' popd # autotest diff --git a/pkgs/by-name/ge/geeqie/package.nix b/pkgs/by-name/ge/geeqie/package.nix index b8cf75d9742b..c0a945cc229a 100644 --- a/pkgs/by-name/ge/geeqie/package.nix +++ b/pkgs/by-name/ge/geeqie/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "geeqie"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; tag = "v${finalAttrs.version}"; - hash = "sha256-90e+f95RIv2FZUFrfr6e7MhsQ8Xnve+Ie+uPyc87FRE="; + hash = "sha256-6g1aBeQUy9+WMlikAqvlb0NcCT7h0qgBRSsCOdRiZ/E="; }; postPatch = '' diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix index 75488e5e7912..367d8e288f00 100644 --- a/pkgs/by-name/ge/gelly/package.nix +++ b/pkgs/by-name/ge/gelly/package.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gelly"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "Fingel"; repo = "gelly"; tag = "v${finalAttrs.version}"; - hash = "sha256-DIE+IjFpDG9kCEwN3XLlxYLWduGZ7G8LXjVDnl6pp1w="; + hash = "sha256-WcnPNsFvQ/CqvAYxWeoAWZiJ62bOgLe8fGNeyh2B+8s="; }; - cargoHash = "sha256-iOJMUyjqYBl5muWZCnKRRgpAf5lTPgANjohTHa1cfGY="; + cargoHash = "sha256-0ZKW2xxjTn84mWBrK6zhw/uiOnd5sD+URu2O0a1TZW8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ge/geminicommit/package.nix b/pkgs/by-name/ge/geminicommit/package.nix index cad18ba4b39a..572d60b2988a 100644 --- a/pkgs/by-name/ge/geminicommit/package.nix +++ b/pkgs/by-name/ge/geminicommit/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "geminicommit"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "tfkhdyt"; repo = "geminicommit"; tag = "v${finalAttrs.version}"; - hash = "sha256-BLCnBym69O6s4UnogopcccI5PnniOFJ3BcWFyxEsUUI="; + hash = "sha256-OgcbPnZ88snTky8Uzbq2LIwSpMv44JvE75MPbTih7+c="; }; vendorHash = "sha256-FFWptw1kSbl7f8DR3FrM0jAfr06NaJT+i/8ZaQjav/E="; diff --git a/pkgs/by-name/gg/ggmorse/package.nix b/pkgs/by-name/gg/ggmorse/package.nix new file mode 100644 index 000000000000..51a4ce819e28 --- /dev/null +++ b/pkgs/by-name/gg/ggmorse/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation { + pname = "ggmorse"; + version = "0.1.0-unstable-2024-05-31"; + + src = fetchFromGitHub { + owner = "ggerganov"; + repo = "ggmorse"; + rev = "8fb433d6cd6a71940f51b5724663ec0c75bf0b62"; + hash = "sha256-6GhyPhzNNAx1DSomfIfejbnLTckKa7/+VUZhSaGvGtI="; + }; + + postPatch = '' + substituteInPlace ./CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 3.0)" \ + "cmake_minimum_required (VERSION 3.5)" + ''; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "GGMORSE_BUILD_EXAMPLES" false) + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Morse code decoding library"; + homepage = "https://github.com/ggerganov/ggmorse"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nekowinston ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index 95c5aa9d7abc..2a8ffea396f5 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "gh-dash"; - version = "4.25.0"; + version = "4.25.2"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${finalAttrs.version}"; - hash = "sha256-gdjP1jIYI84szuNhP7LgGRMXIPqrRwb8nRWB0BjQF+k="; + hash = "sha256-3iUBuMvA2Xh7UjTiFNEs3tuZMCnSt/bIhTSEDD92yCU="; }; vendorHash = "sha256-Teu+8jiZE2gZ+0ErKsunhotY9W4Hjg6PAeFkFLgESIk="; diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 99b5c929c083..789301891d6e 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.30.2"; + version = "1.30.3"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-z3eBORwrccIgTijdHcK7en4DvRY0fE3807Amn0MCuA8="; + hash = "sha256-kWL/ZKBLCXzXXy4gVALfP275PUI2UPlM/WJVqQS+5ak="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; diff --git a/pkgs/by-name/gi/git-imerge/package.nix b/pkgs/by-name/gi/git-imerge/package.nix index 4dfc8f3dd6e6..ae949bde3a68 100644 --- a/pkgs/by-name/gi/git-imerge/package.nix +++ b/pkgs/by-name/gi/git-imerge/package.nix @@ -1,20 +1,24 @@ { lib, python3Packages, - fetchPypi, + fetchFromGitHub, installShellFiles, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "git-imerge"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit (finalAttrs) pname version; - sha256 = "df5818f40164b916eb089a004a47e5b8febae2b4471a827e3aaa4ebec3831a3f"; + src = fetchFromGitHub { + owner = "mhagger"; + repo = "git-imerge"; + tag = "v${finalAttrs.version}"; + hash = "sha256-17xUe1N4igx5HOZBU+q7UQxkpHOFQozhR18hUYuPVuo="; }; + build-system = [ python3Packages.setuptools ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix index 7b30aecb3479..635e1cf27b80 100644 --- a/pkgs/by-name/gi/git-mit/package.nix +++ b/pkgs/by-name/gi/git-mit/package.nix @@ -9,7 +9,7 @@ }: let - version = "6.5.2"; + version = "6.5.3"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; tag = "v${version}"; - hash = "sha256-5tVNCvaNxW9Ko+x2GWi3fMpyuwxgjMNLTED6gvxagnI="; + hash = "sha256-vk0TxbvjjFqyisyeet2s3mp7+aPb99Lp0iLU59+pNG0="; }; - cargoHash = "sha256-gSvFdvW+XW0MGFkwAkVrcC1ETjoGaFJxioD9ENEpml4="; + cargoHash = "sha256-54s4Jnc6C6ysQnQ4AyxxghbTVVkud4KrZ9wLZ83OZmQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix index 1229c78825b1..d28573c0448c 100644 --- a/pkgs/by-name/gi/git-repo/package.nix +++ b/pkgs/by-name/gi/git-repo/package.nix @@ -1,9 +1,8 @@ { lib, stdenv, - fetchFromGitHub, + fetchFromGitiles, makeWrapper, - nix-update-script, python3, git, gnupg, @@ -13,13 +12,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "git-repo"; - version = "2.59"; + version = "2.65"; - src = fetchFromGitHub { - owner = "aosp-mirror"; - repo = "tools_repo"; + src = fetchFromGitiles { + url = "https://android.googlesource.com/tools/repo"; rev = "v${finalAttrs.version}"; - hash = "sha256-5ffk5B4ZA/Wy2bQNahFaXPFRSZdKz5t6TaGbN00mfxo="; + hash = "sha256-ToJj5WS74vwCAX53UB5zgy1K54y1gNK+1d4qQLmp1L8="; }; # Fix 'NameError: name 'ssl' is not defined' @@ -57,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = nix-update-script { }; + updateScript = ./update.sh; }; meta = { @@ -70,7 +68,10 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://android.googlesource.com/tools/repo"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ otavio ]; + maintainers = with lib.maintainers; [ + otavio + ungeskriptet + ]; platforms = lib.platforms.unix; mainProgram = "repo"; }; diff --git a/pkgs/by-name/gi/git-repo/update.sh b/pkgs/by-name/gi/git-repo/update.sh new file mode 100755 index 000000000000..3b1531b75b87 --- /dev/null +++ b/pkgs/by-name/gi/git-repo/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts git +set -euo pipefail +latest_tag=$(list-git-tags --url="https://android.googlesource.com/tools/repo" | sort -V | tail -n1) +latest_tag=${latest_tag##v} +cd "$(git rev-parse --show-toplevel)" +update-source-version git-repo "$latest_tag" diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index fa9e5daae8a0..60e201062113 100644 --- a/pkgs/by-name/gi/git-spice/package.nix +++ b/pkgs/by-name/gi/git-spice/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "git-spice"; - version = "0.30.1"; + version = "0.31.0"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${finalAttrs.version}"; - hash = "sha256-zqHTbsK/vIeNKfvIH8funMLD0ehercVkufIYcRZ7VD0="; + hash = "sha256-3VHT9/oCQaySWPAfnZYRxSsKCz8S8As685V3wvpqip8="; }; - vendorHash = "sha256-dCAgnfnwDudTUsQE/RapWslnz/MtefdlzqneRbWrLmc="; + vendorHash = "sha256-xcU0B+ju1f/JfNVKpXkIy5SO9rd3O9Nl0FizW3kVgI0="; subPackages = [ "." ]; @@ -31,7 +31,6 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" - "-w" "-X=main._version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 2d588493d898..bed8e47f0002 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gitu"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; tag = "v${finalAttrs.version}"; - hash = "sha256-rEhAMikMCPtpKz7GAAFxzJYYshtEeeuawgagnD4IJhU="; + hash = "sha256-NpDTXTBHZs5o6HlOfpffOfo1S6Bw/oNxGuvRHzwv2II="; }; - cargoHash = "sha256-LZegPuUOSxg3a7Gl6bNMEvpKlD4BcaYgs3mc5EwIkTE="; + cargoHash = "sha256-brGnoaaXTxGPHCAHh2i4NzUVxHySmT8H2jmC9le2v8Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix index d63cd9f4983d..e3bca0300831 100644 --- a/pkgs/by-name/go/go-judge/package.nix +++ b/pkgs/by-name/go/go-judge/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "go-judge"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "criyle"; repo = "go-judge"; rev = "v${finalAttrs.version}"; - hash = "sha256-JxYdoDSkzb+BM76m+qzdLM31ox9jqCm3LDrjTn6q1/E="; + hash = "sha256-QWLR0bIBgjqh75D0J7KEDjS+6rL5kV+fg01ThO6Cbq0="; }; - vendorHash = "sha256-7DwEATr5AZGXHJXwDxjLpERquXFYm3AYjU/g3v7Xmlw="; + vendorHash = "sha256-i5RiLaALbHQhOSb143kyQQGu2maJIw2VS0JELmxbxM0="; tags = [ "nomsgpack" diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix index 8437a8412a21..4cc79004aea0 100644 --- a/pkgs/by-name/go/goeland/package.nix +++ b/pkgs/by-name/go/goeland/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "goeland"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "slurdge"; repo = "goeland"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-5pUj7KgjvcA7xuKV7j9nLEih4ecrQjarddRVNszidfE="; + sha256 = "sha256-8vhcAzpgYDPHRuvBzeboGO09n+UCSCxNaJuooPnLBjo="; }; vendorHash = "sha256-GOoeyh0ddtYiigavgjMNy8z6suTFtS9oswO9PAdagGE="; diff --git a/pkgs/by-name/go/goldendict-ng/package.nix b/pkgs/by-name/go/goldendict-ng/package.nix index f02b18b6aac3..099427df6359 100644 --- a/pkgs/by-name/go/goldendict-ng/package.nix +++ b/pkgs/by-name/go/goldendict-ng/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goldendict-ng"; - version = "26.6.1"; + version = "26.6.2"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; tag = "v${finalAttrs.version}"; - hash = "sha256-iWKgOgTTkvrnphPhoWxY8ij+ClVVy3G84V+e+XcsoME="; + hash = "sha256-2K0I6uYJtqRw0JbvNbbmIjzxzn6l7tzDU1d9Lo49cYs="; }; strictDeps = true; diff --git a/pkgs/by-name/go/gomplate/package.nix b/pkgs/by-name/go/gomplate/package.nix index 90997669c188..03bc1f9430c0 100644 --- a/pkgs/by-name/go/gomplate/package.nix +++ b/pkgs/by-name/go/gomplate/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "gomplate"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "hairyhenderson"; repo = "gomplate"; tag = "v${finalAttrs.version}"; - hash = "sha256-wgRIwY3MqYbVU/k4BZWqdDcybSJwnCDFQZ6ybr2/tiM="; + hash = "sha256-rkQ8X3gb9McNxXsp5IwRUoesrDN99uo55Njm8LKGeI4="; }; - vendorHash = "sha256-QXaXOEGUW1Wo6kD16nrNOn3MoZuJw8YNuJtGh0ffCgQ="; + vendorHash = "sha256-yy6+mbLy8HpLp6sPjf07S7ufrqLKmjzIA3NoeKUOeIc="; ldflags = [ "-s" diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix index ece809c2b84f..3cd9dc222c69 100644 --- a/pkgs/by-name/gr/grafana-image-renderer/package.nix +++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "grafana-image-renderer"; - version = "5.9.0"; + version = "5.9.1"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; tag = "v${finalAttrs.version}"; - hash = "sha256-nTYdSMNiNg97UEWQgVxi5umFU7XsKXp4QHjeVoo8L9M="; + hash = "sha256-ODH5u7Q+CIJKZQEKz2QswgHm+ZVzmiRmw9GVR47iooI="; }; vendorHash = "sha256-QiseTdsFOBg3aDYpdmLHfXL9eFll6iJo4wSKwXvdGnM="; diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index c9fe9e7f899d..af2cc83f569d 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -76,9 +76,10 @@ let dontConfigure = true; dontBuild = true; - # On Linux the binary is wrapped with buildFHSEnv; completions are - # generated there. Here we only need to skip fixup to avoid patchelf/strip. - dontFixup = stdenv.hostPlatform.isLinux; + # Skip fixup on all platforms: strip discards the vercel/pkg virtual + # filesystem appended to the binary (see the comment below), leaving a + # binary that fails at runtime with "Pkg: Error reading from file." + dontFixup = true; installPhase = '' runHook preInstall @@ -86,7 +87,13 @@ let runHook postInstall ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin shellCompletions; + # gt tries to create ~/.config/graphite/aliases on startup and exits 1 + # with no output when HOME is not writable, which would leave the + # completion files empty. + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + export HOME=$(mktemp -d) + ${shellCompletions} + ''; }; in # The binary is built with vercel/pkg, which appends a virtual filesystem to diff --git a/pkgs/by-name/gr/graphviz/package.nix b/pkgs/by-name/gr/graphviz/package.nix index f5686e0274d3..0ee2c6b0f129 100644 --- a/pkgs/by-name/gr/graphviz/package.nix +++ b/pkgs/by-name/gr/graphviz/package.nix @@ -22,6 +22,7 @@ libxrender, python3, withXorg ? true, + withQuartz ? false, # for passthru.tests exiv2, @@ -75,7 +76,8 @@ stdenv.mkDerivation (finalAttrs: { "--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-include=${libtool}/include" (lib.withFeature withXorg "x") - ]; + ] + ++ optional withQuartz "--with-quartz"; enableParallelBuilding = true; strictDeps = true; diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix index 1444dea0bf22..b5e61a855989 100644 --- a/pkgs/by-name/gr/grcov/package.nix +++ b/pkgs/by-name/gr/grcov/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "grcov"; - version = "0.9.1"; + version = "0.10.7"; src = fetchFromGitHub { owner = "mozilla"; repo = "grcov"; tag = "v${finalAttrs.version}"; - hash = "sha256-e3RQn6wKvVm40UK8ZlgIi2gRS9eEFBnEXdmXtCgv0Go="; + hash = "sha256-64c8byxQDEE9eRS+YAd9BaGSjGm+cl2XTAy3l3Utrws="; }; - cargoHash = "sha256-v4laGVbWmK8WFJXX5ChtViyKyMtmwpehSgNG6F31Mn0="; + cargoHash = "sha256-JTIYfAatMg9L597pRLywgCQmQO9sbuq/En0wNUx8QUo="; # tests do not find grcov path correctly checkFlags = @@ -29,6 +29,10 @@ rustPlatform.buildRustPackage (finalAttrs: { "test_integration_guess_single_file" "test_integration_zip_dir" "test_integration_zip_zip" + "test_llvm_aggregate_profraws" + "test_profdatas_to_lcov" + "test_profraws_to_lcov" + "test_wrong_binary_file" ]; in builtins.map (x: "--skip=" + x) skipList; diff --git a/pkgs/by-name/gr/grpcui/package.nix b/pkgs/by-name/gr/grpcui/package.nix index 8cfb53958822..cfa0c99af2db 100644 --- a/pkgs/by-name/gr/grpcui/package.nix +++ b/pkgs/by-name/gr/grpcui/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "grpcui"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcui"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-mZeNK/NwN887TN4fnvGzrqwJCBYnYcuW/K+O0LgX0uo="; + sha256 = "sha256-qJ8X4l4Efww6fJ1Xr/MXn2Nr7O0zCmDTb0YAWGInVp4="; }; - vendorHash = "sha256-y4OK610q+8m48M/HX3bXNV7YguoOaZKnCw+JnEvqbEI="; + vendorHash = "sha256-S6GeFwxyrlHzsXWz66jrNa+mtoACn7w2oY3M9XjPusk="; doCheck = false; diff --git a/pkgs/by-name/gt/gtg/package.nix b/pkgs/by-name/gt/gtg/package.nix index aa61c9a14c47..42cff6a4fc98 100644 --- a/pkgs/by-name/gt/gtg/package.nix +++ b/pkgs/by-name/gt/gtg/package.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gtg"; - version = "0.6"; + version = "0.6.1"; src = fetchFromGitHub { owner = "getting-things-gnome"; repo = "gtg"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-O8qBD92P2g8QrBdMXa6j0Ozk+W80Ny5yk0KNTy7ekfE="; + sha256 = "sha256-Qojw9mJlPU234ijsCN92Gu/j2CyMVDvFFwzbYSYvMdU="; }; patches = [ diff --git a/pkgs/by-name/ha/hamrs-pro/package.nix b/pkgs/by-name/ha/hamrs-pro/package.nix index d13f584425ce..743efa9d5159 100644 --- a/pkgs/by-name/ha/hamrs-pro/package.nix +++ b/pkgs/by-name/ha/hamrs-pro/package.nix @@ -22,12 +22,6 @@ let url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage"; hash = "sha256-5WUQBFyvMHZyyIH2aImCRUYdzou8BadaH/M4+5DeQdo="; }; - - x86_64-darwin = fetchurl { - url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg"; - hash = "sha256-BboXYdKT10+SBGhlxW5t1zPZ+0BMC1gUjwTlkQU+/Bk="; - }; - aarch64-darwin = fetchurl { url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg"; hash = "sha256-/9UamFxEJ9NkswgsI8mcfher9nFpVt5Vk0QYFpRXRB4="; @@ -51,7 +45,6 @@ let "x86_64-linux" "aarch64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; diff --git a/pkgs/by-name/ha/hamrs-pro/update.sh b/pkgs/by-name/ha/hamrs-pro/update.sh index 7913ced30cbb..a12439b3a10e 100755 --- a/pkgs/by-name/ha/hamrs-pro/update.sh +++ b/pkgs/by-name/ha/hamrs-pro/update.sh @@ -17,7 +17,6 @@ update-source-version hamrs-pro $latestVersion || true for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; hamrs-pro.src.url" --system "$system" | tr -d '"'))) update-source-version hamrs-pro $latestVersion $hash --system=$system --ignore-same-version diff --git a/pkgs/by-name/ha/hamrs/darwin.nix b/pkgs/by-name/ha/hamrs/darwin.nix index fd8f413ba6d8..69e1c40da6fd 100644 --- a/pkgs/by-name/ha/hamrs/darwin.nix +++ b/pkgs/by-name/ha/hamrs/darwin.nix @@ -12,19 +12,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit pname version; - src = - if stdenvNoCC.hostPlatform.isAarch64 then - (fetchurl { - url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${finalAttrs.version}/HAMRS-${finalAttrs.version}.dmg"; - hash = "sha256-IQ7r2OLwJW4auiNDddzZ99jXxrtPw3uYoGIUEHU1gtc="; - }) - else - (fetchurl { - url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${finalAttrs.version}/HAMRS-${finalAttrs.version}-intel.dmg"; - hash = "sha256-bgWeIARE3gO5FA9MqidfXo1Wdn5wDUa/RNzZBxSKloM="; - }); + src = fetchurl { + url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${finalAttrs.version}/HAMRS-${finalAttrs.version}.dmg"; + hash = "sha256-IQ7r2OLwJW4auiNDddzZ99jXxrtPw3uYoGIUEHU1gtc="; + }; - nativeBuildInputs = if stdenvNoCC.hostPlatform.isAarch64 then [ _7zz ] else [ undmg ]; + nativeBuildInputs = [ _7zz ]; sourceRoot = "."; diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix deleted file mode 100644 index 62519c6e81ca..000000000000 --- a/pkgs/by-name/he/heptabase/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - appimageTools, - fetchurl, -}: -let - pname = "heptabase"; - version = "1.87.2"; - src = fetchurl { - url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-6O6ksa0mCUoAfXW8jzh1n7zAfLZTA45va9o6J2ghKgU="; - }; - - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - install -Dm444 ${appimageContents}/project-meta.desktop -T $out/share/applications/heptabase.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/project-meta.png $out/share/icons/hicolor/512x512/apps/${pname}.png - - substituteInPlace $out/share/applications/heptabase.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=heptabase %U' \ - --replace-fail 'Icon=project-meta' 'Icon=${pname}' - - ''; - - meta = { - changelog = "https://github.com/heptameta/project-meta/releases/tag/v${version}"; - description = "Visual note-taking tool for learning complex topics"; - homepage = "https://heptabase.com/"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; - mainProgram = "heptabase"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 0d4a96882331..9068be750cf3 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; - version = "3.15.2"; + version = "3.15.3"; src = fetchurl { # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key. # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28 url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; - hash = "sha256-rT+RruLMz/DTlYSOMv4D6ZCOVt36iqyx42v8ea4XSdM="; + hash = "sha256-/7RLhSHCnxtKxmusjnrfUEweYXzOoKcQO3G9+loBofk="; }; # - HMCL prompts users to download prebuilt Terracotta binary for diff --git a/pkgs/by-name/hy/hyprlax/package.nix b/pkgs/by-name/hy/hyprlax/package.nix index ff07b7a74fe0..268059d7d3a2 100644 --- a/pkgs/by-name/hy/hyprlax/package.nix +++ b/pkgs/by-name/hy/hyprlax/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprlax"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "sandwichfarm"; repo = "hyprlax"; tag = "v${finalAttrs.version}"; - hash = "sha256-dWWpnJtjis4S+PBKpUrWxkrRETUG42fuyuUaWKFwOao="; + hash = "sha256-pI+JEuUOuUh4ZBT4YhIxc6FU3rMwau6qacypDrQG+dg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ia/iamb/package.nix b/pkgs/by-name/ia/iamb/package.nix index 8a15554b29cf..59f21eb62b36 100644 --- a/pkgs/by-name/ia/iamb/package.nix +++ b/pkgs/by-name/ia/iamb/package.nix @@ -6,6 +6,8 @@ writableTmpDirAsHomeHook, versionCheckHook, nix-update-script, + llvmPackages, + stdenv, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -27,8 +29,17 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # TODO: Remove once #536365 reaches this branch + llvmPackages.lld ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # TODO: Remove once #536365 reaches this branch + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + postInstall = '' installManPage $src/docs/iamb.{1,5} install -D $src/docs/iamb.svg -t $out/share/icons/hicolor/scalable/apps diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index ca52815c8e05..d0eab6a75ed9 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -18,16 +18,16 @@ buildNpmPackage rec { pname = "igir"; - version = "5.2.1"; + version = "5.3.0"; src = fetchFromGitHub { owner = "emmercm"; repo = "igir"; rev = "v${version}"; - hash = "sha256-LWdJPweZ0BFIjdXHUZvJuk8oZb8JtuGo3LIJtdwdG70="; + hash = "sha256-qs6CVmBLn23BOjr+d4WZeROFxqKy9vWx8iUVKBicKdk="; }; - npmDepsHash = "sha256-bRZlaRnPY8k2Xahb994GUYlROmR9ZQj2neEPVKDwv4g="; + npmDepsHash = "sha256-ruFssMRX7fzEI7lwEb/a+0lYso9I3CufLK9uVZiuhoU="; # I have no clue why I have to do this postPatch = '' diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 7b9f98853290..0ce61eea2f86 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -23,6 +23,7 @@ nix-update-script, autoPatchelfHook, makeWrapper, + llvmPackages, }: let @@ -61,7 +62,9 @@ stdenv.mkDerivation (finalAttrs: { pkg-config makeWrapper ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; + ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook + # TODO: Remove once #536365 reaches this branch + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld; buildInputs = [ capstone @@ -103,7 +106,13 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_NAME_DIR" "@executable_path/../Frameworks") ]; - env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + env = { + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # TODO: Remove once #536365 reaches this branch + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; # Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application postPatch = '' diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 8012f5db51a7..c0e2725eaa57 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -77,14 +77,14 @@ let # The geodata website is not versioned, so we use the internet archive geodata = let - timestamp = "20260408011516"; + timestamp = "20260710111330"; date = "${lib.substring 0 4 timestamp}-${lib.substring 4 2 timestamp}-${lib.substring 6 2 timestamp}T" + "${lib.substring 8 2 timestamp}:${lib.substring 10 2 timestamp}:${lib.substring 12 2 timestamp}Z"; in runCommand "immich-geodata" { - outputHash = "sha256-WSKaTn54+8ckXPsk3jsOJ4yCsO0jLKf3y+apqwNlHc4="; + outputHash = "sha256-Pf5u+bqzF2x1PECxKwZ6dfGiEj1YMlRejTcTI1amMvU="; outputHashMode = "recursive"; nativeBuildInputs = [ cacert diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix index e4e500e0ecbf..98e384369006 100644 --- a/pkgs/by-name/in/incus-ui-canonical/package.nix +++ b/pkgs/by-name/in/incus-ui-canonical/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + stdenvNoCC, fetchurl, fetchFromGitHub, fetchYarnDeps, @@ -18,16 +18,16 @@ let hash = "sha256-f0vd/Xp/kBbZkg6CBM4cZPlwg5WUL/zv3mCAEmugzCE="; }; in -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "incus-ui-canonical"; - version = "0.21.3"; + version = "0.21.4"; src = fetchFromGitHub { owner = "zabbly"; repo = "incus-ui-canonical"; # only use tags prefixed by incus- they are the tested fork versions tag = "incus-${finalAttrs.version}"; - hash = "sha256-fyeh7KX2Cvo2YmUNnmzeWkTGgGrJHhjbq39AmnwhgAs="; + hash = "sha256-EMf723WZKyVYDpvdmzjdp61rIZVsoj6gRMiMF323K/A="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/by-name/in/infer/package.nix b/pkgs/by-name/in/infer/package.nix new file mode 100644 index 000000000000..938573476336 --- /dev/null +++ b/pkgs/by-name/in/infer/package.nix @@ -0,0 +1,249 @@ +{ + fetchFromGitHub, + lib, + stdenv, + + # nativeBuildInputs + autoconf, + automake, + cmake, + dune_3, + git, + makeWrapper, + ninja, + opam, + pkg-config, + perl, + which, + + # buildInputs + gmp, + mpfr, + ocaml-ng, + sqlite, + zlib, + + # Erlang + beamPackages, + + # Java + jdk, + + # LLVM + python3, + + # Options + withErlang ? true, + withJava ? true, + withLLVM ? true, + withRust ? false, +}: +let + pname = "infer"; + version = "1.3.0"; + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + tag = "v${version}"; + hash = "sha256-Kq7sJVBqe4ei1HbZz8R+P4V6yxisxEmPVHjyVlpL1aw="; + }; + + # Pre-fetched LLVM source that facebook-clang-plugins would normally download + # They specify the version in `facebook-clang-plugins/clang/src/prepare_clang_src.sh` + # Please check that file and update the version as appropriate when updating + llvmSrc = fetchFromGitHub { + owner = "llvm"; + repo = "llvm-project"; + tag = "llvmorg-21.1.6"; + hash = "sha256-mqZLJYDEs6FXAjbSOruR2ATZZxemNMagNG9SMjSWBFE="; + }; + + # We need to use 5.3 because stdcompat (a transitive ocaml dependency) is + # broken on 5.4 + ocamlPackages = ocaml-ng.ocamlPackages_5_3.overrideScope ( + self: super: { + # Newer ppxlib removed a function needed by 0.36 + ppxlib = super.ppxlib.override { version = "0.34.0"; }; + # Infer bundles charon 0.1.177; nixpkgs unstable has a newer incompatible + # version + charon = super.buildDunePackage { + pname = "charon"; + version = "0.1"; + src = "${src}/dependencies/charon"; + propagatedBuildInputs = with self; [ + easy_logging + name_matcher_parser + ppx_deriving + unionFind + visitors + yojson + ]; + }; + } + ); + + erlangDeps = with beamPackages; [ + erlang + rebar3 + ]; + javaDeps = [ jdk ]; +in +stdenv.mkDerivation { + inherit pname src version; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + autoconf + automake + cmake + dune_3 + git + makeWrapper + ninja + opam + pkg-config + perl + which + ] + ++ (with ocamlPackages; [ + atd + atdgen + ocaml + findlib + menhir + ocamlbuild + ]) + ++ lib.optionals withErlang erlangDeps + ++ lib.optionals withJava javaDeps + ++ lib.optional withLLVM python3; + + buildInputs = [ + gmp + mpfr + sqlite + zlib + ] + ++ (with ocamlPackages; [ + ansiterminal + atd + atdgen + base64 + bheap + charon + cmdliner + containers + containers-data + core + ctypes + fmt + fpath + iter + javalib + memtrace + menhirLib + mtime + ocamlgraph + ounit + ounit2 + parmap + ppx_blob + ppx_compare + ppx_enumerate + ppx_expect + ppx_fields_conv + ppx_show + ppx_yojson_conv + ppxlib + pyml + sawja + saturn + sedlex + spawn + ocaml_sqlite3 + tdigest + xmlm + zarith + ]) + ++ lib.optionals withErlang erlangDeps + ++ lib.optionals withJava javaDeps; + + preConfigure = '' + patchShebangs . + + ${lib.optionalString withLLVM + # sh + '' + # Link in the prefetched llvm source + mkdir -p facebook-clang-plugins/clang/src/download + ln -s ${llvmSrc} facebook-clang-plugins/clang/src/download/llvm-project + # Skip the download step in prepare_clang_src.sh + substituteInPlace facebook-clang-plugins/clang/src/prepare_clang_src.sh \ + --replace-fail 'curl -L' 'echo "SKIPPED: curl" #' \ + --replace-fail 'tar xf' 'echo "SKIPPED: tar" #' + + # Runtimes and bindings fail to build, as it tries to build them using its + # newly built clang, but infer seems to work with them disabled. + # Tools are needed because the build requires llvm-config. + substituteInPlace facebook-clang-plugins/clang/setup.sh \ + --replace-fail '-DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind"' '-DLLVM_ENABLE_RUNTIMES=""'\ + --replace-fail '-DLLVM_BUILD_DOCS=Off' '-DLLVM_BUILD_DOCS=Off -DLLVM_ENABLE_BINDINGS=Off' \ + --replace-fail '-DLLVM_BUILD_TOOLS=Off' '-DLLVM_BUILD_TOOLS=On' + '' + } + + # Remove deprecated -j-std atdgen flag, which is removed in current atdgen + find . -name "dune" -exec sed -i 's/-j-std//g' {} + 2>/dev/null || true + + # Use nix-provided context. + substituteInPlace infer/dune-workspace.in \ + --replace-fail '(context (opam (switch @OPAMSWITCH@) (name default) (merlin)))' '(context default)' + + ./autogen.sh + ''; + + dontUseCmakeConfigure = true; + + configureFlags = [ + "--prefix=${placeholder "out"}" + ] + ++ [ + "--disable-hack-analyzers" # No support on nixpkgs as of writing + "--disable-python-analyzers" # Needs python 3.10, which is not in nixpkgs + "--disable-swift-analyzers" # Does not want to build with the current package + ] + ++ lib.optional (!withErlang) "--disable-erlang-analyzers" + ++ lib.optional (!withJava) "--disable-java-analyzers" + ++ lib.optional (!withLLVM) "--disable-c-analyzers" + ++ lib.optional withRust "--enable-rust-analyzers"; + + buildFlags = [ + # This cuts the build time in half + "CFLAGS=-O2" + "CXXFLAGS=-O2" + # Prevent ocaml warnings 11 and 55 from crashing the build + "OCAMLPARAM=_,w=-11-55" + ]; + + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + + postInstall = + let + runtimeDeps = lib.optionals withErlang erlangDeps ++ lib.optionals withJava javaDeps; + in + lib.optionalString (runtimeDeps != [ ]) '' + wrapProgram "$out/bin/infer" \ + --prefix PATH : "${lib.makeBinPath runtimeDeps}" + ''; + + meta = { + description = "Facebook's static analysis tool for Java, C++, Objective-C, and C."; + homepage = "https://fbinfer.com/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.kacper-uminski ]; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + mainProgram = "infer"; + }; +} diff --git a/pkgs/by-name/in/inmarsatc/package.nix b/pkgs/by-name/in/inmarsatc/package.nix new file mode 100644 index 000000000000..c1ff54c4e6b3 --- /dev/null +++ b/pkgs/by-name/in/inmarsatc/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation { + pname = "inmarsatc"; + version = "0-unstable-2023-07-10"; + + src = fetchFromGitHub { + owner = "cropinghigh"; + repo = "inmarsatc"; + rev = "cda1242e79981d71cd8608e971c8dbc691942b10"; + hash = "sha256-UCmdHR9bSr1x4G0OP7n+o6pdS1thTl9hzH7YMykSiGw="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "C++ library with functions to receive Inmarsat-C signals"; + homepage = "https://github.com/cropinghigh/inmarsatc"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.nekowinston ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/in/inngest/package.nix b/pkgs/by-name/in/inngest/package.nix index f71572ad50b6..29db5cfa0bf7 100644 --- a/pkgs/by-name/in/inngest/package.nix +++ b/pkgs/by-name/in/inngest/package.nix @@ -10,14 +10,14 @@ testers, }: let - version = "1.34.0"; + version = "1.36.0"; websiteRev = "159c0ac611e85ec85ffe0a8c8bf2c4a0330bdb38"; src = fetchFromGitHub { owner = "inngest"; repo = "inngest"; tag = "v${version}"; - hash = "sha256-DMJEhgKj2glNtJmsLc3oyDZr5H/COFLrcogcgaYiLjU="; + hash = "sha256-KyH9Bj3n7RwARDcb3l5nerYGIIk2mgXPZWLhyNMm+f0="; }; website = fetchFromGitHub { diff --git a/pkgs/by-name/in/insomnia/package.nix b/pkgs/by-name/in/insomnia/package.nix index ae533545be65..002582e024f1 100644 --- a/pkgs/by-name/in/insomnia/package.nix +++ b/pkgs/by-name/in/insomnia/package.nix @@ -7,22 +7,22 @@ }: let pname = "insomnia"; - version = "12.2.0"; + version = "13.0.0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-ISQVIhR5TWY/Xk6sXeL89/srxppqBS7wdoRINwuoQqg="; + hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4="; }; x86_64-darwin = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-ISQVIhR5TWY/Xk6sXeL89/srxppqBS7wdoRINwuoQqg="; + hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4="; }; x86_64-linux = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage"; - hash = "sha256-/0fJmbXhjrcVVSFvxd847mSKrzrZRK3Sqi6rjyaBOUw="; + hash = "sha256-PlcKBQnkmgU/SsLRKX7ohrGHm7B4hK9FMkplwlbFolI="; }; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/by-name/ip/ip2unix/package.nix b/pkgs/by-name/ip/ip2unix/package.nix index 78f9d591a9eb..5476d8ad43e7 100644 --- a/pkgs/by-name/ip/ip2unix/package.nix +++ b/pkgs/by-name/ip/ip2unix/package.nix @@ -2,13 +2,12 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, meson, ninja, pkg-config, yaml-cpp, systemd, - python3Packages, + python313Packages, asciidoc, libxslt, docbook_xml_dtd_45, @@ -39,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { docbook_xsl libxml2.bin docbook5 - python3Packages.pytest - python3Packages.pytest-timeout + python313Packages.pytest + python313Packages.pytest-timeout systemd ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; diff --git a/pkgs/by-name/is/isolate/package.nix b/pkgs/by-name/is/isolate/package.nix index 69891ad0a845..f06812ddb73d 100644 --- a/pkgs/by-name/is/isolate/package.nix +++ b/pkgs/by-name/is/isolate/package.nix @@ -8,17 +8,18 @@ systemdLibs, installShellFiles, nixosTests, + libseccomp, }: stdenv.mkDerivation (finalAttrs: { pname = "isolate"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "ioi"; repo = "isolate"; rev = "v${finalAttrs.version}"; - hash = "sha256-z/23k6F9XHbJDFld9tjIafUZzbUDEWAnbLvAoaEAilQ="; + hash = "sha256-a6FQxyClE9cXB0wHV0Z4kjYY6S1+mUE4ReroOifNjKg="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libcap.dev systemdLibs.dev + libseccomp ]; patches = [ diff --git a/pkgs/by-name/it/itsycal/0001-Allow-running-from-the-Nix-store.patch b/pkgs/by-name/it/itsycal/0001-Allow-running-from-the-Nix-store.patch new file mode 100644 index 000000000000..dc11f42f160d --- /dev/null +++ b/pkgs/by-name/it/itsycal/0001-Allow-running-from-the-Nix-store.patch @@ -0,0 +1,29 @@ +From 9ce5e368c00ed887f6d2628d4e8eff664bff5522 Mon Sep 17 00:00:00 2001 +From: 4evy +Date: Sat, 11 Jul 2026 01:12:36 +0300 +Subject: [PATCH 1/4] Allow running from the Nix store + +Upstream normally requires the bundle to live in /Applications because its +Sparkle updater needs a stable, writable installation path. Nix applications +instead live in the immutable Nix store and are updated by Nix. + +Use upstream's existing kAllowOutsideApplicationsFolder escape hatch as the +registered default. This preserves upstream's check and keeps the downstream +change to one explicit policy setting. +--- + Itsycal/AppDelegate.m | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Itsycal/AppDelegate.m b/Itsycal/AppDelegate.m +index 5cc187a..ee256d9 100644 +--- a/Itsycal/AppDelegate.m ++++ b/Itsycal/AppDelegate.m +@@ -42,6 +42,8 @@ + kThemePreference: @0, // System=0, Light=1, Dark=2 + kHideIcon: @(NO), + kShowLocation: @(NO), ++ // Nix installs the app in the immutable Nix store, not /Applications. ++ kAllowOutsideApplicationsFolder: @(YES), + kEnableTahoeMenuIcons: @(NO), + kDoNotDrawOutlineAroundCurrentMonth: @(NO) + }]; diff --git a/pkgs/by-name/it/itsycal/0002-Remove-self-update-controls-for-Nix-builds.patch b/pkgs/by-name/it/itsycal/0002-Remove-self-update-controls-for-Nix-builds.patch new file mode 100644 index 000000000000..de244f092ff6 --- /dev/null +++ b/pkgs/by-name/it/itsycal/0002-Remove-self-update-controls-for-Nix-builds.patch @@ -0,0 +1,124 @@ +From f1474c9b296a3fbef30ca577dbd9a92224290b97 Mon Sep 17 00:00:00 2001 +From: 4evy +Date: Sat, 11 Jul 2026 01:12:47 +0300 +Subject: [PATCH 2/4] Remove self-update controls for Nix builds + +Sparkle cannot replace an application inside the immutable Nix store. Leaving +its menu item and preference checkbox backed by a no-op stub is misleading. + +Remove the updater object, imports, controls, action, and matching Tahoe menu +symbol so the Nix build has no Sparkle runtime dependency or non-functional +update UI. +--- + Itsycal/Base.lproj/MainMenu.xib | 1 - + Itsycal/PrefsGeneralVC.m | 11 ++--------- + Itsycal/ViewController.m | 9 --------- + 3 files changed, 2 insertions(+), 19 deletions(-) + +diff --git a/Itsycal/Base.lproj/MainMenu.xib b/Itsycal/Base.lproj/MainMenu.xib +index aa2067e..1a25048 100644 +--- a/Itsycal/Base.lproj/MainMenu.xib ++++ b/Itsycal/Base.lproj/MainMenu.xib +@@ -89,6 +89,5 @@ + + + +- + + +diff --git a/Itsycal/PrefsGeneralVC.m b/Itsycal/PrefsGeneralVC.m +index 7c19942..86f6be0 100644 +--- a/Itsycal/PrefsGeneralVC.m ++++ b/Itsycal/PrefsGeneralVC.m +@@ -9,7 +9,6 @@ + #import "MoVFLHelper.h" + #import "EventCenter.h" + #import "MASShortcut/Shortcut.h" +-#import "Sparkle/SUUpdater.h" + + static NSString * const kSourceCellId = @"SourceCell"; + static NSString * const kCalendarCellId = @"CalendarCell"; +@@ -33,7 +32,6 @@ static NSString * const kCalendarCellId = @"CalendarCell"; + { + NSTextField *_title; + NSButton *_login; +- NSButton *_checkUpdates; + NSButton *_beepBeep; + NSPopUpButton *_firstDayPopup; + NSTableView *_calendarsTV; +@@ -66,7 +64,6 @@ static NSString * const kCalendarCellId = @"CalendarCell"; + // Checkboxes + _login = chkbx(NSLocalizedString(@"Launch at login", @"")); + _login.action = @selector(launchAtLogin:); +- _checkUpdates = chkbx(NSLocalizedString(@"Automatically check for updates", @"")); + _beepBeep = chkbx(NSLocalizedString(@"Beep beep on the hour", @"")); + + // First day of week label +@@ -130,10 +127,9 @@ static NSString * const kCalendarCellId = @"CalendarCell"; + NSLocalizedString(@"31 days", @"")]]; + [v addSubview:_agendaDaysPopup]; + +- MoVFLHelper *vfl = [[MoVFLHelper alloc] initWithSuperview:v metrics:@{@"m": @20} views:NSDictionaryOfVariableBindings(_login, _checkUpdates, _beepBeep, firstDayLabel, _firstDayPopup, shortcutLabel, shortcutView, tvContainer, agendaDaysLabel, _agendaDaysPopup)]; +- [vfl :@"V:|-m-[_login]-[_checkUpdates]-[_beepBeep]-20-[_firstDayPopup]-20-[shortcutLabel]-3-[shortcutView(25)]-20-[tvContainer(170)]-[_agendaDaysPopup]-m-|"]; ++ MoVFLHelper *vfl = [[MoVFLHelper alloc] initWithSuperview:v metrics:@{@"m": @20} views:NSDictionaryOfVariableBindings(_login, _beepBeep, firstDayLabel, _firstDayPopup, shortcutLabel, shortcutView, tvContainer, agendaDaysLabel, _agendaDaysPopup)]; ++ [vfl :@"V:|-m-[_login]-[_beepBeep]-20-[_firstDayPopup]-20-[shortcutLabel]-3-[shortcutView(25)]-20-[tvContainer(170)]-[_agendaDaysPopup]-m-|"]; + [vfl :@"H:|-m-[_login]-(>=m)-|"]; +- [vfl :@"H:|-m-[_checkUpdates]-(>=m)-|"]; + [vfl :@"H:|-m-[_beepBeep]-(>=m)-|"]; + [vfl :@"H:|-m-[firstDayLabel]-[_firstDayPopup]-(>=m)-|" :NSLayoutFormatAlignAllFirstBaseline]; + [vfl :@"H:|-(>=m)-[shortcutLabel]-(>=m)-|"]; +@@ -144,9 +140,6 @@ static NSString * const kCalendarCellId = @"CalendarCell"; + // Center shortcutLabel + [v addConstraint:[NSLayoutConstraint constraintWithItem:shortcutLabel attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:v attribute:NSLayoutAttributeCenterX multiplier:1 constant:0]]; + +- // Binding for Sparkle automatic update checks +- [_checkUpdates bind:@"value" toObject:[SUUpdater sharedUpdater] withKeyPath:@"automaticallyChecksForUpdates" options:@{NSContinuouslyUpdatesValueBindingOption: @(YES)}]; +- + // Binding for hourly beep + [_beepBeep bind:@"value" toObject:[NSUserDefaultsController sharedUserDefaultsController] withKeyPath:[@"values." stringByAppendingString:kBeepBeepOnTheHour] options:@{NSContinuouslyUpdatesValueBindingOption: @(YES)}]; + +diff --git a/Itsycal/ViewController.m b/Itsycal/ViewController.m +index 1d55c4f..0bd303b 100644 +--- a/Itsycal/ViewController.m ++++ b/Itsycal/ViewController.m +@@ -21,7 +21,6 @@ + #import "MoButton.h" + #import "MoVFLHelper.h" + #import "MoUtils.h" +-#import "Sparkle/SUUpdater.h" + + @implementation ViewController + { +@@ -378,7 +377,6 @@ + NSInteger i = 0; + + [optMenu insertItemWithTitle:NSLocalizedString(@"About Itsycal", @"") action:@selector(showAbout:) keyEquivalent:@"" atIndex:i++]; +- [optMenu insertItemWithTitle:NSLocalizedString(@"Check for Updates…", @"") action:@selector(checkForUpdates:) keyEquivalent:@"" atIndex:i++]; + [optMenu insertItem:[NSMenuItem separatorItem] atIndex:i++]; + [optMenu insertItemWithTitle:NSLocalizedString(@"Go to Date…", @"") action:@selector(showDatePickerPopover:) keyEquivalent:@"T" atIndex:i++]; + [optMenu insertItem:[NSMenuItem separatorItem] atIndex:i++]; +@@ -394,7 +392,6 @@ + NSInteger index = 0; + NSArray *symbolNames = @[ + @"info.circle", +- @"arrow.trianglehead.2.clockwise", + @"21.calendar", + @"gear", + @"calendar.badge.clock", +@@ -462,11 +459,6 @@ + [self.prefsWC showWindow:self]; + } + +-- (void)checkForUpdates:(id)sender +-{ +- [[SUUpdater sharedUpdater] checkForUpdates:self]; +-} +- + - (void)openDateAndTimePrefs:(id)sender + { + NSURL *url = nil; +@@ -1514,4 +1506,3 @@ + } + + @end +- diff --git a/pkgs/by-name/it/itsycal/0003-Use-modern-ServiceManagement-login-items.patch b/pkgs/by-name/it/itsycal/0003-Use-modern-ServiceManagement-login-items.patch new file mode 100644 index 000000000000..44a67ce1d791 --- /dev/null +++ b/pkgs/by-name/it/itsycal/0003-Use-modern-ServiceManagement-login-items.patch @@ -0,0 +1,116 @@ +From d3d2dd9ce8b566496503c38158199432a5ae87bb Mon Sep 17 00:00:00 2001 +From: 4evy +Date: Sat, 11 Jul 2026 01:12:47 +0300 +Subject: [PATCH 3/4] Use modern ServiceManagement login items + +LSSharedFileList was deprecated in macOS 10.11 and its status lookup can fail +when disconnected network volumes are present. Nixpkgs now targets macOS 14, +so no legacy fallback is needed. + +Use SMAppService.mainAppService, available since macOS 13. Treat +RequiresApproval as registered so users can still turn the pending login item +off. The package signs the complete app bundle after fixup, as required by +ServiceManagement. +--- + Itsycal/MoLoginItem.m | 58 +++++++--------------------------------- + Itsycal/PrefsGeneralVC.m | 12 +-------- + 2 files changed, 11 insertions(+), 59 deletions(-) + +diff --git a/Itsycal/MoLoginItem.m b/Itsycal/MoLoginItem.m +index 7efa602..0dc4960 100644 +--- a/Itsycal/MoLoginItem.m ++++ b/Itsycal/MoLoginItem.m +@@ -4,60 +4,22 @@ + // + + #import "MoLoginItem.h" +- +-// LSSharedFileList API was deprecated in macOS 10.11 +-#pragma clang diagnostic push +-#pragma clang diagnostic ignored "-Wdeprecated-declarations" ++#import + + BOOL MOIsLoginItemEnabled(void) + { +- BOOL isEnabled = NO; +- NSString *appPath = [[NSBundle mainBundle] bundlePath]; +- LSSharedFileListRef loginItemsRef = LSSharedFileListCreate(NULL, kLSSharedFileListSessionLoginItems, NULL); +- +- if (loginItemsRef) { +- UInt32 seedValue; +- NSArray *loginItems = CFBridgingRelease(LSSharedFileListCopySnapshot(loginItemsRef, &seedValue)); +- for (id item in loginItems) { +- LSSharedFileListItemRef itemRef = (__bridge LSSharedFileListItemRef)item; +- NSURL *pathURL = CFBridgingRelease(LSSharedFileListItemCopyResolvedURL(itemRef, 0, NULL)); +- if (pathURL && [pathURL.path hasPrefix:appPath]) { +- isEnabled = YES; +- break; +- } +- } +- CFRelease(loginItemsRef); +- } +- return isEnabled; ++ SMAppServiceStatus status = SMAppService.mainAppService.status; ++ return status == SMAppServiceStatusEnabled || status == SMAppServiceStatusRequiresApproval; + } + + void MOEnableLoginItem(BOOL enable) + { +- NSString *appPath = [[NSBundle mainBundle] bundlePath]; +- LSSharedFileListRef loginItemsRef = LSSharedFileListCreate(NULL, kLSSharedFileListSessionLoginItems, NULL); +- +- if (loginItemsRef) { +- if (enable) { +- // We call LSSharedFileListInsertItemURL to insert the item at the bottom of Login Items list. +- CFURLRef url = (__bridge CFURLRef)[NSURL fileURLWithPath:appPath]; +- LSSharedFileListItemRef item = LSSharedFileListInsertItemURL(loginItemsRef, kLSSharedFileListItemLast, NULL, NULL, url, NULL, NULL); +- if (item != NULL) CFRelease(item); +- } +- else { +- // Grab the contents of the shared file list (LSSharedFileListItemRef objects) +- // and pop it in an array so we can iterate through it to find our item. +- UInt32 seedValue; +- NSArray *loginItems = CFBridgingRelease(LSSharedFileListCopySnapshot(loginItemsRef, &seedValue)); +- for (id item in loginItems) { +- LSSharedFileListItemRef itemRef = (__bridge LSSharedFileListItemRef)item; +- NSURL *pathURL = CFBridgingRelease(LSSharedFileListItemCopyResolvedURL(itemRef, 0, NULL)); +- if (pathURL && [pathURL.path hasPrefix:appPath]) { +- LSSharedFileListItemRemove(loginItemsRef, itemRef); // Deleting the item +- } +- } +- } +- CFRelease(loginItemsRef); ++ SMAppService *service = SMAppService.mainAppService; ++ NSError *error = nil; ++ BOOL succeeded = enable ++ ? [service registerAndReturnError:&error] ++ : [service unregisterAndReturnError:&error]; ++ if (!succeeded) { ++ NSLog(@"Unable to %@ launch at login: %@", enable ? @"enable" : @"disable", error); + } + } +- +-#pragma clang diagnostic pop +diff --git a/Itsycal/PrefsGeneralVC.m b/Itsycal/PrefsGeneralVC.m +index 86f6be0..ecfd30d 100644 +--- a/Itsycal/PrefsGeneralVC.m ++++ b/Itsycal/PrefsGeneralVC.m +@@ -158,17 +158,7 @@ static NSString * const kCalendarCellId = @"CalendarCell"; + + _sourcesAndCalendars = [self.ec sourcesAndCalendars]; + +- // The API used to check the login item's state (LSSharedFileList) causes +- // errors for users who have network drives but are not connected to their +- // network (github.com/sfsam/Itsycal/issues/15). Give them an option to +- // disable this check. +- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DoNotCheckLoginItemStatus"] == NO) { +- _login.hidden = NO; +- _login.state = MOIsLoginItemEnabled() ? NSControlStateValueOn : NSControlStateValueOff; +- } +- else { +- _login.hidden = YES; +- } ++ _login.state = MOIsLoginItemEnabled() ? NSControlStateValueOn : NSControlStateValueOff; + + _calendarsTV.enabled = self.ec.calendarAccessGranted; + _agendaDaysPopup.enabled = self.ec.calendarAccessGranted; diff --git a/pkgs/by-name/it/itsycal/0004-Use-APIs-available-on-the-Nixpkgs-macOS-baseline.patch b/pkgs/by-name/it/itsycal/0004-Use-APIs-available-on-the-Nixpkgs-macOS-baseline.patch new file mode 100644 index 000000000000..21cd84f9f0e2 --- /dev/null +++ b/pkgs/by-name/it/itsycal/0004-Use-APIs-available-on-the-Nixpkgs-macOS-baseline.patch @@ -0,0 +1,90 @@ +From 6fb6ac13a8deee492449442e1ab3d7429aa9fff8 Mon Sep 17 00:00:00 2001 +From: 4evy +Date: Sat, 11 Jul 2026 01:12:55 +0300 +Subject: [PATCH 4/4] Use APIs available on the Nixpkgs macOS baseline + +The package metadata and Mach-O deployment target are both macOS 14. Remove +compatibility branches for older systems and use the corresponding current +APIs: + +* request EventKit full access directly; +* discover the calendar handler through NSWorkspace and + UniformTypeIdentifiers; +* use the renamed CoreAudio main-element constant. +--- + Itsycal/EventCenter.m | 20 ++------------------ + Itsycal/ViewController.m | 9 ++++----- + 2 files changed, 6 insertions(+), 23 deletions(-) + +diff --git a/Itsycal/EventCenter.m b/Itsycal/EventCenter.m +index 148c631..3862630 100644 +--- a/Itsycal/EventCenter.m ++++ b/Itsycal/EventCenter.m +@@ -59,15 +59,7 @@ static NSString *kSelectedCalendars = @"SelectedCalendars"; + _queueIsol = dispatch_queue_create("com.mowglii.Itsycal.queueIsol", DISPATCH_QUEUE_SERIAL); + _queueIsol2 = dispatch_queue_create("com.mowglii.Itsycal.queueIsol2", DISPATCH_QUEUE_SERIAL); + _store = [EKEventStore new]; +-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 140000 +- if (@available(macOS 14.0, *)) { +- [_store requestFullAccessToEventsWithCompletion:requestCompletionHandler]; +- } else { +- [_store requestAccessToEntityType:EKEntityTypeEvent completion:requestCompletionHandler]; +- } +-#else +- [_store requestAccessToEntityType:EKEntityTypeEvent completion:requestCompletionHandler]; +-#endif ++ [_store requestFullAccessToEventsWithCompletion:requestCompletionHandler]; + + // Refetch everything when the event store has changed. + __weak __typeof(self) weakSelf = self; +@@ -85,15 +77,7 @@ static NSString *kSelectedCalendars = @"SelectedCalendars"; + #pragma mark - Public (main thread) + + - (BOOL)calendarAccessGranted { +-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 140000 +- if (@available(macOS 14.0, *)) { +- return [EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent] == EKAuthorizationStatusFullAccess; +- } else { +- return [EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent] == EKAuthorizationStatusAuthorized; +- } +-#else +- return [EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent] == EKAuthorizationStatusAuthorized; +-#endif ++ return [EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent] == EKAuthorizationStatusFullAccess; + } + + - (NSString *)defaultCalendarIdentifier { +diff --git a/Itsycal/ViewController.m b/Itsycal/ViewController.m +index 0bd303b..a887682 100644 +--- a/Itsycal/ViewController.m ++++ b/Itsycal/ViewController.m +@@ -21,6 +21,7 @@ + #import "MoButton.h" + #import "MoVFLHelper.h" + #import "MoUtils.h" ++#import + + @implementation ViewController + { +@@ -319,10 +320,8 @@ + // Determine the default calendar app. + // See: support.busymac.com/help/21535-busycal-url-handler + +- CFStringRef strRef = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, CFSTR("ics"), kUTTypeData); +- CFStringRef bundleID = LSCopyDefaultRoleHandlerForContentType(strRef, kLSRolesEditor); +- CFRelease(strRef); +- NSString *defaultCalendarAppBundleID = CFBridgingRelease(bundleID); ++ NSURL *defaultCalendarAppURL = [NSWorkspace.sharedWorkspace URLForApplicationToOpenContentType:UTTypeCalendarEvent]; ++ NSString *defaultCalendarAppBundleID = [NSBundle bundleWithURL:defaultCalendarAppURL].bundleIdentifier; + + // Use URL scheme to open BusyCal or Fantastical2 on the + // date selected in our calendar. +@@ -1263,7 +1262,7 @@ + AudioObjectPropertyAddress propertyAddress; + propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice; + propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; +- propertyAddress.mElement = kAudioObjectPropertyElementMaster; ++ propertyAddress.mElement = kAudioObjectPropertyElementMain; + + OSStatus result = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, &deviceID); + diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix index 18542c37f049..78b7fcb4bd51 100644 --- a/pkgs/by-name/it/itsycal/package.nix +++ b/pkgs/by-name/it/itsycal/package.nix @@ -1,42 +1,240 @@ { lib, - fetchzip, - stdenvNoCC, + stdenv, + fetchFromGitHub, + actool, + ibtool, + lld, + makeWrapper, + rcodesign, + re-plistbuddy, + nix-update-script, }: -stdenvNoCC.mkDerivation (finalAttrs: { +let + # Upstream ships MASShortcut only as a prebuilt framework. Build the + # maintained Rectangle fork instead; it adds F20 and macOS Tahoe fixes while + # retaining the API and bundle identity used by Itsycal. + masShortcutSrc = fetchFromGitHub { + owner = "rxhanson"; + repo = "MASShortcut"; + rev = "2f9fbb3f959b7a683c6faaf9638d22afad37a235"; + hash = "sha256-EZLt7ph24L1wwFEMlltuPutId09RBug/y9OtDhixIig="; + }; + + masShortcutSources = [ + "Model/MASShortcut.m" + "Model/MASShortcutValidator.m" + "Monitoring/MASHotKey.m" + "Monitoring/MASShortcutMonitor.m" + "UI/MASLocalization.m" + "UI/MASShortcutView.m" + "UI/MASShortcutView+Bindings.m" + "UI/MASShortcutViewButtonCell.m" + "User Defaults Storage/MASDictionaryTransformer.m" + "User Defaults Storage/MASShortcutBinder.m" + ]; + + masShortcutInfoPlist = lib.generators.toPlist { escape = true; } { + CFBundleDevelopmentRegion = "English"; + CFBundleExecutable = "MASShortcut"; + CFBundleIdentifier = "com.github.shpakovski.MASShortcut"; + CFBundleInfoDictionaryVersion = "6.0"; + CFBundleName = "MASShortcut"; + CFBundlePackageType = "FMWK"; + CFBundleShortVersionString = "2.4.0"; + CFBundleVersion = "2.4.0"; + NSHumanReadableCopyright = "Copyright © Vadim Shpakovski. All rights reserved."; + }; +in +stdenv.mkDerivation (finalAttrs: { pname = "itsycal"; version = "0.15.12"; - src = fetchzip { - url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip"; - hash = "sha256-2Xu1ZQnNl0o2/AYOIjxZPDnc0TxMXrqKej7CCZEVV9I="; - stripRoot = false; + src = fetchFromGitHub { + owner = "sfsam"; + repo = "Itsycal"; + tag = finalAttrs.version; + hash = "sha256-K25oG8d+OauNHLkatLLskfcWCqOmM2WEw2Ygd3v1uqE="; }; + patches = [ + # Use upstream's hidden escape hatch for installations outside /Applications. + ./0001-Allow-running-from-the-Nix-store.patch + # Nix owns updates, so remove the otherwise non-functional Sparkle UI. + ./0002-Remove-self-update-controls-for-Nix-builds.patch + # Replace the deprecated LSSharedFileList implementation with SMAppService. + ./0003-Use-modern-ServiceManagement-login-items.patch + # The Nixpkgs Darwin baseline is macOS 14; use its non-deprecated APIs. + ./0004-Use-APIs-available-on-the-Nixpkgs-macOS-baseline.patch + ]; + + strictDeps = true; + + nativeBuildInputs = [ + actool + ibtool + lld + makeWrapper + rcodesign + re-plistbuddy + ]; + + # The classic open-source ld64 crashes while linking MASShortcut on arm64. + # Keep lld until the cctools linker can link this framework reliably. + env.NIX_CFLAGS_LINK = "-fuse-ld=lld"; + + dontConfigure = true; + + postPatch = '' + # Both upstream frameworks contain native code. MASShortcut is rebuilt + # below and Sparkle is removed by patch 0002, so make accidental reuse fail. + rm -rf Itsycal/_frameworks + ''; + + buildPhase = '' + runHook preBuild + + buildDir="$PWD/build" + mkdir -p "$buildDir/module-cache" + + # actool accepts one catalog, while upstream keeps images and colors in + # separate catalogs. Merge them without changing their contents. + cp -R Itsycal/Images.xcassets "$buildDir/Assets.xcassets" + cp -R Itsycal/Colors.xcassets/*.colorset "$buildDir/Assets.xcassets/" + + # Compile .m -> .o; flags before --, sources after. Sets _objects array + compile_objc() { + local prefix="$1"; shift + local -a flags=() + while [[ "$1" != "--" ]]; do flags+=("$1"); shift; done; shift + _objects=() + for src in "$@"; do + local obj="$buildDir/''${prefix}_$(basename "$src" .m).o" + clang -fobjc-arc "''${flags[@]}" -c "$src" -o "$obj" + _objects+=("$obj") + done + } + + link_dylib() { + local name="$1"; shift + clang -dynamiclib -fobjc-arc \ + -install_name "@rpath/$name.framework/$name" "$@" + } + + # Build MASShortcut as a real framework. The explicit source list avoids + # pulling its demo or test targets into the application. + masHeaders="$buildDir/MAS_headers/MASShortcut" + mkdir -p "$masHeaders" + cp ${masShortcutSrc}/Framework/include/*.h "$masHeaders/" + + masSources=( ${ + lib.escapeShellArgs (map (src: "${masShortcutSrc}/Framework/${src}") masShortcutSources) + } ) + compile_objc mas -fmodules -fmodules-cache-path="$buildDir/module-cache" \ + -I"$masHeaders" -include AppKit/AppKit.h -- "''${masSources[@]}" + link_dylib MASShortcut -framework AppKit -framework Carbon \ + -compatibility_version 1 -current_version 2.4.0 \ + -o "$buildDir/MASShortcut.dylib" "''${_objects[@]}" + + # Itsycal + compile_objc app -fmodules -fmodules-cache-path="$buildDir/module-cache" \ + -I"$buildDir/MAS_headers" -IItsycal -- Itsycal/*.m + clang -fobjc-arc \ + -framework AppKit -framework EventKit -framework ScriptingBridge \ + -framework Carbon -framework ServiceManagement -framework UniformTypeIdentifiers \ + -Wl,-rpath,@executable_path/../Frameworks \ + "$buildDir/MASShortcut.dylib" \ + -o "$buildDir/Itsycal" "''${_objects[@]}" + + runHook postBuild + ''; + installPhase = '' runHook preInstall - mkdir -p "$out/Applications" - cp -R Itsycal.app "$out/Applications/" + appDir="$out/Applications/Itsycal.app/Contents" + mkdir -p "$appDir"/{MacOS,Frameworks,Resources} + + cp "$buildDir/Itsycal" "$appDir/MacOS/Itsycal" + + # Assemble the framework bundle metadata normally generated by Xcode. + mkdir -p "$appDir/Frameworks/MASShortcut.framework/Resources" + cp "$buildDir/MASShortcut.dylib" "$appDir/Frameworks/MASShortcut.framework/MASShortcut" + cp -r ${masShortcutSrc}/Framework/Resources/*.lproj "$appDir/Frameworks/MASShortcut.framework/Resources/" + printf '%s' ${lib.escapeShellArg masShortcutInfoPlist} \ + > "$appDir/Frameworks/MASShortcut.framework/Resources/Info.plist" + + # Resources + ibtool --compile "$appDir/Resources/MainMenu.nib" Itsycal/Base.lproj/MainMenu.xib + actool --compile "$appDir/Resources" \ + --platform macosx \ + --minimum-deployment-target ${stdenv.hostPlatform.darwinMinVersion} \ + --app-icon AppIcon \ + --output-partial-info-plist "$buildDir/asset-info.plist" \ + "$buildDir/Assets.xcassets" + cp Itsycal/beep.mp3 "$appDir/Resources/" + mkdir -p "$appDir/Resources/Fonts" + cp Itsycal/_fonts/Mow.otf "$appDir/Resources/Fonts/" + for lproj in Itsycal/*.lproj; do + mkdir -p "$appDir/Resources/$(basename "$lproj")" + cp "$lproj"/*.strings "$appDir/Resources/$(basename "$lproj")/" 2>/dev/null || true + done + + # Resolve the Xcode variables in upstream's plist. Keeping that plist as + # the source of truth means new privacy and bundle metadata is preserved. + bundleVersion=$(sed -n 's/.*CURRENT_PROJECT_VERSION = \([0-9]*\);/\1/p' \ + Itsycal.xcodeproj/project.pbxproj | head -1) + cp Itsycal/Info.plist "$appDir/Info.plist" + substituteInPlace "$appDir/Info.plist" \ + --replace-fail '$(EXECUTABLE_NAME)' 'Itsycal' \ + --replace-fail '$(PRODUCT_BUNDLE_IDENTIFIER)' 'com.mowglii.ItsycalApp' \ + --replace-fail '$(PRODUCT_NAME)' 'Itsycal' \ + --replace-fail '$(MARKETING_VERSION)' '${finalAttrs.version}' \ + --replace-fail '$(CURRENT_PROJECT_VERSION)' "$bundleVersion" \ + --replace-fail '$(MACOSX_DEPLOYMENT_TARGET)' '${stdenv.hostPlatform.darwinMinVersion}' + + # Merge actool's icon metadata and remove the Sparkle configuration that + # no longer has a consumer in this immutable Nix build. + PlistBuddy -c 'Set :CFBundleIconFile AppIcon' \ + -c 'Add :CFBundleIconName string AppIcon' \ + -c 'Delete :SUAllowsAutomaticUpdates' \ + -c 'Delete :SUEnableAutomaticChecks' \ + -c 'Delete :SUFeedURL' \ + -c 'Delete :SUPublicEDKey' \ + -c 'Delete :SUScheduledCheckInterval' \ + "$appDir/Info.plist" + + makeWrapper "$out/Applications/Itsycal.app/Contents/MacOS/Itsycal" "$out/bin/itsycal" runHook postInstall ''; - passthru = { - updateScript = ./update.sh; + # Signing only Mach-O files leaves app resources unsealed. Sign the complete + # bundle after fixup so ServiceManagement accepts it and nested code verifies. + postFixup = '' + rcodesign sign "$out/Applications/Itsycal.app" + ''; + + passthru.updateScript = nix-update-script { + # Ignore upstream's non-version "help" tag. + extraArgs = [ "--version-regex=^([0-9]+\\.[0-9]+\\.[0-9]+)$" ]; }; meta = { changelog = "https://www.mowglii.com/itsycal/versionhistory.html"; description = "Tiny menu bar calendar"; homepage = "https://www.mowglii.com/itsycal/"; - license = lib.licenses.mit; + license = with lib.licenses; [ + bsd2 + mit + ]; + mainProgram = "itsycal"; maintainers = with lib.maintainers; [ eclairevoyant _4evy ]; platforms = lib.platforms.darwin; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; }; }) diff --git a/pkgs/by-name/it/itsycal/update.sh b/pkgs/by-name/it/itsycal/update.sh deleted file mode 100755 index cd176cc46860..000000000000 --- a/pkgs/by-name/it/itsycal/update.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl xq-xml common-updater-scripts - -set -eu - -ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/package.nix" -if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find package.nix in $ROOT" - exit 1 -fi - -LATEST_VERSION="$(curl -Ls https://www.mowglii.com/itsycal/versionhistory.html | xq -m -q 'h4' -a 'id' | head -n1)" - -if [ -z "$LATEST_VERSION" ]; then - echo "ERROR: Failed to scrape the latest version." - exit 1 -fi - -update-source-version itsycal "$LATEST_VERSION" --file="$NIX_DRV" diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index b6f35b371667..46338c62722f 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "jenkins"; - version = "2.555.3"; + version = "2.568.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war"; - hash = "sha256-XRmQXmwPI6/4n/AH3lVkuW4KBcE/TRqS0P3LabAzu5o="; + hash = "sha256-WPJPOWX773cIYp++FY1RvxOP/Vd8rbyGtGNn6K0L64M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix index aa0f33dc8aa7..ca3296212efd 100644 --- a/pkgs/by-name/ka/kargo/package.nix +++ b/pkgs/by-name/ka/kargo/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "kargo"; - version = "1.10.7"; + version = "1.10.8"; src = fetchFromGitHub { owner = "akuity"; repo = "kargo"; tag = "v${finalAttrs.version}"; - hash = "sha256-Gd/3bc0PhfitQyRaOPhg2BMhqJeipJbZGYGR5DQHHAc="; + hash = "sha256-MiNoh5YuywlNKvvNezMaMXOJVhf/IuYGe1NkwOyR7Oo="; }; vendorHash = "sha256-tucXuZhcCVplFAmRzWJtxbBQccxiVTAheTA55wHMkyw="; diff --git a/pkgs/by-name/ka/karmor/package.nix b/pkgs/by-name/ka/karmor/package.nix index f76fa6e73a65..ff29f6d90369 100644 --- a/pkgs/by-name/ka/karmor/package.nix +++ b/pkgs/by-name/ka/karmor/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "karmor"; - version = "1.4.7"; + version = "1.4.9"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${finalAttrs.version}"; - hash = "sha256-hohzVj2mlch6rSdjsCl+VcTnX9zvYnRrRM97LwbNeNw="; + hash = "sha256-iTXUb66B6ONeP7oz+vg2Zkte9OjQYrPffh+zanLWTO0="; }; - vendorHash = "sha256-DrrLromAT0xSr3SUqWTM78oGXTy73VCD2DJlMwSEGEs="; + vendorHash = "sha256-LA2qKCWR5akyVmK0qzVS4rCX8WNPGXrqq1585xTDDrE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ke/keka/package.nix b/pkgs/by-name/ke/keka/package.nix index fcea35e15e49..2dbdb9d454bc 100644 --- a/pkgs/by-name/ke/keka/package.nix +++ b/pkgs/by-name/ke/keka/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "keka"; - version = "1.6.0"; + version = "1.6.7"; src = fetchzip { url = "https://github.com/aonez/Keka/releases/download/v${finalAttrs.version}/Keka-${finalAttrs.version}.zip"; - hash = "sha256-E0KvDgjx86myZk5+QsydonDaT31CS+B1QGOUXCOaJxY="; + hash = "sha256-6zC8lQLkJ/Qppyo3XwK6fy4f/bLsIg0L+4GwFfiVlvg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,7 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://www.keka.io"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ emilytrau ]; + maintainers = with lib.maintainers; [ + emilytrau + kinnrai + ]; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ki/kitty-bin/package.nix b/pkgs/by-name/ki/kitty-bin/package.nix new file mode 100644 index 000000000000..f197b6819f5f --- /dev/null +++ b/pkgs/by-name/ki/kitty-bin/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + fetchurl, + _7zz, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "kitty-bin"; + version = "0.47.4"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchurl { + url = "https://github.com/kovidgoyal/kitty/releases/download/v${finalAttrs.version}/kitty-${finalAttrs.version}.dmg"; + hash = "sha256-tTubGKJ9U61Eol3Wd2/ejEdIe04QOsUNaCrx7o57d+0="; + }; + + # undmg can't read the APFS dmg; -snld keeps the .app's symlinks intact. + nativeBuildInputs = [ _7zz ]; + sourceRoot = "."; + unpackCmd = "7zz x -snld $curSrc"; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" "$out/bin" + cp -R kitty.app "$out/Applications/kitty.app" + ln -s "$out/Applications/kitty.app/Contents/MacOS/kitty" "$out/bin/kitty" + ln -s "$out/Applications/kitty.app/Contents/MacOS/kitten" "$out/bin/kitten" + + runHook postInstall + ''; + + # leave the signed bundle untouched so its signature stays valid. + dontFixup = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/kovidgoyal/kitty"; + description = "Fast, feature-rich, GPU based terminal emulator (prebuilt signed macOS app)"; + changelog = "https://github.com/kovidgoyal/kitty/blob/v${finalAttrs.version}/docs/changelog.rst"; + license = lib.licenses.gpl3Only; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.darwin; + mainProgram = "kitty"; + maintainers = with lib.maintainers; [ carlossless ]; + }; +}) diff --git a/pkgs/by-name/ko/koffan/package.nix b/pkgs/by-name/ko/koffan/package.nix index 98a67aeb14b0..9c64a542b05a 100644 --- a/pkgs/by-name/ko/koffan/package.nix +++ b/pkgs/by-name/ko/koffan/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "koffan"; - version = "2.12.0"; + version = "2.12.2"; src = fetchFromGitHub { owner = "PanSalut"; repo = "Koffan"; tag = "v${finalAttrs.version}"; - hash = "sha256-E4R2FrL6pqwz1yuF+0TuSIE33/ksrvE0U9XO4z11AfE="; + hash = "sha256-0fCKVExxsmqz8ndv26r7iJldcj6OnhiZ8SqPMhR8pHo="; }; vendorHash = "sha256-BYehi5LQQ0MIsKG/fN3DHaQwKVmxUFrvWGrKZeKj+ow="; diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 17e81f3c471d..c91f828342e0 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -24,14 +24,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "komikku"; - version = "50.8.0"; + version = "50.9.0"; pyproject = false; src = fetchFromCodeberg { owner = "valos"; repo = "Komikku"; tag = "v${finalAttrs.version}"; - hash = "sha256-u10O0+Ty73ad4vB8BgQPsV1W8NJYvzU3wyAhqHtW9v0="; + hash = "sha256-fjAls3/ikNrQ1AgwUe9hFoQ48zv7UbGCUNB4dlmYM28="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix index 640af5bdb9ab..952ec48f9f23 100644 --- a/pkgs/by-name/ku/kubedb-cli/package.nix +++ b/pkgs/by-name/ku/kubedb-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.65.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; tag = "v${version}"; - hash = "sha256-DHICxjymoqmvEnff4ABVJSuCh8Ojx/RTxgUPlO94HLo="; + hash = "sha256-2JS+wvS+EBNrH+VGmfRp39sZjSBkTLX2iLuZuUQ3MZw="; }; vendorHash = null; diff --git a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix index a9d3c5586608..7fea26a4f7ac 100644 --- a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix +++ b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "controller-tools"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "controller-tools"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-c1d7FlfGv7iGS+4GyhsO99OrCBIxO3M9r7jwYh7qs2o="; + sha256 = "sha256-4IkVnD87/sHZKixDaF9Qz95cdChPfOkEowBQwu7kq9Y="; }; - vendorHash = "sha256-cFnUfcoLyFHg0JR6ix0AnpSHUGuNNVbKldKelvvMu/4="; + vendorHash = "sha256-LNjd0PDVa4GMY1rFJ5PFiWAEeA5MMraIIzZmYgkdgJc="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix index bb8327f5db10..46ceb2439622 100644 --- a/pkgs/by-name/ku/kubeshark/package.nix +++ b/pkgs/by-name/ku/kubeshark/package.nix @@ -66,7 +66,7 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/kubeshark/kubeshark/releases/tag/v${finalAttrs.version}"; description = "API Traffic Viewer for Kubernetes"; mainProgram = "kubeshark"; - homepage = "https://kubeshark.co/"; + homepage = "https://kubeshark.com/"; license = lib.licenses.asl20; longDescription = '' The API traffic viewer for Kubernetes providing real-time, protocol-aware visibility into Kubernetes’ internal network, diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix index 5c8ae4a47f52..20c3e12b4195 100644 --- a/pkgs/by-name/la/lagrange/package.nix +++ b/pkgs/by-name/la/lagrange/package.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Beautiful Gemini Client"; homepage = "https://gmi.skyjake.fi/lagrange/"; + mainProgram = "lagrange"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/la/lammps/package.nix b/pkgs/by-name/la/lammps/package.nix index 40ed6f08f348..d25664c8f85e 100644 --- a/pkgs/by-name/la/lammps/package.nix +++ b/pkgs/by-name/la/lammps/package.nix @@ -8,6 +8,7 @@ blas, lapack, python3, + mpich, cmake, autoAddDriverRunpath, pkg-config, @@ -39,6 +40,7 @@ SRD = true; REAXFF = true; PYTHON = true; + MPIIO = true; }, # Extra cmakeFlags to add as "-D${attr}=${value}" extraCmakeFlags ? { }, @@ -71,7 +73,12 @@ stdenv.mkDerivation (finalAttrs: { # GPU_API=cuda, and it doesn't users that don't enable the GPU package. autoAddDriverRunpath ] - ++ lib.optionals packages.PYTHON [ python3 ]; + ++ lib.optionals packages.PYTHON [ + python3 + ] + ++ lib.optionals packages.MPIIO [ + mpich + ]; passthru = { inherit packages; diff --git a/pkgs/by-name/le/leetgpu/package.nix b/pkgs/by-name/le/leetgpu/package.nix index c1225e123892..78a13e1fffa3 100644 --- a/pkgs/by-name/le/leetgpu/package.nix +++ b/pkgs/by-name/le/leetgpu/package.nix @@ -26,11 +26,6 @@ let url = "https://cli.leetgpu.com/dist/${version}/leetgpu-macos-arm64"; hash = "sha256-B1Sdyw+6fDBKS3PsINmiNA9PnOtEpDZiodFPsx+qk1Y="; }; - - x86_64-darwin = fetchurl { - url = "https://cli.leetgpu.com/dist/${version}/leetgpu-macos-amd64"; - hash = "sha256-Iw2w0qDddM38OE37mVZ4krRTqjKGhXPxZSCav+oM1ac="; - }; }; src = srcs.${stdenvNoCC.hostPlatform.system} or throwSystem; diff --git a/pkgs/by-name/le/leetgpu/update.sh b/pkgs/by-name/le/leetgpu/update.sh index 6a1f26c5d462..b30ac924cbe9 100755 --- a/pkgs/by-name/le/leetgpu/update.sh +++ b/pkgs/by-name/le/leetgpu/update.sh @@ -16,7 +16,6 @@ update-source-version leetgpu $latestVersion || true for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix store prefetch-file --json --hash-type sha256 \ $(nix-instantiate --eval --raw -E "with import ./. {}; leetgpu.src.url" --system "$system") | jq -r '.hash') diff --git a/pkgs/by-name/li/libcpr/package.nix b/pkgs/by-name/li/libcpr/package.nix index e55950be8b7b..82a38e7be001 100644 --- a/pkgs/by-name/li/libcpr/package.nix +++ b/pkgs/by-name/li/libcpr/package.nix @@ -9,7 +9,7 @@ }: let - version = "1.14.1"; + version = "1.14.2"; in stdenv.mkDerivation { pname = "libcpr"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "libcpr"; repo = "cpr"; rev = version; - hash = "sha256-kwbkdAeTpkEJbzvqpUQx007ZIBtwqOPG8n41TvFxeiM="; + hash = "sha256-fglJNQzf+5c5nJysxqTxE4EWSQO0GVauLV8yLypQMPs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libhangul/package.nix b/pkgs/by-name/li/libhangul/package.nix index e7630d33b024..caec4833b7df 100644 --- a/pkgs/by-name/li/libhangul/package.nix +++ b/pkgs/by-name/li/libhangul/package.nix @@ -1,29 +1,42 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "libhangul"; - version = "0.1.0"; + version = "0.2.0"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-${finalAttrs.version}.tar.gz"; - sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; + src = fetchFromGitHub { + owner = "libhangul"; + repo = "libhangul"; + hash = "sha256-1cTDsRJpT5TLdJN8D2LfOISWeAOlSO6zKZOaCrTxooM="; + tag = "libhangul-${finalAttrs.version}"; }; + preAutoreconf = "./autogen.sh"; configureFlags = [ # detection doesn't work for cross builds "ac_cv_func_realloc_0_nonnull=yes" ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + meta = { description = "Core algorithm library for Korean input routines"; mainProgram = "hangul"; - homepage = "https://github.com/choehwanjin/libhangul"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.ianwookim ]; + homepage = "https://github.com/libhangul/libhangul"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ + ianwookim + honnip + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/li/liblouis/package.nix b/pkgs/by-name/li/liblouis/package.nix index 082fa6ddfe50..6bfbfbdddd8c 100644 --- a/pkgs/by-name/li/liblouis/package.nix +++ b/pkgs/by-name/li/liblouis/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "liblouis"; - version = "3.33.0"; + version = "3.38.0"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "liblouis"; repo = "liblouis"; rev = "v${finalAttrs.version}"; - hash = "sha256-+p/2eLbQ5aYtxQIkoHaVE1xDqstveedf+56aRNX9C7M="; + hash = "sha256-OmYMldo2id2HKAM0Hxi6r86khSUnzu22CkJhGBhaaL8="; }; strictDeps = true; @@ -63,7 +63,8 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs tests - substituteInPlace python/louis/__init__.py.in --replace "###LIBLOUIS_SONAME###" "$out/lib/liblouis.so" + substituteInPlace python/louis/__init__.py.in \ + --replace-fail "###LIBLOUIS_SONAME###" "$out/lib/liblouis.so" ''; postInstall = '' @@ -71,6 +72,12 @@ stdenv.mkDerivation (finalAttrs: { python -m build --no-isolation --outdir dist/ --wheel python -m installer --prefix $out dist/*.whl popd + + make install-html MAKEINFOFLAGS="--no-headers --no-split" + pushd doc + make liblouis.txt + popd + install -D -t "$doc/share/doc/liblouis" doc/liblouis.txt ''; doCheck = true; diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix index d4618b54cecb..0c6e356babd5 100644 --- a/pkgs/by-name/li/libqalculate/package.nix +++ b/pkgs/by-name/li/libqalculate/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; tag = "v${finalAttrs.version}"; - hash = "sha256-lwA2faLYUb02FL9lOX+vuv/8pfKbkHWRlS1VnrV+sk4="; + hash = "sha256-f9FzFcu2LtBM6B6apYo7uobeR5uZVb02FxX7Kng/rRI="; }; outputs = [ diff --git a/pkgs/by-name/li/libvlcpp/package.nix b/pkgs/by-name/li/libvlcpp/package.nix index 5aae8b619233..450acf0c48fd 100644 --- a/pkgs/by-name/li/libvlcpp/package.nix +++ b/pkgs/by-name/li/libvlcpp/package.nix @@ -2,26 +2,28 @@ lib, stdenv, fetchFromGitLab, - autoreconfHook, pkg-config, libvlc, + meson, + ninja, }: stdenv.mkDerivation (finalAttrs: { pname = "libvlcpp"; - version = "0.1.0-unstable-2024-02-04"; + version = "0.1.0-unstable-2026-04-16"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = "libvlcpp"; - rev = "44c1f48e56a66c3f418175af1e1ef3fd1ab1b118"; - hash = "sha256-nnS4DMz/2VciCrhOBGRb1+kDbxj+ZOnEtQmzs/TJ870="; + rev = "33214afee13df36dc46309ef5416d681b56db5b9"; + hash = "sha256-PjJzFrvkmrTsBjzmEG6hNU8VzDlofQrdfTGFhxkVPWU="; }; nativeBuildInputs = [ + meson + ninja pkg-config - autoreconfHook ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/li/libvmi/package.nix b/pkgs/by-name/li/libvmi/package.nix index 53680ff18971..1619409ed4d4 100644 --- a/pkgs/by-name/li/libvmi/package.nix +++ b/pkgs/by-name/li/libvmi/package.nix @@ -13,9 +13,6 @@ json_c, libvirt, - withVMIFS ? true, - fuse, - legacyKVM ? false, libkvmi, @@ -67,13 +64,11 @@ stdenv.mkDerivation { libvirt ] ++ lib.optionals xenSupport [ xen ] - ++ lib.optionals (!legacyKVM) [ libkvmi ] - ++ lib.optionals withVMIFS [ fuse ]; + ++ lib.optionals (!legacyKVM) [ libkvmi ]; configureFlags = lib.optionals (!xenSupport) [ "--disable-xen" ] - ++ lib.optionals legacyKVM [ "--enable-kvm-legacy" ] - ++ lib.optionals withVMIFS [ "--enable-vmifs" ]; + ++ lib.optionals legacyKVM [ "--enable-kvm-legacy" ]; # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here postFixup = lib.optionalString xenSupport '' diff --git a/pkgs/by-name/li/license-plist/package.nix b/pkgs/by-name/li/license-plist/package.nix new file mode 100644 index 000000000000..95ade33eaca5 --- /dev/null +++ b/pkgs/by-name/li/license-plist/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenvNoCC, + fetchzip, + versionCheckHook, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "license-plist"; + version = "3.27.7"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchzip { + url = "https://github.com/mono0926/LicensePlist/releases/download/${finalAttrs.version}/portable_licenseplist.zip"; + hash = "sha256-Z8jDFRZj0s6X+edexNZ0Qx2qUC8Bm2GC9uOrKWbXtCI="; + stripRoot = false; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm755 license-plist $out/bin/license-plist + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "License list generator for iOS application dependencies"; + homepage = "https://github.com/mono0926/LicensePlist"; + changelog = "https://github.com/mono0926/LicensePlist/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "license-plist"; + maintainers = with lib.maintainers; [ jeremystucki ]; + platforms = lib.platforms.darwin; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/li/lima/package.nix b/pkgs/by-name/li/lima/package.nix index c998ae4731b6..8d4d63925e30 100644 --- a/pkgs/by-name/li/lima/package.nix +++ b/pkgs/by-name/li/lima/package.nix @@ -11,6 +11,7 @@ apple-sdk_15, withAdditionalGuestAgents ? false, lima-additional-guestagents, + llvmPackages, writableTmpDirAsHomeHook, versionCheckHook, testers, @@ -35,7 +36,16 @@ buildGoModule (finalAttrs: { # For checkPhase, and installPhase(required to build completion) writableTmpDirAsHomeHook ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.sigtool + # TODO: Remove when NixOS/nixpkgs#536365 reaches master. + llvmPackages.lld + ]; + + # TODO: Remove when NixOS/nixpkgs#536365 reaches master. + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' llvmPackages.lld "ld64.lld"}"; + }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 ]; diff --git a/pkgs/by-name/li/linear/package.nix b/pkgs/by-name/li/linear/package.nix index a0c8816a50bd..f8a2122dd09e 100644 --- a/pkgs/by-name/li/linear/package.nix +++ b/pkgs/by-name/li/linear/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "linear"; - version = "1.30.2"; + version = "1.31.1"; src = fetchurl { url = "https://releases.linear.app/Linear-${finalAttrs.version}-universal.dmg"; - hash = "sha256-udtN7sOnbT1B684q/JhPFGq8mYvhc5CbTxuJi6NYFac="; + hash = "sha256-haZz9RdbcQiFbCqdy/S25aCsFoSKn3dFAkYL8NgoTYw="; }; strictDeps = true; @@ -41,7 +41,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "App to manage software development and track bugs"; homepage = "https://linear.app/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ iniw ]; + maintainers = with lib.maintainers; [ + iniw + pradyuman + ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/li/linear/update.sh b/pkgs/by-name/li/linear/update.sh index c6ee30c2ac3a..8a381a4bc560 100755 --- a/pkgs/by-name/li/linear/update.sh +++ b/pkgs/by-name/li/linear/update.sh @@ -1,18 +1,18 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl gnugrep common-updater-scripts +#!nix-shell -i bash -p coreutils curl gnugrep jq common-updater-scripts #shellcheck shell=bash -set -eu -o pipefail +set -euo pipefail -source_url="https://releases.linear.app/mac" - -version="$(curl -L -I "$source_url" | grep -ioE 'filename="Linear-[0-9]+(\.[0-9]+)*-universal\.dmg"' | grep -oE '[0-9]+(\.[0-9]+)*')" +releases_url="https://releases.linear.app" +version_pattern='filename="Linear-\K[0-9]+(\.[0-9]+)*(?=-universal\.dmg")' +version="$(curl -fsSLI "$releases_url/mac" | grep -ioP "$version_pattern")" if [[ -z $version ]]; then echo "Could not find the latest Linear version in release headers" >&2 exit 1 fi -hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "https://releases.linear.app/Linear-${version}-universal.dmg")") +hash="$(nix store prefetch-file --json "$releases_url/Linear-${version}-universal.dmg" | jq -r .hash)" update-source-version linear "$version" "$hash" --ignore-same-version diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index fccffd6d249f..65c77a6ce7ed 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -38,7 +38,6 @@ vulkanSupport ? false, rpcSupport ? false, openssl, - llama-cpp, shaderc, vulkan-headers, vulkan-loader, @@ -190,9 +189,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { # upstream plans on adding targets at the cmakelevel, remove those # additional steps after that postInstall = '' - # Match previous binary name for this package - ln -sf $out/bin/llama-cli $out/bin/llama - mkdir -p $out/include cp $src/include/llama.h $out/include/ diff --git a/pkgs/by-name/lm/lmmath/package.nix b/pkgs/by-name/lm/lmmath/package.nix index 58db2e36c080..23288e21db1e 100644 --- a/pkgs/by-name/lm/lmmath/package.nix +++ b/pkgs/by-name/lm/lmmath/package.nix @@ -2,27 +2,22 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "lmmath"; version = "1.959"; + strictDeps = true; + __structuredAttrs = true; + src = fetchzip { url = "https://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; hash = "sha256-et/WMhfZZYgP0S7ZmI6MZK5owv9bSoMBXFX6yGSng5Y="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/latinmodern-math-${version}/ - cp otf/*.otf $out/share/fonts/opentype/ - cp doc/*.txt $out/share/doc/latinmodern-math-${version}/ - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth"; diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index d857fb008c29..a2702a5e06d2 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, - undmg, darwin, meta, pname, @@ -9,6 +8,7 @@ url, hash, passthru, + _7zz, }: stdenv.mkDerivation { inherit meta pname version; @@ -18,8 +18,8 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - undmg darwin.sigtool + _7zz ]; sourceRoot = "."; @@ -50,22 +50,10 @@ stdenv.mkDerivation { dontFixup = true; # undmg doesn't support APFS and 7zz does break the xattr. Took that approach from https://github.com/NixOS/nixpkgs/blob/a3c6ed7ad2649c1a55ffd94f7747e3176053b833/pkgs/by-name/in/insomnia/package.nix#L52 - unpackCmd = '' - echo "Creating temp directory" - mnt=$(TMPDIR=/tmp mktemp -d -t nix-XXXXXXXXXX) - function finish { - echo "Ejecting temp directory" - /usr/bin/hdiutil detach $mnt -force - rm -rf $mnt - } - # Detach volume when receiving SIG "0" - trap finish EXIT - # Mount DMG file - echo "Mounting DMG file into \"$mnt\"" - /usr/bin/hdiutil attach -nobrowse -mountpoint $mnt $curSrc - # Copy content to local dir for later use - echo 'Copying extracted content into "sourceRoot"' - cp -a $mnt/LM\ Studio.app $PWD/ + # NOTE (djmaxus): even with hdiutil, a check `xattr -lr LM\ Studio.app` returns nothing, + # meaning that xattrs are lost anyway? So, I brought back simple 7zip unpacking + unpackPhase = '' + 7zz x -snld $src ''; inherit passthru; diff --git a/pkgs/by-name/ls/lstr/package.nix b/pkgs/by-name/ls/lstr/package.nix index 4561ace0098c..97cb5094850a 100644 --- a/pkgs/by-name/ls/lstr/package.nix +++ b/pkgs/by-name/ls/lstr/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lstr"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "bgreenwell"; repo = "lstr"; tag = "v${finalAttrs.version}"; - hash = "sha256-uaefVDSTphboWW1BP2HkcuMiW87FmnVYxCthlrAKF5Y="; + hash = "sha256-lJ6BSvlJiyZUOoz0QuahIgZ6GZ9NDcmvvQ7MEd9c/7U="; }; - cargoHash = "sha256-UVaqkNV1cNpbCNphk6YMqOz077xY9dUBgCGt7SLIH0U="; + cargoHash = "sha256-pRPcJwdhrQ+P70zaiuPCAI53lW+zEulqSrK5w8SCraQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/lu/lulu/package.nix b/pkgs/by-name/lu/lulu/package.nix new file mode 100644 index 000000000000..6dc2ddbcd8a8 --- /dev/null +++ b/pkgs/by-name/lu/lulu/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "lulu"; + version = "4.3.1"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchurl { + url = "https://github.com/objective-see/LuLu/releases/download/v${finalAttrs.version}/LuLu_${finalAttrs.version}.dmg"; + hash = "sha256-zANmUn8fQSMpX9EzKaCAMaZgr9JWB23asD5gdDZc75M="; + }; + + nativeBuildInputs = [ undmg ]; + + unpackPhase = '' + runHook preUnpack + undmg "$src" + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R LuLu.app "$out/Applications/LuLu.app" + + runHook postInstall + ''; + + dontFixup = true; # Preserve upstream's notarized app bundle and system extension signature. + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Free open-source macOS firewall that alerts you to outgoing network connections"; + homepage = "https://objective-see.org/products/lulu.html"; + changelog = "https://github.com/objective-see/LuLu/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + mainProgram = "LuLu"; + maintainers = with lib.maintainers; [ philocalyst ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index ca1c4ef4c31b..7ee5ead54663 100644 --- a/pkgs/by-name/lu/lux-cli/package.nix +++ b/pkgs/by-name/lu/lux-cli/package.nix @@ -18,18 +18,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lux-cli"; - version = "0.35.1"; + version = "0.36.1"; src = fetchFromGitHub { owner = "lumen-oss"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-jbHub9/mTkWdg+oTu6jEaNbPLEaS0/f3TqxvymsDS3I="; + hash = "sha256-260gORAxU0l3gxv4ojUSmdNgHvdLpQNPdLkn8ze4HGA="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-envh7C5D/38pDTUi08/9c6YaA9OlZ8Zg+IPLhtKZg6A="; + cargoHash = "sha256-P9XonyY+gC0ni8WqkMPWJW6AjU4EBB7BEjxZ3U/q2qM="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index b9014aa454c1..1822215e189d 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -3,13 +3,15 @@ stdenvNoCC, fetchurl, installShellFiles, + jq, libarchive, p7zip, versionCheckHook, + zsh, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mas"; - version = "6.0.1"; + version = "7.0.0"; __structuredAttrs = true; @@ -20,11 +22,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { { x86_64-darwin = { arch = "x86_64"; - hash = "sha256-7+iDBr4GG5bdTuAlAmMQkEkIzVgLo2+DEdravClaLtQ="; + hash = "sha256-m8od4ftuoZyeC517fIUkkCDJ7WWp1DTC70CJai8zlfk="; }; aarch64-darwin = { arch = "arm64"; - hash = "sha256-BZ9UE8H28kjqiMNdLDUUyC9madR4rBV1mLUGyj6ol3Y="; + hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U="; }; } .${stdenvNoCC.hostPlatform.system} @@ -58,6 +60,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall installBin usr/local/opt/mas/bin/mas + install -D --mode=755 usr/local/opt/mas/libexec/bin/mas "$out/libexec/bin/mas" + + substituteInPlace "$out/bin/mas" \ + --replace-fail "#!/bin/zsh" "#!${lib.getExe zsh}" \ + --replace-fail "/usr/bin/jq" "${lib.getExe jq}" installManPage usr/local/opt/mas/share/man/man1/mas.1 installShellCompletion --bash usr/local/opt/mas/etc/bash_completion.d/mas diff --git a/pkgs/by-name/ma/maskromtool/package.nix b/pkgs/by-name/ma/maskromtool/package.nix index d3af7bd976d1..66b3e917a201 100644 --- a/pkgs/by-name/ma/maskromtool/package.nix +++ b/pkgs/by-name/ma/maskromtool/package.nix @@ -4,37 +4,60 @@ fetchFromGitHub, cmake, qt6, + yara-x, + replxx, + readline, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "maskromtool"; - version = "2024-08-18"; + version = "2026-07-04"; src = fetchFromGitHub { owner = "travisgoodspeed"; repo = "maskromtool"; rev = "v${finalAttrs.version}"; - hash = "sha256-iuCjAAVEKVwJuAgKITwkXGhKau2DVWhFQLPjp28tjIo="; + hash = "sha256-QO2s+nGmf0XTq+PRcIqjEeuc6djzQv8TcJjlYYs/X5c="; + fetchSubmodules = true; }; + postPatch = '' + # remove hardcoded PKG_CONFIG_PATH + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'set(ENV{PKG_CONFIG_PATH} "c:/lib/pkgconfig;/usr/local/lib64")' \ + "" + ''; + + cmakeFlags = [ + (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") + ]; + buildInputs = [ qt6.qtbase qt6.qtcharts qt6.qttools + yara-x + replxx + readline ]; nativeBuildInputs = [ cmake + pkg-config qt6.wrapQtAppsHook ]; meta = { description = "CAD tool for extracting bits from Mask ROM photographs"; homepage = "https://github.com/travisgoodspeed/maskromtool"; + changelog = "https://github.com/travisgoodspeed/maskromtool/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ beerware gpl1Plus ]; maintainers = with lib.maintainers; [ evanrichter ]; + mainProgram = "maskromtool"; }; }) diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix index 6e7e99fcc997..9caad3ba2e9d 100644 --- a/pkgs/by-name/ma/matrix-continuwuity/package.nix +++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix @@ -38,17 +38,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-continuwuity"; - version = "26.6.1"; + version = "26.6.2"; src = fetchFromGitea { domain = "forgejo.ellis.link"; owner = "continuwuation"; repo = "continuwuity"; tag = "v${finalAttrs.version}"; - hash = "sha256-sfUxhBPf0P46Xf0lcZFDj23cuZ9apJDyTQPa97jlcSY="; + hash = "sha256-GcCjJiUOGX+vF7R4IRgNQs8KpfVj+MXwnhofwSm6gpA="; }; - cargoHash = "sha256-Qmw9Xum+Osu/4kbVqJP79gbtimpV2P7SkCMuQWyBYxg="; + cargoHash = "sha256-p1Bz7op/qPogBn8bj9pQ7KjRhH2kZao8o0LPqWH2ZYo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index d041184d9ac9..17ff9947dc4a 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -88,16 +88,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-tuwunel"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "matrix-construct"; repo = "tuwunel"; tag = "v${finalAttrs.version}"; - hash = "sha256-+VoJrUvjZOS3y59HbjHX0kwCT1AUvJo1jJQEC/OLYec="; + hash = "sha256-3qMVu+IQMzI4Jtfb8mJsuDAcd7Jb7XSU07RlvnH7vfc="; }; - cargoHash = "sha256-906VroeI1ZjUokOWKNBcfgZLZhca87p7sQuYDwQmPDI="; + cargoHash = "sha256-VzmaQAsNORH8VxYSUgKeQSIgcCPnI9cAzu3K9ks7ODA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix deleted file mode 100644 index 2e13e24e199a..000000000000 --- a/pkgs/by-name/mc/mcphost/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule (finalAttrs: { - pname = "mcphost"; - version = "0.34.0"; - - src = fetchFromGitHub { - owner = "mark3labs"; - repo = "mcphost"; - tag = "v${finalAttrs.version}"; - hash = "sha256-xqz6K0e/LSX77qpkmwmqgStPAfkkJdqKKDZOeYWnrRo="; - }; - - vendorHash = "sha256-mzrCIDMr1INzwqktZIc9m0SgynQC0FpyVlSlAba//sY="; - - doCheck = false; - - meta = { - description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP)"; - homepage = "https://github.com/mark3labs/mcphost"; - license = lib.licenses.mit; - maintainers = [ ]; - mainProgram = "mcphost"; - }; -}) diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix index 83bf8aae2e98..4a1ac02fe0de 100644 --- a/pkgs/by-name/me/mediawriter/package.nix +++ b/pkgs/by-name/me/mediawriter/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mediawriter"; - version = "5.3.1"; + version = "5.3.2"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; tag = finalAttrs.version; - hash = "sha256-INq07MdWLq5qwBNWrrBRmtIpxsmnHcqPEUyRkIl3Qa4="; + hash = "sha256-Xf8W6qGvFOeJ/mVBE/vnngJkieASMpas9M9o+VwY5pc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix index ce04d0ecae9c..249091106d63 100644 --- a/pkgs/by-name/me/memtier-benchmark/package.nix +++ b/pkgs/by-name/me/memtier-benchmark/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "memtier-benchmark"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "redis"; repo = "memtier_benchmark"; tag = finalAttrs.version; - hash = "sha256-k2xhY4EsPVZIEGfdkDc/Mr3oJomNu2bhbn3MzCfOaDg="; + hash = "sha256-2r/8u+gbgN6zwOoVfA9QCAXeYOK15znq03b6OcS+FLM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix index b1f24fc59e28..a8300fcdf519 100644 --- a/pkgs/by-name/me/mermaid-cli/package.nix +++ b/pkgs/by-name/me/mermaid-cli/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "11.12.0"; + version = "11.16.0"; in buildNpmPackage { pname = "mermaid-cli"; @@ -17,14 +17,14 @@ buildNpmPackage { owner = "mermaid-js"; repo = "mermaid-cli"; rev = version; - hash = "sha256-OpYq0nOYCGTorzDxybsEjJmhL646wMBbQw3eHVxTuqU="; + hash = "sha256-jK87Ffsv9qeh0UPJaLTuIJYbnR9HVqjm7hWrwUaP5zA="; }; patches = [ ./remove-puppeteer-from-dev-deps.patch # https://github.com/mermaid-js/mermaid-cli/issues/830 ]; - npmDepsHash = "sha256-Ex+tEm13feR/Vru0CHlvM3xS5wgGlYyqANeIquvRHwM="; + npmDepsHash = "sha256-sOEDz8ZT2zF+TH+ZJhb+LSyyUF1HWVVLzCqtYtg7A0E="; env = { PUPPETEER_SKIP_DOWNLOAD = true; diff --git a/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch b/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch index 7c58948b97f6..1f9bbba9ba85 100644 --- a/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch +++ b/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch @@ -1,16 +1,11 @@ -Subject: [PATCH] remove pupperteer from dev dependencies +Subject: [PATCH] remove puppeteer from dev dependencies --- Index: package.json -<+>UTF-8 =================================================================== diff --git a/package.json b/package.json ---- a/package.json (revision fa593dc39619f44b57a922927a66346248f31d7d) -+++ b/package.json (date 1736721981718) -@@ -45,7 +45,6 @@ - "@tsconfig/node18": "^18.2.4", - "@types/node": "~18.19.31", - "jest": "^30.0.5", -- "puppeteer": "^23.1.1", - "standard": "^17.0.0", - "typescript": "^5.0.1-rc", - "vite": "^6.0.2", +--- a/package.json ++++ b/package.json +@@ -47,3 +47,2 @@ + "prettier": "^3.8.3", +- "puppeteer": "^25.0.0", + "typescript": "^6.0.3", diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py index d2298c382e6f..1e6419338fce 100755 --- a/pkgs/by-name/mi/microsoft-edge/update.py +++ b/pkgs/by-name/mi/microsoft-edge/update.py @@ -1,7 +1,7 @@ #! /usr/bin/env nix-shell #! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts -import os +import subprocess from collections import OrderedDict from os.path import abspath, dirname from urllib import request @@ -39,8 +39,8 @@ def write_expression(): version = Version.re_valid_version.match(latest["stable"]["Version"]).group( "upstream_version" ) - os.system(f'update-source-version microsoft-edge "{version}"') - os.system(f'update-source-version msedgedriver "{version}"') + subprocess.run(["update-source-version", "microsoft-edge", version]) + subprocess.run(["update-source-version", "msedgedriver", version]) write_expression() diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index 56c617c0768e..489f32863563 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, gitUpdater, nixosTests, boost, @@ -12,6 +11,8 @@ glib, glm, gtest, + gtk4, + gtk4-layer-shell, json_c, libevdev, libglvnd, @@ -29,31 +30,21 @@ wasmedge, wayland, wayland-scanner, + wrapGAppsHook4, yaml-cpp, }: stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; tag = "v${finalAttrs.version}"; - hash = "sha256-7JtdSopKBHfFK0KsV0+9OxrOx3vrSydmZSmAiBvKQiI="; + hash = "sha256-htFgvXYgxQXV2U3F+tXEoaTb0udc2H1aHsIg5E8nRL8="; }; - patches = [ - (fetchpatch { - name = "0001-miracle-wm-mir2.28.patch"; - url = "https://github.com/miracle-wm-org/miracle-wm/commit/0fcfb54c59327d0776f6e8074e885080731a95c4.patch"; - excludes = [ - ".github/workflows/test-deb-install.yml" - ]; - hash = "sha256-HuXwPkM0whLFIy8HM6n9bG9I/DZOuzAajmDpJMZt9BQ="; - }) - ]; - postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail 'DESTINATION lib' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \ @@ -67,12 +58,15 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pkg-config wayland-scanner + wrapGAppsHook4 ]; buildInputs = [ boost glib glm + gtk4 + gtk4-layer-shell json_c libevdev libglvnd @@ -96,11 +90,15 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gtest ]; + # Manually wrapping the few binaries that needs it + dontWrapGApps = true; + cmakeFlags = [ + (lib.cmakeBool "BUILD_DEBUG_OVERLAY" true) + (lib.cmakeBool "BUILD_ERROR_REPORTER" true) (lib.cmakeBool "ENABLE_LTO" true) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) - # https://github.com/miracle-wm-org/miracle-wm/issues/865 - (lib.cmakeBool "FEATURE_PLUGIN_SYSTEM" false) + (lib.cmakeBool "FEATURE_PLUGIN_SYSTEM" true) (lib.cmakeBool "SYSTEMD_INTEGRATION" true) (lib.cmakeBool "END_TO_END_TESTS" finalAttrs.finalPackage.doCheck) ]; @@ -119,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' patchShebangs $out/libexec/miracle-wm-session-setup + wrapProgram $out/libexec/miracle-wm-session-setup \ --prefix PATH : "$out/bin:${ lib.makeBinPath [ @@ -127,6 +126,9 @@ stdenv.mkDerivation (finalAttrs: { systemd # systemctl ] }" + + wrapGApp $out/bin/miracle-wm-basic-error-reporter + wrapGApp $out/bin/miracle-wm-debug-overlay ''; passthru = { diff --git a/pkgs/by-name/mo/mole-cleaner/package.nix b/pkgs/by-name/mo/mole-cleaner/package.nix new file mode 100644 index 000000000000..ad79f8ac2612 --- /dev/null +++ b/pkgs/by-name/mo/mole-cleaner/package.nix @@ -0,0 +1,97 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + makeWrapper, + coreutils, + gnused, + gawk, + fd, + gitUpdater, + versionCheckHook, + writableTmpDirAsHomeHook, +}: + +buildGoModule (finalAttrs: { + pname = "mole-cleaner"; + version = "1.31.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "tw93"; + repo = "Mole"; + tag = "V${finalAttrs.version}"; + hash = "sha256-dalmW3W/seGZreSWuYP7JN/nMUbs3WyDHzKU83EveeY="; + }; + + vendorHash = "sha256-LznLZ0NO8VBWP95ReAVORUMIDhh7/pgTY5mGNN2tND8="; + + subPackages = [ + "cmd/analyze" + "cmd/status" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + coreutils + gnused + gawk + ]; + + postInstall = '' + install -Dm755 mole $out/libexec/mole/mole + install -Dm755 mo $out/libexec/mole/mo + cp -r bin lib $out/libexec/mole/ + + mv $out/bin/analyze $out/libexec/mole/bin/analyze-go + mv $out/bin/status $out/libexec/mole/bin/status-go + + patchShebangs $out/libexec/mole + + makeWrapper $out/libexec/mole/mole $out/bin/mole \ + --prefix PATH : ${ + lib.makeBinPath [ + fd + coreutils + gnused + gawk + ] + } + makeWrapper $out/libexec/mole/mo $out/bin/mo \ + --prefix PATH : ${ + lib.makeBinPath [ + fd + coreutils + gnused + gawk + ] + } + ''; + + doInstallCheck = true; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "--version"; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/mole --help > /dev/null + $out/bin/mo --help > /dev/null + runHook postInstallCheck + ''; + + passthru.updateScript = gitUpdater { rev-prefix = "V"; }; + + meta = { + description = "CLI tool for cleaning and optimizing macOS systems"; + homepage = "https://github.com/tw93/Mole"; + changelog = "https://github.com/tw93/Mole/releases/tag/V${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ IanHollow ]; + mainProgram = "mole"; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/mo/moon/package.nix b/pkgs/by-name/mo/moon/package.nix index 42d00115174e..0c405a7c3b3b 100644 --- a/pkgs/by-name/mo/moon/package.nix +++ b/pkgs/by-name/mo/moon/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, openssl, pkg-config, + protobuf, versionCheckHook, nix-update-script, installShellFiles, @@ -14,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "moon"; - version = "1.41.8"; + version = "2.3.2"; src = fetchFromGitHub { owner = "moonrepo"; repo = "moon"; tag = "v${finalAttrs.version}"; - hash = "sha256-KPK1XE18A8vh5FlGIPizxWmEVPkJHcy6fvtFsOQlhok="; + hash = "sha256-Nc3J6s6+Go73lOnveH7agT80y9PVqLZw+x22vvi2mcg="; }; - cargoHash = "sha256-U3Hq5zy1dvG/sJA08bBi2mwMbTP2E5LLIpx0rMq2U1A="; + cargoHash = "sha256-+pmn9+7VNQyggoTmlhZ7s9vTnhSDWp5rqnFFbyLAfMk="; env = { RUSTFLAGS = "-C strip=symbols"; @@ -33,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config + protobuf installShellFiles writableTmpDirAsHomeHook ]; diff --git a/pkgs/by-name/mo/motus/package.nix b/pkgs/by-name/mo/motus/package.nix index e9d99d833707..994896a26dcf 100644 --- a/pkgs/by-name/mo/motus/package.nix +++ b/pkgs/by-name/mo/motus/package.nix @@ -13,23 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "motus"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "oleiade"; repo = "motus"; tag = "v${finalAttrs.version}"; - hash = "sha256-lMNXg6YYTxAycxOiVtBGrSHpccLwerIQcY25K/NkqMo="; + hash = "sha256-7lFKlU9+/NvJi9NsVpve3IvzpS8OVHaH9cs/WRGjBV8="; }; - cargoHash = "sha256-6MKEHnB2MJVB4cNvz3JYlhuzxhzsA+Pq5OkpLNoAEyU="; - - # The CLI crate version was not bumped to match the v0.4.0 release tag: - # https://github.com/oleiade/motus/issues/58 - postPatch = '' - substituteInPlace crates/motus-cli/src/main.rs \ - --replace-fail '#[command(version = "0.3.1")]' '#[command(version = "${finalAttrs.version}")]' - ''; + cargoHash = "sha256-0qK3omTkzVxkjFn2fIowl+sFmjF/hSHAROyge5CDdFg="; buildInputs = lib.optionals (withClipboard && stdenv.hostPlatform.isLinux) [ libxcb ]; diff --git a/pkgs/by-name/mp/mpdris2-rs/package.nix b/pkgs/by-name/mp/mpdris2-rs/package.nix index 2387720718ac..c48926b8b352 100644 --- a/pkgs/by-name/mp/mpdris2-rs/package.nix +++ b/pkgs/by-name/mp/mpdris2-rs/package.nix @@ -6,15 +6,15 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mpdris2-rs"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "szclsya"; repo = "mpdris2-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-oiyqK7vj41d9bsXBtenc477SOrVHRkXpFljkN8MjdQg="; + hash = "sha256-VcBmo8zpgxowAZyHpe5EVQ/e6zuCYw21Xws0Yf5EZEo="; }; - cargoHash = "sha256-xdgUKU9YiaC3o1uH38ZjvQgR78B/1LqTPis4+XqinQ8="; + cargoHash = "sha256-1Syt8lP/3Efr1A/LuV+k6aMuxDg+AWDg4HPTDFP/UW0="; postPatch = '' substituteInPlace misc/mpdris2-rs.service --replace-fail "/usr/local" "$out" diff --git a/pkgs/by-name/mp/mpv/scripts/thumbfast.nix b/pkgs/by-name/mp/mpv/scripts/thumbfast.nix index 5dd0fc8c673c..3166faf04e7c 100644 --- a/pkgs/by-name/mp/mpv/scripts/thumbfast.nix +++ b/pkgs/by-name/mp/mpv/scripts/thumbfast.nix @@ -8,13 +8,13 @@ buildLua { pname = "mpv-thumbfast"; - version = "0-unstable-2025-02-04"; + version = "0-unstable-2026-06-28"; src = fetchFromGitHub { owner = "po5"; repo = "thumbfast"; - rev = "9deb0733c4e36938cf90e42ddfb7a19a8b2f4641"; - hash = "sha256-avG1CRBrs0UM4HcFMUVAQyOtcIFkZ/H+PbjZJKU7o2A="; + rev = "0f711de3138c9bd6718209d819ac54022c23ded2"; + hash = "sha256-LVeEtzOMVSgBqN9z6VQLZnxXfrOUoQPOWazVXmj3ZFY="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix index d4ac1953cdc3..3d0a8371226a 100644 --- a/pkgs/by-name/mu/multipath-tools/package.nix +++ b/pkgs/by-name/mu/multipath-tools/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "multipath-tools"; - version = "0.14.1"; + version = "0.14.3"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; tag = finalAttrs.version; - hash = "sha256-fkpBvadQAR+oiFeyar7flwL8N69RoWhwOaiYSwYCbXs="; + hash = "sha256-uppx79+ZWazGM/QQ+8jeTogqXyHosiFfcnH2npiz7W0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index d5a48d238ffe..fe7cacc865d3 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "25.2.2"; + version = "25.3.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-WJU0bnjC78GlrTXBixz9/pLLxvJGTvwJfIcGuF329io="; + sha256 = "sha256-Mx+UURIJUpIZlLq0FFuvOoUzMHhHryfNxRpNWgrpHTM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/netwatch/package.nix b/pkgs/by-name/ne/netwatch/package.nix index 6c5bb39fb92a..4a07ac765356 100644 --- a/pkgs/by-name/ne/netwatch/package.nix +++ b/pkgs/by-name/ne/netwatch/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "netwatch-tui"; - version = "0.25.8"; + version = "0.26.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "matthart1983"; repo = "netwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-vKAadOd5H0nsHbYMFSfEBOwxjZn5Df0Zm8Jicz0hpgg="; + hash = "sha256-gJTJ8Fn/McFdzlITvSrmgnOKu2f+KOeA9KODkAljoV8="; }; - cargoHash = "sha256-mpVa+iSDzPyWW3Q78ZroLW2BzO0suXG7Q6nJjjIgHqk="; + cargoHash = "sha256-brCc2FjS/GvjCxHZFLFZaSeTIukIAkfGl/gtpmhShls="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix index 80c9b402f2d8..00d5fec04e37 100644 --- a/pkgs/by-name/ne/nexttrace/package.nix +++ b/pkgs/by-name/ne/nexttrace/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "nexttrace"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-5J0P+HlfSt6wd/q7L/+6h7auQQBJkaA1NO053w32S8Y="; + sha256 = "sha256-yjG/nXnZs5ks80Q5Qq9TsN57nuSrPvp/jlYV3FXJqMk="; }; - vendorHash = "sha256-9g0OZczhIhM96eYFyAMxajpIkRgNUkn6QUZtl3O/xSM="; + vendorHash = "sha256-u5UTl3zNlnv0qk/Z60h1csp44ypn1V6i/aAThtTn3eg="; buildInputs = [ libpcap ]; diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 7515c28f10cd..691b09c2a228 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -49,13 +49,13 @@ let in buildGoModule (finalAttrs: { pname = "nezha"; - version = "2.2.9"; + version = "2.2.10"; src = fetchFromGitHub { owner = "nezhahq"; repo = "nezha"; tag = "v${finalAttrs.version}"; - hash = "sha256-5Mg44BTSL8J/i6fchb/8T9MOugZ0fetgsmiiEOwpLNs="; + hash = "sha256-eAJj+R3tSaZNa7aSfwLg8fS9grbGJRoBUBXdQpncqdI="; }; proxyVendor = true; diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index e885f5a3703b..7bf087a20c31 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -15,20 +15,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ni"; - version = "30.1.0"; + version = "30.2.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "ni"; tag = "v${finalAttrs.version}"; - hash = "sha256-mBKSnnmvlZOwU+6MQrg8S8iCea2PGAsHa+A4lseLYyw="; + hash = "sha256-H+gmiy+sHdiK5rRpOvkUe54kc/66J9eI9kIMfFcjTrg="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-I/jf6nlsKQFrYLO15f+CWdPPdEpVDDMBQodLsbG4sqw="; + hash = "sha256-OxGdTKzGliGshBWlx+5rxVSN1QWTsQKHzJXynnlCUg0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py index a0b9beabc617..9177b0ad5202 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py @@ -265,6 +265,8 @@ class HTMLParameters(NamedTuple): sidebar_depth: int media_dir: Path sidebar_open: frozenset[str] = frozenset() + header: Path | None = None + no_navheader: bool = False class ManualHTMLRenderer(RendererMixin, HTMLRenderer): _base_path: Path @@ -344,7 +346,8 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): if toc.next: next_link = f'' next_a = f'Next' - if toc.prev or toc.parent or toc.next: + # nav_header is not disabled + if not self._html_params.no_navheader and (toc.prev or toc.parent or toc.next): nav_html = "\n".join([ '
', ' ', @@ -381,6 +384,10 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): }); }); """ + header_content = "" + if self._html_params.header: + with open(self._html_params.header) as header_file: + header_content = header_file.read() return "\n".join([ '', @@ -406,6 +413,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): (' ') if sidebar else "", + header_content, nav_html, f' ' if sidebar else "", '
', @@ -757,6 +765,9 @@ def _build_cli_html(p: argparse.ArgumentParser) -> None: p.add_argument('--chunk-toc-depth', nargs='?', action=_DeprecatedDepthFlag, default=None) p.add_argument('--section-toc-depth', nargs='?', action=_DeprecatedDepthFlag, default=None) # Positional + p.add_argument('--no-navheader', default=False, action='store_true') + p.add_argument('--header', type=Path, + help='Inject any html fragment into the as first child') p.add_argument('infile', type=Path) p.add_argument('outfile', type=Path) @@ -774,7 +785,7 @@ def _run_cli_html(args: argparse.Namespace) -> None: md = HTMLConverter( args.revision, HTMLParameters(args.generator, args.stylesheet, args.script, - args.sidebar_depth, args.media_dir, sidebar_open), + args.sidebar_depth, args.media_dir, sidebar_open, args.header, args.no_navheader), json.load(manpage_urls), redirects) md.convert(args.infile, args.outfile) diff --git a/pkgs/by-name/ni/nixos-render-docs/src/tests/test_html_header.py b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_html_header.py new file mode 100644 index 000000000000..7111959bea55 --- /dev/null +++ b/pkgs/by-name/ni/nixos-render-docs/src/tests/test_html_header.py @@ -0,0 +1,30 @@ +from pathlib import Path + +import pytest +from nixos_render_docs.manual import HTMLConverter, HTMLParameters + +SAMPLE_BOOK = "# Title {#book-title}\n## Subtitle\n" + +def render(tmp_path: Path, header: Path | None) -> str: + infile = tmp_path / "index.md" + infile.write_text(SAMPLE_BOOK) + outfile = tmp_path / "index.html" + params = HTMLParameters("", [], [], 2, sidebar_open = [], media_dir=tmp_path, header = header) + HTMLConverter("1.0.0", params, {}).convert(infile, outfile) + return outfile.read_text() + + +def test_html_header_injected_at_start_of_body(tmp_path: Path) -> None: + fragment = '
corporate navigation
' + header = tmp_path / "header.html" + header.write_text(fragment) + + out = render(tmp_path, header) + assert fragment in out + # verify markers appear in this order + assert out.index(" ") < out.index(fragment) < out.index('
') + + +def test_html_header_absent_when_not_given(tmp_path: Path) -> None: + out = render(tmp_path, None) + assert "corp-nav" not in out diff --git a/pkgs/by-name/ni/nixtamal/package.nix b/pkgs/by-name/ni/nixtamal/package.nix index 517a70f1e9a4..09a6e4687fe7 100644 --- a/pkgs/by-name/ni/nixtamal/package.nix +++ b/pkgs/by-name/ni/nixtamal/package.nix @@ -21,7 +21,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { pname = "nixtamal"; - version = "1.8.2"; + version = "1.9.0"; release_year = 2026; minimalOCamlVersion = "5.3"; @@ -30,7 +30,7 @@ ocamlPackages.buildDunePackage (finalAttrs: { url = "https://darcs.toastal.in.th/nixtamal/stable/"; mirrors = [ "https://smeder.ee/~toastal/nixtamal.darcs" ]; rev = finalAttrs.version; - hash = "sha256-WS3Au0V2AFUxRoINZvBLDJWvsTn/SyiN6jSLOWb+PQY="; + hash = "sha256-Uybm9zTxIMFq82A4eCayeFCia/uW7HjhIquvO9LTfjE="; }; nativeBuildInputs = [ @@ -65,7 +65,6 @@ ocamlPackages.buildDunePackage (finalAttrs: { logs saturn stdint - uri xdg ]; @@ -107,6 +106,8 @@ ocamlPackages.buildDunePackage (finalAttrs: { --libdir="$lib/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib" \ nixtamal + cp -r "$src/meta" "$src/ncl" "$data/share"/*/ + for dep in "${ocamlPackages.ocaml}" "${ocamlPackages.camomile}"; do remove-references-to -t "$dep" "$bin/bin/nixtamal" done diff --git a/pkgs/by-name/no/nocturne/package.nix b/pkgs/by-name/no/nocturne/package.nix index 2de7e0ea9d48..ace2388284fd 100644 --- a/pkgs/by-name/no/nocturne/package.nix +++ b/pkgs/by-name/no/nocturne/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nocturne"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "Jeffser"; repo = "Nocturne"; tag = finalAttrs.version; - hash = "sha256-z7E4PVSp7HDarnJeQFrJ/HznxUT+b6xTF0QTm5ffvTQ="; + hash = "sha256-uXsl438K0Ew0fdrKtGf28VkHQ76loDWKLJkounzqhEQ="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/no/nomad-driver-podman/package.nix b/pkgs/by-name/no/nomad-driver-podman/package.nix index be6f9ad9e6a8..72c7a1b01f79 100644 --- a/pkgs/by-name/no/nomad-driver-podman/package.nix +++ b/pkgs/by-name/no/nomad-driver-podman/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "nomad-driver-podman"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "hashicorp"; repo = "nomad-driver-podman"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-fgJzlSJA2SMQU3aMUMoQEcVfkdPm5c8twWi97fxFQ3s="; + sha256 = "sha256-ZUZr992bK4e08bh6peYN5B35N7PEVTOSySUWwQ132iA="; }; - vendorHash = "sha256-+pc4Rnsh7Ku2IVptzq5UHB5wR9fvs+8K/d13M+hNRVI="; + vendorHash = "sha256-AmG4YQNW20wRfNHl9l8RkByrTIfmAjBxnWvndf1jqYU="; subPackages = [ "." ]; diff --git a/pkgs/by-name/no/notion-app/info.json b/pkgs/by-name/no/notion-app/info.json deleted file mode 100644 index 4d756a41cfb4..000000000000 --- a/pkgs/by-name/no/notion-app/info.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "x86_64-darwin": { - "version": "4.24.0", - "url": "https://desktop-release.notion-static.com/Notion-4.24.0.zip", - "hash": "sha512-E/DXvtRD3HFNsliQqFpLG4xoAJIcqWX3xkLNTDMxy8bssc5V9/dN2K3AGLnN8HUj9+FwWySNCJhFPDqzf/nyTQ==" - }, - "aarch64-darwin": { - "version": "4.24.0", - "url": "https://desktop-release.notion-static.com/Notion-arm64-4.24.0.zip", - "hash": "sha512-b0zeG0dBPxMigOb+1o8riB3i9HbKdJ+oZYY02MILpIg70uUttq5f4j5ekZ8d5xwkIHGF9wqhqUddRdyb+qXxtw==" - } -} diff --git a/pkgs/by-name/no/notion-app/package.nix b/pkgs/by-name/no/notion-app/package.nix index 05f9d46c7683..e99f9bb0fa1e 100644 --- a/pkgs/by-name/no/notion-app/package.nix +++ b/pkgs/by-name/no/notion-app/package.nix @@ -6,7 +6,7 @@ }: let info = - (lib.importJSON ./info.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin" + (lib.importJSON ./sources.json)."${stdenvNoCC.hostPlatform.parsed.cpu.name}-darwin" or (throw "Unsupported CPU architecture: ${stdenvNoCC.hostPlatform.parsed.cpu.name}"); in stdenvNoCC.mkDerivation (finalAttrs: { @@ -32,7 +32,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "App to write, plan, collaborate, and get organised"; homepage = "https://www.notion.so/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ xiaoxiangmoe ]; + maintainers = with lib.maintainers; [ + xiaoxiangmoe + pradyuman + ]; platforms = [ "x86_64-darwin" "aarch64-darwin" diff --git a/pkgs/by-name/no/notion-app/sources.json b/pkgs/by-name/no/notion-app/sources.json new file mode 100644 index 000000000000..61b33e14609e --- /dev/null +++ b/pkgs/by-name/no/notion-app/sources.json @@ -0,0 +1,12 @@ +{ + "x86_64-darwin": { + "version": "7.25.1", + "url": "https://desktop-release.notion-static.com/Notion-7.25.1.zip", + "hash": "sha512-HBhe2onWY44JbMVIfiLglyNDk1tqepwCerqbgUuI56mstBlg+B0KuepTl+plJODoTVtRasmrg/WRBw+ESWpEeg==" + }, + "aarch64-darwin": { + "version": "7.25.1", + "url": "https://desktop-release.notion-static.com/Notion-arm64-7.25.1.zip", + "hash": "sha512-1t+hNS33R3CX+inR8ArKvm4LDn0Wu7JiCU91ucnaAgQm85XUcWFdxk/f421M9XqG1Wte+webFX45LXDlixKa2A==" + } +} diff --git a/pkgs/by-name/no/notion-app/update/update.mjs b/pkgs/by-name/no/notion-app/update/update.mjs index d17e5d38bf9e..a4d56e8ff3d8 100755 --- a/pkgs/by-name/no/notion-app/update/update.mjs +++ b/pkgs/by-name/no/notion-app/update/update.mjs @@ -57,7 +57,7 @@ async function getInfo(liveCheckFile) { } async function main() { - const filePath = path.join(__dirname, "../info.json"); + const filePath = path.join(__dirname, "../sources.json"); /** @type {InfoMap} */ const oldInfo = JSON.parse( await fsPromises.readFile(filePath, { encoding: "utf-8" }) diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index 0999756f48aa..87ea74ede309 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "oh-my-posh"; - version = "29.20.0"; + version = "29.26.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "oh-my-posh"; tag = "v${finalAttrs.version}"; - hash = "sha256-EzdrqeWM85hh8lPxrweSPezydICRFyOStgDlEq8g9+8="; + hash = "sha256-hE3L7emTk7MxzBUqSUDNKYiA2H1w9mcGhPYiR1OhYxg="; }; - vendorHash = "sha256-PAdk6nf750wL619W6nyt1Ne/eYYlVkewIhWirNi9rK8="; + vendorHash = "sha256-6DX/x9uWUbwXy9ccB6NIVRKsOc1nJXtctItONAI7zPQ="; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/ol/olm/package.nix b/pkgs/by-name/ol/olm/package.nix index 37ed67e9fb2f..0d0b15ee291a 100644 --- a/pkgs/by-name/ol/olm/package.nix +++ b/pkgs/by-name/ol/olm/package.nix @@ -5,16 +5,19 @@ cmake, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "olm"; version = "3.2.16"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitLab { domain = "gitlab.matrix.org"; owner = "matrix-org"; repo = "olm"; - rev = version; - sha256 = "sha256-JX20mpuLO+UoNc8iQlXEHAbH9sfblkBbM1gE27Ve0ac="; + tag = finalAttrs.version; + hash = "sha256-JX20mpuLO+UoNc8iQlXEHAbH9sfblkBbM1gE27Ve0ac="; }; nativeBuildInputs = [ cmake ]; @@ -94,4 +97,4 @@ stdenv.mkDerivation rec { '' ]; }; -} +}) diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix index 3d6293a20071..85ad6c72d8a1 100644 --- a/pkgs/by-name/ol/olympus-unwrapped/package.nix +++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix @@ -22,9 +22,9 @@ let phome = "$out/lib/olympus"; # The following variables are to be updated by the update script. - version = "26.06.06.03"; - buildId = "5632"; # IMPORTANT: This line is matched with regex in update.sh. - rev = "bc2ed6f1e1082d4bff67c871be2d0f215f6dbc85"; + version = "26.07.12.04"; + buildId = "5707"; # IMPORTANT: This line is matched with regex in update.sh. + rev = "e2fb5adc8c1b122b44f0d5aab84ef2d5d609812a"; in buildDotnetModule { pname = "olympus-unwrapped"; @@ -37,7 +37,7 @@ buildDotnetModule { owner = "EverestAPI"; repo = "Olympus"; fetchSubmodules = true; # Required. See upstream's README. - hash = "sha256-86APse6yodcqWUgi7eG/LJIcoN1JEiIgyKaZRHTstCY="; + hash = "sha256-0ChH9lm1RZU8MdNF12fZneAXHpKwr7j/0m42eBoqw0E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix index 09208f3e79a2..17d891a27037 100644 --- a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix +++ b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix @@ -12,7 +12,7 @@ optipng, x265, libde265, - icu78, + icu, jdk, lib, nodejs_22, @@ -30,9 +30,6 @@ }: let - # default at the time of writing is still 76, - # but libv8 from nodejs_22 needs 78 - icu = icu78; openssl' = openssl.override { enableMD2 = true; static = true; diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix index 96713155bebd..793a766a5e48 100644 --- a/pkgs/by-name/op/openrct2/package.nix +++ b/pkgs/by-name/op/openrct2/package.nix @@ -32,40 +32,22 @@ speexdsp, versionCheckHook, zlib, + zstd, withDiscordRpc ? false, + verifyAssets ? true, # Paths to RCT1 and RCT2 installs can be specified to have them added as a wrapped argument rct1Path ? null, rct2Path ? null, }: -let - objects-version = "1.7.10"; - openmusic-version = "1.6.1"; - opensfx-version = "1.0.6"; - title-sequences-version = "0.4.26"; - - objects = fetchurl { - url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip"; - hash = "sha256-9IO+Jm3CIHe6hRe78y/+OIw1Q7LuWF4K+9QQLbRSgCE="; - }; - openmusic = fetchurl { - url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${openmusic-version}/openmusic.zip"; - hash = "sha256-mUs1DTsYDuHLlhn+J/frrjoaUjKEDEvUeonzP6id4aE="; - }; - opensfx = fetchurl { - url = "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${opensfx-version}/opensound.zip"; - hash = "sha256-BrkPPhnCFnUt9EHVUbJqnj4bp3Vb3SECUEtzv5k2CL4="; - }; - title-sequences = fetchurl { - url = "https://github.com/OpenRCT2/title-sequences/releases/download/v${title-sequences-version}/title-sequences.zip"; - hash = "sha256-2ruXh7FXY0L8pN2fZLP4z6BKfmzpwruWEPR7dikFyFg="; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "openrct2"; version = "0.5.3"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; @@ -73,6 +55,34 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-my7fPBD5N0bO1yPaxwHUFqw6TvayQs10kcAX/NqPpIg="; }; + passthru = { + updateScript = ./update.sh; + + objects-version = "1.7.10"; + openmusic-version = "1.6.1"; + opensfx-version = "1.0.6"; + title-sequences-version = "0.4.26"; + + assets = { + objects = fetchurl { + url = "https://github.com/OpenRCT2/objects/releases/download/v${finalAttrs.passthru.objects-version}/objects.zip"; + hash = "sha256-9IO+Jm3CIHe6hRe78y/+OIw1Q7LuWF4K+9QQLbRSgCE="; + }; + openmusic = fetchurl { + url = "https://github.com/OpenRCT2/OpenMusic/releases/download/v${finalAttrs.passthru.openmusic-version}/openmusic.zip"; + hash = "sha256-mUs1DTsYDuHLlhn+J/frrjoaUjKEDEvUeonzP6id4aE="; + }; + opensfx = fetchurl { + url = "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${finalAttrs.passthru.opensfx-version}/opensound.zip"; + hash = "sha256-BrkPPhnCFnUt9EHVUbJqnj4bp3Vb3SECUEtzv5k2CL4="; + }; + title-sequences = fetchurl { + url = "https://github.com/OpenRCT2/title-sequences/releases/download/v${finalAttrs.passthru.title-sequences-version}/title-sequences.zip"; + hash = "sha256-2ruXh7FXY0L8pN2fZLP4z6BKfmzpwruWEPR7dikFyFg="; + }; + }; + }; + nativeBuildInputs = [ cmake pkg-config @@ -104,6 +114,7 @@ stdenv.mkDerivation (finalAttrs: { openssl speexdsp zlib + zstd ] ++ lib.optional withDiscordRpc discord-rpc; @@ -117,31 +128,21 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = '' mkdir -p $sourceRoot/data/{object,sequence} - unzip -o ${objects} -d $sourceRoot/data/object - unzip -o ${openmusic} -d $sourceRoot/data - unzip -o ${opensfx} -d $sourceRoot/data - unzip -o ${title-sequences} -d $sourceRoot/data/sequence - ''; - - # Fix blank changelog & contributors screen. See https://github.com/OpenRCT2/OpenRCT2/issues/16988 - postPatch = '' - substituteInPlace src/openrct2/platform/Platform.Linux.cpp \ - --replace-fail "/usr/share/doc/openrct2" "$out/share/doc/openrct2" + unzip -o ${finalAttrs.passthru.assets.objects} -d $sourceRoot/data/object + unzip -o ${finalAttrs.passthru.assets.openmusic} -d $sourceRoot/data + unzip -o ${finalAttrs.passthru.assets.opensfx} -d $sourceRoot/data + unzip -o ${finalAttrs.passthru.assets.title-sequences} -d $sourceRoot/data/sequence ''; preConfigure = # Verify that the correct version of each third party repository is used. - ( - let - versionCheck = assetKey: url: '' - grep -qF '"${url}"' assets.json \ - || (echo "${assetKey} differs from expected version!"; exit 1) - ''; - in - (versionCheck "objects" objects.url) - + (versionCheck "openmusic" openmusic.url) - + (versionCheck "opensfx" opensfx.url) - + (versionCheck "title-sequences" title-sequences.url) + lib.optionalString verifyAssets ( + lib.concatStringsSep "\n" ( + lib.mapAttrsToList (assetName: asset: '' + grep -qF '"${asset.url}"' assets.json \ + || (echo "${assetName} differs from expected version!"; exit 1) + '') finalAttrs.passthru.assets + ) ); doInstallCheck = true; @@ -152,8 +153,6 @@ stdenv.mkDerivation (finalAttrs: { ${lib.optionalString (rct2Path != null) "--add-flags '--rct2-data-path=\"${rct2Path}\"'"} ''; - passthru.updateScript = ./update.sh; - meta = { description = "Open source re-implementation of RollerCoaster Tycoon 2"; longDescription = '' diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix index b0399e076f00..ca7a3512042f 100644 --- a/pkgs/by-name/op/opentofu/package.nix +++ b/pkgs/by-name/op/opentofu/package.nix @@ -16,13 +16,13 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; tag = "v${version}"; - hash = "sha256-/Or8+rMsGbZ9aY/oSOqHH0vMFx9Pl0ZRa9KrVJ4X8Ls="; + hash = "sha256-WuSvKev+kLbW0TVRJacEtX2o0fueZ5c2UYcVXQo4Q9Q="; }; vendorHash = "sha256-t4RVH90TSTwxNPR2tKQsk8qd6d2OP8MmjAjgIZx7OVY="; diff --git a/pkgs/by-name/op/opentxl/package.nix b/pkgs/by-name/op/opentxl/package.nix index ab1b5896ba1c..78ade6cb6f3f 100644 --- a/pkgs/by-name/op/opentxl/package.nix +++ b/pkgs/by-name/op/opentxl/package.nix @@ -4,6 +4,7 @@ makeWrapper, opentxl-unwrapped, targetPackages, + withCompiler ? true, }: let inherit (targetPackages.stdenv.cc) targetPrefix; @@ -29,19 +30,21 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin # Wrap compiler - makeWrapper ${opentxl-unwrapped}/bin/txlc \ - $out/bin/${targetPrefix}txlc \ - --set TXLLIB ${opentxl-unwrapped}/lib \ - --set BUILD_TXLLIB ${opentxl-unwrapped}/lib \ - --set TARGET_TXLLIB ${targetOpentxl}/lib \ - --set CC ${targetPackages.stdenv.cc}/bin/${targetPrefix}cc \ - --set OS ${opentxl-unwrapped.osOption stdenv.targetPlatform} - ${ - # For convenience, if there is a target prefix, create a symlink named txlc - lib.optionalString (targetPrefix != "") '' - ln -s $out/bin/${targetPrefix}txlc $out/bin/txlc - '' - } + ${lib.optionalString withCompiler '' + makeWrapper ${opentxl-unwrapped}/bin/txlc \ + $out/bin/${targetPrefix}txlc \ + --set TXLLIB ${opentxl-unwrapped}/lib \ + --set BUILD_TXLLIB ${opentxl-unwrapped}/lib \ + --set TARGET_TXLLIB ${targetOpentxl}/lib \ + --set CC ${targetPackages.stdenv.cc}/bin/${targetPrefix}cc \ + --set OS ${opentxl-unwrapped.osOption stdenv.targetPlatform} + ${ + # For convenience, if there is a target prefix, create a symlink named txlc + lib.optionalString (targetPrefix != "") '' + ln -s $out/bin/${targetPrefix}txlc $out/bin/txlc + '' + } + ''} # Wrap other scripts for name in txl2c txlp; do diff --git a/pkgs/by-name/op/openusage/package.nix b/pkgs/by-name/op/openusage/package.nix new file mode 100644 index 000000000000..6d4326bc5d68 --- /dev/null +++ b/pkgs/by-name/op/openusage/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenvNoCC, + fetchurl, + nix-update-script, + undmg, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "openusage"; + version = "0.6.13"; + + # if is aarch64 download aarch64, otherwise intel + src = + if stdenvNoCC.hostPlatform.isAarch64 then + fetchurl { + url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_aarch64.dmg"; + hash = "sha256-Zfv1VAJSDHFdo2R9KgZ3TN/gu2Ua9Uleq5wNXrBBEH4="; + } + else if stdenvNoCC.hostPlatform.isx86_64 then + fetchurl { + url = "https://github.com/robinebers/openusage/releases/download/v${finalAttrs.version}/OpenUsage_${finalAttrs.version}_x64.dmg"; + hash = "sha256-tllecJOGNUDG3GwQhjeRaNrTHVK2GPzstfiT/GanZmM="; + } + else + throw "Unsupported architecture"; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r "OpenUsage.app" $out/Applications/ + + runHook postInstall + ''; + + nativeBuildInputs = [ undmg ]; + sourceRoot = "."; + + dontBuild = true; + dontFixup = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Burning through your subscriptions too fast? Paying for stuff you never use? Stop guessing. OpenUsage is free and open source."; + homepage = "https://www.openusage.ai/"; + changelog = "https://github.com/robinebers/openusage/releases/tag/v${finalAttrs.version}"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.darwin; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ myzel394 ]; + }; +}) diff --git a/pkgs/by-name/or/orion-browser/package.nix b/pkgs/by-name/or/orion-browser/package.nix new file mode 100644 index 000000000000..280e11396949 --- /dev/null +++ b/pkgs/by-name/or/orion-browser/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + fetchurl, + makeWrapper, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "orion-browser"; + version = "149"; + + src = fetchurl { + url = "https://cdn.kagi.com/updates/26_0/${finalAttrs.version}.zip"; + hash = "sha256-C0mtGNE9Or0alFe2Gu4LkRcHMvk1RLXZ/mUo/XtWB2g="; + }; + + strictDeps = true; + __structuredAttrs = true; + + unpackCmd = "unzip -q $curSrc -x '__MACOSX/*'"; + + nativeBuildInputs = [ + makeWrapper + unzip + ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" "$out/bin" + cp -R Orion.app "$out/Applications" + makeWrapper "$out/Applications/Orion.app/Contents/MacOS/Orion" "$out/bin/orion" + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "WebKit-based web browser by Kagi"; + homepage = "https://orionbrowser.com/"; + changelog = "https://orionbrowser.com/updates/orion-release-notes"; + license = lib.licenses.unfree; + mainProgram = "orion"; + maintainers = with lib.maintainers; [ pradyuman ]; + platforms = [ "aarch64-darwin" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/or/orion-browser/update.sh b/pkgs/by-name/or/orion-browser/update.sh new file mode 100755 index 000000000000..d362428fd5c5 --- /dev/null +++ b/pkgs/by-name/or/orion-browser/update.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env nix +#!nix shell -f ```` curl jq libplist _7zz common-updater-scripts -c bash + +set -euo pipefail + +macos_version="26_0" + +tmpdir="$(mktemp -d)" +trap 'rm -rf "$tmpdir"' EXIT + +dmg="$tmpdir/Orion.dmg" +curl -fsSL -o "$dmg" "https://cdn.kagi.com/downloads/$macos_version/Orion.dmg" +version="$( + 7zz e -so "$dmg" "Orion/Orion.app/Contents/Info.plist" \ + | plistutil -i - -f json -o - \ + | jq -r '.CFBundleVersion' +)" + +if [[ -z "$version" ]]; then + echo "[update] Failed to read Orion version from Info.plist" >&2 + exit 1 +fi + +zip="$tmpdir/Orion.zip" +curl -fsSL -o "$zip" "https://cdn.kagi.com/updates/$macos_version/$version.zip" +hash="$(nix hash file --type sha256 --sri "$zip")" + +update-source-version orion-browser "$version" "$hash" diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix index 619af6e5ab06..ba985ef0cb09 100644 --- a/pkgs/by-name/ov/ov/package.nix +++ b/pkgs/by-name/ov/ov/package.nix @@ -6,26 +6,27 @@ installShellFiles, pandoc, makeWrapper, - testers, - ov, + nix-update-script, + versionCheckHook, }: buildGoModule (finalAttrs: { pname = "ov"; - version = "0.51.1"; + version = "0.54.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; tag = "v${finalAttrs.version}"; - hash = "sha256-Wt7XF1/l5WwdlrnFLyJPYoXyaWhE+uF1RAN68iol3qM="; + hash = "sha256-cIjtu4T9It+u/ZVC+XoUacvnYw51QSnbTNge1QaHr0s="; }; - vendorHash = "sha256-rfUE38Wfo29s9GRsg/F/FCIto9yikE4b9QwLxYjvSg8="; + vendorHash = "sha256-eQh/S2isNvT9l+A4uK+/APcw+krsFL54OD5E6yEduxU="; ldflags = [ "-s" - "-w" "-X=main.Version=v${finalAttrs.version}" "-X=main.Revision=${finalAttrs.src.rev}" ]; @@ -61,11 +62,13 @@ buildGoModule (finalAttrs: { cp $src/ov.yaml $doc/share/$name/sample-config.yaml ''; - passthru.tests = { - version = testers.testVersion { - package = ov; - version = "v${finalAttrs.version}"; - }; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; }; meta = { @@ -73,7 +76,7 @@ buildGoModule (finalAttrs: { homepage = "https://noborus.github.io/ov"; changelog = "https://github.com/noborus/ov/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ Holiu618 ]; mainProgram = "ov"; }; }) diff --git a/pkgs/by-name/pa/packetry/package.nix b/pkgs/by-name/pa/packetry/package.nix index 256dd0437f6e..a66f9d169798 100644 --- a/pkgs/by-name/pa/packetry/package.nix +++ b/pkgs/by-name/pa/packetry/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "packetry"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "greatscottgadgets"; repo = "packetry"; tag = "v${finalAttrs.version}"; - hash = "sha256-eDVom0kAL1QwO8BtrJS76VTvxtKs7CP6Ob5BWlE6wOM="; + hash = "sha256-mgQmorh/MSSufVyOspVtZhBn4nS1vITAiiDXv+/dc/o="; }; - cargoHash = "sha256-he+Y2vBCw5lmYe5x6myIxMKRIohBCLDQ/B1EV+4pKGs="; + cargoHash = "sha256-qku45EAnsZetQ3Q0Y5Pr1OL/St0j6DGIjnlohA8+pDs="; nativeBuildInputs = [ pkg-config @@ -34,7 +34,8 @@ rustPlatform.buildRustPackage (finalAttrs: { # Disable test_replay tests as they need a gui preCheck = '' - sed -i 's:#\[test\]:#[test] #[ignore]:' src/test_replay.rs + substituteInPlace src/ui/test_replay.rs \ + --replace-fail '#[test]' '#[test] #[ignore]' ''; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix index 430dc5ac78db..051ef910cf8f 100644 --- a/pkgs/by-name/pa/parca-agent/package.nix +++ b/pkgs/by-name/pa/parca-agent/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "parca-agent"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "parca-dev"; repo = "parca-agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-/fKwv3vrPQmjsi09W613hnSsUnQsz7+/0+d8rrE2w/s="; + hash = "sha256-IBDl2TKYFGBKb0IW8vRGdByFtjfrhBNdRcnVvDjcOjg="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-ySoxn+RXh8pRzZ2SniBBgkUCecLNm1EWunUNRSM2SXk="; + vendorHash = "sha256-vDjaA307C9azCKD0SRz06ZulMgHlULr6/x3yjPIefUo="; buildInputs = [ stdenv.cc.libc.static diff --git a/pkgs/by-name/pa/passless/package.nix b/pkgs/by-name/pa/passless/package.nix index 844a9ba6652d..cc28b1bbd917 100644 --- a/pkgs/by-name/pa/passless/package.nix +++ b/pkgs/by-name/pa/passless/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "passless"; - version = "0.12.0"; + version = "0.13.0"; __structuredAttrs = true; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "pando85"; repo = "passless"; tag = "v${finalAttrs.version}"; - hash = "sha256-tPlCiXokONUswwEDB2e23gR/NU6G+VYHgqfE+RyRsxw="; + hash = "sha256-ZfIScs+ougawn/tXK8PBme13CEdvxeL8/D38b3F/bcg="; }; - cargoHash = "sha256-cNVmzK/W1jER6eK33JgFVnAN/6vGY4gw3GHB/H5DbIQ="; + cargoHash = "sha256-RpfegA8nH8chbHXHbuWMRH9drSrnBRQwYJtnw2Sqymw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/pe/periphery/package.nix b/pkgs/by-name/pe/periphery/package.nix new file mode 100644 index 000000000000..03a52e404ca1 --- /dev/null +++ b/pkgs/by-name/pe/periphery/package.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenvNoCC, + fetchzip, + versionCheckHook, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "periphery"; + version = "3.7.4"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchzip { + url = "https://github.com/peripheryapp/periphery/releases/download/${finalAttrs.version}/periphery-${finalAttrs.version}.zip"; + hash = "sha256-p40+MvqHczG3iuWU+l0uOS96Zkxv/p88CBhs90b3168="; + stripRoot = false; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm755 periphery $out/bin/periphery + install -Dm755 libIndexStore.dylib $out/bin/libIndexStore.dylib + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Unused code detector for Swift projects"; + homepage = "https://github.com/peripheryapp/periphery"; + changelog = "https://github.com/peripheryapp/periphery/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "periphery"; + maintainers = with lib.maintainers; [ jeremystucki ]; + platforms = lib.platforms.darwin; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/pg/pgdog/package.nix b/pkgs/by-name/pg/pgdog/package.nix index 195a9c4387f4..3c542e1af043 100644 --- a/pkgs/by-name/pg/pgdog/package.nix +++ b/pkgs/by-name/pg/pgdog/package.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { pname = "pgdog"; - version = "0.1.47"; + version = "0.1.48"; src = fetchFromGitHub { owner = "pgdogdev"; repo = "pgdog"; tag = "v${finalAttrs.version}"; - hash = "sha256-+YHn3gkKqrZuOZreItSXBjbn4A78wmf8r+dSRUD2at8="; + hash = "sha256-0lun9HmJvpSWguckUtudDcNlBc/KgpHk/fBJnj4HSuo="; }; - cargoHash = "sha256-W4XbcsFUk8g86zpPgYb/WztVoeCklIQmEhylQSE2a8E="; + cargoHash = "sha256-cNIjTNuxHPofkTYpEb3+8Jhqz5AMAeXj7avNAAOG5D8="; # Hardcoded paths for C compiler and linker postPatch = '' diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix index f103318e24d8..2f036acdaab1 100644 --- a/pkgs/by-name/pi/pi-coding-agent/package.nix +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -12,16 +12,16 @@ }: buildNpmPackage (finalAttrs: { pname = "pi-coding-agent"; - version = "0.80.3"; + version = "0.80.6"; src = fetchFromGitHub { owner = "earendil-works"; repo = "pi"; tag = "v${finalAttrs.version}"; - hash = "sha256-wQTrWKsb2HCGwzSAFEk8NWSDpqxSY/lv1/R6ghcmbaA="; + hash = "sha256-e/wcHruEcBAHDF5tKvwew7LXjVp0eraHh2k+QaL2sCA="; }; - npmDepsHash = "sha256-geh8LH88OZybFXkR/jDeTdew6TNMdFM6jhCSYKn//dU="; + npmDepsHash = "sha256-xXEOR0epZcfbXayYGyJdBiFVliamBexqA+1Sd7wlGhU="; npmWorkspace = "packages/coding-agent"; diff --git a/pkgs/by-name/pi/picgo/package.nix b/pkgs/by-name/pi/picgo/package.nix index 6692f1434b70..e751fa0e7c50 100644 --- a/pkgs/by-name/pi/picgo/package.nix +++ b/pkgs/by-name/pi/picgo/package.nix @@ -6,7 +6,7 @@ pnpm_10, fetchPnpmDeps, pnpmConfigHook, - electron_40, + electron_41, makeWrapper, copyDesktopItems, makeDesktopItem, @@ -18,20 +18,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "picgo"; - version = "2.5.3"; + version = "3.0.0"; src = fetchFromGitHub { owner = "Molunerfinn"; repo = "PicGo"; tag = "v${finalAttrs.version}"; - hash = "sha256-4Ih7PPBo6scJoUS8yTAR0iyG5vxNc/c0CCw5FGaIbHM="; + hash = "sha256-ruTgNgZsjpdu2Cc2Q4HxPdoQHUww1UTbvLazglaz75c="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) version src; inherit pnpm; pname = "picgo"; - hash = "sha256-tILvWDoHAN5XT1F/cJYgfeMzowuO/fhiughI+0FvHzc="; + hash = "sha256-IAuTtI0Ljm4+xCeMGIQAf7lK37CQ6qf7PJsksLIti7Q="; fetcherVersion = 3; # lockfileVersion 9.0 corresponds to fetcherVersion 3 }; @@ -56,6 +56,17 @@ stdenv.mkDerivation (finalAttrs: { runHook postBuild ''; + postBuild = '' + cp -r src/renderer/public/. dist_electron/renderer/ + + # Renderer assets are loaded from a file:// URL, so root-relative paths like + # /squareLogo.png resolve to the filesystem root. Copy the renderer public assets + # next to index.html and rewrite those references to relative paths. + # https://github.com/Molunerfinn/PicGo/blob/dev/src/renderer/components/independent-window/mini/picgo-mini-page.tsx + substituteInPlace dist_electron/renderer/assets/mini-*.js \ + --replace-fail '"/squareLogo.png"' '"./squareLogo.png"' + ''; + installPhase = '' runHook preInstall @@ -73,10 +84,20 @@ stdenv.mkDerivation (finalAttrs: { # Create startup script mkdir -p $out/bin - makeWrapper ${lib.getExe electron_40} $out/bin/picgo \ + # PicGo uses app.isPackaged to decide whether it is running in development mode. + # With the nixpkgs Electron wrapper the executable is still the generic electron + # binary, so app.isPackaged is false unless we force the packaged code path. + # https://github.com/Molunerfinn/PicGo/blob/4d92ca199b7afead168785d7375a525ca156b25f/src/main/utils/env.ts#L17-L22 + + # ELECTRON_FORCE_IS_PACKAGED makes PicGo use its production resource path, + # but with the nixpkgs Electron wrapper process.resourcesPath points to Electron + # itself, so point PicGo at the installed public assets + makeWrapper ${lib.getExe electron_41} $out/bin/picgo \ + --add-flags "--class=picgo" \ --add-flags "$out/lib/picgo/.launcher.cjs" \ - --add-flags "--name picgo" \ --set NODE_ENV production \ + --set ELECTRON_FORCE_IS_PACKAGED 1 \ + --set STATIC_PATH "$out/lib/picgo/public" \ --set-default ELECTRON_OZONE_PLATFORM_HINT auto \ --chdir "$out/lib/picgo" diff --git a/pkgs/by-name/pi/picocrypt-ng/package.nix b/pkgs/by-name/pi/picocrypt-ng/package.nix index 026dbbad8989..f3535dfa8f22 100644 --- a/pkgs/by-name/pi/picocrypt-ng/package.nix +++ b/pkgs/by-name/pi/picocrypt-ng/package.nix @@ -12,6 +12,7 @@ pkg-config, wrapGAppsHook3, writableTmpDirAsHomeHook, + llvmPackages, }: buildGoModule (finalAttrs: { @@ -49,7 +50,9 @@ buildGoModule (finalAttrs: { pkg-config wrapGAppsHook3 writableTmpDirAsHomeHook - ]; + ] + # TODO: Remove once #536365 reaches this branch + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld; # git ls-files doesn't work as source is not a git repo checkFlags = @@ -61,7 +64,13 @@ buildGoModule (finalAttrs: { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; - env.CGO_ENABLED = 1; + env = { + CGO_ENABLED = 1; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # TODO: Remove once #536365 reaches this branch + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; postInstall = '' mv $out/bin/picocrypt $out/bin/picocrypt-ng-gui diff --git a/pkgs/by-name/pi/picocrypt/package.nix b/pkgs/by-name/pi/picocrypt/package.nix index cfa8906fdd91..4728d400dc5c 100644 --- a/pkgs/by-name/pi/picocrypt/package.nix +++ b/pkgs/by-name/pi/picocrypt/package.nix @@ -11,6 +11,7 @@ gtk3, pkg-config, wrapGAppsHook3, + llvmPackages, }: buildGoModule (finalAttrs: { @@ -46,9 +47,17 @@ buildGoModule (finalAttrs: { copyDesktopItems pkg-config wrapGAppsHook3 - ]; + ] + # TODO: Remove once #536365 reaches this branch + ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld; - env.CGO_ENABLED = 1; + env = { + CGO_ENABLED = 1; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # TODO: Remove once #536365 reaches this branch + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; postInstall = '' mv $out/bin/Picocrypt $out/bin/picocrypt-gui diff --git a/pkgs/by-name/pi/pinnacle/package.nix b/pkgs/by-name/pi/pinnacle/package.nix new file mode 100644 index 000000000000..7c62582fa34e --- /dev/null +++ b/pkgs/by-name/pi/pinnacle/package.nix @@ -0,0 +1,170 @@ +{ + rustPlatform, + lib, + pkg-config, + wayland, + lua54Packages, + lua5_4, + extraLuaPackages ? (ps: [ ]), + protobuf, + seatd, + systemdLibs, + libxkbcommon, + mesa, + xwayland, + libinput, + libdisplay-info, + git, + libgbm, + rustc, + cargo, + makeWrapper, + callPackage, + libglvnd, + autoPatchelfHook, + libxcursor, + libxi, + libxrandr, + libx11, + fetchFromGitHub, +}: +let + version = "0.2.4"; + pinnacle-src = fetchFromGitHub { + owner = "pinnacle-comp"; + repo = "pinnacle"; + tag = "v${version}"; + sha256 = "sha256-T8wZjgOTzYKfYUV1ShLBIi2xoCdVn9I7sux/pDH+8ic="; + }; + buildRustConfig = callPackage ./pinnacle-config.nix { inherit pinnacle-src; }; + + meta = { + description = "A WIP Smithay-based Wayland compositor, inspired by AwesomeWM and configured in Lua or Rust"; + homepage = "https://pinnacle-comp.github.io/pinnacle/"; + license = lib.licenses.gpl3; + mainProgram = "pinnacle"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ cassandracomar ]; + }; + + lua-client-api = lua54Packages.buildLuarocksPackage rec { + inherit meta version; + pname = "pinnacle-client-api"; + src = pinnacle-src; + sourceRoot = "${src.name}/api/lua"; + knownRockspec = "${pinnacle-src}/api/lua/rockspecs/pinnacle-api-0.2.4-1.rockspec"; + propagatedBuildInputs = with lua54Packages; [ + cqueues + http + lua-protobuf + compat53 + luaposix + ]; + + postInstall = '' + mkdir -p $out/share/pinnacle/protobuf/pinnacle + cp -rL --no-preserve ownership,mode ../../api/protobuf/pinnacle $out/share/pinnacle/protobuf + mkdir -p $out/share/pinnacle/snowcap/protobuf/snowcap + cp -rL --no-preserve ownership,mode ../../snowcap/api/protobuf/snowcap $out/share/pinnacle/snowcap/protobuf + mkdir -p $out/share/pinnacle/protobuf/google + cp -rL --no-preserve ownership,mode ../../api/protobuf/google $out/share/pinnacle/protobuf + mkdir -p $out/share/pinnacle/snowcap/protobuf/google + cp -rL --no-preserve ownership,mode ../../snowcap/api/protobuf/google $out/share/pinnacle/snowcap/protobuf + ''; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + inherit meta version; + + pname = "pinnacle-server"; + src = pinnacle-src; + cargoHash = "sha256-hM19RB2+ejC+OFU4keH+PKWYf5NRUXJ1W33eSUhKR/g="; + + buildInputs = [ + wayland + + # libs + seatd.dev + systemdLibs.dev + libxkbcommon + libinput + mesa + xwayland + libdisplay-info + libgbm + lua5_4 + + # winit on x11 + libxcursor + libxrandr + libxi + libx11 + ]; + + nativeBuildInputs = [ + pkg-config + protobuf + lua54Packages.luarocks + lua5_4 + lua-client-api + git + wayland + makeWrapper + autoPatchelfHook + ]; + + checkFeatures = [ "testing" ]; + checkNoDefaultFeatures = true; + cargoTestFlags = [ + "--exclude" + "wlcs_pinnacle" + "--all" + "--" + "--skip" + "process_spawn" + ]; + + preCheck = '' + export LD_LIBRARY_PATH="${lib.makeLibraryPath [ wayland ]}"; + export XDG_RUNTIME_DIR=$(mktemp -d) + ''; + + postInstall = '' + wrapProgram $out/bin/pinnacle --prefix PATH ":" ${ + lib.makeBinPath [ + rustc + cargo + finalAttrs.passthru.luaEnv + xwayland + ] + } + install -m755 ./resources/pinnacle-session $out/bin/pinnacle-session + mkdir -p $out/share/wayland-sessions + install -m644 ./resources/pinnacle.desktop $out/share/wayland-sessions/pinnacle.desktop + patchShebangs $out/bin/pinnacle-session + mkdir -p $out/share/xdg-desktop-portal + install -m644 ./resources/pinnacle-portals.conf $out/share/xdg-desktop-portal/pinnacle-portals.conf + install -m644 ./resources/pinnacle-portals.conf $out/share/xdg-desktop-portal/pinnacle-uwsm-portals.conf + ''; + + runtimeDependencies = [ + wayland + mesa + libglvnd # libEGL + ]; + + passthru = { + luaEnv = lua5_4.withPackages ( + ps: + [ + finalAttrs.passthru.lua-client-api + ps.cjson + ] + ++ (extraLuaPackages ps) + ); + inherit buildRustConfig; + providedSessions = [ "pinnacle" ]; + lua-client-api = lua-client-api; + }; + __structuredAttrs = true; +}) diff --git a/pkgs/by-name/pi/pinnacle/pinnacle-config.nix b/pkgs/by-name/pi/pinnacle/pinnacle-config.nix new file mode 100644 index 000000000000..e79180107fec --- /dev/null +++ b/pkgs/by-name/pi/pinnacle/pinnacle-config.nix @@ -0,0 +1,36 @@ +{ + rustPlatform, + protobuf, + pkg-config, + seatd, + libxkbcommon, + libinput, + lua5_4, + libdisplay-info, + libgbm, + pinnacle-src, +}: +args: +rustPlatform.buildRustPackage ( + (removeAttrs args [ + "nativeBuildInputs" + "buildInputs" + ]) + // { + PINNACLE_PROTOBUF_API_DEFS = "${pinnacle-src}/api/protobuf"; + PINNACLE_PROTOBUF_SNOWCAP_API_DEFS = "${pinnacle-src}/snowcap/api/protobuf"; + + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ + protobuf + pkg-config + ]; + buildInputs = (args.buildInputs or [ ]) ++ [ + seatd.dev + libxkbcommon + libinput + lua5_4 + libdisplay-info + libgbm + ]; + } +) diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix index 0c2a4e82a9da..7153f6efc502 100644 --- a/pkgs/by-name/pi/pixieditor/package.nix +++ b/pkgs/by-name/pi/pixieditor/package.nix @@ -46,13 +46,13 @@ let in buildDotnetModule (finalAttrs: { pname = "pixieditor"; - version = "2.1.1.4"; + version = "2.1.1.5"; src = fetchFromGitHub { owner = "PixiEditor"; repo = "PixiEditor"; tag = finalAttrs.version; - hash = "sha256-veTW5JkjGIgviYpnwSJca8uTATf/bq7hTgj7OrNL8m4="; + hash = "sha256-XtDcAnMgNc4Su2hj5OV2SP+LFIAMSfH8h2LLw+VbHok="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/pk/pkl-lsp/deps.json b/pkgs/by-name/pk/pkl-lsp/deps.json index 6c81e37261b1..8fec878a1bde 100644 --- a/pkgs/by-name/pk/pkl-lsp/deps.json +++ b/pkgs/by-name/pk/pkl-lsp/deps.json @@ -19,23 +19,23 @@ "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=", "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs=" }, - "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/8.4.0": { - "pom": "sha256-qJGqi+ZCZ2IVBb6uY6jeAqGACX3PO/wnBZ38b510pEA=" + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/8.7.0": { + "pom": "sha256-8B/rrWkBEaw5YLuUL0/j+kt1SxVAFCjWjF9DHmQMH6w=" }, - "com/diffplug/spotless#spotless-lib-extra/4.5.0": { - "jar": "sha256-dU+ATAnfouuNU5YzEdK+aPG0pWIQEdy1UNcC6tKGUdk=", - "module": "sha256-Bf7t0gVQynxXCeUc7zgpPFADpcx/qrdU6dusW3Vd4KU=", - "pom": "sha256-UPJN+KOGtZ48rS2ylhjHOYgEgZAQYENCsX5jxubdPGU=" + "com/diffplug/spotless#spotless-lib-extra/4.7.0": { + "jar": "sha256-vciax56nfFUzRzZDf6MuhsUW1aCbayIXgORXl2Pe6mw=", + "module": "sha256-AFuJ+A/N+YczpVVnUO23+fLPkMBMHMu7+A5RML0W478=", + "pom": "sha256-laJic+i5Lo37eI16VItXUsmhRLDZAzJnSwCmv1R+0zE=" }, - "com/diffplug/spotless#spotless-lib/4.5.0": { - "jar": "sha256-mM2f5ktjmNp6kPL9kG7wq8Gg5tZvUZ/mrwilhde7bak=", - "module": "sha256-AlNtIagrdaWmOaPNQWCgg5oanDXy3EwP9FJBtHafXTU=", - "pom": "sha256-SvSliKd1rChPrVC/EUkkZwAE9rgKCSkT9QSOb9Gj2fI=" + "com/diffplug/spotless#spotless-lib/4.7.0": { + "jar": "sha256-jF4uWKFEj1pjFvAb7cnQ9N3aOOiEwFYyTn28RDMVRns=", + "module": "sha256-49pdAIRCM2IzAulHWNjzEJE8/fmDXiFmEcG/Rhj0ECo=", + "pom": "sha256-ngcUx2+Ybr5vFPHHoAMfw94G0IHv6ml7JHSe/hHGTBc=" }, - "com/diffplug/spotless#spotless-plugin-gradle/8.4.0": { - "jar": "sha256-oHy1L8S4IhcWeW63AyMQakSjMZ7Itk5ugFb+gn+UOLo=", - "module": "sha256-lQhXXODePA1p+l+xrTWo2/iQKuoQVe/E0328FjyHMmc=", - "pom": "sha256-d0glMskp8EZGF/iXUT/CJNeuMlFeNIKaPO3F5WlH59s=" + "com/diffplug/spotless#spotless-plugin-gradle/8.7.0": { + "jar": "sha256-t2RIUI5I74DVOsiaEDicHfyecL7tgSHNaFVfpsuzLtM=", + "module": "sha256-cYKaVUWLRCHqEM18dHuYJVHrhJpNOwL3GkYEidxizA8=", + "pom": "sha256-fvGO4r+vYaYWhp3Ifyiyw7roBGXfkbcWhPZheHU2kMI=" }, "com/fasterxml#oss-parent/55": { "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" @@ -75,13 +75,13 @@ "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" }, - "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.4.1": { - "pom": "sha256-AdDekM9QXN9PKgCkLFJCe9JtIN+VrPCMnrvRnWyug0c=" + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.4.2": { + "pom": "sha256-qu9dz6fW7rPI6/NKwngGsguf9Wze3uAQ8yVRr16JUc4=" }, - "com/gradleup/shadow#shadow-gradle-plugin/9.4.1": { + "com/gradleup/shadow#shadow-gradle-plugin/9.4.2": { "jar": "sha256-QiPAjWXkx+HxILSpbnMZ34/j36ZV3fJmH2C7VtrPkaw=", - "module": "sha256-HqvAJjuZ/SRTCqADRTyLH7AoZt4QzYni8VLwAsOrBXg=", - "pom": "sha256-W15e5HPddlrSOzAbdIhbRzsrI32zHkFu6/VXSpU6JNQ=" + "module": "sha256-QLLd0qhM9ov7ur/ED8XLlNQvDTzrglMb8/eQ/xdeu9A=", + "pom": "sha256-TPRHwc6WyuND5uDnRPnOnD5jz+e9GQ9j/qbSdPFeKrU=" }, "com/squareup/okhttp3#okhttp/4.12.0": { "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=", @@ -98,17 +98,20 @@ "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, "commons-codec#commons-codec/1.21.0": { - "jar": "sha256-TahRy2q/uYv+nrd8Xl/Ef1QU+ii5TiG3/ZpkZwXcFn8=", "pom": "sha256-sjBBa6b1v534/Lbn9KbCa4+w/oXONx0T1YRu03aDCbc=" }, + "commons-codec#commons-codec/1.22.0": { + "jar": "sha256-0WT+efJiwy2bGKC1stMX0cJ2U9Xpj9K5mMJL+QHHLOQ=", + "pom": "sha256-2aVl2Xj6pp0rEZX7HsJ+YPKef+sJr7ha2sePKABo+P4=" + }, "commons-io#commons-io/2.21.0": { "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" }, - "dev/equo/ide#solstice/1.8.1": { - "jar": "sha256-bluizOgTvh1xzNwuzz5JJxsU5pG/u7GhFM86MOdzsQ0=", - "module": "sha256-pnYDnqavCPJXtG4Hwr8VcaRqTUtbnMuGw/yY0H+v6hs=", - "pom": "sha256-arSo7K4qu9NrkZ0Lm5+yTBdxSPE+U2TJegxu4Ro/xCY=" + "dev/equo/ide#solstice/1.8.2": { + "jar": "sha256-nslXwJZgBSDcmfN6EEp/TJkNQMLdN17pYOt8bNUMEvM=", + "module": "sha256-SrIVTJ83agthp6/i0djQJ+pvOQ08hyzkcKbZgqR+Wv4=", + "pom": "sha256-70jsrBwclJAdj/ML8J16CClTQCNnLdXiVyek6Vh+oFM=" }, "io/github/gradle-nexus#publish-plugin/2.0.0": { "jar": "sha256-lCwaFtFh9kYxkBtOLa1UHS/L/lHPAyOVXavgLiqe8qo=", @@ -147,6 +150,9 @@ "org/apache/commons#commons-parent/96": { "pom": "sha256-LNMom0TvpTBS2c2vPwVUSDOlIKaC+cf/1AOgC7sVf5o=" }, + "org/apache/commons#commons-parent/98": { + "pom": "sha256-1AMYUn9WAz4P8HiZccw4yFaqmaaF7qEScIFOfx7an7o=" + }, "org/apache/groovy#groovy-bom/4.0.27": { "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs=" @@ -209,16 +215,16 @@ "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, - "org/eclipse/jgit#org.eclipse.jgit-parent/7.5.0.202512021534-r": { - "pom": "sha256-fjiAaoU2kaSdsW6sg2/mtiYnaUOxCLZ3VKPVx0D7vA4=" + "org/eclipse/jgit#org.eclipse.jgit-parent/7.7.0.202606012155-r": { + "pom": "sha256-S4qHPLaFhEH/MSUDTbVU0leSL7cIIEeVtyAZDW+05iE=" }, - "org/eclipse/jgit#org.eclipse.jgit/7.5.0.202512021534-r": { - "jar": "sha256-FZe8eKjYwBFpdtRqlIcqLMKGVnDrpNsLn1GBGzSTbXI=", - "pom": "sha256-bJVN/BDxwwG9uiXT1jCfd0eYBDY891VuUei7NxRVXGQ=" + "org/eclipse/jgit#org.eclipse.jgit/7.7.0.202606012155-r": { + "jar": "sha256-onxHjV94vD2VRh8VOmDv3xYjknUCxopFetmplaNcWnw=", + "pom": "sha256-owH00aR2nxrSVstU54V6Uq8n59A+UMo8UPTLZDw98SY=" }, - "org/eclipse/platform#org.eclipse.osgi/3.24.100": { - "jar": "sha256-0g+JIDBZb7wsJdoArNvSdQ93zv1oE2wzo+J5uJSYZ6g=", - "pom": "sha256-+U4i9QNmKcxz7AM41+C5wFx2g70TZ4wWa8p/fIfm+oE=" + "org/eclipse/platform#org.eclipse.osgi/3.24.200": { + "jar": "sha256-v+g/zR+gNOuamGs8tuXisY27rLZ+q9qtLaMoBOzYxlo=", + "pom": "sha256-sMVs+qxqcAh+RUJXzABLfTb7uYk9vu5N64fGISWGERY=" }, "org/gradle/kotlin#gradle-kotlin-dsl-plugins/6.5.7": { "jar": "sha256-zIyqQQGjXQzwQzpj6K04kRpMhIBz/MlPQ64CUfM+Ta8=", @@ -413,15 +419,15 @@ "org/mockito#mockito-bom/5.20.0": { "pom": "sha256-YmvA9584nSxBVD0W2NnbC1OtCEjMN6bgtM53Gk/gvEk=" }, - "org/slf4j#slf4j-api/2.0.17": { - "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", - "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + "org/slf4j#slf4j-api/2.0.18": { + "jar": "sha256-RFCP0VdlAGiMeQsZCs3Rb+xPjHmj4LkAr9cFA88FX1U=", + "pom": "sha256-bCx/LAJ3TMK3thn70t94c82tKXGJJuRHVLh/cNHrQ8s=" }, - "org/slf4j#slf4j-bom/2.0.17": { - "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + "org/slf4j#slf4j-bom/2.0.18": { + "pom": "sha256-khmqtgFXUSbE5m4TMesrDGwXozCsTVoH480R1YCgwS0=" }, - "org/slf4j#slf4j-parent/2.0.17": { - "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + "org/slf4j#slf4j-parent/2.0.18": { + "pom": "sha256-CziWvtrSye2Wl+3L6h2gxUzSOKcjWDqBNYqDv7eC6fo=" }, "org/sonatype/oss#oss-parent/5": { "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" @@ -437,9 +443,9 @@ "jar": "sha256-IRswbPxE+Plt86Cj3a91uoxSie7XfWDXL4ibuFX1NeU=", "pom": "sha256-CTvhsDMxvOKTLWglw36YJy12Ieap6fuTKJoAJRi43Vo=" }, - "org/vafer#jdependency/2.15": { - "jar": "sha256-8oND1aDWjpYYeI42bfWgRDgGGVU5Fy7R0yBcYr5OQZM=", - "pom": "sha256-27DNFL99Z65IZrkSTINMWVCZ8aT8k7f0YRp/64yLlaM=" + "org/vafer#jdependency/2.16": { + "jar": "sha256-hpgdL1CrFe6+GpD4Q6GV8o8L0e5SJV12pz7AtLfsec0=", + "pom": "sha256-+jUpmw0MRzE9cDZKddILmsOoh0Q8Yyx+z1C6ffiHG+U=" } }, "https://repo.maven.apache.org/maven2": { @@ -555,9 +561,9 @@ "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=", "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw=" }, - "io/github/tree-sitter#jtreesitter/0.25.6": { - "jar": "sha256-8ABQJa5DDSStzYhGuwXMQ40fwccS1f7NtOBtzRcOC8Q=", - "pom": "sha256-IqAc23/XMgCg2sGm2QynVzqMU4kQhZTGxOllcZbo5Uw=" + "io/github/tree-sitter#jtreesitter/0.26.1": { + "jar": "sha256-FVulpLS1mAa4NddFpmxKsfnfxBK+ZiBl1jUdOLVyPjE=", + "pom": "sha256-5/hz9xOmKAF7j8KOcDBk1GN8CQidYSRQEFvvlUbzmsg=" }, "net/bytebuddy#byte-buddy-parent/1.18.3": { "pom": "sha256-kOpTFzFQjup1/5KVFBxQjX+aU9GgX0W4D49JmVIUJu8=" @@ -827,14 +833,6 @@ "jar": "sha256-VCo2/lrlw1t7tMwpcQDzY007X5fHtfeM5ENiGDC7vvQ=", "pom": "sha256-xARZ8GJeuKt2KJcbQvqint7UvIdcJe+7owkmlLD/vpE=" }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.2.20": { - "jar": "sha256-O9Juy20Sl4xcTgtB92yf9VH6wqXmJoQnqdKgzfilrZE=", - "pom": "sha256-Cukeav/wZg79os8CjFvbnnoehn4Z3CyOuuiaglcUOOI=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.2.20": { - "jar": "sha256-wxQXeTXY3C7ah5UHEX8l1t5W9sV+3plBaxTNYiu54J0=", - "pom": "sha256-NditbBnaV6t00h7YHdxYSZt8GwAlEbXoUgANuwxYq64=" - }, "org/jetbrains/kotlin#kotlin-stdlib/2.3.20": { "jar": "sha256-CuElBKUEDrrzdwOQhINCDRpWJN0dk/NXZl+Md8hIoB4=", "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=", @@ -899,93 +897,93 @@ "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" }, - "org/junit#junit-bom/5.13.4": { - "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", - "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" + "org/junit#junit-bom/6.1.0": { + "module": "sha256-SCB/lc3sO/tc5sy/GNUqzlHoFfIRBp3BbgKDslWmTZo=", + "pom": "sha256-97Zl5dVzsBr21DTT0kUKpbdBtoPz8QFy8etEo9DQrAw=" }, - "org/junit#junit-bom/6.0.3": { - "module": "sha256-KA48NIVfKhPeJBIZN+TPl+S565IG5g+JHk8KHPDnq6E=", - "pom": "sha256-plW2pdwA0b68kfsrFcDH6K6snWvc+HlZVQU3DidTAoc=" + "org/junit#junit-bom/6.1.1": { + "module": "sha256-QLwON45eR3J0jqqc5ZM0dNSI0lq8TpJQsEVT1hb7mug=", + "pom": "sha256-EKrIAzxbuWlykvg3Zdo6yRdSJL6ttrnXVfOLW0ymozU=" }, - "org/junit/jupiter#junit-jupiter-api/6.0.3": { - "jar": "sha256-1lXX5vDHrgfxCi87uq67bTDpsmIEoGitnps5UKooeSw=", - "module": "sha256-6k1/evmsFrsuF34miQeJb6PG+a5QcmBNRoLXrv/inKg=", - "pom": "sha256-dmyA+zGOFgDr9smpId6AGIexVIqigtataRiLdgjVbUc=" + "org/junit/jupiter#junit-jupiter-api/6.1.0": { + "jar": "sha256-UPl+uADC6Ij6ojegb1oO9EX67VVn+ZTawMK50niprSA=", + "module": "sha256-HQFsKC2GuCGvWz2zd7cJrZI4tUyJSzMjzRsj6lMSl9Y=", + "pom": "sha256-000J8MyNqqQOMC26REEyf8BF+gvV39qC0ho3IBj3i4c=" }, - "org/junit/jupiter#junit-jupiter-engine/6.0.3": { - "jar": "sha256-Hi+rYa0n6gj8fHDdlnfPjG0a5UNNQtz91jOxLH58BNA=", - "module": "sha256-03TlhvHApdyh+00ZNJ4KgEqRc7lh+EHijPxYgeLmUV0=", - "pom": "sha256-uvvAmTJsGIPw7hywVtMbQiLiYWX5+aqbiW89P3ijFTg=" + "org/junit/jupiter#junit-jupiter-engine/6.1.0": { + "jar": "sha256-6nB7lkcIRhmg/JEc77JQN1QNWLKAD46tH8aiuvWLHaU=", + "module": "sha256-qxcPpDeU24cKcgzDt6LWdi3MRXcyjv2vizCOaNLH79E=", + "pom": "sha256-h+13EyLIt6c55oZct+WGTqwoj9IL1qP8Vjtiov8sSVo=" }, - "org/junit/jupiter#junit-jupiter-params/6.0.3": { - "jar": "sha256-zylH4jArn4yKBZJZoneIHBytro+8JRTBapJc/re+suU=", - "module": "sha256-1LBksP8UD1Vd0GdEscxr//wQ9SSbLdWqRprl9NTv7Cg=", - "pom": "sha256-mVtk7KoiJ8S1Xz6453c19URDSi7Cz+7QYF6LrxCCY94=" + "org/junit/jupiter#junit-jupiter-params/6.1.0": { + "jar": "sha256-uYfuoyBRhadvNlmjnmdQPLe2gti3vgO+S5+StxDw7sA=", + "module": "sha256-evPVYvC8fWUmA2HlcT5vzVVQuZcqGA1vxM2itoJM4pc=", + "pom": "sha256-ZOXfB1ZYuUmh2lSyEp6jHOY87fodJTEHWgBxlJnOwEY=" }, - "org/junit/jupiter#junit-jupiter/6.0.3": { - "jar": "sha256-eEtlgV9HmgyZqdOlc7FC4qUl77YCXZf3UbGecvkK7aM=", - "module": "sha256-gaZM8ir7jnaHVSE+nIDr06sDMc5ACm/WOeQ6VJWtj+A=", - "pom": "sha256-vO0g6RqqVnfxupb6b3GBAKuD6JSlLplhtgBMBWoYRew=" + "org/junit/jupiter#junit-jupiter/6.1.0": { + "jar": "sha256-pOQgtcboFwMjtMXJeuNbyg1iC+n5z+NwBoIPU5MfJ6M=", + "module": "sha256-Kl2tWs4texVUiGguY6LrDxS7YA+fbx+75B3QGylMZ0g=", + "pom": "sha256-Rme8comEZvz6eQGJJmuiXGtmrV4WpOVgJgM5euWn4q0=" }, - "org/junit/platform#junit-platform-commons/6.0.3": { - "jar": "sha256-OfJi0Jw9UnGf4Ld/CA6Qo2leKF13mkGyMuF5Y65dogA=", - "module": "sha256-nfLma22VBAClGKmt00M9CjBxzhwzpvgPnPIlYtUpRbc=", - "pom": "sha256-vbjiS+l+Dll2nyFktTYfVSJ5WN9BA9aGgvh3mtLKjX0=" + "org/junit/platform#junit-platform-commons/6.1.0": { + "jar": "sha256-HZBGqxfsftr7C8eUXS5Z1xgP/08oxzS4I7UQAedp9xs=", + "module": "sha256-eVv++8OD8DMoadK4AUJSK65GKjkFu6ntSbe8NcQf64A=", + "pom": "sha256-yRmWB2BYBu8YXQT9RpVRsrShUQos6twHTbRBvXf23TY=" }, - "org/junit/platform#junit-platform-engine/6.0.3": { - "jar": "sha256-SR6eT3RfFhuKjkGGoafGpFDqEscJMMmu2uQnIVMB2Uc=", - "module": "sha256-U1qGeP2rxB2/DEHMW3Vh7xINdWUMPcOTAqfWCTdmE5M=", - "pom": "sha256-eofYxqCn2wJgsAzjAxgPb0HQQFYoldaARhnV227iMr4=" + "org/junit/platform#junit-platform-engine/6.1.0": { + "jar": "sha256-P7a+dsJqsPlP4ITj/Qo54dJeIhKZKaYbKb2AoFK5PqU=", + "module": "sha256-OnbyFfpzfJbOlycTqva0UYePpzOVX/IbDNao+I3LIhI=", + "pom": "sha256-NgVWdVmFVdSVuvtVezXukYzbF2pnUxALABtO7thfJsU=" }, - "org/junit/platform#junit-platform-launcher/6.0.3": { - "jar": "sha256-MVYINy5NxEvKDMs66KB+zCBrM2cDP6BXSKA8zVY/EwE=", - "module": "sha256-glZnrWqEsMW6dTdSvpqZ4wFL/lKRQ7xmtGdNkbA/pbg=", - "pom": "sha256-TTngPyCTd29BkwccjN8ZgTa5YWbHtDteN+fWFWudmO0=" + "org/junit/platform#junit-platform-launcher/6.1.0": { + "jar": "sha256-CZXm7SRNZhlsvaAZ4vh5UE0LSJce2unMPepGobMcA3c=", + "module": "sha256-f4PRJdcb5Z4JVD1LUGn6h9jKchyqQ9FKq+gm+x2xuME=", + "pom": "sha256-on93QpSA4V22Cwlf21lfULa6VylfIqXCZEuo1BitM54=" }, "org/opentest4j#opentest4j/1.3.0": { "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=", "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=", "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U=" }, - "org/pkl-lang#pkl-cli-linux-aarch64/0.31.1": { - "pom": "sha256-tv7vH7HdGoKPx1efn30GvJsQFAiP+EAQbiq7NpcHhyU=" + "org/pkl-lang#pkl-cli-linux-aarch64/0.32.0": { + "pom": "sha256-QMn9OmCYOs+w92fOU5sUUKDgXGrxPtaO3q/3b5vhAi4=" }, - "org/pkl-lang#pkl-cli-linux-amd64/0.31.1": { - "pom": "sha256-a9qNeO4to3bldosuR8juWBfIVYOfcu8+dH9zAHjbF3o=" + "org/pkl-lang#pkl-cli-linux-amd64/0.32.0": { + "pom": "sha256-ZgO0eVrDBiiadEaKCpu7Q0WJzqz/T5P0SvKLrLi+4bU=" }, - "org/pkl-lang#pkl-cli-macos-aarch64/0.31.1": { - "pom": "sha256-uBe6WLi8MwEWoEkMzx1TbhCpiTS2iuodLJduU+NjVb4=" + "org/pkl-lang#pkl-cli-macos-aarch64/0.32.0": { + "pom": "sha256-iAp09TW8GSxc3H4xKkzmUr6ovoVauTdn8AV07ygt5Iw=" }, - "org/pkl-lang#pkl-cli-macos-amd64/0.31.1": { - "pom": "sha256-R8jTjWZ//52ce8HmvV0ITUhv2X3jJPR5zvnLjufrunc=" + "org/pkl-lang#pkl-cli-macos-amd64/0.32.0": { + "pom": "sha256-VLr95sI5DIJIh9XszhrbbouWxh8BU95PTHS2RA6fb7A=" }, - "org/pkl-lang#pkl-formatter/0.31.1": { - "jar": "sha256-DiIZhJM4k9Ye94nQBWgpFStjgnLOFetnjHQ60FJ34Hc=", - "module": "sha256-dHvc/WhBDsWDiMKrY7UNFmEto5ynPyjvlEpiExCS/jw=", - "pom": "sha256-1r8vTKsqkz6FdaiLts4bMB+t5yrMScAxoyUN961XNQ4=" + "org/pkl-lang#pkl-formatter/0.32.0": { + "jar": "sha256-0pxUqhFimSCp6Y2VJZon8L3Y/B2GhQQirIrPmsR9r00=", + "module": "sha256-y34eyvwJFrCzQbB9j2pwzXWqRyt0FrUsUJBwwxk+FYQ=", + "pom": "sha256-BCW+dONIUNupXm9fBV2onQHt85e8hDpYDaBBHQKxruw=" }, - "org/pkl-lang#pkl-parser/0.31.1": { - "jar": "sha256-sjYkK4BB7nUO3+uB1wXcu9VVO4C8z5Pj1ANp3caSsB4=", - "module": "sha256-Ea1S0QB8EtMrwJAfvP/8s9eZ0IxwsmarfvgK/BhY38M=", - "pom": "sha256-f26/+TtpflBa1SHiVDkL3UrP4FatBpZxr9yioXWJego=" + "org/pkl-lang#pkl-parser/0.32.0": { + "jar": "sha256-vDorzk78PtqMJRip6aq8EXvE+yMoNKtnIxK+2aY3yQQ=", + "module": "sha256-Gpfwb/OQOmTyukkUqpWxJ7BzDxNi00v3S/2pAu+/vhU=", + "pom": "sha256-o8Ww7Ms3CEPyxmeFNEsdV4nzzlIF7/UxyczcJlOrPcI=" }, - "org/pkl-lang#pkl-stdlib/0.31.1": { - "pom": "sha256-p7y/Np1Ei4ZAR+Ow3q315TxRKs/yLbl7ioCN3mtxLQg=" + "org/pkl-lang#pkl-stdlib/0.32.0": { + "pom": "sha256-23dU8W98yW4Na8MiDiU4Ou/F3jFgXF20gyiZAKmKYJc=" }, - "org/pkl-lang/pkl-cli-linux-aarch64/0.31.1/pkl-cli-linux-aarch64-0.31.1": { - "bin": "sha256-fvEOdD2qkh+5Sue9uexphvNivyUMVYFLnqKusT8tCD4=" + "org/pkl-lang/pkl-cli-linux-aarch64/0.32.0/pkl-cli-linux-aarch64-0.32.0": { + "bin": "sha256-sbp+9d7JKH+PhDzlY5EeuoIv7VeJpbqrjMcSYVqduvA=" }, - "org/pkl-lang/pkl-cli-linux-amd64/0.31.1/pkl-cli-linux-amd64-0.31.1": { - "bin": "sha256-YY8TlV11XK+/6MnLodJ2NYSM1J28ar/9OY0nUdsSMb8=" + "org/pkl-lang/pkl-cli-linux-amd64/0.32.0/pkl-cli-linux-amd64-0.32.0": { + "bin": "sha256-FefnN1wouFQrPRP+NbzK63uVQhFACJmHCDhUiYhfQec=" }, - "org/pkl-lang/pkl-cli-macos-aarch64/0.31.1/pkl-cli-macos-aarch64-0.31.1": { - "bin": "sha256-G2pUONliTNJ5inUwchu7+ifvcu/lyHihtsVGxufKDo8=" + "org/pkl-lang/pkl-cli-macos-aarch64/0.32.0/pkl-cli-macos-aarch64-0.32.0": { + "bin": "sha256-+4kYVnBfPcuFicdJmeAd7T7ra3etXGqVwCV5qEjBOSg=" }, - "org/pkl-lang/pkl-cli-macos-amd64/0.31.1/pkl-cli-macos-amd64-0.31.1": { - "bin": "sha256-IhI+1K5MA6+oxUxp938L7Dmw+g9nsJ1tFI4KN2oqRx0=" + "org/pkl-lang/pkl-cli-macos-amd64/0.32.0/pkl-cli-macos-amd64-0.32.0": { + "bin": "sha256-GQrWP+xPgfQOdduo1jCQM90w5Rs+BC2zuEb2fHq0bj0=" }, - "org/pkl-lang/pkl-stdlib/0.31.1/pkl-stdlib-0.31.1": { - "zip": "sha256-H2Z2H61I5kngygIOvRdDPQe4ZraiN3hGgOkStMjkyWY=" + "org/pkl-lang/pkl-stdlib/0.32.0/pkl-stdlib-0.32.0": { + "zip": "sha256-pCgSvCT71HG4r9ftY3zuwHtwesDXUbIegh0Usor4qWI=" } } } diff --git a/pkgs/by-name/pk/pkl-lsp/package.nix b/pkgs/by-name/pk/pkl-lsp/package.nix index dfc5d6e41128..db628f37b25d 100644 --- a/pkgs/by-name/pk/pkl-lsp/package.nix +++ b/pkgs/by-name/pk/pkl-lsp/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "pkl-lsp"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "apple"; repo = "pkl-lsp"; tag = finalAttrs.version; - hash = "sha256-r/wNI319BPbU48Mrteq0LdS4YKnyyhPcYxTAS0Mlrp8="; + hash = "sha256-kXBEZU6WBMHV3Nidu3kJEI+4MWFIrqT/Qmm+Cuki844="; leaveDotGit = true; postFetch = '' pushd $out diff --git a/pkgs/by-name/pl/plezy/git-hashes.json b/pkgs/by-name/pl/plezy/git-hashes.json index af3ee856e9f5..ff287f73ce93 100644 --- a/pkgs/by-name/pl/plezy/git-hashes.json +++ b/pkgs/by-name/pl/plezy/git-hashes.json @@ -3,9 +3,7 @@ "auto_updater_macos": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", "auto_updater_platform_interface": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", "auto_updater_windows": "sha256-787cMkeT2BlfwVcy4y46XkWioNqLKJgQ/CCxQvERa+A=", - "background_downloader": "sha256-VHi4g/S/kCxxaeHnDTc64oS6lMHMFiU31VqFqBmdmo8=", - "connectivity_plus": "sha256-PGt4eEp32+w4XMDVwB0Kjla1OSole4l/++Zs5PHXs/U=", - "material_symbols_icons": "sha256-XRB6AZ4Q33sQKVZFA8lgdXCW/bx55h/RpmuItmFYVJM=", - "os_media_controls": "sha256-Xd1RdtmZbuWaljNXZ/rSInQF5/F06aPtr1uVrxIdhP8=", - "wakelock_plus": "sha256-89xs0sLNuoCqApFqwEY+SEk2DUqjHf8JsSd7dfxX3P0=" + "background_downloader": "sha256-y37tzAxOwql1193E+aTJOIi2B0gXLxL3azghEYzcRGA=", + "connectivity_plus": "sha256-sVUG5/6GF0Eu47BgUCkgbGi8w1ip5o0yQS00NnNjAGs=", + "os_media_controls": "sha256-UkrBz52dkdlSJ+UJwC2E7RhuSOcXzJx+dVo0JcW8pEY=" } diff --git a/pkgs/by-name/pl/plezy/package.nix b/pkgs/by-name/pl/plezy/package.nix index 36952fbf6120..17ef30c364d1 100644 --- a/pkgs/by-name/pl/plezy/package.nix +++ b/pkgs/by-name/pl/plezy/package.nix @@ -27,13 +27,13 @@ let pname = "plezy"; - version = "2.8.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "edde746"; repo = "plezy"; tag = version; - hash = "sha256-NvBCh++teOB0uNyy71NmOFwCQvkg9/v9Rx+76UybLQo="; + hash = "sha256-Fc2KWx4byfrulWzOGm0WW6EUXMvV8uwmvVjoSgzQmuA="; }; simdutf = fetchurl { @@ -55,6 +55,7 @@ let maintainers = with lib.maintainers; [ mio miniharinn + BatteredBunny ]; platforms = lib.platforms.linux ++ [ "x86_64-darwin" @@ -72,13 +73,7 @@ let gitHashes = lib.importJSON ./git-hashes.json; - # Upstream uses a sentry-dart fork that fetches sentry-native as a zip instead of via - # git clone. The PR was merged and reverted upstream (getsentry/sentry-dart#3630), so - # we use upstream since theres no actual meaningful difference - patches = [ - ./replace-sentry-fork.patch - ] - ++ lib.optionals use16kPagesizeWorkaround [ + patches = lib.optionals use16kPagesizeWorkaround [ ./16k-font-workaround.patch ]; @@ -152,7 +147,7 @@ let src = fetchurl { url = "https://github.com/edde746/plezy/releases/download/${version}/plezy-macos.dmg"; - hash = "sha256-eN8CJ/yaV4wln6fN2lJqJnn+RvW+ZiD3oCDhjQjyBvU="; + hash = "sha256-jNwMukPYLTWBk1daanHtxYdJpZCB5I/hiKvFx4tL4sY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/pl/plezy/pubspec.lock.json b/pkgs/by-name/pl/plezy/pubspec.lock.json index 55fe06f92542..46ae84a50b07 100644 --- a/pkgs/by-name/pl/plezy/pubspec.lock.json +++ b/pkgs/by-name/pl/plezy/pubspec.lock.json @@ -10,6 +10,16 @@ "source": "hosted", "version": "93.0.0" }, + "analysis_server_plugin": { + "dependency": "transitive", + "description": { + "name": "analysis_server_plugin", + "sha256": "5f3920acbd5765764ec9ef6c5bbdd102015424281232ee4fb4f5431c87abb4eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.7" + }, "analyzer": { "dependency": "transitive", "description": { @@ -108,12 +118,12 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "b4d36f88bb365faaf308ff26be7ade49bbaec859", - "resolved-ref": "b4d36f88bb365faaf308ff26be7ade49bbaec859", + "ref": "021e2075260e324b7440a5c81b57bf0242d35020", + "resolved-ref": "021e2075260e324b7440a5c81b57bf0242d35020", "url": "https://github.com/edde746/background_downloader" }, "source": "git", - "version": "9.5.4" + "version": "9.5.5" }, "boolean_selector": { "dependency": "transitive", @@ -299,12 +309,12 @@ "dependency": "direct main", "description": { "path": "packages/connectivity_plus/connectivity_plus", - "ref": "2b614414ce95d920880765d07cbb9759699a4563", - "resolved-ref": "2b614414ce95d920880765d07cbb9759699a4563", - "url": "https://github.com/edde746/plus_plugins" + "ref": "bf04cdf66598dc3fca274b8b1db2b92b0bf6b73e", + "resolved-ref": "bf04cdf66598dc3fca274b8b1db2b92b0bf6b73e", + "url": "https://github.com/fluttercommunity/plus_plugins" }, "source": "git", - "version": "7.1.1" + "version": "7.2.0" }, "connectivity_plus_platform_interface": { "dependency": "transitive", @@ -390,11 +400,11 @@ "dependency": "direct dev", "description": { "name": "dart_code_linter", - "sha256": "8ece88f710621ca1c40b6c344b316d78bb2269d728d37d2a44f19a81d9d2cb93", + "sha256": "44cce8527a2094201067b50aed97778930638cc43e8bb3cb0b40a90c36fb9c84", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.2" + "version": "4.1.6" }, "dart_discord_presence": { "dependency": "direct main", @@ -873,13 +883,12 @@ "material_symbols_icons": { "dependency": "direct main", "description": { - "path": ".", - "ref": "1d8cd83", - "resolved-ref": "1d8cd8325db29691a01738a25f220dd3515bd1e2", - "url": "https://github.com/edde746/material_symbols_icons" + "name": "material_symbols_icons", + "sha256": "49c532dd0b74544e9d8d93ec0f821d52ec532e7c9263c889ebe71b1be4f34ba7", + "url": "https://pub.dev" }, - "source": "git", - "version": "4.2906.0" + "source": "hosted", + "version": "4.2951.0" }, "meta": { "dependency": "transitive", @@ -955,12 +964,12 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "f51c805ebc15bf7a2f49a74174aeb470d3c4c78e", - "resolved-ref": "f51c805ebc15bf7a2f49a74174aeb470d3c4c78e", + "ref": "75556a968a4a1ebc42fbb8c31942c2418d4326e1", + "resolved-ref": "75556a968a4a1ebc42fbb8c31942c2418d4326e1", "url": "https://github.com/edde746/media_controls" }, "source": "git", - "version": "0.2.4" + "version": "0.3.0" }, "package_config": { "dependency": "transitive", @@ -1225,12 +1234,11 @@ "saf_util": { "dependency": "direct main", "description": { - "name": "saf_util", - "sha256": "0cf5fc462fc7e466e1d5608dd5a331d88d6dd6c7b01f62a305aaf469bf3309ea", - "url": "https://pub.dev" + "path": "packages/saf_util", + "relative": true }, - "source": "hosted", - "version": "2.0.0" + "source": "path", + "version": "3.1.0" }, "screen_retriever": { "dependency": "transitive", @@ -1286,11 +1294,11 @@ "dependency": "transitive", "description": { "name": "sentry", - "sha256": "288aee3d35f252ac0dc3a4b0accbbe7212fa2867604027f2cc5bc65334afd743", + "sha256": "09c573f98ff6c5e98d527f351f037eb8ea9ff684a6e9e84b2e91357144016254", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.16.0" + "version": "9.24.0" }, "sentry_dart_plugin": { "dependency": "direct dev", @@ -1306,11 +1314,11 @@ "dependency": "direct main", "description": { "name": "sentry_flutter", - "sha256": "f9e87d5895cc437902aa2b081727ee7e46524fe7cc2e1910f535480a3eeb8bed", + "sha256": "4a04b7e1901b8128df783b6d36d48706b07b0cd055e621517c998de87f5dafb9", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.16.0" + "version": "9.24.0" }, "serial_csv": { "dependency": "transitive", @@ -1751,13 +1759,11 @@ "wakelock_plus": { "dependency": "direct main", "description": { - "path": "wakelock_plus", - "ref": "8595fee595c952b73d430f2eab05f2e0d858290e", - "resolved-ref": "8595fee595c952b73d430f2eab05f2e0d858290e", - "url": "https://github.com/edde746/wakelock_plus" + "path": "packages/wakelock_plus", + "relative": true }, - "source": "git", - "version": "1.4.0" + "source": "path", + "version": "1.5.2" }, "wakelock_plus_platform_interface": { "dependency": "transitive", @@ -1833,11 +1839,11 @@ "dependency": "direct main", "description": { "name": "win_http", - "sha256": "a50a14f1bf32bc5c9b39add9baa01658b97146b21de25237810ca6b850a6704e", + "sha256": "ebc4d37e2c0e6800cc200e40d289d3bac22fc17d40fce3ae7909d49a20da77bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.1" + "version": "0.2.2" }, "window_manager": { "dependency": "direct main", @@ -1878,6 +1884,16 @@ }, "source": "hosted", "version": "3.1.3" + }, + "yaml_edit": { + "dependency": "transitive", + "description": { + "name": "yaml_edit", + "sha256": "07c9e63ba42519745182b88ca12264a7ba2484d8239958778dfe4d44fe760488", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" } }, "sdks": { diff --git a/pkgs/by-name/pl/plezy/replace-sentry-fork.patch b/pkgs/by-name/pl/plezy/replace-sentry-fork.patch deleted file mode 100644 index f2ad98d1f153..000000000000 --- a/pkgs/by-name/pl/plezy/replace-sentry-fork.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/pubspec.yaml -+++ b/pubspec.yaml -@@ -60,11 +60,7 @@ - git: - url: https://github.com/edde746/background_downloader - ref: b4d36f88bb365faaf308ff26be7ade49bbaec859 -- sentry_flutter: -- git: -- url: https://github.com/edde746/sentry-dart -- path: packages/flutter -- ref: build/fetch-native-zip -+ sentry_flutter: 9.16.0 - auto_updater: - git: - url: https://github.com/edde746/auto_updater -@@ -110,16 +106,6 @@ - url: https://github.com/edde746/auto_updater - ref: 9e150f7 - path: packages/auto_updater_windows -- sentry: -- git: -- url: https://github.com/edde746/sentry-dart -- path: packages/dart -- ref: build/fetch-native-zip -- sentry_flutter: -- git: -- url: https://github.com/edde746/sentry-dart -- path: packages/flutter -- ref: build/fetch-native-zip - material_symbols_icons: - git: - url: https://github.com/edde746/material_symbols_icons diff --git a/pkgs/by-name/pl/plezy/update.sh b/pkgs/by-name/pl/plezy/update.sh index 3791bc122fa0..6cba0df4c373 100755 --- a/pkgs/by-name/pl/plezy/update.sh +++ b/pkgs/by-name/pl/plezy/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go flutter344 git +#! nix-shell -I nixpkgs=./. -i bash -p curl gnused jq nix nix-prefetch-git python3 yq-go set -eou pipefail @@ -26,18 +26,8 @@ DMG_URL="https://github.com/edde746/plezy/releases/download/${latestVersion}/ple DMG_SHA=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url "$DMG_URL")") sed -i "/plezy-macos.dmg/,/hash/{s|hash = \".*\"|hash = \"${DMG_SHA}\"|}" "$ROOT/package.nix" -# Only here to handle the patched pubsec.yaml -workdir=$(mktemp -d) -trap 'rm -rf "$workdir"' EXIT - -curl --fail --silent --location "$GIT_SRC_URL" | tar -xz -C "$workdir" --strip-components=1 -patch -d "$workdir" -p1 < "$ROOT/replace-sentry-fork.patch" - -export PUB_CACHE="$workdir/.pub-cache" -flutter --no-version-check config --no-analytics >/dev/null -(cd "$workdir" && flutter --no-version-check pub get) - -yq eval --output-format=json --prettyPrint "$workdir/pubspec.lock" > "$ROOT/pubspec.lock.json" +curl --fail --silent --location "https://raw.githubusercontent.com/edde746/plezy/${latestVersion}/pubspec.lock" \ + | yq eval --output-format=json --prettyPrint > "$ROOT/pubspec.lock.json" python3 "$(dirname "$(readlink -f "$0")")/../../../development/compilers/dart/fetch-git-hashes.py" \ --input "$ROOT/pubspec.lock.json" \ diff --git a/pkgs/by-name/pl/plugdata/package.nix b/pkgs/by-name/pl/plugdata/package.nix index 9c876530d1d8..4c98030d3bfb 100644 --- a/pkgs/by-name/pl/plugdata/package.nix +++ b/pkgs/by-name/pl/plugdata/package.nix @@ -4,8 +4,6 @@ fetchFromGitHub, fetchpatch2, ensureNewerSourcesForZipFilesHook, - makeDesktopItem, - copyDesktopItems, cmake, pkg-config, alsa-lib, @@ -49,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { cmake pkg-config ensureNewerSourcesForZipFilesHook - copyDesktopItems python3 makeWrapper writableTmpDirAsHomeHook @@ -77,21 +74,6 @@ stdenv.mkDerivation (finalAttrs: { webkitgtk_4_1 ]; - desktopItems = [ - (makeDesktopItem { - name = "PlugData"; - desktopName = "PlugData"; - exec = "plugdata"; - icon = "plugdata_logo"; - comment = "Pure Data as a plugin, with a new GUI"; - type = "Application"; - categories = [ - "AudioVideo" - "Music" - ]; - }) - ]; - env.NIX_LDFLAGS = toString [ "-lX11" "-lXext" @@ -131,7 +113,8 @@ stdenv.mkDerivation (finalAttrs: { cp -r Plugins/VST3/plugdata{,-fx}.vst3 $out/lib/vst3 cp -r Plugins/LV2/plugdata{,-fx}.lv2 $out/lib/lv2 - install -Dm444 $src/Resources/Icons/plugdata_logo_linux.png $out/share/icons/hicolor/512x512/apps/plugdata_logo.png + install -Dm444 Resources/Icons/plugdata_logo_linux.png $out/share/icons/hicolor/512x512/apps/plugdata.png + install -Dm444 Resources/Installer/plugdata.desktop -t $out/share/applications runHook postInstall ''; diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix index 5aed652d8cbc..4f9896effdbc 100644 --- a/pkgs/by-name/pr/process-compose/package.nix +++ b/pkgs/by-name/pr/process-compose/package.nix @@ -10,13 +10,13 @@ let in buildGoModule (finalAttrs: { pname = "process-compose"; - version = "1.116.0"; + version = "1.120.0"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = "process-compose"; tag = "v${finalAttrs.version}"; - hash = "sha256-f+XH4L+yFnPTGmbbsKrXjPMVMzkaR56XQmTtekVCMcQ="; + hash = "sha256-J1Sk6TfTVFgw+FU48CxYBxT5NVbR/pACpsnq2TRuf38="; # 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. diff --git a/pkgs/by-name/pr/proj/package.nix b/pkgs/by-name/pr/proj/package.nix index cd72a4a99b79..51c90fd831d8 100644 --- a/pkgs/by-name/pr/proj/package.nix +++ b/pkgs/by-name/pr/proj/package.nix @@ -13,11 +13,14 @@ nlohmann_json, python3, cacert, + writableTmpDirAsHomeHook, }: stdenv.mkDerivation (finalAttrs: { pname = "proj"; version = "9.8.1"; + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "OSGeo"; @@ -50,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ cacert + sqlite + writableTmpDirAsHomeHook + ]; + checkInputs = [ gtest ]; @@ -57,13 +64,7 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_EXTERNAL_GTEST=ON" "-DRUN_NETWORK_DEPENDENT_TESTS=OFF" "-DNLOHMANN_JSON_ORIGIN=external" - "-DEXE_SQLITE3=${buildPackages.sqlite}/bin/sqlite3" - ]; - - env.CXXFLAGS = toString [ - # GCC 13: error: 'int64_t' in namespace 'std' does not name a type - "-include" - "cstdint" + "-DEXE_SQLITE3=${lib.getExe buildPackages.sqlite}" ]; preCheck = @@ -71,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: { libPathEnvVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in '' - export HOME=$TMPDIR export TMP=$TMPDIR export ${libPathEnvVar}=$PWD/lib ''; diff --git a/pkgs/by-name/pr/prometheus-alertmanager/package.nix b/pkgs/by-name/pr/prometheus-alertmanager/package.nix index 143ddd20f9c1..4116c98b671c 100644 --- a/pkgs/by-name/pr/prometheus-alertmanager/package.nix +++ b/pkgs/by-name/pr/prometheus-alertmanager/package.nix @@ -20,13 +20,13 @@ let in buildGoModule (finalAttrs: { pname = "alertmanager"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "prometheus"; repo = "alertmanager"; tag = "v${finalAttrs.version}"; - hash = "sha256-VXhu50KERPb4FDdcNDMftBqZVk2ipIphhejAE1wMSOk="; + hash = "sha256-LGjBuZ7kbtABunEk2YyCKILsPS/0FlS/6Mf/2qVpseI="; }; postPatch = '' diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix index 335fe85380bb..f7c75d99ea84 100644 --- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "node_exporter"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "prometheus"; repo = "node_exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-AoW4JO9V/sZDjonNT+Ar8saX/rlb1lB/+Vmu5qGtTlA="; + hash = "sha256-pjgxx7Xz0q2SctTEwDiwqmZAOTxrHt1XEl1pSMP7Ids="; }; - vendorHash = "sha256-qTuzF4xeF0riOedwaUR4x/U6Jb0j+GIwUfUfstp2Cao="; + vendorHash = "sha256-WFRxkwMM9D612tLJjij+kwpcwhcl3KhR8xXxx43SC9o="; # FIXME: tests fail due to read-only nix store doCheck = false; diff --git a/pkgs/by-name/pr/prometheus/source.nix b/pkgs/by-name/pr/prometheus/source.nix index 8bc7d9282302..e4d65170f55b 100644 --- a/pkgs/by-name/pr/prometheus/source.nix +++ b/pkgs/by-name/pr/prometheus/source.nix @@ -1,6 +1,6 @@ { - version = "3.13.0"; - hash = "sha256-v6jk4MqoxcfK+yj+T31Ovqj1tyh3mc4aEr8BD0vjBOc="; + version = "3.13.1"; + hash = "sha256-DtUdZp/o/tzLjiOZJ3duGqaLoNvkzulbL+wyLnY0dwA="; pnpmDepsHash = "sha256-Z1TYYZhELi+rIiuleN8xR/WiMn9TF4KotFMTOsR2e6Y="; vendorHash = "sha256-yvzQHfe7yd6Sjh1Vd2VxTp3jK8OWoKTmJ2uMyXX3+xs="; } diff --git a/pkgs/by-name/pr/prometheus/update.sh b/pkgs/by-name/pr/prometheus/update.sh index 2f3b54b8aed4..489a092aac61 100755 --- a/pkgs/by-name/pr/prometheus/update.sh +++ b/pkgs/by-name/pr/prometheus/update.sh @@ -49,9 +49,22 @@ cat > "$SOURCE_NIX" <<-EOF } EOF -VENDOR_HASH=$(extractHash prometheus.goModules) +# Resolve pnpm hash first: the Go integration pulls in the assets, so a fake +# pnpmDepsHash makes that stage fail. PNPM_DEPS_HASH=$(extractHash prometheus.assets.pnpmDeps) +cat > "$SOURCE_NIX" <<-EOF +{ + version = "$TARGET_VERSION"; + hash = "$PREFETCH_HASH"; + pnpmDepsHash = "$PNPM_DEPS_HASH"; + vendorHash = "$FAKE_HASH"; +} +EOF + +# Now do the Go module fetch. +VENDOR_HASH=$(extractHash prometheus.goModules) + cat > "$SOURCE_NIX" <<-EOF { version = "$TARGET_VERSION"; diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index b0f41aedb0f0..b63c860e3a69 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "proto"; - version = "0.58.0"; + version = "0.58.2"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${finalAttrs.version}"; - hash = "sha256-srSL79mK7refwxyJtnHsbm0FaqhUXcDSZykvPgOk4QU="; + hash = "sha256-fITyBLT4SyQ7q3zMJ2JpunsBjdZtgiGA19g09PKQcL8="; }; - cargoHash = "sha256-KncAopV1fDB8AmxeR0PZNbykLo04NXctsyZWaA3PceE="; + cargoHash = "sha256-tK/nb6g8fjhdCciI5mgq+mvUBwXPsak1VNk8pcWlQrk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/pr/prow/package.nix b/pkgs/by-name/pr/prow/package.nix index 5354864dc099..cfffd10d0302 100644 --- a/pkgs/by-name/pr/prow/package.nix +++ b/pkgs/by-name/pr/prow/package.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "prow"; - version = "0-unstable-2026-07-02"; - rev = "ef12e757d9a9ede25c2a41236ace781e56b23265"; + version = "0-unstable-2026-07-09"; + rev = "bcf4297e528a75b2aa580c5dce3e7b97e38f4553"; src = fetchFromGitHub { inherit rev; owner = "kubernetes-sigs"; repo = "prow"; - hash = "sha256-u8TQav5uv8uWpuO6n/gOkEYhZKq16EHRkdUMY3cq6Uc="; + hash = "sha256-pPmkWcnEPWyWWCIlujvDvoAlZ67SrM1X8lP/WJFomyI="; }; vendorHash = "sha256-iLJ2atYyHNMvflyuETpPnuhKD293k25vfZQU68Y7oN8="; diff --git a/pkgs/by-name/pu/putzen/package.nix b/pkgs/by-name/pu/putzen/package.nix new file mode 100644 index 000000000000..45b0110038e4 --- /dev/null +++ b/pkgs/by-name/pu/putzen/package.nix @@ -0,0 +1,36 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, + versionCheckHook, +}: +rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + + pname = "putzen"; + version = "3.3.2"; + + src = fetchFromGitHub { + owner = "sassman"; + repo = "putzen-rs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-OYWsylJo7odN0BCUbM2hrrsiRbvMIapYeSBwCfY0srk="; + }; + + cargoHash = "sha256-RqTBJCCJnvqujknJp7tK4oXMfBir9McfLaA5dtgYU90="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cleaning helper keeping your disk clean of build and dependency artifacts safely"; + homepage = "https://github.com/sassman/putzen-rs"; + changelog = "https://github.com/sassman/putzen-rs/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ adda ]; + mainProgram = "putzen"; + }; +}) diff --git a/pkgs/by-name/pv/pvetui/package.nix b/pkgs/by-name/pv/pvetui/package.nix index 3af103d63b0f..a2c37fd5ef31 100644 --- a/pkgs/by-name/pv/pvetui/package.nix +++ b/pkgs/by-name/pv/pvetui/package.nix @@ -7,7 +7,7 @@ buildGoModule (finalAttrs: { pname = "pvetui"; - version = "1.4.1"; + version = "1.4.2"; __structuredAttrs = true; @@ -15,7 +15,7 @@ buildGoModule (finalAttrs: { owner = "devnullvoid"; repo = "pvetui"; tag = "v${finalAttrs.version}"; - hash = "sha256-RxQ5zI+JUI0QCMeHKgIyQQqbKSX2vt44IxFMNzB6KfM="; + hash = "sha256-yYYGXb+CriDRZcV8e/7MN4Pq8GKP35JdMrcxozWVBpE="; }; vendorHash = "sha256-JOo/7/3J9LqefIYuRl9efSlSfzLvQ/B8Jpy2e5cdEio="; diff --git a/pkgs/by-name/pw/pwru/package.nix b/pkgs/by-name/pw/pwru/package.nix index 92e0bf0862d6..f87021e65329 100644 --- a/pkgs/by-name/pw/pwru/package.nix +++ b/pkgs/by-name/pw/pwru/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "pwru"; - version = "1.0.11"; + version = "1.0.12"; src = fetchFromGitHub { owner = "cilium"; repo = "pwru"; tag = "v${finalAttrs.version}"; - hash = "sha256-P4CKQOSpRujrgBVVNj1DD1jHoN7DEZ18PrfSOKSd31Y="; + hash = "sha256-U7xDjurLVX46cLjjKiWBtx1rKZ3CarWXaSXvuJpnejg="; }; vendorHash = null; diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix index 4ccd1c1a2554..ecd01f7ceeb6 100644 --- a/pkgs/by-name/pw/pwvucontrol/package.nix +++ b/pkgs/by-name/pw/pwvucontrol/package.nix @@ -2,8 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchFromGitLab, - fetchpatch, blueprint-compiler, cargo, desktop-file-utils, @@ -21,22 +19,23 @@ pango, pipewire, wireplumber, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "pwvucontrol"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "saivert"; repo = "pwvucontrol"; tag = finalAttrs.version; - hash = "sha256-3H0qLhnhD/CVjKcx8UISFD4tSgH9O3V2uyNcgYug6Ug="; + hash = "sha256-Y5O/KkYYNDysZ3H0vk0qj2DOkmx/Z4vJELr9oydxpt8="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-k3a1I+M+rxXvABlgpsw6tFhTIgaxpsCUDwhuFQj6Nhc="; + hash = "sha256-pw7UrD4EFd04mxy8Cz3tif+lzlnemIjFkB7VVOnAA1E="; }; postPatch = '' @@ -72,13 +71,17 @@ stdenv.mkDerivation (finalAttrs: { # For https://github.com/saivert/pwvucontrol/blob/7bf43c746cd49fffbfb244ac4474742c6b3737a9/src/meson.build#L45-L46 env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; + passthru.updateScript = nix-update-script { }; + meta = { description = "Pipewire Volume Control"; homepage = "https://github.com/saivert/pwvucontrol"; + changelog = "https://github.com/saivert/pwvucontrol/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ Guanran928 johnrtitor + ilkecan ]; mainProgram = "pwvucontrol"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix index 10b9574fdb50..c874419c2e3f 100644 --- a/pkgs/by-name/qa/qalculate-gtk/package.nix +++ b/pkgs/by-name/qa/qalculate-gtk/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; tag = "v${finalAttrs.version}"; - hash = "sha256-EVDbpE/T5EvKK/fTNSDbMFMQR+uamiXo7yjv9Se09w4="; + hash = "sha256-c0n0iu8KB0sK7dnvMcwQAFQvtOmaBpET4oRRufliN4k="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/by-name/ql/qlmarkdown/package.nix b/pkgs/by-name/ql/qlmarkdown/package.nix new file mode 100644 index 000000000000..845a0e81a651 --- /dev/null +++ b/pkgs/by-name/ql/qlmarkdown/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenvNoCC, + fetchzip, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "qlmarkdown"; + version = "1.5.2"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchzip { + url = "https://github.com/sbarex/QLMarkdown/releases/download/${finalAttrs.version}/QLMarkdown.zip"; + hash = "sha256-duQwlY87yWKn5RXEaPqZz8oICIsHid8m1i5V7+5bIf4="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" "$out/bin" + cp -R "QLMarkdown.app" "$out/Applications/" + + ln -s \ + "$out/Applications/QLMarkdown.app/Contents/Resources/qlmarkdown_cli" \ + "$out/bin/qlmarkdown_cli" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Quick Look extension for Markdown previews on macOS"; + homepage = "https://github.com/sbarex/QLMarkdown"; + changelog = "https://github.com/sbarex/QLMarkdown/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ kinnrai ]; + mainProgram = "qlmarkdown_cli"; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index fd8b1d819de5..bb125bfd1bef 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "railway"; - version = "5.23.3"; + version = "5.26.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-VdCGxYEOL2/GCL2kBBbyxPwRJ5pPnyoskq3mtXCmFL0="; + hash = "sha256-OImzgztObPJy7hAGYrgMdMZTCeDvHFctO+Zz9WHAysQ="; }; - cargoHash = "sha256-+ihMzlAkvmred/pm2rFG6mvoTNpWZEH5lTXlK4WmfPE="; + cargoHash = "sha256-EMupuiYuosuH/aSa/rPCuYJNPcoUHbId4NPVLMF8YWc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix index 56b3eb1b04cc..d38466427948 100644 --- a/pkgs/by-name/ra/rainfrog/package.nix +++ b/pkgs/by-name/ra/rainfrog/package.nix @@ -7,7 +7,7 @@ rainfrog, }: let - version = "0.3.19"; + version = "0.3.20"; in rustPlatform.buildRustPackage { inherit version; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage { owner = "achristmascarl"; repo = "rainfrog"; tag = "v${version}"; - hash = "sha256-tVnz2AMcFBbeH7jv1FGJlSA6+rDmvgG1X7Xc1gUc/TQ="; + hash = "sha256-Il8/vj56xQQXLefg9cCKMCRZ65+kp/NcXzFQUU0lKbQ="; }; - cargoHash = "sha256-wXNuh3eJPiFb49yOFw7srihc6IiNx0rWB/waYrrKKPU="; + cargoHash = "sha256-aRjQYQQVOQu5VQWyqC0br/0w/EdZWWpkVgoFZStUE3I="; passthru = { tests.version = testers.testVersion { diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index cc71ee36dc67..fe9a01beddc3 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.67.0"; + version = "0.68.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-xEqwi19PTNnfJkGiMfGTYpgs/xrir/7neb0FKq7ZrYY="; + hash = "sha256-dS+PLxG5HfORy3hCEipS1rCoqCttHcqwsvIXwE5lQ/w="; }; - cargoHash = "sha256-a7qkVeVWKX/v7FapuDaJ58FKhEpHVwSieDs67ORzG3o="; + cargoHash = "sha256-uJjS0dE89XRy1irTZv1piH2Mm9/CqeNuUJl8Ntc4V8c="; doCheck = false; # test requires network access diff --git a/pkgs/by-name/ra/rauthy/package.nix b/pkgs/by-name/ra/rauthy/package.nix index 5ace4bf53030..9a2c7d6912ca 100644 --- a/pkgs/by-name/ra/rauthy/package.nix +++ b/pkgs/by-name/ra/rauthy/package.nix @@ -8,20 +8,20 @@ nix-update-script, perl, wasm-pack, - wasm-bindgen-cli_0_2_121, + wasm-bindgen-cli_0_2_126, binaryen, lld, rust-jemalloc-sys-unprefixed, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "rauthy"; - version = "0.35.2"; + version = "0.36.0"; src = fetchFromGitHub { owner = "sebadob"; repo = "rauthy"; tag = "v${finalAttrs.version}"; - hash = "sha256-onwNtlz2FP01aYr/T3Y3KK3CJHKsBBOF6vCfWKrdyRE="; + hash = "sha256-ctc80gG36O4viHrFcG3RSrr8wnwD3YZD0eyauS9JCPA="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nodejs npmHooks.npmConfigHook perl - wasm-bindgen-cli_0_2_121 + wasm-bindgen-cli_0_2_126 wasm-pack ]; @@ -40,10 +40,10 @@ rustPlatform.buildRustPackage (finalAttrs: { npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/frontend"; - hash = "sha256-w3x+dUfmJ4H82wX87C3UHEJ5Ls4v6lsn7kKOxvRJY8g="; + hash = "sha256-3bLzlGbC1i8TOYNi/SAVqIb8bsK0IhDTGr65rVWU5XY="; }; - cargoHash = "sha256-oUc8aMsI3i0WM5/tP/ro93GgkjaDjBdYcgpxiKDvtJ4="; + cargoHash = "sha256-lkD2Yd15VuQT+OmMttea0KBWOnhwvRBN6aS1DVR0Heg="; preBuild = '' pushd src/wasm-modules diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix index 19438c2cba8d..2726452ff546 100644 --- a/pkgs/by-name/re/rectangle/package.nix +++ b/pkgs/by-name/re/rectangle/package.nix @@ -5,6 +5,8 @@ darwin, actool, ibtool, + # TODO: Clean up on `staging` + llvmPackages, makeWrapper, nix-update-script, }: @@ -149,6 +151,8 @@ stdenv.mkDerivation (finalAttrs: { ibtool darwin.autoSignDarwinBinariesHook makeWrapper + # TODO: Clean up on `staging` + llvmPackages.lld ]; dontConfigure = true; @@ -161,6 +165,8 @@ stdenv.mkDerivation (finalAttrs: { commonSwiftFlags=( -O -disable-bridging-pch -Xlinker -platform_version -Xlinker macos -Xlinker 14.0 -Xlinker 26.0 + # TODO: Clean up on `staging` + -use-ld=lld ) nixLog "building Sparkle stub framework" @@ -196,6 +202,8 @@ stdenv.mkDerivation (finalAttrs: { clang -dynamiclib "''${masObjFiles[@]}" \ -framework AppKit -framework Carbon -framework Foundation \ -install_name "@rpath/MASShortcut.framework/MASShortcut" \ + # TODO: Clean up on `staging` + -fuse-ld=lld \ -o "$buildDir/libMASShortcut.dylib" rectSwiftFiles=() diff --git a/pkgs/by-name/re/redisinsight/package.nix b/pkgs/by-name/re/redisinsight/package.nix index 4e98d8b8f85b..106dd7f82a5a 100644 --- a/pkgs/by-name/re/redisinsight/package.nix +++ b/pkgs/by-name/re/redisinsight/package.nix @@ -9,27 +9,28 @@ copyDesktopItems, dart-sass, makeWrapper, - nodejs-slim_20, + nodejs-slim_24, pkg-config, yarnConfigHook, - electron, + electron_41, libsecret, sqlite, }: let - nodejs = nodejs-slim_20; + electron = electron_41; + nodejs = nodejs-slim_24; in stdenv.mkDerivation (finalAttrs: { pname = "redisinsight"; - version = "3.4.2"; + version = "3.6.0"; src = fetchFromGitHub { owner = "redis"; repo = "RedisInsight"; rev = finalAttrs.version; - hash = "sha256-QV1xxpr8aMgkxWitJPVjXB/G2UaAYrV2wMM1FbltZpE="; + hash = "sha256-YnBy++KshDVNw3p1gf7gHydQyyh03fkSULhnZsqZMxs="; }; patches = [ @@ -42,21 +43,21 @@ stdenv.mkDerivation (finalAttrs: { baseOfflineCache = fetchYarnDeps { name = "redisinsight-${finalAttrs.version}-base-offline-cache"; inherit (finalAttrs) src patches; - hash = "sha256-hU8/ycljmRxqQEx0neezQmJPaianJhL0IyVOJEfLy5o="; + hash = "sha256-lfCasq3C0jD4wNpguxSOxwrR0Sx3ZfwK95Ib31TShSQ="; }; innerOfflineCache = fetchYarnDeps { name = "redisinsight-${finalAttrs.version}-inner-offline-cache"; inherit (finalAttrs) src patches; postPatch = "cd redisinsight"; - hash = "sha256-s4JTgqXT+5P/C5e3/c30/VZHt8MRct3KViZOD1Fekqc="; + hash = "sha256-vdBSquVsIeMh5eZMRxYdVz3iuhM27RgEtI6FZqjCP74="; }; apiOfflineCache = fetchYarnDeps { name = "redisinsight-${finalAttrs.version}-api-offline-cache"; inherit (finalAttrs) src patches; postPatch = "cd redisinsight/api"; - hash = "sha256-GsdKJjQltpHKDZmGRF60M1TLTbnwyHt9e5ayrXgbFOU="; + hash = "sha256-8u4igcegknwydNsVLcPv6E5/uwQJpwNWhIpCujfoXqk="; }; nativeBuildInputs = [ @@ -101,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { npm rebuild --verbose --no-progress cd redisinsight npm rebuild --verbose --no-progress + export npm_config_nodedir=${nodejs} cd api npm rebuild --verbose --no-progress cd ../.. @@ -115,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace node_modules/sass/dist/lib/src/compiler-path.js \ --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];' + yarn --cwd redisinsight/api generate:api-client yarn --offline build:prod # TODO: Generate defaults. Currently broken because it requires network access. diff --git a/pkgs/by-name/rh/rHttp/package.nix b/pkgs/by-name/rh/rhttp/package.nix similarity index 89% rename from pkgs/by-name/rh/rHttp/package.nix rename to pkgs/by-name/rh/rhttp/package.nix index 71b4e9c3e46b..d433cc931fb0 100644 --- a/pkgs/by-name/rh/rHttp/package.nix +++ b/pkgs/by-name/rh/rhttp/package.nix @@ -4,9 +4,12 @@ fetchFromGitHub, }: buildGoModule { - pname = "rHttp"; + pname = "rhttp"; version = "0-unstable-2024-04-28"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { owner = "1buran"; repo = "rHttp"; diff --git a/pkgs/by-name/ri/rime-moegirl/package.nix b/pkgs/by-name/ri/rime-moegirl/package.nix index 176374f5d42d..b21c9a9f334b 100644 --- a/pkgs/by-name/ri/rime-moegirl/package.nix +++ b/pkgs/by-name/ri/rime-moegirl/package.nix @@ -5,10 +5,10 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "rime-moegirl"; - version = "20260511"; + version = "20260712"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict.yaml"; - hash = "sha256-rtrwuPNvh0krobTDP3oTrAswYj9ALCZITrfudW5EXfc="; + hash = "sha256-d4I2xyyWh9vry7vMkE1E19G55w/uenqbTspymdy0dqw="; }; dontUnpack = true; diff --git a/pkgs/by-name/rk/rkbin/package.nix b/pkgs/by-name/rk/rkbin/package.nix index 541819239650..2693dc942e28 100644 --- a/pkgs/by-name/rk/rkbin/package.nix +++ b/pkgs/by-name/rk/rkbin/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "rkbin"; - version = "0-unstable-2025-06-13"; + version = "0-unstable-2025-12-30"; src = fetchFromGitHub { owner = "rockchip-linux"; repo = "rkbin"; - rev = "74213af1e952c4683d2e35952507133b61394862"; - hash = "sha256-gNCZwJd9pjisk6vmvtRNyGSBFfAYOADTa5Nd6Zk+qEk="; + rev = "ecb4fcbe954edf38b3ae037d5de6d9f5bccf81f4"; + hash = "sha256-U8d2cH6/TSXfBnLhh141A9wP/t6prFgwYMvwgXBf4vc="; }; installPhase = '' @@ -23,11 +23,11 @@ stdenvNoCC.mkDerivation { ''; passthru = { - BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.45.elf"; - BL31_RK3588 = "${rkbin}/bin/rk35/rk3588_bl31_v1.51.elf"; - TPL_RK3566 = "${rkbin}/bin/rk35/rk3566_ddr_1056MHz_v1.23.bin"; - TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.23.bin"; - TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.19.bin"; + BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.46.elf"; + BL31_RK3588 = "${rkbin}/bin/rk35/rk3588_bl31_v1.54.elf"; + TPL_RK3566 = "${rkbin}/bin/rk35/rk3566_ddr_1056MHz_v1.25.bin"; + TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.25.bin"; + TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.21.bin"; }; meta = { diff --git a/pkgs/by-name/rn/rnsapi/package.nix b/pkgs/by-name/rn/rnsapi/package.nix index 4d1543986eb3..2ec9227a63c3 100644 --- a/pkgs/by-name/rn/rnsapi/package.nix +++ b/pkgs/by-name/rn/rnsapi/package.nix @@ -7,15 +7,15 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "rnsapi"; - version = "0-unstable-2026-07-06"; + version = "0-unstable-2026-07-09"; pyproject = true; __structuredAttrs = true; src = fetchFromGitHub { owner = "attermann"; repo = "ReticulumAPI"; - rev = "9dc2a562c7e8695fb08c5204a403052a19af03d2"; - hash = "sha256-8WsQyJtxkXVaObBHQCQ2VrqJUApSyePL1IVUoTE4XPk="; + rev = "1f20cf5d2f00894389c864d1e018d771191a9809"; + hash = "sha256-IB67sLjOlaiAI8089ODAUNZRahvhLuiOxdGZ+4B24IE="; }; build-system = [ @@ -48,6 +48,6 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://github.com/attermann/ReticulumAPI"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ drupol ]; - mainProgram = "reticulum-api"; + mainProgram = "rnsapid"; }; }) diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix index 96e61506a5e8..4b0e4a286dc7 100644 --- a/pkgs/by-name/ru/rumdl/package.nix +++ b/pkgs/by-name/ru/rumdl/package.nix @@ -11,16 +11,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rumdl"; - version = "0.2.30"; + version = "0.2.31"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "rvben"; repo = "rumdl"; tag = "v${finalAttrs.version}"; - hash = "sha256-P+mqXeafWRtaaNKPAlAP5zjmzP51PazMAvWL0FZK7jk="; + hash = "sha256-sKL1Sn7ipv/5fGwblSTwwLnMEmmNqapBv4phS7sELFY="; }; - cargoHash = "sha256-SAmjBtRokZ9Qkz1DMXy1MZ2MCidXgWaMfhdTYXbLBQU="; + cargoHash = "sha256-Q9SQq5oyimRgxB+5FuRn73c00pqjeDDxuJ/klcvKck8="; cargoBuildFlags = [ "--bin=rumdl" @@ -74,6 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: { maintainers = with lib.maintainers; [ kachick hasnep + faukah ]; mainProgram = "rumdl"; platforms = with lib.platforms; unix ++ windows; diff --git a/pkgs/by-name/ru/runpodctl/package.nix b/pkgs/by-name/ru/runpodctl/package.nix index 27403efa1afe..546e8d5b067f 100644 --- a/pkgs/by-name/ru/runpodctl/package.nix +++ b/pkgs/by-name/ru/runpodctl/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "runpodctl"; - version = "2.3.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "runpod"; repo = "runpodctl"; rev = "v${finalAttrs.version}"; - hash = "sha256-Lqmo/AZyxTIJjCePIagZosWnQxRZXLC228TaQDSz8Pk="; + hash = "sha256-hx0plQ5og4C6UY7r8RjYKo8LVk+WnWhtRErr0riNKbQ="; }; - vendorHash = "sha256-pbHVaNm/mcWQDBmPAYHBLS70VfDY4B3AvKhbNx25eOI="; + vendorHash = "sha256-38d+nWZDjWgcK091G3JCGtBqyE7iJ60edAhbx8GzxPM="; postInstall = '' rm $out/bin/docs # remove the docs binary diff --git a/pkgs/by-name/ru/rust-petname/package.nix b/pkgs/by-name/ru/rust-petname/package.nix index 19c808ccace1..11491fa6e44c 100644 --- a/pkgs/by-name/ru/rust-petname/package.nix +++ b/pkgs/by-name/ru/rust-petname/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-petname"; - version = "3.0.0"; + version = "3.1.0"; src = fetchCrate { inherit (finalAttrs) version; crateName = "petname"; - hash = "sha256-RKOW0SDRlMRPlsmWvk+teB14Tdf3tgrP35Glvn/wJBE="; + hash = "sha256-p5sGxGYzvc1b8Ch8MBwluMVFyu2Z8IIqhJzt68o90HQ="; }; - cargoHash = "sha256-LMlfYVL6Hk+b7v6qvz0Y1y2awxvcH35+vCvBMvCUEv4="; + cargoHash = "sha256-7+LATYCokoh27sZkIWZ5eW4n1HZSB5fDvQKBeyObCgE="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/sa/sabiql/package.nix b/pkgs/by-name/sa/sabiql/package.nix index a29570f0c293..aca5cc3f8fc4 100644 --- a/pkgs/by-name/sa/sabiql/package.nix +++ b/pkgs/by-name/sa/sabiql/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "sabiql"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "riii111"; repo = "sabiql"; rev = "v${finalAttrs.version}"; - hash = "sha256-HDaiCLu1L2aQ+9swQWWPzb9MWqI44ECf71KyhI43emk="; + hash = "sha256-Fm9AINbCoazT2OHPJUO7YHpLt1KpQ8jDfXAkX3Karl0="; }; - cargoHash = "sha256-5o68x2pOe4ArDzPJmGI9ooqRgs8rEReSFnpT8TKItl4="; + cargoHash = "sha256-915W5zpavggfPN7artvgxkErWsx9eZ6953RX/eLQagg="; # Upstream use latest rust version need to patch use nixpkgs version postPatch = '' diff --git a/pkgs/by-name/sa/satysfi/package.nix b/pkgs/by-name/sa/satysfi/package.nix index fe7d71c8b4be..f4887ec115fc 100644 --- a/pkgs/by-name/sa/satysfi/package.nix +++ b/pkgs/by-name/sa/satysfi/package.nix @@ -79,7 +79,7 @@ ocamlPackages.buildDunePackage { mkdir -p $out/share/satysfi/dist/fonts cp -r lib-satysfi/dist/ $out/share/satysfi/ cp -r \ - ${ipaexfont}/share/fonts/opentype/* \ + ${ipaexfont}/share/fonts/truetype/* \ ${lmodern}/share/fonts/opentype/public/lm/* \ ${lmmath}/share/fonts/opentype/latinmodern-math.otf \ ${junicode}/share/fonts/truetype/Junicode-{Bold,BoldItalic,Italic}.ttf \ diff --git a/pkgs/by-name/sc/scantpaper/package.nix b/pkgs/by-name/sc/scantpaper/package.nix index bdf70d93b65e..ae4aa42f20d5 100644 --- a/pkgs/by-name/sc/scantpaper/package.nix +++ b/pkgs/by-name/sc/scantpaper/package.nix @@ -33,13 +33,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "scantpaper"; - version = "3.0.9"; + version = "3.0.11"; src = fetchFromGitHub { owner = "carygravel"; repo = "scantpaper"; tag = "v${version}"; - hash = "sha256-4YHC77Hgvl2A15klilJx0JdP9VWSpqBSj9q//faMNM8="; + hash = "sha256-6zjIEwDHdOIAIucV4T/zY10F80nQNOgnRkA+i2n7Sng="; }; pyproject = true; diff --git a/pkgs/by-name/sc/scid-vs-pc/package.nix b/pkgs/by-name/sc/scid-vs-pc/package.nix index 54ab0980759e..5370f5084667 100644 --- a/pkgs/by-name/sc/scid-vs-pc/package.nix +++ b/pkgs/by-name/sc/scid-vs-pc/package.nix @@ -16,7 +16,7 @@ tcl.mkTclDerivation rec { src = fetchurl { url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz"; - hash = "sha256-DivCF3yCHmGyps7PTU1xKcdG+oBegD/ntMst9rOr0TU="; + hash = "sha256-aWN1w46dOW7VMACs8huvUsACtk3ggIS6BZ51BM9k+VM="; }; postPatch = '' diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix index 0d684e77db3d..697ce7a422ce 100644 --- a/pkgs/by-name/sc/scrcpy/package.nix +++ b/pkgs/by-name/sc/scrcpy/package.nix @@ -16,12 +16,12 @@ }: let - version = "4.0"; + version = "4.1"; prebuilt_server = fetchurl { name = "scrcpy-server"; inherit version; url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - hash = "sha256-hJJL1WSh62CJyHLHUh+WgFiXf5H1/wJRSox0r/MhDzo="; + hash = "sha256-3qy5ke0lCXFRYP/ceQfke0Fg6zDRVmIX6QR/1biFDK4="; }; in stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = "scrcpy"; tag = "v${version}"; - hash = "sha256-o8jZXVwNub8KU7k2BjC9jvpX4Y7bKFySBUYw/dVHck0="; + hash = "sha256-x7ICNxR1i3WCPmYLsE/kmQ7vkNL9Be1M4m5SJMiXob4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix index 203ac01b72c9..4322a0d654e4 100644 --- a/pkgs/by-name/sd/sdrangel/package.nix +++ b/pkgs/by-name/sd/sdrangel/package.nix @@ -12,16 +12,19 @@ dsdcc, faad2, fetchFromGitHub, - fetchpatch, fftwFloat, flac, + ggmorse, glew, hackrf, hidapi, ffmpeg, + inmarsatc, libiio, + libogg, libopus, libpulseaudio, + libunwind, libusb1, limesuite, libbladeRF, @@ -31,6 +34,7 @@ pkg-config, qt6, qt6Packages, + rnnoise, rtl-sdr, serialdv, sdrplay, @@ -39,26 +43,22 @@ uhd, zlib, withSDRplay ? false, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.22.9"; + version = "7.27.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; tag = "v${finalAttrs.version}"; - hash = "sha256-VYSM9ldzx/8tWKQb++qGROSXdeEXIDhGqnnHUmkW4+k="; + hash = "sha256-rdPXqA0ySnqh/rlMlfcDLyAd6egbggWHrRQRnXeQPFM="; }; - patches = [ - # Fix build with Qt 6.10, remove when the commit reaches a release - (fetchpatch { - url = "https://github.com/f4exb/sdrangel/commit/fd6a8d51f8c39fd31b4e864f528bf1921ebd4260.patch"; - hash = "sha256-S8LQbCTEgyEt1wByDsDMqqyQjK5HALtvUIODgQ1skSA="; - }) - ]; + __structuredAttrs = true; + strictDeps = true; nativeBuildInputs = [ cmake @@ -80,11 +80,13 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg fftwFloat flac + ggmorse glew hackrf hidapi libbladeRF libiio + libogg libopus libpulseaudio libusb1 @@ -101,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { qt6Packages.qtspeech qt6Packages.qttools qt6Packages.qtwebsockets - qt6Packages.qtwebengine + rnnoise rtl-sdr serialdv sgp4 @@ -109,18 +111,25 @@ stdenv.mkDerivation (finalAttrs: { uhd zlib ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + inmarsatc + libunwind + qt6Packages.qtwayland + qt6Packages.qtwebengine + ] ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ - "-DAPT_DIR=${aptdec}" - "-DDAB_DIR=${dab_lib}" - "-DSGP4_DIR=${sgp4}" - "-DSOAPYSDR_DIR=${soapysdr-with-plugins}" + (lib.cmakeFeature "APT_DIR" aptdec.outPath) + (lib.cmakeFeature "DAB_DIR" dab_lib.outPath) + (lib.cmakeFeature "SGP4_DIR" sgp4.outPath) + (lib.cmakeFeature "SOAPYSDR_DIR" soapysdr-with-plugins.outPath) + (lib.cmakeBool "ENABLE_QT6" true) "-Wno-dev" - "-DENABLE_QT6=ON" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Software defined radio (SDR) software"; homepage = "https://github.com/f4exb/sdrangel"; diff --git a/pkgs/by-name/se/search-vulns/package.nix b/pkgs/by-name/se/search-vulns/package.nix index d57d17b8e414..5e4919ee1ce8 100644 --- a/pkgs/by-name/se/search-vulns/package.nix +++ b/pkgs/by-name/se/search-vulns/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "search-vulns"; - version = "1.1.0"; + version = "1.2.1"; pyproject = true; src = fetchFromGitHub { owner = "ra1nb0rn"; repo = "search_vulns"; tag = "v${finalAttrs.version}"; - hash = "sha256-b5WFIDxjqe4iEueOm8DyC6Z1KwChSQalppqY2CB4UW8="; + hash = "sha256-w4kK0/bAbWPHK6Nllhb8vCReJwiBUL6EpX/Cnt3aplg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/sh/shoko-webui/package.nix b/pkgs/by-name/sh/shoko-webui/package.nix index 4a64b65afd0c..df0f653cdc03 100644 --- a/pkgs/by-name/sh/shoko-webui/package.nix +++ b/pkgs/by-name/sh/shoko-webui/package.nix @@ -14,13 +14,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "shoko-webui"; - version = "2.4.1"; + version = "2.5.9"; src = fetchFromGitHub { owner = "ShokoAnime"; repo = "Shoko-WebUI"; tag = "v${finalAttrs.version}"; - hash = "sha256-/frP6qI5xAmogb5a5AA83IJxgOhVUi6X0E4h3Qg5u6w="; + hash = "sha256-mHBflHehCnwCkh4K271vo30rfoQa+3xLos0d7P/kKvE="; }; # Avoid requiring git as a build time dependency. It's used for version @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-rTlem83dFptgvKUKUaHK8vi5B0FBehPFtkCUhOnUKd0="; + hash = "sha256-0ZXXfP6iHyd5zlUQruS3MZADkuucygXrUPRKNCNYA7k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sh/shoko/package.nix b/pkgs/by-name/sh/shoko/package.nix index 8ed20a1be403..4febee5eddcc 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.3.1"; + version = "5.3.3"; src = fetchFromGitHub { owner = "ShokoAnime"; repo = "ShokoServer"; tag = "v${finalAttrs.version}"; - hash = "sha256-gZK0NUwPKhrrIjdnfwNI0s618qnTf1cYBgPkwajSTEw="; + hash = "sha256-PJtjG4YJBgUrjBt/S2uWyKrCj1pW4N9wrLqoh2gHKcg="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix index aafc51dbd2a3..5f6bb47767be 100644 --- a/pkgs/by-name/si/signalbackup-tools/package.nix +++ b/pkgs/by-name/si/signalbackup-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "signalbackup-tools"; - version = "20260615"; + version = "20260712"; src = fetchFromGitHub { owner = "bepaald"; repo = "signalbackup-tools"; tag = finalAttrs.version; - hash = "sha256-T/LMv2HbdGo8OViAz2/QFiBXSLqDpkXH5XMvA6H7I70="; + hash = "sha256-X4I7eFUXty9LNI2nNyVUZXYhKQds+elor/Zs5FSg2iE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/sioyek/package.nix b/pkgs/by-name/si/sioyek/package.nix index fafb4e15ddf8..1b2436bb4e7c 100644 --- a/pkgs/by-name/si/sioyek/package.nix +++ b/pkgs/by-name/si/sioyek/package.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sioyek"; - version = "2.0.0-unstable-2026-06-13"; + version = "2.0.0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "ahrm"; repo = "sioyek"; - rev = "552008ace47614dbc21a0d41060b25f08767a4b6"; - hash = "sha256-yzisnz/7pl7IgUK24CqivPoau17rIiu7n0Z20q7UXy8="; + rev = "8c4008653f3279633fe1e7e2a1be057aa210fe73"; + hash = "sha256-5GJpXyLhRziSWJLrDIfzXZS4QPMqiRhEp6gcPoSy1/8="; }; buildInputs = [ diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix index 68106fd82420..4d615ad3b9a8 100644 --- a/pkgs/by-name/sk/sketchybar/package.nix +++ b/pkgs/by-name/sk/sketchybar/package.nix @@ -5,6 +5,7 @@ nix-update-script, apple-sdk_15, versionCheckHook, + llvmPackages, }: let @@ -28,12 +29,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-5tyc/yYzdV/3JTtujuj7le/14XkC7TlN/nZg7tOZsNg="; }; + nativeBuildInputs = [ + # TODO: Remove once #536365 reaches this branch + llvmPackages.lld + ]; + buildInputs = [ apple-sdk_15 ]; makeFlags = [ target ]; + # TODO: Remove once #536365 reaches this branch + env.NIX_CFLAGS_LINK = "-fuse-ld=lld"; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix index ab66664bd318..5be0cecd7181 100644 --- a/pkgs/by-name/sk/skills/package.nix +++ b/pkgs/by-name/sk/skills/package.nix @@ -14,20 +14,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "skills"; - version = "1.5.14"; + version = "1.5.16"; src = fetchFromGitHub { owner = "vercel-labs"; repo = "skills"; tag = "v${finalAttrs.version}"; - hash = "sha256-176EeM1VhNSBH1cYUUy3oLST21PbV0v+tCNglfM9+6Y="; + hash = "sha256-gL8uNkS3gsRGXIunIsYLYykLYs2c1gO9PFVTE69nWKU="; }; pnpmDeps = fetchPnpmDeps { fetcherVersion = 3; inherit (finalAttrs) pname version src; inherit pnpm; - hash = "sha256-3GSa4ze859dRA4Yrxw8r3rwZKn7FMSjBMvpz1HTDobU="; + hash = "sha256-wntHp5UT21wD1myxj8EQafQis5QMuQ9U2PKiKg2jalw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/sk/skim/package.nix b/pkgs/by-name/sk/skim/package.nix index d2a373310254..313cba00a493 100644 --- a/pkgs/by-name/sk/skim/package.nix +++ b/pkgs/by-name/sk/skim/package.nix @@ -11,7 +11,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "skim"; - version = "5.0.0"; + version = "5.1.0"; __structuredAttrs = true; outputs = [ @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "skim-rs"; repo = "skim"; tag = "v${finalAttrs.version}"; - hash = "sha256-fnpTEp2SXAgiK8stHR2AmRnefBDuXAS+gPoWbUDPirI="; + hash = "sha256-AB/73sU02/DHV/bnQXpBqmzmGy+roXyIWd4BnN6GWGw="; }; postPatch = '' @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "expand(':h:h')" "'$out'" ''; - cargoHash = "sha256-o02x09q3s4qyHJcAwhgjC0/fN6xTN392D2vlkAgTReI="; + cargoHash = "sha256-tPNAwaefZrwhH7AoQnAkQYQUfKOKWMehHHeoUf7i4yE="; nativeBuildInputs = [ installShellFiles ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/sl/slint-tr-extractor/package.nix b/pkgs/by-name/sl/slint-tr-extractor/package.nix index a09d2dff3c93..3955135e2b11 100644 --- a/pkgs/by-name/sl/slint-tr-extractor/package.nix +++ b/pkgs/by-name/sl/slint-tr-extractor/package.nix @@ -7,13 +7,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "slint-tr-extractor"; - version = "1.17.0"; + version = "1.17.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-sFqSO+sg9meKynCKx1hWHB691cEqF7ifUd/Q4q37vIA="; + hash = "sha256-ytJLH7CcfLjpzRXljTUZS1rzueBljGXwpDOpKKdBJ+k="; }; - cargoHash = "sha256-+eGziYcF8+wlIw3N4n55GZ5UcI+EyqOuJ9kyz+C7nkw="; + cargoHash = "sha256-D+wHG+e2gVt7I7h0KobY4bLkphZJXWaTCoSp2gpNctE="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/sm/smbclient-ng/package.nix b/pkgs/by-name/sm/smbclient-ng/package.nix index 43724f3c4a5d..59310a4936ea 100644 --- a/pkgs/by-name/sm/smbclient-ng/package.nix +++ b/pkgs/by-name/sm/smbclient-ng/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "smbclient-ng"; - version = "3.0.0"; + version = "3.1.0"; pyproject = true; src = fetchFromGitHub { owner = "p0dalirius"; repo = "smbclient-ng"; tag = finalAttrs.version; - hash = "sha256-W0f+PxPjI5raIjUNK7fcfPvFugrJxLZTWZPpX/6P56w="; + hash = "sha256-y/tTAyo9ouobSRFjP53rUm2Lzm5m5IfCdX7ZOpllwTE="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index a2cc8276e9b8..52db924d889d 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -15,13 +15,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "snx-rs"; - version = "6.1.2"; + version = "6.2.0"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-JhknaTqvd7Dsox38FH6mphbi+DPzVoyLlyAX6ZsqPkI="; + hash = "sha256-GA6YlsX2AgyorWSTPwZI84ViOG1RH9/CDSGOKzbUhHo="; }; passthru.updateScript = nix-update-script { }; @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckHook ]; - cargoHash = "sha256-lclSkg+WDRl3LQuzF4Q1+5zRT7UcnrasVvbcgd7wbxQ="; + cargoHash = "sha256-o01QwkDtbRLOjeAJhajqbWOB/rm7+/dK7t0Nzc1h/gc="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; diff --git a/pkgs/by-name/sp/sprite/package.nix b/pkgs/by-name/sp/sprite/package.nix index 4532980a4c1c..6379d4ef9b81 100644 --- a/pkgs/by-name/sp/sprite/package.nix +++ b/pkgs/by-name/sp/sprite/package.nix @@ -9,7 +9,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sprite"; - version = "0.0.1-rc44"; + version = "0.0.1-rc45"; src = fetchurl { url = "https://sprites-binaries.t3.storage.dev/client/v${finalAttrs.version}/sprite-${ @@ -17,10 +17,10 @@ stdenv.mkDerivation (finalAttrs: { }-${if stdenv.hostPlatform.isx86_64 then "amd64" else "arm64"}.tar.gz"; hash = { - aarch64-darwin = "sha256-XMr3JZxaFFpJh+CDxZYmbfOLrIhjgYj/mqOAA6qgyoo="; - x86_64-darwin = "sha256-KrBmA2auCp+gJ19Cmd7Kc6fDBkgxLIYV50/wWNhz4X0="; - aarch64-linux = "sha256-uiTQgChPRjo/OvvcQso52YxhaKjYJ5aU9nZRPUl5hgw="; - x86_64-linux = "sha256-cmffpuWg9XqFH2BcSC+gJG00kqHvV532XEDOs/u0dHs="; + aarch64-darwin = "sha256-0EbsXuNdSC9lfTR9lQFgGk9nYg200f+tZY8xcXmqTzc="; + x86_64-darwin = "sha256-IA3C42wheIATCBlAFVJbq0omjPZv+rQstthCwXDUm5w="; + aarch64-linux = "sha256-4a7LrFWgxe5wUcPLMDvo2/HmpCnELkJSyr2nAA9RBwk="; + x86_64-linux = "sha256-FfWZ9PFhorfbf8/YsdcFAnpA2QtA1LqAfQiGrc8sesQ="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/sp/spruce/package.nix b/pkgs/by-name/sp/spruce/package.nix index 28abce9ea403..c1664e82c17a 100644 --- a/pkgs/by-name/sp/spruce/package.nix +++ b/pkgs/by-name/sp/spruce/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "spruce"; - version = "1.35.9"; + version = "1.35.11"; src = fetchFromGitHub { owner = "geofffranks"; repo = "spruce"; rev = "v${finalAttrs.version}"; - hash = "sha256-WxFheR0p2rAniXGwM703vPpOem5a8wJ1r/dBgqOwXDQ="; + hash = "sha256-HejGA21Mm8yNvCoVJkwp+Uld3sfwtufyx/yH1xOGbgE="; }; vendorHash = null; diff --git a/pkgs/by-name/sq/sqruff/package.nix b/pkgs/by-name/sq/sqruff/package.nix index ec57b60a3b6f..a6bdd732a3cd 100644 --- a/pkgs/by-name/sq/sqruff/package.nix +++ b/pkgs/by-name/sq/sqruff/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "sqruff"; - version = "0.38.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "quarylabs"; repo = "sqruff"; tag = "v${finalAttrs.version}"; - hash = "sha256-khIP3CtrWcMWIuLcKwDOhwfnJ2FfpffQNqphNpWtzOs="; + hash = "sha256-1ynG6A5sGHnCfAfw6MjSTghLPmicRvWPFWnL2Gtns7Y="; }; - cargoHash = "sha256-9u8U7rWm6jOlxky8+y4ptPRnBBEBWWcg4QO0jbLAk5E="; + cargoHash = "sha256-HAeF831rPODaT5nzzq+Li8xEmT78IJiRppaKUSlPXXg="; # Disable the `python` feature which doesn't work on Nix yet buildNoDefaultFeatures = true; @@ -32,6 +32,7 @@ rustPlatform.buildRustPackage (finalAttrs: { crates/cli/tests/fix_parse_errors.rs \ crates/cli/tests/fix_return_code.rs \ crates/cli/tests/ignore_data_directory.rs \ + crates/cli/tests/none_format.rs \ crates/cli/tests/verbose_logging_ignore.rs \ crates/cli/tests/ui_github.rs \ crates/cli/tests/ui_json.rs \ diff --git a/pkgs/by-name/sr/srsran/package.nix b/pkgs/by-name/sr/srsran/package.nix index a49abe56173f..1a9388f38d43 100644 --- a/pkgs/by-name/sr/srsran/package.nix +++ b/pkgs/by-name/sr/srsran/package.nix @@ -24,11 +24,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "srsran"; version = "25_10"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "srsran"; - repo = "srsran"; - rev = "release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; + repo = "srsRAN_4G"; + tag = "release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; sha256 = "sha256-DwQ4u17m8D5RqX3OIYSyeE5+51sLah1qchRcwlX5i0A="; }; @@ -68,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DENABLE_WERROR=OFF" - (lib.cmakeBool "ENABLE_LTE_RATES" enableLteRates) + (lib.cmakeBool "USE_LTE_RATES" enableLteRates) (lib.cmakeBool "ENABLE_AVX" enableAvx) (lib.cmakeBool "ENABLE_AVX2" enableAvx2) (lib.cmakeBool "ENABLE_FMA" enableFma) @@ -81,9 +82,13 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.srslte.com/"; - description = "Open-source 4G and 5G software radio suite"; + changelog = "https://github.com/srsran/srsRAN_4G/releases/tag/${finalAttrs.src.tag}"; + description = "Open-source 4G software radio suite, including complete LTE UE, eNodeB and EPC applications"; license = lib.licenses.agpl3Plus; - platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ hexagonal-sun ]; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + hexagonal-sun + felbinger + ]; }; }) diff --git a/pkgs/by-name/ss/sssnake/package.nix b/pkgs/by-name/ss/sssnake/package.nix index 8ef9d6a4252f..827090d5de74 100644 --- a/pkgs/by-name/ss/sssnake/package.nix +++ b/pkgs/by-name/ss/sssnake/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sssnake"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "angeljumbo"; repo = "sssnake"; rev = "v${finalAttrs.version}"; - hash = "sha256-zkErOV6Az0kJdwyXzMCnVW1997zpAB79TBvf/41Igic="; + hash = "sha256-RU+yYT+GcCsk0lBisE2/4Y9zMVLA6dbN4n0ibAovav4="; }; postPatch = '' substituteInPlace makefile --replace '-lncursesw' '-lncursesw -D_XOPEN_SOURCE=500' diff --git a/pkgs/by-name/st/stalwart_0_16/package.nix b/pkgs/by-name/st/stalwart_0_16/package.nix index be84df21f1b1..675ae66a9306 100644 --- a/pkgs/by-name/st/stalwart_0_16/package.nix +++ b/pkgs/by-name/st/stalwart_0_16/package.nix @@ -50,7 +50,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "stalwart" + (lib.optionalString stalwartEnterprise "-enterprise"); - version = "0.16.12"; + version = "0.16.13"; __structuredAttrs = true; @@ -58,10 +58,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "stalwartlabs"; repo = "stalwart"; tag = "v${finalAttrs.version}"; - hash = "sha256-IAwD4zW8UEIMQ+Z0y7Qfvo7+o2W2FVySldPA3+IGowE="; + hash = "sha256-Uc1dUuu4TnpTKB17GArlo/hYT2gdUUnl3NxWalSB50k="; }; - cargoHash = "sha256-O/14/jqLXmlmGYfU1x0B1ZRBCGEeREJaOkicaAM7aeU="; + cargoHash = "sha256-C+BwUqeYzutGcX13YgR1ngfUtuk+S12/k/xAYz68b3s="; env = { # https://docs.rs/openssl/latest/openssl/#manual diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix index 4989092fc781..5168a4051808 100644 --- a/pkgs/by-name/st/stats/package.nix +++ b/pkgs/by-name/st/stats/package.nix @@ -46,6 +46,8 @@ let toPlist { CFBundleDevelopmentRegion = "en"; CFBundleExecutable = "Stats"; + CFBundleIconFile = "AppIcon"; + CFBundleIconName = "AppIcon"; CFBundleIdentifier = "eu.exelban.Stats"; CFBundleInfoDictionaryVersion = "6.0"; CFBundleName = "Stats"; @@ -68,7 +70,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "stats"; - version = "3.0.3"; + version = "3.0.6"; __structuredAttrs = true; strictDeps = true; @@ -77,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "exelban"; repo = "Stats"; tag = "v${finalAttrs.version}"; - hash = "sha256-HYuS0mFzzln+EjYUmQgjCPFsF4aGP+4QWalDL0vt3OA="; + hash = "sha256-ztBV+nT3TjislSmItyUFSGvs2atKy5+ZrNHlijIFvTw="; }; nativeBuildInputs = [ @@ -317,6 +319,7 @@ stdenv.mkDerivation (finalAttrs: { --platform macosx \ --minimum-deployment-target 14.0 \ --app-icon AppIcon \ + --output-partial-info-plist /dev/null \ "Stats/Supporting Files/Assets.xcassets" # Copy localization files @@ -350,6 +353,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ _4evy emilytrau + kinnrai ]; platforms = lib.platforms.darwin; }; diff --git a/pkgs/by-name/st/stremio-linux-shell/out-path.patch b/pkgs/by-name/st/stremio-linux-shell/out-path.patch new file mode 100644 index 000000000000..db60b233ce0b --- /dev/null +++ b/pkgs/by-name/st/stremio-linux-shell/out-path.patch @@ -0,0 +1,42 @@ +diff --git a/build.rs b/build.rs +index aa2bec5..d512a42 100644 +--- a/build.rs ++++ b/build.rs +@@ -26,7 +26,7 @@ fn setup_po() -> Result<()> { + && extension == "po" + && let Some(po_lang) = path.file_stem() + { +- let mo_dir = po_dir.join(po_lang).join("LC_MESSAGES"); ++ let mo_dir = Path::new("@out@/share/locale").join(po_lang).join("LC_MESSAGES"); + + fs::create_dir_all(&mo_dir)?; + +@@ -46,7 +46,7 @@ fn setup_po() -> Result<()> { + fn setup_schemas(filename: &str) -> Result<()> { + println!("cargo:rerun-if-changed={DATA_DIR}"); + +- let out_dir = dirs::data_dir().expect("Failed to get data dir"); ++ let out_dir = Path::new("@out@/share"); + let out_dir = out_dir.join("glib-2.0/schemas"); + + fs::create_dir_all(&out_dir)?; +diff --git a/data/com.stremio.Stremio.service b/data/com.stremio.Stremio.service +index 7cfb139..7491969 100644 +--- a/data/com.stremio.Stremio.service ++++ b/data/com.stremio.Stremio.service +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=com.stremio.Stremio +-Exec=/app/bin/stremio --gapplication-service ++Exec=@out@/bin/stremio --gapplication-service +diff --git a/data/stremio.sh b/data/stremio.sh +index 161bada..37373b0 100644 +--- a/data/stremio.sh ++++ b/data/stremio.sh +@@ -5,4 +5,4 @@ if ls /dev/nvidia0 &>/dev/null 2>&1; then + export GSK_RENDERER=opengl + fi + +-exec /app/libexec/stremio/stremio "$@" +\ No newline at end of file ++exec @out@/libexec/stremio/stremio "$@" diff --git a/pkgs/by-name/st/stremio-linux-shell/package.nix b/pkgs/by-name/st/stremio-linux-shell/package.nix index c93dffdd91e9..4a44bf0861f5 100644 --- a/pkgs/by-name/st/stremio-linux-shell/package.nix +++ b/pkgs/by-name/st/stremio-linux-shell/package.nix @@ -3,7 +3,7 @@ rustPlatform, fetchFromGitHub, versionCheckHook, - gitUpdater, + nix-update-script, # nativeBuildInputs pkg-config, @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "stremio-linux-shell"; - version = "1.0.2"; + version = "1.1.2"; strictDeps = true; __structuredAttrs = true; @@ -35,17 +35,18 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Stremio"; repo = "stremio-linux-shell"; tag = "v${finalAttrs.version}"; - hash = "sha256-NbzUAv/L8xzdepqn677nlROumjlliZIHzPXIToHHeTU="; + hash = "sha256-jo+9KDX/a46jPTmYhiFNgp5fDKhoAsML/+m7u3ituEQ="; }; - cargoHash = "sha256-yafkD7D0E+lbFV7MlLwQM4iWC8Glo/Tn2F+TFff6GoM="; + cargoHash = "sha256-hZ9neZD+aB7bth4UTsWJXIKGSbo/c3wZRtfOIp7LvwY="; + + patches = [ + ./out-path.patch + ]; postPatch = '' - substituteInPlace data/com.stremio.Stremio.service \ - --replace-fail "Exec=/app/bin/stremio" "Exec=$out/bin/stremio" - - substituteInPlace data/stremio.sh \ - --replace-fail "/app/libexec/stremio/stremio" "$out/libexec/stremio/stremio" + substituteInPlace data/com.stremio.Stremio.service data/stremio.sh build.rs \ + --subst-var out ''; nativeBuildInputs = [ @@ -67,9 +68,11 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' install -Dm644 data/icons/com.stremio.Stremio.svg $out/share/icons/hicolor/scalable/apps/com.stremio.Stremio.svg install -Dm644 data/com.stremio.Stremio.desktop $out/share/applications/com.stremio.Stremio.desktop + install -Dm644 data/com.stremio.Stremio.metainfo.xml $out/share/metainfo/com.stremio.Stremio.metainfo.xml install -Dm644 data/com.stremio.Stremio.service $out/share/dbus-1/services/com.stremio.Stremio.service install -Dm644 data/server.js $out/libexec/stremio/server.js install -Dm755 data/stremio.sh $out/bin/stremio + install -Dm644 LICENSE $out/share/licenses/stremio/LICENSE mv $out/bin/stremio-linux-shell $out/libexec/stremio/stremio ''; @@ -93,7 +96,9 @@ rustPlatform.buildRustPackage (finalAttrs: { doInstallCheck = true; passthru = { - updateScript = gitUpdater { rev-prefix = "v"; }; + updateScript = nix-update-script { + extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; + }; }; meta = { @@ -111,7 +116,10 @@ rustPlatform.buildRustPackage (finalAttrs: { fromSource obfuscatedCode # server.js ]; - maintainers = with lib.maintainers; [ thunze ]; + maintainers = with lib.maintainers; [ + thunze + fazzi + ]; platforms = lib.platforms.linux; mainProgram = "stremio"; }; diff --git a/pkgs/by-name/sy/syntax-highlight/package.nix b/pkgs/by-name/sy/syntax-highlight/package.nix new file mode 100644 index 000000000000..1a552f7d6d46 --- /dev/null +++ b/pkgs/by-name/sy/syntax-highlight/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenvNoCC, + fetchzip, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "syntax-highlight"; + version = "2.1.30"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchzip { + url = "https://github.com/sbarex/SourceCodeSyntaxHighlight/releases/download/${finalAttrs.version}/Syntax.Highlight.zip"; + hash = "sha256-URjobIBo43xtc2S6Ppr88lzeTo5KdbhF2T5weUjaxsA="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" "$out/bin" + cp -R "Syntax Highlight.app" "$out/Applications/" + + ln -s \ + "$out/Applications/Syntax Highlight.app/Contents/Resources/syntax_highlight_cli" \ + "$out/bin/syntax_highlight_cli" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Quick Look extension for syntax-highlighted source file previews on macOS"; + homepage = "https://github.com/sbarex/SourceCodeSyntaxHighlight"; + changelog = "https://github.com/sbarex/SourceCodeSyntaxHighlight/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ kinnrai ]; + mainProgram = "syntax_highlight_cli"; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/t3/t3code/package.nix b/pkgs/by-name/t3/t3code/package.nix index 835c397f59ca..6352c9047ff7 100644 --- a/pkgs/by-name/t3/t3code/package.nix +++ b/pkgs/by-name/t3/t3code/package.nix @@ -1,25 +1,8 @@ { - cctools, - copyDesktopItems, - electron_41, - fetchFromGitHub, - installShellFiles, lib, - libicns, + callPackage, + symlinkJoin, makeBinaryWrapper, - makeDesktopItem, - nix-update-script, - node-gyp, - nodejs, - python3, - stdenv, - writeDarwinBundle, - xcbuild, - fetchPnpmDeps, - pnpm_10, - pnpmConfigHook, - pnpmBuildHook, - cacert, enableAzureDevOps ? false, azure-cli, azure-cli-extensions, @@ -43,214 +26,59 @@ jujutsu, enableOpencode ? false, opencode, + t3code-unwrapped ? callPackage ./unwrapped.nix { }, }: -stdenv.mkDerivation ( - finalAttrs: - let - appName = "T3 Code (Alpha)"; - electron = electron_41; - pnpm = pnpm_10; - desktopIcon = - if stdenv.hostPlatform.isDarwin then - "assets/prod/black-macos-1024.png" - else - "assets/prod/black-universal-1024.png"; - - runtimePackages = - lib.optionals enableAzureDevOps [ - azure-cli.withExtensions - [ azure-cli-extensions.azure-devops ] - ] - ++ lib.optionals enableBitbucket [ bitbucket-cli ] - ++ lib.optionals enableClaude [ claude-code ] - ++ lib.optionals enableCodex [ codex ] - ++ lib.optionals enableCursor [ code-cursor ] - ++ lib.optionals enableCursorCli [ cursor-cli ] - ++ lib.optionals enableGitHub [ gh ] - ++ lib.optionals enableGit [ git ] - ++ lib.optionals enableGitLab [ glab ] - ++ lib.optionals enableJujutsu [ jujutsu ] - ++ lib.optionals enableOpencode [ opencode ]; - - runtimePathWrapperArgs = lib.optionalString (runtimePackages != [ ]) '' - \ - --prefix PATH : ${lib.makeBinPath runtimePackages} - ''; - in - { - pname = "t3code"; - version = "0.0.28"; - strictDeps = true; - __structuredAttrs = true; - - src = fetchFromGitHub { - owner = "pingdotgg"; - repo = "t3code"; - tag = "v${finalAttrs.version}"; - hash = "sha256-InVrw9L281QSSPrHSiZuivmb+FkYEd6FkHwHIAAxmGk="; - }; - - postPatch = '' - substituteInPlace apps/web/vite.config.ts \ - --replace-fail 'const host = process.env.HOST?.trim() || "localhost";' \ - 'const host = process.env.HOST?.trim() || "127.0.0.1";' - ''; - - nativeBuildInputs = [ - installShellFiles - makeBinaryWrapper - node-gyp - nodejs - python3 - pnpmConfigHook - pnpmBuildHook - pnpm - cacert +let + runtimePackages = + lib.optionals enableAzureDevOps [ + (azure-cli.withExtensions [ azure-cli-extensions.azure-devops ]) ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - cctools.libtool - libicns - writeDarwinBundle - xcbuild - ]; + ++ lib.optionals enableBitbucket [ bitbucket-cli ] + ++ lib.optionals enableClaude [ claude-code ] + ++ lib.optionals enableCodex [ codex ] + ++ lib.optionals enableCursor [ code-cursor ] + ++ lib.optionals enableCursorCli [ cursor-cli ] + ++ lib.optionals enableGitHub [ gh ] + ++ lib.optionals enableGit [ git ] + ++ lib.optionals enableGitLab [ glab ] + ++ lib.optionals enableJujutsu [ jujutsu ] + ++ lib.optionals enableOpencode [ opencode ]; - pnpmWorkspaces = [ - # `...` suffix is used to also include other workspace packages that are - # directly or indirectly depended on by the listed packages, such as - # `@t3tools/contracts` and `@t3tools/shared`. - "@t3tools/monorepo" - "t3..." - "@t3tools/desktop..." - "@t3tools/scripts..." - ]; +in +symlinkJoin { + pname = "t3code"; + inherit (t3code-unwrapped) version; + __structuredAttrs = true; + strictDeps = true; - pnpmDeps = fetchPnpmDeps { - inherit pnpm; - inherit (finalAttrs) - pname - version - src - pnpmWorkspaces - ; + paths = [ t3code-unwrapped ]; - fetcherVersion = 4; - hash = "sha256-+JqW/iI0wdRPxyL7y6ggD/+AvwwZXs9+fSUtG/SgW9s="; - }; + nativeBuildInputs = [ makeBinaryWrapper ]; - preBuild = '' - node scripts/update-release-package-versions.ts ${finalAttrs.version} + postBuild = lib.optionalString (runtimePackages != [ ]) '' + for program in "$out/bin"/*; do + wrapProgram "$program" \ + --prefix PATH : "${lib.makeBinPath runtimePackages}" + done + ''; - export npm_config_nodedir=${nodejs} - export ELECTRON_SKIP_BINARY_DOWNLOAD=1 - # Exclude the `@t3tools/monorepo` workspace from the pending rebuild since - # `vp config` needs git - pnpm rebuild --pending "''${pnpmInstallFlags[@]}" --filter '!@t3tools/monorepo' - ''; - - pnpmBuildScript = "build:desktop"; - - postBuild = '' - pnpm vp cache clean - ''; - - # Many dependencies vendors many prebuilt native artifacts for non-host - # platforms, and some of those binaries are statically linked. Let fixup - # handle wrappers, shebangs, and stripping, but skip patchelf on the - # vendored tree. - dontPatchELF = true; - # The tmpdir audit hook also shells out to patchelf while scanning every - # vendored ELF for leaked build paths. That produces spurious warnings on - # some dependencies' static foreign-platform binaries. - noAuditTmpdir = true; - - installPhase = '' - runHook preInstall - - mkdir --parents "$out"/libexec/t3code/apps/desktop "$out"/libexec/t3code/apps/server - cp --recursive --no-preserve=mode node_modules "$out"/libexec/t3code - cp --recursive --no-preserve=mode apps/server/{node_modules,dist} "$out"/libexec/t3code/apps/server - cp --recursive --no-preserve=mode \ - apps/desktop/{package.json,node_modules,dist-electron} \ - "$out"/libexec/t3code/apps/desktop - - mkdir --parents "$out"/libexec/t3code/apps/desktop/prod-resources - install --mode=444 ${desktopIcon} \ - "$out"/libexec/t3code/apps/desktop/prod-resources/icon.png - - find "$out"/libexec/t3code -xtype l -delete - - makeWrapper ${lib.getExe nodejs} "$out"/bin/t3 \ - --add-flags "$out"/libexec/t3code/apps/server/dist/bin.mjs ${runtimePathWrapperArgs} - - makeWrapper ${lib.getExe electron} "$out"/bin/t3code-desktop \ - --add-flags "$out"/libexec/t3code/apps/desktop \ - --inherit-argv0 ${runtimePathWrapperArgs} - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # node-pty tries to chmod this helper at runtime, but the Nix store is - # immutable by then. - find "$out"/libexec/t3code \ - -path '*/node-pty/prebuilds/darwin-*/spawn-helper' \ - -exec chmod 755 {} + - - mkdir --parents "$out/Applications/${appName}.app/Contents/"{MacOS,Resources} - png2icns \ - "$out/Applications/${appName}.app/Contents/Resources/t3code.icns" \ - ${desktopIcon} - - # writeDarwinBundle is a shebangless bash script; run it explicitly via - # stdenv.shell to avoid Darwin's intermittent ENOEXEC fallback issues. - ${stdenv.shell} ${lib.getExe writeDarwinBundle} \ - "$out" "${appName}" t3code-desktop t3code - '' - + '' - mkdir --parents \ - "$out"/share/icons/hicolor/scalable/apps - install --mode=444 ${desktopIcon} \ - "$out"/share/icons/t3code.png - install --mode=444 assets/prod/logo.svg \ - "$out"/share/icons/hicolor/scalable/apps/t3code.svg - - runHook postInstall - ''; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - for shell in bash fish zsh; do - installShellCompletion --cmd t3 --"$shell" <("$out/bin/t3" --completions "$shell") - done - ''; - - desktopItems = [ - (makeDesktopItem { - name = "t3code"; - desktopName = appName; - comment = "Minimal web GUI for coding agents"; - exec = "t3code-desktop %U"; - terminal = false; - icon = "t3code"; - startupWMClass = "t3code"; - categories = [ "Development" ]; - }) - ]; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - description = "Minimal web GUI for coding agents"; - homepage = "https://t3.codes"; - downloadPage = "https://t3.codes/download"; - changelog = "https://github.com/pingdotgg/t3code/releases/tag/${finalAttrs.src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - iamanaws - qweered - ]; - mainProgram = "t3code-desktop"; - inherit (nodejs.meta) platforms; - }; + passthru = { + unwrapped = t3code-unwrapped; } -) + // t3code-unwrapped.passthru; + + meta = { + # Manually inherit so that pos works + inherit (t3code-unwrapped.meta) + description + homepage + downloadPage + changelog + license + maintainers + mainProgram + platforms + ; + }; +} diff --git a/pkgs/by-name/t3/t3code/unwrapped.nix b/pkgs/by-name/t3/t3code/unwrapped.nix new file mode 100644 index 000000000000..eddfbebb6874 --- /dev/null +++ b/pkgs/by-name/t3/t3code/unwrapped.nix @@ -0,0 +1,216 @@ +{ + cctools, + copyDesktopItems, + electron_41, + fetchFromGitHub, + installShellFiles, + lib, + libicns, + makeBinaryWrapper, + makeDesktopItem, + nix-update-script, + node-gyp, + nodejs, + python3, + stdenv, + writeDarwinBundle, + xcbuild, + fetchPnpmDeps, + pnpm_10, + pnpmConfigHook, + pnpmBuildHook, + cacert, +}: + +stdenv.mkDerivation ( + finalAttrs: + let + appName = "T3 Code (Alpha)"; + electron = electron_41; + pnpm = pnpm_10; + desktopIcon = + if stdenv.hostPlatform.isDarwin then + "assets/prod/black-macos-1024.png" + else + "assets/prod/black-universal-1024.png"; + + in + { + pname = "t3code-unwrapped"; + version = "0.0.28"; + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "pingdotgg"; + repo = "t3code"; + tag = "v${finalAttrs.version}"; + hash = "sha256-InVrw9L281QSSPrHSiZuivmb+FkYEd6FkHwHIAAxmGk="; + }; + + postPatch = '' + substituteInPlace apps/web/vite.config.ts \ + --replace-fail 'const host = process.env.HOST?.trim() || "localhost";' \ + 'const host = process.env.HOST?.trim() || "127.0.0.1";' + ''; + + nativeBuildInputs = [ + installShellFiles + makeBinaryWrapper + node-gyp + nodejs + python3 + pnpmConfigHook + pnpmBuildHook + pnpm + cacert + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools.libtool + libicns + writeDarwinBundle + xcbuild + ]; + + pnpmWorkspaces = [ + # `...` suffix is used to also include other workspace packages that are + # directly or indirectly depended on by the listed packages, such as + # `@t3tools/contracts` and `@t3tools/shared`. + "@t3tools/monorepo" + "t3..." + "@t3tools/desktop..." + "@t3tools/scripts..." + ]; + + pnpmDeps = fetchPnpmDeps { + inherit pnpm; + inherit (finalAttrs) + pname + version + src + pnpmWorkspaces + ; + + fetcherVersion = 4; + hash = "sha256-+JqW/iI0wdRPxyL7y6ggD/+AvwwZXs9+fSUtG/SgW9s="; + }; + + preBuild = '' + node scripts/update-release-package-versions.ts ${finalAttrs.version} + + export npm_config_nodedir=${nodejs} + export ELECTRON_SKIP_BINARY_DOWNLOAD=1 + # Exclude the `@t3tools/monorepo` workspace from the pending rebuild since + # `vp config` needs git + pnpm rebuild --pending "''${pnpmInstallFlags[@]}" --filter '!@t3tools/monorepo' + ''; + + pnpmBuildScript = "build:desktop"; + + postBuild = '' + pnpm vp cache clean + ''; + + # Many dependencies vendors many prebuilt native artifacts for non-host + # platforms, and some of those binaries are statically linked. Let fixup + # handle wrappers, shebangs, and stripping, but skip patchelf on the + # vendored tree. + dontPatchELF = true; + # The tmpdir audit hook also shells out to patchelf while scanning every + # vendored ELF for leaked build paths. That produces spurious warnings on + # some dependencies' static foreign-platform binaries. + noAuditTmpdir = true; + + installPhase = '' + runHook preInstall + + mkdir --parents "$out"/libexec/t3code/apps/desktop "$out"/libexec/t3code/apps/server + cp --recursive --no-preserve=mode node_modules "$out"/libexec/t3code + cp --recursive --no-preserve=mode apps/server/{node_modules,dist} "$out"/libexec/t3code/apps/server + cp --recursive --no-preserve=mode \ + apps/desktop/{package.json,node_modules,dist-electron} \ + "$out"/libexec/t3code/apps/desktop + + mkdir --parents "$out"/libexec/t3code/apps/desktop/prod-resources + install --mode=444 ${desktopIcon} \ + "$out"/libexec/t3code/apps/desktop/prod-resources/icon.png + + find "$out"/libexec/t3code -xtype l -delete + + makeWrapper ${lib.getExe nodejs} "$out"/bin/t3 \ + --add-flags "$out"/libexec/t3code/apps/server/dist/bin.mjs + + makeWrapper ${lib.getExe electron} "$out"/bin/t3code-desktop \ + --add-flags "$out"/libexec/t3code/apps/desktop \ + --inherit-argv0 + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # node-pty tries to chmod this helper at runtime, but the Nix store is + # immutable by then. + find "$out"/libexec/t3code \ + -path '*/node-pty/prebuilds/darwin-*/spawn-helper' \ + -exec chmod 755 {} + + + mkdir --parents "$out/Applications/${appName}.app/Contents/"{MacOS,Resources} + png2icns \ + "$out/Applications/${appName}.app/Contents/Resources/t3code.icns" \ + ${desktopIcon} + + # writeDarwinBundle is a shebangless bash script; run it explicitly via + # stdenv.shell to avoid Darwin's intermittent ENOEXEC fallback issues. + ${stdenv.shell} ${lib.getExe writeDarwinBundle} \ + "$out" "${appName}" t3code-desktop t3code + '' + + '' + mkdir --parents \ + "$out"/share/icons/hicolor/scalable/apps + install --mode=444 ${desktopIcon} \ + "$out"/share/icons/t3code.png + install --mode=444 assets/prod/logo.svg \ + "$out"/share/icons/hicolor/scalable/apps/t3code.svg + + runHook postInstall + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + for shell in bash fish zsh; do + installShellCompletion --cmd t3 --"$shell" <("$out/bin/t3" --completions "$shell") + done + ''; + + desktopItems = [ + (makeDesktopItem { + name = "t3code"; + desktopName = appName; + comment = "Minimal web GUI for coding agents"; + exec = "t3code-desktop %U"; + terminal = false; + icon = "t3code"; + startupWMClass = "t3code"; + categories = [ "Development" ]; + }) + ]; + + passthru = { + updateScript = nix-update-script { + attrPath = "t3code.unwrapped"; + extraArgs = [ "--use-github-releases" ]; + }; + }; + + meta = { + description = "Minimal web GUI for coding agents"; + homepage = "https://t3.codes"; + downloadPage = "https://t3.codes/download"; + changelog = "https://github.com/pingdotgg/t3code/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + iamanaws + qweered + ]; + mainProgram = "t3code-desktop"; + inherit (nodejs.meta) platforms; + }; + } +) diff --git a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json index 55abcf33388d..ca48dcf1154e 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server-library/nuget-deps.json @@ -19,4 +19,4 @@ "version": "6.0.0", "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo=" } -] \ No newline at end of file +] diff --git a/pkgs/by-name/te/technitium-dns-server-library/package.nix b/pkgs/by-name/te/technitium-dns-server-library/package.nix index 1a7f086d303c..c5db4bfb27f8 100644 --- a/pkgs/by-name/te/technitium-dns-server-library/package.nix +++ b/pkgs/by-name/te/technitium-dns-server-library/package.nix @@ -7,13 +7,13 @@ }: buildDotnetModule rec { pname = "technitium-dns-server-library"; - version = "15.2.0"; + version = "15.3.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "TechnitiumLibrary"; tag = "dns-server-v${version}"; - hash = "sha256-PC8j7JT4JiisGGfHORke63boLC4W1gLoaQQ3jPz5Qtc="; + hash = "sha256-BQWDzMEiChY8uX1wUUZNWFDomGqUyDrZ6+UEncC5G5U="; name = "${pname}-${version}"; }; diff --git a/pkgs/by-name/te/technitium-dns-server/dnssec-do-bit-fix.patch b/pkgs/by-name/te/technitium-dns-server/dnssec-do-bit-fix.patch deleted file mode 100644 index aaafec50add1..000000000000 --- a/pkgs/by-name/te/technitium-dns-server/dnssec-do-bit-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs b/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs -index 352ea6c0..41a9a1c7 100644 ---- a/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs -+++ b/DnsServerCore/Dns/ZoneManagers/AuthZoneManager.cs -@@ -3536,7 +3536,7 @@ namespace DnsServerCore.Dns.ZoneManagers - } - } - -- return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, true, false, request.RecursionDesired, isRecursionAllowed, false, false, rCode, request.Question, answer, authority, additional, udpPayloadSize: _dnsServer.UdpPayloadSize, options: eDnsOptions); -+ return new DnsDatagram(request.Identifier, true, DnsOpcode.StandardQuery, true, false, request.RecursionDesired, isRecursionAllowed, false, false, rCode, request.Question, answer, authority, additional, _dnsServer.UdpPayloadSize, request.DnssecOk ? EDnsHeaderFlags.DNSSEC_OK : EDnsHeaderFlags.None, eDnsOptions); - } - } - diff --git a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json index 3c5b4c6e4f0a..dfb73aa03e2b 100644 --- a/pkgs/by-name/te/technitium-dns-server/nuget-deps.json +++ b/pkgs/by-name/te/technitium-dns-server/nuget-deps.json @@ -6,8 +6,8 @@ }, { "pname": "Microsoft.AspNetCore.Authentication.OpenIdConnect", - "version": "10.0.7", - "hash": "sha256-hr1QgB9miQO2rXj5heibTX/fa3Tj/Nci8G/pDcrq11c=" + "version": "10.0.9", + "hash": "sha256-+fRq6oetJlK32C2R/nRBThcO+S6HTX6AIcfg12keAxU=" }, { "pname": "Microsoft.IdentityModel.Abstractions", @@ -59,4 +59,4 @@ "version": "8.0.1", "hash": "sha256-hW4f9zWs0afxPbcMqCA/FAGvBZbBFSkugIOurswomHg=" } -] \ No newline at end of file +] diff --git a/pkgs/by-name/te/technitium-dns-server/package.nix b/pkgs/by-name/te/technitium-dns-server/package.nix index f143be229523..6ddd88f61f89 100644 --- a/pkgs/by-name/te/technitium-dns-server/package.nix +++ b/pkgs/by-name/te/technitium-dns-server/package.nix @@ -10,13 +10,13 @@ }: buildDotnetModule rec { pname = "technitium-dns-server"; - version = "15.2.0"; + version = "15.3.0"; src = fetchFromGitHub { owner = "TechnitiumSoftware"; repo = "DnsServer"; tag = "v${version}"; - hash = "sha256-464jhswTOJnQnxetl9hH5U3aDP0RXzJTicot9nWzpAo="; + hash = "sha256-nopmnQpozvN0p/SyUCH3Yej/oAhDvNdfJssUA1JyGsk="; name = "${pname}-${version}"; }; @@ -41,12 +41,6 @@ buildDotnetModule rec { libmsquic ]; - # Confirmed correct by upstream, remove when fixed in a release: - # https://github.com/TechnitiumSoftware/DnsServer/issues/1967 - patches = [ - ./dnssec-do-bit-fix.patch - ]; - passthru.tests = { inherit (nixosTests) technitium-dns-server; }; diff --git a/pkgs/by-name/te/terminal-notifier/package.nix b/pkgs/by-name/te/terminal-notifier/package.nix index ecfea7c2fb1d..59cd6469b99d 100644 --- a/pkgs/by-name/te/terminal-notifier/package.nix +++ b/pkgs/by-name/te/terminal-notifier/package.nix @@ -3,6 +3,7 @@ fetchFromGitHub, ibtool, lib, + llvmPackages, makeBinaryWrapper, stdenv, xcbuildHook, @@ -23,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: { ibtool makeBinaryWrapper xcbuildHook + # TODO: Clean up on `staging` + llvmPackages.lld ]; buildInputs = [ @@ -36,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: { "Release" ]; + # TODO: Clean up on `staging` + env.NIX_CFLAGS_LINK = "-fuse-ld=lld"; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/te/termirs/package.nix b/pkgs/by-name/te/termirs/package.nix index 3fd1b6324c62..80f600b6c4ea 100644 --- a/pkgs/by-name/te/termirs/package.nix +++ b/pkgs/by-name/te/termirs/package.nix @@ -8,19 +8,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "termirs"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "caelansar"; repo = "termirs"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ae295u1qJLWrtWSYK+c9wMgjW6m3rvTJzVsm25BeXZo="; + hash = "sha256-K8SDC/pH+PcY67qo/2F8zLKafzdKbxSC5IcVVRYMkHE="; }; - cargoHash = "sha256-klSZDK3s5X7qRopXVy3Qec3Dnuu9ov0bfuhwc6DwpIM="; + cargoHash = "sha256-z0TgeDALtpDoR3YEHi+udRgTLwDhWQcGVejNBjuzY4c="; postPatch = '' - substituteInPlace ../termirs-0.3.2-vendor/source-git-0/wezterm-term-0.1.0/src/terminalstate/mod.rs \ + substituteInPlace ../termirs-0.3.3-vendor/source-git-0/wezterm-term-0.1.0/src/terminalstate/mod.rs \ --replace-fail 'include_bytes!("../../../termwiz/data/wezterm")' 'include_bytes!("../../../termwiz-0.24.0/data/wezterm")' ''; diff --git a/pkgs/by-name/tf/tfupdate/package.nix b/pkgs/by-name/tf/tfupdate/package.nix index aaa1a2d6cfbb..7ced17a1bfa4 100644 --- a/pkgs/by-name/tf/tfupdate/package.nix +++ b/pkgs/by-name/tf/tfupdate/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "tfupdate"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfupdate"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-aS+0piQbV4Lh5vJzzgpxQ3uoK9ENP1j4KpuMW+XosA4="; + sha256 = "sha256-1okamMftP12ggQWxTgkjD4iAuxLlQ0YSwiUq8U39D7Y="; }; - vendorHash = "sha256-0odAvB2VqYZnPu4wlXpPeR2ioEq3WOGyvpRm72/GWsg="; + vendorHash = "sha256-5dz76K1/sBmms1iL7dFHXg2jJwsRmDlgstiHKExBAyU="; # Tests start http servers which need to bind to local addresses: # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted diff --git a/pkgs/by-name/th/thorium-reader/package.nix b/pkgs/by-name/th/thorium-reader/package.nix index e345900043fa..b98d7cd74d79 100644 --- a/pkgs/by-name/th/thorium-reader/package.nix +++ b/pkgs/by-name/th/thorium-reader/package.nix @@ -14,18 +14,35 @@ buildNpmPackage (finalAttrs: { pname = "thorium-reader"; - version = "3.3.0"; + version = "3.4.0"; nodejs = nodejs_24; - npmDepsHash = "sha256-UR2MSqmdJ79Fz7qjQRkCAwx2jdMn8KLWPzNSnnsb5Ak="; + npmDepsHash = "sha256-IwdU77fRJJ7Ch5rWop3lFpf14XHklFDa8w6YJCFtJRU="; makeCacheWritable = true; src = fetchFromGitHub { owner = "edrlab"; repo = "thorium-reader"; tag = "v${finalAttrs.version}"; - hash = "sha256-2d5M9C/cLK2A8O3Ls0xEkT6H8tucVR7eivPi+82V7Zg="; + hash = "sha256-h285GM7DKKD34Wjw6E+zSSIGkUH/UOesLrYD2EdQ7+U="; }; + # The upstream `build` script re-runs `npm i` inside `dist/` to populate + # `dist/node_modules` with the runtime subset declared in `src/package.json`. + # This is bad (not reproducible), so we strip that segment from the `build` + # script. This ends up not being an issue, since our build/install process + # copies relevant dependencies anyways. + patches = [ ./remove-dist-npm-install.patch ]; + + postBuild = '' + # copy node modules manually + cp -r node_modules dist/node_modules + + # remove unnecessary npm deps + pushd dist + npm prune --production --ignore-scripts --offline --no-audit --no-fund + popd + ''; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; # makeBinaryWrapper is required on Darwin since MacOS is confuses itself # into thinking it needs Rosetta 2 if it encounters a non-MachO executable diff --git a/pkgs/by-name/th/thorium-reader/remove-dist-npm-install.patch b/pkgs/by-name/th/thorium-reader/remove-dist-npm-install.patch new file mode 100644 index 000000000000..4b5146605262 --- /dev/null +++ b/pkgs/by-name/th/thorium-reader/remove-dist-npm-install.patch @@ -0,0 +1,13 @@ +diff --git a/package.json b/package.json +index d838331..073dfff 100644 +--- a/package.json ++++ b/package.json +@@ -25,7 +25,7 @@ + "_NOT_NEEDED_electron-build_": "npm rebuild --runtime=electron --target=41.1.1 --disturl=https://electronjs.org/headers --build-from-source", + "_NOT_NEEDED_electron-build": "electron-rebuild --version=41.1.1 --disturl=https://electronjs.org/headers", + "_NOT_NEEDED_rmDupeReactReduxTypes": "rimraf \"./node_modules/@types/react-redux/node_modules/@types/react\"", +- "build": "cross-env NODE_ENV=production webpack --config webpack.config.js && ncp src/package.json dist/package.json && cd dist && rimraf node_modules && npm i --ignore-scripts --foreground-scripts && rimraf package-lock.json && cd ..", ++ "build": "cross-env NODE_ENV=production webpack --config webpack.config.js && ncp src/package.json dist/package.json", + "build:prod": "npm run lint && npm run build", + "build:dev:main": "webpack --config webpack.config.main.js", + "_NOT_NEEDED_build:dev:renderer:library": "webpack --config webpack.config.renderer-library.js", diff --git a/pkgs/by-name/th/thunderbird-mcp/package-lock.json b/pkgs/by-name/th/thunderbird-mcp/package-lock.json index 4d69ec7302a2..6eab8be02f1b 100644 --- a/pkgs/by-name/th/thunderbird-mcp/package-lock.json +++ b/pkgs/by-name/th/thunderbird-mcp/package-lock.json @@ -1,19 +1,1110 @@ { "name": "thunderbird-mcp", - "version": "0.1.0", + "version": "0.7.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "thunderbird-mcp", - "version": "0.1.0", + "version": "0.7.3", "license": "MIT", "bin": { "thunderbird-mcp": "mcp-bridge.cjs" }, + "devDependencies": { + "@eslint/js": "^10.0.1", + "eslint": "^10.5.0", + "eslint-plugin-n": "^18.1.0", + "eslint-plugin-promise": "^7.2.1", + "globals": "^17.5.0" + }, "engines": { "node": ">=18.0.0" } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz", + "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.4.3" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/config-array": { + "version": "0.23.5", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz", + "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^3.0.5", + "debug": "^4.3.1", + "minimatch": "^10.2.4" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@eslint/config-helpers": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.6.0.tgz", + "integrity": "sha512-ii6Bw9jJ2zi2cWA2Z+9/QZ/+3DX6kwaV5Q986D/CdP3Lap3w/pgQZ373FV7byY/i7L4IRH/G43I5dz1ClsCbpA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^1.2.1" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@eslint/core": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz", + "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@eslint/js": { + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-10.0.1.tgz", + "integrity": "sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "eslint": "^10.0.0" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } + }, + "node_modules/@eslint/object-schema": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz", + "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.2.tgz", + "integrity": "sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^1.2.1", + "levn": "^0.4.1" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@humanfs/core": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz", + "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/types": "^0.15.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.8", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz", + "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@humanfs/core": "^0.19.2", + "@humanfs/types": "^0.15.0", + "@humanwhocodes/retry": "^0.4.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/types": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz", + "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.22" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@humanwhocodes/retry": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } + }, + "node_modules/@types/esrecurse": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz", + "integrity": "sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/estree": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true, + "license": "MIT" + }, + "node_modules/acorn": { + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz", + "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==", + "dev": true, + "license": "MIT", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/ajv": { + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", + "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/brace-expansion": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz", + "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/cross-spawn": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/enhanced-resolve": { + "version": "5.24.2", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.2.tgz", + "integrity": "sha512-rpsZEGT1jFuve6QlpyRp9ckQ+kN61hvF9BzCPyMdaKTm8UJce96KBn3sorXOFXlzjPrs3Vc4T1NsSroZ3PxlFw==", + "dev": true, + "license": "MIT", + "dependencies": { + "graceful-fs": "^4.2.4", + "tapable": "^2.3.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint": { + "version": "10.7.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.7.0.tgz", + "integrity": "sha512-GVTD7s1vdIl6UYvAfriOPeY1Df8LIZjfofLvHwde+erDHGGuHyuM6xoxRxmHiebhYuD2p1vN4wWh0XzPARSGDQ==", + "dev": true, + "license": "MIT", + "workspaces": [ + "packages/*" + ], + "dependencies": { + "@eslint-community/eslint-utils": "^4.8.0", + "@eslint-community/regexpp": "^4.12.2", + "@eslint/config-array": "^0.23.5", + "@eslint/config-helpers": "^0.6.0", + "@eslint/core": "^1.2.1", + "@eslint/plugin-kit": "^0.7.2", + "@humanfs/node": "^0.16.6", + "@humanwhocodes/module-importer": "^1.0.1", + "@humanwhocodes/retry": "^0.4.2", + "@types/estree": "^1.0.6", + "ajv": "^6.14.0", + "cross-spawn": "^7.0.6", + "debug": "^4.3.2", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^9.1.2", + "eslint-visitor-keys": "^5.0.1", + "espree": "^11.2.0", + "esquery": "^1.7.0", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^8.0.0", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "minimatch": "^10.2.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } + } + }, + "node_modules/eslint-compat-utils": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz", + "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "semver": "^7.5.4" + }, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "eslint": ">=6.0.0" + } + }, + "node_modules/eslint-plugin-es-x": { + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.8.0.tgz", + "integrity": "sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==", + "dev": true, + "funding": [ + "https://github.com/sponsors/ota-meshi", + "https://opencollective.com/eslint" + ], + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.1.2", + "@eslint-community/regexpp": "^4.11.0", + "eslint-compat-utils": "^0.5.1" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": ">=8" + } + }, + "node_modules/eslint-plugin-n": { + "version": "18.2.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-18.2.2.tgz", + "integrity": "sha512-gOO0lIqwEjZ750kv9/SptCWArUoAZXJoBr0vYWTO2dCBxctHUXlBIigiC8xuxxr/NKqgIT6Ehz1xRcilj8a5cA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.5.0", + "enhanced-resolve": "^5.17.1", + "eslint-plugin-es-x": "^7.8.0", + "get-tsconfig": "^4.8.1", + "globals": "^15.11.0", + "globrex": "^0.1.2", + "ignore": "^5.3.2", + "semver": "^7.6.3" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": ">=8.57.1", + "ts-declaration-location": "^1.0.6", + "typescript": ">=5.0.0" + }, + "peerDependenciesMeta": { + "ts-declaration-location": { + "optional": true + }, + "typescript": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-n/node_modules/globals": { + "version": "15.15.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", + "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/eslint-plugin-promise": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-7.3.0.tgz", + "integrity": "sha512-6uGiOR0INuujr6PEQmeSSP7GbIMJ/ebEXXiEzb/nOj68LknH5Pxzb/AbZivmr6VE6TkTE8rTjRK9zhKpK6HsRA==", + "dev": true, + "license": "ISC", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0" + } + }, + "node_modules/eslint-scope": { + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz", + "integrity": "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@types/esrecurse": "^4.3.1", + "@types/estree": "^1.0.8", + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", + "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-11.2.0.tgz", + "integrity": "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "acorn": "^8.16.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^5.0.1" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/esquery": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", + "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true, + "license": "MIT" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true, + "license": "MIT" + }, + "node_modules/file-entry-cache": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^4.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/flat-cache": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.4" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/flatted": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", + "dev": true, + "license": "ISC" + }, + "node_modules/get-tsconfig": { + "version": "4.14.0", + "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.0.tgz", + "integrity": "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==", + "dev": true, + "license": "MIT", + "dependencies": { + "resolve-pkg-maps": "^1.0.0" + }, + "funding": { + "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1" + } + }, + "node_modules/glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "license": "ISC", + "dependencies": { + "is-glob": "^4.0.3" + }, + "engines": { + "node": ">=10.13.0" + } + }, + "node_modules/globals": { + "version": "17.7.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.7.0.tgz", + "integrity": "sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/globrex": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", + "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", + "dev": true, + "license": "MIT" + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true, + "license": "ISC" + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "license": "MIT", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" + }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true, + "license": "MIT" + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" + }, + "node_modules/keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "json-buffer": "3.0.1" + } + }, + "node_modules/levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/minimatch": { + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", + "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.5" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" + }, + "node_modules/optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/resolve-pkg-maps": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", + "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" + } + }, + "node_modules/semver": { + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", + "dev": true, + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "license": "MIT", + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/tapable": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz", + "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, + "node_modules/type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "license": "MIT", + "dependencies": { + "prelude-ls": "^1.2.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "license": "ISC", + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "node-which": "bin/node-which" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } } } } diff --git a/pkgs/by-name/th/thunderbird-mcp/package.nix b/pkgs/by-name/th/thunderbird-mcp/package.nix index dabc4c8ea9c0..d2ff5690148e 100644 --- a/pkgs/by-name/th/thunderbird-mcp/package.nix +++ b/pkgs/by-name/th/thunderbird-mcp/package.nix @@ -7,24 +7,30 @@ buildNpmPackage (finalAttrs: { pname = "thunderbird-mcp"; - version = "0.6.0"; + version = "0.7.3"; src = fetchFromGitHub { owner = "TKasperczyk"; repo = "thunderbird-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-wewuXZV6tjSJ3gjmUkIoRFWwGbqVUc7xxEt1kp9dWSM="; + hash = "sha256-VIJUMMiJ2NCdMfxK4E/FAQ4P2ryS6KlxhPj749JH6sE="; }; postPatch = '' cp ${./package-lock.json} package-lock.json ''; - preInstall = "mkdir node_modules/"; forceEmptyCache = true; dontNpmBuild = true; - npmDepsHash = "sha256-LbEnmABmAoTCTPNNbocl+n2TtFC3FOFwwTnyATxvM3k="; + npmDepsHash = "sha256-6irpujYRk/OvoTA43CvtoaOmHvK4coMFXRfXhGrjFNk="; + + doCheck = true; + + # Tests use local mock servers. + __darwinAllowLocalNetworking = true; + + checkPhase = "npm test"; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix index 84d7636fa278..2b4fe6b29b98 100644 --- a/pkgs/by-name/ti/tigerbeetle/package.nix +++ b/pkgs/by-name/ti/tigerbeetle/package.nix @@ -10,14 +10,14 @@ let platform = if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system; hash = builtins.getAttr platform { - "universal-macos" = "sha256-4WwsY0UzKpBFoVT2FbSyc8zMat8gD5m+32ui2IS/nIg="; - "x86_64-linux" = "sha256-PKG0BqSZwLfrte2DKHxHMEcGHjqqHoCBBtmvWVy1CRM="; - "aarch64-linux" = "sha256-Xv8qOs64sJPd9SfbkawtBFC99ByVdZkvD4BZaeqVNCg="; + "universal-macos" = "sha256-kvTRqAZ1kX9ojZdto5sRxPm/sUU8dRGb31GKszr5KTo="; + "x86_64-linux" = "sha256-fuNmpCZ/0cV+AuOLeG5RvBxFd/hGYrx005QJWCihPpY="; + "aarch64-linux" = "sha256-4mSFOvgoz7d14iKWl6B6jYwkEz1Yud8Apt9yT/E7ynY="; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "tigerbeetle"; - version = "0.17.8"; + version = "0.17.9"; src = fetchzip { url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip"; diff --git a/pkgs/by-name/ti/tinygo/package.nix b/pkgs/by-name/ti/tinygo/package.nix index e62935a3fc6b..817d6ce5e72d 100644 --- a/pkgs/by-name/ti/tinygo/package.nix +++ b/pkgs/by-name/ti/tinygo/package.nix @@ -1,11 +1,11 @@ { stdenv, lib, - buildGo125Module, + buildGo126Module, fetchFromGitHub, makeWrapper, llvmPackages_20, - go_1_25, + go_1_26, xar, binaryen, avrdude, @@ -18,8 +18,8 @@ let # nixpkgs typically updates default llvm and go versions faster than tinygo releases # which ends up breaking this build. Use fixed versions for each release. - buildGoModule = buildGo125Module; - go = go_1_25; + buildGoModule = buildGo126Module; + go = go_1_26; llvmMajor = lib.versions.major llvm.version; inherit (llvmPackages_20) llvm diff --git a/pkgs/by-name/to/todoist-cli/package.nix b/pkgs/by-name/to/todoist-cli/package.nix index a5fcf11c5769..3aa1dcdc3788 100644 --- a/pkgs/by-name/to/todoist-cli/package.nix +++ b/pkgs/by-name/to/todoist-cli/package.nix @@ -7,16 +7,16 @@ }: buildNpmPackage rec { pname = "todoist-cli"; - version = "1.75.3"; + version = "1.76.1"; src = fetchFromGitHub { owner = "Doist"; repo = "todoist-cli"; rev = "v${version}"; - sha256 = "sha256-OqpwGMMEVpCLogSarf+RJBHXxvSf9EulwYO5hsuDXPY="; + sha256 = "sha256-3glrAc2yZJqP8gd28m5cjVPR+t7hM17etsxQWOs4J8k="; }; - npmDepsHash = "sha256-Wz7UxeZwC0boDBb9hGomELJ37mK+3aL8szpYDYDtjUg="; + npmDepsHash = "sha256-q50gIxHYdwW7cUO6FaUr3em1NX6kNw/+T8T+QLaB6Wk="; doCheck = true; diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix index c3609237d5a3..45ef928a6052 100644 --- a/pkgs/by-name/to/topgrade/package.nix +++ b/pkgs/by-name/to/topgrade/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, rustPlatform, installShellFiles, + llvmPackages, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -21,14 +22,18 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ installShellFiles - ]; + ] + # TODO: Remove once #536365 reaches this branch + ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ]; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals stdenv.hostPlatform.isDarwin [ + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + NIX_CFLAGS_COMPILE = toString [ "-framework" "AppKit" - ] - ); + ]; + # TODO: Remove once #536365 reaches this branch + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd topgrade \ diff --git a/pkgs/by-name/tu/tuist/package.nix b/pkgs/by-name/tu/tuist/package.nix index 12296f5ac958..b8c6fed3bc6d 100644 --- a/pkgs/by-name/tu/tuist/package.nix +++ b/pkgs/by-name/tu/tuist/package.nix @@ -4,15 +4,16 @@ fetchurl, unzip, nix-update-script, + versionCheckHook, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tuist"; - version = "4.144.0"; + version = "4.202.1"; src = fetchurl { url = "https://github.com/tuist/tuist/releases/download/${finalAttrs.version}/tuist.zip"; - hash = "sha256-t6nqGnrIwZQFfji7r1I2MvV0e8MFtUTlpOmOi8i8aYM="; + hash = "sha256-J/xlwRRW3zLr03jA6Xpa5frlRQGHa/nmzzlj35/30tw="; }; dontUnpack = true; @@ -35,6 +36,24 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "version"; + versionCheckKeepEnvironment = [ + "HOME" + "XDG_CACHE_HOME" + "XDG_CONFIG_HOME" + "XDG_STATE_HOME" + ]; + preVersionCheck = '' + export HOME=$(mktemp -d) + export XDG_CACHE_HOME=$HOME/.cache + export XDG_CONFIG_HOME=$HOME/.config + export XDG_STATE_HOME=$HOME/.local/state + ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^([0-9.]+)$" ]; }; meta = { diff --git a/pkgs/by-name/tu/tun2socks/package.nix b/pkgs/by-name/tu/tun2socks/package.nix index a2d6f20fdf3c..5a0dedd48c08 100644 --- a/pkgs/by-name/tu/tun2socks/package.nix +++ b/pkgs/by-name/tu/tun2socks/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "tun2socks"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "xjasonlyu"; repo = "tun2socks"; tag = "v${version}"; - hash = "sha256-ec4M107BE6MCnW/uz9S83JYJtY9tsQQXDFL98h951DA="; + hash = "sha256-eObTZsNy5sBzgM7YNsA6Q4IWazWv3MTywrLtkv7XLOc="; }; - vendorHash = "sha256-YAAdyV2p/Ci9RzgVWYXBwR/ctERSQ8SPK7AbwRuUJiI="; + vendorHash = "sha256-slsPN0XvE6/8CcAEhSwm743IGYNpIljq1DVTsjpY6lk="; ldflags = [ "-w" diff --git a/pkgs/by-name/tx/txm/package.nix b/pkgs/by-name/tx/txm/package.nix new file mode 100644 index 000000000000..300cdec3a808 --- /dev/null +++ b/pkgs/by-name/tx/txm/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "txm"; + version = "0.1.4"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "thatmagicalcat"; + repo = "txm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TV2vDQRH4KV+id7pPtG3Wjbfz/V60RS3wfIvKTP90iE="; + }; + + cargoHash = "sha256-ZGoIIPuDZUata7YmKOMCYcwc8Dlxo0s8W6eogK8qWsE="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal math rendering engine with LaTeX support"; + homepage = "https://github.com/thatmagicalcat/txm"; + changelog = "https://github.com/thatmagicalcat/txm/releases/tag/v${finalAttrs.src.tag}"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ DuskyElf ]; + mainProgram = "txm"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix index 38dc7ce6849f..3927f5cd282a 100644 --- a/pkgs/by-name/ud/udiskie/package.nix +++ b/pkgs/by-name/ud/udiskie/package.nix @@ -108,5 +108,6 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dotlambda ]; + mainProgram = "udiskie"; }; }) diff --git a/pkgs/by-name/ur/urbit/package.nix b/pkgs/by-name/ur/urbit/package.nix index 8bc85a12e162..897bec0e3243 100644 --- a/pkgs/by-name/ur/urbit/package.nix +++ b/pkgs/by-name/ur/urbit/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "urbit"; - version = "4.5"; + version = "4.6"; src = fetchurl { url = "https://github.com/urbit/vere/releases/download/vere-v${finalAttrs.version}/${platform}.tgz"; sha256 = { - x86_64-linux = "1vbyh6glh4fqcx8d8x2jp88nzl9922dj709zgwhvy858s2m30ymz"; - aarch64-linux = "18gc1kyxj4j6vikxpif4a1b6l629m0lnhdzmlwx5i2v0l18drvbp"; - x86_64-darwin = "02g431xgjw8gwa823kkxnzhg1cgswi3nlkv54mzkjxbhw856qa4z"; - aarch64-darwin = "06x8mdxmbmhg78jzsf0n83cwmp2czp74ssh616ikqf1r8v5l0h2p"; + x86_64-linux = "1bm32airwqi6pkxlkd0hwrwd0gwm9x5y05dzgy27yxnbcrnyjcpk"; + aarch64-linux = "126hw995xipbx9kb4ml8kn6xwkwd96q90cbr3q143ya2wl1sabya"; + x86_64-darwin = "07k8msx5wxyggi8x8hc97vimb6zbav7ficyq7m6jjaq1zf0vinqb"; + aarch64-darwin = "0dsapvlyfr2cb9c16b46bcnvq75by87ybys96zhf16k92z4rzrfv"; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix index fe869947d6ed..45b9f505aba5 100644 --- a/pkgs/by-name/vc/vcpkg/package.nix +++ b/pkgs/by-name/vc/vcpkg/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "vcpkg"; - version = "2026.06.01"; + version = "2026.06.24"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg"; tag = finalAttrs.version; - hash = "sha256-hb3kFRe/14pO0IUyQNpmV2tEgP0hCcRx5KcbY49MPio="; + hash = "sha256-pPTN+Oy9CwcgeJx7nXK0K65JQDWiQdytbqA9e2cXgkY="; leaveDotGit = true; postFetch = '' cd "$out" diff --git a/pkgs/by-name/vm/vmaware/package.nix b/pkgs/by-name/vm/vmaware/package.nix new file mode 100644 index 000000000000..1f99151f85bc --- /dev/null +++ b/pkgs/by-name/vm/vmaware/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "vmaware"; + version = "2.8.0"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "kernelwernel"; + repo = "VMAware"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KPjIk5nm27RcxGg3owfLVt+b1sL0y90IPPgeGv7fTgQ="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Cross-platform C++ library and CLI tool for virtual machine detection"; + homepage = "https://github.com/kernelwernel/VMAware"; + changelog = "https://github.com/kernelwernel/VMAware/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ patrickdag ]; + platforms = lib.platforms.linux; + mainProgram = "vmaware"; + }; +}) diff --git a/pkgs/by-name/vp/vpnc-scripts/package.nix b/pkgs/by-name/vp/vpnc-scripts/package.nix index ef15c3834c9b..1bac471f4bd2 100644 --- a/pkgs/by-name/vp/vpnc-scripts/package.nix +++ b/pkgs/by-name/vp/vpnc-scripts/package.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation { pname = "vpnc-scripts"; - version = "unstable-2023-01-03"; + version = "unstable-2026-06-29"; src = fetchgit { url = "https://gitlab.com/openconnect/vpnc-scripts.git"; - rev = "22756827315bc875303190abb3756b5b1dd147ce"; - hash = "sha256-EWrDyXg47Ur9mFutaG8+oYOCAW9AZowzwwJp3YbogIY="; + rev = "ce9e961bd0f6b867e1c7c35f78f6fb973f6ff101"; + hash = "sha256-Gbu+UCw6uSXH5pGpzLx9mc8D1/tpRNwfF5h5QdEBbYE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/vp/vpxtool/package.nix b/pkgs/by-name/vp/vpxtool/package.nix new file mode 100644 index 000000000000..5180b0d7fdff --- /dev/null +++ b/pkgs/by-name/vp/vpxtool/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + rustPlatform, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "vpxtool"; + version = "0.33.4"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "francisdb"; + repo = "vpxtool"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bXKfXBm1y4cdGvNQA8InYdsxOo4GJzSX5w24QUkeHs8="; + }; + + cargoHash = "sha256-07Muapi8zILczLgCSP/+mEqynm8Abc6EclVX4eDVZmw="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal based frontend and utilities for Visual Pinball"; + homepage = "https://github.com/francisdb/vpxtool"; + changelog = "https://github.com/francisdb/vpxtool/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nmoya ]; + mainProgram = "vpxtool"; + }; +}) diff --git a/pkgs/by-name/wa/wappalyzergo/package.nix b/pkgs/by-name/wa/wappalyzergo/package.nix index 6901c4056c9e..43a28b2e4b20 100644 --- a/pkgs/by-name/wa/wappalyzergo/package.nix +++ b/pkgs/by-name/wa/wappalyzergo/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "wappalyzergo"; - version = "0.2.87"; + version = "0.2.89"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "wappalyzergo"; tag = "v${finalAttrs.version}"; - hash = "sha256-l8nG+LldJdvtx/0CN3SLJR6wtoIJx2Y0y6/qKtiuQmE="; + hash = "sha256-L5DBXn96PK4Ed3MhmIgfVDLniGWgB/iogI+HKzfsvvA="; }; vendorHash = "sha256-9MUhivdlbxAhcdbLALdt6vhxvMLzm+WincF3iG9pR1A="; diff --git a/pkgs/by-name/we/webcord-vencord/package.nix b/pkgs/by-name/we/webcord-vencord/package.nix index 24f36c08118b..3b4437fee96d 100644 --- a/pkgs/by-name/we/webcord-vencord/package.nix +++ b/pkgs/by-name/we/webcord-vencord/package.nix @@ -1,6 +1,6 @@ { # allow overriding electron - electron_41, + electron_42, webcord, replaceVars, lib, @@ -8,7 +8,7 @@ }: # nixpkgs-update: no auto update -(webcord.override { inherit electron_41; }).overrideAttrs (old: { +(webcord.override { inherit electron_42; }).overrideAttrs (old: { pname = "webcord-vencord"; patches = (old.patches or [ ]) ++ [ diff --git a/pkgs/by-name/we/webcord/package.nix b/pkgs/by-name/we/webcord/package.nix index 6b59db23ff8b..0b25cc21e296 100644 --- a/pkgs/by-name/we/webcord/package.nix +++ b/pkgs/by-name/we/webcord/package.nix @@ -5,23 +5,23 @@ copyDesktopItems, python3, xdg-utils, - electron_41, + electron_42, makeDesktopItem, nodejs_22, }: buildNpmPackage.override { nodejs = nodejs_22; } rec { pname = "webcord"; - version = "4.13.0"; + version = "4.13.2"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; tag = "v${version}"; - hash = "sha256-XUhaGZkHTLZlOuzh7aN9tIk7uBayiEID4MbmADhwvLs="; + hash = "sha256-td04ayA1AVDy6WCPQH3Y8zmZ6VfObqzFvm+cD8WZum4="; }; - npmDepsHash = "sha256-KJMHQlCW/2AYG2Z0oshyMEvFiKsZgG4NKmsHMYrnyUE="; + npmDepsHash = "sha256-LLxDJOLLBnjHRHTH/q1o3szu+armmwx9ZIKYKHUO+Z0="; makeCacheWritable = true; @@ -56,7 +56,7 @@ buildNpmPackage.override { nodejs = nodejs_22; } rec { install -Dm644 sources/assets/icons/app.png $out/share/icons/hicolor/256x256/apps/webcord.png # Add xdg-utils to path via suffix, per PR #181171 - makeWrapper '${lib.getExe electron_41}' $out/bin/webcord \ + makeWrapper '${lib.getExe electron_42}' $out/bin/webcord \ --suffix PATH : "${binPath}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ --add-flags $out/lib/node_modules/webcord/ diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix index aef406ccd310..adaabe200cab 100644 --- a/pkgs/by-name/we/webex/package.nix +++ b/pkgs/by-name/we/webex/package.nix @@ -58,11 +58,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "46.4.0.34752"; + version = "46.6.1.35236"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-2004-Gold/20260422175501/Webex_ubuntu.7z"; - sha256 = "8b0711259237ae1009c05b012d44c5fc4e222005bf26d9ac1b84af063719d09a"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-2004-Gold/20260625094602/Webex_ubuntu.7z"; + sha256 = "2420fda7e86883d53751c38a358dc61b3b9a731e20abda8b84dfcd367ecfc67f"; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/we/webull-desktop/package.nix b/pkgs/by-name/we/webull-desktop/package.nix index 9b5af8ba61eb..831a0bd29f02 100644 --- a/pkgs/by-name/we/webull-desktop/package.nix +++ b/pkgs/by-name/we/webull-desktop/package.nix @@ -60,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: { }; # Keep the "CURL_GNUTLS_3" symbol which is sought by libwbhttpsclient.so - patches = (previousAttrs.patches or [ ]) ++ [ + # "fix-wakeup-consumption.patch" that is applied to newer versions of curl + # is not needed and will not apply to curl-8.10.0 + patches = [ (builtins.toFile "curl-gnutls-keep-symbols-compatible.patch" '' --- a/lib/libcurl.vers.in +++ b/lib/libcurl.vers.in diff --git a/pkgs/by-name/wg/wg-ddns/package.nix b/pkgs/by-name/wg/wg-ddns/package.nix index 16cef33ce71a..28c72055b8f5 100644 --- a/pkgs/by-name/wg/wg-ddns/package.nix +++ b/pkgs/by-name/wg/wg-ddns/package.nix @@ -6,22 +6,25 @@ buildGoModule (finalAttrs: { pname = "wg-ddns"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "fernvenue"; repo = "wg-ddns"; tag = "v${finalAttrs.version}"; - hash = "sha256-BV57jidn6bPWU/IhhQvIeMF4xHtTm2WZKm4MQRSMM5Y="; + hash = "sha256-Djh/H/PlpwVeJ3T2V/xG8AAJNznYmStCQEMd5uh38us="; }; - vendorHash = "sha256-VfSLrWuvJF4XwAW2BQGxh+3v9RiWmPdysw/nIdt2A9M="; + vendorHash = "sha256-oJOpf7PPQvb5z7nqpW0YjOhsF0UiWt/nlwBvF2SdzsY="; meta = { description = "Lightweight tool that provides DDNS dynamic DNS support for WireGuard"; homepage = "https://github.com/fernvenue/wg-ddns"; license = lib.licenses.gpl3Only; - maintainers = [ lib.maintainers.bdim404 ]; + maintainers = [ + lib.maintainers.fernvenue + lib.maintainers.bdim404 + ]; platforms = lib.platforms.unix; mainProgram = "wg-ddns"; }; diff --git a/pkgs/by-name/wh/whipper/package.nix b/pkgs/by-name/wh/whipper/package.nix index f64d01150360..3f60058a23cf 100644 --- a/pkgs/by-name/wh/whipper/package.nix +++ b/pkgs/by-name/wh/whipper/package.nix @@ -66,7 +66,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ruamel-yaml discid pillow - setuptools + setuptools_80 ]; buildInputs = [ diff --git a/pkgs/by-name/wt/wttrbar/package.nix b/pkgs/by-name/wt/wttrbar/package.nix index b444e62a896b..c36129ea1b06 100644 --- a/pkgs/by-name/wt/wttrbar/package.nix +++ b/pkgs/by-name/wt/wttrbar/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "wttrbar"; - version = "0.14.5"; + version = "0.15.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; tag = finalAttrs.version; - hash = "sha256-ztCidqh6DPtGBM8rfEmPi5AXqo4iF8n9lvyBGMxuh1o="; + hash = "sha256-Fr9Zlzssw69YUdiQA1AcqQdHVg1cZghuoVB1EgS1vak="; }; cargoHash = "sha256-oumahPzbX8EjuQt1ke7yc1KAGayjsRcucsSm9uT6gOs="; diff --git a/pkgs/by-name/wx/wxwidgets_3_2/package.nix b/pkgs/by-name/wx/wxwidgets_3_2/package.nix index ca05463f928f..164911b73410 100644 --- a/pkgs/by-name/wx/wxwidgets_3_2/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_2/package.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wxwidgets"; - version = "3.2.9"; + version = "3.2.11"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; tag = "v${finalAttrs.version}"; - hash = "sha256-mYMUW3FnFkKHDQXb/k9UosSiWCPW7OQn+/orwq4Q95k="; + hash = "sha256-YaQrPJSlTpJKwjXLdRsGB04f7wKJCWfHjXWkB45qyEg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/wx/wxwidgets_3_3/package.nix b/pkgs/by-name/wx/wxwidgets_3_3/package.nix index 8afa367df0fe..d7e649b1e8ea 100644 --- a/pkgs/by-name/wx/wxwidgets_3_3/package.nix +++ b/pkgs/by-name/wx/wxwidgets_3_3/package.nix @@ -37,14 +37,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "wxwidgets"; - version = "3.3.2"; + version = "3.3.3.1"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-UL1NuByKFGMQ/dhjuWRdnWTgdy4+1cD9pSls3e1mur8="; + hash = "sha256-gB+mEk8rHpB4z1m8RWJSV+upKzLt7pZtlviS2g03EHY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/xf/xfr/package.nix b/pkgs/by-name/xf/xfr/package.nix index 015a5e167fcc..c422347b3efa 100644 --- a/pkgs/by-name/xf/xfr/package.nix +++ b/pkgs/by-name/xf/xfr/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xfr"; - version = "0.9.20"; + version = "0.9.21"; src = fetchFromGitHub { owner = "lance0"; repo = "xfr"; tag = "v${finalAttrs.version}"; - hash = "sha256-qEagafvSktcZzg5hTAhVwamnJ/xxjs2fwIcWgmrt0Oo="; + hash = "sha256-dcXbyiqhj/6VXIlFmk19LocxbfSnGC3aXR70YlUXQkA="; }; - cargoHash = "sha256-3OjzNSbK+bDaJ1HaO5S8t6SRSjmm2I5LQFmmXz8n2s0="; + cargoHash = "sha256-A5oYEjJvvS7hWtt9ceD9ewup8rzk8NRP0egQRrQwlzY="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/xf/xfstests/package.nix b/pkgs/by-name/xf/xfstests/package.nix index 4e44bce33c87..6e18aa424a10 100644 --- a/pkgs/by-name/xf/xfstests/package.nix +++ b/pkgs/by-name/xf/xfstests/package.nix @@ -29,8 +29,10 @@ util-linux, which, writeScript, + writeShellScript, xfsprogs, - nix-update-script, + gitMinimal, + nix-update, runtimeShell, }: @@ -157,7 +159,24 @@ stdenv.mkDerivation (finalAttrs: { }:$PATH exec ./check "$@" ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = writeShellScript "update-xfstests" '' + set -euo pipefail + export PATH=${ + lib.makeBinPath [ + coreutils + gitMinimal + gawk + nix-update + ] + }:$PATH + VERSION="$(git ls-remote --tags --refs https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git \ + | awk '{ print $2 }' \ + | grep '^refs/tags/v' \ + | sed 's|^refs/tags/v||' \ + | sort -V \ + | tail -n1)" + exec nix-update --version "$VERSION" xfstests "$@" + ''; meta = { description = "Torture test suite for filesystems"; diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix index fe22ebbe9dcd..dbf4bfbd6bd6 100644 --- a/pkgs/by-name/ya/yamlscript/package.nix +++ b/pkgs/by-name/ya/yamlscript/package.nix @@ -6,11 +6,11 @@ buildGraalvmNativeImage (finalAttrs: { pname = "yamlscript"; - version = "0.2.24"; + version = "0.2.27"; src = fetchurl { url = "https://github.com/yaml/yamlscript/releases/download/${finalAttrs.version}/yamlscript.cli-${finalAttrs.version}-standalone.jar"; - hash = "sha256-2MwHgFdWk6OEzi3RihhLxB286zVn/g+n1+TPzRIb13Q="; + hash = "sha256-d2kG10M+AeADVRzzjShx5CMTpsVgScF5NDimQm/B0DM="; }; extraNativeImageBuildArgs = [ diff --git a/pkgs/by-name/ya/yashiki/package.nix b/pkgs/by-name/ya/yashiki/package.nix new file mode 100644 index 000000000000..fdcf7936644c --- /dev/null +++ b/pkgs/by-name/ya/yashiki/package.nix @@ -0,0 +1,69 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, + apple-sdk_15, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "yashiki"; + version = "0.14.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "typester"; + repo = "yashiki"; + tag = "yashiki-v${finalAttrs.version}"; + hash = "sha256-ePZ8ONdvj3gaQps+5Ua0OLeFdzNdJhoB9yw6pC7qoEQ="; + }; + + cargoHash = "sha256-JMrftBKyD188SZqEGI4fA/MrfEK8JLKSeEqrQxhSs3U="; + + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = [ + apple-sdk_15 + ]; + + postInstall = '' + app="$out/Applications/Yashiki.app" + + mkdir -p "$app/Contents/MacOS" "$app/Contents/Resources/layouts" + + ln -s "$out/bin/yashiki" "$app/Contents/MacOS/yashiki" + ln -s "$out/bin/yashiki-layout-tatami" "$app/Contents/Resources/layouts/yashiki-layout-tatami" + ln -s "$out/bin/yashiki-layout-byobu" "$app/Contents/Resources/layouts/yashiki-layout-byobu" + + cp resources/icon/Assets.car "$app/Contents/Resources/Assets.car" + substitute Info.plist.template "$app/Contents/Info.plist" \ + --replace-fail VERSION_PLACEHOLDER "${finalAttrs.version}" \ + --replace-fail "yashiki-launcher" "yashiki" + + installShellCompletion --cmd yashiki --zsh completions/zsh/_yashiki + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + versionCheckProgramArg = "version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "macOS tiling window manager"; + homepage = "https://github.com/typester/yashiki"; + changelog = "https://github.com/typester/yashiki/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + maintainers = with lib.maintainers; [ anntnzrb ]; + mainProgram = "yashiki"; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ya/yazi/plugins/projects/default.nix b/pkgs/by-name/ya/yazi/plugins/projects/default.nix index 438d1e466ae6..10fea532f4a7 100644 --- a/pkgs/by-name/ya/yazi/plugins/projects/default.nix +++ b/pkgs/by-name/ya/yazi/plugins/projects/default.nix @@ -5,13 +5,13 @@ }: mkYaziPlugin { pname = "projects.yazi"; - version = "0-unstable-2026-05-30"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "MasouShizuka"; repo = "projects.yazi"; - rev = "112a2707e9d37c02304449fbc8669d0264841e22"; - hash = "sha256-w7QTVogc7pqVa56fSCl22m8AkOHO5jq+yXLfCRaY1Yg="; + rev = "22a4006f531b7c8e71704f64e48feed659164104"; + hash = "sha256-J3MM4Fc3+6P84OrC4DWqchSPbEOuzhEeO8rzNYXSZXQ="; }; meta = { diff --git a/pkgs/by-name/yf/yffi/package.nix b/pkgs/by-name/yf/yffi/package.nix index 6bebf3fe9c20..86d102979c9e 100644 --- a/pkgs/by-name/yf/yffi/package.nix +++ b/pkgs/by-name/yf/yffi/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "yffi"; - version = "0.24.0"; + version = "0.27.3"; src = fetchFromGitHub { owner = "y-crdt"; repo = "y-crdt"; tag = "v${finalAttrs.version}"; - hash = "sha256-RFdLEsKQxt8BGqbf5FFM7mZD64glW7bTKRJaAQOe+vo="; + hash = "sha256-OYqBxhpNw4LAfCLN/xBxSFuwjUV/PZvbg7Kk4AQpvvs="; }; - cargoHash = "sha256-RL9lBc7lSmc6jOavE5lZupmaNGZgQhJBedNhjfHVajg="; + cargoHash = "sha256-eMGhHDcVeySESsgrP5Pj9BwsAgEe8rZHz+0FeFFp7IY="; buildAndTestSubdir = "yffi"; diff --git a/pkgs/by-name/yu/yubioath-flutter/package.nix b/pkgs/by-name/yu/yubioath-flutter/package.nix index 22136cd0f0b6..5117fa42d205 100644 --- a/pkgs/by-name/yu/yubioath-flutter/package.nix +++ b/pkgs/by-name/yu/yubioath-flutter/package.nix @@ -1,6 +1,6 @@ { lib, - flutter341, + flutter344, python3Packages, fetchFromGitHub, pcre2, @@ -14,15 +14,15 @@ nix-update-script, }: -flutter341.buildFlutterApplication rec { +flutter344.buildFlutterApplication rec { pname = "yubioath-flutter"; - version = "7.3.3"; + version = "7.4.1"; src = fetchFromGitHub { owner = "Yubico"; repo = "yubioath-flutter"; tag = version; - hash = "sha256-PB16QOD84i564LufF++tSdutuqUfKms6mTZW1knXTJk="; + hash = "sha256-7863P463ZOtYcrCN9KLQIj2YOTmKH62PFap5Ja7m5Ig="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json b/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json index 94871acf6c88..2839258cd771 100644 --- a/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json +++ b/pkgs/by-name/yu/yubioath-flutter/pubspec.lock.json @@ -34,11 +34,11 @@ "dependency": "direct main", "description": { "name": "archive", - "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", + "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.7" + "version": "4.0.9" }, "args": { "dependency": "direct main", @@ -54,11 +54,11 @@ "dependency": "direct main", "description": { "name": "async", - "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.13.0" + "version": "2.13.1" }, "base32": { "dependency": "direct main", @@ -84,21 +84,21 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "275bf6bb2a00a9852c28d4e0b410da1d833a734d57d39d44f94bfc895a484ec3", + "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.4" + "version": "4.0.6" }, "build_config": { "dependency": "transitive", "description": { "name": "build_config", - "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187", + "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.2.0" + "version": "1.3.0" }, "build_daemon": { "dependency": "transitive", @@ -114,11 +114,11 @@ "dependency": "direct dev", "description": { "name": "build_runner", - "sha256": "ac78098de97893812b7aff1154f29008fa2464cad9e8e7044d39bc905dad4fbc", + "sha256": "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.11.0" + "version": "2.15.0" }, "built_collection": { "dependency": "transitive", @@ -134,11 +134,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8", + "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.3" + "version": "8.12.6" }, "characters": { "dependency": "transitive", @@ -204,21 +204,11 @@ "dependency": "transitive", "description": { "name": "code_assets", - "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687", + "sha256": "bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.0" - }, - "code_builder": { - "dependency": "transitive", - "description": { - "name": "code_builder", - "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.11.1" + "version": "1.2.1" }, "collection": { "dependency": "direct main", @@ -244,21 +234,21 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "sha256": "956a3de0725ca232ad353565a8290d3357592bf4250f6f298a185e2d949c5d3d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.15.1" }, "cross_file": { "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937", + "sha256": "92c9c43c383bfa1c32079d3bc492d55d6d4318044b7b47edaff8971cbb555c51", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.5+2" + "version": "0.3.5+4" }, "crypto": { "dependency": "direct main", @@ -324,21 +314,21 @@ "dependency": "transitive", "description": { "name": "dbus", - "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270", + "sha256": "0ce9b0a839e6dee59a37a623d2fc26a35bbbe6404213e419b0d6411023d62645", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.12" + "version": "0.7.14" }, "desktop_drop": { "dependency": "direct main", "description": { "name": "desktop_drop", - "sha256": "e70b46b2d61f1af7a81a40d1f79b43c28a879e30a4ef31e87e9c27bea4d784e8", + "sha256": "aa1e797255bfbc76f9eb5aa4f61e5b68dbf69962ab1be6495816d2f251bc0d1f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.0" + "version": "0.7.1" }, "dispose_scope": { "dependency": "transitive", @@ -354,11 +344,11 @@ "dependency": "transitive", "description": { "name": "equatable", - "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b", + "sha256": "3bce007a596ff8b3119c45d68aaef631272537c03d30e5d4534dd24bf4c5eaa2", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.8" + "version": "2.1.0" }, "fake_async": { "dependency": "transitive", @@ -374,11 +364,11 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "d07d37192dbf97461359c1518788f203b0c9102cfd2c35a716b823741219542c", + "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.2.0" }, "file": { "dependency": "transitive", @@ -442,21 +432,21 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1", + "sha256": "3854fe5e3bff0b113c658f260b90c95dea17c92db0f2addeac2e343dd9969785", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.33" + "version": "2.0.35" }, "flutter_riverpod": { "dependency": "direct main", "description": { "name": "flutter_riverpod", - "sha256": "e2026c72738a925a60db30258ff1f29974e40716749f3c9850aabf34ffc1a14c", + "sha256": "9255e1e3ad6e38906a1b4f8287678f95f378744c5b46b1985588543f3f19046e", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.3.2" }, "flutter_test": { "dependency": "direct dev", @@ -530,21 +520,21 @@ "dependency": "transitive", "description": { "name": "hooks", - "sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6", + "sha256": "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.1" + "version": "2.0.2" }, "hotreloader": { "dependency": "transitive", "description": { "name": "hotreloader", - "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b", + "sha256": "66871df468fc24eee81f1a0a7cb98acc104716f9b7376d355437b48d633c4ebf", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.4.0" }, "http": { "dependency": "transitive", @@ -602,6 +592,26 @@ "source": "hosted", "version": "1.0.5" }, + "jni": { + "dependency": "transitive", + "description": { + "name": "jni", + "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "jni_flutter": { + "dependency": "transitive", + "description": { + "name": "jni_flutter", + "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, "json_annotation": { "dependency": "direct main", "description": { @@ -715,11 +725,11 @@ "dependency": "direct main", "description": { "name": "material_symbols_icons", - "sha256": "c62b15f2b3de98d72cbff0148812f5ef5159f05e61fc9f9a089ec2bb234df082", + "sha256": "49c532dd0b74544e9d8d93ec0f821d52ec532e7c9263c889ebe71b1be4f34ba7", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2906.0" + "version": "4.2951.0" }, "menu_base": { "dependency": "transitive", @@ -735,11 +745,11 @@ "dependency": "direct dev", "description": { "name": "meta", - "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", + "sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.17.0" + "version": "1.18.0" }, "mime": { "dependency": "transitive", @@ -751,16 +761,6 @@ "source": "hosted", "version": "2.0.0" }, - "native_toolchain_c": { - "dependency": "transitive", - "description": { - "name": "native_toolchain_c", - "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.17.4" - }, "node_preamble": { "dependency": "transitive", "description": { @@ -775,11 +775,11 @@ "dependency": "transitive", "description": { "name": "objective_c", - "sha256": "983c7fa1501f6dcc0cb7af4e42072e9993cb28d73604d25ebf4dab08165d997e", + "sha256": "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.2.5" + "version": "9.4.1" }, "package_config": { "dependency": "transitive", @@ -815,21 +815,21 @@ "dependency": "direct main", "description": { "name": "path_provider", - "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "sha256": "a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.1.6" }, "path_provider_android": { "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", + "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.22" + "version": "2.3.1" }, "path_provider_foundation": { "dependency": "transitive", @@ -845,21 +845,21 @@ "dependency": "transitive", "description": { "name": "path_provider_linux", - "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "sha256": "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.1" + "version": "2.2.2" }, "path_provider_platform_interface": { "dependency": "transitive", "description": { "name": "path_provider_platform_interface", - "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "sha256": "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.2" + "version": "2.1.3" }, "path_provider_windows": { "dependency": "transitive", @@ -875,31 +875,31 @@ "dependency": "direct dev", "description": { "name": "patrol_finders", - "sha256": "2b46426a89498414ee5c24d2fbf34ba1796cc9dff4e49ce4322544bace03be6b", + "sha256": "34e75a59df653dc9e6fc6c0caa469b950b18aaa538aaf859f756b52f937f0da8", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.0.0" + "version": "3.5.0" }, "patrol_log": { "dependency": "transitive", "description": { "name": "patrol_log", - "sha256": "017fe7ea3ab662e78673a8acbbb7c96b71f38def59b70d44d0169887620e9fbf", + "sha256": "080608c3402480e18f7dce5a7ee17bf2e23fc191eedffb73a8a635506ce6d4bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.0" + "version": "0.9.1" }, "petitparser": { "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", + "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.1" + "version": "7.0.2" }, "platform": { "dependency": "transitive", @@ -935,11 +935,11 @@ "dependency": "transitive", "description": { "name": "posix", - "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.3" + "version": "6.5.0" }, "process": { "dependency": "transitive", @@ -980,15 +980,25 @@ "source": "path", "version": "1.0.0" }, + "record_use": { + "dependency": "transitive", + "description": { + "name": "record_use", + "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, "riverpod": { "dependency": "transitive", "description": { "name": "riverpod", - "sha256": "8c22216be8ad3ef2b44af3a329693558c98eca7b8bd4ef495c92db0bba279f83", + "sha256": "17100416c51db7810c71a7bb2c34d1f881faa0074fd452afb0c4db6f8f126c76", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.2.1" + "version": "3.3.2" }, "rxdart": { "dependency": "transitive", @@ -1004,71 +1014,71 @@ "dependency": "direct main", "description": { "name": "screen_retriever", - "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "sha256": "ace919117a7520c13a50a6259e60c4a0d4cbe98809468792a91b5c5adada2aa6", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.2" }, "screen_retriever_linux": { "dependency": "transitive", "description": { "name": "screen_retriever_linux", - "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "sha256": "7b52006a5ceae1f3d5af7f77188c3290d6e7d8ded16d99809bea84967c65c257", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.2" }, "screen_retriever_macos": { "dependency": "transitive", "description": { "name": "screen_retriever_macos", - "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "sha256": "a1489b99cce597c45a54b9aae1cd94c8d4705353b7e0bb2457a6e4de44e0ad8a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.2" }, "screen_retriever_platform_interface": { "dependency": "transitive", "description": { "name": "screen_retriever_platform_interface", - "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "sha256": "94a5535277510a63184ca178ce12a1449bc0b38618879aa1c18bf57369c5064a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.2" }, "screen_retriever_windows": { "dependency": "transitive", "description": { "name": "screen_retriever_windows", - "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "sha256": "dafc6922b0bfbf1d48cf3ccbf519b4fff47bdcb820da1728ea6db675fecc9324", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.2" }, "shared_preferences": { "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64", + "sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.4" + "version": "2.5.5" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f", + "sha256": "93ae5884a9df5d3bb696825bceb3a17590754548b5d740eba51500afc8d088f5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.20" + "version": "2.4.26" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1094,11 +1104,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_platform_interface", - "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "sha256": "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "shared_preferences_web": { "dependency": "transitive", @@ -1180,11 +1190,11 @@ "dependency": "transitive", "description": { "name": "source_gen", - "sha256": "1d562a3c1f713904ebbed50d2760217fd8a51ca170ac4b05b0db490699dbac17", + "sha256": "ec37cc0e6694374cbef59ed79685572c870a54ede6fa30a3e420feb3adffea02", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.2.0" + "version": "4.2.3" }, "source_helper": { "dependency": "transitive", @@ -1300,41 +1310,41 @@ "dependency": "transitive", "description": { "name": "test", - "sha256": "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7", + "sha256": "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.30.0" + "version": "1.31.0" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a", + "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.10" + "version": "0.7.11" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51", + "sha256": "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.16" + "version": "0.6.17" }, "tray_manager": { "dependency": "direct main", "description": { "name": "tray_manager", - "sha256": "c5fd83b0ae4d80be6eaedfad87aaefab8787b333b8ebd064b0e442a81006035b", + "sha256": "1a659b08baa6e9b91ef8ce16eda37740de398be1c4cf322b8a1ddfef25c68c5a", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.5.2" + "version": "0.5.3" }, "typed_data": { "dependency": "transitive", @@ -1370,21 +1380,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", + "sha256": "b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.28" + "version": "6.3.32" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad", + "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.6" + "version": "6.4.1" }, "url_launcher_linux": { "dependency": "transitive", @@ -1420,11 +1430,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f", + "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.3" }, "url_launcher_windows": { "dependency": "transitive", @@ -1440,21 +1450,21 @@ "dependency": "transitive", "description": { "name": "uuid", - "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", + "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.3" }, "vector_graphics": { "dependency": "direct main", "description": { "name": "vector_graphics", - "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", + "sha256": "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.19" + "version": "1.2.2" }, "vector_graphics_codec": { "dependency": "transitive", @@ -1470,11 +1480,11 @@ "dependency": "direct main", "description": { "name": "vector_graphics_compiler", - "sha256": "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b", + "sha256": "142a9146f447d15b10bdc00e21d5f4d83e5b32bb5f8f8f5a04c75311344923a3", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.20" + "version": "1.2.6" }, "vector_math": { "dependency": "transitive", @@ -1490,11 +1500,11 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.2" + "version": "15.2.0" }, "watcher": { "dependency": "transitive", @@ -1609,7 +1619,7 @@ } }, "sdks": { - "dart": ">=3.10.3 <4.0.0", - "flutter": ">=3.38.4" + "dart": ">=3.12.0 <4.0.0", + "flutter": ">=3.44.0" } } diff --git a/pkgs/by-name/zi/zigfetch/package.nix b/pkgs/by-name/zi/zigfetch/package.nix index 7241b6d295e1..67e2dc7eafa4 100644 --- a/pkgs/by-name/zi/zigfetch/package.nix +++ b/pkgs/by-name/zi/zigfetch/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zigfetch"; - version = "0.27.1"; + version = "0.27.2"; src = fetchFromGitHub { owner = "utox39"; repo = "zigfetch"; rev = "v${finalAttrs.version}"; - hash = "sha256-A8DZ8O7WghvN9+74FGapLl/7SfGc3n+FlyI6jRKX/yk="; + hash = "sha256-PFZqtKgZYRRVXf0bNUKYFsahmJ9g2qcm58LFTR4ZzCU="; }; patches = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/by-name/zs/zs/package.nix b/pkgs/by-name/zs/zs/package.nix index 1a07ada5be0d..1e4e4c56dab6 100644 --- a/pkgs/by-name/zs/zs/package.nix +++ b/pkgs/by-name/zs/zs/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "zs"; - version = "0.4.1"; + version = "0.4.5"; src = fetchFromGitea { domain = "git.mills.io"; owner = "prologic"; repo = "zs"; rev = finalAttrs.version; - hash = "sha256-V8+p19kvVh64yCreNVp4RVdkJkjrq8Q5VbjaJWekZHY="; + hash = "sha256-NYnr0s730u4ICppPVZAAHB753XVooZtSSKIAp+z98Gw="; }; - vendorHash = "sha256-KXcYTYO4wnWOup5uJ6T+XwthX5l2FL02JyOt1Nv51Sg="; + vendorHash = "sha256-21UukhXVVj1AO+HlTlEpHkf5zLHA6dapjrOriVQd1jM="; ldflags = [ "-w" @@ -41,7 +41,7 @@ buildGoModule (finalAttrs: { homepage = "https://git.mills.io/prologic/zs"; changelog = "https://git.mills.io/prologic/zs/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ wariuccio ]; mainProgram = "zs"; }; }) diff --git a/pkgs/by-name/zs/zsh-artisan/package.nix b/pkgs/by-name/zs/zsh-artisan/package.nix new file mode 100644 index 000000000000..06ffdad5966d --- /dev/null +++ b/pkgs/by-name/zs/zsh-artisan/package.nix @@ -0,0 +1,38 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, +}: + +stdenvNoCC.mkDerivation { + pname = "zsh-artisan"; + version = "0-unstable-2025-12-08"; + + src = fetchFromGitHub { + owner = "jessarcher"; + repo = "zsh-artisan"; + rev = "4063d53fd310f715c7a8fb7d4e133812ef0b3128"; + hash = "sha256-O0Tn9zQWR0i7UWJ9VtOvxjqpqz9Sj7aKogdHZSOATC0="; + }; + + __structuredAttrs = true; + strictDeps = true; + installPhase = '' + runHook preInstall + + install -D artisan.plugin.zsh --target-directory=$out/share/zsh-artisan + + runHook postInstall + ''; + + meta = { + description = "Laravel artisan plugin for zsh"; + longDescription = '' + Laravel artisan plugin for zsh to help you to run artisan from anywhere in the project tree, + with auto-completion, and it can automatically open files created by artisan! + ''; + homepage = "https://github.com/jessarcher/zsh-artisan"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.FatBoyXPC ]; + }; +} diff --git a/pkgs/by-name/zs/zsync/package.nix b/pkgs/by-name/zs/zsync/package.nix index d7f0fa2a63f8..8661ab43b273 100644 --- a/pkgs/by-name/zs/zsync/package.nix +++ b/pkgs/by-name/zs/zsync/package.nix @@ -3,17 +3,18 @@ stdenv, fetchFromGitHub, autoreconfHook, + perl, }: stdenv.mkDerivation (finalAttrs: { pname = "zsync"; - version = "0.6.3-unstable-2025-05-29"; + version = "0.6.4"; src = fetchFromGitHub { owner = "cph6"; repo = "zsync"; - rev = "a5cb28f923dd3cfdeb65e2930dd1faa727c2abf8"; - hash = "sha256-gJs1P83AKWGipspeoFCSibZH+X6mmj3aL4+yjGO2YJo="; + tag = finalAttrs.version; + hash = "sha256-qZSjh23snJHWmrIUxRvpu5pZ1G3rJcnl08WGEEM+0Jw="; }; sourceRoot = "${finalAttrs.src.name}/c"; @@ -41,9 +42,14 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook ]; + doCheck = true; + + nativeCheckInputs = [ perl ]; + meta = { - homepage = "https://github.com/cph6/zsync"; description = "File distribution system using the rsync algorithm"; + homepage = "https://github.com/cph6/zsync"; + changelog = "https://github.com/cph6/zsync/raw/refs/tags/${finalAttrs.src.tag}/c/NEWS"; license = lib.licenses.artistic2; maintainers = with lib.maintainers; [ viric diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix index 5cb159efb42c..6c8266fdd4b2 100644 --- a/pkgs/by-name/zu/zuban/package.nix +++ b/pkgs/by-name/zu/zuban/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zuban"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "zubanls"; repo = "zuban"; tag = "v${finalAttrs.version}"; - hash = "sha256-mbBaOwJdYJhD7qUboHRSJfFo1t7ZLA+5/7moQWYjU3M="; + hash = "sha256-g06iHdbKb/uZkGkbX7fHB0MMDbuYYnGodQAEPvA18KA="; fetchSubmodules = true; }; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/zuban"; - cargoHash = "sha256-mT8QG4pI96gTgFFZN49Yi7Ax90ulPM8pA0tdB/fdSuM="; + cargoHash = "sha256-bfiWuig9ySkbJ/2CL4jGlNYn/YvVClB3Eg0cq8dKi3E="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix index 0e6cab178aac..730c2d6b3a77 100644 --- a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -2,14 +2,12 @@ stdenv, lib, fetchFromGitLab, - fetchpatch, gitUpdater, nixosTests, testers, boost, cmake, cmake-extras, - ctestCheckHook, doxygen, gst_all_1, gdk-pixbuf, @@ -37,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-thumbnailer"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-thumbnailer"; tag = finalAttrs.version; - hash = "sha256-6fQonYnOjxzHcM51VgCeL5OfsmThq9tNpGnMvNWrDXI="; + hash = "sha256-bDSqLxYQYCnN5SngoZmYwJTL6qoWpZ9HVUQMiAVQxlE="; }; outputs = [ @@ -125,7 +123,6 @@ stdenv.mkDerivation (finalAttrs: { ]); nativeCheckInputs = [ - ctestCheckHook shared-mime-info xvfb-run ]; @@ -147,17 +144,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - disabledTests = [ - # QSignalSpy tests in QML suite always fail, pass when running interactively - "qml" - ] - ++ lib.optionals withQt6 [ - # https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/work_items/13 - "dbus" - "lomiri-thumbnailer-qt6" - "thumbnailer-admin" - ]; - enableParallelChecking = false; preCheck = '' diff --git a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix index d9a7435ec4ee..786dbeac64fb 100644 --- a/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-url-dispatcher/default.nix @@ -29,17 +29,17 @@ }: let - withQt6 = lib.strings.versionAtLeast qtbase.version "6"; + withQt6 = lib.versions.major qtbase.version == "6"; in stdenv.mkDerivation (finalAttrs: { pname = "lomiri-url-dispatcher"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/lomiri-url-dispatcher"; tag = finalAttrs.version; - hash = "sha256-+3/C6z8wyiNSpt/eyMl+j/TGJW0gZ5T3Vd1NmghK67k="; + hash = "sha256-Qg3nYg8SThm6lYp/TB81XW4yEM5NhzK3wPU8bB/g/ks="; }; outputs = [ @@ -81,7 +81,9 @@ stdenv.mkDerivation (finalAttrs: { setuptools ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ + fixtures python-dbusmock + testtools ] )) wrapQtAppsHook @@ -103,6 +105,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus + dbus-test-runner sqlite ]; diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix index 763afa072f32..7e0eb2cb2c21 100644 --- a/pkgs/development/compilers/llvm/default.nix +++ b/pkgs/development/compilers/llvm/default.nix @@ -28,9 +28,9 @@ let "21.1.8".officialRelease.sha256 = "sha256-pgd8g9Yfvp7abjCCKSmIn1smAROjqtfZaJkaUkBSKW0="; "22.1.8".officialRelease.sha256 = "sha256-SF7wFuh4kXZTytpdgX7vUZItKtRobnVICm+ixze4iG0="; "23.0.0-git".gitRelease = { - rev = "319c1f1c1132e54a2135ffe1d7c58ed7e47b5e51"; - rev-version = "23.0.0-unstable-2026-07-05"; - sha256 = "sha256-FM2a7MGnxE+gj4nz6sKOu+107jt9hVMUhCFVgqNyXCs="; + rev = "7d24dfa5f29e1794e452aadaa27f994f15568763"; + rev-version = "23.0.0-unstable-2026-07-12"; + sha256 = "sha256-mHiwOqEvqXyG6OoiVLRrhzb2MK7FqjQm9ez329ngbYw="; }; } // llvmVersions; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index 76bf3682c5bc..bd751ed9d7fd 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -1,6 +1,6 @@ { lib, - mkCoqDerivation, + mkRocqDerivation, which, dune, coq, @@ -34,7 +34,9 @@ let propagatedBuildInputs_wo_elpi = [ coq.ocamlPackages.findlib ]; - derivation = mkCoqDerivation.override { dune = dune.override { version = "3.21.1"; }; } { + derivation = mkRocqDerivation.override { dune = dune.override { version = "3.21.1"; }; } { + useCoq = true; + namePrefix = [ "coq" ]; pname = "elpi"; repo = "coq-elpi"; owner = "LPCIC"; diff --git a/pkgs/development/coq-modules/stalmarck/default.nix b/pkgs/development/coq-modules/stalmarck/default.nix index 5bcdffbfa9c8..50eea900a422 100644 --- a/pkgs/development/coq-modules/stalmarck/default.nix +++ b/pkgs/development/coq-modules/stalmarck/default.nix @@ -1,6 +1,6 @@ { lib, - mkCoqDerivation, + mkRocqDerivation, dune, coq, stdlib, @@ -39,7 +39,9 @@ let else "A two-level approach to prove tautologies using Stålmarck's algorithm in Coq."; in - mkCoqDerivation.override { dune = dune.override { version = "3.21.1"; }; } { + mkRocqDerivation.override { dune = dune.override { version = "3.21.1"; }; } { + useCoq = true; + namePrefix = [ "coq" ]; inherit version pname diff --git a/pkgs/development/coq-modules/vscoq-language-server/default.nix b/pkgs/development/coq-modules/vscoq-language-server/default.nix index b20d6961eb7a..af1106de9f03 100644 --- a/pkgs/development/coq-modules/vscoq-language-server/default.nix +++ b/pkgs/development/coq-modules/vscoq-language-server/default.nix @@ -82,7 +82,7 @@ ocamlPackages.buildDunePackage { license = lib.licenses.mit; } // lib.optionalAttrs (fetched.broken or false) { - coqFilter = true; + rocqFilter = true; broken = true; }; } diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix index 7e51dc43b61e..f1f35969bd49 100644 --- a/pkgs/development/libraries/astal/source.nix +++ b/pkgs/development/libraries/astal/source.nix @@ -7,15 +7,15 @@ let originalDrv = fetchFromGitHub { owner = "Aylur"; repo = "astal"; - rev = "11842ae3045c1367fb3a62a2302dba0d9ccb4a33"; - hash = "sha256-FGZHls4eQJ8y3pvf5h3b83PfXlve3vD/Gj3g1qoAK6o="; + rev = "04454c22094401cc8e682cfe1f8ecc3194cac5f9"; + hash = "sha256-bXd034/ARs18ZQ7hWUAw9NwyfBmcKQws8DQHzwYp6jM="; }; in originalDrv.overrideAttrs ( final: prev: { name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name pname = "astal-source"; - version = "0-unstable-2026-06-21"; + version = "0-unstable-2026-07-03"; meta = prev.meta // { description = "Building blocks for creating custom desktop shells (source)"; diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json index 48ea3ae223b5..3f56fa6db65e 100644 --- a/pkgs/development/mobile/androidenv/repo.json +++ b/pkgs/development/mobile/androidenv/repo.json @@ -12,7 +12,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-10", @@ -90,7 +90,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-11", @@ -154,7 +154,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-12", @@ -230,7 +230,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-12", @@ -276,7 +276,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-13", @@ -352,7 +352,7 @@ } ], "displayName": "Google TV Addon", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-googletv-license", "name": "google_tv_addon", "path": "add-ons/addon-google_tv_addon-google-13", @@ -398,7 +398,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-14", @@ -476,7 +476,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-15", @@ -568,7 +568,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-16", @@ -660,7 +660,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-17", @@ -752,7 +752,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-18", @@ -844,7 +844,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-19", @@ -936,7 +936,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-21", @@ -1028,7 +1028,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-22", @@ -1212,7 +1212,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-24", @@ -1304,7 +1304,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-25", @@ -1396,7 +1396,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-3", @@ -1460,7 +1460,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-4", @@ -1524,7 +1524,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-5", @@ -1588,7 +1588,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-6", @@ -1652,7 +1652,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-7", @@ -1716,7 +1716,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-8", @@ -1780,7 +1780,7 @@ } ], "displayName": "Google APIs", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "google_apis", "path": "add-ons/addon-google_apis-google-9", @@ -1845,7 +1845,7 @@ } ], "displayName": "Android Support Repository", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-android-m2repository", "path": "extras/android/m2repository", @@ -1876,7 +1876,7 @@ } ], "displayName": "Android Emulator hypervisor driver (installer)", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-Android_Emulator_Hypervisor_Driver", "path": "extras/google/Android_Emulator_Hypervisor_Driver", @@ -1907,7 +1907,7 @@ } ], "displayName": "Google AdMob Ads SDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-admob_ads_sdk", "path": "extras/google/admob_ads_sdk", @@ -1936,7 +1936,7 @@ } ], "displayName": "Google Analytics App Tracking SDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-analytics_sdk_v2", "path": "extras/google/analytics_sdk_v2", @@ -1986,7 +1986,7 @@ } ], "displayName": "Android Auto Desktop Head Unit Emulator", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-auto", "path": "extras/google/auto", @@ -2012,7 +2012,7 @@ } ], "displayName": "Google Cloud Messaging for Android Library", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-gcm", "path": "extras/google/gcm", @@ -2048,7 +2048,7 @@ } }, "displayName": "Google Play services", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-google_play_services", "path": "extras/google/google_play_services", @@ -2077,7 +2077,7 @@ } ], "displayName": "Google Play services for Froyo", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-google_play_services_froyo", "path": "extras/google/google_play_services_froyo", @@ -2106,7 +2106,7 @@ } ], "displayName": "Google Play Instant Development SDK (Deprecated)", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-instantapps", "path": "extras/google/instantapps", @@ -2144,7 +2144,7 @@ } }, "displayName": "Google Repository", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-m2repository", "path": "extras/google/m2repository", @@ -2173,7 +2173,7 @@ } ], "displayName": "Google Play APK Expansion library", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-market_apk_expansion", "path": "extras/google/market_apk_expansion", @@ -2202,7 +2202,7 @@ } ], "displayName": "Google Play Licensing Library", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-market_licensing", "path": "extras/google/market_licensing", @@ -2231,7 +2231,7 @@ } ], "displayName": "Android Auto API Simulators", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-simulators", "path": "extras/google/simulators", @@ -2260,7 +2260,7 @@ } ], "displayName": "Google USB Driver", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-usb_driver", "path": "extras/google/usb_driver", @@ -2289,7 +2289,7 @@ } ], "displayName": "Google Web Driver", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "extras-google-webdriver", "path": "extras/google/webdriver", @@ -2329,7 +2329,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-10-default-armeabi-v7a", "path": "system-images/android-10/default/armeabi-v7a", @@ -2373,7 +2373,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-10-default-x86", "path": "system-images/android-10/default/x86", @@ -2419,7 +2419,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-10-google_apis-armeabi-v7a", "path": "system-images/android-10/google_apis/armeabi-v7a", @@ -2471,7 +2471,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-10-google_apis-x86", "path": "system-images/android-10/google_apis/x86", @@ -2520,7 +2520,7 @@ } ], "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-14-default-armeabi-v7a", "path": "system-images/android-14/default/armeabi-v7a", @@ -2568,7 +2568,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-15-default-armeabi-v7a", "path": "system-images/android-15/default/armeabi-v7a", @@ -2612,7 +2612,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-15-default-x86", "path": "system-images/android-15/default/x86", @@ -2658,7 +2658,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-15-google_apis-armeabi-v7a", "path": "system-images/android-15/google_apis/armeabi-v7a", @@ -2710,7 +2710,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-15-google_apis-x86", "path": "system-images/android-15/google_apis/x86", @@ -2766,7 +2766,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-16-default-armeabi-v7a", "path": "system-images/android-16/default/armeabi-v7a", @@ -2803,7 +2803,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "mips-android-sysimage-license", "name": "system-image-16-default-mips", "path": "system-images/android-16/default/mips", @@ -2847,7 +2847,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-16-default-x86", "path": "system-images/android-16/default/x86", @@ -2893,7 +2893,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-16-google_apis-armeabi-v7a", "path": "system-images/android-16/google_apis/armeabi-v7a", @@ -2945,7 +2945,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-16-google_apis-x86", "path": "system-images/android-16/google_apis/x86", @@ -3001,7 +3001,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-17-default-armeabi-v7a", "path": "system-images/android-17/default/armeabi-v7a", @@ -3038,7 +3038,7 @@ } ], "displayName": "MIPS System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "mips-android-sysimage-license", "name": "system-image-17-default-mips", "path": "system-images/android-17/default/mips", @@ -3082,7 +3082,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-17-default-x86", "path": "system-images/android-17/default/x86", @@ -3136,7 +3136,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-17-google_apis-armeabi-v7a", "path": "system-images/android-17/google_apis/armeabi-v7a", @@ -3188,7 +3188,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-17-google_apis-x86", "path": "system-images/android-17/google_apis/x86", @@ -3244,7 +3244,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-18-default-armeabi-v7a", "path": "system-images/android-18/default/armeabi-v7a", @@ -3288,7 +3288,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-18-default-x86", "path": "system-images/android-18/default/x86", @@ -3334,7 +3334,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-18-google_apis-armeabi-v7a", "path": "system-images/android-18/google_apis/armeabi-v7a", @@ -3386,7 +3386,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-18-google_apis-x86", "path": "system-images/android-18/google_apis/x86", @@ -3442,7 +3442,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-19-default-armeabi-v7a", "path": "system-images/android-19/default/armeabi-v7a", @@ -3486,7 +3486,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-19-default-x86", "path": "system-images/android-19/default/x86", @@ -3532,7 +3532,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-19-google_apis-armeabi-v7a", "path": "system-images/android-19/google_apis/armeabi-v7a", @@ -3584,7 +3584,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-19-google_apis-x86", "path": "system-images/android-19/google_apis/x86", @@ -3633,7 +3633,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-21-android-tv-armeabi-v7a", "path": "system-images/android-21/android-tv/armeabi-v7a", @@ -3670,7 +3670,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-21-android-tv-x86", "path": "system-images/android-21/android-tv/x86", @@ -3709,7 +3709,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-21-default-arm64-v8a", "path": "system-images/android-21/default/arm64-v8a", @@ -3753,7 +3753,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-21-default-armeabi-v7a", "path": "system-images/android-21/default/armeabi-v7a", @@ -3797,7 +3797,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-21-default-x86", "path": "system-images/android-21/default/x86", @@ -3841,7 +3841,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-21-default-x86_64", "path": "system-images/android-21/default/x86_64", @@ -3880,7 +3880,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-21-google_apis-arm64-v8a", "path": "system-images/android-21/google_apis/arm64-v8a", @@ -3932,7 +3932,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-21-google_apis-armeabi-v7a", "path": "system-images/android-21/google_apis/armeabi-v7a", @@ -3984,7 +3984,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86", "path": "system-images/android-21/google_apis/x86", @@ -4036,7 +4036,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-21-google_apis-x86_64", "path": "system-images/android-21/google_apis/x86_64", @@ -4085,7 +4085,7 @@ } ], "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-22-android-tv-x86", "path": "system-images/android-22/android-tv/x86", @@ -4124,7 +4124,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-22-default-arm64-v8a", "path": "system-images/android-22/default/arm64-v8a", @@ -4168,7 +4168,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-22-default-armeabi-v7a", "path": "system-images/android-22/default/armeabi-v7a", @@ -4212,7 +4212,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-22-default-x86", "path": "system-images/android-22/default/x86", @@ -4256,7 +4256,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-22-default-x86_64", "path": "system-images/android-22/default/x86_64", @@ -4295,7 +4295,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-22-google_apis-arm64-v8a", "path": "system-images/android-22/google_apis/arm64-v8a", @@ -4347,7 +4347,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-22-google_apis-armeabi-v7a", "path": "system-images/android-22/google_apis/armeabi-v7a", @@ -4399,7 +4399,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86", "path": "system-images/android-22/google_apis/x86", @@ -4451,7 +4451,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-22-google_apis-x86_64", "path": "system-images/android-22/google_apis/x86_64", @@ -4500,7 +4500,7 @@ } ], "displayName": "Android TV ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-23-android-tv-armeabi-v7a", "path": "system-images/android-23/android-tv/armeabi-v7a", @@ -4544,7 +4544,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-23-android-tv-x86", "path": "system-images/android-23/android-tv/x86", @@ -4583,7 +4583,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-23-default-arm64-v8a", "path": "system-images/android-23/default/arm64-v8a", @@ -4627,7 +4627,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-23-default-armeabi-v7a", "path": "system-images/android-23/default/armeabi-v7a", @@ -4671,7 +4671,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-23-default-x86", "path": "system-images/android-23/default/x86", @@ -4715,7 +4715,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-23-default-x86_64", "path": "system-images/android-23/default/x86_64", @@ -4754,7 +4754,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-23-google_apis-arm64-v8a", "path": "system-images/android-23/google_apis/arm64-v8a", @@ -4806,7 +4806,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-23-google_apis-armeabi-v7a", "path": "system-images/android-23/google_apis/armeabi-v7a", @@ -4858,7 +4858,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86", "path": "system-images/android-23/google_apis/x86", @@ -4910,7 +4910,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-23-google_apis-x86_64", "path": "system-images/android-23/google_apis/x86_64", @@ -4966,7 +4966,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-24-android-tv-x86", "path": "system-images/android-24/android-tv/x86", @@ -5005,7 +5005,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-24-default-arm64-v8a", "path": "system-images/android-24/default/arm64-v8a", @@ -5049,7 +5049,7 @@ } }, "displayName": "ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-24-default-armeabi-v7a", "path": "system-images/android-24/default/armeabi-v7a", @@ -5093,7 +5093,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-24-default-x86", "path": "system-images/android-24/default/x86", @@ -5137,7 +5137,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-24-default-x86_64", "path": "system-images/android-24/default/x86_64", @@ -5183,7 +5183,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-24-google_apis-arm64-v8a", "path": "system-images/android-24/google_apis/arm64-v8a", @@ -5235,7 +5235,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86", "path": "system-images/android-24/google_apis/x86", @@ -5287,7 +5287,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-24-google_apis-x86_64", "path": "system-images/android-24/google_apis/x86_64", @@ -5341,7 +5341,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-24-google_apis_playstore-x86", "path": "system-images/android-24/google_apis_playstore/x86", @@ -5397,7 +5397,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-android-tv-x86", "path": "system-images/android-25/android-tv/x86", @@ -5443,7 +5443,7 @@ } }, "displayName": "Android Wear ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-android-wear-armeabi-v7a", "path": "system-images/android-25/android-wear/armeabi-v7a", @@ -5487,7 +5487,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-android-wear-x86", "path": "system-images/android-25/android-wear/x86", @@ -5526,7 +5526,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-default-arm64-v8a", "path": "system-images/android-25/default/arm64-v8a", @@ -5570,7 +5570,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-default-x86", "path": "system-images/android-25/default/x86", @@ -5614,7 +5614,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-default-x86_64", "path": "system-images/android-25/default/x86_64", @@ -5653,7 +5653,7 @@ } ], "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-google_apis-arm64-v8a", "path": "system-images/android-25/google_apis/arm64-v8a", @@ -5705,7 +5705,7 @@ } }, "displayName": "Google APIs ARM EABI v7a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-google_apis-armeabi-v7a", "path": "system-images/android-25/google_apis/armeabi-v7a", @@ -5757,7 +5757,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86", "path": "system-images/android-25/google_apis/x86", @@ -5809,7 +5809,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-google_apis-x86_64", "path": "system-images/android-25/google_apis/x86_64", @@ -5863,7 +5863,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-25-google_apis_playstore-x86", "path": "system-images/android-25/google_apis_playstore/x86", @@ -5934,7 +5934,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-26-android-tv-x86", "path": "system-images/android-26/android-tv/x86", @@ -5980,7 +5980,7 @@ } }, "displayName": "Android Wear Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-26-android-wear-x86", "path": "system-images/android-26/android-wear/x86", @@ -6031,7 +6031,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-26-default-arm64-v8a", "path": "system-images/android-26/default/arm64-v8a", @@ -6075,7 +6075,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-26-default-x86", "path": "system-images/android-26/default/x86", @@ -6119,7 +6119,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-26-default-x86_64", "path": "system-images/android-26/default/x86_64", @@ -6170,7 +6170,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-26-google_apis-arm64-v8a", "path": "system-images/android-26/google_apis/arm64-v8a", @@ -6237,7 +6237,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86", "path": "system-images/android-26/google_apis/x86", @@ -6304,7 +6304,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-26-google_apis-x86_64", "path": "system-images/android-26/google_apis/x86_64", @@ -6373,7 +6373,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-26-google_apis_playstore-x86", "path": "system-images/android-26/google_apis_playstore/x86", @@ -6429,7 +6429,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-27-android-tv-x86", "path": "system-images/android-27/android-tv/x86", @@ -6480,7 +6480,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-27-default-arm64-v8a", "path": "system-images/android-27/default/arm64-v8a", @@ -6524,7 +6524,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-27-default-x86", "path": "system-images/android-27/default/x86", @@ -6568,7 +6568,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-27-default-x86_64", "path": "system-images/android-27/default/x86_64", @@ -6619,7 +6619,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-27-google_apis-arm64-v8a", "path": "system-images/android-27/google_apis/arm64-v8a", @@ -6686,7 +6686,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-27-google_apis-x86", "path": "system-images/android-27/google_apis/x86", @@ -6755,7 +6755,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-27-google_apis_playstore-x86", "path": "system-images/android-27/google_apis_playstore/x86", @@ -6816,7 +6816,7 @@ } }, "displayName": "Automotive Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-28-android-automotive-playstore-x86", "path": "system-images/android-28/android-automotive-playstore/x86", @@ -6861,7 +6861,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-28-android-tv-x86", "path": "system-images/android-28/android-tv/x86", @@ -6907,7 +6907,7 @@ } }, "displayName": "Wear OS Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-28-android-wear-x86", "path": "system-images/android-28/android-wear/x86", @@ -6958,7 +6958,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-28-default-arm64-v8a", "path": "system-images/android-28/default/arm64-v8a", @@ -6995,7 +6995,7 @@ } ], "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86", "path": "system-images/android-28/default/x86", @@ -7032,7 +7032,7 @@ } ], "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-28-default-x86_64", "path": "system-images/android-28/default/x86_64", @@ -7083,7 +7083,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-28-google_apis-arm64-v8a", "path": "system-images/android-28/google_apis/arm64-v8a", @@ -7150,7 +7150,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis-x86", "path": "system-images/android-28/google_apis/x86", @@ -7217,7 +7217,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-28-google_apis-x86_64", "path": "system-images/android-28/google_apis/x86_64", @@ -7276,7 +7276,7 @@ } }, "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-28-google_apis_playstore-arm64-v8a", "path": "system-images/android-28/google_apis_playstore/arm64-v8a", @@ -7343,7 +7343,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86", "path": "system-images/android-28/google_apis_playstore/x86", @@ -7410,7 +7410,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-28-google_apis_playstore-x86_64", "path": "system-images/android-28/google_apis_playstore/x86_64", @@ -7471,7 +7471,7 @@ } }, "displayName": "Automotive with Play Store Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-29-android-automotive-playstore-x86", "path": "system-images/android-29/android-automotive-playstore/x86", @@ -7531,7 +7531,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-29-android-tv-x86", "path": "system-images/android-29/android-tv/x86", @@ -7570,7 +7570,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-29-default-arm64-v8a", "path": "system-images/android-29/default/arm64-v8a", @@ -7633,7 +7633,7 @@ } }, "displayName": "Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-29-default-x86", "path": "system-images/android-29/default/x86", @@ -7696,7 +7696,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-29-default-x86_64", "path": "system-images/android-29/default/x86_64", @@ -7747,7 +7747,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis-arm64-v8a", "path": "system-images/android-29/google_apis/arm64-v8a", @@ -7804,7 +7804,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86", "path": "system-images/android-29/google_apis/x86", @@ -7861,7 +7861,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-29-google_apis-x86_64", "path": "system-images/android-29/google_apis/x86_64", @@ -7920,7 +7920,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-29-google_apis_playstore-arm64-v8a", "path": "system-images/android-29/google_apis_playstore/arm64-v8a", @@ -8001,7 +8001,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86", "path": "system-images/android-29/google_apis_playstore/x86", @@ -8082,7 +8082,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-29-google_apis_playstore-x86_64", "path": "system-images/android-29/google_apis_playstore/x86_64", @@ -8143,7 +8143,7 @@ } }, "displayName": "Automotive with Play Store Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-30-android-automotive-playstore-x86_64", "path": "system-images/android-30/android-automotive-playstore/x86_64", @@ -8203,7 +8203,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-30-android-tv-x86", "path": "system-images/android-30/android-tv/x86", @@ -8249,7 +8249,7 @@ } }, "displayName": "China version of Wear OS 3 ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-30-android-wear-arm64-v8a", "path": "system-images/android-30/android-wear-cn/arm64-v8a", @@ -8293,7 +8293,7 @@ } }, "displayName": "China version of Wear OS 3 Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-30-android-wear-x86", "path": "system-images/android-30/android-wear-cn/x86", @@ -8332,7 +8332,7 @@ } ], "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-30-default-arm64-v8a", "path": "system-images/android-30/default/arm64-v8a", @@ -8381,7 +8381,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-30-default-x86_64", "path": "system-images/android-30/default/x86_64", @@ -8432,7 +8432,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis-arm64-v8a", "path": "system-images/android-30/google_apis/arm64-v8a", @@ -8499,7 +8499,7 @@ } }, "displayName": "Google APIs Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-30-google_apis-x86", "path": "system-images/android-30/google_apis/x86", @@ -8566,7 +8566,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-30-google_apis-x86_64", "path": "system-images/android-30/google_apis/x86_64", @@ -8632,7 +8632,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-arm64-v8a", "path": "system-images/android-30/google_apis_playstore/arm64-v8a", @@ -8713,7 +8713,7 @@ } }, "displayName": "Google Play Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-30-google_apis_playstore-x86", "path": "system-images/android-30/google_apis_playstore/x86", @@ -8794,7 +8794,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-30-google_apis_playstore-x86_64", "path": "system-images/android-30/google_apis_playstore/x86_64", @@ -8865,7 +8865,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-31-android-tv-arm64-v8a", "path": "system-images/android-31/android-tv/arm64-v8a", @@ -8924,7 +8924,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-31-android-tv-x86", "path": "system-images/android-31/android-tv/x86", @@ -8975,7 +8975,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-31-default-arm64-v8a", "path": "system-images/android-31/default/arm64-v8a", @@ -9024,7 +9024,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-31-default-x86_64", "path": "system-images/android-31/default/x86_64", @@ -9085,7 +9085,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis-arm64-v8a", "path": "system-images/android-31/google_apis/arm64-v8a", @@ -9152,7 +9152,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-31-google_apis-x86_64", "path": "system-images/android-31/google_apis/x86_64", @@ -9228,7 +9228,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-arm64-v8a", "path": "system-images/android-31/google_apis_playstore/arm64-v8a", @@ -9295,7 +9295,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-31-google_apis_playstore-x86_64", "path": "system-images/android-31/google_apis_playstore/x86_64", @@ -9356,7 +9356,7 @@ } }, "displayName": "Android Automotive with Google Play arm64-v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-32-android-automotive-playstore-arm64-v8a", "path": "system-images/android-32/android-automotive-playstore/arm64-v8a", @@ -9409,7 +9409,7 @@ } }, "displayName": "Android Automotive with Google Play x86_64 System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-32-android-automotive-playstore-x86_64", "path": "system-images/android-32/android-automotive-playstore/x86_64", @@ -9464,7 +9464,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-32-default-arm64-v8a", "path": "system-images/android-32/default/arm64-v8a", @@ -9513,7 +9513,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-32-default-x86_64", "path": "system-images/android-32/default/x86_64", @@ -9574,7 +9574,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis-arm64-v8a", "path": "system-images/android-32/google_apis/arm64-v8a", @@ -9641,7 +9641,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis-x86_64", "path": "system-images/android-32/google_apis/x86_64", @@ -9717,7 +9717,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-32-google_apis_playstore-arm64-v8a", "path": "system-images/android-32/google_apis_playstore/arm64-v8a", @@ -9798,7 +9798,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-32-google_apis_playstore-x86_64", "path": "system-images/android-32/google_apis_playstore/x86_64", @@ -9859,7 +9859,7 @@ } }, "displayName": "Android Automotive with Google APIs arm64-v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-33-android-automotive-arm64-v8a", "path": "system-images/android-33/android-automotive/arm64-v8a", @@ -9912,7 +9912,7 @@ } }, "displayName": "Android Automotive with Google APIs x86_64 System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-33-android-automotive-x86_64", "path": "system-images/android-33/android-automotive/x86_64", @@ -9977,7 +9977,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-33-android-tv-arm64-v8a", "path": "system-images/android-33/android-tv/arm64-v8a", @@ -10036,7 +10036,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-33-android-tv-x86", "path": "system-images/android-33/android-tv/x86", @@ -10082,7 +10082,7 @@ } }, "displayName": "Wear OS 4 ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-33-android-wear-arm64-v8a", "path": "system-images/android-33/android-wear/arm64-v8a", @@ -10126,7 +10126,7 @@ } }, "displayName": "Wear OS 4 Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-33-android-wear-x86_64", "path": "system-images/android-33/android-wear/x86_64", @@ -10177,7 +10177,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-33-default-arm64-v8a", "path": "system-images/android-33/default/arm64-v8a", @@ -10226,7 +10226,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-33-default-x86_64", "path": "system-images/android-33/default/x86_64", @@ -10287,7 +10287,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis-arm64-v8a", "path": "system-images/android-33/google_apis/arm64-v8a", @@ -10354,7 +10354,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-33-google_apis-x86_64", "path": "system-images/android-33/google_apis/x86_64", @@ -10423,7 +10423,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-33-google_apis_playstore-arm64-v8a", "path": "system-images/android-33/google_apis_playstore/arm64-v8a", @@ -10490,7 +10490,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-33-google_apis_playstore-x86_64", "path": "system-images/android-33/google_apis_playstore/x86_64", @@ -10565,7 +10565,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-33x-google_apis_playstore-arm64-v8a", "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a", @@ -10614,7 +10614,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-33x-google_apis_playstore-x86_64", "path": "system-images/android-33-ext4/google_apis_playstore/x86_64", @@ -10677,7 +10677,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34-android-tv-arm64-v8a", "path": "system-images/android-34/android-tv/arm64-v8a", @@ -10737,7 +10737,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34-android-tv-x86", "path": "system-images/android-34/android-tv/x86", @@ -10777,7 +10777,7 @@ } ], "displayName": "Wear OS 5 ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34-android-wear-arm64-v8a", "path": "system-images/android-34/android-wear/arm64-v8a", @@ -10814,7 +10814,7 @@ } ], "displayName": "Wear OS 5 Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34-android-wear-x86_64", "path": "system-images/android-34/android-wear/x86_64", @@ -10865,7 +10865,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34-default-arm64-v8a", "path": "system-images/android-34/default/arm64-v8a", @@ -10914,7 +10914,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34-default-x86_64", "path": "system-images/android-34/default/x86_64", @@ -10975,7 +10975,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis-arm64-v8a", "path": "system-images/android-34/google_apis/arm64-v8a", @@ -11043,7 +11043,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34-google_apis-x86_64", "path": "system-images/android-34/google_apis/x86_64", @@ -11113,7 +11113,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-34-google_apis_playstore-arm64-v8a", "path": "system-images/android-34/google_apis_playstore/arm64-v8a", @@ -11182,7 +11182,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34-google_apis_playstore-x86_64", "path": "system-images/android-34/google_apis_playstore/x86_64", @@ -11245,7 +11245,7 @@ } }, "displayName": "Android Automotive with Google APIs arm64-v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34x-android-automotive-arm64-v8a", "path": "system-images/android-34-ext9/android-automotive/arm64-v8a", @@ -11298,7 +11298,7 @@ } }, "displayName": "Android Automotive with Google APIs x86_64 System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34x-android-automotive-x86_64", "path": "system-images/android-34-ext9/android-automotive/x86_64", @@ -11367,7 +11367,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-34x-google_apis_playstore-arm64-v8a", "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a", @@ -11416,7 +11416,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-34x-google_apis_playstore-x86_64", "path": "system-images/android-34-ext12/google_apis_playstore/x86_64", @@ -11457,7 +11457,7 @@ } ], "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-35-android-wear-arm64-v8a", "path": "system-images/android-35/android-wear/arm64-v8a", @@ -11489,7 +11489,7 @@ } ], "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-35-android-wear-x86_64", "path": "system-images/android-35/android-wear/x86_64", @@ -11535,7 +11535,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35-default-arm64-v8a", "path": "system-images/android-35/default/arm64-v8a", @@ -11580,7 +11580,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35-default-x86_64", "path": "system-images/android-35/default/x86_64", @@ -11627,7 +11627,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-google_apis-arm64-v8a", "path": "system-images/android-35/google_apis/arm64-v8a", @@ -11685,7 +11685,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35-google_apis-x86_64", "path": "system-images/android-35/google_apis/x86_64", @@ -11745,7 +11745,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-google_apis_playstore-arm64-v8a", "path": "system-images/android-35/google_apis_playstore/arm64-v8a", @@ -11803,7 +11803,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35-google_apis_playstore-x86_64", "path": "system-images/android-35/google_apis_playstore/x86_64", @@ -11863,7 +11863,7 @@ } }, "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-35-page_size_16kb-arm64-v8a", "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a", @@ -11925,7 +11925,7 @@ } }, "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35-page_size_16kb-x86_64", "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64", @@ -11991,7 +11991,7 @@ } }, "displayName": "Android Automotive with Google APIs arm64-v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35x-android-automotive-arm64-v8a", "path": "system-images/android-35-ext15/android-automotive/arm64-v8a", @@ -12044,7 +12044,7 @@ } }, "displayName": "Android Automotive with Google APIs x86_64 System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35x-android-automotive-x86_64", "path": "system-images/android-35-ext15/android-automotive/x86_64", @@ -12087,7 +12087,7 @@ } ], "displayName": "Wear OS 5.1 ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35x-android-wear-arm64-v8a", "path": "system-images/android-35-ext15/android-wear/arm64-v8a", @@ -12120,7 +12120,7 @@ } ], "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35x-android-wear-x86_64", "path": "system-images/android-35-ext15/android-wear/x86_64", @@ -12167,7 +12167,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-35x-google_apis-arm64-v8a", "path": "system-images/android-35-ext15/google_apis/arm64-v8a", @@ -12216,7 +12216,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35x-google_apis-x86_64", "path": "system-images/android-35-ext15/google_apis/x86_64", @@ -12267,7 +12267,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-35x-google_apis_playstore-arm64-v8a", "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a", @@ -12316,7 +12316,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-35x-google_apis_playstore-x86_64", "path": "system-images/android-35-ext15/google_apis_playstore/x86_64", @@ -12369,7 +12369,7 @@ } }, "displayName": "Android TV ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36-android-tv-arm64-v8a", "path": "system-images/android-36/android-tv/arm64-v8a", @@ -12414,7 +12414,7 @@ } }, "displayName": "Android TV Intel x86 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36-android-tv-x86", "path": "system-images/android-36/android-tv/x86", @@ -12459,7 +12459,7 @@ } }, "displayName": "Android TV Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36-android-tv-x86_64", "path": "system-images/android-36/android-tv/x86_64", @@ -12494,7 +12494,7 @@ } ], "displayName": "Wear OS 6.0 ARM 64 v8a System Image (signed)", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36-android-wear-arm64-v8a", "path": "system-images/android-36/android-wear-signed/arm64-v8a", @@ -12527,7 +12527,7 @@ } ], "displayName": "Wear OS 6.0 Intel x86_64 Atom System Image (signed)", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36-android-wear-x86_64", "path": "system-images/android-36/android-wear-signed/x86_64", @@ -12574,7 +12574,7 @@ } }, "displayName": "ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36-default-arm64-v8a", "path": "system-images/android-36/default/arm64-v8a", @@ -12619,7 +12619,7 @@ } }, "displayName": "Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36-default-x86_64", "path": "system-images/android-36/default/x86_64", @@ -12666,7 +12666,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-36-google_apis-arm64-v8a", "path": "system-images/android-36/google_apis/arm64-v8a", @@ -12715,7 +12715,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36-google_apis-x86_64", "path": "system-images/android-36/google_apis/x86_64", @@ -12766,7 +12766,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-36-google_apis_playstore-arm64-v8a", "path": "system-images/android-36/google_apis_playstore/arm64-v8a", @@ -12815,7 +12815,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36-google_apis_playstore-x86_64", "path": "system-images/android-36/google_apis_playstore/x86_64", @@ -12866,7 +12866,7 @@ } }, "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-36-page_size_16kb-arm64-v8a", "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a", @@ -12919,7 +12919,7 @@ } }, "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36-page_size_16kb-x86_64", "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64", @@ -12964,7 +12964,7 @@ } ], "displayName": "Wear OS 6.1 ARM 64 v8a System Image (signed)", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36.1-android-wear-arm64-v8a", "path": "system-images/android-36.1/android-wear-signed/arm64-v8a", @@ -12997,7 +12997,7 @@ } ], "displayName": "Wear OS 6.1 Intel x86_64 Atom System Image (signed)", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36.1-android-wear-x86_64", "path": "system-images/android-36.1/android-wear-signed/x86_64", @@ -13044,7 +13044,7 @@ } }, "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-36.1-google_apis-arm64-v8a", "path": "system-images/android-36.1/google_apis_ps16k/arm64-v8a", @@ -13102,7 +13102,7 @@ } }, "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36.1-google_apis-x86_64", "path": "system-images/android-36.1/google_apis_ps16k/x86_64", @@ -13162,7 +13162,7 @@ } }, "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-36.1-google_apis_playstore-arm64-v8a", "path": "system-images/android-36.1/google_apis_playstore_ps16k/arm64-v8a", @@ -13220,7 +13220,7 @@ } }, "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36.1-google_apis_playstore-x86_64", "path": "system-images/android-36.1/google_apis_playstore_ps16k/x86_64", @@ -13390,7 +13390,7 @@ } }, "displayName": "Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-36x-google_apis-arm64-v8a", "path": "system-images/android-36-ext19/google_apis/arm64-v8a", @@ -13439,7 +13439,7 @@ } }, "displayName": "Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36x-google_apis-x86_64", "path": "system-images/android-36-ext19/google_apis/x86_64", @@ -13490,7 +13490,7 @@ } }, "displayName": "Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-36x-google_apis_playstore-arm64-v8a", "path": "system-images/android-36-ext19/google_apis_playstore/arm64-v8a", @@ -13539,7 +13539,7 @@ } }, "displayName": "Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-36x-google_apis_playstore-x86_64", "path": "system-images/android-36-ext19/google_apis_playstore/x86_64", @@ -13580,7 +13580,7 @@ } ], "displayName": "Wear OS 7.0 - Preview ARM 64 v8a System Image (signed)", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-37.0-android-wear-arm64-v8a", "path": "system-images/android-37.0/android-wear-signed/arm64-v8a", @@ -13613,7 +13613,7 @@ } ], "displayName": "Wear OS 7.0 - Preview Intel x86_64 Atom System Image (signed)", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "system-image-37.0-android-wear-x86_64", "path": "system-images/android-37.0/android-wear-signed/x86_64", @@ -13660,7 +13660,7 @@ } }, "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-37.0-google_apis-arm64-v8a", "path": "system-images/android-37.0/google_apis_ps16k/arm64-v8a", @@ -13722,7 +13722,7 @@ } }, "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-37.0-google_apis-x86_64", "path": "system-images/android-37.0/google_apis_ps16k/x86_64", @@ -13786,7 +13786,7 @@ } }, "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-37.0-google_apis_playstore-arm64-v8a", "path": "system-images/android-37.0/google_apis_playstore_ps16k/arm64-v8a", @@ -13848,7 +13848,7 @@ } }, "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-37.0-google_apis_playstore-x86_64", "path": "system-images/android-37.0/google_apis_playstore_ps16k/x86_64", @@ -13889,6 +13889,224 @@ } } }, + "37.1": { + "google_apis": { + "arm64-v8a": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "a30cd0035f1f195455e2f863c8a6c35f0f589834", + "size": 2092733202, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-37.1_r06.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "36", + "micro:2": "11", + "minor:1": "5" + } + } + }, + "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image", + "last-available-day": 20647, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-37.1-google_apis-arm64-v8a", + "path": "system-images/android-37.1/google_apis_ps16k/arm64-v8a", + "revision": "37.1-google_apis-arm64-v8a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:6": "arm64-v8a", + "api-level:0": "37.1", + "base-extension:2": "true", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "23", + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "tag:4": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "vendor:5": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "724c0f206e8c4d8a2b45080e438ece5009d2debe", + "size": 2172594682, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-37.1_r06.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "36", + "micro:2": "11", + "minor:1": "5" + } + } + }, + "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image", + "last-available-day": 20647, + "license": "android-sdk-license", + "name": "system-image-37.1-google_apis-x86_64", + "path": "system-images/android-37.1/google_apis_ps16k/x86_64", + "revision": "37.1-google_apis-x86_64", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:6": "x86_64", + "api-level:0": "37.1", + "base-extension:2": "true", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "23", + "tag:3": { + "display:1": "Google APIs", + "id:0": "google_apis" + }, + "tag:4": { + "display:1": "16 KB Page Size", + "id:0": "page_size_16kb" + }, + "vendor:5": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + }, + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "f2d225e0b569dfd8c993ca9eac794ca6655820b9", + "size": 2120238345, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-37.1_r06.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "36", + "micro:2": "11", + "minor:1": "5" + } + } + }, + "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image", + "last-available-day": 20647, + "license": "android-sdk-arm-dbt-license", + "name": "system-image-37.1-google_apis_playstore-arm64-v8a", + "path": "system-images/android-37.1/google_apis_playstore_ps16k/arm64-v8a", + "revision": "37.1-google_apis_playstore-arm64-v8a", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:6": "arm64-v8a", + "api-level:0": "37.1", + "base-extension:2": "true", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "23", + "tag:3": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, + "tag:4": { + "display:1": "Page Size 16KB", + "id:0": "page_size_16kb" + }, + "vendor:5": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + }, + "x86_64": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "15fcda0d15335414cabefbefa7d875a12e62861d", + "size": 2190215543, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-37.1_r06.zip" + } + ], + "dependencies": { + "dependency:0": { + "element-attributes": { + "path": "emulator" + }, + "min-revision:0": { + "major:0": "36", + "micro:2": "11", + "minor:1": "5" + } + } + }, + "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image", + "last-available-day": 20647, + "license": "android-sdk-license", + "name": "system-image-37.1-google_apis_playstore-x86_64", + "path": "system-images/android-37.1/google_apis_playstore_ps16k/x86_64", + "revision": "37.1-google_apis_playstore-x86_64", + "revision-details": { + "major:0": "6" + }, + "type-details": { + "abi:6": "x86_64", + "api-level:0": "37.1", + "base-extension:2": "true", + "element-attributes": { + "xsi:type": "ns12:sysImgDetailsType" + }, + "extension-level:1": "23", + "tag:3": { + "display:1": "Google APIs PlayStore", + "id:0": "google_apis_playstore" + }, + "tag:4": { + "display:1": "Page Size 16KB", + "id:0": "page_size_16kb" + }, + "vendor:5": { + "display:1": "Google Inc.", + "id:0": "google" + } + } + } + } + }, "Baklava": { "google_apis": { "arm64-v8a": { @@ -14212,9 +14430,9 @@ { "arch": "all", "os": "all", - "sha1": "d3e00c6f779ae63bf8334991243194ed8726f50f", - "size": 1926900131, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36.0-CANARY_r03.zip" + "sha1": "bf0663990865c3b31528840dbc53259f050f17c1", + "size": 2186218057, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-CANARY_r14.zip" } ], "dependencies": { @@ -14230,13 +14448,13 @@ } }, "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-CANARY-google_apis-arm64-v8a", "path": "system-images/android-CANARY/google_apis_ps16k/arm64-v8a", "revision": "CANARY-google_apis-arm64-v8a", "revision-details": { - "major:0": "13" + "major:0": "14" }, "type-details": { "abi:6": "arm64-v8a", @@ -14275,9 +14493,9 @@ { "arch": "all", "os": "all", - "sha1": "9183e8f62265c01ad1604a4a0d7dc3d85833cbe9", - "size": 1962644486, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36.0-CANARY_r03.zip" + "sha1": "671e41bda24076e1226acc44b6bda596eaee1a0a", + "size": 2267928836, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-CANARY_r14.zip" } ], "dependencies": { @@ -14293,13 +14511,13 @@ } }, "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-CANARY-google_apis-x86_64", "path": "system-images/android-CANARY/google_apis_ps16k/x86_64", "revision": "CANARY-google_apis-x86_64", "revision-details": { - "major:0": "13" + "major:0": "14" }, "type-details": { "abi:6": "x86_64", @@ -14340,9 +14558,9 @@ { "arch": "all", "os": "all", - "sha1": "f6229e271519531634c27cf7e9263fa2d957b22f", - "size": 1953862507, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36.0-CANARY_r03.zip" + "sha1": "e9912f4fd25d63467484913d6cac03aa5af54b85", + "size": 2213671181, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-CANARY_r14.zip" } ], "dependencies": { @@ -14358,13 +14576,13 @@ } }, "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-CANARY-google_apis_playstore-arm64-v8a", "path": "system-images/android-CANARY/google_apis_playstore_ps16k/arm64-v8a", "revision": "CANARY-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "13" + "major:0": "14" }, "type-details": { "abi:6": "arm64-v8a", @@ -14403,9 +14621,9 @@ { "arch": "all", "os": "all", - "sha1": "03efb3c709569c93a86ef1c342f6ed8608442bfd", - "size": 2005819876, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36.0-CANARY_r03.zip" + "sha1": "0c57211535e81766ec0a484d813d8c187e5bcede", + "size": 2285680518, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-CANARY_r14.zip" } ], "dependencies": { @@ -14421,13 +14639,13 @@ } }, "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-CANARY-google_apis_playstore-x86_64", "path": "system-images/android-CANARY/google_apis_playstore_ps16k/x86_64", "revision": "CANARY-google_apis_playstore-x86_64", "revision-details": { - "major:0": "13" + "major:0": "14" }, "type-details": { "abi:6": "x86_64", @@ -14580,9 +14798,9 @@ { "arch": "all", "os": "all", - "sha1": "42826280f4210f45826793167e236a2711e2d302", - "size": 2088998508, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-CinnamonBun_r04.zip" + "sha1": "d40b3a56fab1d15b280000a04be4dde8050e5fd3", + "size": 2094864739, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-ps16k-CinnamonBun_r05.zip" } ], "dependencies": { @@ -14598,13 +14816,13 @@ } }, "displayName": "16 KB Page Size Google APIs ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-CinnamonBun-google_apis-arm64-v8a", "path": "system-images/android-CinnamonBun/google_apis_ps16k/arm64-v8a", "revision": "CinnamonBun-google_apis-arm64-v8a", "revision-details": { - "major:0": "4" + "major:0": "5" }, "type-details": { "abi:7": "arm64-v8a", @@ -14643,9 +14861,9 @@ { "arch": "all", "os": "all", - "sha1": "57fb82e646a58fd72ab9eef87e98151aec17ef02", - "size": 2075019883, - "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-CinnamonBun_r04.zip" + "sha1": "d879c8113d89d202f1cbc2796c2372fa737ab565", + "size": 2169610681, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-ps16k-CinnamonBun_r05.zip" } ], "dependencies": { @@ -14661,13 +14879,13 @@ } }, "displayName": "16 KB Page Size Google APIs Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-CinnamonBun-google_apis-x86_64", "path": "system-images/android-CinnamonBun/google_apis_ps16k/x86_64", "revision": "CinnamonBun-google_apis-x86_64", "revision-details": { - "major:0": "4" + "major:0": "5" }, "type-details": { "abi:7": "x86_64", @@ -14708,9 +14926,9 @@ { "arch": "all", "os": "all", - "sha1": "80e3337028882c3d195c4ecf633e4c9d94e66b37", - "size": 2201449106, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-CinnamonBun_r04.zip" + "sha1": "a7609b48a497a992e87bdeb94a945cf92993f1bb", + "size": 2206834051, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-playstore-ps16k-CinnamonBun_r05.zip" } ], "dependencies": { @@ -14726,13 +14944,13 @@ } }, "displayName": "16 KB Page Size Google Play ARM 64 v8a System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-arm-dbt-license", "name": "system-image-CinnamonBun-google_apis_playstore-arm64-v8a", "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/arm64-v8a", "revision": "CinnamonBun-google_apis_playstore-arm64-v8a", "revision-details": { - "major:0": "4" + "major:0": "5" }, "type-details": { "abi:7": "arm64-v8a", @@ -14771,9 +14989,9 @@ { "arch": "all", "os": "all", - "sha1": "32b8028026697d28b237e002b8da62af9221400b", - "size": 2199666231, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-CinnamonBun_r04.zip" + "sha1": "cdf42021f5938c76ce368cee7674d8dc34bd7fce", + "size": 2296198717, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-playstore-ps16k-CinnamonBun_r05.zip" } ], "dependencies": { @@ -14789,13 +15007,13 @@ } }, "displayName": "16 KB Page Size Google Play Intel x86_64 Atom System Image", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "system-image-CinnamonBun-google_apis_playstore-x86_64", "path": "system-images/android-CinnamonBun/google_apis_playstore_ps16k/x86_64", "revision": "CinnamonBun-google_apis_playstore-x86_64", "revision-details": { - "major:0": "4" + "major:0": "5" }, "type-details": { "abi:7": "x86_64", @@ -15411,11 +15629,11 @@ "ndk": "29.0.14206865", "ndk-bundle": "22.1.7171670", "platform-tools": "37.0.0", - "platforms": "37.0", + "platforms": "37.1", "skiaparser": "8", - "sources": "37.0", + "sources": "37.1", "tools": "26.1.1", - "fingerprint": "b32174c25099306e" + "fingerprint": "bf983fbce7b915ee" }, "licenses": { "android-googletv-license": [ @@ -15483,7 +15701,7 @@ } ], "displayName": "Lightbuild", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build", "path": "build/lightbuild/0.0.10-alpha01", @@ -15538,7 +15756,7 @@ } ], "displayName": "Android Project Templates", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build", "path": "build/templates", @@ -15588,7 +15806,7 @@ } }, "displayName": "Android SDK Build-Tools 17", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15637,7 +15855,7 @@ } }, "displayName": "Android SDK Build-Tools 18.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15686,7 +15904,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15735,7 +15953,7 @@ } }, "displayName": "Android SDK Build-Tools 18.1.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15784,7 +16002,7 @@ } }, "displayName": "Android SDK Build-Tools 19", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15833,7 +16051,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15882,7 +16100,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15931,7 +16149,7 @@ } }, "displayName": "Android SDK Build-Tools 19.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -15980,7 +16198,7 @@ } }, "displayName": "Android SDK Build-Tools 19.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/19.1.0", @@ -16028,7 +16246,7 @@ } }, "displayName": "Android SDK Build-Tools 20", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/20.0.0", @@ -16076,7 +16294,7 @@ } }, "displayName": "Android SDK Build-Tools 21", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -16125,7 +16343,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -16174,7 +16392,7 @@ } }, "displayName": "Android SDK Build-Tools 21.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -16223,7 +16441,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -16272,7 +16490,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -16321,7 +16539,7 @@ } }, "displayName": "Android SDK Build-Tools 21.1.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/21.1.2", @@ -16369,7 +16587,7 @@ } }, "displayName": "Android SDK Build-Tools 22", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -16418,7 +16636,7 @@ } }, "displayName": "Android SDK Build-Tools 22.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/22.0.1", @@ -16466,7 +16684,7 @@ } }, "displayName": "Android SDK Build-Tools 23", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "obsolete": "true", @@ -16515,7 +16733,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.1", @@ -16563,7 +16781,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.2", @@ -16611,7 +16829,7 @@ } }, "displayName": "Android SDK Build-Tools 23.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/23.0.3", @@ -16659,7 +16877,7 @@ } }, "displayName": "Android SDK Build-Tools 24", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.0", @@ -16707,7 +16925,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.1", @@ -16755,7 +16973,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.2", @@ -16803,7 +17021,7 @@ } }, "displayName": "Android SDK Build-Tools 24.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/24.0.3", @@ -16851,7 +17069,7 @@ } }, "displayName": "Android SDK Build-Tools 25", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.0", @@ -16899,7 +17117,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.1", @@ -16947,7 +17165,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.2", @@ -16995,7 +17213,7 @@ } }, "displayName": "Android SDK Build-Tools 25.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/25.0.3", @@ -17043,7 +17261,7 @@ } }, "displayName": "Android SDK Build-Tools 26", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.0", @@ -17091,7 +17309,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.1", @@ -17139,7 +17357,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.2", @@ -17187,7 +17405,7 @@ } }, "displayName": "Android SDK Build-Tools 26.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/26.0.3", @@ -17235,7 +17453,7 @@ } }, "displayName": "Android SDK Build-Tools 27", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.0", @@ -17283,7 +17501,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.1", @@ -17331,7 +17549,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.2", @@ -17379,7 +17597,7 @@ } }, "displayName": "Android SDK Build-Tools 27.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/27.0.3", @@ -17427,7 +17645,7 @@ } }, "displayName": "Android SDK Build-Tools 28", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.0", @@ -17475,7 +17693,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -17525,7 +17743,7 @@ } }, "displayName": "Android SDK Build-Tools 28-rc2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -17575,7 +17793,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.1", @@ -17623,7 +17841,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.2", @@ -17671,7 +17889,7 @@ } }, "displayName": "Android SDK Build-Tools 28.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/28.0.3", @@ -17719,7 +17937,7 @@ } }, "displayName": "Android SDK Build-Tools 29", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.0", @@ -17767,7 +17985,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -17817,7 +18035,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -17867,7 +18085,7 @@ } }, "displayName": "Android SDK Build-Tools 29-rc3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "obsolete": "true", @@ -17917,7 +18135,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.1", @@ -17965,7 +18183,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.2", @@ -18013,7 +18231,7 @@ } }, "displayName": "Android SDK Build-Tools 29.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/29.0.3", @@ -18061,7 +18279,7 @@ } }, "displayName": "Android SDK Build-Tools 30", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.0", @@ -18109,7 +18327,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.1", @@ -18157,7 +18375,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.2", @@ -18205,7 +18423,7 @@ } }, "displayName": "Android SDK Build-Tools 30.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/30.0.3", @@ -18246,7 +18464,7 @@ } ], "displayName": "Android SDK Build-Tools 31", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/31.0.0", @@ -18287,7 +18505,7 @@ } ], "displayName": "Android SDK Build-Tools 32", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/32.0.0", @@ -18328,7 +18546,7 @@ } ], "displayName": "Android SDK Build-Tools 32.1-rc1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/32.1.0-rc1", @@ -18370,7 +18588,7 @@ } ], "displayName": "Android SDK Build-Tools 33", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.0", @@ -18411,7 +18629,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.1", @@ -18452,7 +18670,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.2", @@ -18493,7 +18711,7 @@ } ], "displayName": "Android SDK Build-Tools 33.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/33.0.3", @@ -18534,7 +18752,7 @@ } ], "displayName": "Android SDK Build-Tools 34", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/34.0.0", @@ -18575,7 +18793,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc1", @@ -18617,7 +18835,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc2", @@ -18659,7 +18877,7 @@ } ], "displayName": "Android SDK Build-Tools 34-rc3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/34.0.0-rc3", @@ -18701,7 +18919,7 @@ } ], "displayName": "Android SDK Build-Tools 35", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/35.0.0", @@ -18742,7 +18960,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc1", @@ -18784,7 +19002,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc2", @@ -18826,7 +19044,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc3", @@ -18868,7 +19086,7 @@ } ], "displayName": "Android SDK Build-Tools 35-rc4", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/35.0.0-rc4", @@ -18910,7 +19128,7 @@ } ], "displayName": "Android SDK Build-Tools 35.0.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/35.0.1", @@ -18951,7 +19169,7 @@ } ], "displayName": "Android SDK Build-Tools 36", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/36.0.0", @@ -18992,7 +19210,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc1", @@ -19034,7 +19252,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc3", @@ -19076,7 +19294,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc4", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc4", @@ -19118,7 +19336,7 @@ } ], "displayName": "Android SDK Build-Tools 36-rc5", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.0.0-rc5", @@ -19160,7 +19378,7 @@ } ], "displayName": "Android SDK Build-Tools 36.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/36.1.0", @@ -19201,7 +19419,7 @@ } ], "displayName": "Android SDK Build-Tools 36.1-rc1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/36.1.0-rc1", @@ -19243,7 +19461,7 @@ } ], "displayName": "Android SDK Build-Tools 37", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "build-tools", "path": "build-tools/37.0.0", @@ -19284,7 +19502,7 @@ } ], "displayName": "Android SDK Build-Tools 37-rc1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/37.0.0-rc1", @@ -19326,7 +19544,7 @@ } ], "displayName": "Android SDK Build-Tools 37-rc2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "build-tools", "path": "build-tools/37.0.0-rc2", @@ -19377,7 +19595,7 @@ } ], "displayName": "CMake 3.10.2.4988404", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.10.2.4988404", @@ -19418,7 +19636,7 @@ } ], "displayName": "CMake 3.18.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.18.1", @@ -19459,7 +19677,7 @@ } ], "displayName": "CMake 3.22.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.22.1", @@ -19500,7 +19718,7 @@ } ], "displayName": "CMake 3.30.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.3", @@ -19541,7 +19759,7 @@ } ], "displayName": "CMake 3.30.4", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.4", @@ -19582,7 +19800,7 @@ } ], "displayName": "CMake 3.30.5", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.30.5", @@ -19623,7 +19841,7 @@ } ], "displayName": "CMake 3.31.0", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.0", @@ -19664,7 +19882,7 @@ } ], "displayName": "CMake 3.31.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.1", @@ -19705,7 +19923,7 @@ } ], "displayName": "CMake 3.31.4", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.4", @@ -19746,7 +19964,7 @@ } ], "displayName": "CMake 3.31.5", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.5", @@ -19787,7 +20005,7 @@ } ], "displayName": "CMake 3.31.6", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.31.6", @@ -19835,7 +20053,7 @@ } ], "displayName": "CMake 3.6.4111459", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/3.6.4111459", @@ -19876,7 +20094,7 @@ } ], "displayName": "CMake 4.0.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/4.0.2", @@ -19917,7 +20135,7 @@ } ], "displayName": "CMake 4.0.3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/4.0.3", @@ -19958,7 +20176,7 @@ } ], "displayName": "CMake 4.1.0", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/4.1.0", @@ -19999,7 +20217,7 @@ } ], "displayName": "CMake 4.1.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/4.1.1", @@ -20040,7 +20258,7 @@ } ], "displayName": "CMake 4.1.2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmake", "path": "cmake/4.1.2", @@ -20083,7 +20301,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/1.0", @@ -20123,7 +20341,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/10.0", @@ -20163,7 +20381,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/11.0", @@ -20203,7 +20421,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/12.0", @@ -20243,7 +20461,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0", @@ -20283,7 +20501,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/13.0-rc01", @@ -20324,7 +20542,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/14.0-alpha01", @@ -20365,7 +20583,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/16.0", @@ -20405,7 +20623,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/16.0-alpha01", @@ -20446,7 +20664,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/17.0", @@ -20486,7 +20704,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/19.0", @@ -20526,7 +20744,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "cmdline-tools", "path": "cmdline-tools/19.0-alpha01", @@ -20567,7 +20785,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "obsolete": "true", @@ -20608,7 +20826,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/2.1", @@ -20648,7 +20866,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/20.0", @@ -20688,7 +20906,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/21.0", @@ -20728,7 +20946,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/3.0", @@ -20768,7 +20986,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/4.0", @@ -20808,7 +21026,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/5.0", @@ -20848,7 +21066,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/6.0", @@ -20888,7 +21106,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/7.0", @@ -20928,7 +21146,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/8.0", @@ -20968,7 +21186,7 @@ } ], "displayName": "Android SDK Command-line Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "cmdline-tools", "path": "cmdline-tools/9.0", @@ -22331,7 +22549,7 @@ } ], "displayName": "Android Emulator", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "emulator", "path": "emulator", @@ -22682,6 +22900,54 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "37.1.7": { + "archives": [ + { + "arch": "x64", + "os": "linux", + "sha1": "0bed8aa5972eb1e1a4fc2b24faea46ebd160459f", + "size": 346483673, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-15769812.zip" + }, + { + "arch": "x64", + "os": "macosx", + "sha1": "40e8e131255e7b2ead0fe6529ce23fd82485eea5", + "size": 477449117, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-15769812.zip" + }, + { + "arch": "aarch64", + "os": "macosx", + "sha1": "d4974d38cc05cd13b67d48994591ff69b9b2ce56", + "size": 405381417, + "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-15769812.zip" + }, + { + "arch": "x64", + "os": "windows", + "sha1": "33f49b34be3a1863cee42cf2abfd2b113ad4d897", + "size": 452935068, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-15769812.zip" + } + ], + "displayName": "Android Emulator", + "last-available-day": 20647, + "license": "android-sdk-preview-license", + "name": "emulator", + "path": "emulator", + "revision": "37.1.7", + "revision-details": { + "major:0": "37", + "micro:2": "7", + "minor:1": "1" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "extras": { @@ -22807,7 +23073,7 @@ } }, "displayName": "NDK (Side by side) 16.1.4479499", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/16.1.4479499", @@ -22869,7 +23135,7 @@ } }, "displayName": "NDK (Side by side) 17.2.4988734", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/17.2.4988734", @@ -22931,7 +23197,7 @@ } }, "displayName": "NDK (Side by side) 18.1.5063045", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/18.1.5063045", @@ -22993,7 +23259,7 @@ } }, "displayName": "NDK (Side by side) 19.0.5232133", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "obsolete": "true", @@ -23056,7 +23322,7 @@ } }, "displayName": "NDK (Side by side) 19.2.5345600", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/19.2.5345600", @@ -23118,7 +23384,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5392854", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -23182,7 +23448,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5471264", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "obsolete": "true", @@ -23246,7 +23512,7 @@ } }, "displayName": "NDK (Side by side) 20.0.5594570", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.0.5594570", @@ -23308,7 +23574,7 @@ } }, "displayName": "NDK (Side by side) 20.1.5948944", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/20.1.5948944", @@ -23356,7 +23622,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6011959", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.0.6011959", @@ -23405,7 +23671,7 @@ } }, "displayName": "NDK (Side by side) 21.0.6113669", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.0.6113669", @@ -23453,7 +23719,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6210238", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6210238", @@ -23509,7 +23775,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6273396", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6273396", @@ -23565,7 +23831,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6352462", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.1.6352462", @@ -23620,7 +23886,7 @@ } }, "displayName": "NDK (Side by side) 21.1.6363665", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/21.1.6363665", @@ -23676,7 +23942,7 @@ } }, "displayName": "NDK (Side by side) 21.2.6472646", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.2.6472646", @@ -23731,7 +23997,7 @@ } }, "displayName": "NDK (Side by side) 21.3.6528147", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.3.6528147", @@ -23786,7 +24052,7 @@ } }, "displayName": "NDK (Side by side) 21.4.7075529", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/21.4.7075529", @@ -23841,7 +24107,7 @@ } }, "displayName": "NDK (Side by side) 22.0.6917172", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/22.0.6917172", @@ -23897,7 +24163,7 @@ } }, "displayName": "NDK (Side by side) 22.0.7026061", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.0.7026061", @@ -23952,7 +24218,7 @@ } }, "displayName": "NDK (Side by side) 22.1.7171670", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/22.1.7171670", @@ -24007,7 +24273,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7123448", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7123448", @@ -24063,7 +24329,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7196353", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7196353", @@ -24119,7 +24385,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7272597", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7272597", @@ -24175,7 +24441,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7344513", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7344513", @@ -24224,7 +24490,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7421159", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7421159", @@ -24273,7 +24539,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7530507", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/23.0.7530507", @@ -24322,7 +24588,7 @@ } }, "displayName": "NDK (Side by side) 23.0.7599858", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.0.7599858", @@ -24370,7 +24636,7 @@ } }, "displayName": "NDK (Side by side) 23.1.7779620", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.1.7779620", @@ -24418,7 +24684,7 @@ } }, "displayName": "NDK (Side by side) 23.2.8568313", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/23.2.8568313", @@ -24466,7 +24732,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7856742", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7856742", @@ -24515,7 +24781,7 @@ } }, "displayName": "NDK (Side by side) 24.0.7956693", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.7956693", @@ -24564,7 +24830,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8079956", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/24.0.8079956", @@ -24613,7 +24879,7 @@ } }, "displayName": "NDK (Side by side) 24.0.8215888", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/24.0.8215888", @@ -24661,7 +24927,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8151533", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8151533", @@ -24710,7 +24976,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8221429", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8221429", @@ -24759,7 +25025,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8355429", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8355429", @@ -24808,7 +25074,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8528842", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/25.0.8528842", @@ -24857,7 +25123,7 @@ } }, "displayName": "NDK (Side by side) 25.0.8775105", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.0.8775105", @@ -24905,7 +25171,7 @@ } }, "displayName": "NDK (Side by side) 25.1.8937393", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.1.8937393", @@ -24953,7 +25219,7 @@ } }, "displayName": "NDK (Side by side) 25.2.9519653", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/25.2.9519653", @@ -25001,7 +25267,7 @@ } }, "displayName": "NDK (Side by side) 26.0.10404224", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10404224", @@ -25043,7 +25309,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10636728", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/26.0.10636728", @@ -25085,7 +25351,7 @@ } ], "displayName": "NDK (Side by side) 26.0.10792818", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.0.10792818", @@ -25126,7 +25392,7 @@ } ], "displayName": "NDK (Side by side) 26.1.10909125", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.1.10909125", @@ -25167,7 +25433,7 @@ } ], "displayName": "NDK (Side by side) 26.2.11394342", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.2.11394342", @@ -25208,7 +25474,7 @@ } ], "displayName": "NDK (Side by side) 26.3.11579264", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/26.3.11579264", @@ -25249,7 +25515,7 @@ } ], "displayName": "NDK (Side by side) 27.0.11718014", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/27.0.11718014", @@ -25291,7 +25557,7 @@ } ], "displayName": "NDK (Side by side) 27.0.11902837", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/27.0.11902837", @@ -25333,7 +25599,7 @@ } ], "displayName": "NDK (Side by side) 27.0.12077973", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.0.12077973", @@ -25374,7 +25640,7 @@ } ], "displayName": "NDK (Side by side) 27.1.12297006", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.1.12297006", @@ -25415,7 +25681,7 @@ } ], "displayName": "NDK (Side by side) 27.2.12479018", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.2.12479018", @@ -25456,7 +25722,7 @@ } ], "displayName": "NDK (Side by side) 27.3.13750724", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/27.3.13750724", @@ -25497,7 +25763,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12433566", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12433566", @@ -25539,7 +25805,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12674087", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12674087", @@ -25581,7 +25847,7 @@ } ], "displayName": "NDK (Side by side) 28.0.12916984", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/28.0.12916984", @@ -25623,7 +25889,7 @@ } ], "displayName": "NDK (Side by side) 28.0.13004108", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/28.0.13004108", @@ -25664,7 +25930,7 @@ } ], "displayName": "NDK (Side by side) 28.1.13356709", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/28.1.13356709", @@ -25705,7 +25971,7 @@ } ], "displayName": "NDK (Side by side) 28.2.13676358", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/28.2.13676358", @@ -25746,7 +26012,7 @@ } ], "displayName": "NDK (Side by side) 29.0.13113456", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/29.0.13113456", @@ -25788,7 +26054,7 @@ } ], "displayName": "NDK (Side by side) 29.0.13599879", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/29.0.13599879", @@ -25830,7 +26096,7 @@ } ], "displayName": "NDK (Side by side) 29.0.13846066", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/29.0.13846066", @@ -25872,7 +26138,7 @@ } ], "displayName": "NDK (Side by side) 29.0.14033849", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/29.0.14033849", @@ -25914,7 +26180,7 @@ } ], "displayName": "NDK (Side by side) 29.0.14206865", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk", "path": "ndk/29.0.14206865", @@ -25955,7 +26221,7 @@ } ], "displayName": "NDK (Side by side) 30.0.14904198", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk", "path": "ndk/30.0.14904198", @@ -25971,6 +26237,48 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "30.0.15729638-rc2": { + "archives": [ + { + "arch": "all", + "os": "linux", + "sha1": "069427047d18cc6e44369cd7b8e711bfc2c7a3b5", + "size": 737229785, + "url": "https://dl.google.com/android/repository/android-ndk-r30-beta2-linux.zip" + }, + { + "arch": "all", + "os": "macosx", + "sha1": "8742eb5075240884f74ed29ccd99d7a1f6852a6b", + "size": 973958817, + "url": "https://dl.google.com/android/repository/android-ndk-r30-beta2-darwin.zip" + }, + { + "arch": "all", + "os": "windows", + "sha1": "5b5e308db4cfd7a51f5524f464dedec20682b5ed", + "size": 727029070, + "url": "https://dl.google.com/android/repository/android-ndk-r30-beta2-windows.zip" + } + ], + "displayName": "NDK (Side by side) 30.0.15729638", + "last-available-day": 20647, + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/30.0.15729638", + "revision": "30.0.15729638-rc2", + "revision-details": { + "major:0": "30", + "micro:2": "15729638", + "minor:1": "0", + "preview:3": "2" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "ndk-bundle": { @@ -26020,7 +26328,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26082,7 +26390,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26144,7 +26452,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26206,7 +26514,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "obsolete": "true", @@ -26269,7 +26577,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26331,7 +26639,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -26395,7 +26703,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "obsolete": "true", @@ -26459,7 +26767,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26521,7 +26829,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26569,7 +26877,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26618,7 +26926,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26666,7 +26974,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26722,7 +27030,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26778,7 +27086,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26833,7 +27141,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26889,7 +27197,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26944,7 +27252,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -26999,7 +27307,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -27054,7 +27362,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -27110,7 +27418,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -27165,7 +27473,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -27220,7 +27528,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -27276,7 +27584,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -27332,7 +27640,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -27388,7 +27696,7 @@ } }, "displayName": "NDK", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-preview-license", "name": "ndk-bundle", "path": "ndk-bundle", @@ -27597,7 +27905,7 @@ } ], "displayName": "Android SDK Platform-Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", @@ -27612,6 +27920,47 @@ "xsi:type": "ns5:genericDetailsType" } } + }, + "37.0.1": { + "archives": [ + { + "arch": "all", + "os": "linux", + "sha1": "477254aa5f903c15cf51001717bdf347fb6b53e0", + "size": 9054187, + "url": "https://dl.google.com/android/repository/platform-tools_r37.0.1-linux.zip" + }, + { + "arch": "all", + "os": "macosx", + "sha1": "a5d4918c3ccf58e1ca443d106411fe0ff8a6b83f", + "size": 16110598, + "url": "https://dl.google.com/android/repository/platform-tools_r37.0.1-darwin.zip" + }, + { + "arch": "all", + "os": "windows", + "sha1": "10f2ef5325bc5705d48d38a0aa900c7babda24fa", + "size": 8044994, + "url": "https://dl.google.com/android/repository/platform-tools_r37.0.1-win.zip" + } + ], + "displayName": "Android SDK Platform-Tools", + "last-available-day": 20647, + "license": "android-sdk-preview-license", + "name": "platform-tools", + "path": "platform-tools", + "revision": "37.0.1", + "revision-details": { + "major:0": "37", + "micro:2": "1", + "minor:1": "0" + }, + "type-details": { + "element-attributes": { + "xsi:type": "ns5:genericDetailsType" + } + } } }, "platforms": { @@ -27626,7 +27975,7 @@ } ], "displayName": "Android SDK Platform 10", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-10", @@ -27664,7 +28013,7 @@ } ], "displayName": "Android SDK Platform 11", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-11", @@ -27702,7 +28051,7 @@ } ], "displayName": "Android SDK Platform 12", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-12", @@ -27740,7 +28089,7 @@ } ], "displayName": "Android SDK Platform 13", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-13", @@ -27778,7 +28127,7 @@ } ], "displayName": "Android SDK Platform 14", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-14", @@ -27816,7 +28165,7 @@ } ], "displayName": "Android SDK Platform 15", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-15", @@ -27854,7 +28203,7 @@ } ], "displayName": "Android SDK Platform 16", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-16", @@ -27892,7 +28241,7 @@ } ], "displayName": "Android SDK Platform 17", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-17", @@ -27930,7 +28279,7 @@ } ], "displayName": "Android SDK Platform 18", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-18", @@ -27968,7 +28317,7 @@ } ], "displayName": "Android SDK Platform 19", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-19", @@ -28020,7 +28369,7 @@ } ], "displayName": "Android SDK Platform 2", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -28059,7 +28408,7 @@ } ], "displayName": "Android SDK Platform 20", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-20", @@ -28097,7 +28446,7 @@ } ], "displayName": "Android SDK Platform 21", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-21", @@ -28135,7 +28484,7 @@ } ], "displayName": "Android SDK Platform 22", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-22", @@ -28173,7 +28522,7 @@ } ], "displayName": "Android SDK Platform 23", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-23", @@ -28211,7 +28560,7 @@ } ], "displayName": "Android SDK Platform 24", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-24", @@ -28249,7 +28598,7 @@ } ], "displayName": "Android SDK Platform 25", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-25", @@ -28287,7 +28636,7 @@ } ], "displayName": "Android SDK Platform 26", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-26", @@ -28325,7 +28674,7 @@ } ], "displayName": "Android SDK Platform 27", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-27", @@ -28363,7 +28712,7 @@ } ], "displayName": "Android SDK Platform 28", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-28", @@ -28401,7 +28750,7 @@ } ], "displayName": "Android SDK Platform 29", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-29", @@ -28453,7 +28802,7 @@ } ], "displayName": "Android SDK Platform 3", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -28492,7 +28841,7 @@ } ], "displayName": "Android SDK Platform 30", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-30", @@ -28530,7 +28879,7 @@ } ], "displayName": "Android SDK Platform 31", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-31", @@ -28568,7 +28917,7 @@ } ], "displayName": "Android SDK Platform 32", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-32", @@ -28606,7 +28955,7 @@ } ], "displayName": "Android SDK Platform 33", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33", @@ -28645,7 +28994,7 @@ } ], "displayName": "Android SDK Platform 33-ext5", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-33-ext5", @@ -28679,7 +29028,7 @@ } ], "displayName": "Android SDK Platform 34", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -28724,7 +29073,7 @@ } ], "displayName": "Android SDK Platform 34-ext12", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-34-ext12", @@ -28757,7 +29106,7 @@ } ], "displayName": "Android SDK Platform 35", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-35", @@ -28795,7 +29144,7 @@ } ], "displayName": "Android SDK Platform 35-ext15", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-35-ext15", @@ -28828,7 +29177,7 @@ } ], "displayName": "Android SDK Platform 36", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-36", @@ -28861,7 +29210,7 @@ } ], "displayName": "Android SDK Platform 36.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-36.1", @@ -28894,7 +29243,7 @@ } ], "displayName": "Android SDK Platform 36-ext19", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-36-ext19", @@ -28927,7 +29276,7 @@ } ], "displayName": "Android SDK Platform 37.0", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-37.0", @@ -28950,6 +29299,40 @@ } } }, + "37.1": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "62aeba1ec09c2b1fdf888e79549daf678fa0d75f", + "size": 67500655, + "url": "https://dl.google.com/android/repository/platform-37.1_r01.zip" + } + ], + "displayName": "Android SDK Platform 37.1", + "last-available-day": 20647, + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-37.1", + "revision": "37.1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "37.1", + "base-extension:3": "true", + "codename:1": {}, + "element-attributes": { + "xsi:type": "ns11:platformDetailsType" + }, + "extension-level:2": "23", + "layoutlib:4": { + "element-attributes": { + "api": "15" + } + } + } + }, "4": { "archives": [ { @@ -28975,7 +29358,7 @@ } ], "displayName": "Android SDK Platform 4", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -29028,7 +29411,7 @@ } ], "displayName": "Android SDK Platform 5", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -29081,7 +29464,7 @@ } ], "displayName": "Android SDK Platform 6", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -29120,7 +29503,7 @@ } ], "displayName": "Android SDK Platform 7", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-7", @@ -29158,7 +29541,7 @@ } ], "displayName": "Android SDK Platform 8", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-8", @@ -29196,7 +29579,7 @@ } ], "displayName": "Android SDK Platform 9", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-9", @@ -29262,19 +29645,19 @@ { "arch": "all", "os": "all", - "sha1": "755b48c64c9ad32dee09d164e872c129ada2abdd", - "size": 67599805, - "url": "https://dl.google.com/android/repository/platform-CANARY_r13.zip" + "sha1": "579bed8e6d9f9759efbf10dfc93c876bb226bdee", + "size": 67761167, + "url": "https://dl.google.com/android/repository/platform-CANARY_r14.zip" } ], "displayName": "Android SDK Platform CANARY", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-CANARY", "revision": "CANARY", "revision-details": { - "major:0": "13" + "major:0": "14" }, "type-details": { "api-level:0": "37.1", @@ -29296,13 +29679,13 @@ { "arch": "all", "os": "all", - "sha1": "185c1c48b6b9abd402200cb3d9629b4323e1c4fc", - "size": 67477798, - "url": "https://dl.google.com/android/repository/platform-CinnamonBun_r04.zip" + "sha1": "e2b204742c79147f694281af9e30fa8d8b7e96eb", + "size": 67558105, + "url": "https://dl.google.com/android/repository/platform-CinnamonBun_r05.zip" } ], "displayName": "Android SDK Platform CinnamonBun-ext23", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "path": "platforms/android-CinnamonBun-ext23", @@ -29367,7 +29750,7 @@ } ], "displayName": "Android SDK Platform UpsideDownCake", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "platforms", "obsolete": "true", @@ -29485,7 +29868,7 @@ } ], "displayName": "Layout Inspector image server for API S", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/2", @@ -29606,7 +29989,7 @@ } ], "displayName": "Layout Inspector image server for API 29-30", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/1", @@ -29698,7 +30081,7 @@ } ], "displayName": "Layout Inspector image server for API 31-36", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "skiaparser", "path": "skiaparser/3", @@ -29725,7 +30108,7 @@ } ], "displayName": "Sources for Android 14", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "obsolete": "true", @@ -29754,7 +30137,7 @@ } ], "displayName": "Sources for Android 15", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-15", @@ -29782,7 +30165,7 @@ } ], "displayName": "Sources for Android 16", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-16", @@ -29810,7 +30193,7 @@ } ], "displayName": "Sources for Android 17", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-17", @@ -29838,7 +30221,7 @@ } ], "displayName": "Sources for Android 18", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-18", @@ -29866,7 +30249,7 @@ } ], "displayName": "Sources for Android 19", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-19", @@ -29894,7 +30277,7 @@ } ], "displayName": "Sources for Android 20", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-20", @@ -29922,7 +30305,7 @@ } ], "displayName": "Sources for Android 21", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-21", @@ -29950,7 +30333,7 @@ } ], "displayName": "Sources for Android 22", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-22", @@ -29978,7 +30361,7 @@ } ], "displayName": "Sources for Android 23", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-23", @@ -30006,7 +30389,7 @@ } ], "displayName": "Sources for Android 24", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-24", @@ -30034,7 +30417,7 @@ } ], "displayName": "Sources for Android 25", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-25", @@ -30062,7 +30445,7 @@ } ], "displayName": "Sources for Android 26", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-26", @@ -30090,7 +30473,7 @@ } ], "displayName": "Sources for Android 27", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-27", @@ -30118,7 +30501,7 @@ } ], "displayName": "Sources for Android 28", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-28", @@ -30146,7 +30529,7 @@ } ], "displayName": "Sources for Android 29", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-29", @@ -30174,7 +30557,7 @@ } ], "displayName": "Sources for Android 30", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-30", @@ -30202,7 +30585,7 @@ } ], "displayName": "Sources for Android 31", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-31", @@ -30230,7 +30613,7 @@ } ], "displayName": "Sources for Android 32", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-32", @@ -30258,7 +30641,7 @@ } ], "displayName": "Sources for Android 33", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-33", @@ -30287,7 +30670,7 @@ } ], "displayName": "Sources for Android 34", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-34", @@ -30316,7 +30699,7 @@ } ], "displayName": "Sources for Android 35", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-35", @@ -30345,7 +30728,7 @@ } ], "displayName": "Sources for Android 36", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-36", @@ -30373,7 +30756,7 @@ } ], "displayName": "Sources for Android 36.1", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-36.1", @@ -30401,7 +30784,7 @@ } ], "displayName": "Sources for Android 37.0", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "sources", "path": "sources/android-37.0", @@ -30418,6 +30801,35 @@ }, "extension-level:2": "22" } + }, + "37.1": { + "archives": [ + { + "arch": "all", + "os": "all", + "sha1": "d1bb191997a96b334526470f630fcb74a80abd7c", + "size": 53339267, + "url": "https://dl.google.com/android/repository/source-37.1_r01.zip" + } + ], + "displayName": "Sources for Android 37.1", + "last-available-day": 20647, + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-37.1", + "revision": "37.1", + "revision-details": { + "major:0": "1" + }, + "type-details": { + "api-level:0": "37.1", + "base-extension:3": "true", + "codename:1": {}, + "element-attributes": { + "xsi:type": "ns11:sourceDetailsType" + }, + "extension-level:2": "23" + } } }, "tools": { @@ -30469,7 +30881,7 @@ } }, "displayName": "Android SDK Tools", - "last-available-day": 20621, + "last-available-day": 20647, "license": "android-sdk-license", "name": "tools", "obsolete": "true", diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index dc7f13cbcb5a..29cd59bbb01c 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -9,19 +9,15 @@ buildDunePackage (finalAttrs: { pname = "pyml"; - version = "20231101"; + version = "20250807"; src = fetchFromGitHub { owner = "ocamllibs"; repo = "pyml"; tag = finalAttrs.version; - hash = "sha256-0Yy5T/S3Npwt0XJmEsdXGg5AXYi9vV9UG9nMSzz/CEc="; + hash = "sha256-WPtmj9EEs7P72OXWJg1syIrbLuh7u4V4W4nyozXmSa0="; }; - patches = [ - ./remove-stdcompat.patch - ]; - buildInputs = [ utop ]; @@ -37,6 +33,7 @@ buildDunePackage (finalAttrs: { ]; strictDeps = true; + __structuredAttrs = true; doCheck = true; diff --git a/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch b/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch deleted file mode 100644 index 5d8bdb739f59..000000000000 --- a/pkgs/development/ocaml-modules/pyml/remove-stdcompat.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/pyml_stubs.c b/pyml_stubs.c -index 40e3481..e7826f1 100644 ---- a/pyml_stubs.c -+++ b/pyml_stubs.c -@@ -11,7 +11,6 @@ - #include - #include - #include --#include - #include - #include "pyml_stubs.h" diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index af07486905c7..fdec0666c2b9 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.43.45"; + version = "1.43.46"; pyproject = true; src = fetchPypi { pname = "boto3_stubs"; inherit (finalAttrs) version; - hash = "sha256-ln1dK7msfiTyyov5D2RsLePOUgfkVyP7eU8C1I+ibkg="; + hash = "sha256-dlHkPTCFXU3WqNqVSapQvlAOqnMBqfG+itIHkc4jbxw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/bytecode/default.nix b/pkgs/development/python-modules/bytecode/default.nix index 7911b9156a40..5f803209905e 100644 --- a/pkgs/development/python-modules/bytecode/default.nix +++ b/pkgs/development/python-modules/bytecode/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "bytecode"; - version = "0.17.0"; + version = "0.18.1"; pyproject = true; src = fetchFromGitHub { - owner = "vstinner"; + owner = "MatthieuDartiailh"; repo = "bytecode"; tag = version; - hash = "sha256-AocS5Z4WkHTR+nO5/4B7oV/fb/ASG0aGrG/722Ioup0="; + hash = "sha256-hjPjF7xC7v2dZ6espAcru2sb7/6AEb3D1MYO0ekzJds="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/caido-schema-proxy/default.nix b/pkgs/development/python-modules/caido-schema-proxy/default.nix index 5a0d647b5adf..9c82d272be34 100644 --- a/pkgs/development/python-modules/caido-schema-proxy/default.nix +++ b/pkgs/development/python-modules/caido-schema-proxy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage (finalAttrs: { pname = "caido-schema-proxy"; - version = "0.57.0"; + version = "0.57.1"; pyproject = true; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "caido_schema_proxy"; inherit (finalAttrs) version; - hash = "sha256-5hholzMKrNuJZUZIvg+phProD8OZ/YB0ZSGReGa2IqU="; + hash = "sha256-gIElEhHnMDfz6hu0UTOtTiYaB/ZnfeBCskEWTM9419M="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/ckzg/default.nix b/pkgs/development/python-modules/ckzg/default.nix index 8a52ba6083fb..27bca517401f 100644 --- a/pkgs/development/python-modules/ckzg/default.nix +++ b/pkgs/development/python-modules/ckzg/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ckzg"; - version = "2.1.7"; + version = "2.1.8"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "c-kzg-4844"; tag = "v${version}"; - hash = "sha256-T2EdLKEyyTM3/Ro5UfdGu3mNZKz0nk15pmBSGZplA+M="; + hash = "sha256-i7m1oFQ4WmY+TfETfQuznvQINt6+JfWztoRFnI/pV/s="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/cleanit/default.nix b/pkgs/development/python-modules/cleanit/default.nix index 8e75a5d3c140..cd7845b5750c 100644 --- a/pkgs/development/python-modules/cleanit/default.nix +++ b/pkgs/development/python-modules/cleanit/default.nix @@ -43,10 +43,7 @@ buildPythonPackage rec { pyyaml ]; - pythonRelaxDeps = [ - "click" - "jsonschema" - ]; + pythonRelaxDeps = [ "chardet" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/courlan/default.nix b/pkgs/development/python-modules/courlan/default.nix index d3e63da7213b..86da2f43e917 100644 --- a/pkgs/development/python-modules/courlan/default.nix +++ b/pkgs/development/python-modules/courlan/default.nix @@ -39,7 +39,7 @@ buildPythonPackage (finalAttrs: { substituteInPlace tests/unit_tests.py \ --replace-fail \ 'assert os.system("courlan --help") == 0' \ - 'assert os.system("${courlanBinPath} --help") == 0' \ + 'assert subprocess.run(["${courlanBinPath}", "--help"]).returncode == 0' \ --replace-fail \ 'courlan_bin = "courlan"' \ 'courlan_bin = "${courlanBinPath}"' diff --git a/pkgs/development/python-modules/cssbeautifier/default.nix b/pkgs/development/python-modules/cssbeautifier/default.nix index b3c2267f95aa..65533d884fa0 100644 --- a/pkgs/development/python-modules/cssbeautifier/default.nix +++ b/pkgs/development/python-modules/cssbeautifier/default.nix @@ -5,17 +5,16 @@ fetchPypi, jsbeautifier, setuptools, - six, }: buildPythonPackage rec { pname = "cssbeautifier"; - version = "1.15.4"; + version = "2.0.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-m7CNw/ZMEBoBZ38Sis8BkFkUz0Brr4dDTc3gW3TArPU="; + hash = "sha256-9hAsBYnIW+PBoBbO527jZh7kvV2ojUil+HCL+vZjriY="; }; nativeBuildInputs = [ setuptools ]; @@ -23,7 +22,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ editorconfig jsbeautifier - six ]; # Module has no tests diff --git a/pkgs/development/python-modules/denon-rs232/default.nix b/pkgs/development/python-modules/denon-rs232/default.nix index 29a4a1d369a0..c091da9c33f6 100644 --- a/pkgs/development/python-modules/denon-rs232/default.nix +++ b/pkgs/development/python-modules/denon-rs232/default.nix @@ -12,7 +12,7 @@ buildPythonPackage (finalAttrs: { pname = "denon-rs232"; - version = "4.2.0"; + version = "4.2.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: { owner = "home-assistant-libs"; repo = "denon-rs232"; tag = finalAttrs.version; - hash = "sha256-1GVpF4aOQ8Zzu/abghRF8WJXF+9DP+1suA0F3hy8NSo="; + hash = "sha256-3EFV/lDUWylQBpiOf5gHX+8J9qW8mMTvr1xET27salo="; }; build-system = [ uv-build ]; diff --git a/pkgs/development/python-modules/exa-py/default.nix b/pkgs/development/python-modules/exa-py/default.nix index ba44908b4516..50a210291523 100644 --- a/pkgs/development/python-modules/exa-py/default.nix +++ b/pkgs/development/python-modules/exa-py/default.nix @@ -24,7 +24,7 @@ buildPythonPackage (finalAttrs: { pname = "exa-py"; - version = "2.14.0"; + version = "2.16.1"; pyproject = true; __structuredAttrs = true; @@ -33,7 +33,7 @@ buildPythonPackage (finalAttrs: { owner = "exa-labs"; repo = "exa-py"; tag = "v${finalAttrs.version}"; - hash = "sha256-pL5d79KdKlfv4l/M7PF8fs0gUEk4DYEKPm8PJ+pwFMc="; + hash = "sha256-zMQAPJnIHA7PiHCoPf0/iPrTEsctnM8cQBY2fVpDpjo="; }; build-system = [ diff --git a/pkgs/development/python-modules/functions-framework/default.nix b/pkgs/development/python-modules/functions-framework/default.nix index fa7b692b6a71..57ebbfffc618 100644 --- a/pkgs/development/python-modules/functions-framework/default.nix +++ b/pkgs/development/python-modules/functions-framework/default.nix @@ -30,14 +30,14 @@ buildPythonPackage (finalAttrs: { pname = "functions-framework"; - version = "3.10.1"; + version = "3.10.2"; pyproject = true; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "functions-framework-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-CEH0PokH3lhyJl7OPIpJkaKZxAUp1fYVia89DtGoJ7k="; + hash = "sha256-JiDerfEXlamZWzHxZaTJN/QFMXSph5YDtRsZM4hb4hs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/genai-prices/default.nix b/pkgs/development/python-modules/genai-prices/default.nix index 105f09245c32..2c87e8d7887f 100644 --- a/pkgs/development/python-modules/genai-prices/default.nix +++ b/pkgs/development/python-modules/genai-prices/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "genai-prices"; - version = "0.0.69"; + version = "0.0.71"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "genai-prices"; tag = "v${finalAttrs.version}"; - hash = "sha256-kXS8+GcrcDPGxfIej18wSn/DdBzgf3mjFo/1QIOGwVM="; + hash = "sha256-IFBdpXJ0AE3UNNqUlOrYMIgRGeB87BYbNqb4GvtJkl0="; }; sourceRoot = "${finalAttrs.src.name}/packages/python"; diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix index 9b216bc0cf79..de939ee1ad7c 100644 --- a/pkgs/development/python-modules/gguf/default.nix +++ b/pkgs/development/python-modules/gguf/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "gguf"; - version = "9775"; + version = "9967"; pyproject = true; src = fetchFromGitHub { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-y//hC8lpHjyFA3UK6hmcwkzb99xCZyZRMRILo+Y7Ap4="; + hash = "sha256-HgptebnnT3xOU26/UJCqQ6FSrhcoybju7SKUy4pLOKA="; }; sourceRoot = "${finalAttrs.src.name}/gguf-py"; diff --git a/pkgs/development/python-modules/gviz-api/default.nix b/pkgs/development/python-modules/gviz-api/default.nix index 6b14a04aa65b..8c27b6265436 100644 --- a/pkgs/development/python-modules/gviz-api/default.nix +++ b/pkgs/development/python-modules/gviz-api/default.nix @@ -2,21 +2,25 @@ lib, fetchPypi, buildPythonPackage, + setuptools, six, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gviz_api"; version = "1.10.0"; - format = "wheel"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; - format = "wheel"; - sha256 = "a05055fed8c279f34f4b496eace7648c7fe9c1b06851e8a36e748541f1adbb05"; + inherit (finalAttrs) pname version; + sha256 = "sha256-hGaS3YzHMiT8MbGOQVib2TThzAUJDGV2r0tLJsLnG5A="; }; - propagatedBuildInputs = [ six ]; + build-system = [ setuptools ]; + + dependencies = [ six ]; meta = { description = "Python API for Google Visualization"; @@ -24,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ndl ]; }; -} +}) diff --git a/pkgs/development/python-modules/ha-garmin/default.nix b/pkgs/development/python-modules/ha-garmin/default.nix index 761877013cf2..851ed4e831fc 100644 --- a/pkgs/development/python-modules/ha-garmin/default.nix +++ b/pkgs/development/python-modules/ha-garmin/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "ha-garmin"; - version = "0.1.27"; + version = "0.1.29"; pyproject = true; src = fetchFromGitHub { owner = "cyberjunky"; repo = "ha-garmin"; tag = "v${finalAttrs.version}"; - hash = "sha256-XbNXnwWoWWBZdmBjApX0SyouemCG+A9U6JSWn09OsTI="; + hash = "sha256-mny9QnmgRaCFZf4pExdIGDlljw6nSPhU8kB9rzSHymg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/helium/default.nix b/pkgs/development/python-modules/helium/default.nix index b2275f8e3cf4..99c0cf410cc4 100644 --- a/pkgs/development/python-modules/helium/default.nix +++ b/pkgs/development/python-modules/helium/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "helium"; - version = "7.0.2"; + version = "7.0.3"; pyproject = true; src = fetchFromGitHub { owner = "mherrmann"; repo = "helium"; tag = "v${finalAttrs.version}"; - hash = "sha256-phZ7vSwRVM7QutZuy7Krtp7gUCK+5bg0AZA5qXJSVNA="; + hash = "sha256-I3qLp3v6aIwGIelzNE5gRnvp/eHVPfzJijUxlT28Wqs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ida-hcli/default.nix b/pkgs/development/python-modules/ida-hcli/default.nix index aa8e33bf764b..a8ffdb60c9ec 100644 --- a/pkgs/development/python-modules/ida-hcli/default.nix +++ b/pkgs/development/python-modules/ida-hcli/default.nix @@ -27,7 +27,7 @@ buildPythonPackage (finalAttrs: { pname = "ida-hcli"; - version = "0.18.3"; + version = "0.18.5"; pyproject = true; __structuredAttrs = true; @@ -36,7 +36,7 @@ buildPythonPackage (finalAttrs: { owner = "HexRaysSA"; repo = "ida-hcli"; tag = "v${finalAttrs.version}"; - hash = "sha256-5ymjKms3qtprIwd81PpmXgewDi4jSLlblgD/9b8Kzt8="; + hash = "sha256-n8hLgVgxqaU7Au6HVgOEUKOm1LV3Wx/v42gi2gOD3Jk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index 39fc694fa546..92b1a6cca48f 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jq"; - version = "1.11.0"; + version = "1.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "mwilliamson"; repo = "jq.py"; tag = version; - hash = "sha256-v5Hi3SkLKX7KrCHiXDuEThSLghDU5VVhNGt1KpMEqC4="; + hash = "sha256-glWEqoS+QaoIiBJu9DXd+VvhPnWOgRT4VaYfMpjbR5g="; }; env.JQPY_USE_SYSTEM_LIBS = 1; diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 8160d59263e3..90f294daed3e 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: { pname = "kafka-python"; - version = "3.0.6"; + version = "3.0.8"; pyproject = true; __structuredAttrs = true; @@ -31,7 +31,7 @@ buildPythonPackage (finalAttrs: { owner = "dpkp"; repo = "kafka-python"; tag = finalAttrs.version; - hash = "sha256-Cw6Mm5xNoyZEAYxyjELlt5zlhjIt7PsdlN/RwtMkE4k="; + hash = "sha256-f/4RcR4vUn0odVdm+YASkqklYFMRHuwlyYln19w/WOs="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index ee42db423b63..ff9abeaf063a 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -8,15 +8,15 @@ qdrant-client, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-vector-stores-qdrant"; - version = "0.10.1"; + version = "0.10.2"; pyproject = true; src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; - inherit version; - hash = "sha256-/vTKhBHD4zY2qrz4g5Qf3nqdbeqkUlTugGJ/LQ/79VE="; + inherit (finalAttrs) version; + hash = "sha256-MSK2RJAce1jmFv2eftT9HsJgTGPxuFxdatRIIK8ym+I="; }; build-system = [ hatchling ]; @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 65f50ef39116..68f42550d2de 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -255,8 +255,8 @@ in "sha256-PVskBSuwqSfNybHDtLLfVpDG0dwR/Q1LhrHz1imsR8A="; mypy-boto3-cloudwatch = - buildMypyBoto3Package "cloudwatch" "1.43.38" - "sha256-3STwHJJpbVZa1ACznoyPLvYMpBGL7xxS1+5h0bx40+Y="; + buildMypyBoto3Package "cloudwatch" "1.43.46" + "sha256-xUMPa6CSx3wYLfGZMV05ulf2yX+p3ToM7aOd55U7AUE="; mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.43.0" @@ -443,8 +443,8 @@ in "sha256-dXNkOcMonYrBh4yzeubd+v3mW42s9XpmpfvgbtgoJgY="; mypy-boto3-ec2 = - buildMypyBoto3Package "ec2" "1.43.45" - "sha256-xT9yYnd7XfKbajmSfMOjaqYF7YnzwXOe1wtb5vy/wSI="; + buildMypyBoto3Package "ec2" "1.43.46" + "sha256-XDJPpDHlw2q0YJGM9SMsBd/Ww2JWiAsq+5xulibZCJs="; mypy-boto3-ec2-instance-connect = buildMypyBoto3Package "ec2-instance-connect" "1.43.0" @@ -622,8 +622,8 @@ in "sha256-9P8m5QYikdsimepaivrYcb/tP1iThyPZWFMkyo24+bo="; mypy-boto3-inspector2 = - buildMypyBoto3Package "inspector2" "1.43.42" - "sha256-MjSPOIJu0hdJ68eBwjppu/V+dM5pdAx+Ls7AiJY11Jo="; + buildMypyBoto3Package "inspector2" "1.43.46" + "sha256-pus2RROpJt39PoOX0OsK4GyU0qUcKVqRzuk039VEAM0="; mypy-boto3-internetmonitor = buildMypyBoto3Package "internetmonitor" "1.43.0" @@ -766,8 +766,8 @@ in "sha256-gYTCgaRwH3zKi6gg4MC8DUwXQT+jZO6lqc/vi+JUahU="; mypy-boto3-lambda = - buildMypyBoto3Package "lambda" "1.43.42" - "sha256-mLDdcUFNxg9ZjaL7HiGX6Dv0hEIFID8k+CLh9jq9TZs="; + buildMypyBoto3Package "lambda" "1.43.46" + "sha256-mM1VwviZXBkkjd5PBEpJKZSDCoyV6VH26erz78gJKSk="; mypy-boto3-lex-models = buildMypyBoto3Package "lex-models" "1.43.3" @@ -786,8 +786,8 @@ in "sha256-efpFIYAdYkvWBlj0tLsQagps6XJfO4XLjlfwKS2vi3s="; mypy-boto3-license-manager = - buildMypyBoto3Package "license-manager" "1.43.0" - "sha256-DGbHoepZkxN9ICxqnda/6mBJxiTH9X8gU/wT+xMGs3g="; + buildMypyBoto3Package "license-manager" "1.43.46" + "sha256-WYv6TjbNNEhrumvLT1QPBgaFUP/w4+7a5gY63n0tjmQ="; mypy-boto3-license-manager-linux-subscriptions = buildMypyBoto3Package "license-manager-linux-subscriptions" "1.43.0" @@ -1070,8 +1070,8 @@ in "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg="; mypy-boto3-quicksight = - buildMypyBoto3Package "quicksight" "1.43.39" - "sha256-xjqIi2ZTAZusw3FDL2AQx871Yg0VM++K32w+ht74F34="; + buildMypyBoto3Package "quicksight" "1.43.46" + "sha256-WmYr7ycG07ZhbhQL/DHVmiMl0/997F6Dt3P33624V5M="; mypy-boto3-ram = buildMypyBoto3Package "ram" "1.43.0" @@ -1170,8 +1170,8 @@ in "sha256-T+JIJpHxD7IzAwq8yxgq6zbVMj/btpbhKnylMyfFvvU="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.43.33" - "sha256-dTc7cVfvrRoCxP9rUBRYTw8UhQdges7IERfXSRXHxd0="; + buildMypyBoto3Package "sagemaker" "1.43.46" + "sha256-yBA9PXosbtOQVPoOTv6C2gfOf6SHkR/3oQosTugp6Is="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.43.0" diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix index 1cad643d6c6d..162539ae98cf 100644 --- a/pkgs/development/python-modules/niquests/default.nix +++ b/pkgs/development/python-modules/niquests/default.nix @@ -81,6 +81,11 @@ buildPythonPackage rec { "tests/test_rate_limiters.py" "tests/test_lowlevel.py" "tests/test_testserver.py" + # ssl.SSLCertVerificationError: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (_ssl.c:1032) + "tests/test_crl.py" + "tests/test_live.py" + "tests/test_ocsp.py" + "tests/test_sse.py" ]; disabledTests = diff --git a/pkgs/development/python-modules/oslo-db/default.nix b/pkgs/development/python-modules/oslo-db/default.nix index b09352d3cf3b..3f6f9053f759 100644 --- a/pkgs/development/python-modules/oslo-db/default.nix +++ b/pkgs/development/python-modules/oslo-db/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "18.0.0"; + version = "18.1.0"; pyproject = true; src = fetchPypi { pname = "oslo_db"; inherit version; - hash = "sha256-lL/zJBrTie9YZsFpGd4AWuDlud8YFO65TUAnxXUnCSM="; + hash = "sha256-B16GziPAwh2x01CR8dyyGwVEnInDpDJtpPLT+4MwIj8="; }; build-system = [ @@ -44,7 +44,8 @@ buildPythonPackage rec { oslo-utils sqlalchemy stevedore - ]; + ] + ++ sqlalchemy.optional-dependencies.asyncio; nativeCheckInputs = [ aiosqlite diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix index c4003e943cac..e77851a61808 100644 --- a/pkgs/development/python-modules/pandas-stubs/default.nix +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "pandas-stubs"; - version = "2.3.3.260113"; + version = "3.0.3.260530"; pyproject = true; src = fetchFromGitHub { owner = "pandas-dev"; repo = "pandas-stubs"; tag = "v${version}"; - hash = "sha256-DJS3aG79IZowiTqHeOEgDdlH9Z1SXrbZ7yplCrFTtzw="; + hash = "sha256-vPXz4ibNbFE2B14pkGPN5EDAwhA92VgFXzMLR9da6WQ="; }; build-system = [ poetry-core ]; @@ -78,12 +78,19 @@ buildPythonPackage rec { # Missing dependencies, error and warning checks "test_all_read_without_lxml_dtype_backend" # pyarrow.orc "test_orc" # pyarrow.orc + "test_iceberg" # pyiceberg "test_plotting" # UserWarning: No artists with labels found to put in legend. "test_spss" # FutureWarning: ChainedAssignmentError: behaviour will change in pandas 3.0! "test_show_version" # FutureWarning: In the future `np.bool` will be defined as the corresponding... "test_timedelta_cmp" "test_timestamp_cmp" + # DeprecationWarning: The 'generic' unit for NumPy timedelta is deprecated + "test_timedelta_properties_methods" + "test_sparse_dtype" + "test_sparse_dtype_fill_value_subtype_compatibility" + "test_isna" + "test_timedelta_range" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_clipboard" # FileNotFoundError: [Errno 2] No such file or directory: 'pbcopy' diff --git a/pkgs/development/python-modules/pkg-about/default.nix b/pkgs/development/python-modules/pkg-about/default.nix index ea1c6fde8441..fb467c644f83 100644 --- a/pkgs/development/python-modules/pkg-about/default.nix +++ b/pkgs/development/python-modules/pkg-about/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pkg-about"; - version = "2.3.0"; + version = "2.4.3"; pyproject = true; src = fetchPypi { pname = "pkg_about"; inherit version; - hash = "sha256-g+RduU/aLD+UwZVexONXa8+rQznVmybC5G4ZnIugPqI="; + hash = "sha256-CqO4k49pEhjYKPtKC088wdT77WjEc8QH23uKBtfBR0g="; }; # Unnecessarily requires the newest versions available for these diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix index 5be96456c138..f07cfb90e3d2 100644 --- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix +++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "pydantic-ai-slim"; - version = "2.5.0"; + version = "2.8.0"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-SpWiFEN9wwBtKSRDKZ8buPvBiRU3cqjwTCLFkGKpeOs="; + hash = "sha256-KwuhRZWGOofglR5SVsUOijtgYnhVV3Fc9DLtUwL+KSU="; }; sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim"; diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix index 6b13b57c8483..5faee498d04f 100644 --- a/pkgs/development/python-modules/pydantic-graph/default.nix +++ b/pkgs/development/python-modules/pydantic-graph/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "pydantic-graph"; - version = "2.5.0"; + version = "2.8.0"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-SpWiFEN9wwBtKSRDKZ8buPvBiRU3cqjwTCLFkGKpeOs="; + hash = "sha256-KwuhRZWGOofglR5SVsUOijtgYnhVV3Fc9DLtUwL+KSU="; }; sourceRoot = "${finalAttrs.src.name}/pydantic_graph"; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index c6b365bf23f1..e32c63e89ef4 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -3,6 +3,7 @@ buildPythonPackage, fetchFromGitHub, replaceVars, + stdenv, graphviz, coreutils, pkg-config, @@ -11,6 +12,10 @@ pytest, }: +let + # TODO: remove once #540793 makes it to master + graphviz' = graphviz.override { withQuartz = stdenv.hostPlatform.isDarwin; }; +in buildPythonPackage (finalAttrs: { pname = "pygraphviz"; version = "2.0"; @@ -27,7 +32,7 @@ buildPythonPackage (finalAttrs: { # pygraphviz depends on graphviz executables and wc being in PATH (replaceVars ./path.patch { path = lib.makeBinPath [ - graphviz + graphviz' coreutils ]; }) @@ -38,19 +43,19 @@ buildPythonPackage (finalAttrs: { --replace-fail ', "swig>4.1.0"' "" ''; - env.GRAPHVIZ_PREFIX = graphviz; + env.GRAPHVIZ_PREFIX = graphviz'; build-system = [ setuptools ]; nativeBuildInputs = [ - graphviz # for dot + graphviz' # for dot pkg-config swig ]; - buildInputs = [ graphviz ]; + buildInputs = [ graphviz' ]; nativeCheckInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pyhanko/default.nix b/pkgs/development/python-modules/pyhanko/default.nix index 575cd470b4da..3cbc9a1422b0 100644 --- a/pkgs/development/python-modules/pyhanko/default.nix +++ b/pkgs/development/python-modules/pyhanko/default.nix @@ -39,14 +39,14 @@ buildPythonPackage (finalAttrs: { pname = "pyhanko"; - version = "0.35.1"; + version = "0.35.2"; pyproject = true; src = fetchFromGitHub { owner = "MatthiasValvekens"; repo = "pyHanko"; tag = "v${finalAttrs.version}"; - hash = "sha256-mZ9u3mQ8JZIq+G1iwNQST8r7/rCWi/UW0j1xfeV9zFM="; + hash = "sha256-CY+YgUu8za5c0t2OKStKvCN9X8hVXT2sN42KSDiyMX8="; }; sourceRoot = "${finalAttrs.src.name}/pkgs/pyhanko"; diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index 5f5b4df67dc7..2df267c92ecf 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "pylint-django"; - version = "2.7.0"; + version = "2.8.0"; pyproject = true; src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint-django"; tag = "v${finalAttrs.version}"; - hash = "sha256-f0L/wYedLHtyi3/vro4n29oAY+axnQ5sBv545zD/Gvc="; + hash = "sha256-W3BPCK6fj4poZ1EaBUGyVyfRo/0sZa+2ktk96Ic6+q0="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/pylutron/default.nix b/pkgs/development/python-modules/pylutron/default.nix index 40eaee6be67c..3c2a2c42309d 100644 --- a/pkgs/development/python-modules/pylutron/default.nix +++ b/pkgs/development/python-modules/pylutron/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "pylutron"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; src = fetchFromGitHub { owner = "thecynic"; repo = "pylutron"; tag = finalAttrs.version; - hash = "sha256-bfr0Guu4rbb50arFB6fIWPSqh1hLZY0WO9mALsf8dj0="; + hash = "sha256-W0QiOiaUh2/kNNxdPlQLyc4HorDAxZLc+zsftNC0Ah4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index ae8d768045c6..4f21bfe09bb1 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "python-fsutil"; - version = "0.16.1"; + version = "0.17.0"; pyproject = true; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = "python-fsutil"; tag = finalAttrs.version; - hash = "sha256-/KlnQdN8R95qjxMGui0SofLFZl10vq6ufl05JuVuhDw="; + hash = "sha256-HQdQwPfMXTXSP9v/VF5fy3DicWm562V/KxxaO85nQ0c="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/python-open-router/default.nix b/pkgs/development/python-modules/python-open-router/default.nix index 33e360f36d28..95c9c6583240 100644 --- a/pkgs/development/python-modules/python-open-router/default.nix +++ b/pkgs/development/python-modules/python-open-router/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "python-open-router"; - version = "0.3.3"; + version = "0.4.0"; pyproject = true; src = fetchFromGitHub { owner = "joostlek"; repo = "python-open-router"; tag = "v${version}"; - hash = "sha256-RFKtt8ViTIEBmahY9H9YhSdVSlxaBEPOxRWPST9GoAM="; + hash = "sha256-hf8Ay3/xXH262/1R07mN0iQpOlHFhHb6VUZoYQEq8YI="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/python-qube-heatpump/default.nix b/pkgs/development/python-modules/python-qube-heatpump/default.nix index a6a4245fe38b..32ceed11d511 100644 --- a/pkgs/development/python-modules/python-qube-heatpump/default.nix +++ b/pkgs/development/python-modules/python-qube-heatpump/default.nix @@ -11,14 +11,14 @@ buildPythonPackage (finalAttrs: { pname = "python-qube-heatpump"; - version = "1.11.2"; + version = "1.12.0"; pyproject = true; src = fetchFromGitHub { owner = "MattieGit"; repo = "python-qube-heatpump"; tag = "v${finalAttrs.version}"; - hash = "sha256-B2tId45VbKpeI0vGWjV1h51Lwuj44zAsxWqt/Lz88Iw="; + hash = "sha256-49zRXAWHo5+Ooo/D+Cb3ydIKD3vMIslSql5lmAHtaeA="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/python3-application/default.nix b/pkgs/development/python-modules/python3-application/default.nix index 4131d859d98e..c20fea16c99a 100644 --- a/pkgs/development/python-modules/python3-application/default.nix +++ b/pkgs/development/python-modules/python3-application/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python3-application"; - version = "3.0.10"; + version = "3.0.11"; pyproject = true; disabled = !isPy3k; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "AGProjects"; repo = "python3-application"; rev = "release-${version}"; - hash = "sha256-ZVy5zfZPOYt6gxIGayeCMpcCG9GXCECDHM1S8SmODMY="; + hash = "sha256-qJhs59dZUHjvLVswLIqNRBOdF+11jk73n8iRHUVcOeg="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyvers/default.nix b/pkgs/development/python-modules/pyvers/default.nix index 168bc437b175..017e0a84298c 100644 --- a/pkgs/development/python-modules/pyvers/default.nix +++ b/pkgs/development/python-modules/pyvers/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "pyvers"; - version = "0.2.2"; + version = "0.2.3"; pyproject = true; src = fetchFromGitHub { owner = "vmoens"; repo = "pyvers"; tag = "v${finalAttrs.version}"; - hash = "sha256-VKNwhxyc1f7tyJO7JyBNELlZwVv6U2N8ye0OYFN/nmc="; + hash = "sha256-aXHOgKd/w1RKdL0wLoM4F05JWTaKAL3i3UerLcBG+vs="; }; build-system = [ diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index 7b5b7969e6f2..57169fa9970f 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -4,18 +4,21 @@ fetchPypi, stdenv, buildPythonPackage, + setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyxattr"; version = "0.8.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-SMV47PjqC9Q1GxdSRw4wGpCjdhx8IfAPlT3PbW+m7lo="; }; + build-system = [ setuptools ]; + # IOError: [Errno 95] Operation not supported (expected) doCheck = false; @@ -27,4 +30,4 @@ buildPythonPackage rec { # Darwin doesn't need `attr` for this. platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index cb84a39e9463..cbe22f5ad541 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2026.6.0"; + version = "2026.7.0"; pyproject = true; src = fetchPypi { pname = "qbittorrent_api"; inherit version; - hash = "sha256-8uJb8HCWC5BgNZF6EHWQQrDCiKxq3xkbr09ISIkLghM="; + hash = "sha256-nwpuM+5NuikNFV3jrVnBkd4C5NljnUJL8C7EoA7PMgU="; }; build-system = [ diff --git a/pkgs/development/python-modules/qemu/default.nix b/pkgs/development/python-modules/qemu/default.nix index bf3901980fc4..0b05055b31e6 100644 --- a/pkgs/development/python-modules/qemu/default.nix +++ b/pkgs/development/python-modules/qemu/default.nix @@ -5,10 +5,7 @@ setuptools, fuseSupport ? false, fusepy, - tuiSupport ? false, - urwid, - urwid-readline, - pygments, + qemu-qmp, }: buildPythonPackage { @@ -31,18 +28,12 @@ buildPythonPackage { fi ''; - buildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = - [ ] - ++ lib.optionals fuseSupport [ fusepy ] - ++ lib.optionals tuiSupport [ - urwid - urwid-readline - pygments - ]; + dependencies = [ qemu-qmp ] ++ lib.optionals fuseSupport [ fusepy ]; - # Project requires avocado-framework for testing, therefore replacing check phase + # Project now uses pytest instead of avocado-framework for testing but does not perform functional testing. + # let's keep it this way. checkPhase = '' for bin in $out/bin/*; do $bin --help @@ -51,13 +42,11 @@ buildPythonPackage { pythonImportsCheck = [ "qemu" ]; - preFixup = - (lib.optionalString (!tuiSupport) '' - rm $out/bin/qmp-tui - '') - + (lib.optionalString (!fuseSupport) '' + preFixup = ( + lib.optionalString (!fuseSupport) '' rm $out/bin/qom-fuse - ''); + '' + ); meta = { homepage = "https://www.qemu.org/"; diff --git a/pkgs/development/python-modules/redisvl/default.nix b/pkgs/development/python-modules/redisvl/default.nix index 4ceb16d1c2d1..9bb03f6e5aa1 100644 --- a/pkgs/development/python-modules/redisvl/default.nix +++ b/pkgs/development/python-modules/redisvl/default.nix @@ -27,6 +27,8 @@ buildPythonPackage (finalAttrs: { build-system = [ hatchling ]; + pythonRelaxDeps = [ "redis" ]; + dependencies = [ numpy pyyaml diff --git a/pkgs/development/python-modules/riscof/make_writeable.patch b/pkgs/development/python-modules/riscof/make_writeable.patch index 938f9913a7ad..c597338cda00 100644 --- a/pkgs/development/python-modules/riscof/make_writeable.patch +++ b/pkgs/development/python-modules/riscof/make_writeable.patch @@ -1,25 +1,33 @@ diff --git a/riscof/cli.py b/riscof/cli.py -index 26af62e..9d0ddbf 100644 +index 26af62e..94051ae 100644 --- a/riscof/cli.py +++ b/riscof/cli.py -@@ -502,6 +502,7 @@ def setup(dutname,refname,work_dir): +@@ -7,6 +7,7 @@ import os + import sys + import pytz + import shutil ++import subprocess + import configparser + import distutils.dir_util + +@@ -502,6 +503,7 @@ def setup(dutname,refname,work_dir): src = os.path.join(constants.root, "Templates/setup/model/") dest = os.path.join(cwd, dutname) distutils.dir_util.copy_tree(src, dest) -+ os.system(f"chmod +w -R '{dest}'") ++ subprcess.run(["chmod", "+w", "-R", dest]) os.rename(cwd+'/'+dutname+'/model_isa.yaml', cwd+'/'+dutname+'/'+dutname+'_isa.yaml') -@@ -525,10 +526,12 @@ def setup(dutname,refname,work_dir): +@@ -525,10 +527,12 @@ def setup(dutname,refname,work_dir): src = os.path.join(constants.root, "Templates/setup/sail_cSim/") dest = os.path.join(cwd, refname) distutils.dir_util.copy_tree(src, dest) -+ os.system(f"chmod +w -R '{dest}'") ++ subprcess.run(["chmod", "+w", "-R", dest]) else: src = os.path.join(constants.root, "Templates/setup/reference/") dest = os.path.join(cwd, refname) distutils.dir_util.copy_tree(src, dest) -+ os.system(f"chmod +w -R '{dest}'") ++ subprcess.run(["chmod", "+w", "-R", dest]) os.rename(cwd+'/'+refname+'/riscof_model.py', cwd+'/'+refname+'/riscof_'+refname+'.py') with open(cwd+'/'+refname+'/riscof_'+refname+'.py', 'r') as file : diff --git a/pkgs/development/python-modules/sabctools/default.nix b/pkgs/development/python-modules/sabctools/default.nix index dc69a97325d2..63c70514debd 100644 --- a/pkgs/development/python-modules/sabctools/default.nix +++ b/pkgs/development/python-modules/sabctools/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "sabctools"; - version = "9.5.0"; + version = "9.6.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-x0+9GT/xs+EdX63qglTeuYE/z8cp/kOZmk6zd8MlAgQ="; + hash = "sha256-7hiLzmhaB5btSw5OVWcGpWAvsnKKamybRvwDQMrdigM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 3a48512d690b..b019830aead6 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -15,15 +15,16 @@ writableTmpDirAsHomeHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "seaborn"; version = "0.13.2"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "mwaskom"; repo = "seaborn"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-aGIVcdG/XN999nYBHh3lJqGa3QVt0j8kmzaxdkULznY="; }; @@ -47,9 +48,9 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ matplotlib numpy pandas @@ -79,6 +80,10 @@ buildPythonPackage rec { ++ lib.optionals (!stdenv.hostPlatform.isx86) [ # overly strict float tolerances "TestDendrogram" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # overly strict float tolerances + "test_ticklabels_overlap" ]; # All platforms should use Agg. Let's set it explicitly to avoid probing GUI @@ -90,8 +95,8 @@ buildPythonPackage rec { meta = { description = "Statistical data visualization"; homepage = "https://seaborn.pydata.org/"; - changelog = "https://github.com/mwaskom/seaborn/blob/v${version}/doc/whatsnew/v${version}.rst"; + changelog = "https://github.com/mwaskom/seaborn/blob/${finalAttrs.src.tag}/doc/whatsnew/${finalAttrs.src.tag}.rst"; license = with lib.licenses; [ bsd3 ]; maintainers = with lib.maintainers; [ miniharinn ]; }; -} +}) diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index ec1820af170b..ab5779b946fa 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "simple-salesforce"; - version = "1.12.9"; + version = "1.12.10"; pyproject = true; src = fetchFromGitHub { owner = "simple-salesforce"; repo = "simple-salesforce"; tag = "v${finalAttrs.version}"; - hash = "sha256-eMO/K6W9ROljYxR3gK9QjCHdlbAuN4DYjOyTO1WcalQ="; + hash = "sha256-6Aj4ha1OtYEr7CxXWvSjYDU88tNZE6Fz5oRYyVpWVPI="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 10c60fc80aff..1acd553a108b 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -10,16 +10,16 @@ time-machine, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "structlog"; - version = "25.5.0"; + version = "26.1.0"; pyproject = true; src = fetchFromGitHub { owner = "hynek"; repo = "structlog"; - tag = version; - hash = "sha256-dY18eZ7IEzP/eKR7d2CjpTRr2KfXy+YmeZMueHkLSQY="; + tag = finalAttrs.version; + hash = "sha256-Q31eqeRYAbwn6Cj3hkXfy3udeBHHglEk5/qTjKbBbL8="; }; build-system = [ @@ -39,8 +39,8 @@ buildPythonPackage rec { meta = { description = "Painless structural logging"; homepage = "https://github.com/hynek/structlog"; - changelog = "https://github.com/hynek/structlog/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/hynek/structlog/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) diff --git a/pkgs/development/python-modules/svgdigitizer/default.nix b/pkgs/development/python-modules/svgdigitizer/default.nix index 704a6bdb784d..e328ca34bc3a 100644 --- a/pkgs/development/python-modules/svgdigitizer/default.nix +++ b/pkgs/development/python-modules/svgdigitizer/default.nix @@ -26,15 +26,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "svgdigitizer"; version = "0.14.4"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "echemdb"; repo = "svgdigitizer"; - tag = version; + tag = finalAttrs.version; hash = "sha256-sDMSzoXa8RnygFjveh1SrF+bFit7OMQh2kbiZ478cM4="; }; @@ -42,6 +43,11 @@ buildPythonPackage rec { setuptools ]; + # https://github.com/echemdb/svgdigitizer/issues/298 + pythonRelaxDeps = [ + "astropy" + ]; + dependencies = [ astropy click @@ -81,8 +87,8 @@ buildPythonPackage rec { meta = { description = "Extract numerical data points from SVG files"; homepage = "https://github.com/echemdb/svgdigitizer"; - changelog = "https://github.com/echemdb/svgdigitizer/blob/${src.tag}/ChangeLog"; + changelog = "https://github.com/echemdb/svgdigitizer/blob/${finalAttrs.src.tag}/ChangeLog"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ doronbehar ]; }; -} +}) diff --git a/pkgs/development/python-modules/swcgeom/default.nix b/pkgs/development/python-modules/swcgeom/default.nix index a03d97b2838f..d4d87099382a 100644 --- a/pkgs/development/python-modules/swcgeom/default.nix +++ b/pkgs/development/python-modules/swcgeom/default.nix @@ -25,19 +25,17 @@ pytestCheckHook, }: -let - version = "0.21.5"; -in -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "swcgeom"; - inherit version; + version = "0.21.6"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "yzx9"; repo = "swcgeom"; - tag = "v${version}"; - hash = "sha256-QLo2tfoQFuoKee/e/t5l3bUwOtobV57Od9UvAze78FE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Q9YvHHUAYGX3m9jJ+ogTYRrdPaCdrcNY2cNlKK7ThX4="; }; build-system = [ @@ -88,8 +86,8 @@ buildPythonPackage rec { meta = { description = "Neuron geometry library for swc format"; homepage = "https://github.com/yzx9/swcgeom"; - changelog = "https://github.com/yzx9/swcgeom/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/yzx9/swcgeom/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ yzx9 ]; }; -} +}) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index cf2e44f13ec7..eeed8592bc0d 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage (finalAttrs: { pname = "tencentcloud-sdk-python"; - version = "3.1.130"; + version = "3.1.131"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = finalAttrs.version; - hash = "sha256-vPxFrS9I7YmgSKjswlZY5gsIP2IAwoSEU+YA5+D/DMw="; + hash = "sha256-0J0UnWoXNe9vzQeJBACPp7C90UsvJ0Puh2h9roueCZw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index beef86aafa30..4fe8846e4a5e 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "1.5.1"; + version = "1.6.4"; pyproject = true; src = fetchFromGitHub { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; tag = "v${version}"; - hash = "sha256-QQSm856y4/bL61noJ2ebPsZSAAKW3Md6/zQ+FFydri4="; + hash = "sha256-Z27HPmlat0GfVmTeRYmqp9HlUsuZ+5A9FStqGGFMfiw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 10452676e90e..5b08b95dfd11 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -15,14 +15,14 @@ buildPythonPackage (finalAttrs: { pname = "timezonefinder"; - version = "8.2.4"; + version = "8.2.5"; pyproject = true; src = fetchFromGitHub { owner = "jannikmi"; repo = "timezonefinder"; tag = finalAttrs.version; - hash = "sha256-f0JEnXQHhROe6jQ377xQlM21Afp1Lqs2fHfme1ah4QM="; + hash = "sha256-NDxGYiBYFqYU3tK/RwlHYARcncAB1GJk+qHxRNrT1oU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/tplink-omada-client/default.nix b/pkgs/development/python-modules/tplink-omada-client/default.nix index 9d69ef3eb595..32ce8e88f619 100644 --- a/pkgs/development/python-modules/tplink-omada-client/default.nix +++ b/pkgs/development/python-modules/tplink-omada-client/default.nix @@ -9,13 +9,13 @@ buildPythonPackage (finalAttrs: { pname = "tplink-omada-client"; - version = "1.5.8"; + version = "1.5.9"; pyproject = true; src = fetchPypi { pname = "tplink_omada_client"; inherit (finalAttrs) version; - hash = "sha256-JFAx2rDV0ughzilXBLIyPvFia79rL0ZcNFXp9hPJysU="; + hash = "sha256-DjWfz7D29RiMPa7rHm6rdSPI33pAj4JdWwk7EuLEbvk="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/types-colorama/default.nix b/pkgs/development/python-modules/types-colorama/default.nix index e176716e7cf3..270299e73935 100644 --- a/pkgs/development/python-modules/types-colorama/default.nix +++ b/pkgs/development/python-modules/types-colorama/default.nix @@ -5,18 +5,18 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-colorama"; - version = "0.4.15.20250801"; + version = "0.4.15.20260508"; pyproject = true; src = fetchPypi { pname = "types_colorama"; - inherit version; - hash = "sha256-AlZdE9aJY9EiN9PzMPXs1iKjF597WxTufxYUYnDDV/U="; + inherit (finalAttrs) version; + hash = "sha256-OokWA55XRSvSH1fmdOHyIcqeTzGYk8Xju9N7hFwn2OY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Module has no tests doCheck = false; @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/types-mysqlclient/default.nix b/pkgs/development/python-modules/types-mysqlclient/default.nix index f15568dd92a8..ca26a39e0f25 100644 --- a/pkgs/development/python-modules/types-mysqlclient/default.nix +++ b/pkgs/development/python-modules/types-mysqlclient/default.nix @@ -5,7 +5,7 @@ setuptools, }: let - version = "2.2.0.20250915"; + version = "2.2.0.20260508"; in buildPythonPackage { inherit version; @@ -15,7 +15,7 @@ buildPythonPackage { src = fetchPypi { inherit version; pname = "types_mysqlclient"; - hash = "sha256-/nCJOVm6w38Xry/MDKGvoXtxRpg+HGzAM2oTFAzO/I0="; + hash = "sha256-DrNMz7yF4vf9V3JyNlGtKGPjayeHADO+/ka+crqfz+I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-retry/default.nix b/pkgs/development/python-modules/types-retry/default.nix index fb60b27d3efc..0d3c807464c1 100644 --- a/pkgs/development/python-modules/types-retry/default.nix +++ b/pkgs/development/python-modules/types-retry/default.nix @@ -7,7 +7,7 @@ buildPythonPackage (finalAttrs: { pname = "types-retry"; - version = "0.9.9.20250322"; + version = "0.9.9.20260408"; pyproject = true; __structuredAttrs = true; @@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: { src = fetchPypi { pname = "types_retry"; inherit (finalAttrs) version; - hash = "sha256-LqpvS4MsGHEhBWmIu+bS0Lb06wNjH9yXUuKsKAL3tyY="; + hash = "sha256-P5j6YuwCdEk4P1wBnM6sx4TB26tHYJid2rQh97hAfZI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/types-webencodings/default.nix b/pkgs/development/python-modules/types-webencodings/default.nix index 976a306d7518..e8ae2202cfdb 100644 --- a/pkgs/development/python-modules/types-webencodings/default.nix +++ b/pkgs/development/python-modules/types-webencodings/default.nix @@ -5,15 +5,15 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "types-webencodings"; - version = "0.5.0.20251108"; + version = "0.5.0.20260408"; pyproject = true; src = fetchPypi { pname = "types_webencodings"; - inherit version; - hash = "sha256-I3jizszO09QbteITh1hue1MF4RUZ/GsGWcYp8jsuXeQ="; + inherit (finalAttrs) version; + hash = "sha256-KMWWYZ82fkPu45PYX2Po0v22h0xlSo1EHDf4r+KcbQ0="; }; build-system = [ setuptools ]; @@ -26,4 +26,4 @@ buildPythonPackage rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/uploadserver/default.nix b/pkgs/development/python-modules/uploadserver/default.nix index 36f895e9983a..5c3fa9759fd6 100644 --- a/pkgs/development/python-modules/uploadserver/default.nix +++ b/pkgs/development/python-modules/uploadserver/default.nix @@ -10,14 +10,14 @@ }: buildPythonPackage (finalAttrs: { pname = "uploadserver"; - version = "6.0.2"; + version = "6.0.3"; pyproject = true; src = fetchFromGitHub { owner = "Densaugeo"; repo = "uploadserver"; tag = finalAttrs.version; - hash = "sha256-z0lqVllR+vmdMt95Kv2pGrp0Coc3ZEwgS4xyvnw0geE="; + hash = "sha256-aG/s7C55QaAvOMFWrYKlDdjQFWljKBjal2Qe6j1/B/o="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/vtherm-api/default.nix b/pkgs/development/python-modules/vtherm-api/default.nix index 37abc93a5435..bc8f9d5dbe6a 100644 --- a/pkgs/development/python-modules/vtherm-api/default.nix +++ b/pkgs/development/python-modules/vtherm-api/default.nix @@ -3,9 +3,9 @@ buildPythonPackage, fetchFromGitHub, home-assistant, - pythonOlder, pytest-asyncio, pytestCheckHook, + python, setuptools, }: @@ -14,7 +14,7 @@ buildPythonPackage (finalAttrs: { version = "0.3.0"; pyproject = true; - disabled = pythonOlder "3.14"; + disabled = python.version != home-assistant.python3Packages.python.version; src = fetchFromGitHub { owner = "jmcollin78"; @@ -25,9 +25,8 @@ buildPythonPackage (finalAttrs: { build-system = [ setuptools ]; - dependencies = [ home-assistant ]; - nativeCheckInputs = [ + home-assistant pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 81fac05ef276..c76095e59333 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "7.2-rc2", - "hash": "sha256:0fmmgckfjcld0ljwdz3jzc1bpkyfsj0i8q90mzzy92j07s28nffh", + "version": "7.2-rc3", + "hash": "sha256:1nf6znpalqikblq6g0yb3hp7i689frhlhb4j1yxj6nn8fvma4rwd", "lts": false }, "6.1": { diff --git a/pkgs/os-specific/linux/usbrelay/test.nix b/pkgs/os-specific/linux/usbrelay/test.nix index b7894b0da773..60118dee1cd3 100644 --- a/pkgs/os-specific/linux/usbrelay/test.nix +++ b/pkgs/os-specific/linux/usbrelay/test.nix @@ -45,9 +45,11 @@ import ../../../../nixos/tests/make-test-python.nix ( documentation.nixos.enable = false; # building nixos manual takes long time }; - testScript = '' + testScript = /* py */ '' import os - if os.waitstatus_to_exitcode(os.system("lsusb -d 16c0:05df")) != 0: + import subprocess + + if os.waitstatus_to_exitcode(subprocess.run(["lsusb", "-d", "16c0:05df"]).returncode) != 0: print("No USB relay detected, skipping test") import sys sys.exit(2) diff --git a/pkgs/servers/home-assistant/custom-components/closest_intent/package.nix b/pkgs/servers/home-assistant/custom-components/closest_intent/package.nix index 9f76fec4c9bd..4f851dfe9697 100644 --- a/pkgs/servers/home-assistant/custom-components/closest_intent/package.nix +++ b/pkgs/servers/home-assistant/custom-components/closest_intent/package.nix @@ -12,13 +12,13 @@ buildHomeAssistantComponent (finalAttrs: { owner = "charludo"; domain = "closest_intent"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { inherit (finalAttrs) owner; repo = "hass-closest-intent"; tag = "v${finalAttrs.version}"; - hash = "sha256-AvI9vX2RnN3ALQY4Q2mF3E9mkEV9VBOvk9HOH6i7RbQ="; + hash = "sha256-rfmQso2UJsyyCA5F+0B/7gszxy6+RUpTJtil0CxdtyY="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix index 35fe4b9cabae..a443bc552a0b 100644 --- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix +++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "jwillemsen"; domain = "daikin_onecta"; - version = "4.6.10"; + version = "4.6.12"; src = fetchFromGitHub { owner = "jwillemsen"; repo = "daikin_onecta"; tag = "v${version}"; - hash = "sha256-kUwtgjwDPuQ2Kce7Oi2IMXSpNuW9tBqQLKro9W0bDlU="; + hash = "sha256-IMYrgSB4Fyc+BEhY4+FGE9Dca7llAQgvkAiOssut04c="; }; meta = { diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix index f3a83f838dc8..47b38e159a1b 100644 --- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix +++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "cyberjunky"; domain = "garmin_connect"; - version = "3.0.12"; + version = "3.0.13"; src = fetchFromGitHub { owner = "cyberjunky"; repo = "home-assistant-garmin_connect"; tag = version; - hash = "sha256-8pyuH3GgFTov4M2ckmh3KCYmAzVG4iYkGGpA+Cd9/wk="; + hash = "sha256-qba1aexMT02dUob4ITS1ePLB41WBleZEdKsWuXCx6+o="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-components/local_openai/package.nix b/pkgs/servers/home-assistant/custom-components/local_openai/package.nix index 76abfc48cf6c..86fe23a34e6b 100644 --- a/pkgs/servers/home-assistant/custom-components/local_openai/package.nix +++ b/pkgs/servers/home-assistant/custom-components/local_openai/package.nix @@ -9,13 +9,13 @@ buildHomeAssistantComponent (finalAttrs: { owner = "skye-harris"; domain = "local_openai"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { inherit (finalAttrs) owner; repo = "hass_local_openai_llm"; tag = finalAttrs.version; - hash = "sha256-L5gcjKTT9KvTHCuUxg+r0mBJ+jRZqLvF9o+X+6tSH6g="; + hash = "sha256-42hfVQGFHWn+QBIdK9vVPM6nV+vaO8w8mo4FCsQur4I="; }; dependencies = [ diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix index 1c4aed328a8d..31f42e9f4f6f 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/horizon-card/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "horizon-card"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "rejuvenate"; repo = "lovelace-horizon-card"; tag = "v${finalAttrs.version}"; - hash = "sha256-z2cJ6BIhNnzUo9nIFxVyrPBVWSKf35fyLXK72pE8TJw="; + hash = "sha256-Ja4r8x9sNH6W7LoH//zfXDlQb9W7KYFz4Y9UBoqt19s="; }; patches = [ @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src patches; - hash = "sha256-KWbXvivHxoV4xQuY2m/wpajjIZcypeh6nuvRVnrtFM0="; + hash = "sha256-Ztb69kAGYteVevzzFOx+62LI2i4iQakI4Fwqb6G2vuM="; }; buildPhase = '' 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 d7826ed1bb4f..dde15e621031 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 = "2.1.0"; - zipHash = "sha256-7t91vh1HWsItadyqtJ/Dq1wu7mlB1LK+UVzycY6mDE0="; + version = "2.2.0"; + zipHash = "sha256-NMs4aFZ1QFWbLRDBcGTzkK9SNHIfBA7eO4BQzeHbMuM="; 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/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index d2404b18e61d..7640142f5349 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v74 = generic { - version = "7.4.11"; - hash = "sha256-uouF3zlrg76SFpxk7EAn1+HsedZzGG/0gcKqqOUka+w="; + version = "7.4.12"; + hash = "sha256-LGBinl3OYfUDAmyZ2KksL2at4y7v2Ji6XZAA/enrndA="; }; v70 = generic { version = "7.0.28"; diff --git a/pkgs/test/problems/cases/allow-broken-predicate-match/default.nix b/pkgs/test/problems/cases/allow-broken-predicate-match/default.nix index 7869bc996809..df18d357e1e8 100644 --- a/pkgs/test/problems/cases/allow-broken-predicate-match/default.nix +++ b/pkgs/test/problems/cases/allow-broken-predicate-match/default.nix @@ -5,7 +5,7 @@ let system = "x86_64-linux"; overlays = [ ]; config = { - allowBrokenPredicate = attrs: lib.getName attrs == "a"; + problems.handlers.a.broken = "ignore"; }; }; in diff --git a/pkgs/test/problems/cases/invalid-kind-error/expected-stderr b/pkgs/test/problems/cases/invalid-kind-error/expected-stderr index 6fdf2b1d04b1..0d7cb8f874b6 100644 --- a/pkgs/test/problems/cases/invalid-kind-error/expected-stderr +++ b/pkgs/test/problems/cases/invalid-kind-error/expected-stderr @@ -1,4 +1,4 @@ (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: Refusing to evaluate package 'a-0' in /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-default.nix:11 because it has an invalid meta attrset: - - a.meta.problems.invalid: Problem kind invalid, inferred from the problem name, is invalid; expected enum. You can specify an explicit problem kind with `a.meta.problems.invalid.kind` + - a.meta.problems.invalid: Problem kind invalid, inferred from the problem name, is invalid; expected enum. You can specify an explicit problem kind with `a.meta.problems.invalid.kind` diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a5bb5b418569..4659ad0ae3a0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1021,6 +1021,7 @@ mapAliases { haxor-news = throw "'haxor-news' has been removed as it is unmaintained"; # Added 2026-06-16 helix-gpt = throw "helix-gpt was deprecated in January 2026 and has been since removed"; # Added 2026-02-05 HentaiAtHome = throw "'HentaiAtHome' has been renamed to/replaced by 'hentai-at-home'"; # Converted to throw 2025-10-27 + heptabase = throw "'heptabase' bas been removed due to lack of maintenance."; # Added 2026-05-31 hiawatha = throw "hiawatha has been removed, since it is no longer actively supported upstream, nor well maintained in nixpkgs"; # Added 2025-09-10 hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10 hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # Added 2025-08-20 @@ -1500,6 +1501,7 @@ mapAliases { matrix-synapse-tools.synadm = throw "'matrix-synapse-tools.synadm' has been renamed to/replaced by 'synadm'"; # Converted to throw 2025-10-27 mbedtls_2 = throw "'mbedtls_2' has been removed as it reached its end of life. Migrate to 'mbedtls'."; mcomix3 = throw "'mcomix3' has been renamed to/replaced by 'mcomix'"; # Converted to throw 2025-10-27 + mcphost = throw "'mcphost' has been removed as it was marked discontinued upstream"; # Added 2026-07-08 mdbook-alerts = throw "'mdbook-alerts' has been removed because it is deprecated and natively supported by mdbook since version 0.5.0"; # Added 2026-01-07 mdbook-linkcheck = throw "'mdbook-linkcheck' has been removed and replaced by 'mdbook-linkcheck2' due to incompatibility with mdbook version 0.5.0+"; # Added 2026-03-03 mdt = throw "'mdt' has been renamed to/replaced by 'md-tui'"; # Converted to throw 2025-10-27 @@ -1993,6 +1995,7 @@ mapAliases { retroarchFull = throw "'retroarchFull' has been renamed to/replaced by 'retroarch-full'"; # Converted to throw 2025-10-27 retroshare06 = throw "'retroshare06' has been renamed to/replaced by 'retroshare'"; # Converted to throw 2025-10-27 rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03 + rHttp = rhttp; # Added 2026-07-05 rigsofrods = throw "'rigsofrods' has been renamed to/replaced by 'rigsofrods-bin'"; # Converted to throw 2025-10-27 rili = throw "'rili' has been dropped in favor of its maintained fork 'li-ri'"; # Added 2026-01-03 rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a3c8df417f5..cec28b402ecb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9253,7 +9253,6 @@ with pkgs; qemu-python-utils = python3Packages.toPythonApplication ( python3Packages.qemu.override { fuseSupport = true; - tuiSupport = true; } ); diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index a93fb26666c9..ebe42498e38a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -27,14 +27,14 @@ let self: coq: let callPackage = self.callPackage; - coqPackages = self // { + rocqPackages = self // { recurseForDerivations = false; }; in { - inherit coqPackages lib; + inherit rocqPackages lib; - metaFetch = import ../build-support/coq/meta-fetch/default.nix { + metaFetch = import ../build-support/rocq/meta-fetch/default.nix { inherit lib stdenv @@ -42,7 +42,16 @@ let fetchurl ; }; - mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq { }); + mkRocqDerivation = lib.makeOverridable (callPackage ../build-support/rocq { }); + mkCoqDerivation = + args: + self.mkRocqDerivation ( + { + useCoq = true; + namePrefix = [ "coq" ]; + } + // args + ); coq = coq.overrideAttrs (oldAttrs: { passthru = (oldAttrs.passthru or { }) // { @@ -286,7 +295,7 @@ let let v = set.${name} or null; in - lib.optional (!v.meta.coqFilter or false) ( + lib.optional (!v.meta.rocqFilter or false) ( lib.nameValuePair name ( if lib.isAttrs v && v.recurseForDerivations or false then filterCoqPackages v else v ) diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix index 28b980f6dbfc..7b48e4d73079 100644 --- a/pkgs/top-level/rocq-packages.nix +++ b/pkgs/top-level/rocq-packages.nix @@ -26,7 +26,7 @@ let recurseForDerivations = false; }; - metaFetch = import ../build-support/coq/meta-fetch/default.nix { + metaFetch = import ../build-support/rocq/meta-fetch/default.nix { inherit lib stdenv